From 723314a19922787bd5a00b46e70c61203b752669 Mon Sep 17 00:00:00 2001 From: shuishangtang <836181219@qq.com> Date: Fri, 10 Nov 2023 11:26:51 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=A4=87=E8=B4=A7=E7=AE=A1=E7=90=86?= =?UTF-8?q?=EF=BC=9A=E4=BF=AE=E5=A4=8D=E5=95=86=E9=85=8D=E3=80=81=E5=B8=82?= =?UTF-8?q?=E9=85=8D=E5=92=8C=E8=87=AA=E6=8F=90=E5=A4=87=E8=B4=A7=E7=9A=84?= =?UTF-8?q?=E5=AF=BC=E5=87=BA=E5=8A=9F=E8=83=BD=E4=B8=AD=E5=A4=87=E8=B4=A7?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E7=BF=BB=E8=AF=91=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../excel/DistributionMarketExcel.java | 6 ++- .../impl/DistributionStockupServiceImpl.java | 45 +++++++++++++++++-- 2 files changed, 47 insertions(+), 4 deletions(-) diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionMarketExcel.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionMarketExcel.java index 103c30973..d633b0446 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionMarketExcel.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionMarketExcel.java @@ -21,7 +21,9 @@ import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.annotation.write.style.ColumnWidth; import com.alibaba.excel.annotation.write.style.ContentRowHeight; import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import lombok.AllArgsConstructor; import lombok.Data; +import lombok.NoArgsConstructor; import java.io.Serializable; import java.util.Date; @@ -37,6 +39,8 @@ import java.util.Date; @ColumnWidth(25) @HeadRowHeight(20) @ContentRowHeight(18) +@NoArgsConstructor +@AllArgsConstructor public class DistributionMarketExcel implements Serializable { private static final long serialVersionUID = 1L; @@ -71,7 +75,7 @@ public class DistributionMarketExcel implements Serializable { @ColumnWidth(20) @ExcelProperty("备货人员") - private Long forklift; + private String forkliftName; @ColumnWidth(20) @ExcelProperty("所在托盘") diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java index 8c3e0d416..fb55de772 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java @@ -2555,7 +2555,20 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl list = baseMapper.exportMarket(paramMap, idArr); list.forEach(li -> { - li.setStockupStatus(DictCache.getValue(DictBizConstant.STOCKUP_STATUS, li.getStockupStatus())); + switch (li.getStockupStatus()) { + case "10": + li.setStockupStatus("待分配"); + break; + case "20": + li.setStockupStatus("待备货"); + break; + case "30": + li.setStockupStatus("备货中"); + break; + case "40": + li.setStockupStatus("已备货"); + break; + } li.setAssignStatus("1".equals(li.getAssignStatus()) ? "未指派" : "已指派"); }); return list; @@ -2581,7 +2594,20 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl list = baseMapper.exportCity(paramMap, idArr); list.forEach(li -> { - li.setStockupStatus(DictCache.getValue(DictBizConstant.STOCKUP_STATUS, li.getStockupStatus())); + switch (li.getStockupStatus()) { + case "10": + li.setStockupStatus("待分配"); + break; + case "20": + li.setStockupStatus("待备货"); + break; + case "30": + li.setStockupStatus("备货中"); + break; + case "40": + li.setStockupStatus("已备货"); + break; + } li.setAssignStatus("1".equals(li.getAssignStatus()) ? "未指派" : "已指派"); }); return list; @@ -2608,7 +2634,20 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl list = baseMapper.exportSelf(paramMap, idArr); list.forEach(li -> { - li.setStockupStatus(DictCache.getValue(DictBizConstant.STOCKUP_STATUS, li.getStockupStatus())); + switch (li.getStockupStatus()) { + case "10": + li.setStockupStatus("待分配"); + break; + case "20": + li.setStockupStatus("待备货"); + break; + case "30": + li.setStockupStatus("备货中"); + break; + case "40": + li.setStockupStatus("已备货"); + break; + } li.setAssignStatus("1".equals(li.getAssignStatus()) ? "未指派" : "已指派"); }); return list; From d354123c4b2f94ec1c4418e7b788974aa2526dc8 Mon Sep 17 00:00:00 2001 From: kilo Date: Fri, 10 Nov 2023 11:26:52 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E8=B4=A7=E7=89=A9=E6=89=98=E7=9B=98?= =?UTF-8?q?=E8=A7=A3=E7=BB=91=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/DistributionDeliveryListServiceImpl.java | 11 ++++++++--- .../service/impl/DistributionSignforServiceImpl.java | 1 - 2 files changed, 8 insertions(+), 4 deletions(-) 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 3ed9fac91..892d3e400 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 @@ -556,8 +556,8 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl reservationLoadscanEntities = new ArrayList<>(); for (DistributionParcelListEntity parcelListEntity : parcelListEntities) { - warehouseUpdownTypeClient.downPackageOrDelTray(parcelListEntity.getOrderPackageCode(),myCurrentWarehouse.getId()); + try { + warehouseUpdownTypeClient.downPackage(parcelListEntity.getOrderPackageCode(),myCurrentWarehouse.getId()); + }catch (Exception e){ + log.error("#################货物下架错误：{}",parcelListEntity.getOrderPackageCode()); + return Resp.scanFail("装车失败", "装车失败"); + } if (parcelListEntity.getOrderPackageLoadingStatus().equals(OrderPackageLoadingStatusConstant.weizhuancghe.getValue())) { parcelListEntity.setOrderPackageLoadingStatus(OrderPackageLoadingStatusConstant.yizhuangche.getValue()); parcelListEntity.setOrderPackageStatus(OrderPackageStatusConstant.yichuku.getValue()); 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 6c5bdcbaf..90e790a10 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 @@ -1881,7 +1881,6 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl Date: Fri, 10 Nov 2023 11:50:37 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9D=A1=E4=BB=B6?= =?UTF-8?q?=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/DistributionStockupServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java index 8c3e0d416..faf6278c2 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java @@ -1823,7 +1823,7 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl