From c053f7a2dd48da9acf1c0bfcf253922ea735e7e9 Mon Sep 17 00:00:00 2001 From: liuxy Date: Fri, 28 Jun 2024 10:13:23 +0800 Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E4=BA=8C=E6=9C=9F=E5=87=BA?= =?UTF-8?q?=E5=BA=93=E5=AE=8C=E6=88=90=E6=8A=A5=E9=94=99bug=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/StIvtIostorinvOutServiceImpl.java | 1 + .../service/impl/InAndOutRetrunServiceImpl.java | 8 ++++++++ .../views/wms/basedata/st/struct/structattr.js | 16 ---------------- 3 files changed, 9 insertions(+), 16 deletions(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvOutServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvOutServiceImpl.java index 600a4ca50..99555408f 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvOutServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvOutServiceImpl.java @@ -649,6 +649,7 @@ public class StIvtIostorinvOutServiceImpl extends ServiceImpl ObjectUtil.isNotEmpty(row.getTask_id())) .map(row -> row.getTask_id().toString()) .distinct() .collect(Collectors.joining("','")); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/returns/service/impl/InAndOutRetrunServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/returns/service/impl/InAndOutRetrunServiceImpl.java index 282fa3b1f..2208f8464 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/returns/service/impl/InAndOutRetrunServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/returns/service/impl/InAndOutRetrunServiceImpl.java @@ -378,6 +378,10 @@ public class InAndOutRetrunServiceImpl implements InAndOutReturnService { param.put("Attribute2", jo_mst.getString("confirm_time")); param.put("Attribute3", DateUtil.now()); + // 删除子卷 + WQLObject.getWQLObject("pdm_bi_subpackagerelation") + .delete("package_box_sn = '"+json.getString("box_no")+"'"); + JSONArray container_jo = wo_dis.query("iostorinv_id = '" + jo_mst.getString("iostorinv_id") + "' AND box_no = '" + json.getString("box_no") + "'").getResultJSONArray(0); for (int k = 0; k < container_jo.size(); k++) { JSONObject dis_jo = container_jo.getJSONObject(k); @@ -1493,6 +1497,10 @@ public class InAndOutRetrunServiceImpl implements InAndOutReturnService { param.put("Attribute2", jo_mst.getString("confirm_time")); param.put("Attribute3", DateUtil.now()); + // 删除子卷 + WQLObject.getWQLObject("pdm_bi_subpackagerelation") + .delete("package_box_sn = '"+json.getString("box_no")+"'"); + JSONArray container_jo = wo_dis.query("iostorinv_id = '" + jo_mst.getString("iostorinv_id") + "' AND box_no = '" + json.getString("box_no") + "'").getResultJSONArray(0); for (int k = 0; k < container_jo.size(); k++) { JSONObject dis_jo = container_jo.getJSONObject(k); diff --git a/lms/nladmin-ui/src/views/wms/basedata/st/struct/structattr.js b/lms/nladmin-ui/src/views/wms/basedata/st/struct/structattr.js index f37b42659..4ff5d7c18 100644 --- a/lms/nladmin-ui/src/views/wms/basedata/st/struct/structattr.js +++ b/lms/nladmin-ui/src/views/wms/basedata/st/struct/structattr.js @@ -48,14 +48,6 @@ export function blurQuery(data) { }) } -export function oneCreate(data) { - return request({ - url: 'api/structattr/oneCreate', - method: 'post', - data - }) -} - export function tunConfirm(data) { return request({ url: 'api/structattr/tunConfirm', @@ -64,12 +56,4 @@ export function tunConfirm(data) { }) } -export function blurQuery(data) { - return request({ - url: 'api/structattr/blurQuery', - method: 'post', - data - }) -} - export default { add, edit, del, changeActive, oneCreate, blurQuery, tunConfirm }