From ca1b251d79b57c473f2630dd20eba01b7e0e8eae Mon Sep 17 00:00:00 2001 From: liuxy Date: Mon, 23 Jun 2025 11:16:57 +0800 Subject: [PATCH] =?UTF-8?q?rev=EF=BC=9A=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pda/ios_manage/service/impl/PdaIosInServiceImpl.java | 2 ++ .../service/dao/mapper/MdPbGroupplateMapper.xml | 6 ++++-- wms/nladmin-ui/src/views/wms/basedata/group/index.vue | 1 + 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/ios_manage/service/impl/PdaIosInServiceImpl.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/ios_manage/service/impl/PdaIosInServiceImpl.java index ce219cc..1e34626 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/ios_manage/service/impl/PdaIosInServiceImpl.java +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/ios_manage/service/impl/PdaIosInServiceImpl.java @@ -147,6 +147,8 @@ public class PdaIosInServiceImpl implements PdaIosInService { JSONObject result = new JSONObject(); result.put("group_id", groupDao.getGroup_id()); result.put("material_code", material_code); + result.put("material_name", materDao.getMaterial_name()); + result.put("material_spec", materDao.getMaterial_spec()); result.put("pcsn", pcsn); result.put("qty", qty); result.put("qty_unit_name", unitDao.getUnit_name()); diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/dao/mapper/MdPbGroupplateMapper.xml b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/dao/mapper/MdPbGroupplateMapper.xml index c08e16d..0a30c63 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/dao/mapper/MdPbGroupplateMapper.xml +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/dao/mapper/MdPbGroupplateMapper.xml @@ -6,7 +6,8 @@ SELECT late.*, mater.material_code, - mater.material_name + mater.material_name, + mater.material_spec FROM md_pb_groupplate late LEFT JOIN md_me_materialbase mater ON mater.material_id = late.material_id @@ -23,7 +24,8 @@ SELECT late.*, mater.material_code, - mater.material_name + mater.material_name, + mater.material_spec FROM md_pb_groupplate late INNER JOIN md_me_materialbase mater ON mater.material_id = late.material_id diff --git a/wms/nladmin-ui/src/views/wms/basedata/group/index.vue b/wms/nladmin-ui/src/views/wms/basedata/group/index.vue index 77dd506..69f0b8a 100644 --- a/wms/nladmin-ui/src/views/wms/basedata/group/index.vue +++ b/wms/nladmin-ui/src/views/wms/basedata/group/index.vue @@ -71,6 +71,7 @@ +