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

更新

Browse Source
This commit is contained in:
gengby
2022-08-08 19:36:21 +08:00
parent 02f5ec1bd3
commit 6ea0f433ce
9 changed files with 34 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/wql/QDEVICE_SCREEN.wql
View File

@@ -174,6 +174,8 @@
status_type = '05'
AND
IFNULL( end_time, '' ) = ''
and
device.is_active = '1'
OPTION 输入.workprocedure_id <> ""
device.workprocedure_id = 输入.workprocedure_id
ENDOPTION
@@ -192,6 +194,8 @@
status_type = '03'
AND
IFNULL( end_time, '' ) = ''
and
device.is_active = '1'
OPTION 输入.workprocedure_id <> ""
device.workprocedure_id = 输入.workprocedure_id
ENDOPTION
@@ -209,6 +213,8 @@
INNER JOIN pdm_bi_devicerunstatusrecord run ON run.device_id = device.device_id AND IFNULL(run.end_time,'') =''
WHERE
shift.is_delete = '0'
and
device.is_active = '1'
AND
shift.order_status <> '04'
AND
@@ -258,6 +264,8 @@
pdm_bi_device device
LEFT JOIN pdm_bi_devicerunstatusrecord run ON run.device_id = device.device_id AND IFNULL(run.end_time,'') = ''
LEFT JOIN pdm_bi_workprocedure pro ON pro.workprocedure_id = device.workprocedure_id
where
device.is_active = '1'
ENDSELECT
ENDQUERY
ENDIF

5
mes/qd/src/views/wms/mps/produce/bigScreen.vue
View File

@@ -66,11 +66,12 @@
:visible.sync="devicedialogVisible"
width="35%"
:before-close="handleClose">
<el-form :model="deviceForm" status-icon label-width="120px" ref="deviceForm" class="demo-ruleForm">
<el-form :model="deviceForm" status-icon label-width="90px" ref="deviceForm" class="demo-ruleForm">
<el-form-item label="选择设备" prop="device_id">
<el-select
v-model="deviceForm.device_id"
clearable
filterable
size="mini"
class="filter-item"
>
@@ -94,7 +95,7 @@
:visible.sync="reportdialogVisibler"
width="35%"
:before-close="handleClose">
<el-form :model="reportForm" status-icon ref="reportForm" label-width="120px" class="demo-ruleForm">
<el-form :model="reportForm" status-icon ref="reportForm" label-width="90px" class="demo-ruleForm">
<el-form-item label="生产数量" prop="produce_qty">
<el-input disabled v-model="reportForm.produce_qty" />
</el-form-item>