feat(all): 修改林氏订单号的取值字段

blade-service/logpm-factory-data/logpm-factory-data-linsy/src/main/java/com/logpm/factorydata/linsy/mq/FactoryOrderListener.java

@@ -106,7 +106,7 @@ public class FactoryOrderListener {
 				BeanUtil.copyProperties(orderInfo, orderInfoEntity);
 				orderInfoEntity.setLogId(ObjectUtil.isNotEmpty(logId) ? logId.toString() : null);
 				orderInfoEntity.setDeliveryNoteId(vo.getId().toString());
-				orderInfoEntity.setOrderCode(vo.getBillCode());
+				orderInfoEntity.setOrderCode(vo.getCustomizedBillCode());
 				infoEntities.add(orderInfoEntity);
 			}
 			packageInfoService.saveBatch(infoEntities);

blade-service/logpm-factory-data/logpm-factory-data-linsy/src/main/java/com/logpm/factorydata/linsy/service/impl/DeliveryNoteServiceImpl.java

@@ -104,7 +104,8 @@ public class DeliveryNoteServiceImpl extends BaseServiceImpl<DeliveryNoteMapper,
 		advanceEntity.setSenderAddress("");
 		advanceEntity.setTrainNumber(StrUtil.replace(DateUtil.today(), "-", ""));
 		advanceEntity.setSenderFactory(BrandEnums.LINSY.getValue());
-		advanceEntity.setOrderCode(vo.getBillCode());
+		// advanceEntity.setOrderCode(vo.getBillCode());
+		advanceEntity.setOrderCode(vo.getCustomizedBillCode());
 		advanceEntity.setDealerCode("");
 		advanceEntity.setDealerName(vo.getShopName());
 		advanceEntity.setStoreCode("");
@@ -124,7 +125,7 @@ public class DeliveryNoteServiceImpl extends BaseServiceImpl<DeliveryNoteMapper,
 			advanceDetailEntity.setWarehouseName(startWarehouseName);
 //					advanceDetailEntity.setIncomingWarehouseId(0L);
 //					advanceDetailEntity.setIncomingWarehouseName("");
-			advanceDetailEntity.setOrderCode(vo.getBillCode());
+			advanceDetailEntity.setOrderCode(vo.getCustomizedBillCode());
 			advanceDetailEntity.setBrand(BrandEnums.LINSY.getValue());
 			advanceDetailEntity.setSystemType("线上");
 			advanceDetailEntity.setFirstPackName(orderPackageDTO.getMaterialCode());
@@ -220,7 +221,8 @@ public class DeliveryNoteServiceImpl extends BaseServiceImpl<DeliveryNoteMapper,
 		advance.set("mtdsNo", "");
 		advance.set("warehouse_id", startWarehouseId);
 		advance.set("mctsTruck", StrUtil.replace(DateUtil.today(), "-", ""));
-		advance.set("orderSelfNum", vo.getBillCode());
+		// advance.set("orderSelfNum", vo.getBillCode());
+		advance.set("orderSelfNum", vo.getCustomizedBillCode());
 		advance.set("dealerName", vo.getShopName());
 		advance.set("dealerCode", "");
 		advance.set("storeName", vo.getShopName());
@@ -258,7 +260,8 @@ public class DeliveryNoteServiceImpl extends BaseServiceImpl<DeliveryNoteMapper,
 			// advance.set("firstPackCode", orderPackageDTO.getMaterialCode());
 			// 封装包件
 			JSONObject advanceDetailEntity = new JSONObject();
-			advanceDetailEntity.set("orderSelfNum", vo.getBillCode());
+			// advanceDetailEntity.set("orderSelfNum", vo.getBillCode());
+			advanceDetailEntity.set("orderSelfNum", vo.getCustomizedBillCode());
 			advanceDetailEntity.set("serviceNum", vo.getCustomizedBillCode());
 			advanceDetailEntity.set("type", BrandEnums.LINSY.getValue());
 			advanceDetailEntity.set("systemType", "线上");