From 743184329a5e99789a20689806a4e4e32a197a0a Mon Sep 17 00:00:00 2001 From: liyongde <1419499670@qq.com> Date: Mon, 8 Jan 2024 15:31:26 +0800 Subject: [PATCH] =?UTF-8?q?opt:=20=E4=BB=BB=E5=8A=A1=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E7=95=8C=E9=9D=A2=E6=9F=A5=E8=AF=A2=E5=A4=B1=E8=B4=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/SchBaseVehiclematerialgroupController.java | 5 ----- .../nl/wms/sch/task/controller/SchBaseTaskController.java | 1 - .../wms/sch/task/service/dao/mapper/SchBaseTaskMapper.xml | 8 ++++++-- .../sch/task_manage/task/tasks/fj/mapper/FJMapper.java | 6 ++++++ .../nl/wms/sch/task_manage/task/tasks/yz/YZSLTask.java | 4 ++-- 5 files changed, 14 insertions(+), 10 deletions(-) diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/group/controller/SchBaseVehiclematerialgroupController.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/group/controller/SchBaseVehiclematerialgroupController.java index 957bb57..253c519 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/group/controller/SchBaseVehiclematerialgroupController.java +++ b/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 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 create(@Validated @RequestBody SchBaseVehiclematerialgroup entity) { schBaseVehiclematerialgroupService.create(entity); @@ -49,7 +47,6 @@ public class SchBaseVehiclematerialgroupController { @PutMapping @Log("修改组盘信息管理") - //@SaCheckPermission("@el.check('schBaseVehiclematerialgroup:edit')") public ResponseEntity update(@Validated @RequestBody SchBaseVehiclematerialgroup entity) { schBaseVehiclematerialgroupService.update(entity); @@ -57,7 +54,6 @@ public class SchBaseVehiclematerialgroupController { } @Log("删除组盘信息管理") - //@SaCheckPermission("@el.check('schBaseVehiclematerialgroup:del')") @DeleteMapping public ResponseEntity delete(@RequestBody Set ids) { @@ -67,7 +63,6 @@ public class SchBaseVehiclematerialgroupController { @PostMapping("/getGroup") @Log("获取组盘信息管理") - public ResponseEntity getGroup(@RequestBody JSONObject entity) { return new ResponseEntity<>(schBaseVehiclematerialgroupService.getGroup(entity), HttpStatus.OK); } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/controller/SchBaseTaskController.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/controller/SchBaseTaskController.java index 538d049..275e174 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/controller/SchBaseTaskController.java +++ b/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 query(SchBaseTaskQuery whereJson, PageQuery page) { return new ResponseEntity<>(TableDataInfo.build(schBaseTaskService.queryAll(whereJson, page)), HttpStatus.OK); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/dao/mapper/SchBaseTaskMapper.xml b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/dao/mapper/SchBaseTaskMapper.xml index 114b90f..acdfbe9 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/dao/mapper/SchBaseTaskMapper.xml +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/dao/mapper/SchBaseTaskMapper.xml @@ -48,6 +48,10 @@ AND t.config_code = #{whereJson.config_code} + + AND (t.point_code1 LIKE '%${whereJson.point_code}%' + OR t.point_code2 LIKE '%${whereJson.point_code}%') + AND t.task_status #{whereJson.unFinished} @@ -55,10 +59,10 @@ AND t.vehicle_code = #{whereJson.vehicle_code} - AND t.create_time #{query.end_time} + AND t.create_time #{whereJson.end_time} - AND t.create_time =]]> #{query.begin_time} + AND t.create_time =]]> #{whereJson.begin_time} AND t.task_status IN diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/mapper/FJMapper.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/mapper/FJMapper.java index ff483bc..f3a1b73 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/mapper/FJMapper.java +++ b/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 findPointForFJQL(List regionCode, String materialId); List findPointForFJSK(List regionCode); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/yz/YZSLTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/yz/YZSLTask.java index cfdf1eb..35b23c1 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/yz/YZSLTask.java +++ b/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());