diff --git a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/PackageListVO.java b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/PackageListVO.java index 9810b9ada..1775340d6 100644 --- a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/PackageListVO.java +++ b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/PackageListVO.java @@ -7,6 +7,7 @@ import java.io.Serializable; @Data public class PackageListVO implements Serializable { + private Long packageId; private String orderPackageCode; private String waybillNo; private String orderCode; diff --git a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/WarehouseUpdownGoodsVO.java b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/WarehouseUpdownGoodsVO.java index 3c473d9c0..89a19a80b 100644 --- a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/WarehouseUpdownGoodsVO.java +++ b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/WarehouseUpdownGoodsVO.java @@ -14,4 +14,7 @@ public class WarehouseUpdownGoodsVO extends WarehouseUpdownGoodsEntity { private String warehouseName; private String materialName; + private String trayCode; + private String trayName; + } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionSignforAppController.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionSignforAppController.java index 1155ba236..940389b4c 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionSignforAppController.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionSignforAppController.java @@ -146,9 +146,15 @@ public class DistributionSignforAppController { try{ BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse(); List packageCodes = (List) r.getData(); + String orderPackageCodes = null; for (String packageCode : packageCodes) { - updownTypeClient.downPackageOrDelTray(packageCode,myCurrentWarehouse.getId()); + if(StringUtils.isBlank(orderPackageCodes)){ + orderPackageCodes = packageCode; + }else{ + orderPackageCodes = orderPackageCodes + "," + packageCode; + } } + updownTypeClient.downPackageOrDelTray(orderPackageCodes,myCurrentWarehouse.getId()); }catch (Exception e){ log.error("#############signfor: 下架失败"); } @@ -226,21 +232,20 @@ public class DistributionSignforAppController { public R oneclick(@Valid @RequestBody DistributionSignforDTO distributionSignfor) { distributionSignfor.setIsClerk(false); R r = distributionSignforService.oneclick(distributionSignfor); - + List packageCodes = (List)r.getData(); try{ - List packageIds = (List)r.getData(); String orderPackageCodes = null; - for (Long packageId : packageIds) { + for (String packageCode : packageCodes) { if(StringUtils.isBlank(orderPackageCodes)){ - orderPackageCodes = packageId+""; + orderPackageCodes = packageCode+""; }else{ - orderPackageCodes = orderPackageCodes + "," +packageId; + orderPackageCodes = orderPackageCodes + "," +packageCode; } } BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse(); updownTypeClient.downPackageOrDelTray(orderPackageCodes,myCurrentWarehouse.getId()); }catch (Exception e){ - log.error("##############oneclick: 更新包件下架状态失败"); + log.error("##############oneclick: 更新包件下架状态失败 packageCodes=()",packageCodes); } return r; } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionSignforController.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionSignforController.java index 2ee093eb0..2307ffa3f 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionSignforController.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionSignforController.java @@ -269,20 +269,20 @@ public class DistributionSignforController extends BladeController { public R oneclick(@Valid @RequestBody DistributionSignforDTO distributionSignfor) { distributionSignfor.setIsClerk(true); R r = distributionSignforService.oneclick(distributionSignfor); - List packageIds = (List)r.getData(); + List packageCodes = (List)r.getData(); try{ String orderPackageCodes = null; - for (Long packageId : packageIds) { + for (String packageCode : packageCodes) { if(StringUtils.isBlank(orderPackageCodes)){ - orderPackageCodes = packageId+""; + orderPackageCodes = packageCode+""; }else{ - orderPackageCodes = orderPackageCodes + "," +packageId; + orderPackageCodes = orderPackageCodes + "," +packageCode; } } BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse(); updownTypeClient.downPackageOrDelTray(orderPackageCodes,myCurrentWarehouse.getId()); }catch (Exception e){ - log.error("##############oneclick: 更新包件下架状态失败 packageIds={}",packageIds); + log.error("##############oneclick: 更新包件下架状态失败 packageCodes={}",packageCodes); } return r; } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java index a2eb7bc50..1c36dd164 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java @@ -1790,7 +1790,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl packageIds = updatePackageList.stream().map(DistributionParcelListEntity::getId).collect(Collectors.toList()); diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java index 5a06377f7..f513e96fb 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java @@ -2514,6 +2514,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl packageIds = new ArrayList<>(); + List packageCodes = new ArrayList<>(); List orderCodes = new ArrayList<>(); log.info(">>>>>>>>>>> tag {}",8); if (Func.isNotEmpty(parcelListEntityList)) { @@ -2607,6 +2608,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl - select lwug.association_value orderPackageCode, + select ldpl.id packageId, + lwug.association_value orderPackageCode, ldpl.waybill_number waybillNo, ldpl.order_code orderCode, ldpl.warehouse warehouseName, diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownTypeServiceImpl.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownTypeServiceImpl.java index 856fff21b..4fd061586 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownTypeServiceImpl.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownTypeServiceImpl.java @@ -1202,9 +1202,16 @@ public class WarehouseUpdownTypeServiceImpl extends BaseServiceImpl