From fc3f2501b35c8dc13d0d86cf8502a67eea2a8c69 Mon Sep 17 00:00:00 2001 From: liuxy Date: Thu, 11 Jan 2024 09:48:47 +0800 Subject: [PATCH] =?UTF-8?q?rev=EF=BC=9A=E6=88=90=E5=93=81=E6=8A=A5?= =?UTF-8?q?=E5=BA=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/InAndOutRetrunServiceImpl.java | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 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 2ed3fb0da..5369ebd76 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 @@ -336,8 +336,16 @@ 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); + // 所有分切计划 +// 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 param = new JSONObject(); JSONArray item = new JSONArray(); @@ -359,7 +367,7 @@ public class InAndOutRetrunServiceImpl implements InAndOutReturnService { JSONObject jsonObject1 = new JSONObject(); jsonObject1.put("ContainerName", jsonObject.getString("pcsn")); - jsonObject1.put("NetWeight", jsonObject.getString("plan_qty")); + jsonObject1.put("NetWeight",NumberUtil.toStr(jsonObject.getDoubleValue("plan_qty"))); details.add(jsonObject1); } jsonDtl.put("Details", details); @@ -1552,7 +1560,7 @@ public class InAndOutRetrunServiceImpl implements InAndOutReturnService { JSONObject jsonObject1 = new JSONObject(); jsonObject1.put("ContainerName", jsonObject.getString("pcsn")); - jsonObject1.put("NetWeight", jsonObject.getString("plan_qty")); + jsonObject1.put("NetWeight", NumberUtil.toStr(jsonObject.getDoubleValue("plan_qty"))); details.add(jsonObject1); } jsonDtl.put("Details", details);