From c75117d6934a0d998bede79b155ed1dab601c5c4 Mon Sep 17 00:00:00 2001 From: Kelvin Date: Wed, 18 Dec 2024 17:38:03 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=87=BA=E5=BA=93=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ktg-admin/src/main/resources/application.yml | 2 +- .../com/ktg/mes/md/service/impl/WmsOutTaskServiceImpl.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ktg-admin/src/main/resources/application.yml b/ktg-admin/src/main/resources/application.yml index e354520..a652115 100644 --- a/ktg-admin/src/main/resources/application.yml +++ b/ktg-admin/src/main/resources/application.yml @@ -47,7 +47,7 @@ spring: # 国际化资源文件路径 basename: i18n/messages profiles: - active: online + active: dev # 文件上传 servlet: multipart: diff --git a/ktg-mes/src/main/java/com/ktg/mes/md/service/impl/WmsOutTaskServiceImpl.java b/ktg-mes/src/main/java/com/ktg/mes/md/service/impl/WmsOutTaskServiceImpl.java index 11fb02e..b072b4b 100644 --- a/ktg-mes/src/main/java/com/ktg/mes/md/service/impl/WmsOutTaskServiceImpl.java +++ b/ktg-mes/src/main/java/com/ktg/mes/md/service/impl/WmsOutTaskServiceImpl.java @@ -97,7 +97,7 @@ public class WmsOutTaskServiceImpl implements IWmsOutTaskService { WmsBusinessType wmsBusinessType = this.wmsBusinessTypeMapper.selectWmsBusinessTypeByTypeId(wmsOutPlan.getWmsBusinessTypeId().toString()); // 获取库位信息 - WmStorageArea wmStorageArea = wmStorageAreaMapper.selectWmStorageAreaByAreaId(wmsOutTask.getWmStorageAreaId()); + WmStorageArea wmStorageArea = wmStorageAreaMapper.selectWmStorageAreaByAreaCode(nowWmsOutPlanDetailEntity.getAreaCode()); // 设定出库信息数据 HashMap hashMap = new HashMap<>(); @@ -117,7 +117,7 @@ public class WmsOutTaskServiceImpl implements IWmsOutTaskService { hashMap.put("planTypeName", wmsBusinessType.getName()); // 出库类型名称 /* 来自计划明细 */ hashMap.put("detailBatchNum", wmsOutPlanDetail.getDetailBatchNum()); // 明细批次 - hashMap.put("wmStorageAreaId", wmsOutPlanDetail.getWmStorageAreaId()); // 库位ID + hashMap.put("wmStorageAreaId", wmStorageArea.getAreaId()); // 库位ID hashMap.put("wmStorageAreaCode", wmStorageArea.getAreaCode()); // 库位编码 hashMap.put("wmStorageAreaName", wmStorageArea.getAreaName()); // 库位名称 hashMap.put("cellX", wmStorageArea.getPositionX().toString());