From 502005d7ad70c92b5b3b2e6d61e653c01de297f5 Mon Sep 17 00:00:00 2001 From: PigBaoBei <2739175034@qq.com> Date: Mon, 15 Apr 2024 14:36:38 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E6=90=9C=E7=B4=A2?= =?UTF-8?q?=E5=BD=95=E5=85=A5=E9=BB=98=E8=AE=A4=E8=AE=A1=E5=88=92=E6=95=B0?= =?UTF-8?q?=E3=80=81=E8=87=AA=E6=8F=90=E9=A1=B5=E9=9D=A2=E5=8F=96=E6=B6=88?= =?UTF-8?q?=E9=80=89=E6=8B=A9=E4=BB=93=E5=BA=93=E9=99=90=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/DistributionStockArticleServiceImpl.java | 5 +++++ .../service/impl/DistrilbutionBillLadingServiceImpl.java | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java index d81d08bca..211f7d21b 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java @@ -1167,6 +1167,11 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl stockArticleEntityList = baseMapper.selectAllDistributionOrder(page, stockArticleEntity); List stockArticleVOS = DistributionStockArticleNewWrapper.build().listVO(stockArticleEntityList.getRecords()); + for (DistributionStockArticleVO stockArticleVO : stockArticleVOS) { + if (IsOrNoConstant.no.getValue().equals(stockArticleVO.getIsZero())){ + stockArticleVO.setReservationNum(stockArticleVO.getHandQuantity()); + } + } IPage distributionStockArticleEntityIPage = page.setRecords(stockArticleVOS); return distributionStockArticleEntityIPage; } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java index 9287a1a74..ab809fe37 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java @@ -1721,13 +1721,13 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl pageList(IPage page, Map distrilbutionBillLading) { DistrilbutionBillLadingDTO distrilbutionBillLadingDTO = JSONObject.parseObject(JSONObject.toJSONString(distrilbutionBillLading), DistrilbutionBillLadingDTO.class); //获取当前登录人仓库 - List myWatchWarehouse = basicdataWarehouseClient.getMyWarehouseList(); - List collect = myWatchWarehouse.stream() + List warehouseList = basicdataWarehouseClient.getMyWarehouseList(); + List collect = warehouseList.stream() .map(BasicdataWarehouseEntity::getId) .collect(Collectors.toList()); BasicdataWarehouseEntity myCurrentWarehouse = basicdataWarehouseClient.getMyCurrentWarehouse(); distrilbutionBillLadingDTO.setWarehouseIdList(collect); - if (Func.isNotEmpty(myWatchWarehouse)){ + if (Func.isNotEmpty(myCurrentWarehouse)){ distrilbutionBillLadingDTO.setWarehouseIdList(null); distrilbutionBillLadingDTO.setWarehouseId(myCurrentWarehouse.getId()); } From 20f67dff3ce96b0d1142ede11ffb190694c7f9d7 Mon Sep 17 00:00:00 2001 From: PigBaoBei <2739175034@qq.com> Date: Mon, 15 Apr 2024 14:45:51 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E9=A2=84=E7=BA=A6=E3=80=81=E8=87=AA?= =?UTF-8?q?=E6=8F=90=E6=90=9C=E7=B4=A2=E8=AE=A2=E5=8D=95=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E5=BD=93=E5=89=8D=E8=AE=A1=E5=88=92=E5=8F=AF=E7=94=A8=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/DistributionStockArticleServiceImpl.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java index 211f7d21b..0c2f772d5 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java @@ -1170,6 +1170,12 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl distributionParcelNumberVOS = distributionParcelNumberMapper.selectZeroPackage(stockArticleVO.getId()); +// 零担查询当前操作计划可用数量 + int reservationNum = distributionParcelNumberVOS.stream().mapToInt(DistributionParcelNumberVO::getHandQuantity).sum() - distributionParcelNumberVOS.stream().mapToInt(DistributionParcelNumberVO::getDeliveryQuantity).sum(); + stockArticleVO.setReservationNum(reservationNum); + } } IPage distributionStockArticleEntityIPage = page.setRecords(stockArticleVOS); From 3679b706c985b3560c320e470ac935b65e169db4 Mon Sep 17 00:00:00 2001 From: "pref_mail@163.com" Date: Mon, 15 Apr 2024 16:59:13 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=BF=97=E9=82=A6?= =?UTF-8?q?=E7=9A=84=E5=85=A5=E5=BA=93=E6=95=B0=E6=8D=AE=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/logpm/factory/zb/dto/OrderPackageDTO.java | 4 ++++ .../main/java/com/logpm/factory/zb/dto/PackageInfoDTO.java | 4 ++++ .../src/main/java/com/logpm/factory/zb/dto/ZBReceiptDTO.java | 4 ++++ .../java/com/logpm/warehouse/excel/TaskQueryDataExcel.java | 1 + 4 files changed, 13 insertions(+) diff --git a/blade-service/logpm-factory/src/main/java/com/logpm/factory/zb/dto/OrderPackageDTO.java b/blade-service/logpm-factory/src/main/java/com/logpm/factory/zb/dto/OrderPackageDTO.java index 9742c471b..182bffe56 100644 --- a/blade-service/logpm-factory/src/main/java/com/logpm/factory/zb/dto/OrderPackageDTO.java +++ b/blade-service/logpm-factory/src/main/java/com/logpm/factory/zb/dto/OrderPackageDTO.java @@ -37,4 +37,8 @@ public class OrderPackageDTO extends ZbOrderPackageEntity { @ApiModelProperty("包件物料清单") private List items; + @Override + public String toString() { + return super.toString(); + } } diff --git a/blade-service/logpm-factory/src/main/java/com/logpm/factory/zb/dto/PackageInfoDTO.java b/blade-service/logpm-factory/src/main/java/com/logpm/factory/zb/dto/PackageInfoDTO.java index c7cefb25d..8fc2ce6aa 100644 --- a/blade-service/logpm-factory/src/main/java/com/logpm/factory/zb/dto/PackageInfoDTO.java +++ b/blade-service/logpm-factory/src/main/java/com/logpm/factory/zb/dto/PackageInfoDTO.java @@ -31,4 +31,8 @@ import lombok.EqualsAndHashCode; public class PackageInfoDTO extends ZbPackageInfoEntity { private static final long serialVersionUID = 1L; + @Override + public String toString() { + return "PackageInfoDTO{}"+super.toString(); + } } diff --git a/blade-service/logpm-factory/src/main/java/com/logpm/factory/zb/dto/ZBReceiptDTO.java b/blade-service/logpm-factory/src/main/java/com/logpm/factory/zb/dto/ZBReceiptDTO.java index 77b20f061..157932bf1 100644 --- a/blade-service/logpm-factory/src/main/java/com/logpm/factory/zb/dto/ZBReceiptDTO.java +++ b/blade-service/logpm-factory/src/main/java/com/logpm/factory/zb/dto/ZBReceiptDTO.java @@ -37,4 +37,8 @@ public class ZBReceiptDTO extends ZbReceiptEntity { @ApiModelProperty("派车单订单列表") private List details; + @Override + public String toString() { + return super.toString(); + } } diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/excel/TaskQueryDataExcel.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/excel/TaskQueryDataExcel.java index 392e8001e..106aa6805 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/excel/TaskQueryDataExcel.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/excel/TaskQueryDataExcel.java @@ -15,6 +15,7 @@ import java.io.Serializable; public class TaskQueryDataExcel implements Serializable { + private static final long serialVersionUID = 1L; /** * 订单自编号