托盘装车维护字段

blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/app/DistributionAppReservationVO.java

@@ -100,6 +100,11 @@ public class DistributionAppReservationVO extends DistributionReservationEntity
 	 */
 	@ApiModelProperty(value = "托盘码")
 	private String trayCode;
+	/**
+	 * 托盘名称
+	 */
+	@ApiModelProperty(value = "托盘码")
+	private String trayName;
 
 	/**
 	 * 货物名称

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

@@ -320,7 +320,7 @@
         ldsl.id,
         ldrs.id as deliveryDetailsId,
         ldsl.cargo_unit as cargoUnit,
-        SUM(ldrs.reservation_num) AS reservationNum
+        ldrs.reservation_num AS reservationNum
         FROM
         logpm_distribution_reservation_stocklist ldrs
         LEFT JOIN logpm_distribution_stock_list ldsl ON ldrs.stocklist_id = ldsl.id

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

@@ -5004,6 +5004,8 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 			}
 			TrayTypeDataVO trayTypeDataVO = warehouseTrayTypeClient.selectListByTrayCode(c.getTrayCode());
 			if (Func.isNotEmpty(trayTypeDataVO)) {
+				String trayName = trayTypeDataVO.getTrayName();
+				c.setTrayname(trayName);
 				List<WarehouseTrayGoodsEntity> goodsLsit = trayTypeDataVO.getGoodsLsit();
 				if (Func.isNotEmpty(goodsLsit)) {
 					List<Long> longs = goodsLsit.stream().map(WarehouseTrayGoodsEntity::getAssociationId).collect(Collectors.toList());

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

@@ -486,7 +486,8 @@ public class DistributionParcelListServiceImpl extends BaseServiceImpl<Distribut
 				}
 				if(stockArticleEntity1.getTotalNumber().equals(list1.size())){
 					//修改订单状态
-					DistributionStockArticleEntity stockArticleEntity = new DistributionStockArticleEntity();
+					DistributionStockArticleEntity stockArticleEntity = distributionStockArticleMapper.selectById(oo);
+
 					//修改
 					stockArticleEntity.setId(oo);
 					stockArticleEntity.setGenre(2);
@@ -500,7 +501,7 @@ public class DistributionParcelListServiceImpl extends BaseServiceImpl<Distribut
 				);
 				if(!distributionParcelListEntities.isEmpty() && stockArticleEntity1.getTotalNumber().equals(distributionParcelListEntities.size())){
 					//修改订单状态
-					DistributionStockArticleEntity stockArticleEntity = new DistributionStockArticleEntity();
+					DistributionStockArticleEntity stockArticleEntity = distributionStockArticleMapper.selectById(oo);
 					//修改
 						stockArticleEntity.setId(oo);
 						stockArticleEntity.setGenre(2);

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

@@ -1179,7 +1179,6 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 
 			//商，市
 			List<DistributionStockupStockListVO> list = distributionReservationService.selectStockupStockList(reservationId);
-
 			for (int i = 0; i < list.size(); i++) {
 				DistributionStockupStockListVO distributionStockupStockListVO = list.get(i);
 				if (distributionStockupStockListVO.getPlanNum().equals(distributionStockupStockListVO.getRealNum())) {