diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionStockupStockListVO.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionStockupStockListVO.java index e22c85bb8..a0517a9de 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionStockupStockListVO.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionStockupStockListVO.java @@ -8,6 +8,8 @@ import java.io.Serializable; public class DistributionStockupStockListVO implements Serializable { private Long stockListId;//库存品id + private Long allocationId;//库存品id + private Long deliveryDetailsId; //自提库存品id diff --git a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/feign/IWarehouseTrayGoodsClient.java b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/feign/IWarehouseTrayGoodsClient.java index e198923cb..490c2ba9e 100644 --- a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/feign/IWarehouseTrayGoodsClient.java +++ b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/feign/IWarehouseTrayGoodsClient.java @@ -68,6 +68,6 @@ public interface IWarehouseTrayGoodsClient { * @param trayId */ @PostMapping(GETTRAYIDLIST) - List getTrayIdList(@RequestParam Long trayId); + List getTrayIdList(@RequestParam String trayId); } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionStockupAppController.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionStockupAppController.java index 061440c0d..dab35a38d 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionStockupAppController.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionStockupAppController.java @@ -61,6 +61,7 @@ import org.springframework.web.bind.annotation.*; import java.lang.reflect.Field; import java.util.*; +import java.util.stream.Collectors; /** * 备货信息表 app控制器 @@ -207,7 +208,13 @@ public class DistributionStockupAppController extends BladeController { map = convertObjectToMap(distributionStockupSelfVO); //客户订单 List list = distributionStockupService.selectStockupOrderList(stockupDTO); - map.put("orderList", list); + List collect = list.stream().filter(i -> { + if (ObjectUtils.isNotNull(i.getTrayId()) && !i.getPallet().contains(",") && !i.isCompleteStact() && ObjectUtils.isNotNull( i.getAllocationId()) ) { + i.setTrayLean(true); + } + return true; + }).collect(Collectors.toList()); + map.put("orderList", collect); } else { //查询备货区信息 DistributionStockupSelfVO distributionStockupSelfVO = distributionStockupService.selectStockupStockListDetails(reservationId); @@ -232,9 +239,9 @@ public class DistributionStockupAppController extends BladeController { for (DistributionStockupOrderListVO vo : list) { planNum = planNum + vo.getPlanNum(); scanNum = scanNum + vo.getScanNum(); - Boolean aBoolean = distributionStockupService.getClientStockupTray(reservationId, vo.getAllocationId()); +// Boolean aBoolean = distributionStockupService.getClientStockupTray(reservationId, vo.getAllocationId()); // Boolean aBoolean = distributionReservationPackageService.selectClientStockupState(reservationId, vo.getStockArticleId()); - vo.setTrayLean(aBoolean); +// vo.setTrayLean(aBoolean); } map.put("planNum", planNum); map.put("scanNum", scanNum); @@ -248,8 +255,8 @@ public class DistributionStockupAppController extends BladeController { for (DistributionStockupStockListVO vo : list) { planNum = planNum + vo.getPlanNum(); scanNum = scanNum + vo.getRealNum(); -// Boolean aBoolean = distributionStockupService.getClientStockupTray(reservationId, vo.getAllocationId()); -// vo.setTrayLean(aBoolean); + Boolean aBoolean = distributionStockupService.getClientStockupTray(reservationId, vo.getAllocationId()); + vo.setTrayLean(aBoolean); } map.put("planNum", planNum); map.put("scanNum", scanNum); @@ -276,7 +283,7 @@ public class DistributionStockupAppController extends BladeController { Integer orderStatus = stockupDTO.getOrderStatus();//1 客户订单 2库存品 Integer status = stockupDTO.getStatus();//0未完成 1已完成 Long allocationId = stockupDTO.getAllocationId(); //货位 - Long trayId = stockupDTO.getTrayId(); //托盘Id + Long trayId = Long.valueOf(stockupDTO.getTrayId()); //托盘Id if (ObjectUtils.isNull(stockupId)) { log.warn("##############orderInfo: 备货任务ID为空 allocation={}", stockupId); diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/app/StockupDTO.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/app/StockupDTO.java index 7bcd849a0..cd9a75da9 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/app/StockupDTO.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/app/StockupDTO.java @@ -51,7 +51,7 @@ public class StockupDTO implements Serializable { private String trayBarCode;//托盘码 private String typeService;//备货类型 private Integer stockPrint;//库存品扫码类型 1 原有包条 2打印处理的扫码 - private Long trayId;//货位ID + private String trayId;//货位ID private String stockupArea;//备货区 private Long stockupAreaId;//备货区ID private Long stockupId;//备货任务区Id diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupMapper.xml index 1eacd574a..1cc4c2655 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupMapper.xml @@ -258,22 +258,7 @@ LEFT JOIN logpm_distribution_stockup_info ldsi on ds.id = ldsi.stockup_id LEFT JOIN logpm_distribution_reservation_stocklist ldrs on ldrs.reservation_id = ldsi.reservation_id and ldrs.stock_list_status in (1,3) where ds.id = lds.id - ) inventoryNub, - ( - select COUNT(DISTINCT ldsk.id) - from logpm_distribution_stockup ds - LEFT JOIN logpm_distribution_stockup_info ldsi on ds.id = ldsi.stockup_id - LEFT JOIN logpm_distribution_reservation_package ldrp on ldrp.reservation_id = ldsi.reservation_id and ldrp.packet_bar_status in (1,3) - LEFT JOIN logpm_distribution_stock ldsk on ldsk.parcel_list_id = ldrp.parce_list_id and ldsk.stockup_id =ds.id - where ds.id = lds.id - )+( - select COUNT(DISTINCT ldsk.id) - from logpm_distribution_stockup ds - LEFT JOIN logpm_distribution_stockup_info ldsi on ds.id = ldsi.stockup_id - LEFT JOIN logpm_distribution_reservation_stocklist ldrs on ldrs.reservation_id = ldsi.reservation_id and ldrs.stock_list_status in (1,3) - LEFT JOIN logpm_distribution_stock ldsk on ldsk.stock_list_id = ldrs.stocklist_id and ldsk.stockup_id =ds.id - where ds.id = lds.id and ldsk.stockup_id = lds.id - ) realNum + ) inventoryNub from logpm_distribution_stockup lds LEFT JOIN logpm_distribution_stockup_info ldsi on lds.id = ldsi.stockup_id LEFT JOIN logpm_distribution_reservation_stockarticle ldrs on ldrs.reservation_id = ldsi.reservation_id @@ -322,21 +307,7 @@ select SUM(lddd.quantity) from logpm_distribution_delivery_details lddd where lddd.bill_lading_id = ldbs.bill_lading_id - ) inventoryNub, - ( - select COUNT(DISTINCT id) - from logpm_distribution_stock - where parcel_list_id in ( - select id - from logpm_distribution_parcel_list - where ldbs.stock_article_id = stock_article_id - ) and bill_lading_id = ldbs.bill_lading_id - )+( - select COUNT(DISTINCT lds.id) - from logpm_distribution_delivery_details lddd - LEFT JOIN logpm_distribution_stock lds on lddd.stock_list_id = lds.stock_list_id - where lds.bill_lading_id =ldbs.bill_lading_id - ) realNum + ) inventoryNub from logpm_distribution_stockup lds LEFT JOIN logpm_distribution_stockup_info ldsi on lds.id = ldsi.stockup_id and ldsi.stock_up_type = 3 LEFT JOIN logpm_distrilbution_bill_stock ldbs on ldbs.bill_lading_id = ldsi.reservation_id and ldbs.order_status in (1,2) diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillStockMapper.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillStockMapper.java index 90dbe85f5..8263b2d39 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillStockMapper.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillStockMapper.java @@ -64,4 +64,6 @@ public interface DistrilbutionBillStockMapper extends BaseMapper selectDistrilbutionBillPackWuSelf(@Param("reservationId")Long reservationId,@Param("stockupId") Long stockupId); List selectDistrilbutionBillOverPackWuSelf(@Param("param")StockupDTO stockupDTO); + + List listPackageSelf(@Param("reservationId")Long reservationId); } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillStockMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillStockMapper.xml index e4b93878f..000c8f084 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillStockMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillStockMapper.xml @@ -5,7 +5,13 @@ +