From 0146a7524bb713113a43421c2d5e95a14cd5de5c Mon Sep 17 00:00:00 2001 From: zhenghaoyu Date: Wed, 6 Mar 2024 11:48:16 +0800 Subject: [PATCH 1/3] =?UTF-8?q?1.=E8=AE=A2=E5=8D=95=E6=9F=A5=E8=AF=A2-bug?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../logpm/distribution/mapper/DistributionParcelListMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.xml index f029bb51b..7ad7da730 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.xml @@ -832,7 +832,7 @@ ldpl.material_name AS descriptionGoods, ldpl.order_package_status AS orderPackageStatus, ldpl.conditions, - lwtg.pallet_name AS trayCode, + lwt.pallet_name AS trayCode, lwug.position_code AS positionCode , ldsa.mall_name as marketName from From 1c633b61f61e860c501a3c4433765490e52437ae Mon Sep 17 00:00:00 2001 From: PigBaoBei <2739175034@qq.com> Date: Wed, 6 Mar 2024 11:52:39 +0800 Subject: [PATCH 2/3] =?UTF-8?q?PDA=E6=89=AB=E6=8F=8F=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2BUG=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../logpm/distribution/mapper/DistributionSignforMapper.xml | 2 +- .../service/impl/DistributionDeliveryListServiceImpl.java | 6 +++--- .../service/impl/DistributionStockListServiceImpl.java | 4 ++++ 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml index 0b17292f2..6b0579f8e 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml @@ -1227,7 +1227,7 @@ logpm_distribution_reservation AS ldr LEFT JOIN logpm_distribution_reservation_package AS ldrp ON ldr.id = ldrp.reservation_id LEFT JOIN logpm_distribution_parcel_list AS ldpl ON ldrp.parce_list_id = ldpl.id - LEFT JOIN logpm_distribution_loadscan AS ldl ON ldl.package_id = ldpl.id AND ldl.is_abnormal_loading = 1 AND ldl.scan_status != 1 + LEFT JOIN logpm_distribution_loadscan AS ldl ON ldl.package_id = ldpl.id AND ldl.is_abnormal_loading = 1 AND ldl.scan_status != 1 AND ldl.reservation_id = ldr.id WHERE ldrp.packet_bar_status != 2 AND ldr.id = #{reservationId} 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 7deefe6f5..b9b45cfdb 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 @@ -373,8 +373,6 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl Date: Wed, 6 Mar 2024 14:07:50 +0800 Subject: [PATCH 3/3] =?UTF-8?q?1.=E8=AE=A2=E5=8D=95=E6=9F=A5=E8=AF=A2-bug?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/logpm/supervise/vo/ClassifyExportVO.java | 16 ++++++++-------- .../service/impl/ClassifyServiceImpl.java | 13 ++++++++----- 2 files changed, 16 insertions(+), 13 deletions(-) diff --git a/blade-service-api/logpm-supervise-api/src/main/java/com/logpm/supervise/vo/ClassifyExportVO.java b/blade-service-api/logpm-supervise-api/src/main/java/com/logpm/supervise/vo/ClassifyExportVO.java index 43414a24b..5a0b927be 100644 --- a/blade-service-api/logpm-supervise-api/src/main/java/com/logpm/supervise/vo/ClassifyExportVO.java +++ b/blade-service-api/logpm-supervise-api/src/main/java/com/logpm/supervise/vo/ClassifyExportVO.java @@ -19,34 +19,34 @@ public class ClassifyExportVO implements Serializable { @ExcelIgnore private Long createDept; - @ExcelProperty(value = "创建时间") + @ExcelProperty(value = "创建时间",index = 7) private Date createTime; @ExcelIgnore private Long updateUser; - @ExcelProperty(value = "指标名称") + @ExcelProperty(value = "指标名称",index = 1) private String name; - @ExcelProperty(value = "指标描述") + @ExcelProperty(value = "指标描述",index = 2) private String description; - @ExcelProperty(value = "指标备注") + @ExcelProperty(value = "指标备注",index = 3) private String remark; @ExcelIgnore private Long pId; - @ExcelProperty(value = "考核范围") + @ExcelProperty(value = "考核范围",index = 4) private String examineDeptName; - @ExcelProperty(value = "指标分类") + @ExcelProperty(value = "指标分类",index = 0) private String parentClassifyName; - @ExcelProperty(value = "考核归属部门") + @ExcelProperty(value = "考核归属部门",index = 5) private String createDeptName; - @ExcelProperty(value = "考核分值") + @ExcelProperty(value = "考核分值" ,index = 6) private String pointStr; } diff --git a/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/service/impl/ClassifyServiceImpl.java b/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/service/impl/ClassifyServiceImpl.java index e9f09946c..87f01f75f 100644 --- a/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/service/impl/ClassifyServiceImpl.java +++ b/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/service/impl/ClassifyServiceImpl.java @@ -128,12 +128,15 @@ public class ClassifyServiceImpl extends BaseServiceImpl