From 66f867a1626a4ecf76156108693d327986b21e95 Mon Sep 17 00:00:00 2001 From: liuxy Date: Mon, 4 Dec 2023 16:01:55 +0800 Subject: [PATCH 1/2] =?UTF-8?q?rev:1.=E5=BA=93=E5=AD=98=E6=8A=A5=E8=A1=A8?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=B6=85=E6=9C=9F=E5=8E=9F=E5=9B=A0=202.?= =?UTF-8?q?=E6=88=90=E5=93=81=E6=8A=A5=E5=BA=9F=E5=9B=9E=E4=BC=A0=E9=A3=9E?= =?UTF-8?q?=E4=B9=A6=E5=8F=AA=E5=9B=9E=E4=BC=A0>200=E7=9A=84=E5=AD=90?= =?UTF-8?q?=E5=8D=B7=203.=E5=87=BA=E5=BA=93=E8=AE=BE=E7=BD=AE=E7=AB=99?= =?UTF-8?q?=E7=82=B9=E6=97=B6=E5=87=BA=E5=BA=93a=E5=8D=95=E6=8D=AE?= =?UTF-8?q?=E4=BC=9A=E5=B8=A6=E5=87=BAb=E5=8D=95=E6=8D=AE=E6=9C=A8?= =?UTF-8?q?=E7=AE=B1=E9=97=AE=E9=A2=98=E8=A7=A3=E5=86=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../st/service/impl/StructivtServiceImpl.java | 10 ++- .../service/impl/ProductScrapServiceImpl.java | 2 +- .../service/impl/CheckOutBillServiceImpl.java | 20 +++-- .../st/outbill/wql/QST_IVT_CHECKOUTBILL.wql | 89 +++++++++++++++++++ .../org/nl/wms/st/outbill/wql/ST_OUTIVT04.wql | 12 +++ .../src/views/wms/basedata/st/ivt/index.vue | 24 ++++- 6 files changed, 146 insertions(+), 11 deletions(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/impl/StructivtServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/impl/StructivtServiceImpl.java index d8f6a5609..c1886edee 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/impl/StructivtServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/impl/StructivtServiceImpl.java @@ -291,7 +291,15 @@ public class StructivtServiceImpl implements StructivtService { mp.put("子卷的物性值1", json.getString("un_plan_product_property1")); mp.put("子卷的物性值2", json.getString("un_plan_product_property2")); mp.put("子卷的物性值3", json.getString("un_plan_product_property3")); - mp.put("备注", json.getString("remark")); + if (json.getString("remark").equals("1")) { + mp.put("超期原因", "客户原因"); + } else if (json.getString("remark").equals("2")) { + mp.put("超期原因", "生产质量原因"); + } else if (json.getString("remark").equals("3")){ + mp.put("超期原因", "市场原因"); + } else { + mp.put("超期原因", ""); + } mp.put("是否需要重打外包装标签", json.getString("isreprintpackageboxlabel")); mp.put("是否需要拆包重打子卷标签", json.getString("isunpackbox")); mp.put("客户要求规格幅宽", json.getString("width_standard")); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/service/impl/ProductScrapServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/service/impl/ProductScrapServiceImpl.java index 179d69d58..d9a037f21 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/service/impl/ProductScrapServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/service/impl/ProductScrapServiceImpl.java @@ -299,7 +299,7 @@ public class ProductScrapServiceImpl implements ProductScrapService { WQLObject dtl = WQLObject.getWQLObject("st_ivt_productscrapdtl"); WQLObject sub = WQLObject.getWQLObject("pdm_bi_subpackagerelation"); - List dtlList = dtl.query("scrap_id = '" + whereJson.getString("scrap_id") + "'").getResultJSONArray(0).toJavaList(JSONObject.class); + List dtlList = dtl.query("scrap_id = '" + whereJson.getString("scrap_id") + "' and qty >= 200").getResultJSONArray(0).toJavaList(JSONObject.class); String package_box_in = dtlList.stream() .map(row -> row.getString("package_box_sn")) diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/CheckOutBillServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/CheckOutBillServiceImpl.java index 5f38e11d6..9c847be46 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/CheckOutBillServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/CheckOutBillServiceImpl.java @@ -280,7 +280,7 @@ public class CheckOutBillServiceImpl implements CheckOutBillService { // rows.clear(); // 遍历 for (String box_no : boxSet) { - JSONObject jsonObject = WQL.getWO("QST_IVT_CHECKOUTBILL").addParam("flag", "7").addParam("box_no", box_no).process().uniqueResult(0); + JSONObject jsonObject = WQL.getWO("QST_IVT_CHECKOUTBILL").addParam("flag", "77").addParam("box_no", box_no).process().uniqueResult(0); rows.add(jsonObject); } } @@ -798,7 +798,7 @@ public class CheckOutBillServiceImpl implements CheckOutBillService { // rows.clear(); // 遍历 for (String box_no : boxSet) { - JSONObject jsonObject = WQL.getWO("QST_IVT_CHECKOUTBILL").addParam("flag", "7").addParam("box_no", box_no).process().uniqueResult(0); + JSONObject jsonObject = WQL.getWO("QST_IVT_CHECKOUTBILL").addParam("flag", "77").addParam("box_no", box_no).process().uniqueResult(0); rows.add(jsonObject); } } @@ -2802,6 +2802,7 @@ public class CheckOutBillServiceImpl implements CheckOutBillService { JSONArray disRowArr = WQL.getWO("ST_OUTIVT04") .addParam("flag", "23") .addParam("iostorinvdtl_id", iostorinvdtl_id) + .addParam("iostorinv_id", jsonRow.getString("iostorinv_id")) .addParam("block_num", jsonRow.getString("block_num")) .addParam("row_num", jsonRow.getString("row_num")) .process().getResultJSONArray(0); @@ -2872,6 +2873,7 @@ public class CheckOutBillServiceImpl implements CheckOutBillService { disRowArrNew = WQL.getWO("ST_OUTIVT04") .addParam("flag", "22") .addParam("iostorinvdtl_id", iostorinvdtl_id) + .addParam("iostorinv_id", jsonRow.getString("iostorinv_id")) .addParam("block_num", jsonRow.getString("block_num")) .addParam("row_num", jsonRow.getString("row_num")) .process().getResultJSONArray(0); @@ -2906,6 +2908,7 @@ public class CheckOutBillServiceImpl implements CheckOutBillService { disRowArrNew = WQL.getWO("ST_OUTIVT04") .addParam("flag", "2") .addParam("iostorinvdtl_id", iostorinvdtl_id) + .addParam("iostorinv_id", jsonRow.getString("iostorinv_id")) .addParam("block_num", jsonRow.getString("block_num")) .addParam("row_num", jsonRow.getString("row_num")) .process().getResultJSONArray(0); @@ -2939,6 +2942,7 @@ public class CheckOutBillServiceImpl implements CheckOutBillService { disRowArrNew = WQL.getWO("ST_OUTIVT04") .addParam("flag", "2") .addParam("iostorinvdtl_id", iostorinvdtl_id) + .addParam("iostorinv_id", jsonRow.getString("iostorinv_id")) .addParam("block_num", jsonRow.getString("block_num")) .addParam("row_num", jsonRow.getString("row_num")) .process().getResultJSONArray(0); @@ -2968,12 +2972,13 @@ public class CheckOutBillServiceImpl implements CheckOutBillService { error += json.getString("struct_code") + ","; } - throw new BadRequestException("仓位：" + error + "被锁定且未下发任务"); + throw new BadRequestException("仓位：" + error + "被锁定请等待下发任务并等待任务完成"); } // 重新按照排序查询 disRowArrNew = WQL.getWO("ST_OUTIVT04") .addParam("flag", "22") .addParam("iostorinvdtl_id", iostorinvdtl_id) + .addParam("iostorinv_id", jsonRow.getString("iostorinv_id")) .addParam("block_num", jsonRow.getString("block_num")) .addParam("row_num", jsonRow.getString("row_num")) .process().getResultJSONArray(0); @@ -3001,13 +3006,14 @@ public class CheckOutBillServiceImpl implements CheckOutBillService { error += json.getString("struct_code") + ","; } - throw new BadRequestException("仓位：" + error + "被锁定且未下发任务"); + throw new BadRequestException("仓位：" + error + "被锁定请等待下发任务并等待任务完成"); } // 重新按照排序查询 disRowArrNew = WQL.getWO("ST_OUTIVT04") .addParam("flag", "2") .addParam("iostorinvdtl_id", iostorinvdtl_id) + .addParam("iostorinv_id", jsonRow.getString("iostorinv_id")) .addParam("block_num", jsonRow.getString("block_num")) .addParam("row_num", jsonRow.getString("row_num")) .process().getResultJSONArray(0); @@ -3415,7 +3421,7 @@ public class CheckOutBillServiceImpl implements CheckOutBillService { error += json.getString("struct_code") + ","; } - throw new BadRequestException("仓位：" + error + "被锁定且未下发任务"); + throw new BadRequestException("仓位：" + error + "被锁定请等待下发任务并等待任务完成"); } // 重新按照排序查询 disRowArrNew = WQL.getWO("ST_OUTIVT04") @@ -3446,7 +3452,7 @@ public class CheckOutBillServiceImpl implements CheckOutBillService { error += json.getString("struct_code") + ","; } - throw new BadRequestException("仓位：" + error + "被锁定且未下发任务"); + throw new BadRequestException("仓位：" + error + "被锁定请等待下发任务并等待任务完成!"); } // 重新按照排序查询 @@ -5254,7 +5260,7 @@ public class CheckOutBillServiceImpl implements CheckOutBillService { JSONArray array = new JSONArray(); // 遍历 for (String box_no : boxSet) { - JSONArray boxArr = WQL.getWO("QST_IVT_CHECKOUTBILL").addParam("flag", "7").addParam("box_no", box_no).process().getResultJSONArray(0); + JSONArray boxArr = WQL.getWO("QST_IVT_CHECKOUTBILL").addParam("flag", "77").addParam("box_no", box_no).process().getResultJSONArray(0); array.addAll(boxArr); } return array; diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/wql/QST_IVT_CHECKOUTBILL.wql b/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/wql/QST_IVT_CHECKOUTBILL.wql index aaa3cb5f3..316615d06 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/wql/QST_IVT_CHECKOUTBILL.wql +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/wql/QST_IVT_CHECKOUTBILL.wql @@ -752,6 +752,95 @@ ENDPAGEQUERY ENDIF + IF 输入.flag = "77" + QUERY + SELECT + ivt.stockrecord_id, + ivt.struct_id, + ivt.struct_code, + ivt.struct_name, + ivt.region_id, + ivt.material_id, + ivt.quality_scode, + ivt.pcsn, + ivt.canuse_qty, + ivt.frozen_qty, + ivt.ivt_qty AS plan_qty, + ivt.warehousing_qty, + ivt.qty_unit_id, + ivt.instorage_time, + mater.material_name, + mater.material_code, + unit.unit_name AS qty_unit_name, + attr.storagevehicle_code AS box_no, + sub.sap_pcsn + FROM + ST_IVT_StructIvt ivt + LEFT JOIN md_me_materialbase mater ON mater.material_id = ivt.material_id + LEFT JOIN md_pb_measureunit unit ON unit.measure_unit_id = ivt.qty_unit_id + LEFT JOIN ST_IVT_StructAttr attr ON attr.struct_id = ivt.struct_id + LEFT JOIN PDM_BI_SubPackageRelation sub ON ivt.pcsn = sub.container_name AND sub.status = '2' AND attr.storagevehicle_code = sub.package_box_sn + WHERE + attr.is_delete = '0' + AND attr.is_used = '1' + + OPTION 输入.material_code <> "" + (mater.material_code like 输入.material_code or + mater.material_name like 输入.material_code) + ENDOPTION + + OPTION 输入.stor_id <> "" + attr.stor_id = 输入.stor_id + ENDOPTION + + OPTION 输入.sap_pcsn <> "" + sub.sap_pcsn like 输入.sap_pcsn + ENDOPTION + + OPTION 输入.package_box_sn <> "" + sub.package_box_sn like 输入.package_box_sn + ENDOPTION + + OPTION 输入.pcsn <> "" + ivt.pcsn like 输入.pcsn + ENDOPTION + + OPTION 输入.begin_time <> "" + ivt.instorage_time >= 输入.begin_time + ENDOPTION + + OPTION 输入.end_time <> "" + ivt.instorage_time <= 输入.end_time + ENDOPTION + + OPTION 输入.box_no <> "" + attr.storagevehicle_code = 输入.box_no + ENDOPTION + + OPTION 输入.canuse_qty <> "" + ivt.canuse_qty > 输入.canuse_qty + ENDOPTION + + OPTION 输入.width_standard <> "" + sub.width_standard = 输入.width_standard + ENDOPTION + + OPTION 输入.thickness_request <> "" + sub.thickness_request = 输入.thickness_request + ENDOPTION + + OPTION 输入.customer_name <> "" + sub.customer_name = 输入.customer_name + ENDOPTION + + OPTION 输入.struct_code <> "" + attr.struct_code like 输入.struct_code + ENDOPTION + + ENDSELECT + ENDQUERY + ENDIF + IF 输入.flag = "8" QUERY SELECT diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/wql/ST_OUTIVT04.wql b/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/wql/ST_OUTIVT04.wql index ab7dfdbf6..46bee9c35 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/wql/ST_OUTIVT04.wql +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/wql/ST_OUTIVT04.wql @@ -109,6 +109,10 @@ dis.iostorinvdis_id = 输入.iostorinvdis_id ENDOPTION + OPTION 输入.iostorinv_id <> "" + dis.iostorinv_id = 输入.iostorinv_id + ENDOPTION + OPTION 输入.block_num <> "" attr.block_num = 输入.block_num ENDOPTION @@ -162,6 +166,10 @@ dis.iostorinvdtl_id = 输入.iostorinvdtl_id ENDOPTION + OPTION 输入.iostorinv_id <> "" + dis.iostorinv_id = 输入.iostorinv_id + ENDOPTION + OPTION 输入.block_num <> "" attr.block_num = 输入.block_num ENDOPTION @@ -195,6 +203,10 @@ dis.iostorinvdtl_id = 输入.iostorinvdtl_id ENDOPTION + OPTION 输入.iostorinv_id <> "" + dis.iostorinv_id = 输入.iostorinv_id + ENDOPTION + OPTION 输入.iostorinvdis_id <> "" dis.iostorinvdis_id = 输入.iostorinvdis_id ENDOPTION diff --git a/lms/nladmin-ui/src/views/wms/basedata/st/ivt/index.vue b/lms/nladmin-ui/src/views/wms/basedata/st/ivt/index.vue index 928ae3ab1..52b590558 100644 --- a/lms/nladmin-ui/src/views/wms/basedata/st/ivt/index.vue +++ b/lms/nladmin-ui/src/views/wms/basedata/st/ivt/index.vue @@ -200,9 +200,24 @@ - + @@ -258,6 +273,11 @@ export default { { 'value': '2', 'label': '改切' }, { 'value': '1', 'label': '返检' } ], + remarkList: [ + { 'value': '1', 'label': '客户原因' }, + { 'value': '2', 'label': '生产质量原因' }, + { 'value': '3', 'label': '市场原因' } + ], permission: { }, rules: { From f8df3e6861080490bbe4503be24a63d8b5bd0953 Mon Sep 17 00:00:00 2001 From: liuxy Date: Mon, 4 Dec 2023 20:16:12 +0800 Subject: [PATCH 2/2] =?UTF-8?q?rev=EF=BC=9A=E6=88=90=E5=93=81=E5=87=BA?= =?UTF-8?q?=E5=BA=93=E8=AE=BE=E7=BD=AE=E7=AB=99=E7=82=B9=E6=9C=AA=E7=94=9F?= =?UTF-8?q?=E6=88=90=E4=BB=BB=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../st/outbill/service/impl/CheckOutBillServiceImpl.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/CheckOutBillServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/CheckOutBillServiceImpl.java index 9c847be46..05bd39760 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/CheckOutBillServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/CheckOutBillServiceImpl.java @@ -3753,7 +3753,7 @@ public class CheckOutBillServiceImpl implements CheckOutBillService { * @param arr * @return */ - /*public JSONArray isNum(JSONArray arr) { + /* public JSONArray isNum(JSONArray arr) { WQLObject taskTab = WQLObject.getWQLObject("sch_base_task"); // 任务表 JSONArray result = new JSONArray(); @@ -3783,11 +3783,11 @@ public class CheckOutBillServiceImpl implements CheckOutBillService { for (int i = 0; i < arr.size(); i++) { JSONObject jo = arr.getJSONObject(i); String struct_code = jo.getString("struct_code"); - boolean flag = false; + boolean flag = true; for (int j = 0; j < task_ja.size(); j++) { JSONObject task_jo = task_ja.getJSONObject(j); if (task_jo.getString("point_code1").equals(struct_code)) { - flag = true; + flag = false; break; } }