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