From dba5a0c917a522a0d5cb06689e73caf2406b81d2 Mon Sep 17 00:00:00 2001 From: liuxy Date: Wed, 6 Jul 2022 11:27:49 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wms/pdm/produce/worktask/print2Dialog.vue | 32 +++++++++++-------- .../repair/devicerepairpa/AddChangeDialog.vue | 19 +++++------ 2 files changed, 29 insertions(+), 22 deletions(-) diff --git a/mes/qd/src/views/wms/pdm/produce/worktask/print2Dialog.vue b/mes/qd/src/views/wms/pdm/produce/worktask/print2Dialog.vue index 689f62af..68411482 100644 --- a/mes/qd/src/views/wms/pdm/produce/worktask/print2Dialog.vue +++ b/mes/qd/src/views/wms/pdm/produce/worktask/print2Dialog.vue @@ -136,26 +136,32 @@ export default { const time = item.planstart_time var num = Number.parseFloat(item.storage_qty) const strTime = time.slice(0, 10) + let pcsn = item.pcsn + if (pcsn.length > 10) { + pcsn = '批次：' + pcsn.slice(0, 10) + '\n' + ' ' + pcsn.slice(10) + } else { + pcsn = '批次：' + pcsn + } const LODOP = getLodop() - LODOP.SET_SHOW_MODE('HIDE_DISBUTTIN_SETUP', 1)// 隐藏那些无效按钮 - LODOP.SET_PRINT_PAGESIZE(1, '90mm', '90mm', '') - LODOP.ADD_PRINT_RECT('5mm', '5mm', '80mm', '80mm', 0, 1) - LODOP.ADD_PRINT_BARCODE('6mm', '6mm', '40mm', '40mm', 'QRCode', item.bucketunique + '##' + item.material_id + '##' + item.pcsn + '##' + item.storage_qty + '##' + strTime+ '##' + item.order_no+ '##' + item.is_active) - LODOP.SET_PRINT_STYLE('FontSize', 20) + LODOP.PRINT_INIT('') + LODOP.SET_PRINT_PAGESIZE(1, '80mm', '60mm', '') + LODOP.ADD_PRINT_RECT('1mm', '3mm', '74mm', '54mm', 0, 1) + LODOP.SET_PRINT_STYLE('FontSize', 12) LODOP.SET_PRINT_STYLE('Bold', 1) - LODOP.ADD_PRINT_HTM('14mm', '40mm', '90mm', '15mm', '日期：'+strTime) - LODOP.ADD_PRINT_HTM('22mm', '40mm', '90mm', '15mm', '重量：'+ num.toFixed(3)+ 'kg') - LODOP.ADD_PRINT_HTM('40mm', '8mm', '90mm', '15mm', '桶号：'+item.bucketunique+'') - LODOP.ADD_PRINT_HTM('48mm', '8mm', '90mm', '15mm', '编码：'+item.material_code+'') - LODOP.ADD_PRINT_HTM('56mm', '8mm', '90mm', '15mm', '名称：'+item.material_name+'') - LODOP.ADD_PRINT_HTM('64mm', '8mm', '90mm', '15mm', '批次：'+item.pcsn+'') - LODOP.ADD_PRINT_HTM('72mm', '8mm', '90mm', '15mm', '顺序号：'+item.order_no+'') + LODOP.ADD_PRINT_BARCODE('2mm', '4mm', '33mm', '33mm', 'QRCode', item.bucketunique + '##' + item.material_id + '##' + item.pcsn + '##' + item.storage_qty + '##' + strTime + '##' + item.order_no + '##' + item.is_active) + LODOP.ADD_PRINT_TEXT('5mm', '35mm', '50mm', '15mm', '日期：' + strTime) + LODOP.ADD_PRINT_TEXT('15mm', '35mm', '50mm', '15mm', pcsn) + LODOP.ADD_PRINT_TEXT('25mm', '35mm', '50mm', '15mm', '重量：' + num.toFixed(3) + 'kg') + LODOP.ADD_PRINT_TEXT('34mm', '5mm', '80mm', '15mm', '桶号：' + item.bucketunique + '') + LODOP.ADD_PRINT_TEXT('41mm', '5mm', '80mm', '15mm', '编码：' + item.material_code + '') + LODOP.ADD_PRINT_TEXT('48mm', '5mm', '80mm', '15mm', '名称：' + item.material_name + '') + LODOP.ADD_PRINT_TEXT('48mm', '59mm', '80mm', '15mm', '序号：' + item.order_no + '') // LODOP.PREVIEW()// 预览 LODOP.PRINT()// 打印 }) this.crud.notify('打印成功', CRUD.NOTIFICATION_TYPE.SUCCESS) }) - }, + } } } diff --git a/mes/qd/src/views/wms/sb/repair/devicerepairpa/AddChangeDialog.vue b/mes/qd/src/views/wms/sb/repair/devicerepairpa/AddChangeDialog.vue index ad12c6a8..31c20bea 100644 --- a/mes/qd/src/views/wms/sb/repair/devicerepairpa/AddChangeDialog.vue +++ b/mes/qd/src/views/wms/sb/repair/devicerepairpa/AddChangeDialog.vue @@ -190,18 +190,19 @@ export default { }, addIvt(index, row) { this.bomShow = true - this.fileBomJson = row - this.fileBomindex = index + this.nowindex = index + this.nowrow = row }, tableChanged2(row) { debugger - const arr = this.fileBom - for (let i = 0; i < arr.length; i++) { - if (i === this.fileBomindex) { - arr[i].change_only_id = row.sparepart_only_id - } - } - this.fileBom = arr + // const arr = this.fileBom + // for (let i = 0; i < arr.length; i++) { + // if (i === this.fileBomindex) { + // arr[i].change_only_id = row.sparepart_only_id + // } + // } + // this.fileBom = arr + this.$set(this.nowrow, 'change_only_id', row.sparepart_only_id) } } } From ec18c8a4fdc4b14b7c12342fce22a1bed6ee4771 Mon Sep 17 00:00:00 2001 From: zds <2388969634@qq.com> Date: Wed, 6 Jul 2022 14:09:29 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/org/nl/wms/pdm/service/impl/WorkTaskServiceImpl.java | 3 +++ mes/qd/src/views/wms/st/inStor/shutFrame/AddDialog.vue | 1 - 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/WorkTaskServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/WorkTaskServiceImpl.java index c3712d5b..ad5dc5f0 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/WorkTaskServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/WorkTaskServiceImpl.java @@ -199,6 +199,9 @@ public class WorkTaskServiceImpl implements WorkTaskService { FormulaMap.put("start_time", now); PDM_BI_Formula.update(FormulaMap, "status='20' and workorder_id ='" + jsonMst.getString("workorder_id") + "' and material_id='"+jsonMst.getString("material_id")+"'"); } + if (jsonMst.getString("workprocedure_code").equals(topDtl.getString("workprocedure_code"))) { + workordeMap.put("realstart_time", now); + } //更新工令 PDM_BI_WorkOrder.update(workordeMap, "workorder_id ='" + jsonMst.getString("workorder_id") + "'"); } diff --git a/mes/qd/src/views/wms/st/inStor/shutFrame/AddDialog.vue b/mes/qd/src/views/wms/st/inStor/shutFrame/AddDialog.vue index daa77b73..6b55ad5d 100644 --- a/mes/qd/src/views/wms/st/inStor/shutFrame/AddDialog.vue +++ b/mes/qd/src/views/wms/st/inStor/shutFrame/AddDialog.vue @@ -292,7 +292,6 @@ export default { tableChanged(row) { this.form.material_code = row.material_code this.form.material_id = row.material_id - //this.form.tableData = [] this.tableData1 = [] this.form.detail_count = this.form.tableData.length