From 7a0dbbac4763fc40fbdf360acacd26a033fcb58b Mon Sep 17 00:00:00 2001 From: "ZHOUZ\\Noble'lift" <1014987728@qq.com> Date: Tue, 12 Sep 2023 17:57:12 +0800 Subject: [PATCH] =?UTF-8?q?rev:=E5=8F=91=E8=B4=A7=E5=8D=95=E3=80=81?= =?UTF-8?q?=E8=B0=83=E6=8B=A8=E5=8D=95EXCEL=E4=BF=AE=E6=94=B9=EF=BC=9B?= =?UTF-8?q?=E8=BF=94=E6=A3=80=E5=87=BA=E5=BA=93=E5=88=A0=E9=99=A4=E5=8C=85?= =?UTF-8?q?=E8=A3=85=E5=85=B3=E7=B3=BBBUG=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/CheckOutBillServiceImpl.java | 30 ++++++++++++++----- .../service/impl/OutBillQueryServiceImpl.java | 3 ++ .../nl/wms/stat/wql/ST_IVT_OUTBILLQUERY.wql | 4 ++- .../nl/wms/stat/wql/ST_IVT_PASTIVTQUERY.wql | 1 - .../src/views/wms/st/outbill/ViewDialog.vue | 18 +++++++++++ .../src/views/wms/stat/outbillquery/index.vue | 1 + 6 files changed, 47 insertions(+), 10 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 9314e6035..1349efd0f 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 @@ -3732,7 +3732,7 @@ public class CheckOutBillServiceImpl implements CheckOutBillService { String struct_code = json.getString("struct_code"); String vehicle_code = json.getString("storagevehicle_code"); - JSONObject jsonTask1 = taskTab.query("point_code1 = '" + struct_code + "' and task_status in ('05','06','07') and vehicle_code = '"+vehicle_code+"'").uniqueResult(0); + JSONObject jsonTask1 = taskTab.query("point_code1 = '" + struct_code + "' and task_status in ('05','06','07') and vehicle_code = '" + vehicle_code + "'").uniqueResult(0); if (ObjectUtil.isNotEmpty(jsonTask1)) { @@ -4217,7 +4217,8 @@ public class CheckOutBillServiceImpl implements CheckOutBillService { JSONObject dtl_jo = WQLObject.getWQLObject("st_ivt_iostorinvdtl").query("iostorinvdtl_id = '" + dis.getString("iostorinvdtl_id") + "'").uniqueResult(0); // 更新子卷包装关系表 状态 - 3 JSONObject jsonSub = subTab.query("container_name = '" + dis.getString("pcsn") + "' and package_box_sn = '" + dis.getString("box_no") + "' and status = '2'").uniqueResult(0); - if (ObjectUtil.isEmpty(jsonSub)) throw new BadRequestException("此子卷不存在或不为入库状态：" + dis.getString("pcsn")); + if (ObjectUtil.isEmpty(jsonSub)) + throw new BadRequestException("此子卷不存在或不为入库状态：" + dis.getString("pcsn")); // 如果是拆分入库则将包装关系改为生成状态 if (jo_mst.getString("bill_type").equals("1005") || (jo_mst.getString("bill_type").equals("1009"))) { jsonSub.put("status", "0"); @@ -4347,12 +4348,12 @@ public class CheckOutBillServiceImpl implements CheckOutBillService { String sect_code = dis_row.getString("sect_code"); //如果是虚拟区的出库，直接把包装关系删除；如果为立库的包装关系，将解绑删除标识置为1。当发货区解绑时，删除包装关系 String pcsn = dis_row.getString("pcsn"); - if (sect_code.equals("XN01")){ - WQLObject.getWQLObject("pdm_bi_subpackagerelation").delete("container_name = '"+pcsn+"'"); - }else { - HashMap map = new HashMap<>(); - map.put("need_delete","1"); - WQLObject.getWQLObject("pdm_bi_subpackagerelation").update(map,"container_name = '"+pcsn+"'"); + if (sect_code.equals("XN01")) { + WQLObject.getWQLObject("pdm_bi_subpackagerelation").delete("container_name = '" + pcsn + "'"); + } else { + HashMap map = new HashMap<>(); + map.put("need_delete", "1"); + WQLObject.getWQLObject("pdm_bi_subpackagerelation").update(map, "container_name = '" + pcsn + "'"); } } @@ -4641,6 +4642,8 @@ public class CheckOutBillServiceImpl implements CheckOutBillService { WQLObject wo_dis = WQLObject.getWQLObject("ST_IVT_IOStorInvDis"); //出库明细表 WQLObject wo_dtl = WQLObject.getWQLObject("st_ivt_iostorinvdtl"); + //出库主表 + WQLObject wo_mst = WQLObject.getWQLObject("st_ivt_iostorinv"); //任务表 WQLObject wo_Task = WQLObject.getWQLObject("SCH_BASE_Task"); String task_id = whereJson.getString("task_id"); @@ -4668,6 +4671,17 @@ public class CheckOutBillServiceImpl implements CheckOutBillService { JSONObject dtljo = wo_dis.query("task_id='" + task_id + "'").uniqueResult(0); whereJson.put("iostorinv_id", dtljo.getString("iostorinv_id")); + JSONObject mst_jo = wo_mst.query("iostorinv_id = '" + dtljo.getString("iostorinv_id") + "'").uniqueResult(0); + if (ObjectUtil.isEmpty(mst_jo)) { + throw new BadRequestException("未查询到对应的出库单据！"); + } else { + if (mst_jo.getString("bill_type").equals("1003") || mst_jo.getString("bill_type").equals("1006")){ + HashMap map = new HashMap<>(); + map.put("need_delete", "1"); + WQLObject.getWQLObject("pdm_bi_subpackagerelation").update(map, "package_box_sn = '" + task.getString("vehicle_code") + "'"); + } + } + HashMap map = new HashMap<>(); map.put("task_status", TaskStatusEnum.FINISHED.getCode()); map.put("finished_type", "01"); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/stat/service/impl/OutBillQueryServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/stat/service/impl/OutBillQueryServiceImpl.java index 56412a3a3..ef5edfdb8 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/stat/service/impl/OutBillQueryServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/stat/service/impl/OutBillQueryServiceImpl.java @@ -122,6 +122,9 @@ public class OutBillQueryServiceImpl implements OutBillQueryService { Map mp = new LinkedHashMap<>(); mp.put("仓库", json.getString("stor_name")); + if (ObjectUtil.isNotEmpty(bill_type) && bill_type.equals("1004")){ + mp.put("移入仓库", json.getString("in_stor_name")); + } mp.put("库区", json.getString("sect_name")); mp.put("交货单号", json.getString("vbeln")); mp.put("物流公司", json.getString("cust_name")); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/stat/wql/ST_IVT_OUTBILLQUERY.wql b/lms/nladmin-system/src/main/java/org/nl/wms/stat/wql/ST_IVT_OUTBILLQUERY.wql index 2e6e929f5..51c49b3b8 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/stat/wql/ST_IVT_OUTBILLQUERY.wql +++ b/lms/nladmin-system/src/main/java/org/nl/wms/stat/wql/ST_IVT_OUTBILLQUERY.wql @@ -68,13 +68,15 @@ sub.thickness, sub.mass_per_unit_area, mst.input_optname, - mst.remark + mst.remark, + stor.stor_name AS in_stor_name FROM st_ivt_iostorinvdis dis LEFT JOIN st_ivt_iostorinv mst ON mst.iostorinv_id = dis.iostorinv_id LEFT JOIN st_ivt_iostorinvdtl dtl ON dtl.iostorinvdtl_id = dis.iostorinvdtl_id LEFT JOIN md_cs_transportationbase base ON base.cust_code = mst.trans_code LEFT JOIN md_me_materialbase mater ON mater.material_id = dis.material_id + LEFT JOIN st_ivt_bsrealstorattr stor ON stor.stor_id = mst.out_stor_id LEFT JOIN pdm_bi_subpackagerelation sub ON sub.container_name = dis.pcsn AND sub.package_box_sn = dis.box_no WHERE mst.io_type = '1' diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/stat/wql/ST_IVT_PASTIVTQUERY.wql b/lms/nladmin-system/src/main/java/org/nl/wms/stat/wql/ST_IVT_PASTIVTQUERY.wql index d602190da..1f8c2a8e5 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/stat/wql/ST_IVT_PASTIVTQUERY.wql +++ b/lms/nladmin-system/src/main/java/org/nl/wms/stat/wql/ST_IVT_PASTIVTQUERY.wql @@ -82,7 +82,6 @@ sub.box_width, sub.box_high, sub.remark, - (90 - DATEDIFF(NOW(),sub.date_of_production)) AS sid_day FROM st_ivt_structivt ivt diff --git a/lms/nladmin-ui/src/views/wms/st/outbill/ViewDialog.vue b/lms/nladmin-ui/src/views/wms/st/outbill/ViewDialog.vue index 511b574fe..1e424ea58 100644 --- a/lms/nladmin-ui/src/views/wms/st/outbill/ViewDialog.vue +++ b/lms/nladmin-ui/src/views/wms/st/outbill/ViewDialog.vue @@ -84,6 +84,24 @@ + + + + + + diff --git a/lms/nladmin-ui/src/views/wms/stat/outbillquery/index.vue b/lms/nladmin-ui/src/views/wms/stat/outbillquery/index.vue index bd180d31c..e10d6f63e 100644 --- a/lms/nladmin-ui/src/views/wms/stat/outbillquery/index.vue +++ b/lms/nladmin-ui/src/views/wms/stat/outbillquery/index.vue @@ -104,6 +104,7 @@ style="width: 100%;" > +