root/wuHanXinRui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

优化

Browse Source
This commit is contained in:
zds
2022-08-23 11:21:20 +08:00
parent 7601fb92ef
commit 84ae9bf79c
4 changed files with 30 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
mes/hd/nladmin-system/src/main/java/org/nl/pda/st/set/wql/QPADSTSETSERVICE.wql
View File

@@ -1,10 +1,10 @@
[交易说明] [交易说明]
交易名： 库区分页查询 交易名： 库区分页查询
所属模块： 所属模块：
功能简述： 功能简述：
版权所有： 版权所有：
表引用： 表引用：
版本经历： 版本经历：
[数据库] [数据库]
--指定数据库，为空采用默认值，默认为db.properties中列出的第一个库 --指定数据库，为空采用默认值，默认为db.properties中列出的第一个库
@@ -31,26 +31,26 @@
[临时表] [临时表]
--这边列出来的临时表就会在运行期动态创建 --这边列出来的临时表就会在运行期动态创建
[临时变量] [临时变量]
--所有中间过程变量均可在此处定义 --所有中间过程变量均可在此处定义
[业务过程] [业务过程]
########################################## ##########################################
# 1、输入输出检查 # # 1、输入输出检查 #
########################################## ##########################################
########################################## ##########################################
# 2、主过程前处理 # # 2、主过程前处理 #
########################################## ##########################################
########################################## ##########################################
# 3、业务主过程 # # 3、业务主过程 #
########################################## ##########################################
IF 输入.flag = "1" IF 输入.flag = "1"
PAGEQUERY PAGEQUERY
SELECT SELECT
@@ -292,16 +292,18 @@
bucket.is_active, bucket.is_active,
bucket.bucketunique, bucket.bucketunique,
bucket.material_id, bucket.material_id,
material_code, material.material_code,
material_name, material.material_name,
bucket.pcsn, bucket.pcsn,
bucket.qty_unit_id, bucket.qty_unit_id,
bucket.qty_unit_name, bucket.qty_unit_name,
bucket.storage_qty, bucket.storage_qty,
materialext.old_mark,
bucket.print_type bucket.print_type
FROM FROM
md_pb_bucketrecord bucket md_pb_bucketrecord bucket
LEFT JOIN md_me_materialbase material ON material.material_id = bucket.material_id 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 WHERE
1 =1 1 =1
OPTION 输入.bucketunique <> "" OPTION 输入.bucketunique <> ""

1
mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/WorkTaskServiceImpl.java
View File

@@ -538,6 +538,7 @@ public class WorkTaskServiceImpl implements WorkTaskService {
printJson.put("material_id", whereJson.getString("ext_id")); printJson.put("material_id", whereJson.getString("ext_id"));
printJson.put("material_code", whereJson.getString("material_code")); printJson.put("material_code", whereJson.getString("material_code"));
printJson.put("material_name", whereJson.getString("material_name")); printJson.put("material_name", whereJson.getString("material_name"));
printJson.put("old_mark", whereJson.getString("old_mark"));
printJson.put("pcsn", whereJson.getString("pcsn")); printJson.put("pcsn", whereJson.getString("pcsn"));
printJson.put("storage_qty", whereJson.getString("standard_weight")); printJson.put("storage_qty", whereJson.getString("standard_weight"));
printJson.put("planstart_time", whereJson.getString("planstart_time")); printJson.put("planstart_time", whereJson.getString("planstart_time"));

1
mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/wql/QPDM_WORKTASK01.wql
View File

@@ -59,6 +59,7 @@
0 AS is_line, 0 AS is_line,
'1' AS begin_record_order, '1' AS begin_record_order,
materialext.standard_weight, materialext.standard_weight,
materialext.old_mark,
WorkOrder.workordercard_id, WorkOrder.workordercard_id,
WorkOrder.STATUS AS order_status WorkOrder.STATUS AS order_status
FROM FROM

24
mes/qd/src/views/wms/pdm/produce/worktask/print2Dialog.vue
View File

@@ -145,18 +145,20 @@ export default {
} }
const LODOP = getLodop() const LODOP = getLodop()
LODOP.PRINT_INIT('') LODOP.PRINT_INIT('')
LODOP.SET_PRINT_PAGESIZE(1, '80mm', '60mm', '') LODOP.SET_PRINT_PAGESIZE(1, '150mm', '100mm', '')
LODOP.ADD_PRINT_RECT('1mm', '3mm', '74mm', '54mm', 0, 1) LODOP.ADD_PRINT_RECT('2mm', '2mm', '146mm', '96mm', 0, 1)
LODOP.SET_PRINT_STYLE('FontSize', 12) LODOP.SET_PRINT_STYLE('FontSize', 23)
LODOP.SET_PRINT_STYLE('Bold', 1) 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_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('5mm', '35mm', '50mm', '15mm', '日期：' + strTime) LODOP.ADD_PRINT_TEXT('7mm', '65mm', '80mm', '27mm', '日期：' + strTime)
LODOP.ADD_PRINT_TEXT('15mm', '35mm', '50mm', '15mm', pcsn) LODOP.ADD_PRINT_TEXT('19mm', '65mm', '80mm', '27mm', pcsn)
LODOP.ADD_PRINT_TEXT('25mm', '35mm', '50mm', '15mm', '重量：' + num.toFixed(3) + 'kg') LODOP.ADD_PRINT_TEXT('31mm', '65mm', '80mm', '27mm', '重量：' + num.toFixed(3) + 'kg')
LODOP.ADD_PRINT_TEXT('34mm', '5mm', '80mm', '15mm', '桶号：' + item.bucketunique + '') LODOP.ADD_PRINT_TEXT('43mm', '65mm', '80mm', '27mm', '桶号：' + 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('59mm', '6mm', '140mm', '27mm', '编码：' + item.material_code + '')
LODOP.ADD_PRINT_TEXT('48mm', '59mm', '80mm', '15mm', '序号：' + item.order_no + '') 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.PREVIEW()// 预览
LODOP.PRINT()// 打印 LODOP.PRINT()// 打印
}) })