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

修改任务列表

Browse Source
This commit is contained in:
baoge
2023-03-27 19:51:57 +08:00
parent a74a4d5d3a
commit f860535bcd
3 changed files with 91 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mes/hd/nladmin-system/src/main/java/org/nl/wms/pda/rest/CacheLineHandController.java
View File

@@ -267,7 +267,7 @@ public class CacheLineHandController{
@Log("获取生产区域下拉框") @Log("获取生产区域下拉框")
@ApiOperation("获取生产区域下拉框") @ApiOperation("获取生产区域下拉框")
public CommonResult<JSONArray> getProductArea() { public CommonResult<JSONArray> getProductArea() {
return RestBusinessTemplate.execute(() -> cacheLineHandService.getProductArea()); return RestBusinessTemplate.execute(cacheLineHandService::getProductArea);
} }
@PostMapping("/getCacheLineMaterialInfo") @PostMapping("/getCacheLineMaterialInfo")

4
mes/hd/nladmin-system/src/main/java/org/nl/wms/pda/service/impl/CacheLineHandServiceImpl.java
View File

@@ -180,7 +180,7 @@ public class CacheLineHandServiceImpl implements CacheLineHandService{
if(StrUtil.isNotEmpty(whereJson.getString("end_date"))) { if(StrUtil.isNotEmpty(whereJson.getString("end_date"))) {
map.put("end_date", whereJson.getString("end_date")); map.put("end_date", whereJson.getString("end_date"));
} }
return WQL.getWO("QSCH_TASK_01").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "task.update_time desc"); return WQL.getWO("PDA_QUERY").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "task.update_time desc");
} }
@Override @Override
@@ -494,7 +494,7 @@ public class CacheLineHandServiceImpl implements CacheLineHandService{
String vehicle_code = param.getString("vehicle_code"); String vehicle_code = param.getString("vehicle_code");
String wcsdevice_code = param.getString("wcsdevice_code"); String wcsdevice_code = param.getString("wcsdevice_code");
String inOut_type = param.getString("inOut_type"); String inOut_type = param.getString("inOut_type");
WQLObject instructTab = WQLObject.getWQLObject("IF_WCS_InstructPoint"); WQLObject instructTab = WQLObject.getWQLObject("sch_base_task");
JSONArray result = new JSONArray(); JSONArray result = new JSONArray();
// 入箱扫码异常 // 入箱扫码异常
if("1".equals(inOut_type)) { if("1".equals(inOut_type)) {

178
mes/hd/nladmin-system/src/main/java/org/nl/wms/pda/wql/PDA_QUERY.wql
View File

@@ -51,7 +51,7 @@
WHERE WHERE
is_delete = '0' is_delete = '0'
OPTION 输入.condition <> "" OPTION 输入.condition <> ""
material_spec LIKE CONCAT ( '%', 输入.condition, '%' ) material_spec LIKE CONCAT ('%', 输入.condition, '%')
ENDOPTION ENDOPTION
GROUP BY material_spec GROUP BY material_spec
ENDSELECT ENDSELECT
@@ -69,8 +69,8 @@
WHERE WHERE
is_used = '1' is_used = '1'
OPTION 输入.condition <> "" OPTION 输入.condition <> ""
workprocedure_code LIKE CONCAT ( '%', 输入.condition, '%' ) workprocedure_code LIKE CONCAT ('%', 输入.condition, '%')
OR workprocedure_name LIKE CONCAT ( '%', 输入.condition, '%' ) OR workprocedure_name LIKE CONCAT ('%', 输入.condition, '%')
ENDOPTION ENDOPTION
ENDSELECT ENDSELECT
ENDQUERY ENDQUERY
@@ -86,7 +86,7 @@
WHERE WHERE
CODE = 'task_status' CODE = 'task_status'
OPTION 输入.condition <> "" OPTION 输入.condition <> ""
label LIKE CONCAT ( '%', 输入.condition, '%' ) label LIKE CONCAT ('%', 输入.condition, '%')
ENDOPTION ENDOPTION
ORDER BY dict_sort ORDER BY dict_sort
ENDSELECT ENDSELECT
@@ -103,7 +103,7 @@
WHERE WHERE
is_delete = '0' is_delete = '0'
OPTION 输入.condition <> "" OPTION 输入.condition <> ""
device_name LIKE CONCAT ( '%', 输入.condition, '%' ) device_name LIKE CONCAT ('%', 输入.condition, '%')
ENDOPTION ENDOPTION
ORDER BY device_code DESC ORDER BY device_code DESC
ENDSELECT ENDSELECT
@@ -141,10 +141,10 @@
WHERE WHERE
mb.is_delete = '0' mb.is_delete = '0'
OPTION 输入.condition <> "" OPTION 输入.condition <> ""
mb.material_name LIKE CONCAT ( '%', 输入.condition, '%' ) mb.material_name LIKE CONCAT ('%', 输入.condition, '%')
OR mb.material_code LIKE CONCAT ( '%', 输入.condition, '%' ) OR mb.material_code LIKE CONCAT ('%', 输入.condition, '%')
OR mb.material_spec LIKE CONCAT ( '%', 输入.condition, '%' ) OR mb.material_spec LIKE CONCAT ('%', 输入.condition, '%')
OR class.class_name LIKE CONCAT ( '%', 输入.condition, '%' ) OR class.class_name LIKE CONCAT ('%', 输入.condition, '%')
ENDOPTION ENDOPTION
ENDSELECT ENDSELECT
ENDQUERY ENDQUERY
@@ -167,38 +167,39 @@
ENDQUERY ENDQUERY
ENDIF ENDIF
IF 输入.flag = "8" IF 输入.flag = "8"
QUERY QUERY
SELECT SELECT
sch_cacheline_position.cacheLine_code, sch_cacheline_position.cacheLine_code,
sch_cacheline_position.position_code, sch_cacheline_position.position_code,
sch_cacheline_position.vehicle_code, sch_cacheline_position.vehicle_code,
sch_cacheline_position.layer_num, sch_cacheline_position.layer_num,
sch_cacheline_position.positionOrder_no, sch_cacheline_position.positionOrder_no,
sch_cacheline_vehilematerial.workprocedure_code, sch_cacheline_vehilematerial.workprocedure_code,
sch_cacheline_vehilematerial.workprocedure_name, sch_cacheline_vehilematerial.workprocedure_name,
sch_cacheline_vehilematerial.material_uuid, sch_cacheline_vehilematerial.material_uuid,
sch_cacheline_vehilematerial.material_code, sch_cacheline_vehilematerial.material_code,
sch_cacheline_vehilematerial.material_name, sch_cacheline_vehilematerial.material_name,
sch_cacheline_vehilematerial.material_spec, sch_cacheline_vehilematerial.material_spec,
sch_cacheline_vehilematerial.quantity, sch_cacheline_vehilematerial.quantity,
sch_cacheline_vehilematerial.weight, sch_cacheline_vehilematerial.weight,
IF (length(sch_cacheline_position.vehicle_code) > 0, IFNULL( sch_cacheline_vehilematerial.vehicle_status, 4), 5) AS vehicle_status IF(length(sch_cacheline_position.vehicle_code) > 0, IFNULL(sch_cacheline_vehilematerial.vehicle_status, 4), 5) AS vehicle_status
FROM FROM
sch_cacheline_position sch_cacheline_position
LEFT JOIN sch_cacheline_vehilematerial ON sch_cacheline_position.vehicle_code = sch_cacheline_vehilematerial.vehicle_code LEFT JOIN sch_cacheline_vehilematerial ON sch_cacheline_position.vehicle_code = sch_cacheline_vehilematerial.vehicle_code
WHERE WHERE
1 = 1 1 = 1
OPTION 输入.product_area <> "" OPTION 输入.product_area <> ""
sch_cacheline_position.product_area = 输入.product_area sch_cacheline_position.product_area = 输入.product_area
ENDOPTION ENDOPTION
OPTION 输入.cacheLine_code <> "" OPTION 输入.cacheLine_code <> ""
sch_cacheline_position.cacheLine_code = 输入.cacheLine_code sch_cacheline_position.cacheLine_code = 输入.cacheLine_code
ENDOPTION ENDOPTION
ORDER BY ORDER BY
sch_cacheline_position.cacheLine_code sch_cacheline_position.cacheLine_code
ENDSELECT ENDSELECT
ENDQUERY ENDQUERY
ENDIF ENDIF
IF 输入.flag = "9" IF 输入.flag = "9"
QUERY QUERY
SELECT SELECT
@@ -213,55 +214,52 @@
ENDIF ENDIF
IF 输入.flag = "10" IF 输入.flag = "10"
PAGEQUERY PAGEQUERY
select SELECT
task.task_id instruct_uuid, task.task_id as instruct_uuid,
task.task_code instructoperate_num, task.task_code as instructoperate_num,
task.task_name mes_no, task.task_name as mes_no,
task.vehicle_code invehicle_code, task.vehicle_code as invehicle_code,
task.vehicle_code2 outvehicle_code, task.vehicle_code2 as outvehicle_code,
task.create_time, task.create_time,
dict.label status_name, dict.label as status_name,
mater.material_code processmaterial_code, mater.material_code as processmaterial_code,
point1.point_name startpoint_code, point1.point_name as startpoint_code,
point2.point_name nextpoint_code, point2.point_name as nextpoint_code,
point3.point_name nextpoint_code2 point3.point_name as nextpoint_code2
from FROM
sch_base_task task sch_base_task task
left join sch_base_point point1 on task.point_code1 = point1.point_code left join sch_base_point point1 on task.point_code1 = point1.point_code
left join sch_base_point point2 on task.point_code2 = point2.point_code left join sch_base_point point2 on task.point_code2 = point2.point_code
left join sch_base_point point3 on task.point_code3 = point3.point_code left join sch_base_point point3 on task.point_code3 = point3.point_code
left join md_me_materialbase mater on task.material_id = mater.material_id left join md_me_materialbase mater on task.material_id = mater.material_id
left join sys_dict dict on dict.`value` = task.task_status left join sys_dict dict on dict.`value` = task.task_status
and dict.`code` = 'task_status' and dict.`code` = 'task_status'
where WHERE task.is_delete = '0'
task.is_delete = '0' OPTION 输入.status <> ""
OPTION 输入.status <> "" find_in_set(task.task_status,输入.status)
find_in_set( task.task_status, 输入.status) ENDOPTION
ENDOPTION OPTION 输入.inst_num <>""
OPTION 输入.inst_num <> "" (task.task_code like 输入.inst_num)
(task.task_code like 输入.inst_num) ENDOPTION
ENDOPTION OPTION 输入.vehicle_code <> ""
OPTION 输入.vehicle_code <> "" (task.vehicle_code like 输入.vehicle_code)
(task.vehicle_code like 输入.vehicle_code) ENDOPTION
ENDOPTION OPTION 输入.start_point <> ""
OPTION 输入.start_point <> "" (task.point_code1 like 输入.start_point)
(task.point_code1 like 输入.start_point) ENDOPTION
ENDOPTION OPTION 输入.end_point <> ""
OPTION 输入.end_point <> "" (task.point_code2 like 输入.end_point)
(task.point_code2 like 输入.end_point) ENDOPTION
ENDOPTION OPTION 输入.start_date <> ""
OPTION 输入.start_date <> "" task.create_time >= 输入.start_date
task.create_time >= 输入.start_date ENDOPTION
ENDOPTION OPTION 输入.end_date <> ""
OPTION 输入.end_date <> "" task.create_time <= 输入.end_date
task.create_time <= 输入.end_date ENDOPTION
ENDOPTION ENDSELECT
ENDSELECT ENDPAGEQUERY
ENDPAGEQUERY ENDIF
ENDIF