修改任务列表

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

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

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

@@ -180,7 +180,7 @@ public class CacheLineHandServiceImpl implements CacheLineHandService{
           if(StrUtil.isNotEmpty(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
@@ -494,7 +494,7 @@ public class CacheLineHandServiceImpl implements CacheLineHandService{
           String vehicle_code = param.getString("vehicle_code");
           String wcsdevice_code = param.getString("wcsdevice_code");
           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();
           // 入箱扫码异常
           if("1".equals(inOut_type)) {

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

@@ -199,6 +199,7 @@
                 ENDSELECT
             ENDQUERY
         ENDIF
+
     IF 输入.flag = "9"
         QUERY
             SELECT
@@ -214,19 +215,19 @@
 
     IF 输入.flag = "10"
         	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,
-                    	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
                         	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
@@ -234,8 +235,7 @@
                         	left join md_me_materialbase mater on task.material_id = mater.material_id
                         	left join sys_dict dict on dict.`value` = task.task_status
                         	and dict.`code` = 'task_status'
-                    where
+                     WHERE task.is_delete = '0'
-                    	task.is_delete = '0'
                         	OPTION 输入.status <> ""
                                   find_in_set(task.task_status,输入.status)
                             ENDOPTION
@@ -272,5 +272,3 @@
 
 
 
-
-