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

add 工单查询条件

Browse Source
This commit is contained in:
张江玮
2023-06-26 17:24:16 +08:00
parent b1bb89ec8a
commit 5a6e2d9c4c
2 changed files with 17 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lms/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/WorkorderServiceImpl.java
View File

@@ -61,6 +61,7 @@ public class WorkorderServiceImpl implements WorkordeService {
String begin_time = MapUtil.getStr(whereJson, "begin_time"); String begin_time = MapUtil.getStr(whereJson, "begin_time");
String end_time = MapUtil.getStr(whereJson, "end_time"); String end_time = MapUtil.getStr(whereJson, "end_time");
String order_status = MapUtil.getStr(whereJson, "order_status"); String order_status = MapUtil.getStr(whereJson, "order_status");
String device = MapUtil.getStr(whereJson, "device");
JSONObject map = new JSONObject(); JSONObject map = new JSONObject();
map.put("flag", "1"); map.put("flag", "1");
if (StrUtil.isNotBlank(begin_time)) { if (StrUtil.isNotBlank(begin_time)) {
@@ -85,6 +86,9 @@ public class WorkorderServiceImpl implements WorkordeService {
if (StrUtil.isNotEmpty(material)) { if (StrUtil.isNotEmpty(material)) {
map.put("material", "%" + material + "%"); map.put("material", "%" + material + "%");
} }
if (StrUtil.isNotBlank(device)) {
map.put("device", device);
}
JSONObject jsonObject = WQL.getWO("MPS_PRODUCEDURE001").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "ShiftOrder.order_status ASC, ShiftOrder.create_time DESC"); JSONObject jsonObject = WQL.getWO("MPS_PRODUCEDURE001").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "ShiftOrder.order_status ASC, ShiftOrder.create_time DESC");
return jsonObject; return jsonObject;
} }
@@ -509,6 +513,7 @@ public class WorkorderServiceImpl implements WorkordeService {
String begin_time = MapUtil.getStr(params, "begin_time"); String begin_time = MapUtil.getStr(params, "begin_time");
String end_time = MapUtil.getStr(params, "end_time"); String end_time = MapUtil.getStr(params, "end_time");
String order_status = MapUtil.getStr(params, "order_status"); String order_status = MapUtil.getStr(params, "order_status");
String device = MapUtil.getStr(params, "device");
JSONObject map = new JSONObject(); JSONObject map = new JSONObject();
map.put("flag", "7"); map.put("flag", "7");
if (StrUtil.isNotBlank(begin_time)) { if (StrUtil.isNotBlank(begin_time)) {
@@ -533,6 +538,9 @@ public class WorkorderServiceImpl implements WorkordeService {
if (StrUtil.isNotEmpty(material)) { if (StrUtil.isNotEmpty(material)) {
map.put("material", "%" + material + "%"); map.put("material", "%" + material + "%");
} }
if (StrUtil.isNotBlank(device)) {
map.put("device", device);
}
JSONArray workorders = WQL.getWO("MPS_PRODUCEDURE001").addParamMap(map).process().getResultJSONArray(0); JSONArray workorders = WQL.getWO("MPS_PRODUCEDURE001").addParamMap(map).process().getResultJSONArray(0);
List<Map<String, Object>> list = workorders.stream().map(o -> { List<Map<String, Object>> list = workorders.stream().map(o -> {
JSONObject workorder = (JSONObject) o; JSONObject workorder = (JSONObject) o;

9
lms/nladmin-ui/src/views/wms/pdm/workerorder/index.vue
View File

@@ -20,6 +20,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"
clearable
placeholder="设备"
style="width: 200px;"
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>
<el-form-item label="物料编码"> <el-form-item label="物料编码">
<el-input <el-input
v-model="query.material" v-model="query.material"