From 236d970338b4a5cb1bd33b5cc042fac89b61df66 Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期四, 17 十月 2024 16:45:21 +0800
Subject: [PATCH] #
---
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/service/impl/MainServiceImpl.java | 50 +-
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/kernel/command/LiftCommandService.java | 13
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/utils/OpenUtils.java | 438 +++++++++++++++++++++++++++
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/model/enums/TaskStsType.java | 4
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/timer/TaskTimer.java | 13
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/utils/LiftDispatcher.java | 3
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/controller/OpenController.java | 419 -------------------------
7 files changed, 502 insertions(+), 438 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 b39dad9..bb0d670 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,37 +1,14 @@
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.*;
-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.*;
-import com.zy.asrs.wcs.core.utils.Utils;
-import com.zy.asrs.wcs.rcs.cache.SlaveConnection;
-import com.zy.asrs.wcs.rcs.entity.Device;
-import com.zy.asrs.wcs.rcs.model.enums.SlaveType;
-import com.zy.asrs.wcs.rcs.model.enums.WorkModeType;
-import com.zy.asrs.wcs.rcs.model.protocol.ShuttleProtocol;
-import com.zy.asrs.wcs.rcs.service.DeviceService;
-import com.zy.asrs.wcs.rcs.thread.DevpThread;
-import com.zy.asrs.wcs.rcs.thread.ShuttleThread;
+import com.zy.asrs.wcs.core.utils.OpenUtils;
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;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
-
-import java.util.Date;
-import java.util.List;
/**
* 瀵瑰鏆撮湶鎺ュ彛
@@ -42,418 +19,36 @@
public class OpenController extends BaseController {
@Autowired
- private SnowflakeIdWorker snowflakeIdWorker;
- @Autowired
- private TaskCtgService taskCtgService;
- @Autowired
- private TaskService taskService;
- @Autowired
- private DeviceService deviceService;
- @Autowired
- private LocService locService;
- @Autowired
- private DictService dictService;
- @Autowired
- private BasConveyorPathService basConveyorPathService;
- @Autowired
- private BasLiftService basLiftService;
- @Autowired
- private BasConveyorService basConveyorService;
- @Autowired
- private BasConveyorStaService basConveyorStaService;
+ private OpenUtils openUtils;
//鐢熸垚鍏ュ簱浠诲姟
@PostMapping("/createInTask")
public R createInTask(@RequestBody CreateInTaskParam param) {
- //鑾峰彇鍏ュ簱浠诲姟绫诲瀷
- TaskCtg taskCtg = taskCtgService.getOne(new LambdaQueryWrapper<TaskCtg>()
- .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("搴撲綅鍙蜂笉瀛樺湪");
- }
-
- //鑾峰彇涓ユ牸妯″紡鍙傛暟
- 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());
- }
-
-// //鍒ゆ柇鍑哄叆搴撴ā寮�
-// BasConveyorSta basConveyorSta = basConveyorStaService.getOne(new LambdaQueryWrapper<BasConveyorSta>()
-// .eq(BasConveyorSta::getSiteNo, destSite));
-// if (!basConveyorSta.getWorkMode().equals((int) WorkModeType.PAKIN_MODE.id)) {
-// //涓嶆槸鍏ュ簱妯″紡锛屾娴嬫槸鍚﹀彲鍒囨崲鍏ュ簱
-// //鑾峰彇鍑哄簱浠诲姟绫诲瀷
-// TaskCtg taskInCtg = taskCtgService.getOne(new LambdaQueryWrapper<TaskCtg>()
-// .eq(TaskCtg::getFlag, String.valueOf(TaskCtgType.OUT))
-// .eq(TaskCtg::getStatus, 1));
-// if (taskInCtg == null) {
-// return R.error("浠诲姟绫诲瀷寮傚父");
-// }
-// List<Task> tasks = taskService.list(new LambdaQueryWrapper<Task>()
-// .eq(Task::getTaskCtg, taskInCtg.getId()));
-// if (!tasks.isEmpty()) {
-// return R.error("褰撳墠瀛樺湪鍑哄簱浠诲姟锛屾棤娉曞垏鎹㈠叆搴撴ā寮�");
-// }
-//
-// BasConveyor basConveyor = basConveyorService.getOne(new LambdaQueryWrapper<BasConveyor>().eq(BasConveyor::getConveyorNo, basConveyorSta.getConveyorNo()));
-// if(basConveyor == null) {
-// return R.error("杈撻�佺嚎涓嶅瓨鍦�");
-// }
-//
-// DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Conveyor, basConveyor.getDeviceId().intValue());
-// if(devpThread == null) {
-// return R.error("杈撻�佺嚎绾跨▼涓嶅瓨鍦�");
-// }
-//
-// boolean result = devpThread.switchWorkMode(Integer.parseInt(destSite), WorkModeType.PAKIN_MODE.id);
-// if (!result) {
-// return R.error("妯″紡鍒囨崲澶辫触");
-// }
-// }
-
- //浼樺厛绾�
- Integer priority = 10;
- if (param.getPriority() != null) {
- priority = param.getPriority();
- }
-
- 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(destSite);
- task.setDestLoc(param.getDestLoc());
- task.setZpallet(param.getBarcode());
- task.setIoTime(new Date());
- task.setStartTime(new Date());
- task.setStatus(1);
- task.setMemo("");
- task.setShuttleNo(null);//绛夊緟涓荤嚎绋嬪垎閰嶅皬杞�
- task.setRecordLoc("Y");//璁板綍搴撳瓨淇℃伅
- task.setHostId(hostId);//涓存椂鎺у埗鍙厑璁竓ost涓�1
-
- boolean result = taskService.save(task);
- if (!result) {
- return R.error("鐢熸垚鍏ュ簱浠诲姟澶辫触锛�");
- }
- return R.ok();
+ return openUtils.createInTask(param);
}
//鐢熸垚鍑哄簱浠诲姟
@PostMapping("/createOutTask")
public R createOutTask(@RequestBody CreateOutTaskParam param) {
- //鑾峰彇鍑哄簱浠诲姟绫诲瀷
- TaskCtg taskCtg = taskCtgService.getOne(new LambdaQueryWrapper<TaskCtg>()
- .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("搴撲綅鍙蜂笉瀛樺湪");
- }
-
- //鑾峰彇涓ユ牸妯″紡鍙傛暟
- 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());
- }
-
-// //鍒ゆ柇鍑哄叆搴撴ā寮�
-// BasConveyorSta basConveyorSta = basConveyorStaService.getOne(new LambdaQueryWrapper<BasConveyorSta>()
-// .eq(BasConveyorSta::getSiteNo, originSite));
-// if (!basConveyorSta.getWorkMode().equals((int) WorkModeType.PAKOUT_MODE.id)) {
-// //涓嶆槸鍑哄簱妯″紡锛屾娴嬫槸鍚﹀彲鍒囨崲鍑哄簱
-// //鑾峰彇鍏ュ簱浠诲姟绫诲瀷
-// TaskCtg taskInCtg = taskCtgService.getOne(new LambdaQueryWrapper<TaskCtg>()
-// .eq(TaskCtg::getFlag, String.valueOf(TaskCtgType.IN))
-// .eq(TaskCtg::getStatus, 1));
-// if (taskInCtg == null) {
-// return R.error("浠诲姟绫诲瀷寮傚父");
-// }
-// List<Task> tasks = taskService.list(new LambdaQueryWrapper<Task>()
-// .eq(Task::getTaskCtg, taskInCtg.getId()));
-// if (!tasks.isEmpty()) {
-// return R.error("褰撳墠瀛樺湪鍏ュ簱浠诲姟锛屾棤娉曞垏鎹㈠嚭搴撴ā寮�");
-// }
-//
-// BasConveyor basConveyor = basConveyorService.getOne(new LambdaQueryWrapper<BasConveyor>().eq(BasConveyor::getConveyorNo, basConveyorSta.getConveyorNo()));
-// if(basConveyor == null) {
-// return R.error("杈撻�佺嚎涓嶅瓨鍦�");
-// }
-//
-// DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Conveyor, basConveyor.getDeviceId().intValue());
-// if(devpThread == null) {
-// return R.error("杈撻�佺嚎绾跨▼涓嶅瓨鍦�");
-// }
-//
-// boolean result = devpThread.switchWorkMode(Integer.parseInt(originSite), WorkModeType.PAKOUT_MODE.id);
-// if (!result) {
-// return R.error("妯″紡鍒囨崲澶辫触");
-// }
-// }
-
- //浼樺厛绾�
- Integer priority = 10;
- if (param.getPriority() != null) {
- priority = param.getPriority();
- }
-
- 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(originSite);
- task.setOriginLoc(param.getOriginLoc());
- task.setDestSite(param.getDestSite());
- task.setDestLoc(null);
- task.setIoTime(new Date());
- task.setStartTime(new Date());
- task.setStatus(1);
- task.setMemo("");
- task.setShuttleNo(null);//绛夊緟涓荤嚎绋嬪垎閰嶅皬杞�
- task.setRecordLoc("Y");//璁板綍搴撳瓨淇℃伅
- task.setHostId(hostId);//涓存椂鎺у埗鍙厑璁竓ost涓�1
-
- boolean result = taskService.save(task);
- if (!result) {
- return R.error("鐢熸垚鍑哄簱浠诲姟澶辫触锛�");
- }
- return R.ok();
+ return openUtils.createOutTask(param);
}
//鐢熸垚鎵嬪姩鍙栨斁璐т换鍔�
@PostMapping("/createManualTakeTask")
public R createManualTakeTask(@RequestBody CreateManualTakeTaskParam param) {
- //鑾峰彇鎵嬪姩浠诲姟绫诲瀷
- TaskCtg taskCtg = taskCtgService.getOne(new LambdaQueryWrapper<TaskCtg>()
- .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("浠诲姟宸插瓨鍦�");
- }
-
- //浼樺厛绾�
- Integer priority = 10;
- if (param.getPriority() != null) {
- priority = param.getPriority();
- }
-
- 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);
- task.setOriginSite(null);
- task.setOriginLoc(param.getOriginLoc());//婧愬簱浣�
- task.setDestSite(null);
- task.setDestLoc(param.getDestLoc());//鐩爣搴撲綅
- task.setIoTime(new Date());
- task.setStartTime(new Date());
- task.setStatus(1);
- task.setMemo("");
- task.setShuttleNo(null);//绛夊緟涓荤嚎绋嬪垎閰嶅皬杞�
- task.setRecordLoc(param.getRecord() ? "Y" : "N");//璁板綍搴撳瓨淇℃伅
- task.setHostId(1L);//涓存椂鎺у埗鍙厑璁竓ost涓�1
-
- boolean result = taskService.save(task);
- if (!result) {
- return R.error("鐢熸垚鎵嬪姩鍙栨斁璐т换鍔″け璐ワ紒");
- }
- return R.ok();
+ return openUtils.createManualTakeTask(param);
}
//鐢熸垚灏忚溅绉诲姩浠诲姟
@PostMapping("/createMoveTask")
public R createMoveTask(@RequestBody CreateMoveTaskParam param) {
- //鑾峰彇鍑哄簱浠诲姟绫诲瀷
- TaskCtg taskCtg = taskCtgService.getOne(new LambdaQueryWrapper<TaskCtg>()
- .eq(TaskCtg::getFlag, String.valueOf(TaskCtgType.MOVE))
- .eq(TaskCtg::getStatus, 1));
- if (taskCtg == null) {
- return R.error("浠诲姟绫诲瀷寮傚父");
- }
-
- Device device = deviceService.getOne(new LambdaQueryWrapper<Device>()
- .eq(Device::getDeviceType, DeviceCtgType.SHUTTLE.val())
- .eq(Device::getDeviceNo, param.getShuttleNo())
- .eq(Device::getHostId, 1)
- .eq(Device::getStatus, 1));
- if (device == null) {
- return R.error("绌挎杞︿笉瀛樺湪");
- }
- ShuttleThread shuttleThread = (ShuttleThread) SlaveConnection.get(SlaveType.Shuttle, device.getId().intValue());
- if (shuttleThread == null) {
- return R.error("绌挎杞︿笉鍦ㄧ嚎");
- }
- ShuttleProtocol shuttleProtocol = shuttleThread.getStatus();
- 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("浠诲姟宸插瓨鍦�");
- }
-
- //浼樺厛绾�
- Integer priority = 10;
- if (param.getPriority() != null) {
- priority = param.getPriority();
- }
-
- 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(null);
- task.setDestLoc(param.getDestLoc());
- task.setIoTime(new Date());
- task.setStartTime(new Date());
- task.setStatus(1);
- task.setMemo("");
- task.setShuttleNo(param.getShuttleNo());
- task.setRecordLoc("N");//涓嶈褰曞簱瀛樹俊鎭�
- task.setHostId(1L);//涓存椂鎺у埗鍙厑璁竓ost涓�1
-
- boolean result = taskService.save(task);
- if (!result) {
- return R.error("鐢熸垚灏忚溅绉诲姩浠诲姟澶辫触锛�");
- }
- return R.ok();
+ return openUtils.createMoveTask(param);
}
//鍒囨崲宸ヤ綔妯″紡
@PostMapping("/switchWorkMode")
public R switchWorkMode(@RequestBody SwitchWorkModeParam param) {
- BasConveyor basConveyor = basConveyorService.getOne(new LambdaQueryWrapper<BasConveyor>().eq(BasConveyor::getConveyorNo, param.getConveyorNo()));
- if(basConveyor == null) {
- return R.error("杈撻�佺嚎涓嶅瓨鍦�");
- }
-
- DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Conveyor, basConveyor.getDeviceId().intValue());
- if(devpThread == null) {
- return R.error("杈撻�佺嚎绾跨▼涓嶅瓨鍦�");
- }
-
- boolean result = devpThread.switchWorkMode(param.getSiteId(), param.getWorkMode());
- if (!result) {
- return R.error("妯″紡鍒囨崲澶辫触");
- }
- return R.ok();
+ return openUtils.switchWorkMode(param);
}
}
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/kernel/command/LiftCommandService.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/kernel/command/LiftCommandService.java
index 6be4924..403c932 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/kernel/command/LiftCommandService.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/kernel/command/LiftCommandService.java
@@ -115,6 +115,11 @@
command = liftThread.getPalletInOutCommand(assignCommand.getDeviceTaskNo(), Integer.parseInt(motion.getOrigin()), Integer.parseInt(motion.getTarget()), motion.getOriDrt(), motion.getTarDrt(), LiftCommandModeType.PALLET_INOUT);
list.addAll(command);
+
+ motion.setTemp(String.valueOf(assignCommand.getDeviceTaskNo()));
+ motion.setUpdateTime(new Date());
+ motionService.updateById(motion);
+
return liftAction.assignWork(liftThread.getDevice(), assignCommand);
case LIFT_WITH_SHUTTLE:
//鍒ゆ柇鎻愬崌鏈烘槸鍚﹁嚜鍔�
@@ -247,7 +252,13 @@
return false;
}
if (!motion.getTaskNo().equals(staProtocol.getWorkNo().intValue())) {
- return false;
+ if (motion.getTemp() == null) {
+ return false;
+ }
+
+ if (Integer.parseInt(motion.getTemp()) != staProtocol.getWorkNo().intValue()) {
+ return false;
+ }
}
if (motion.getReleaseLift() == 1) {//閲婃斁鎻愬崌鏈�
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/model/enums/TaskStsType.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/model/enums/TaskStsType.java
index 43d5aa1..405119c 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/model/enums/TaskStsType.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/model/enums/TaskStsType.java
@@ -1,10 +1,6 @@
package com.zy.asrs.wcs.core.model.enums;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.zy.asrs.framework.common.SpringUtils;
import com.zy.asrs.framework.exception.CoolException;
-import com.zy.asrs.wcs.core.entity.TaskSts;
-import com.zy.asrs.wcs.core.service.TaskStsService;
public enum TaskStsType {
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/service/impl/MainServiceImpl.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/service/impl/MainServiceImpl.java
index 5acaf07..94221bf 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/service/impl/MainServiceImpl.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/service/impl/MainServiceImpl.java
@@ -8,15 +8,18 @@
import com.zy.asrs.common.domain.param.SearchLocParam;
import com.zy.asrs.common.utils.HttpHandler;
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.MatDto;
import com.zy.asrs.wcs.core.domain.dto.RedisMapDto;
import com.zy.asrs.wcs.core.domain.dto.StaDto;
+import com.zy.asrs.wcs.core.domain.param.CreateInTaskParam;
import com.zy.asrs.wcs.core.entity.*;
import com.zy.asrs.wcs.core.kernel.AnalyzeService;
import com.zy.asrs.wcs.core.model.MapNode;
import com.zy.asrs.wcs.core.model.enums.*;
import com.zy.asrs.wcs.core.service.*;
+import com.zy.asrs.wcs.core.utils.OpenUtils;
import com.zy.asrs.wcs.core.utils.RedisUtil;
import com.zy.asrs.wcs.core.utils.ShuttleDispatcher;
import com.zy.asrs.wcs.core.utils.Utils;
@@ -86,6 +89,8 @@
private DeviceBarcodeService deviceBarcodeService;
@Autowired
private ShuttleChargeStaService shuttleChargeStaService;
+ @Autowired
+ private OpenUtils openUtils;
/**
* 缁勬墭
@@ -191,19 +196,18 @@
}
}
- //鑾峰彇鍏ュ簱浠诲姟绫诲瀷
- TaskCtg taskCtg = taskCtgService.getOne(new LambdaQueryWrapper<TaskCtg>()
- .eq(TaskCtg::getFlag, String.valueOf(TaskCtgType.IN))
- .eq(TaskCtg::getStatus, 1));
-
// 鍒ゆ柇閲嶅宸ヤ綔妗�
Task task1 = taskService.getOne(new LambdaQueryWrapper<Task>()
.eq(Task::getOriginSite, inSta.getStaNo())
- .eq(Task::getTaskCtg, taskCtg.getId())
- .in(Task::getTaskSts, 1, 2, 3)
+ .in(Task::getTaskSts, TaskStsType.NEW_INBOUND.sts, TaskStsType.ANALYZE_INBOUND.sts, TaskStsType.EXECUTE_INBOUND.sts)
.eq(Task::getZpallet, barcode));
if (task1 != null) {
News.error("宸ヤ綔妗ｅ凡瀛樺湪,宸ヤ綔鍙�={}", task1.getTaskNo());
+ if (staProtocol.getWorkNo().intValue() != Integer.parseInt(task1.getTaskNo())) {
+ devpThread.writeWorkSta(staProtocol.getSiteId(), Short.parseShort(task1.getTaskNo()), Short.parseShort(task1.getDestSite()));
+ devpThread.setPakMk(staProtocol.getSiteId(), false);
+ News.info("杈撻�佺嚎鍏ュ簱鍛戒护涓嬪彂锛屼换鍔℃暟鎹�={}", JSON.toJSON(task1));
+ }
continue;
}
@@ -233,17 +237,25 @@
if (code.equals(200)) {
StartupDto dto = jsonObject.getObject("data", StartupDto.class);
- //鑾峰彇杈撻�佽矾寰�
- BasConveyorPath conveyorPath = basConveyorPathService.getOne(new LambdaQueryWrapper<BasConveyorPath>()
- .eq(BasConveyorPath::getTypeNo, TaskCtgType.IN.val())
- .eq(BasConveyorPath::getDeviceId, devp.getId())
- .eq(BasConveyorPath::getStnNo, staProtocol.getSiteId()));
- if (conveyorPath == null) {
- News.error("杈撻�佽矾寰勪笉瀛樺湪");
- }else {
- devpThread.writeWorkSta(staProtocol.getSiteId(), dto.getWorkNo().shortValue(), conveyorPath.getDeviceStn().shortValue());
- devpThread.setPakMk(staProtocol.getSiteId(), false);
- }
+ String wmsLocNo = dto.getLocNo();
+ int row = Integer.parseInt(wmsLocNo.substring(0, 2));
+ int bay = Integer.parseInt(wmsLocNo.substring(2, 5));
+ int lev = Integer.parseInt(wmsLocNo.substring(5, 7));
+ row -= 16;
+ String wcsLocNo = Utils.getLocNo(row, bay, lev);
+
+ CreateInTaskParam createInTaskParam = new CreateInTaskParam();
+ createInTaskParam.setTaskNo(String.valueOf(dto.getWorkNo()));
+ createInTaskParam.setDestLoc(wcsLocNo);
+ createInTaskParam.setOriginSite("31002");
+ createInTaskParam.setDestSite("31004");
+ createInTaskParam.setPriority(11);
+ createInTaskParam.setBarcode(barcode);
+
+ R result = openUtils.createInTask(createInTaskParam);
+ News.info("鍒涘缓鍏ュ簱浠诲姟锛屼换鍔℃暟鎹�={}锛岃姹傚搷搴�={}", JSON.toJSON(param), JSON.toJSON(result));
+ }else {
+ News.error("鍏ュ簱鐢宠澶辫触锛屼换鍔℃暟鎹�={}锛岃姹傚搷搴�={}", JSON.toJSON(param), JSON.toJSON(jsonObject));
}
} catch (Exception e) {
e.printStackTrace();
@@ -455,7 +467,7 @@
if (Cools.isEmpty(basConveyorSta.getTaskNo())){
continue;
}
- if (!basConveyorSta.getTaskNo().toString().equals(task.getWmsTaskNo())){
+ if (!basConveyorSta.getTaskNo().toString().equals(task.getTaskNo())){
continue;
}
DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Conveyor, basConveyor.getDeviceId().intValue());
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/timer/TaskTimer.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/timer/TaskTimer.java
index b8d5959..128af0d 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/timer/TaskTimer.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/timer/TaskTimer.java
@@ -8,6 +8,7 @@
import com.zy.asrs.wcs.core.model.enums.LocStsType;
import com.zy.asrs.wcs.core.model.enums.TaskStsType;
import com.zy.asrs.wcs.core.service.*;
+import com.zy.asrs.wcs.rcs.News;
import com.zy.asrs.wcs.system.entity.Dict;
import com.zy.asrs.wcs.system.service.DictService;
import lombok.extern.slf4j.Slf4j;
@@ -51,9 +52,17 @@
.eq(Task::getStatus, 1)
.in(Task::getTaskSts, taskSts));
for (Task task : tasks) {
- if (reportWms != null && reportWms.getFlag().equals("true")) {
+ if (reportWms != null && reportWms.getValue().equals("true")) {
+ //鑾峰彇WMS鍦板潃
+ Dict dict = dictService.getOne(new LambdaQueryWrapper<Dict>().eq(Dict::getFlag, "WMS_URL").eq(Dict::getStatus, 1));
+ if (dict == null) {
+ News.error("WMS鍦板潃鏈厤缃�");
+ return;
+ }
+ String wmsUrl = dict.getValue();
+
if(task.getTaskSts().equals(TaskStsType.COMPLETE_INBOUND.sts) || task.getTaskSts().equals(TaskStsType.COMPLETE_OUTBOUND.sts)){
- boolean httpRequest = doHttpRequest(task, "127.0.0.1:8080", "/wms/open/asrs//wrkMast/finish/v1");
+ boolean httpRequest = doHttpRequest(task, wmsUrl, "/open/asrs//wrkMast/finish/v1");
if (!httpRequest) {
return;
}
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/utils/LiftDispatcher.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/utils/LiftDispatcher.java
index cc41792..28df8f4 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/utils/LiftDispatcher.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/utils/LiftDispatcher.java
@@ -81,6 +81,9 @@
String liftLocNo = Utils.getLocNo(Utils.getRow(standby.getDeviceStandbyLoc()), Utils.getBay(standby.getDeviceStandbyLoc()), Utils.getLev(locNo));
List<NavigateNode> nodeList = NavigateUtils.calc(locNo, liftLocNo, NavigationMapType.NONE.id, null);
+ if (nodeList == null) {
+ continue;
+ }
Integer originPathAllDistance = NavigateUtils.getOriginPathAllDistance(nodeList);//鎬昏窛绂�
if (originPathAllDistance < finalDistance) {
finalDistance = originPathAllDistance;
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/utils/OpenUtils.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/utils/OpenUtils.java
new file mode 100644
index 0000000..a666960
--- /dev/null
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/utils/OpenUtils.java
@@ -0,0 +1,438 @@
+package com.zy.asrs.wcs.core.utils;
+
+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.*;
+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.*;
+import com.zy.asrs.wcs.rcs.cache.SlaveConnection;
+import com.zy.asrs.wcs.rcs.entity.Device;
+import com.zy.asrs.wcs.rcs.model.enums.SlaveType;
+import com.zy.asrs.wcs.rcs.model.protocol.ShuttleProtocol;
+import com.zy.asrs.wcs.rcs.service.DeviceService;
+import com.zy.asrs.wcs.rcs.thread.DevpThread;
+import com.zy.asrs.wcs.rcs.thread.ShuttleThread;
+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.stereotype.Component;
+
+import java.util.Date;
+import java.util.List;
+
+@Component
+public class OpenUtils {
+
+ @Autowired
+ private SnowflakeIdWorker snowflakeIdWorker;
+ @Autowired
+ private TaskCtgService taskCtgService;
+ @Autowired
+ private TaskService taskService;
+ @Autowired
+ private DeviceService deviceService;
+ @Autowired
+ private LocService locService;
+ @Autowired
+ private DictService dictService;
+ @Autowired
+ private BasConveyorPathService basConveyorPathService;
+ @Autowired
+ private BasLiftService basLiftService;
+ @Autowired
+ private BasConveyorService basConveyorService;
+ @Autowired
+ private BasConveyorStaService basConveyorStaService;
+
+ public R createInTask(CreateInTaskParam param) {
+ //鑾峰彇鍏ュ簱浠诲姟绫诲瀷
+ TaskCtg taskCtg = taskCtgService.getOne(new LambdaQueryWrapper<TaskCtg>()
+ .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("搴撲綅鍙蜂笉瀛樺湪");
+ }
+
+ //鑾峰彇涓ユ牸妯″紡鍙傛暟
+ 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());
+ }
+
+// //鍒ゆ柇鍑哄叆搴撴ā寮�
+// BasConveyorSta basConveyorSta = basConveyorStaService.getOne(new LambdaQueryWrapper<BasConveyorSta>()
+// .eq(BasConveyorSta::getSiteNo, destSite));
+// if (!basConveyorSta.getWorkMode().equals((int) WorkModeType.PAKIN_MODE.id)) {
+// //涓嶆槸鍏ュ簱妯″紡锛屾娴嬫槸鍚﹀彲鍒囨崲鍏ュ簱
+// //鑾峰彇鍑哄簱浠诲姟绫诲瀷
+// TaskCtg taskInCtg = taskCtgService.getOne(new LambdaQueryWrapper<TaskCtg>()
+// .eq(TaskCtg::getFlag, String.valueOf(TaskCtgType.OUT))
+// .eq(TaskCtg::getStatus, 1));
+// if (taskInCtg == null) {
+// return R.error("浠诲姟绫诲瀷寮傚父");
+// }
+// List<Task> tasks = taskService.list(new LambdaQueryWrapper<Task>()
+// .eq(Task::getTaskCtg, taskInCtg.getId()));
+// if (!tasks.isEmpty()) {
+// return R.error("褰撳墠瀛樺湪鍑哄簱浠诲姟锛屾棤娉曞垏鎹㈠叆搴撴ā寮�");
+// }
+//
+// BasConveyor basConveyor = basConveyorService.getOne(new LambdaQueryWrapper<BasConveyor>().eq(BasConveyor::getConveyorNo, basConveyorSta.getConveyorNo()));
+// if(basConveyor == null) {
+// return R.error("杈撻�佺嚎涓嶅瓨鍦�");
+// }
+//
+// DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Conveyor, basConveyor.getDeviceId().intValue());
+// if(devpThread == null) {
+// return R.error("杈撻�佺嚎绾跨▼涓嶅瓨鍦�");
+// }
+//
+// boolean result = devpThread.switchWorkMode(Integer.parseInt(destSite), WorkModeType.PAKIN_MODE.id);
+// if (!result) {
+// return R.error("妯″紡鍒囨崲澶辫触");
+// }
+// }
+
+ //浼樺厛绾�
+ Integer priority = 10;
+ if (param.getPriority() != null) {
+ priority = param.getPriority();
+ }
+
+ 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(destSite);
+ task.setDestLoc(param.getDestLoc());
+ task.setZpallet(param.getBarcode());
+ task.setIoTime(new Date());
+ task.setStartTime(new Date());
+ task.setStatus(1);
+ task.setMemo("");
+ task.setShuttleNo(null);//绛夊緟涓荤嚎绋嬪垎閰嶅皬杞�
+ task.setRecordLoc("Y");//璁板綍搴撳瓨淇℃伅
+ task.setHostId(hostId);//涓存椂鎺у埗鍙厑璁竓ost涓�1
+
+ boolean result = taskService.save(task);
+ if (!result) {
+ return R.error("鐢熸垚鍏ュ簱浠诲姟澶辫触锛�");
+ }
+ return R.ok().add(task);
+ }
+
+ public R createOutTask(CreateOutTaskParam param) {
+ //鑾峰彇鍑哄簱浠诲姟绫诲瀷
+ TaskCtg taskCtg = taskCtgService.getOne(new LambdaQueryWrapper<TaskCtg>()
+ .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("搴撲綅鍙蜂笉瀛樺湪");
+ }
+
+ //鑾峰彇涓ユ牸妯″紡鍙傛暟
+ 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());
+ }
+
+// //鍒ゆ柇鍑哄叆搴撴ā寮�
+// BasConveyorSta basConveyorSta = basConveyorStaService.getOne(new LambdaQueryWrapper<BasConveyorSta>()
+// .eq(BasConveyorSta::getSiteNo, originSite));
+// if (!basConveyorSta.getWorkMode().equals((int) WorkModeType.PAKOUT_MODE.id)) {
+// //涓嶆槸鍑哄簱妯″紡锛屾娴嬫槸鍚﹀彲鍒囨崲鍑哄簱
+// //鑾峰彇鍏ュ簱浠诲姟绫诲瀷
+// TaskCtg taskInCtg = taskCtgService.getOne(new LambdaQueryWrapper<TaskCtg>()
+// .eq(TaskCtg::getFlag, String.valueOf(TaskCtgType.IN))
+// .eq(TaskCtg::getStatus, 1));
+// if (taskInCtg == null) {
+// return R.error("浠诲姟绫诲瀷寮傚父");
+// }
+// List<Task> tasks = taskService.list(new LambdaQueryWrapper<Task>()
+// .eq(Task::getTaskCtg, taskInCtg.getId()));
+// if (!tasks.isEmpty()) {
+// return R.error("褰撳墠瀛樺湪鍏ュ簱浠诲姟锛屾棤娉曞垏鎹㈠嚭搴撴ā寮�");
+// }
+//
+// BasConveyor basConveyor = basConveyorService.getOne(new LambdaQueryWrapper<BasConveyor>().eq(BasConveyor::getConveyorNo, basConveyorSta.getConveyorNo()));
+// if(basConveyor == null) {
+// return R.error("杈撻�佺嚎涓嶅瓨鍦�");
+// }
+//
+// DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Conveyor, basConveyor.getDeviceId().intValue());
+// if(devpThread == null) {
+// return R.error("杈撻�佺嚎绾跨▼涓嶅瓨鍦�");
+// }
+//
+// boolean result = devpThread.switchWorkMode(Integer.parseInt(originSite), WorkModeType.PAKOUT_MODE.id);
+// if (!result) {
+// return R.error("妯″紡鍒囨崲澶辫触");
+// }
+// }
+
+ //浼樺厛绾�
+ Integer priority = 10;
+ if (param.getPriority() != null) {
+ priority = param.getPriority();
+ }
+
+ 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(originSite);
+ task.setOriginLoc(param.getOriginLoc());
+ task.setDestSite(param.getDestSite());
+ task.setDestLoc(null);
+ task.setIoTime(new Date());
+ task.setStartTime(new Date());
+ task.setStatus(1);
+ task.setMemo("");
+ task.setShuttleNo(null);//绛夊緟涓荤嚎绋嬪垎閰嶅皬杞�
+ task.setRecordLoc("Y");//璁板綍搴撳瓨淇℃伅
+ task.setHostId(hostId);//涓存椂鎺у埗鍙厑璁竓ost涓�1
+
+ boolean result = taskService.save(task);
+ if (!result) {
+ return R.error("鐢熸垚鍑哄簱浠诲姟澶辫触锛�");
+ }
+ return R.ok();
+ }
+
+ public R createManualTakeTask(CreateManualTakeTaskParam param) {
+ //鑾峰彇鎵嬪姩浠诲姟绫诲瀷
+ TaskCtg taskCtg = taskCtgService.getOne(new LambdaQueryWrapper<TaskCtg>()
+ .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("浠诲姟宸插瓨鍦�");
+ }
+
+ //浼樺厛绾�
+ Integer priority = 10;
+ if (param.getPriority() != null) {
+ priority = param.getPriority();
+ }
+
+ 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);
+ task.setOriginSite(null);
+ task.setOriginLoc(param.getOriginLoc());//婧愬簱浣�
+ task.setDestSite(null);
+ task.setDestLoc(param.getDestLoc());//鐩爣搴撲綅
+ task.setIoTime(new Date());
+ task.setStartTime(new Date());
+ task.setStatus(1);
+ task.setMemo("");
+ task.setShuttleNo(null);//绛夊緟涓荤嚎绋嬪垎閰嶅皬杞�
+ task.setRecordLoc(param.getRecord() ? "Y" : "N");//璁板綍搴撳瓨淇℃伅
+ task.setHostId(1L);//涓存椂鎺у埗鍙厑璁竓ost涓�1
+
+ boolean result = taskService.save(task);
+ if (!result) {
+ return R.error("鐢熸垚鎵嬪姩鍙栨斁璐т换鍔″け璐ワ紒");
+ }
+ return R.ok();
+ }
+
+ public R createMoveTask(CreateMoveTaskParam param) {
+ //鑾峰彇鍑哄簱浠诲姟绫诲瀷
+ TaskCtg taskCtg = taskCtgService.getOne(new LambdaQueryWrapper<TaskCtg>()
+ .eq(TaskCtg::getFlag, String.valueOf(TaskCtgType.MOVE))
+ .eq(TaskCtg::getStatus, 1));
+ if (taskCtg == null) {
+ return R.error("浠诲姟绫诲瀷寮傚父");
+ }
+
+ Device device = deviceService.getOne(new LambdaQueryWrapper<Device>()
+ .eq(Device::getDeviceType, DeviceCtgType.SHUTTLE.val())
+ .eq(Device::getDeviceNo, param.getShuttleNo())
+ .eq(Device::getHostId, 1)
+ .eq(Device::getStatus, 1));
+ if (device == null) {
+ return R.error("绌挎杞︿笉瀛樺湪");
+ }
+ ShuttleThread shuttleThread = (ShuttleThread) SlaveConnection.get(SlaveType.Shuttle, device.getId().intValue());
+ if (shuttleThread == null) {
+ return R.error("绌挎杞︿笉鍦ㄧ嚎");
+ }
+ ShuttleProtocol shuttleProtocol = shuttleThread.getStatus();
+ 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("浠诲姟宸插瓨鍦�");
+ }
+
+ //浼樺厛绾�
+ Integer priority = 10;
+ if (param.getPriority() != null) {
+ priority = param.getPriority();
+ }
+
+ 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(null);
+ task.setDestLoc(param.getDestLoc());
+ task.setIoTime(new Date());
+ task.setStartTime(new Date());
+ task.setStatus(1);
+ task.setMemo("");
+ task.setShuttleNo(param.getShuttleNo());
+ task.setRecordLoc("N");//涓嶈褰曞簱瀛樹俊鎭�
+ task.setHostId(1L);//涓存椂鎺у埗鍙厑璁竓ost涓�1
+
+ boolean result = taskService.save(task);
+ if (!result) {
+ return R.error("鐢熸垚灏忚溅绉诲姩浠诲姟澶辫触锛�");
+ }
+ return R.ok();
+ }
+
+ public R switchWorkMode(SwitchWorkModeParam param) {
+ BasConveyor basConveyor = basConveyorService.getOne(new LambdaQueryWrapper<BasConveyor>().eq(BasConveyor::getConveyorNo, param.getConveyorNo()));
+ if(basConveyor == null) {
+ return R.error("杈撻�佺嚎涓嶅瓨鍦�");
+ }
+
+ DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Conveyor, basConveyor.getDeviceId().intValue());
+ if(devpThread == null) {
+ return R.error("杈撻�佺嚎绾跨▼涓嶅瓨鍦�");
+ }
+
+ boolean result = devpThread.switchWorkMode(param.getSiteId(), param.getWorkMode());
+ if (!result) {
+ return R.error("妯″紡鍒囨崲澶辫触");
+ }
+ return R.ok();
+ }
+
+}
--
Gitblit v1.9.1