From cc5d6be4dac9b96f288748132d126137bfc9f9ed Mon Sep 17 00:00:00 2001 From: liuxy Date: Wed, 5 Jul 2023 15:04:19 +0800 Subject: [PATCH] =?UTF-8?q?rev=EF=BC=9A=E6=88=90=E5=93=81=E5=85=A5?= =?UTF-8?q?=E5=BA=93=E4=B8=80=E4=BD=93=E6=9C=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../storage_manage/pda/service/impl/PdaStCpInServiceImpl.java | 2 +- .../iostorInv/dao/mapper/xml/StIvtIostorinvCpMapper.xml | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/pda/service/impl/PdaStCpInServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/pda/service/impl/PdaStCpInServiceImpl.java index f0399ee9..63a6f50d 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/pda/service/impl/PdaStCpInServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/pda/service/impl/PdaStCpInServiceImpl.java @@ -182,7 +182,7 @@ public class PdaStCpInServiceImpl implements PdaStCpInService { @Override @Transactional public JSONObject confirm(JSONObject whereJson) { - iStIvtIostorinvCpService.confirm(whereJson); + iStIvtIostorinvCpService.confirm(whereJson.getJSONObject("row")); JSONObject result = new JSONObject(); result.put("data", ""); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/iostorInv/dao/mapper/xml/StIvtIostorinvCpMapper.xml b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/iostorInv/dao/mapper/xml/StIvtIostorinvCpMapper.xml index f9834c16..6793d23e 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/iostorInv/dao/mapper/xml/StIvtIostorinvCpMapper.xml +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/iostorInv/dao/mapper/xml/StIvtIostorinvCpMapper.xml @@ -7,9 +7,10 @@ mst.*, dis.material_code, dis.material_name, - dis.net_weight, + dis.net_weight AS unit_weight, dis.point_code, dis.struct_code, + dis.material_spec, dis.storagevehicle_code FROM st_ivt_iostorinv_cp mst @@ -18,6 +19,7 @@ a.iostorinv_id, MAX(b.material_code) AS material_code, MAX(b.material_name) AS material_name, + MAX(b.material_spec) AS material_spec, MAX(b.net_weight) AS net_weight, MAX(a.point_code) AS point_code, MAX(a.struct_code) AS struct_code,