Merge remote-tracking branch 'origin/dev' into dev

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

@@ -5,6 +5,7 @@ import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.http.HttpUtil;
+import cn.hutool.json.JSONArray;
 import cn.hutool.json.JSONObject;
 import cn.hutool.json.JSONUtil;
 import com.logpm.factorydata.base.feign.IFactoryDataBaseClient;
@@ -243,8 +244,10 @@ public class DeliveryNoteServiceImpl extends BaseServiceImpl<DeliveryNoteMapper,
 		advance.set("senderName", vo.getSenderName());
 		advance.set("senderMobile", vo.getSenderTelephone());
 		advance.set("senderAddress", vo.getSenderDetailAddress());
+		advance.set("create_time", DateUtil.now());
+		advance.set("update_time", DateUtil.now());
 
-		List<JSONObject> packageList = new ArrayList<>();
+		JSONArray packageList = new JSONArray();
 		for (PackageInfoVO orderPackageDTO : packages) {
 			advance.set("firstPackName", orderPackageDTO.getMaterialName());
 			advance.set("firstPackCode", orderPackageDTO.getMaterialCode());
@@ -277,7 +280,7 @@ public class DeliveryNoteServiceImpl extends BaseServiceImpl<DeliveryNoteMapper,
 			advanceDetailEntity.set("isSuppin", "N");
 			advanceDetailEntity.set("productCode", "");
 			advanceDetailEntity.set("goodName", "");
-			advanceDetailEntity.set("admin", "");
+			// advanceDetailEntity.set("admin", "");
 			advanceDetailEntity.set("siteCode", "");
 			advanceDetailEntity.set("area", "");
 			advanceDetailEntity.set("date2", "");
@@ -293,10 +296,12 @@ public class DeliveryNoteServiceImpl extends BaseServiceImpl<DeliveryNoteMapper,
 			advanceDetailEntity.set("is_opai", 0);
 			advanceDetailEntity.set("administrators_id", 1126);
 			advanceDetailEntity.set("date100", new Date());
+			advanceDetailEntity.set("create_time", DateUtil.now());
+			advanceDetailEntity.set("update_time", DateUtil.now());
 			JSONObject entries = JSONUtil.parseObj(advanceDetailEntity);
 			packageList.add(entries);
 		}
-		advance.set("details", JSONUtil.toJsonStr(packageList));
+		advance.set("details", packageList);
 		if (ObjectUtil.isAllNotEmpty(linsyProperties.getOldSystemHost(), linsyProperties.getOldSystemAdvanceUrl())) {
 			log.info("推送老系统暂存单：{}", JSONUtil.toJsonStr(advance));
 			String post = HttpUtil.post(linsyProperties.getOldSystemHost() + linsyProperties.getOldSystemAdvanceUrl(), JSONUtil.toJsonStr(advance));

blade-service/logpm-factory-data/logpm-factory-data-zbom/src/main/java/com/logpm/factorydata/zbom/mq/ZbomNodeDataPushListener.java

@@ -131,7 +131,7 @@ public class ZbomNodeDataPushListener {
 							.eq(ZbFactoryNodePushEntity::getDepartCode, value.getDepartCode())
 						);
 						// 已经推送过了就不再推了
-						if(CollUtil.isNotEmpty(list)){
+						if (CollUtil.isNotEmpty(list)) {
 							return;
 						}
 					}
@@ -156,10 +156,11 @@ public class ZbomNodeDataPushListener {
 			Map<String, SendMsg> sendMsgMap = new HashMap<>();
 			// 构建提交参数
 			buildParam(entries, node, workNodeEnums, orders, noSignNumberMap, nodeOrderMap, nodeConfirmLsit, sendMsgMap);
-			try {
+			if (CollUtil.isNotEmpty(nodeConfirmLsit)) {
-				// 推送给志邦
+				for (NodeConfirmParamDTO nodeConfirmParam : nodeConfirmLsit) {
-				if (CollUtil.isNotEmpty(nodeConfirmLsit)) {
+					log.info("zb节点数据推送NodeConfirmParamDTO：{}", JSONUtil.toJsonStr(nodeConfirmParam));
-					for (NodeConfirmParamDTO nodeConfirmParam : nodeConfirmLsit) {
+					try {
+						// 推送给志邦
 						String key = nodeConfirmParam.getDepartCode() + nodeConfirmParam.getPlatformOrderCode();
 						String body = JSONUtil.toJsonStr(nodeConfirmParam);
 						String result = null;
@@ -224,14 +225,14 @@ public class ZbomNodeDataPushListener {
 								}
 							}
 						}
+					} catch (Exception e) {
+						// 处理推送不成功的异常情况
+						log.error("zb节点推送数据异常：{}", e);
+						// 保存日志
+
+						e.printStackTrace();
 					}
 				}
-			} catch (Exception e) {
-				// 处理推送不成功的异常情况
-				log.error("zb节点推送数据异常：{}", e);
-				// 保存日志
-
-				e.printStackTrace();
 			}
 		}
 	}

blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/mapper/AdvanceDetailMapper.xml

@@ -97,9 +97,6 @@
     <select id="getByUnitNo" resultType="com.logpm.oldproject.vo.DistributionParcelListEntityVO">
         select w.title warehouse,
                od.unitNo packetBarCode,
-               c.title cargoTitle,
-               s.title shelfTitle,
-               l.title goodsAllocation,
                ad.firstPackName firsts,
                ad.secondPackName `second`,
                ad.thirdPackName thirdProduct,
@@ -115,9 +112,6 @@
         from ht_order_detail od
             left join ht_advance_detail ad on ad.unitNo = od.unitNo and ad.delete_time = 0
             left join ht_warehouse w on w.id = od.now_warehouse_id
-            left join ht_location l on od.location_id = l.id
-            left join ht_shelf s on l.shelf_id = s.id
-            left join ht_cargo c on s.cargo_id = c.id
             left join (select unit_no,productcode,productname from ht_detail_product where unit_no= #{unitNo} limit 1) t on t.unit_no = ad.unitNo
         where od.unitNo = #{unitNo}
           and od.delete_time = 0
@@ -128,9 +122,6 @@
     <select id="getByUnitNoByPyl" resultType="com.logpm.oldproject.vo.DistributionParcelListEntityVO">
         select w.title warehouse,
                od.unitNo packetBarCode,
-               c.title cargoTitle,
-               s.title shelfTitle,
-               l.title goodsAllocation,
                ad.firstPackName firsts,
                ad.secondPackName `second`,
                ad.thirdPackName thirdProduct,
@@ -144,9 +135,6 @@
         from ht_order_detail od
                  left join ht_advance_detail ad on ad.unitNo = od.unitNo
                  left join ht_warehouse w on w.id = od.now_warehouse_id
-                 left join ht_location l on od.location_id = l.id
-                 left join ht_shelf s on l.shelf_id = s.id
-                 left join ht_cargo c on s.cargo_id = c.id
         where od.unitNo = #{unitNo}
 
     </select>
@@ -177,9 +165,6 @@
     <select id="getByUnitNoAndWarehouseId" resultType="com.logpm.oldproject.vo.DistributionParcelListEntityVO">
         select w.title warehouse,
                od.unitNo packetBarCode,
-               c.title cargoTitle,
-               s.title shelfTitle,
-               l.title goodsAllocation,
                ad.firstPackName firsts,
                ad.secondPackName `second`,
                ad.thirdPackName thirdProduct,
@@ -195,9 +180,6 @@
         from ht_order_detail od
             left join ht_advance_detail ad on ad.unitNo = od.unitNo
             left join ht_warehouse w on w.id = od.now_warehouse_id
-            left join ht_location l on od.location_id = l.id
-            left join ht_shelf s on l.shelf_id = s.id
-            left join ht_cargo c on s.cargo_id = c.id
             left join ht_detail_product hdp on hdp.unit_no = od.unitNo
         where od.unitNo = #{unitNo}
         and od.now_warehouse_id = #{oldWarehouseId}

blade-service/logpm-patch/src/main/java/com/logpm/patch/jobhandle/SyncWarehouseData.java

@@ -636,13 +636,13 @@ public class SyncWarehouseData {
 			}
 		});
 
-		delTrayAndAllocationPackageMap.keySet().forEach(warehouseId -> {
+//		delTrayAndAllocationPackageMap.keySet().forEach(warehouseId -> {
-			List<String> list = delTrayAndAllocationPackageMap.get(warehouseId);
+//			List<String> list = delTrayAndAllocationPackageMap.get(warehouseId);
-			if(!list.isEmpty()){
+//			if(!list.isEmpty()){
-				Set<String> orderPackageCodes = new HashSet<>(list);
+//				Set<String> orderPackageCodes = new HashSet<>(list);
-				warehouseUpdownTypeClient.downPackageOrDelTray(StringUtil.join(orderPackageCodes,","),warehouseId,"系统因为签收或者出库下架解托");
+//				warehouseUpdownTypeClient.downPackageOrDelTray(StringUtil.join(orderPackageCodes,","),warehouseId,"系统因为签收或者出库下架解托");
-			}
+//			}
-		});
+//		});
 
 
 		log.info("############syncAllTrayAndAllocation: 处理所有包件零担库存品的托盘库位信息 结束");

blade-service/logpm-patch/src/main/java/com/logpm/patch/mapper/WarehouseMappingDataMapper.xml

@@ -363,7 +363,7 @@
 
     <select id="findZeroTraysInfo" resultType="com.logpm.patch.vo.ZeroTrayInfoVO">
         select lwtg.association_value orderCode,
-               ldpl.warehouse_id warehouseId,
+               lwtg.warehouse_id warehouseId,
                lwt.pallet_name trayName
         from logpm_warehouse_tray_goods lwtg
         left join logpm_warehouse_tray lwt on lwt.id = lwtg.tray_id
@@ -378,6 +378,7 @@
         left join logpm_warehouse_tray lwt on lwt.id = lwtg.tray_id
         left join logpm_distribution_stock_list ldsl on ldsl.cargo_number = lwtg.association_value and ldsl.warehouse_id = lwtg.warehouse_id and ldsl.market_id = lwtg.market_id and ldsl.incoming_batch = lwtg.incoming_batch
         where lwtg.association_type = '4'
+        and ldsl.id is not null
     </select>
 
     <select id="findPackageAllocationData" resultType="com.logpm.patch.vo.PackageAllocationInfoVO">
@@ -387,7 +388,7 @@
                lwga.qr_code allocationName,
                ldpl.order_package_status orderPackageStatus
         from logpm_warehouse_updown_goods lwug
-         left join logpm_distribution_parcel_list ldpl on ldpl.order_package_code = lwtg.association_value and ldpl.warehouse_id = lwtg.warehouse_id
+         left join logpm_distribution_parcel_list ldpl on ldpl.order_package_code = lwug.association_value and ldpl.warehouse_id = lwug.warehouse_id
          left join logpm_warehouse_goods_allocation lwga on lwga.id = lwug.allocation_id
         where lwug.association_type = '3'
     </select>
@@ -409,6 +410,7 @@
          left join logpm_warehouse_goods_allocation lwga on lwga.id = lwug.allocation_id
          left join logpm_distribution_stock_list ldsl on ldsl.cargo_number = lwug.association_value and ldsl.warehouse_id = lwug.warehouse_id and ldsl.market_id = lwug.market_id and ldsl.incoming_batch = lwug.incoming_batch
         where lwug.association_type = '4'
+          and ldsl.id is not null
     </select>
 
 </mapper>