From 0b22a631d8fd8076e7f6fe15d38dd86d21d8a73d Mon Sep 17 00:00:00 2001 From: zhenghaoyu Date: Tue, 21 Jan 2025 18:38:36 +0800 Subject: [PATCH 1/4] =?UTF-8?q?1.=E8=A7=A3=E6=89=98=E9=80=BB=E8=BE=91?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/TrunklineCarsLoadServiceImpl.java | 27 +++++++++++++++++-- 1 file changed, 25 insertions(+), 2 deletions(-) diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java index 8b470c959..db62c7bd1 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java @@ -7086,7 +7086,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl { + DownPackageTrayVO downPackageTrayVO = new DownPackageTrayVO(); + downPackageTrayVO.setOrderPackageCodes(orderPackageCode); + downPackageTrayVO.setWarehouseId(warehouseId); + downPackageTrayVO.setRemark("PC批量签收下架解托"); + updownTypeClient.downPackageOrDelTray(downPackageTrayVO); + }); + + //生成签收记录 trunklineCarsSignLogService.addList(updateCarsLoadScanList, "PC批量签收"); From b1e23c5b3a9b465d2812c2e91c58edef3b62dc8e Mon Sep 17 00:00:00 2001 From: zhenghaoyu Date: Tue, 21 Jan 2025 18:55:14 +0800 Subject: [PATCH 2/4] =?UTF-8?q?1.=E8=A7=A3=E6=89=98=E9=80=BB=E8=BE=91?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/TripartiteTransferApiController.java | 2 +- .../service/ITrunklineCarsLoadService.java | 2 +- .../impl/TrunklineCarsLoadServiceImpl.java | 17 +++++++++++++---- 3 files changed, 15 insertions(+), 6 deletions(-) diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/api/TripartiteTransferApiController.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/api/TripartiteTransferApiController.java index 9e9e6b808..8fbaf34cc 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/api/TripartiteTransferApiController.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/api/TripartiteTransferApiController.java @@ -114,7 +114,7 @@ public class TripartiteTransferApiController { } - return carsLoadService.transferUnloadPackage(loadId,orderPackageCode,myCurrentWarehouse.getId(),1,"正常卸车"); + return carsLoadService.transferUnloadPackage(loadId,orderPackageCode,myCurrentWarehouse.getId(),1,"正常卸车",1); }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/service/ITrunklineCarsLoadService.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineCarsLoadService.java index 464d31bd8..b7c695561 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineCarsLoadService.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineCarsLoadService.java @@ -138,7 +138,7 @@ public interface ITrunklineCarsLoadService extends BaseService zeroPackageList); diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java index db62c7bd1..eb1e41373 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java @@ -6915,7 +6915,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl Date: Wed, 22 Jan 2025 09:39:50 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=89=93=E6=8B=BC?= =?UTF-8?q?=E5=B9=B2=E7=BA=BF=E6=95=B0=E6=8D=AE=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/logpm/report/mapper/largeScreen/TrunkDataMapper.java | 2 +- .../com/logpm/report/mapper/largeScreen/TrunkDataMapper.xml | 3 ++- .../report/service/largeScreen/impl/TrunkDataServiceImpl.java | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/largeScreen/TrunkDataMapper.java b/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/largeScreen/TrunkDataMapper.java index de5b1220f..f833deb91 100644 --- a/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/largeScreen/TrunkDataMapper.java +++ b/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/largeScreen/TrunkDataMapper.java @@ -5,6 +5,6 @@ import org.apache.ibatis.annotations.Mapper; @Mapper public interface TrunkDataMapper { public Integer getTotal(String startTime, String endTime); - public Integer getOnTheWay(); + public Integer getOnTheWay(String startTime, String endTime); public Integer getArrival(String startTime, String endTime); } diff --git a/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/largeScreen/TrunkDataMapper.xml b/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/largeScreen/TrunkDataMapper.xml index f10b15961..9f48edf05 100644 --- a/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/largeScreen/TrunkDataMapper.xml +++ b/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/largeScreen/TrunkDataMapper.xml @@ -12,7 +12,8 @@ select count(*) from logpm_platform.logpm_trunkline_cars_load - where load_status in ('10', '20', '30') + where create_time between #{startTime} and #{endTime} + and load_status in ('10', '20', '30')