opt: 任务管理界面查询失败

lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/group/controller/SchBaseVehiclematerialgroupController.java

@@ -31,7 +31,6 @@ public class SchBaseVehiclematerialgroupController {
 
     @GetMapping
     @Log("查询组盘信息管理")
-
     //@SaCheckPermission("@el.check('schBaseVehiclematerialgroup:list')")
     public ResponseEntity<Object> query(SchBaseVehiclematerialgroupQuery whereJson, PageQuery page) {
         return new ResponseEntity<>(TableDataInfo.build(schBaseVehiclematerialgroupService
@@ -40,7 +39,6 @@ public class SchBaseVehiclematerialgroupController {
 
     @PostMapping
     @Log("新增组盘信息管理")
-
     //@SaCheckPermission("@el.check('schBaseVehiclematerialgroup:add')")
     public ResponseEntity<Object> create(@Validated @RequestBody SchBaseVehiclematerialgroup entity) {
         schBaseVehiclematerialgroupService.create(entity);
@@ -49,7 +47,6 @@ public class SchBaseVehiclematerialgroupController {
 
     @PutMapping
     @Log("修改组盘信息管理")
-
     //@SaCheckPermission("@el.check('schBaseVehiclematerialgroup:edit')")
     public ResponseEntity<Object> update(@Validated @RequestBody SchBaseVehiclematerialgroup entity) {
         schBaseVehiclematerialgroupService.update(entity);
@@ -57,7 +54,6 @@ public class SchBaseVehiclematerialgroupController {
     }
 
     @Log("删除组盘信息管理")
-
     //@SaCheckPermission("@el.check('schBaseVehiclematerialgroup:del')")
     @DeleteMapping
     public ResponseEntity<Object> delete(@RequestBody Set<String> ids) {
@@ -67,7 +63,6 @@ public class SchBaseVehiclematerialgroupController {
 
     @PostMapping("/getGroup")
     @Log("获取组盘信息管理")
-
     public ResponseEntity<Object> getGroup(@RequestBody JSONObject entity) {
         return new ResponseEntity<>(schBaseVehiclematerialgroupService.getGroup(entity), HttpStatus.OK);
     }

lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/controller/SchBaseTaskController.java

@@ -32,7 +32,6 @@ public class SchBaseTaskController {
 
     @GetMapping
     @Log("查询任务管理")
-
     //@SaCheckPermission("@el.check('schBaseTask:list')")
     public ResponseEntity<Object> query(SchBaseTaskQuery whereJson, PageQuery page) {
         return new ResponseEntity<>(TableDataInfo.build(schBaseTaskService.queryAll(whereJson, page)), HttpStatus.OK);

lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/dao/mapper/SchBaseTaskMapper.xml

@@ -48,6 +48,10 @@
             <if test="whereJson.config_code != null">
                 AND t.config_code = #{whereJson.config_code}
             </if>
+            <if test="whereJson.point_code != null">
+                AND (t.point_code1 LIKE '%${whereJson.point_code}%'
+                    OR t.point_code2 LIKE '%${whereJson.point_code}%')
+            </if>
             <if test="whereJson.unFinished != null">
                 AND t.task_status <![CDATA[<=]]> #{whereJson.unFinished}
             </if>
@@ -55,10 +59,10 @@
                 AND t.vehicle_code = #{whereJson.vehicle_code}
             </if>
             <if test="whereJson.end_time != null">
-                AND t.create_time <![CDATA[<=]]> #{query.end_time}
+                AND t.create_time <![CDATA[<=]]> #{whereJson.end_time}
             </if>
             <if test="whereJson.begin_time != null">
-                AND t.create_time <![CDATA[>=]]> #{query.begin_time}
+                AND t.create_time <![CDATA[>=]]> #{whereJson.begin_time}
             </if>
             <if test="collect != null and collect != ''">
                 AND t.task_status IN

lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/mapper/FJMapper.java

@@ -12,6 +12,12 @@ import java.util.List;
  * @Date: 2023/6/20
  */
 public interface FJMapper {
+    /**
+     * 分拣缺料找起点
+     * @param regionCode 区域
+     * @param materialId 物料
+     * @return /
+     */
     List<SchBasePoint> findPointForFJQL(List<String> regionCode, String materialId);
 
     List<SchBasePoint> findPointForFJSK(List<String> regionCode);

lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/yz/YZSLTask.java

@@ -124,6 +124,8 @@ public class YZSLTask extends AbstractTask {
         // 找终点
         String requestParam = task.getRequest_param();
         JSONObject jsonObject = JSONObject.parseObject(requestParam);
+        // 设置组盘 - 需要的话由子类自行实现
+        task.setGroup_id(setGroupPlate(jsonObject));
         SchBasePoint point = findNextPoint(nextRegionStr, jsonObject);
         if (ObjectUtil.isEmpty(point)) {
             // 消息通知
@@ -131,8 +133,6 @@ public class YZSLTask extends AbstractTask {
                     NoticeTypeEnum.WARN.getCode());
             throw new BadRequestException("压机[" + task.getPoint_code1() + "]未找到所需点位!");
         }
-        // 设置组盘 - 需要的话由子类自行实现
-        task.setGroup_id(setGroupPlate(jsonObject));
         // 设置终点并修改创建成功状态
         task.setPoint_code2(point.getPoint_code());
         task.setTask_status(TaskStatus.CREATED.getCode());