备货状态BUG修复

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/feign/BasicdataTrayClient.java

@@ -80,7 +80,7 @@ public class BasicdataTrayClient implements IBasicdataTrayClient {
 		updateWrapper.set("tray_status",trayStatus)
 			.eq("id",trayId)
 			.eq("is_deleted",0);
-		basicdataTrayService.update(updateWrapper);
+		basicdataTrayService.update(updateWrapper );
 	}
 
 

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

@@ -776,12 +776,13 @@
         ldpl.material_name materialName,
         ldpl.order_package_status orderPackageStatus,
         lwug.position_code goodsAllocation,
-        lwtg.tray_code pallet
+        lwt.pallet_name pallet
         FROM
         logpm_distribution_parcel_list ldpl
         JOIN logpm_distribution_stock_article ldsa ON ldpl.stock_article_id = ldsa.id
         LEFT JOIN logpm_warehouse_updown_goods lwug ON lwug.association_id = ldpl.id
         left join logpm_warehouse_tray_goods lwtg on lwtg.association_id = ldpl.id
+        left join logpm_warehouse_tray lwt on lwtg.tray_id = lwt.id
         <where>
             ldsa.is_deleted = 0
             AND ldpl.conditions =1
@@ -831,7 +832,7 @@
         ldpl.material_name AS descriptionGoods,
         ldpl.order_package_status AS orderPackageStatus,
         ldpl.conditions,
-        lwtg.tray_code AS trayCode,
+        lwtg.pallet_name AS trayCode,
         lwug.position_code AS positionCode ,
         ldsa.mall_name as marketName
         from
@@ -840,6 +841,7 @@
         LEFT JOIN logpm_warehouse_updown_goods lwug ON ldpl.id = lwug.association_id
 
         LEFT JOIN logpm_warehouse_tray_goods lwtg ON lwtg.association_id = ldpl.id
+        LEFT JOIN logpm_warehouse_tray lwt ON lwtg.tray_id = lwt.id
         <where>
             ldpl.stock_article_id = #{id} and ldpl.conditions =2
             <if test="collect != null and @org.apache.commons.collections4.CollectionUtils@isNotEmpty(collect)">

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

@@ -866,7 +866,7 @@
         from  logpm_distribution_reservation_package ldrp
         LEFT JOIN logpm_warehouse_updown_goods lwug on lwug.association_id = ldrp.parce_list_id
         where  ldrp.reservation_id = ldsi.reservation_id
-        )  goodsAllocation,ldr.stock_status stockStatus,
+        )  goodsAllocation,ldr.stockup_status stockStatus,
         ldr.reservation_num reservationNum,
         ldr.reservation_stock_list_num reservationStockListNum
         from logpm_distribution_reservation ldr

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

@@ -1712,7 +1712,7 @@ public class DistributionAsyncServiceImpl implements IDistributionAsyncService {
 			int i = billLadingEntity.getStockOrderQuantity() + billLadingEntity.getReserveQuantity() + 1;
 			if (i >= z) {
 				//备货完成
-				billLadingEntity1.setStockStatus("3");
+				billLadingEntity1.setStockStatus(ReservationStockupStatusConstant.yibeihuo.getValue());
 				billLadingEntity1.setEndTimeStocking(new Date());
 
 				DistributionStockupInfoEntity stockupInfoEntity = new DistributionStockupInfoEntity();
@@ -1759,7 +1759,7 @@ public class DistributionAsyncServiceImpl implements IDistributionAsyncService {
 			int i = distributionReservationEntity.getReservationNum() + distributionReservationEntity.getReservationStockListNum();//预约数量
 			int i1 = distributionReservationEntity.getStockOrderQuantity() + distributionReservationEntity.getReserveQuantity() + 1;//备货数量
 			if (i1 >= i) {
-				reservationEntity.setStockStatus("3");
+				reservationEntity.setStockStatus("4");
 				reservationEntity.setEndTimeStocking(new Date());
 				DistributionStockupInfoEntity stockupInfoEntity = new DistributionStockupInfoEntity();
 				stockupInfoEntity.setId(distributionStockupInfoEntity.getId());

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

@@ -1662,13 +1662,13 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 
 			if(ObjectUtils.isNotNull(i.getStockStatus())){
 				switch (i.getStockStatus()){
-					case "1":
+					case "10":
 						i.setStockStatusName("待备货");
 						break;
-					case "2":
+					case "20":
 						i.setStockStatusName("备货中");
 						break;
-					case "3":
+					case "30":
 						i.setStockStatusName("已备货");
 						break;
 				}