From 5a2ec88cf71194456a371efda15f3cab5f6225ae Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期四, 20 六月 2024 20:48:41 +0800
Subject: [PATCH] #
---
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/controller/OpenController.java | 151 +++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 131 insertions(+), 20 deletions(-)
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/controller/OpenController.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/controller/OpenController.java
index 3e9339b..940edd9 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/controller/OpenController.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/controller/OpenController.java
@@ -1,20 +1,20 @@
package com.zy.asrs.wcs.core.controller;
+import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.zy.asrs.framework.common.Cools;
import com.zy.asrs.framework.common.R;
import com.zy.asrs.framework.common.SnowflakeIdWorker;
+import com.zy.asrs.wcs.core.domain.dto.BasLiftStaDto;
import com.zy.asrs.wcs.core.domain.param.CreateInTaskParam;
import com.zy.asrs.wcs.core.domain.param.CreateManualTakeTaskParam;
import com.zy.asrs.wcs.core.domain.param.CreateMoveTaskParam;
import com.zy.asrs.wcs.core.domain.param.CreateOutTaskParam;
-import com.zy.asrs.wcs.core.entity.Loc;
-import com.zy.asrs.wcs.core.entity.Task;
-import com.zy.asrs.wcs.core.entity.TaskCtg;
+import com.zy.asrs.wcs.core.entity.*;
import com.zy.asrs.wcs.core.model.enums.DeviceCtgType;
+import com.zy.asrs.wcs.core.model.enums.TaskCtgType;
import com.zy.asrs.wcs.core.model.enums.TaskStsType;
-import com.zy.asrs.wcs.core.service.LocService;
-import com.zy.asrs.wcs.core.service.TaskCtgService;
-import com.zy.asrs.wcs.core.service.TaskService;
+import com.zy.asrs.wcs.core.service.*;
import com.zy.asrs.wcs.core.utils.Utils;
import com.zy.asrs.wcs.rcs.cache.SlaveConnection;
import com.zy.asrs.wcs.rcs.entity.Device;
@@ -23,6 +23,8 @@
import com.zy.asrs.wcs.rcs.service.DeviceService;
import com.zy.asrs.wcs.rcs.thread.ShuttleThread;
import com.zy.asrs.wcs.system.controller.BaseController;
+import com.zy.asrs.wcs.system.entity.Dict;
+import com.zy.asrs.wcs.system.service.DictService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
@@ -30,6 +32,7 @@
import org.springframework.web.bind.annotation.RestController;
import java.util.Date;
+import java.util.List;
/**
* 瀵瑰鏆撮湶鎺ュ彛
@@ -49,25 +52,62 @@
private DeviceService deviceService;
@Autowired
private LocService locService;
+ @Autowired
+ private DictService dictService;
+ @Autowired
+ private BasConveyorPathService basConveyorPathService;
+ @Autowired
+ private BasLiftService basLiftService;
//鐢熸垚鍏ュ簱浠诲姟
@PostMapping("/createInTask")
public R createInTask(@RequestBody CreateInTaskParam param) {
//鑾峰彇鍏ュ簱浠诲姟绫诲瀷
TaskCtg taskCtg = taskCtgService.getOne(new LambdaQueryWrapper<TaskCtg>()
- .eq(TaskCtg::getFlag, "IN")
+ .eq(TaskCtg::getFlag, String.valueOf(TaskCtgType.IN))
.eq(TaskCtg::getStatus, 1));
if (taskCtg == null) {
return R.error("浠诲姟绫诲瀷寮傚父");
}
+
+ Long hostId = 1L;//榛樿涓讳粨搴�
Loc loc = locService.selectByLocNo(param.getDestLoc());
if (loc == null) {
return R.error("搴撲綅鍙蜂笉瀛樺湪");
}
- if (!loc.getLocStsFlag().equals("O")) {
+ //鑾峰彇涓ユ牸妯″紡鍙傛暟
+ boolean mapStrict = true;//榛樿涓ユ牸妯″紡
+ Dict dict = dictService.getOne(new LambdaQueryWrapper<Dict>().eq(Dict::getFlag, "shuttleMapStrict"));
+ if (dict != null) {
+ mapStrict = Boolean.parseBoolean(dict.getValue());
+ }
+
+ if (mapStrict && !loc.getLocStsFlag().equals("O")) {
return R.error("搴撲綅鐘舵�佷笉婊¤冻鍏ュ簱鏉′欢");
+ }
+
+ Task one = taskService.getOne(new LambdaQueryWrapper<Task>()
+ .eq(Task::getTaskCtg, taskCtg.getId())
+ .eq(Task::getOriginSite, param.getOriginSite())
+ .eq(Task::getDestSite, param.getDestSite())
+ .eq(Task::getDestLoc, param.getDestLoc()));
+ if (one != null) {
+ return R.error("浠诲姟宸插瓨鍦�");
+ }
+
+ String destSite = param.getDestSite();
+ if (Cools.isEmpty(param.getDestSite())) {
+ //鐩爣绔欎负绌哄垯浣跨敤WCS绯荤粺鍐呯疆璺緞
+ BasConveyorPath path = basConveyorPathService.getOne(new LambdaQueryWrapper<BasConveyorPath>()
+ .eq(BasConveyorPath::getTypeNo, taskCtg.getId())
+ .eq(BasConveyorPath::getHostId, hostId)
+ .eq(BasConveyorPath::getStnNo, param.getOriginSite()));
+ if(path == null) {
+ return R.error("鍐呯疆璺緞涓嶅瓨鍦�");
+ }
+ destSite = String.valueOf(path.getDeviceStn());
}
//浼樺厛绾�
@@ -79,12 +119,13 @@
Task task = new Task();
task.setUuid(String.valueOf(snowflakeIdWorker.nextId()));
task.setTaskNo(String.valueOf(Utils.getTaskNo("IN")));
+ task.setWmsTaskNo(param.getTaskNo());
task.setTaskSts(TaskStsType.NEW_INBOUND.sts);
task.setTaskCtg(taskCtg.getId());
task.setPriority(priority);
task.setOriginSite(param.getOriginSite());
task.setOriginLoc(null);
- task.setDestSite(param.getDestSite());
+ task.setDestSite(destSite);
task.setDestLoc(param.getDestLoc());
task.setIoTime(new Date());
task.setStartTime(new Date());
@@ -92,7 +133,7 @@
task.setMemo("");
task.setShuttleNo(null);//绛夊緟涓荤嚎绋嬪垎閰嶅皬杞�
task.setRecordLoc("Y");//璁板綍搴撳瓨淇℃伅
- task.setHostId(1L);//涓存椂鎺у埗鍙厑璁竓ost涓�1
+ task.setHostId(hostId);//涓存椂鎺у埗鍙厑璁竓ost涓�1
boolean result = taskService.save(task);
if (!result) {
@@ -106,19 +147,68 @@
public R createOutTask(@RequestBody CreateOutTaskParam param) {
//鑾峰彇鍑哄簱浠诲姟绫诲瀷
TaskCtg taskCtg = taskCtgService.getOne(new LambdaQueryWrapper<TaskCtg>()
- .eq(TaskCtg::getFlag, "OUT")
+ .eq(TaskCtg::getFlag, String.valueOf(TaskCtgType.OUT))
.eq(TaskCtg::getStatus, 1));
if (taskCtg == null) {
return R.error("浠诲姟绫诲瀷寮傚父");
}
+
+ Long hostId = 1L;//榛樿涓讳粨搴�
Loc loc = locService.selectByLocNo(param.getOriginLoc());
if (loc == null) {
return R.error("搴撲綅鍙蜂笉瀛樺湪");
}
- if (!loc.getLocStsFlag().equals("F")) {
+ //鑾峰彇涓ユ牸妯″紡鍙傛暟
+ boolean mapStrict = true;//榛樿涓ユ牸妯″紡
+ Dict dict = dictService.getOne(new LambdaQueryWrapper<Dict>().eq(Dict::getFlag, "shuttleMapStrict"));
+ if (dict != null) {
+ mapStrict = Boolean.parseBoolean(dict.getValue());
+ }
+
+ if (mapStrict && !loc.getLocStsFlag().equals("F")) {
return R.error("搴撲綅鐘舵�佷笉婊¤冻鍑哄簱鏉′欢");
+ }
+
+ Task one = taskService.getOne(new LambdaQueryWrapper<Task>()
+ .eq(Task::getTaskCtg, taskCtg.getId())
+ .eq(Task::getOriginSite, param.getOriginSite())
+ .eq(Task::getOriginLoc, param.getOriginLoc())
+ .eq(Task::getDestSite, param.getDestSite()));
+ if (one != null) {
+ return R.error("浠诲姟宸插瓨鍦�");
+ }
+
+ String originSite = param.getOriginSite();
+ if (Cools.isEmpty(param.getOriginSite())) {
+ //浣跨敤WCS绯荤粺鍐呯疆璺緞
+ BasConveyorPath path = basConveyorPathService.getOne(new LambdaQueryWrapper<BasConveyorPath>()
+ .eq(BasConveyorPath::getTypeNo, taskCtg.getId())
+ .eq(BasConveyorPath::getHostId, hostId)
+ .eq(BasConveyorPath::getStnNo, param.getDestSite()));
+ if(path == null) {
+ return R.error("鍐呯疆璺緞涓嶅瓨鍦�");
+ }
+ Integer deviceNo = path.getDeviceNo();//鑾峰彇鎻愬崌鏈哄彿
+ BasLift basLift = basLiftService.getOne(new LambdaQueryWrapper<BasLift>().eq(BasLift::getLiftNo, deviceNo).eq(BasLift::getHostId, hostId));
+ if(basLift == null) {
+ return R.error("鎻愬崌鏈哄璞′笉瀛樺湪");
+ }
+ List<BasLiftStaDto> staList = JSON.parseArray(basLift.getSta(), BasLiftStaDto.class);
+ BasLiftStaDto originStaDto = null;
+ for (BasLiftStaDto sta : staList) {
+ if (sta.getLev() == Utils.getLev(param.getOriginLoc())) {
+ originStaDto = sta;
+ break;
+ }
+ }
+
+ if (originStaDto == null) {
+ return R.error("婧愮珯涓嶅瓨鍦�");
+ }
+
+ originSite = String.valueOf(originStaDto.getStaNo());
}
//浼樺厛绾�
@@ -130,10 +220,11 @@
Task task = new Task();
task.setUuid(String.valueOf(snowflakeIdWorker.nextId()));
task.setTaskNo(String.valueOf(Utils.getTaskNo("OUT")));
+ task.setWmsTaskNo(param.getTaskNo());
task.setTaskSts(TaskStsType.NEW_OUTBOUND.sts);
task.setTaskCtg(taskCtg.getId());
task.setPriority(priority);
- task.setOriginSite(param.getOriginSite());
+ task.setOriginSite(originSite);
task.setOriginLoc(param.getOriginLoc());
task.setDestSite(param.getDestSite());
task.setDestLoc(null);
@@ -143,7 +234,7 @@
task.setMemo("");
task.setShuttleNo(null);//绛夊緟涓荤嚎绋嬪垎閰嶅皬杞�
task.setRecordLoc("Y");//璁板綍搴撳瓨淇℃伅
- task.setHostId(1L);//涓存椂鎺у埗鍙厑璁竓ost涓�1
+ task.setHostId(hostId);//涓存椂鎺у埗鍙厑璁竓ost涓�1
boolean result = taskService.save(task);
if (!result) {
@@ -157,10 +248,18 @@
public R createManualTakeTask(@RequestBody CreateManualTakeTaskParam param) {
//鑾峰彇鎵嬪姩浠诲姟绫诲瀷
TaskCtg taskCtg = taskCtgService.getOne(new LambdaQueryWrapper<TaskCtg>()
- .eq(TaskCtg::getFlag, "MANUAL")
+ .eq(TaskCtg::getFlag, String.valueOf(TaskCtgType.MANUAL))
.eq(TaskCtg::getStatus, 1));
if (taskCtg == null) {
return R.error("浠诲姟绫诲瀷寮傚父");
+ }
+
+ Task one = taskService.getOne(new LambdaQueryWrapper<Task>()
+ .eq(Task::getTaskCtg, taskCtg.getId())
+ .eq(Task::getOriginLoc, param.getOriginLoc())
+ .eq(Task::getDestLoc, param.getDestLoc()));
+ if (one != null) {
+ return R.error("浠诲姟宸插瓨鍦�");
}
//浼樺厛绾�
@@ -172,6 +271,7 @@
Task task = new Task();
task.setUuid(String.valueOf(snowflakeIdWorker.nextId()));
task.setTaskNo(String.valueOf(Utils.getTaskNo("OUT")));
+ task.setWmsTaskNo(param.getTaskNo());
task.setTaskSts(TaskStsType.NEW_MANUAL.sts);
task.setTaskCtg(taskCtg.getId());
task.setPriority(priority);
@@ -199,7 +299,7 @@
public R createMoveTask(@RequestBody CreateMoveTaskParam param) {
//鑾峰彇鍑哄簱浠诲姟绫诲瀷
TaskCtg taskCtg = taskCtgService.getOne(new LambdaQueryWrapper<TaskCtg>()
- .eq(TaskCtg::getFlag, "MOVE")
+ .eq(TaskCtg::getFlag, String.valueOf(TaskCtgType.MOVE))
.eq(TaskCtg::getStatus, 1));
if (taskCtg == null) {
return R.error("浠诲姟绫诲瀷寮傚父");
@@ -218,8 +318,18 @@
return R.error("绌挎杞︿笉鍦ㄧ嚎");
}
ShuttleProtocol shuttleProtocol = shuttleThread.getStatus();
- if (Utils.getLev(shuttleProtocol.getCurrentLocNo()) != Utils.getLev(param.getDestSite())) {
- return R.error("绌挎杞﹀拰鐩爣浣嶇疆涓嶅湪鍚屼竴妤煎眰");
+ if (shuttleProtocol == null) {
+ return R.error("绌挎杞︿笉鍦ㄧ嚎");
+ }
+// if (Utils.getLev(shuttleProtocol.getCurrentLocNo()) != Utils.getLev(param.getDestLoc())) {
+// return R.error("绌挎杞﹀拰鐩爣浣嶇疆涓嶅湪鍚屼竴妤煎眰");
+// }
+
+ Task one = taskService.getOne(new LambdaQueryWrapper<Task>()
+ .eq(Task::getTaskCtg, taskCtg.getId())
+ .eq(Task::getDestLoc, param.getDestLoc()));
+ if (one != null) {
+ return R.error("浠诲姟宸插瓨鍦�");
}
//浼樺厛绾�
@@ -231,13 +341,14 @@
Task task = new Task();
task.setUuid(String.valueOf(snowflakeIdWorker.nextId()));
task.setTaskNo(String.valueOf(Utils.getTaskNo("OUT")));
+ task.setWmsTaskNo(param.getTaskNo());
task.setTaskSts(TaskStsType.NEW_MOVE.sts);
task.setTaskCtg(taskCtg.getId());
task.setPriority(priority);
task.setOriginSite(null);
task.setOriginLoc(null);
- task.setDestSite(param.getDestSite());
- task.setDestLoc(null);
+ task.setDestSite(null);
+ task.setDestLoc(param.getDestLoc());
task.setIoTime(new Date());
task.setStartTime(new Date());
task.setStatus(1);
--
Gitblit v1.9.1