采购订单订单号不存在后端生成,采购明细加提单号是否存在判断

blade-service/blade-deliver-goods/src/main/java/org/springblade/deliver/goods/controller/ImportDeliveryController.java

@@ -200,7 +200,7 @@ public class ImportDeliveryController extends BladeController {
 									  @ApiParam(value = "订单号", required = true) @RequestParam String billNo,
 									  @ApiParam(value = "合同号", required = true) @RequestParam String contractNumber) {
 
-		R<StockGoodsVO> stockGoodsVOR = stockGoodsClient.selectStock(corpId, storageId, goodId, null, null, cntrNo, billNo, contractNumber);
+		R<StockGoodsVO> stockGoodsVOR = stockGoodsClient.selectStock(corpId, storageId, goodId, null, null, cntrNo, billNo, contractNumber,"JK");
 		if(stockGoodsVOR.isSuccess())
 		{
 			StockGoodsVO data = stockGoodsVOR.getData();

blade-service/trade-purchase/src/main/java/com/trade/purchase/order/component/impl/DefaultOrderSaveImpl.java

@@ -129,13 +129,15 @@ public class DefaultOrderSaveImpl implements IOrderSave {
 			}
 			order.setSysNo((String) billNo.getData());
 			R<CorpsDesc> corpMessage = corpsDescClient.getCorpMessage(order.getCorpId());
-		/*	//生成订单号
-			R clientBillNo = serialClient.getBillNo(corpMessage.getData().getCode(),order.getTradeType());
+			if (StringUtils.isBlank(order.getOrderNo())){
+			//生成订单号
+			R clientBillNo = serialClient.getBillNo(corpMessage.getData().getCode(),order.getTradeType(),order.getTradeType());
 			if (!clientBillNo.isSuccess()){
 				TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
 				throw new SecurityException("生成订单号失败");
 			}
-			order.setOrderNo((String) clientBillNo.getData());*/
+			order.setOrderNo((String) clientBillNo.getData());
+			}
 			//判断贸易类型
 			if(order.getTradeType().equals("JK"))
 			{
@@ -174,16 +176,20 @@ public class DefaultOrderSaveImpl implements IOrderSave {
 		}
 		if (CollectionUtils.isNotEmpty(itemsVOList)) {
 			itemsVOList.forEach(li -> {
+				String billNo = null;
+				if (StringUtils.isNotBlank(li.getBillNo())){
+					billNo = li.getBillNo().toUpperCase();
+				}
 				li.setPid(id);
 				if (Objects.isNull(li.getId())) {
 					li.setCreateTime(new Date());
 					li.setCreateUser(AuthUtil.getUserId());
-					li.setBillNo(li.getBillNo().toUpperCase());
+					li.setBillNo(billNo);
 					orderItemsMapper.insert(li);
 				} else {
 					li.setUpdateTime(new Date());
 					li.setUpdateUser(AuthUtil.getUserId());
-					li.setBillNo(li.getBillNo().toUpperCase());
+					li.setBillNo(billNo);
 					orderItemsMapper.updateById(li);
 				}
 			});