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 eb3f9f1c..aed5bc24 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 @@ -405,46 +405,46 @@ public class WmsToErpServiceImpl implements WmsToErpService { for (int i = 0; i < ja.size(); i++) { JSONObject jo = ja.getJSONObject(i); - String CGENERALBID = jo.getString("CGENERALBID"); + String CGENERALBID = jo.getString("cgeneralbid"); 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")); - purchase.put("ITEM_ID",jo.getString("ITEM_ID")); - purchase.put("ITEM_NO",jo.getString("ITEM_NO")); - purchase.put("ITEM_NAME",jo.getString("ITEM_NAME")); - purchase.put("MATERIALSPEC",jo.getString("MATERIALSPEC")); - purchase.put("MATERIALTYPE",jo.getString("MATERIALTYPE")); - purchase.put("VBILLCODE",jo.getString("VBILLCODE")); - purchase.put("DBILLDATE",jo.getString("DBILLDATE")); - purchase.put("DR",jo.getString("DR")); - purchase.put("CREATOR",jo.getString("CREATOR")); - purchase.put("CREATIONTIME",jo.getString("CREATIONTIME")); - purchase.put("T_NOTE",jo.getString("T_NOTE")); - purchase.put("FBILLFLAG",jo.getString("FBILLFLAG")); - purchase.put("QTY",jo.getString("QTY")); - purchase.put("F_QTY",jo.getString("F_QTY")); - purchase.put("UNIT",jo.getString("UNIT")); - purchase.put("F_UNIT",jo.getString("F_UNIT")); - purchase.put("D_NOTE",jo.getString("D_NOTE")); - purchase.put("VBATCHCODE",jo.getString("VBATCHCODE")); - purchase.put("PK_BATCHCODE",jo.getString("PK_BATCHCODE")); - purchase.put("CG_EMPL",jo.getString("CG_EMPL")); - purchase.put("VEND_NAME",jo.getString("VEND_NAME")); + purchase.put("CGENERALHID",jo.getString("cgeneralhid")); + purchase.put("CGENERALBID",jo.getString("cgeneralbid")); + purchase.put("CROWNO",jo.getString("crowno")); + purchase.put("ITEM_ID",jo.getString("item_id")); + purchase.put("ITEM_NO",jo.getString("item_no")); + purchase.put("ITEM_NAME",jo.getString("item_name")); + purchase.put("MATERIALSPEC",jo.getString("materialspec")); + purchase.put("MATERIALTYPE",jo.getString("materialtype")); + purchase.put("VBILLCODE",jo.getString("vbillcode")); + purchase.put("DBILLDATE",jo.getString("dbilldate")); + purchase.put("DR",jo.getString("dr")); + purchase.put("CREATOR",jo.getString("creator")); + purchase.put("CREATIONTIME",jo.getString("creationtime")); + purchase.put("T_NOTE",jo.getString("t_note")); + purchase.put("FBILLFLAG",jo.getString("fbillflag")); + purchase.put("QTY",jo.getString("qty")); + purchase.put("F_QTY",jo.getString("f_qty")); + purchase.put("UNIT",jo.getString("unit")); + purchase.put("F_UNIT",jo.getString("f_unit")); + purchase.put("D_NOTE",jo.getString("d_note")); + purchase.put("VBATCHCODE",jo.getString("vbatchcode")); + purchase.put("PK_BATCHCODE",jo.getString("pk_batchcode")); + purchase.put("CG_EMPL",jo.getString("cg_empl")); + purchase.put("VEND_NAME",jo.getString("vend_name")); purchase.put("input_optid","1452555001116364823"); purchase.put("input_optname","mes系统"); purchase.put("input_time",DateUtil.now()); - if (jo.getString("FBILLFLAG").equals("2")){ + if (jo.getString("fbillflag").equals("2")){ purchase.put("proc_status","01"); - }else if (jo.getString("FBILLFLAG").equals("3")){ + }else if (jo.getString("fbillflag").equals("3")){ purchase.put("proc_status","02"); }else { throw new BadRequestException("备件采购订单状态不符！"); } - if (jo.getString("FBILLFLAG").equals("3")){ + if (jo.getString("fbillflag").equals("3")){ //生成入库单 JSONObject io_mst = new JSONObject(); String iostorinv_id = IdUtil.getSnowflake(1, 1).nextId() + ""; @@ -492,12 +492,12 @@ public class WmsToErpServiceImpl implements WmsToErpService { JSONObject qty_jo = WQLObject.getWQLObject("md_pb_measureunit").query("ext_id = '"+purchase.getString("UNIT")+"'").uniqueResult(0); io_dtl.put("qty_unit_id",qty_jo.getString("measure_unit_id")); io_dtl.put("qty_unit_name",qty_jo.getString("unit_name")); - io_dtl.put("plan_qty",purchase.getString("QTY")); - io_dtl.put("source_billdtl_id",purchase.getString("CGENERALBID")); + io_dtl.put("plan_qty",purchase.getString("qty")); + io_dtl.put("source_billdtl_id",purchase.getString("id")); io_dtl.put("source_bill_type",purchase.getString("PO")); io_dtl.put("source_bill_code",purchase.getString("VBILLCODE")); io_dtl.put("source_bill_table",purchase.getString("EM_BI_ErpPurchaseIn")); - io_dtl.put("base_billdtl_id",purchase.getString("CGENERALBID")); + io_dtl.put("base_billdtl_id",purchase.getString("id")); io_dtl.put("base_bill_type",purchase.getString("PO")); io_dtl.put("base_bill_code",purchase.getString("VBILLCODE")); io_dtl.put("base_bill_table",purchase.getString("EM_BI_ErpPurchaseIn")); @@ -509,40 +509,40 @@ public class WmsToErpServiceImpl implements WmsToErpService { if (purchase.getString("proc_status").equals("02")){ continue; }else { - purchase.put("CGENERALBID",jo.getString("CGENERALBID")); - purchase.put("CROWNO",jo.getString("CROWNO")); - purchase.put("ITEM_ID",jo.getString("ITEM_ID")); - purchase.put("ITEM_NO",jo.getString("ITEM_NO")); - purchase.put("ITEM_NAME",jo.getString("ITEM_NAME")); - purchase.put("MATERIALSPEC",jo.getString("MATERIALSPEC")); - purchase.put("MATERIALTYPE",jo.getString("MATERIALTYPE")); - purchase.put("VBILLCODE",jo.getString("VBILLCODE")); - purchase.put("DBILLDATE",jo.getString("DBILLDATE")); - purchase.put("DR",jo.getString("DR")); - purchase.put("CREATOR",jo.getString("CREATOR")); - purchase.put("CREATIONTIME",jo.getString("CREATIONTIME")); - purchase.put("T_NOTE",jo.getString("T_NOTE")); - purchase.put("FBILLFLAG",jo.getString("FBILLFLAG")); - purchase.put("QTY",jo.getString("QTY")); - purchase.put("F_QTY",jo.getString("F_QTY")); - purchase.put("UNIT",jo.getString("UNIT")); - purchase.put("F_UNIT",jo.getString("F_UNIT")); - purchase.put("D_NOTE",jo.getString("D_NOTE")); - purchase.put("VBATCHCODE",jo.getString("VBATCHCODE")); - purchase.put("PK_BATCHCODE",jo.getString("PK_BATCHCODE")); - purchase.put("CG_EMPL",jo.getString("CG_EMPL")); - purchase.put("VEND_NAME",jo.getString("VEND_NAME")); + purchase.put("CGENERALBID",jo.getString("cgeneralbid")); + purchase.put("CROWNO",jo.getString("crowno")); + purchase.put("ITEM_ID",jo.getString("item_id")); + purchase.put("ITEM_NO",jo.getString("item_no")); + purchase.put("ITEM_NAME",jo.getString("item_name")); + purchase.put("MATERIALSPEC",jo.getString("materialspec")); + purchase.put("MATERIALTYPE",jo.getString("materialtype")); + purchase.put("VBILLCODE",jo.getString("vbillcode")); + purchase.put("DBILLDATE",jo.getString("dbilldate")); + purchase.put("DR",jo.getString("dr")); + purchase.put("CREATOR",jo.getString("creator")); + purchase.put("CREATIONTIME",jo.getString("creationtime")); + purchase.put("T_NOTE",jo.getString("t_note")); + purchase.put("FBILLFLAG",jo.getString("fbillflag")); + purchase.put("QTY",jo.getString("qty")); + purchase.put("F_QTY",jo.getString("f_qty")); + purchase.put("UNIT",jo.getString("unit")); + purchase.put("F_UNIT",jo.getString("f_unit")); + purchase.put("D_NOTE",jo.getString("d_note")); + purchase.put("VBATCHCODE",jo.getString("vbatchcode")); + purchase.put("PK_BATCHCODE",jo.getString("pk_batchcode")); + purchase.put("CG_EMPL",jo.getString("cg_empl")); + purchase.put("VEND_NAME",jo.getString("vend_name")); purchase.put("update_optid","1452555001116364823"); purchase.put("update_optname","mes系统"); purchase.put("update_time",DateUtil.now()); - if (jo.getString("FBILLFLAG").equals("2")){ + if (jo.getString("fbillflag").equals("2")){ purchase.put("proc_status","01"); - }else if (jo.getString("FBILLFLAG").equals("3")){ + }else if (jo.getString("fbillflag").equals("3")){ purchase.put("proc_status","02"); }else { throw new BadRequestException("备件采购订单状态不符！"); } - if (jo.getString("FBILLFLAG").equals("3")){ + if (jo.getString("fbillflag").equals("3")){ //生成入库单 JSONObject io_mst = new JSONObject(); String iostorinv_id = IdUtil.getSnowflake(1, 1).nextId() + ""; @@ -590,12 +590,12 @@ public class WmsToErpServiceImpl implements WmsToErpService { JSONObject qty_jo = WQLObject.getWQLObject("md_pb_measureunit").query("ext_id = '"+purchase.getString("UNIT")+"'").uniqueResult(0); io_dtl.put("qty_unit_id",qty_jo.getString("measure_unit_id")); io_dtl.put("qty_unit_name",qty_jo.getString("unit_name")); - io_dtl.put("plan_qty",purchase.getString("QTY")); - io_dtl.put("source_billdtl_id",purchase.getString("CGENERALBID")); + io_dtl.put("plan_qty",purchase.getString("qty")); + io_dtl.put("source_billdtl_id",purchase.getString("id")); io_dtl.put("source_bill_type",purchase.getString("PO")); io_dtl.put("source_bill_code",purchase.getString("VBILLCODE")); io_dtl.put("source_bill_table",purchase.getString("EM_BI_ErpPurchaseIn")); - io_dtl.put("base_billdtl_id",purchase.getString("CGENERALBID")); + io_dtl.put("base_billdtl_id",purchase.getString("id")); io_dtl.put("base_bill_type",purchase.getString("PO")); io_dtl.put("base_bill_code",purchase.getString("VBILLCODE")); io_dtl.put("base_bill_table",purchase.getString("EM_BI_ErpPurchaseIn")); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/ext/erp/wql/QERP.wql b/mes/hd/nladmin-system/src/main/java/org/nl/ext/erp/wql/QERP.wql index b177c3e8..533cace7 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/ext/erp/wql/QERP.wql +++ b/mes/hd/nladmin-system/src/main/java/org/nl/ext/erp/wql/QERP.wql @@ -127,6 +127,26 @@ ENDQUERY ENDIF + IF 输入.flag = "5" + QUERY + SELECT + pp.* + FROM + PURCHASE_IN pp + WHERE 1=1 + OPTION 输入.import_date4 <> "" + pp.CREATIONTIME > to_date(输入.import_date3,'yyyy-mm-dd HH24:MI:SS') + ENDOPTION + OPTION 输入.begin_time <> "" + pp.CREATIONTIME >= to_date(输入.begin_time,'yyyy-mm-dd HH24:MI:SS') + ENDOPTION + OPTION 输入.end_time <> "" + pp.CREATIONTIME <= to_date(输入.end_time,'yyyy-mm-dd HH24:MI:SS') + ENDOPTION + ENDSELECT + ENDQUERY + ENDIF + diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/pda/sb/service/impl/SparePartServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/pda/sb/service/impl/SparePartServiceImpl.java index 4ce9ae69..9c9aa6ed 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/pda/sb/service/impl/SparePartServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/pda/sb/service/impl/SparePartServiceImpl.java @@ -149,7 +149,7 @@ public class SparePartServiceImpl implements SparePartService { dis_jo.put("material_id", dtl.getString("material_id")); dis_jo.put("pcsn", "999999"); dis_jo.put("real_qty", "1"); - dis_jo.put("work_status", "01"); + dis_jo.put("work_status", "99"); dis_jo.put("qty_unit_id", dtl.getString("qty_unit_id")); dis_jo.put("qty_unit_name", dtl.getString("qty_unit_name")); JSONObject stor = WQLObject.getWQLObject("st_ivt_bsrealstorattr").query("is_attachment = '1'").uniqueResult(0); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/pda/sb/wql/QPDAEM_BI_SPAREPART.wql b/mes/hd/nladmin-system/src/main/java/org/nl/pda/sb/wql/QPDAEM_BI_SPAREPART.wql index 3d264ff0..cb61d395 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/pda/sb/wql/QPDAEM_BI_SPAREPART.wql +++ b/mes/hd/nladmin-system/src/main/java/org/nl/pda/sb/wql/QPDAEM_BI_SPAREPART.wql @@ -252,8 +252,8 @@ run.prepare_times, run.error_times, run.adjust_times, - run.product_qty, - run.nok_qty, + round(run.product_qty,3) AS product_qty, + round(run.nok_qty,3) AS nok_qty, run.oee_value, run.run_date FROM diff --git a/mes/qd/src/api/wms/sb/sparepart.js b/mes/qd/src/api/wms/sb/sparepart.js index b90d252e..ebaf9b8c 100644 --- a/mes/qd/src/api/wms/sb/sparepart.js +++ b/mes/qd/src/api/wms/sb/sparepart.js @@ -202,12 +202,14 @@ export function backConfirm(data) { export function importData(data) { return request({ - url: 'api/inbill/importData', + url: 'api/sb/inbill/importData', method: 'put', data: data }) } -export default { add, edit, del, getType, getBillDtl, disConfirm, insertDtl, getIODtl, commit, checkVehicle, - deleteDisDtl, getDisDtl, createCode, divPoint, cancelCreate, - divStruct, bucketDtl, updateTask, delTask, reIssueTask, confirmTask, cancelTask, confirm, backConfirm } +export default { + add, edit, del, getType, getBillDtl, disConfirm, insertDtl, getIODtl, commit, checkVehicle, + deleteDisDtl, getDisDtl, createCode, divPoint, cancelCreate, importData, + divStruct, bucketDtl, updateTask, delTask, reIssueTask, confirmTask, cancelTask, confirm, backConfirm +} diff --git a/mes/qd/src/views/wms/sb/inbill/importOrder.vue b/mes/qd/src/views/wms/sb/inbill/importOrder.vue index 34e87504..4aaf5971 100644 --- a/mes/qd/src/views/wms/sb/inbill/importOrder.vue +++ b/mes/qd/src/views/wms/sb/inbill/importOrder.vue @@ -20,7 +20,7 @@ end-placeholder="结束日期" :default-time="['00:00:00', '23:59:59']" /> - 确认 + 确认 @@ -66,7 +66,7 @@ export default { this.$emit('update:dialogShow', false) this.$emit('tableChanged', this.rows) }, - queryStruct() { + confirm() { debugger this.fullscreenLoading = true sparePart.importData(this.form).then(res => { diff --git a/mes/qd/src/views/wms/sb/outbill/DivDialog.vue b/mes/qd/src/views/wms/sb/outbill/DivDialog.vue index 573cc75a..948e76b3 100644 --- a/mes/qd/src/views/wms/sb/outbill/DivDialog.vue +++ b/mes/qd/src/views/wms/sb/outbill/DivDialog.vue @@ -229,10 +229,6 @@ export default { clcikRow(row, column, event) { debugger 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 })