进口合同号手填

blade-service/blade-purchase-sales/src/main/java/org/springblade/purchase/sales/service/impl/OrderServiceImpl.java

@@ -107,16 +107,18 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 				return R.fail(500,"生成系统编号失败");
 			}
 			order.setSysNo((String) billNo.getData());
-			R<CorpsDesc> corpMessage = corpsDescClient.getCorpMessage(order.getCorpId());
-			if (corpMessage.isSuccess()){
-				R clientBillNo = serialClient.getBillNo(corpMessage.getData().getCode(),order.getTradeType());
-				if (!clientBillNo.isSuccess()){
-					TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
-					return R.fail(500,"生成订单编号失败");
-				}
-				order.setOrderNo((String) clientBillNo.getData());
-				if (!order.getBillType().equals(OrderTypeEnum.IMPORT.getType())){   //进口的orgOrderNo 存的是采购订单号  出口国内存的是本身的订单号码
-					order.setOrgOrderNo((String) clientBillNo.getData());
+			if (!order.getTradeType().equals(OrderTypeEnum.IMPORT.getType()) && StringUtils.isNotBlank(order.getOrderNo())){
+				R<CorpsDesc> corpMessage = corpsDescClient.getCorpMessage(order.getCorpId());
+				if (corpMessage.isSuccess()){
+					R clientBillNo = serialClient.getBillNo(corpMessage.getData().getCode(),order.getTradeType());
+					if (!clientBillNo.isSuccess()){
+						TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+						return R.fail(500,"生成订单编号失败");
+					}
+					order.setOrderNo((String) clientBillNo.getData());
+					if (!order.getBillType().equals(OrderTypeEnum.IMPORT.getType())){   //进口的orgOrderNo 存的是采购订单号  出口国内存的是本身的订单号码
+						order.setOrgOrderNo((String) clientBillNo.getData());
+					}
 				}
 			}
 			//主订单号为空已订单号一致国内贸易