From 3c23807c4fbefdea1b503b440e844603cc4f4921 Mon Sep 17 00:00:00 2001 From: "ZHOUZ\\Noble'lift" <1014987728@qq.com> Date: Thu, 21 Jul 2022 15:06:13 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/org/nl/ext/erp/service/impl/WmsToErpServiceImpl.java | 3 ++- mes/qd/src/views/wms/sb/inbill/DivDialog.vue | 4 ---- mes/qd/src/views/wms/sb/inbill/ViewDialog.vue | 1 - 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/ext/erp/service/impl/WmsToErpServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/ext/erp/service/impl/WmsToErpServiceImpl.java index ae5a9516..eb3f9f1c 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/ext/erp/service/impl/WmsToErpServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/ext/erp/service/impl/WmsToErpServiceImpl.java @@ -400,7 +400,7 @@ public class WmsToErpServiceImpl implements WmsToErpService { whereMap = new HashMap(map); } - JSONArray ja = WQL.getWO("QERP").setDbname("dataSource1").addParamMap(whereMap).addParam("flag", "4").process().getResultJSONArray(0); + JSONArray ja = WQL.getWO("QERP").setDbname("dataSource1").addParamMap(whereMap).addParam("flag", "5").process().getResultJSONArray(0); log.info("备件入库单导入数据---------:" + ja.toString()); for (int i = 0; i < ja.size(); i++) { @@ -409,6 +409,7 @@ public class WmsToErpServiceImpl implements WmsToErpService { JSONObject purchase = purchaseIn_wql.query("CGENERALBID = '"+CGENERALBID+"'").uniqueResult(0); if (ObjectUtil.isEmpty(purchase)){ purchase = new JSONObject(); + purchase.put("id", IdUtil.getSnowflake(1, 1).nextId()); purchase.put("CGENERALHID",jo.getString("CGENERALHID")); purchase.put("CGENERALBID",jo.getString("CGENERALBID")); purchase.put("CROWNO",jo.getString("CROWNO")); diff --git a/mes/qd/src/views/wms/sb/inbill/DivDialog.vue b/mes/qd/src/views/wms/sb/inbill/DivDialog.vue index de804d19..360f63fc 100644 --- a/mes/qd/src/views/wms/sb/inbill/DivDialog.vue +++ b/mes/qd/src/views/wms/sb/inbill/DivDialog.vue @@ -237,10 +237,6 @@ export default { }, clcikRow(row, column, event) { this.form.dtl_row = row - sparePart.getIODtl({ 'bill_code': this.form.dtl_row.bill_code }).then(res => { - this.openParam = res - this.form.dtl_row = res[row.index] - }) sparePart.getDisDtl(row).then(res => { this.form.tableMater = res }) diff --git a/mes/qd/src/views/wms/sb/inbill/ViewDialog.vue b/mes/qd/src/views/wms/sb/inbill/ViewDialog.vue index 6372c652..32c65e10 100644 --- a/mes/qd/src/views/wms/sb/inbill/ViewDialog.vue +++ b/mes/qd/src/views/wms/sb/inbill/ViewDialog.vue @@ -239,7 +239,6 @@ export default { return this.dict.label.work_status[row.work_status] }, handleDtlCurrentChange(current) { - debugger if (current !== null) { this.tabledis = [] this.currentdtl = current