diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/pda/st/set/wql/QPADSTSETSERVICE.wql b/mes/hd/nladmin-system/src/main/java/org/nl/pda/st/set/wql/QPADSTSETSERVICE.wql index e3199606..2fe11568 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/pda/st/set/wql/QPADSTSETSERVICE.wql +++ b/mes/hd/nladmin-system/src/main/java/org/nl/pda/st/set/wql/QPADSTSETSERVICE.wql @@ -1,10 +1,10 @@ [交易说明] 交易名： 库区分页查询 - 所属模块： - 功能简述： - 版权所有： - 表引用： - 版本经历： + 所属模块： + 功能简述： + 版权所有： + 表引用： + 版本经历： [数据库] --指定数据库，为空采用默认值，默认为db.properties中列出的第一个库 @@ -31,26 +31,26 @@ [临时表] --这边列出来的临时表就会在运行期动态创建 - + [临时变量] --所有中间过程变量均可在此处定义 - + [业务过程] ########################################## # 1、输入输出检查 # ########################################## - + ########################################## # 2、主过程前处理 # ########################################## - - + + ########################################## # 3、业务主过程 # ########################################## - + IF 输入.flag = "1" PAGEQUERY SELECT @@ -292,16 +292,18 @@ bucket.is_active, bucket.bucketunique, bucket.material_id, - material_code, - material_name, + material.material_code, + material.material_name, bucket.pcsn, bucket.qty_unit_id, bucket.qty_unit_name, bucket.storage_qty, + materialext.old_mark, bucket.print_type FROM md_pb_bucketrecord bucket LEFT JOIN md_me_materialbase material ON material.material_id = bucket.material_id + LEFT JOIN md_me_producmaterialext materialext ON materialext.material_id = material.material_id WHERE 1 =1 OPTION 输入.bucketunique <> "" 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 f1e2ed3e..da4efebf 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 @@ -538,6 +538,7 @@ public class WorkTaskServiceImpl implements WorkTaskService { printJson.put("material_id", whereJson.getString("ext_id")); printJson.put("material_code", whereJson.getString("material_code")); printJson.put("material_name", whereJson.getString("material_name")); + printJson.put("old_mark", whereJson.getString("old_mark")); printJson.put("pcsn", whereJson.getString("pcsn")); printJson.put("storage_qty", whereJson.getString("standard_weight")); printJson.put("planstart_time", whereJson.getString("planstart_time")); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/wql/QPDM_WORKTASK01.wql b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/wql/QPDM_WORKTASK01.wql index b0bc46ae..629e3387 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/wql/QPDM_WORKTASK01.wql +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/wql/QPDM_WORKTASK01.wql @@ -59,6 +59,7 @@ 0 AS is_line, '1' AS begin_record_order, materialext.standard_weight, + materialext.old_mark, WorkOrder.workordercard_id, WorkOrder.STATUS AS order_status FROM 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 198b3444..c4fe9b56 100644 --- a/mes/qd/src/views/wms/pdm/produce/worktask/print2Dialog.vue +++ b/mes/qd/src/views/wms/pdm/produce/worktask/print2Dialog.vue @@ -145,18 +145,20 @@ export default { } const LODOP = getLodop() 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_PAGESIZE(1, '150mm', '100mm', '') + LODOP.ADD_PRINT_RECT('2mm', '2mm', '146mm', '96mm', 0, 1) + LODOP.SET_PRINT_STYLE('FontSize', 23) LODOP.SET_PRINT_STYLE('Bold', 1) - 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.ADD_PRINT_BARCODE('5mm', '5mm', '60mm', '60mm', 'QRCode', item.bucketunique + '##' + item.material_id + '##' + item.pcsn + '##' + item.storage_qty + '##' + strTime + '##' + item.order_no + '##' + item.is_active) + LODOP.ADD_PRINT_TEXT('7mm', '65mm', '80mm', '27mm', '日期：' + strTime) + LODOP.ADD_PRINT_TEXT('19mm', '65mm', '80mm', '27mm', pcsn) + LODOP.ADD_PRINT_TEXT('31mm', '65mm', '80mm', '27mm', '重量：' + num.toFixed(3) + 'kg') + LODOP.ADD_PRINT_TEXT('43mm', '65mm', '80mm', '27mm', '桶号：' + item.bucketunique + '') + + LODOP.ADD_PRINT_TEXT('59mm', '6mm', '140mm', '27mm', '编码：' + item.material_code + '') + LODOP.ADD_PRINT_TEXT('85mm', '6mm', '140mm', '27mm', '牌号：' + item.old_mark + '') + LODOP.ADD_PRINT_TEXT('72mm', '6mm', '140mm', '27mm', '名称：' + item.material_name + '') + LODOP.ADD_PRINT_TEXT('85mm', '110mm', '60mm', '27mm', '序号：' + item.order_no + '') // LODOP.PREVIEW()// 预览 LODOP.PRINT()// 打印 })