From a9d11e13e15096b64ca360d9bfd388099916f3c6 Mon Sep 17 00:00:00 2001 From: PigBaoBei <2739175034@qq.com> Date: Mon, 13 May 2024 12:03:10 +0800 Subject: [PATCH 01/11] =?UTF-8?q?=E8=A3=85=E8=BD=A6=E4=B8=8B=E6=9E=B6?= =?UTF-8?q?=E3=80=81=E8=A7=A3=E6=89=98=E5=8C=85=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/DistributionDeliveryListServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 9a936dc4b..2979bc019 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 @@ -726,7 +726,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl info = new HashMap<>(); info.put("orderPackageCode",parcelListEntity.getOrderPackageCode()); info.put("warehouseId",myCurrentWarehouse.getId()); - warehouseUpdownTypeClient.downDeliveryPackage(info); + warehouseUpdownTypeClient.downPackageOrDelTray(parcelListEntity.getOrderPackageCode(),myCurrentWarehouse.getId(),"扫描装车进行下架、解托"); Map map = new HashMap(); String distrilbutionloadingscanDTOJson = JSONObject.toJSONString(distrilbutionloadingscanDTO); From 48d187b248909155bde1dc9bed1b0e20e7cf1919 Mon Sep 17 00:00:00 2001 From: PigBaoBei <2739175034@qq.com> Date: Mon, 13 May 2024 14:00:57 +0800 Subject: [PATCH 02/11] =?UTF-8?q?=E9=85=8D=E9=80=81=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E5=AF=BC=E5=87=BA=E5=A2=9E=E5=8A=A0=E8=AE=A2=E5=8D=95=E8=87=AA?= =?UTF-8?q?=E7=BC=96=E5=8F=B7=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../distribution/excel/DistributionDeliveryListExcel.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionDeliveryListExcel.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionDeliveryListExcel.java index faeae066e..03040c59b 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionDeliveryListExcel.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionDeliveryListExcel.java @@ -68,6 +68,13 @@ public class DistributionDeliveryListExcel implements Serializable { @ColumnWidth(20) @ExcelProperty("客户名称") private String consignee; + + /** + * 仓库 + */ + @ColumnWidth(20) + @ExcelProperty("订单自编号") + private String orderCode; /** * 仓库 */ From a58aec641e6c6fdb069d99c0ad27c761e54b1121 Mon Sep 17 00:00:00 2001 From: PigBaoBei <2739175034@qq.com> Date: Mon, 13 May 2024 14:18:42 +0800 Subject: [PATCH 03/11] =?UTF-8?q?=E5=95=86=E9=85=8D=E8=AE=A1=E5=88=92?= =?UTF-8?q?=E9=A2=84=E7=BA=A6=E6=95=B0=E9=87=8F=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/DistributionDeliveryListServiceImpl.java | 1 + 1 file changed, 1 insertion(+) 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 2979bc019..79483d786 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 @@ -2553,6 +2553,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImplquery().lambda().eq(DistributionParcelListEntity::getStockArticleId, rs.getStockArticleId())))); //// } // } + distributionStockArticleVO.setReservationNum(rs.getReservationNum()); distributionStockArticleVOS.add(distributionStockArticleVO); }); } From 1364cb6ad6cf5cbb489b19923b416593b22f2c26 Mon Sep 17 00:00:00 2001 From: PigBaoBei <2739175034@qq.com> Date: Mon, 13 May 2024 14:36:06 +0800 Subject: [PATCH 04/11] =?UTF-8?q?=E8=87=AA=E6=8F=90=E5=8C=85=E4=BB=B6?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E5=AF=BC=E5=87=BA=E5=A2=9E=E5=8A=A0=E5=8C=85?= =?UTF-8?q?=E4=BB=B6=E6=95=B0=E9=87=8F=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../distribution/excel/DistributionBillOrderPackExcel.java | 3 +++ .../logpm/distribution/mapper/DistrilbutionBillStockMapper.xml | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionBillOrderPackExcel.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionBillOrderPackExcel.java index 8cf5ebc19..68c51fd5d 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionBillOrderPackExcel.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionBillOrderPackExcel.java @@ -55,6 +55,9 @@ public class DistributionBillOrderPackExcel { @ExcelProperty("物料名称") private String materialName; @ColumnWidth(20) + @ExcelProperty("数量") + private Integer num; + @ColumnWidth(20) @ExcelProperty("托盘码") private String pallet; @ColumnWidth(20) 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 77d701067..b2d7cba79 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 @@ -357,7 +357,8 @@ end as clerkCheck, CASE WHEN ldbl.conditions = 30 THEN ldbl.update_time - end as clerkUpdateTime + end as clerkUpdateTime, + 1 AS num FROM logpm_distrilbution_bill_lading ldbl LEFT JOIN logpm_distrilbution_bill_package ldbp on ldbl.id = ldbp.bill_lading_id LEFT JOIN logpm_distribution_parcel_list ldpl ON ldbp.parce_list_id = ldpl.id From 72e4f93d37392f726af5e0206363e70e9b51435b Mon Sep 17 00:00:00 2001 From: zhenghaoyu Date: Mon, 13 May 2024 16:02:12 +0800 Subject: [PATCH 05/11] =?UTF-8?q?1.=E5=B9=B2=E7=BA=BFbug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../trunkline/vo/LoadingDetailExportVO.java | 10 + .../controller/IncomingController.java | 2 +- .../mapper/TrunklineCarsLoadScanMapper.xml | 26 +- .../trunkline/service/IInComingService.java | 3 +- .../service/IOpenOrderAsyncService.java | 2 +- .../service/ITrunklineAdvanceService.java | 3 +- .../service/impl/InComingServiceImpl.java | 5 +- .../impl/OpenOrderAsyncServiceImpl.java | 5 +- .../service/impl/OpenOrderServiceImpl.java | 274 +++++++++++------- .../TrunklineAdvanceDetailServiceImpl.java | 49 +++- .../impl/TrunklineAdvanceServiceImpl.java | 4 +- ...TrunklineBillladingPackageServiceImpl.java | 2 +- .../impl/TrunklineCarsLoadServiceImpl.java | 11 +- .../mapper/WarehouseWaybillMapper.xml | 93 +++--- 14 files changed, 289 insertions(+), 200 deletions(-) diff --git a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/LoadingDetailExportVO.java b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/LoadingDetailExportVO.java index 87512aacf..15a0ebc82 100644 --- a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/LoadingDetailExportVO.java +++ b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/LoadingDetailExportVO.java @@ -1,9 +1,11 @@ package com.logpm.trunkline.vo; import com.alibaba.excel.annotation.ExcelProperty; +import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import java.io.Serializable; +import java.util.Date; @Data public class LoadingDetailExportVO implements Serializable { @@ -62,4 +64,12 @@ public class LoadingDetailExportVO implements Serializable { @ExcelProperty(value = "是否补录") private String isSupple; + @ExcelProperty(value = "装车时间") + @JsonFormat(locale = "zh", timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + private Date loadingTime; + + @ExcelProperty(value = "卸车时间") + @JsonFormat(locale = "zh", timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + private Date unloadTime; + } diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/controller/IncomingController.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/controller/IncomingController.java index 178dd7c72..1691e19e8 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/controller/IncomingController.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/controller/IncomingController.java @@ -90,7 +90,7 @@ public class IncomingController { } - return inComingService.incomingBatchOrder(inComingDTO); + return inComingService.incomingBatchOrder(inComingDTO,null); }catch (CustomerException e){ log.error(e.message,e); return R.fail(e.code,e.message); diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadScanMapper.xml b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadScanMapper.xml index f95b0a17c..abc93ea47 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadScanMapper.xml +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadScanMapper.xml @@ -656,15 +656,12 @@