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-07-04 12:54:00 +08:00
parent 648c12e66d
commit 17c010f0b7
2 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -57,12 +57,14 @@
mb.material_name, mb.material_name,
mb.ext_id, mb.ext_id,
device.device_code, device.device_code,
producmaterialext.old_mark,
device.device_name, device.device_name,
Formula.create_name AS formula_name, Formula.create_name AS formula_name,
Formula.create_time AS formula_time Formula.create_time AS formula_time
FROM FROM
PDM_BI_WorkOrder WorkOrder PDM_BI_WorkOrder WorkOrder
LEFT JOIN md_me_materialbase mb ON mb.material_id = WorkOrder.material_id LEFT JOIN md_me_materialbase mb ON mb.material_id = WorkOrder.material_id
LEFT JOIN md_me_producmaterialext producmaterialext ON mb.material_id = producmaterialext.material_id
LEFT JOIN em_bi_deviceinfo device ON device.device_id = WorkOrder.device_id LEFT JOIN em_bi_deviceinfo device ON device.device_id = WorkOrder.device_id
LEFT JOIN PDM_BI_Formula Formula ON (Formula.workorder_id = WorkOrder.workorder_id and Formula.bucket_type='01' AND Formula.is_delete = '0') LEFT JOIN PDM_BI_Formula Formula ON (Formula.workorder_id = WorkOrder.workorder_id and Formula.bucket_type='01' AND Formula.is_delete = '0')
WHERE WHERE
@@ -102,12 +104,14 @@
mb.material_name, mb.material_name,
device.device_code, device.device_code,
device.device_name, device.device_name,
producmaterialext.old_mark,
Formula.create_name AS formula_name, Formula.create_name AS formula_name,
Formula.create_time AS formula_time, Formula.create_time AS formula_time,
productprocessroutedtl.workprocedure_code AS frist_workprocedure_code productprocessroutedtl.workprocedure_code AS frist_workprocedure_code
FROM FROM
PDM_BI_WorkOrder WorkOrder PDM_BI_WorkOrder WorkOrder
LEFT JOIN md_me_materialbase mb ON mb.material_id = WorkOrder.material_id LEFT JOIN md_me_materialbase mb ON mb.material_id = WorkOrder.material_id
LEFT JOIN md_me_producmaterialext producmaterialext ON mb.material_id = producmaterialext.material_id
LEFT JOIN em_bi_deviceinfo device ON device.device_id = WorkOrder.device_id LEFT JOIN em_bi_deviceinfo device ON device.device_id = WorkOrder.device_id
LEFT JOIN PDM_BI_Formula Formula ON (Formula.workorder_id = WorkOrder.workorder_id LEFT JOIN PDM_BI_Formula Formula ON (Formula.workorder_id = WorkOrder.workorder_id
AND Formula.bucket_type = '01' AND Formula.bucket_type = '01'

1
mes/qd/src/views/wms/pdm/produce/workorder/index.vue
View File

@@ -212,6 +212,7 @@
<el-table-column :formatter="stateFormat" min-width="80" prop="status" label="工令状态" /> <el-table-column :formatter="stateFormat" min-width="80" prop="status" label="工令状态" />
<el-table-column prop="device_name" min-width="100" label="设备"/> <el-table-column prop="device_name" min-width="100" label="设备"/>
<el-table-column prop="material_code" min-width="130" label="物料编码"/> <el-table-column prop="material_code" min-width="130" label="物料编码"/>
<el-table-column prop="old_mark" min-width="80" label="牌号"/>
<el-table-column :formatter="seriesFormat" min-width="80" prop="product_series_id" label="系列" /> <el-table-column :formatter="seriesFormat" min-width="80" prop="product_series_id" label="系列" />
<el-table-column prop="pcsn" min-width="80" label="批次"/> <el-table-column prop="pcsn" min-width="80" label="批次"/>
<el-table-column prop="workorder_qty" min-width="80" label="重量" :formatter="crud.formatNum3"/> <el-table-column prop="workorder_qty" min-width="80" label="重量" :formatter="crud.formatNum3"/>