From 94f17e846423dc6e8ef62f633e8bcd99e04b7fce Mon Sep 17 00:00:00 2001 From: liuxy Date: Wed, 5 Jun 2024 15:24:15 +0800 Subject: [PATCH] =?UTF-8?q?rev=EF=BC=9A=E6=8A=A5=E5=BA=9F=E5=9B=9E?= =?UTF-8?q?=E4=BC=A0=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/InAndOutRetrunServiceImpl.java | 35 ++++++++++++------- 1 file changed, 22 insertions(+), 13 deletions(-) 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 9dd91345b..282fa3b1f 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 @@ -407,13 +407,6 @@ public class InAndOutRetrunServiceImpl implements InAndOutReturnService { // 所有子卷 List disList = WQLObject.getWQLObject("st_ivt_iostorinvdis").query("box_no in ('" + box_no_in + "') and iostorinv_id = '" + jo_mst.getString("iostorinv_id") + "'").getResultJSONArray(0).toJavaList(JSONObject.class); - // 所有分切计划 -// String pcsn_in = disList.stream() -// .map(row -> row.getString("pcsn")) -// .collect(Collectors.joining("','")); - -// List planList = WQLObject.getWQLObject("pdm_bi_slittingproductionplan").query("container_name in ('" + pcsn_in + "')").getResultJSONArray(0).toJavaList(JSONObject.class); - // 查询仓库 JSONObject jsonStor = WQLObject.getWQLObject("st_ivt_bsrealstorattr") .query("stor_code = '" + jo_mst.getString("stor_code") + "'").uniqueResult(0); @@ -449,7 +442,7 @@ public class InAndOutRetrunServiceImpl implements InAndOutReturnService { // 仓库编码 param.put("WareHouse", jsonStor.getString("ext_id")); - // new LmsToMesServiceImpl().ChildScrapUpdate(param); + new LmsToMesServiceImpl().ChildScrapUpdate(param); // 更新分配回传成功 JSONObject jsonUpdate = new JSONObject(); @@ -1635,12 +1628,17 @@ public class InAndOutRetrunServiceImpl implements InAndOutReturnService { .map(row -> row.getString("box_no")) .collect(Collectors.joining("','")); + // 所有子卷 List disList = WQLObject.getWQLObject("st_ivt_iostorinvdis").query("box_no in ('" + box_no_in + "') and iostorinv_id = '" + jo_mst.getString("iostorinv_id") + "'").getResultJSONArray(0).toJavaList(JSONObject.class); - JSONObject param = new JSONObject(); - JSONArray item = new JSONArray(); + // 查询仓库 + JSONObject jsonStor = WQLObject.getWQLObject("st_ivt_bsrealstorattr") + .query("stor_code = '" + jo_mst.getString("stor_code") + "'").uniqueResult(0); for (int j = 0; j < disArr.size(); j++) { + JSONObject param = new JSONObject(); + JSONArray item = new JSONArray(); + JSONObject json = disArr.getJSONObject(j); JSONObject jsonDtl = new JSONObject(); @@ -1658,14 +1656,25 @@ public class InAndOutRetrunServiceImpl implements InAndOutReturnService { JSONObject jsonObject1 = new JSONObject(); jsonObject1.put("ContainerName", jsonObject.getString("pcsn")); - jsonObject1.put("NetWeight", NumberUtil.toStr(jsonObject.getDoubleValue("plan_qty"))); + jsonObject1.put("NetWeight",NumberUtil.toStr(jsonObject.getDoubleValue("plan_qty"))); details.add(jsonObject1); } jsonDtl.put("Details", details); item.add(jsonDtl); + + param.put("Items", item); + + // 仓库编码 + param.put("WareHouse", jsonStor.getString("ext_id")); + new LmsToMesServiceImpl().ChildScrapUpdate(param); + + // 更新分配回传成功 + JSONObject jsonUpdate = new JSONObject(); + jsonUpdate.put("is_upload", "1"); + + WQLObject.getWQLObject("st_ivt_iostorinvdis") + .update(jsonUpdate,"iostorinv_id = '"+jo_mst.getString("iostorinv_id")+"' and box_no = '"+json.getString("box_no")+"'"); } - param.put("Items", item); - new LmsToMesServiceImpl().ChildScrapUpdate(param); jo_mst.put("upload_mes", "1"); jo_mst.put("is_upload", "1");