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

代码更新

Browse Source
This commit is contained in:
liuxy
2022-07-26 16:40:13 +08:00
parent 0fd959d728
commit 9af611f09c
3 changed files with 18 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/service/impl/WorkOrderServiceImpl.java
View File

@@ -63,6 +63,10 @@ public class WorkOrderServiceImpl implements WorkOrdereService {
if (StrUtil.isNotEmpty(end_time)) { if (StrUtil.isNotEmpty(end_time)) {
map.put("end_time", end_time.substring(0,10)+" 23:59:59"); map.put("end_time", end_time.substring(0,10)+" 23:59:59");
} }
String device_code = map.get("device_code");
if (StrUtil.isNotEmpty(device_code)) {
map.put("device_code", "%" + device_code + "%");
}
JSONObject json = WQL.getWO("QPDM_WORKORDER01").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "WorkOrder.planstart_time,mb.material_code,WorkOrder.pcsn"); JSONObject json = WQL.getWO("QPDM_WORKORDER01").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "WorkOrder.planstart_time,mb.material_code,WorkOrder.pcsn");
return json; return json;
} }

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

@@ -26,6 +26,7 @@
输入.workprocedure_id TYPEAS s_string 输入.workprocedure_id TYPEAS s_string
输入.device_id TYPEAS s_string 输入.device_id TYPEAS s_string
输入.pcsn TYPEAS s_string 输入.pcsn TYPEAS s_string
输入.device_code TYPEAS s_string
[临时表] [临时表]
@@ -71,6 +72,10 @@
WorkOrder.is_delete = '0' WorkOrder.is_delete = '0'
OPTION 输入.workorder_code <> "" OPTION 输入.workorder_code <> ""
WorkOrder.workorder_code like 输入.workorder_code WorkOrder.workorder_code like 输入.workorder_code
ENDOPTION
OPTION 输入.device_code <> ""
(device.device_code like 输入.device_code or
device.device_name like 输入.device_code)
ENDOPTION ENDOPTION
OPTION 输入.pcsn <> "" OPTION 输入.pcsn <> ""
WorkOrder.pcsn like 输入.pcsn WorkOrder.pcsn like 输入.pcsn

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

@@ -103,6 +103,15 @@
@keyup.enter.native="crud.toQuery" @keyup.enter.native="crud.toQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="关键设备">
<el-input
v-model="query.device_code"
size="mini"
clearable
placeholder="编码、名称"
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>
<rrOperation /> <rrOperation />
</el-form> </el-form>
</div> </div>