福达销售订单号去掉Q，报价单号加Q

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

@@ -151,14 +151,17 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 			order.setSysNo((String) billNo.getData());
 			if (!order.getTradeType().equals(OrderTypeEnum.IMPORT.getType()) && StringUtils.isBlank(order.getOrderNo())) {
 				//出口贸易的报价单号和销售单号的生成规则是 Q + 客户编码后三位
-				if (order.getTradeType().equals(OrderTypeEnum.EXPORT.getType()) && (order.getBillType().equals(OrderTypeEnum.ENQUIRY.getType()) ||order.getBillType().equals(OrderTypeEnum.SALES.getType()))) {
+				if (order.getTradeType().equals(OrderTypeEnum.EXPORT.getType())) {
 					R<CorpsDesc> corpMessage = corpsDescClient.getCorpMessage(order.getCorpId());
 					if (corpMessage.isSuccess() && StringUtils.isNotBlank(corpMessage.getData().getCode())) {
 						String substring = "";
+						if (order.getBillType().equals(OrderTypeEnum.ENQUIRY.getType())){
+							substring =substring +"Q";
+						}
 						if (corpMessage.getData().getCode().length() > 3) {
-							substring = "Q" + corpMessage.getData().getCode().substring(corpMessage.getData().getCode().length() - 3, corpMessage.getData().getCode().length());
+							substring = substring+ corpMessage.getData().getCode().substring(corpMessage.getData().getCode().length() - 3, corpMessage.getData().getCode().length());
 						} else {
-							substring = "Q" + corpMessage.getData().getCode();
+							substring = substring + corpMessage.getData().getCode();
 						}
 						R clientBillNo = serialClient.getBillNo(substring, order.getTradeType(), order.getBillType());
 						if (!clientBillNo.isSuccess()) {