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

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockListMapper.xml

@@ -393,7 +393,7 @@
         ldsi.description_goods descriptionGoods
         FROM
         logpm_distribution_stock_list ldsi
-        LEFT JOIN logpm_warehouse_updown_goods lwug ON ldsi.material_id = lwug.association_id
+        LEFT JOIN logpm_warehouse_updown_goods lwug ON ldsi.material_id = lwug.association_id AND lwug.incoming_batch = ldsi.incoming_batch
         LEFT JOIN logpm_warehouse_goods_allocation AS lwga ON lwug.allocation_id = lwga.id
         AND ldsi.incoming_batch = lwug.incoming_batch
         AND ldsi.market_id = lwug.market_id

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

@@ -8860,7 +8860,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 					warehouseUpdownTypeClient.downPackageOrDelTray(parcelListEntity.getOrderPackageCode(), myCurrentWarehouse.getId(), "扫描装车进行下架、解托");
 				}
 				//检查是否存在有装车异常,进行处理
-
+				distributionSignforService.maintenanceSignfor(reservationId);
 				String content = "包件在" + myCurrentWarehouse.getName() + "由" + loadscanEntity.getScanUser() + "扫描装车,配送车次号:" + deliveryListEntity.getTrainNumber() + "预约任务号:" + reservationEntity.getReservationCode();
 				JSONObject packageLog = handleLogJSONObject(myCurrentWarehouse, AuthUtil.getUser(), parcelListEntity.getOrderPackageCode(), content, WorkNodeEnums.DISTRIBUTION_LOADING.getCode());
 				packageLogs.add(packageLog);
@@ -9026,6 +9026,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 					} else {
 						log.error("#######################查询预约订单信息错误,reservationID:{}", distrilbutionloadingscanDTO.getReservationId());
 					}
+					distributionSignforService.maintenanceSignfor(distrilbutionloadingscanDTO.getReservationId());
 				}
 				break;
 			case 3:
@@ -9111,9 +9112,8 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 				distributionReservationService.maintenanceReservationInfo(distrilbutionloadingscanDTO.getReservationId());
 				//维护配送装车状态
 				distributionDeliveryListService.maintenanceDeliveryInfo(distrilbutionloadingscanDTO.getDeliveryId());
-				//维护异常信息
-				distributionSignforService.maintenanceSignfor(reservationId);
 				//备货库位下架
+				distributionSignforService.maintenanceSignfor(distrilbutionloadingscanDTO.getReservationId());
 				JSONObject inventoryJsonObject = new JSONObject();
 				inventoryJsonObject.put("code", distributionLoadscaninvnEntity.getOrderPackageCode());
 				inventoryJsonObject.put("warehouseId", myCurrentWarehouse.getId());
@@ -9279,6 +9279,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 			String s = orderCodes.stream().collect(Collectors.joining(","));
 			distributionStockArticleService.maintenanceOrderInfo(s, myCurrentWarehouse.getId());
 		}
+		//维护异常信息
 		warehouseUpdownStockUpAreaClient.downStockUpShelf(jsonObjects);
 		trunklinePackageTrackLogClient.addPackageTrackLog(packageLogs);
 		Integer carLaodNum = getCarLaodNum(distrilbutionloadingscanDTO.getDeliveryId());