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

@@ -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;
@@ -244,7 +245,7 @@ public class DeliveryNoteServiceImpl extends BaseServiceImpl<DeliveryNoteMapper,
 		advance.set("senderMobile", vo.getSenderTelephone());
 		advance.set("senderAddress", vo.getSenderDetailAddress());
 
-		List<JSONObject> packageList = new ArrayList<>();
+		JSONArray packageList = new JSONArray();
 		for (PackageInfoVO orderPackageDTO : packages) {
 			advance.set("firstPackName", orderPackageDTO.getMaterialName());
 			advance.set("firstPackCode", orderPackageDTO.getMaterialCode());
@@ -296,7 +297,7 @@ public class DeliveryNoteServiceImpl extends BaseServiceImpl<DeliveryNoteMapper,
 			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)) {
+				for (NodeConfirmParamDTO nodeConfirmParam : nodeConfirmLsit) {
+					log.info("zb节点数据推送NodeConfirmParamDTO：{}", JSONUtil.toJsonStr(nodeConfirmParam));
+					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

@@ -122,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,
@@ -138,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>
@@ -171,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,
@@ -189,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}