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

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java

@@ -3322,6 +3322,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 							if (flag){
 								throw new RuntimeException(s.getOrderCode()+"正在操作,请刷新后尝试");
 							}else {
+								packageLockIds.addAll(a);
 								bladeRedis.setEx("warehouseId:" + myCurrentWarehouse.getId() + "orderCode:" + s.getOrderCode(),packageLockIds,5*60L);
 							}
 						}

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationServiceImpl.java

@@ -1801,6 +1801,7 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 						//当前操作包件存在于缓存中，此次操作无效
 						throw new RuntimeException(v.get(0).getOrderCode()+"正在操作,请刷新后尝试");
 					}else {
+						packageLockIds.addAll(a);
 						bladeRedis.setEx("warehouseId:" + myCurrentWarehouse.getId() + "orderCode:" + v.get(0).getOrderCode(),packageLockIds,5*60L);
 					}
 				}

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

@@ -77,6 +77,7 @@ public class ZbomNodeDataPushListener {
 				}
 			}
 		}
+
 		// 构建参数对象
 		List<NodeConfirmParamDTO> nodeConfirmParams = initParam(msgEntries, packageCodeList);
 		try {
@@ -107,8 +108,12 @@ public class ZbomNodeDataPushListener {
 									.build();
 								// 推送成功
 								nodePushService.save(pushEntity);
-								// 修改订单包件表的签收状态
-								orderPackageService.updateSignForStatus(packageCodeList);
+								String node = msgEntries.getStr("node");
+								NodeEnums nodeEnums = EnumUtil.fromString(NodeEnums.class, node);
+								if (ObjectUtil.equal(nodeEnums, NodeEnums.CLERK_REVIEW)) {
+									// 修改订单包件表的签收状态
+									orderPackageService.updateSignForStatus(packageCodeList);
+								}
 							}
 						}
 					}
@@ -145,7 +150,7 @@ public class ZbomNodeDataPushListener {
 					order.setAddress(entries.getStr("address"));
 					// 如果是签收节点，需要判断是否为全部签收和部分签收
 					if (EnumUtil.equals(NodeEnums.CLERK_REVIEW, node)) {
-						Integer signNumber = Convert.toInt(order.getRejectQty());
+						Integer signNumber = Convert.toInt(order.getSignQty());
 						// 查询当前未签收的数量与当前签收数量比较，如果未签收数较大，则是部分签收
 						String key = order.getDepartCode() + order.getPlatformOrderCode();
 						// 部分签收
@@ -159,6 +164,7 @@ public class ZbomNodeDataPushListener {
 						}
 					} else {
 						order.setRejectQty("");
+						order.setSignQty("");
 						order.setNode(ZbomNodeMappingEnums.getZbomByNodeAndStatus(nodeEnums).getCode());
 					}
 				}