Merge branch 'dev' into pre-production

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

@@ -254,7 +254,7 @@ public class DeliveryNoteServiceImpl extends BaseServiceImpl<DeliveryNoteMapper,
 		JSONArray packageList = new JSONArray();
 		for (PackageInfoVO orderPackageDTO : packages) {
 			advance.set("firstPackName", orderPackageDTO.getMaterialName());
-			advance.set("firstPackCode", orderPackageDTO.getMaterialCode());
+			// advance.set("firstPackCode", orderPackageDTO.getMaterialCode());
 			// 封装包件
 			JSONObject advanceDetailEntity = new JSONObject();
 			advanceDetailEntity.set("orderSelfNum", vo.getBillCode());
@@ -266,9 +266,9 @@ public class DeliveryNoteServiceImpl extends BaseServiceImpl<DeliveryNoteMapper,
 			advanceDetailEntity.set("secondPackName", orderPackageDTO.getMaterialName());
 			// 三级品类名称
 			advanceDetailEntity.set("thirdPackName", orderPackageDTO.getMaterialName());
-			advanceDetailEntity.set("firstPackCode", orderPackageDTO.getMaterialCode());
-			advanceDetailEntity.set("secondPackCode", orderPackageDTO.getMaterialCode());
-			advanceDetailEntity.set("thirdPackCode", orderPackageDTO.getMaterialCode());
+			// advanceDetailEntity.set("firstPackCode", orderPackageDTO.getMaterialCode());
+			// advanceDetailEntity.set("secondPackCode", orderPackageDTO.getMaterialCode());
+			// advanceDetailEntity.set("thirdPackCode", orderPackageDTO.getMaterialCode());
 			advanceDetailEntity.set("siteName", vo.getSupplierName());
 			advanceDetailEntity.set("unitNo", orderPackageDTO.getBarcode());
 			advanceDetailEntity.set("mctsTruck", StrUtil.replace(DateUtil.today(), "-", ""));