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

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

@@ -5975,8 +5975,6 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 						}
 						loadscanEntity.setIsZero(1);
 						distributionLoadscanService.save(loadscanEntity);
-						distributionLoadscanEntityLists.add(loadscanEntity);
-
 						distributionLoadscanEntityLists.add(loadscanEntity);
 						num = loadscanEntity.getLoadedNub();
 
@@ -6447,6 +6445,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 				packageData.setPackageType(PackageTypeEnums.INV);
 			}
 			packageData.setNumber(1);
+			data.add(packageData);
 		}
 		distributionLoadVO.setPackageDataList(data);
 		nodeFanoutMsg.setMain(distributionLoadVO);

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

@@ -5057,6 +5057,11 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 		R r = warehouseUpdownTypeClient.downStock(list);
 		//查询当前库位最早入库的库存品
 		distributionStockService.save(distributionStockEntity);
+		// 备货作业节点
+		NodeFanoutMsg<StockUpVO> nodeFanoutMsg = buildStockUpNodeDataByStock(stockupEntity, distributionStockEntity);
+		if (ObjectUtils.isNotNull(nodeFanoutMsg)) {
+			distributionNodeWorkService.planStock(nodeFanoutMsg, AuthUtil.getUser());
+		}
 		//对码值进行使用状态标记
 		one.setCodeStatus("1");
 		disStockOrdercodeRecoService.updateById(one);
@@ -5205,6 +5210,7 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 				DisStockListDetailEntity disStockListDetailEntity = getDisStockListDetailEntity(inventoryPackageList, parcelListEntity, distributionStockListEntity.getId());
 				distributionStockEntity.setParcelListId(disStockListDetailEntity.getId());
 				disStockListDetailService.updateById(disStockListDetailEntity);
+
 				//对原库存品进行冻结数的扣减
 				distributionStockListMapper.decreaseStockListQuantityOccupied(stockListId, num);
 				//对新增库存品进行冻结数量增加
@@ -5230,7 +5236,13 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 		if (!logList.isEmpty()) {
 			trunklinePackageTrackLogClient.addPackageTrackLog(logList);
 		}
+
 		distributionStockService.save(distributionStockEntity);
+		// 备货作业节点
+		NodeFanoutMsg<StockUpVO> nodeFanoutMsg = buildStockUpNodeDataByStock(stockupEntity, distributionStockEntity);
+		if (ObjectUtils.isNotNull(nodeFanoutMsg)) {
+			distributionNodeWorkService.planStock(nodeFanoutMsg, AuthUtil.getUser());
+		}
 		return Resp.scanSuccess(PdaAudioLingoStatus.saomiaochenggong.getName(), "");
 	}
 
@@ -6364,6 +6376,11 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 		R r = warehouseUpdownTypeClient.downStock(list);
 		//查询当前库位最早入库的库存品
 		distributionStockService.save(distributionStockEntity);
+		// 备货作业节点
+		NodeFanoutMsg<StockUpVO> nodeFanoutMsg = buildStockUpNodeDataByStock(stockupEntity, distributionStockEntity);
+		if (ObjectUtils.isNotNull(nodeFanoutMsg)) {
+			distributionNodeWorkService.planStock(nodeFanoutMsg, AuthUtil.getUser());
+		}
 		//对码值进行使用状态标记
 		one.setCodeStatus("1");
 		disStockOrdercodeRecoService.updateById(one);
@@ -6518,6 +6535,11 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 		//进行下架
 		warehouseUpdownTypeClient.downPackage(parcelListEntity.getOrderPackageCode(), myCurrentWarehouse.getId(), "备货包件下架");
 		distributionStockService.save(distributionStockEntity);
+		// 备货作业节点
+		NodeFanoutMsg<StockUpVO> nodeFanoutMsg = buildStockUpNodeDataByStock(stockupEntity, distributionStockEntity);
+		if (ObjectUtils.isNotNull(nodeFanoutMsg)) {
+			distributionNodeWorkService.planStock(nodeFanoutMsg, AuthUtil.getUser());
+		}
 		return Resp.scanSuccess(PdaAudioLingoStatus.saomiaochenggong.getName(), "");
 
 	}