From 0d221fab2b0bcd3be2c74a6bb56a08c0578606ac Mon Sep 17 00:00:00 2001 From: zhangzhiqiang Date: Tue, 27 Dec 2022 11:23:21 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E5=85=A5=E5=BA=93=E6=98=8E=E7=BB=86?= =?UTF-8?q?=E5=8D=95=E6=9F=A5=E8=AF=A2sql:=E5=87=BA=E5=85=A5=E5=BA=93?= =?UTF-8?q?=E5=8D=95=E6=98=8E=E7=BB=86=E8=A1=A8=E5=85=BC=E5=AE=B900,01?= =?UTF-8?q?=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/InspectionsheetmstServiceImpl.java | 16 ++++++++-------- .../nl/wms/ql/wql/QL_TEST_INSPECTIONSHEET002.wql | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ql/service/impl/InspectionsheetmstServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ql/service/impl/InspectionsheetmstServiceImpl.java index 087272a0..6c8d2805 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ql/service/impl/InspectionsheetmstServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ql/service/impl/InspectionsheetmstServiceImpl.java @@ -647,11 +647,11 @@ public class InspectionsheetmstServiceImpl implements InspectionsheetmstService continue; } // 如果是合格或者是放行就存入 入库数 - if (StrUtil.equals(jsonDtl.getString("result"), "01") || StrUtil.equals(jsonDtl.getString("result"), "03")) { - jsonReDtl.put("instor_qty", json.getDoubleValue("real_qty")); - // 如果是不合格就将入库数清0 - } else if (StrUtil.equals(jsonDtl.getString("result"), "02")) { + if (StrUtil.equals(jsonDtl.getString("result"), "02")) { jsonReDtl.put("instor_qty", 0); + // 如果是不合格就将入库数清0 + } else { + jsonReDtl.put("instor_qty", json.getDoubleValue("real_qty")); } //判断到货明细表中的数量与到货入库数是否相等，相同就完成，不相等就到货中 if (jsonReDtl.getDoubleValue("receive_qty") <= jsonReDtl.getDoubleValue("instor_qty")) { @@ -824,11 +824,11 @@ public class InspectionsheetmstServiceImpl implements InspectionsheetmstService JSONObject json = ivtDtlArr.getJSONObject(j); JSONObject jsonReDtl = reDtlTab.query("receivedtl_id = '" + json.getString("source_billdtl_id") + "'").uniqueResult(0); // 如果是合格或者是放行就存入 入库数 - if (StrUtil.equals(jsonDtl.getString("result"), "01") || StrUtil.equals(jsonDtl.getString("result"), "03")) { - jsonReDtl.put("instor_qty", json.getDoubleValue("real_qty")); - // 如果是不合格就将入库数清0 - } else if (StrUtil.equals(jsonDtl.getString("result"), "02")) { + if (StrUtil.equals(jsonDtl.getString("result"), "02")) { jsonReDtl.put("instor_qty", 0); + // 如果是不合格就将入库数清0 + } else { + jsonReDtl.put("instor_qty", json.getDoubleValue("real_qty")); } //判断到货明细表中的数量与到货入库数是否相等，相同就完成，不相等就到货中 if (jsonReDtl.getDoubleValue("receive_qty") <= jsonReDtl.getDoubleValue("instor_qty")) { diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ql/wql/QL_TEST_INSPECTIONSHEET002.wql b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ql/wql/QL_TEST_INSPECTIONSHEET002.wql index 939d167c..aa0868fd 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ql/wql/QL_TEST_INSPECTIONSHEET002.wql +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ql/wql/QL_TEST_INSPECTIONSHEET002.wql @@ -76,7 +76,7 @@ LEFT JOIN ST_IVT_IOStorInv mst ON mst.iostorinv_id = dtl.iostorinv_id WHERE mst.is_delete = '0' - AND dtl.quality_scode = '00' + AND dtl.quality_scode in ('00','01') AND dtl.material_id = 输入.material_id AND dtl.pcsn = 输入.pcsn AND dtl.source_bill_type = '81'