From eb4089e77115b7c0dfd2eba91f9257581d2b14f2 Mon Sep 17 00:00:00 2001 From: zhaoqiaobo <583671871@qq.com> Date: Mon, 24 Mar 2025 16:18:42 +0800 Subject: [PATCH 1/2] =?UTF-8?q?feat(all):=20=E9=85=8D=E9=80=81=E7=AD=BE?= =?UTF-8?q?=E6=94=B6=E7=8E=87=E6=8A=A5=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1 修改签收状态字段显示错误问题 --- .../com/logpm/report/mapper/QualityDispatchNumberMapper.xml | 2 +- .../logpm/report/vo/qulity/dispatch/QualityDispatchTaskVO.java | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/QualityDispatchNumberMapper.xml b/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/QualityDispatchNumberMapper.xml index a1db885e3..542ea77f3 100644 --- a/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/QualityDispatchNumberMapper.xml +++ b/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/QualityDispatchNumberMapper.xml @@ -143,7 +143,7 @@ t.driver_name, t.vehicle_name, t.delivery_create_user_name, - case when t.sign_status = 1 then '已签收' else '未签收' end signStatus, + t.sign_status signStatus, t.sign_time, t.sign_user_name, t.reviewStatus, diff --git a/blade-service/logpm-report/src/main/java/com/logpm/report/vo/qulity/dispatch/QualityDispatchTaskVO.java b/blade-service/logpm-report/src/main/java/com/logpm/report/vo/qulity/dispatch/QualityDispatchTaskVO.java index 7a896959c..602e319b1 100644 --- a/blade-service/logpm-report/src/main/java/com/logpm/report/vo/qulity/dispatch/QualityDispatchTaskVO.java +++ b/blade-service/logpm-report/src/main/java/com/logpm/report/vo/qulity/dispatch/QualityDispatchTaskVO.java @@ -1,5 +1,6 @@ package com.logpm.report.vo.qulity.dispatch; +import com.alibaba.excel.annotation.ExcelIgnore; import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.annotation.write.style.ColumnWidth; import com.alibaba.excel.annotation.write.style.ContentRowHeight; @@ -94,7 +95,7 @@ public class QualityDispatchTaskVO implements Serializable { private Integer signStockNum; @ApiModelProperty(value = "状态") - @ExcelProperty("状态") + @ExcelIgnore private String signStatus; @ApiModelProperty(value = "签收时间") From 6c266cf99a6911d99f7b0756a861d3bd1252e8e5 Mon Sep 17 00:00:00 2001 From: zhenghaoyu Date: Mon, 24 Mar 2025 16:31:36 +0800 Subject: [PATCH 2/2] =?UTF-8?q?1.=E5=B9=B2=E7=BA=BF=E5=90=8C=E6=AD=A5?= =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E6=97=A0=E7=BC=96=E7=A0=81=E6=95=B0=E6=8D=AE?= =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/TrunklineCarsLoadServiceImpl.java | 32 +++++++++++++++++-- 1 file changed, 29 insertions(+), 3 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 b4680d4a8..d3a88353d 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 @@ -13297,6 +13297,13 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl advanceIdSet = allAdvanceDetailList.stream().map(TrunklineAdvanceDetailEntity::getAdvanceId).collect(Collectors.toSet()); + List advanceEntities = advanceService.findListByIds(new ArrayList<>(advanceIdSet)); + //把advanceEntities转化成id为key的Map + Map advanceMap = advanceEntities.stream().collect(Collectors.toMap(TrunklineAdvanceEntity::getId, Function.identity())); + + //把allAdvanceDetailList转化成orderPackageCode为key的Map Map advanceDetailMap = allAdvanceDetailList.stream().collect(Collectors.toMap(TrunklineAdvanceDetailEntity::getOrderPackageCode, Function.identity())); @@ -13310,6 +13317,8 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl { - - }); +// udateAdvanceDetailList.forEach(trunklineAdvanceDetailEntity -> { +// +// }); } @@ -13447,6 +13467,12 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl orderPackageCodes = new ArrayList<>(orderPackageCodeSet); + + String content = "包件在 " + warehouseName + "卸车，车次号："+carsLoadEntity.getCarsNo()+" 卸车方式：" + IncomingTypeEnum.getValue(IncomingTypeEnum.SYNC_INCOMING.getCode()); + packageTrackLogAsyncService.addPackageTrackLog(AuthUtil.getTenantId(), AuthUtil.getUserId(), Func.firstLong(AuthUtil.getDeptId()), AuthUtil.getNickName(), orderPackageCodes, warehouseId, warehouseName, WorkNodeEnums.UNLOAD_INCOMING_WAREHOUSE.getCode(), content); + } bladeRedis.del(key);