From 3fd514d4b802534159518924f3711dc5152732d4 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期二, 20 八月 2024 16:12:10 +0800
Subject: [PATCH] #任务增加缓存队列
---
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/service/TaskCacheService.java | 8
zy-asrs-wcs/src/main/resources/mapper/core/TaskCacheMapper.xml | 5
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/service/OpenService.java | 20
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/mapper/TaskCacheMapper.java | 12
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/service/impl/TaskCacheServiceImpl.java | 12
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/entity/TaskCache.java | 209 ++++++++
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/controller/OpenController.java | 453 ------------------
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/service/impl/OpenServiceImpl.java | 592 ++++++++++++++++++++++++
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/timer/TaskCacheTimer.java | 85 +++
9 files changed, 948 insertions(+), 448 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 ed35e06..4b3d777 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
@@ -64,6 +64,8 @@
private BasConveyorService basConveyorService;
@Autowired
private BasConveyorStaService basConveyorStaService;
+ @Autowired
+ private OpenService openService;
@PostMapping("/agvPickupComplete")
@@ -275,462 +277,22 @@
log.info("杩斿洖mes淇℃伅:"+JSONObject.toJSONString(map));
return map;
}
- String sta = "06YZ";
- String loc = "0601KW";
- if (param.getFrmPos().substring(0,4).equals(sta) && param.getToPos().substring(0,6).equals(loc)){
- if (!param.getFrmPos().equals("06YZ0001")){
- try {
- AgvTaskCreateParam agvTaskCreateParam = new AgvTaskCreateParam();
- getInRequestParam(agvTaskCreateParam,param);
- String httpRequest = doHttpRequest(agvTaskCreateParam, "172.18.16.248:443", "/rcs/rtas/api/robot/controller/task/submit");
- if (!httpRequest.equals("SUCCESS")){
- map.put("success", "0");
- map.put("message", httpRequest);
- map.put("result", "");
- map.put("requestPK", param.getRequestPK());
- log.info("杩斿洖mes淇℃伅:"+JSONObject.toJSONString(map));
- return map;
- }
- }catch (Exception e){
- map.put("success", "0");
- map.put("message", "杞彂AGV浠诲姟鍑洪敊");
- map.put("result", "");
- map.put("requestPK", param.getRequestPK());
- log.info("杩斿洖mes淇℃伅:"+JSONObject.toJSONString(map));
- return map;
- }
- }
- CreateInTaskParam createInTaskParam = new CreateInTaskParam();
- createInTaskParam.setTaskNo(param.getRequestPK());
- createInTaskParam.setDestLoc(getWMStoWCSLocNo(param.getToPos()));
- createInTaskParam.setOriginSite("100");
- createInTaskParam.setBarcode(param.getContNo());
- createInTaskParam.setPriority(Integer.valueOf(param.getTrkPrty()));
- createInTaskParam.setEndSite(param.getToPos());
- R inTask = null;
- try {
- inTask = createInTask(createInTaskParam);
- }catch (Exception e){
- map.put("success", "0");
- map.put("message", "鐢熸垚浠诲姟鍑洪敊");
- map.put("result", "");
- map.put("requestPK", param.getRequestPK());
- log.info("杩斿洖mes淇℃伅:"+JSONObject.toJSONString(map));
- return map;
- }finally {
- int code = (int) inTask.get("code");
- if (code == 200){
- map.put("success", "1");
- map.put("message", inTask.get("msg"));
- map.put("result", "");
- map.put("requestPK", param.getRequestPK());
- }else {
- map.put("success", "0");
- map.put("message", inTask.get("msg"));
- map.put("result", "");
- map.put("requestPK", param.getRequestPK());
- }
- }
- } else if (param.getFrmPos().substring(0,6).equals(loc) && param.getToPos().substring(0,4).equals(sta)) {
- CreateOutTaskParam createOutTaskParam = new CreateOutTaskParam();
- createOutTaskParam.setTaskNo(param.getRequestPK());
- createOutTaskParam.setOriginLoc(getWMStoWCSLocNo(param.getFrmPos()));
- createOutTaskParam.setOriginSite("101");
- createOutTaskParam.setDestSite("100");
- createOutTaskParam.setPriority(Integer.valueOf(param.getTrkPrty()));
- createOutTaskParam.setEndSite(param.getToPos());
- createOutTaskParam.setZpallet(param.getContNo());
- R outTask = null;
- try {
- outTask = createOutTask(createOutTaskParam);
- }catch (Exception e){
- map.put("success", "0");
- map.put("message", "鐢熸垚浠诲姟鍑洪敊");
- map.put("result", "");
- map.put("requestPK", param.getRequestPK());
- log.info("杩斿洖mes淇℃伅:"+JSONObject.toJSONString(map));
- return map;
- }finally {
- int code = (int) outTask.get("code");
- if (code == 200){
- map.put("success", "1");
- map.put("message", outTask.get("msg"));
- map.put("result", "");
- map.put("requestPK", param.getRequestPK());
- }else {
- map.put("success", "0");
- map.put("message", outTask.get("msg"));
- map.put("result", "");
- map.put("requestPK", param.getRequestPK());
- }
- }
-
- } else if (param.getFrmPos().substring(0,4).equals(sta) && param.getToPos().substring(0,4).equals(sta)) {
- try {
- AgvTaskCreateParam agvTaskCreateParam = new AgvTaskCreateParam();
- getTransmitRequestParam(agvTaskCreateParam,param);
- String httpRequest = doHttpRequest(agvTaskCreateParam, "172.18.16.248:443", "/rcs/rtas/api/robot/controller/task/submit");
- if (!httpRequest.equals("SUCCESS")){
- map.put("success", "0");
- map.put("message", httpRequest);
- map.put("result", "");
- map.put("requestPK", param.getRequestPK());
- log.info("杩斿洖mes淇℃伅:"+JSONObject.toJSONString(map));
- return map;
- }
- }catch (Exception e){
- map.put("success", "0");
- map.put("message", "杞彂AGV浠诲姟鍑洪敊");
- map.put("result", "");
- map.put("requestPK", param.getRequestPK());
- log.info("杩斿洖mes淇℃伅:"+JSONObject.toJSONString(map));
- return map;
- }
-
- } else {
- map.put("success", "0");
- map.put("message", "鏈壘鍒板搴斾换鍔＄被鍨�");
- map.put("result", "");
- map.put("requestPK", param.getRequestPK());
- }
+ map = openService.createWcsTaskCache(param);
log.info("杩斿洖mes淇℃伅:"+JSONObject.toJSONString(map));
return map;
- }
- public static String getWMStoWCSLocNo(String loc){
- String locNo = "";
- int row = Integer.parseInt(loc.substring(6,8));
- int bay = Integer.parseInt(loc.substring(8,10));
- int lev = Integer.parseInt(loc.substring(10,12));
- if (row == 2){
- row = 3;
- }
- locNo = row +"-"+bay+"-"+lev;
- return locNo;
- }
- private void getInRequestParam(AgvTaskCreateParam agvTaskCreateParam,CreateWcsTaskParam param){
- List<AgvTaskCreateParam.AgvTaskParam> agvTaskParamList = Arrays.asList(
- //璧峰浣�
- new AgvTaskCreateParam.AgvTaskParam("SITE",param.getFrmPos(),0,1),
- //鐩爣浣�
- new AgvTaskCreateParam.AgvTaskParam("SITE","06YZ0001",1,1)
- );
- List<AgvTaskCreateParam.carrierInfoParam> carrierInfoParam = Arrays.asList(
- //璧峰浣�
- new AgvTaskCreateParam.carrierInfoParam()
-
- );
- agvTaskCreateParam.setTaskType("F01");
- agvTaskCreateParam.setInitPriority(param.getTrkPrty());
- agvTaskCreateParam.setRobotTaskCode(param.getRequestPK());
- agvTaskCreateParam.setTargetRoute(agvTaskParamList);
- agvTaskCreateParam.setCarrierInfo(carrierInfoParam);
-
- }
- private void getTransmitRequestParam(AgvTaskCreateParam agvTaskCreateParam,CreateWcsTaskParam param){
- List<AgvTaskCreateParam.AgvTaskParam> agvTaskParamList = Arrays.asList(
- //璧峰浣�
- new AgvTaskCreateParam.AgvTaskParam("SITE",param.getFrmPos(),0,1),
- //鐩爣浣�
- new AgvTaskCreateParam.AgvTaskParam("SITE",param.getToPos(),1,1)
- );
- List<AgvTaskCreateParam.carrierInfoParam> carrierInfoParam = Arrays.asList(
- //璧峰浣�
- new AgvTaskCreateParam.carrierInfoParam()
-
- );
- agvTaskCreateParam.setTaskType("F01");
- agvTaskCreateParam.setInitPriority(param.getTrkPrty());
- agvTaskCreateParam.setRobotTaskCode(param.getRequestPK());
- agvTaskCreateParam.setTargetRoute(agvTaskParamList);
- agvTaskCreateParam.setCarrierInfo(carrierInfoParam);
-
- }
- private String doHttpRequest(AgvTaskCreateParam requestParam, String url, String path){
- String response = "";
- String success = "error";
- Map<String, Object> map = new HashMap<>();
- map.put("Content-Type", "application/json;charset=UTF-8");
- map.put("X-lr-request-id", requestParam.getRobotTaskCode());
- map.put("X-lr-version", 4.1);
- map.put("X-lr-trace-id", "{{$guid}}");
- try {
- response = new HttpHandler.Builder()
- .setHeaders(map)
- .setUri(url)
- .setHttps(true)
- .setPath(path)
- .setJson(JSONObject.toJSONString(requestParam))
- .build()
- .doPost();
- JSONObject jsonObject = JSON.parseObject(response);
-
- String code = jsonObject.get("code").toString();
- if(code.equals("SUCCESS")){
- success = "SUCCESS";
- }else {
- success = jsonObject.get("message").toString();
- }
- log.info("杞彂agv浠诲姟锛氳姹備綋:"+JSONObject.toJSONString(requestParam)+",杩斿洖鍊�:"+jsonObject);
- }catch (Exception e){
-
- }
- return success;
}
//鐢熸垚鍏ュ簱浠诲姟
@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
- task.setMemo(param.getEndSite());
-
- boolean result = taskService.save(task);
- if (!result) {
- return R.error("鐢熸垚鍏ュ簱浠诲姟澶辫触锛�");
- }
- return R.ok();
+ return openService.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(param.getEndSite());
- task.setShuttleNo(null);//绛夊緟涓荤嚎绋嬪垎閰嶅皬杞�
- task.setRecordLoc("Y");//璁板綍搴撳瓨淇℃伅
- task.setHostId(hostId);//涓存椂鎺у埗鍙厑璁竓ost涓�1
- task.setZpallet(param.getZpallet());
-
- boolean result = taskService.save(task);
- if (!result) {
- return R.error("鐢熸垚鍑哄簱浠诲姟澶辫触锛�");
- }
- return R.ok();
+ return openService.createOutTask(param);
}
//鐢熸垚鎵嬪姩鍙栨斁璐т换鍔�
@@ -923,11 +485,6 @@
return R.error("妯″紡鍒囨崲澶辫触");
}
return R.ok();
- }
-
- public static void main(String[] args) {
- String wmStoWCSLocNo = getWMStoWCSLocNo("0601KW010101");
- System.out.println(wmStoWCSLocNo);
}
}
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/entity/TaskCache.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/entity/TaskCache.java
new file mode 100644
index 0000000..014f660
--- /dev/null
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/entity/TaskCache.java
@@ -0,0 +1,209 @@
+package com.zy.asrs.wcs.core.entity;
+
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+import com.zy.asrs.wcs.system.entity.Host;
+import com.zy.asrs.wcs.system.entity.User;
+import org.springframework.format.annotation.DateTimeFormat;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import com.zy.asrs.framework.common.Cools;
+import com.zy.asrs.framework.common.SpringUtils;
+import com.zy.asrs.wcs.system.service.UserService;
+import com.zy.asrs.wcs.system.service.HostService;
+
+import java.io.Serializable;
+import java.util.Date;
+
+@Data
+@TableName("wcs_task_cache")
+public class TaskCache implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * ID
+ */
+ @ApiModelProperty(value= "ID")
+ @TableId(value = "id", type = IdType.AUTO)
+ private Long id;
+
+ /**
+ * 浠诲姟绫诲瀷 1: 鍏ュ簱 2: 鍑哄簱
+ */
+ @ApiModelProperty(value= "浠诲姟绫诲瀷 1: 鍏ュ簱 2: 鍑哄簱 ")
+ private Integer taskType;
+
+ /**
+ * 浠诲姟鍙傛暟
+ */
+ @ApiModelProperty(value= "浠诲姟鍙傛暟")
+ private String taskParam;
+
+ /**
+ * 鎵�灞炴満鏋�
+ */
+ @ApiModelProperty(value= "鎵�灞炴満鏋�")
+ private Long hostId;
+
+ /**
+ * 鐘舵�� 1: 姝ｅ父 0: 绂佺敤
+ */
+ @ApiModelProperty(value= "鐘舵�� 1: 姝ｅ父 0: 绂佺敤 ")
+ private Integer status;
+
+ /**
+ * 鏄惁鍒犻櫎 1: 鏄� 0: 鍚�
+ */
+ @ApiModelProperty(value= "鏄惁鍒犻櫎 1: 鏄� 0: 鍚� ")
+ private Integer deleted;
+
+ /**
+ * 娣诲姞鏃堕棿
+ */
+ @ApiModelProperty(value= "娣诲姞鏃堕棿")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private Date createTime;
+
+ /**
+ * 娣诲姞浜哄憳
+ */
+ @ApiModelProperty(value= "娣诲姞浜哄憳")
+ private Long createBy;
+
+ /**
+ * 淇敼鏃堕棿
+ */
+ @ApiModelProperty(value= "淇敼鏃堕棿")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private Date updateTime;
+
+ /**
+ * 淇敼浜哄憳
+ */
+ @ApiModelProperty(value= "淇敼浜哄憳")
+ private Long updateBy;
+
+ /**
+ * 澶囨敞
+ */
+ @ApiModelProperty(value= "澶囨敞")
+ private String memo;
+
+ public TaskCache() {}
+
+ public TaskCache(Integer taskType,String taskParam,Long hostId,Integer status,Integer deleted,Date createTime,Long createBy,Date updateTime,Long updateBy,String memo) {
+ this.taskType = taskType;
+ this.taskParam = taskParam;
+ this.hostId = hostId;
+ this.status = status;
+ this.deleted = deleted;
+ this.createTime = createTime;
+ this.createBy = createBy;
+ this.updateTime = updateTime;
+ this.updateBy = updateBy;
+ this.memo = memo;
+ }
+
+// TaskCache taskCache = new TaskCache(
+// null, // 浠诲姟绫诲瀷
+// null, // 浠诲姟鍙傛暟
+// null, // 鎵�灞炴満鏋�
+// null, // 鐘舵��
+// null, // 鏄惁鍒犻櫎
+// null, // 娣诲姞鏃堕棿
+// null, // 娣诲姞浜哄憳
+// null, // 淇敼鏃堕棿
+// null, // 淇敼浜哄憳
+// null // 澶囨敞
+// );
+
+ public String getTaskType$(){
+ if (null == this.taskType){ return null; }
+ switch (this.taskType){
+ case 1:
+ return "鍏ュ簱";
+ case 2:
+ return "鍑哄簱";
+ default:
+ return String.valueOf(this.taskType);
+ }
+ }
+
+ public String getHostId$(){
+ HostService service = SpringUtils.getBean(HostService.class);
+ Host host = service.getById(this.hostId);
+ if (!Cools.isEmpty(host)){
+ return String.valueOf(host.getName());
+ }
+ return null;
+ }
+
+ public String getStatus$(){
+ if (null == this.status){ return null; }
+ switch (this.status){
+ case 1:
+ return "姝ｅ父";
+ case 0:
+ return "绂佺敤";
+ default:
+ return String.valueOf(this.status);
+ }
+ }
+
+ public String getDeleted$(){
+ if (null == this.deleted){ return null; }
+ switch (this.deleted){
+ case 1:
+ return "鏄�";
+ case 0:
+ return "鍚�";
+ default:
+ return String.valueOf(this.deleted);
+ }
+ }
+
+ public String getCreateTime$(){
+ if (Cools.isEmpty(this.createTime)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.createTime);
+ }
+
+ public String getCreateBy$(){
+ UserService service = SpringUtils.getBean(UserService.class);
+ User user = service.getById(this.createBy);
+ if (!Cools.isEmpty(user)){
+ return String.valueOf(user.getNickname());
+ }
+ return null;
+ }
+
+ public String getUpdateTime$(){
+ if (Cools.isEmpty(this.updateTime)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.updateTime);
+ }
+
+ public String getUpdateBy$(){
+ UserService service = SpringUtils.getBean(UserService.class);
+ User user = service.getById(this.updateBy);
+ if (!Cools.isEmpty(user)){
+ return String.valueOf(user.getNickname());
+ }
+ return null;
+ }
+
+
+}
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/mapper/TaskCacheMapper.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/mapper/TaskCacheMapper.java
new file mode 100644
index 0000000..432f06d
--- /dev/null
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/mapper/TaskCacheMapper.java
@@ -0,0 +1,12 @@
+package com.zy.asrs.wcs.core.mapper;
+
+import com.zy.asrs.wcs.core.entity.TaskCache;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
+
+@Mapper
+@Repository
+public interface TaskCacheMapper extends BaseMapper<TaskCache> {
+
+}
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/service/OpenService.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/service/OpenService.java
new file mode 100644
index 0000000..f45ac06
--- /dev/null
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/service/OpenService.java
@@ -0,0 +1,20 @@
+package com.zy.asrs.wcs.core.service;
+
+import com.zy.asrs.framework.common.R;
+import com.zy.asrs.wcs.core.domain.param.CreateInTaskParam;
+import com.zy.asrs.wcs.core.domain.param.CreateOutTaskParam;
+import com.zy.asrs.wcs.core.domain.param.CreateWcsTaskParam;
+
+import java.util.HashMap;
+
+public interface OpenService {
+
+ R createInTask(CreateInTaskParam param);
+
+ R createOutTask(CreateOutTaskParam param);
+
+ HashMap<String, Object> executeWcsTaskCache(CreateWcsTaskParam param);
+
+ HashMap<String, Object> createWcsTaskCache(CreateWcsTaskParam param);
+
+}
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/service/TaskCacheService.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/service/TaskCacheService.java
new file mode 100644
index 0000000..11b4848
--- /dev/null
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/service/TaskCacheService.java
@@ -0,0 +1,8 @@
+package com.zy.asrs.wcs.core.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.zy.asrs.wcs.core.entity.TaskCache;
+
+public interface TaskCacheService extends IService<TaskCache> {
+
+}
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/service/impl/OpenServiceImpl.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/service/impl/OpenServiceImpl.java
new file mode 100644
index 0000000..3dd8255
--- /dev/null
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/service/impl/OpenServiceImpl.java
@@ -0,0 +1,592 @@
+package com.zy.asrs.wcs.core.service.impl;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+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.BasLiftStaDto;
+import com.zy.asrs.wcs.core.domain.param.AgvTaskCreateParam;
+import com.zy.asrs.wcs.core.domain.param.CreateInTaskParam;
+import com.zy.asrs.wcs.core.domain.param.CreateOutTaskParam;
+import com.zy.asrs.wcs.core.domain.param.CreateWcsTaskParam;
+import com.zy.asrs.wcs.core.entity.*;
+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.model.enums.SlaveType;
+import com.zy.asrs.wcs.rcs.model.enums.WorkModeType;
+import com.zy.asrs.wcs.rcs.thread.DevpThread;
+import com.zy.asrs.wcs.system.entity.Dict;
+import com.zy.asrs.wcs.system.service.DictService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.*;
+
+@Service("openService")
+@Slf4j
+public class OpenServiceImpl implements OpenService {
+
+ @Autowired
+ private TaskService taskService;
+ @Autowired
+ private TaskCtgService taskCtgService;
+ @Autowired
+ private LocService locService;
+ @Autowired
+ private DictService dictService;
+ @Autowired
+ private BasConveyorPathService basConveyorPathService;
+ @Autowired
+ private BasConveyorStaService basConveyorStaService;
+ @Autowired
+ private BasConveyorService basConveyorService;
+ @Autowired
+ private SnowflakeIdWorker snowflakeIdWorker;
+ @Autowired
+ private BasLiftService basLiftService;
+ @Autowired
+ private TaskCacheService taskCacheService;
+
+
+ @Override
+ 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
+ task.setMemo(param.getEndSite());
+
+ boolean result = taskService.save(task);
+ if (!result) {
+ return R.error("鐢熸垚鍏ュ簱浠诲姟澶辫触锛�");
+ }
+ return R.ok();
+ }
+
+ @Override
+ 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(param.getEndSite());
+ task.setShuttleNo(null);//绛夊緟涓荤嚎绋嬪垎閰嶅皬杞�
+ task.setRecordLoc("Y");//璁板綍搴撳瓨淇℃伅
+ task.setHostId(hostId);//涓存椂鎺у埗鍙厑璁竓ost涓�1
+ task.setZpallet(param.getZpallet());
+
+ boolean result = taskService.save(task);
+ if (!result) {
+ return R.error("鐢熸垚鍑哄簱浠诲姟澶辫触锛�");
+ }
+ return R.ok();
+ }
+
+ @Override
+ public HashMap<String, Object> executeWcsTaskCache(CreateWcsTaskParam param) {
+ HashMap<String, Object> map = new HashMap<>();
+ String sta = "06YZ";
+ String loc = "0601KW";
+ if (param.getFrmPos().substring(0,4).equals(sta) && param.getToPos().substring(0,6).equals(loc)){
+ if (!param.getFrmPos().equals("06YZ0001")){
+ try {
+ AgvTaskCreateParam agvTaskCreateParam = new AgvTaskCreateParam();
+ getInRequestParam(agvTaskCreateParam,param);
+ String httpRequest = doHttpRequest(agvTaskCreateParam, "172.18.16.248:443", "/rcs/rtas/api/robot/controller/task/submit");
+ if (!httpRequest.equals("SUCCESS")){
+ map.put("success", "0");
+ map.put("message", httpRequest);
+ map.put("result", "");
+ map.put("requestPK", param.getRequestPK());
+ log.info("杩斿洖mes淇℃伅:"+ JSONObject.toJSONString(map));
+ return map;
+ }
+ }catch (Exception e){
+ map.put("success", "0");
+ map.put("message", "杞彂AGV浠诲姟鍑洪敊");
+ map.put("result", "");
+ map.put("requestPK", param.getRequestPK());
+ log.info("杩斿洖mes淇℃伅:"+JSONObject.toJSONString(map));
+ return map;
+ }
+ }
+
+ CreateInTaskParam createInTaskParam = new CreateInTaskParam();
+ createInTaskParam.setTaskNo(param.getRequestPK());
+ createInTaskParam.setDestLoc(getWMStoWCSLocNo(param.getToPos()));
+ createInTaskParam.setOriginSite("100");
+ createInTaskParam.setBarcode(param.getContNo());
+ createInTaskParam.setPriority(Integer.valueOf(param.getTrkPrty()));
+ createInTaskParam.setEndSite(param.getToPos());
+ R inTask = null;
+ try {
+ inTask = this.createInTask(createInTaskParam);
+ }catch (Exception e){
+ map.put("success", "0");
+ map.put("message", "鐢熸垚浠诲姟鍑洪敊");
+ map.put("result", "");
+ map.put("requestPK", param.getRequestPK());
+ log.info("杩斿洖mes淇℃伅:"+JSONObject.toJSONString(map));
+ return map;
+ }finally {
+ int code = (int) inTask.get("code");
+ if (code == 200){
+ map.put("success", "1");
+ map.put("message", inTask.get("msg"));
+ map.put("result", "");
+ map.put("requestPK", param.getRequestPK());
+ }else {
+ map.put("success", "0");
+ map.put("message", inTask.get("msg"));
+ map.put("result", "");
+ map.put("requestPK", param.getRequestPK());
+ }
+ }
+ } else if (param.getFrmPos().substring(0,6).equals(loc) && param.getToPos().substring(0,4).equals(sta)) {
+ CreateOutTaskParam createOutTaskParam = new CreateOutTaskParam();
+ createOutTaskParam.setTaskNo(param.getRequestPK());
+ createOutTaskParam.setOriginLoc(getWMStoWCSLocNo(param.getFrmPos()));
+ createOutTaskParam.setOriginSite("101");
+ createOutTaskParam.setDestSite("100");
+ createOutTaskParam.setPriority(Integer.valueOf(param.getTrkPrty()));
+ createOutTaskParam.setEndSite(param.getToPos());
+ createOutTaskParam.setZpallet(param.getContNo());
+ R outTask = null;
+ try {
+ outTask = this.createOutTask(createOutTaskParam);
+ }catch (Exception e){
+ map.put("success", "0");
+ map.put("message", "鐢熸垚浠诲姟鍑洪敊");
+ map.put("result", "");
+ map.put("requestPK", param.getRequestPK());
+ log.info("杩斿洖mes淇℃伅:"+JSONObject.toJSONString(map));
+ return map;
+ }finally {
+ int code = (int) outTask.get("code");
+ if (code == 200){
+ map.put("success", "1");
+ map.put("message", outTask.get("msg"));
+ map.put("result", "");
+ map.put("requestPK", param.getRequestPK());
+ }else {
+ map.put("success", "0");
+ map.put("message", outTask.get("msg"));
+ map.put("result", "");
+ map.put("requestPK", param.getRequestPK());
+ }
+ }
+
+ } else if (param.getFrmPos().substring(0,4).equals(sta) && param.getToPos().substring(0,4).equals(sta)) {
+ try {
+ AgvTaskCreateParam agvTaskCreateParam = new AgvTaskCreateParam();
+ getTransmitRequestParam(agvTaskCreateParam,param);
+ String httpRequest = doHttpRequest(agvTaskCreateParam, "172.18.16.248:443", "/rcs/rtas/api/robot/controller/task/submit");
+ if (!httpRequest.equals("SUCCESS")){
+ map.put("success", "0");
+ map.put("message", httpRequest);
+ map.put("result", "");
+ map.put("requestPK", param.getRequestPK());
+ log.info("杩斿洖mes淇℃伅:"+JSONObject.toJSONString(map));
+ return map;
+ }
+ }catch (Exception e){
+ map.put("success", "0");
+ map.put("message", "杞彂AGV浠诲姟鍑洪敊");
+ map.put("result", "");
+ map.put("requestPK", param.getRequestPK());
+ log.info("杩斿洖mes淇℃伅:"+JSONObject.toJSONString(map));
+ return map;
+ }
+
+ } else {
+ map.put("success", "0");
+ map.put("message", "鏈壘鍒板搴斾换鍔＄被鍨�");
+ map.put("result", "");
+ map.put("requestPK", param.getRequestPK());
+ }
+
+ return map;
+ }
+
+ @Override
+ public HashMap<String, Object> createWcsTaskCache(CreateWcsTaskParam param) {
+ HashMap<String, Object> map = new HashMap<>();
+ String sta = "06YZ";
+ String loc = "0601KW";
+ if (param.getFrmPos().substring(0,4).equals(sta) && param.getToPos().substring(0,6).equals(loc)){
+ //鍏ュ簱
+ TaskCache taskCache = new TaskCache();
+ taskCache.setTaskType(1);
+ taskCache.setTaskParam(JSON.toJSONString(param));
+ boolean save = taskCacheService.save(taskCache);
+ if (!save) {
+ map.put("success", "0");
+ map.put("message", "鐢熸垚浠诲姟鍑洪敊");
+ map.put("result", "");
+ map.put("requestPK", param.getRequestPK());
+ log.info("杩斿洖mes淇℃伅:"+JSONObject.toJSONString(map));
+ return map;
+ }
+ map.put("success", "1");
+ map.put("message", "success");
+ map.put("result", "");
+ map.put("requestPK", param.getRequestPK());
+ return map;
+ } else if (param.getFrmPos().substring(0,6).equals(loc) && param.getToPos().substring(0,4).equals(sta)) {
+ //鍑哄簱
+ TaskCache taskCache = new TaskCache();
+ taskCache.setTaskType(2);
+ taskCache.setTaskParam(JSON.toJSONString(param));
+ boolean save = taskCacheService.save(taskCache);
+ if (!save) {
+ map.put("success", "0");
+ map.put("message", "鐢熸垚浠诲姟鍑洪敊");
+ map.put("result", "");
+ map.put("requestPK", param.getRequestPK());
+ log.info("杩斿洖mes淇℃伅:"+JSONObject.toJSONString(map));
+ return map;
+ }
+ map.put("success", "1");
+ map.put("message", "success");
+ map.put("result", "");
+ map.put("requestPK", param.getRequestPK());
+ } else if (param.getFrmPos().substring(0,4).equals(sta) && param.getToPos().substring(0,4).equals(sta)) {
+ try {
+ AgvTaskCreateParam agvTaskCreateParam = new AgvTaskCreateParam();
+ getTransmitRequestParam(agvTaskCreateParam,param);
+ String httpRequest = doHttpRequest(agvTaskCreateParam, "172.18.16.248:443", "/rcs/rtas/api/robot/controller/task/submit");
+ if (!httpRequest.equals("SUCCESS")){
+ map.put("success", "0");
+ map.put("message", httpRequest);
+ map.put("result", "");
+ map.put("requestPK", param.getRequestPK());
+ log.info("杩斿洖mes淇℃伅:"+JSONObject.toJSONString(map));
+ return map;
+ }
+ }catch (Exception e){
+ map.put("success", "0");
+ map.put("message", "杞彂AGV浠诲姟鍑洪敊");
+ map.put("result", "");
+ map.put("requestPK", param.getRequestPK());
+ log.info("杩斿洖mes淇℃伅:"+JSONObject.toJSONString(map));
+ return map;
+ }
+
+ } else {
+ map.put("success", "0");
+ map.put("message", "鏈壘鍒板搴斾换鍔＄被鍨�");
+ map.put("result", "");
+ map.put("requestPK", param.getRequestPK());
+ }
+
+ return map;
+ }
+
+ private void getInRequestParam(AgvTaskCreateParam agvTaskCreateParam,CreateWcsTaskParam param){
+ List<AgvTaskCreateParam.AgvTaskParam> agvTaskParamList = Arrays.asList(
+ //璧峰浣�
+ new AgvTaskCreateParam.AgvTaskParam("SITE",param.getFrmPos(),0,1),
+ //鐩爣浣�
+ new AgvTaskCreateParam.AgvTaskParam("SITE","06YZ0001",1,1)
+ );
+ List<AgvTaskCreateParam.carrierInfoParam> carrierInfoParam = Arrays.asList(
+ //璧峰浣�
+ new AgvTaskCreateParam.carrierInfoParam()
+
+ );
+ agvTaskCreateParam.setTaskType("F01");
+ agvTaskCreateParam.setInitPriority(param.getTrkPrty());
+ agvTaskCreateParam.setRobotTaskCode(param.getRequestPK());
+ agvTaskCreateParam.setTargetRoute(agvTaskParamList);
+ agvTaskCreateParam.setCarrierInfo(carrierInfoParam);
+
+ }
+ private void getTransmitRequestParam(AgvTaskCreateParam agvTaskCreateParam,CreateWcsTaskParam param){
+ List<AgvTaskCreateParam.AgvTaskParam> agvTaskParamList = Arrays.asList(
+ //璧峰浣�
+ new AgvTaskCreateParam.AgvTaskParam("SITE",param.getFrmPos(),0,1),
+ //鐩爣浣�
+ new AgvTaskCreateParam.AgvTaskParam("SITE",param.getToPos(),1,1)
+ );
+ List<AgvTaskCreateParam.carrierInfoParam> carrierInfoParam = Arrays.asList(
+ //璧峰浣�
+ new AgvTaskCreateParam.carrierInfoParam()
+
+ );
+ agvTaskCreateParam.setTaskType("F01");
+ agvTaskCreateParam.setInitPriority(param.getTrkPrty());
+ agvTaskCreateParam.setRobotTaskCode(param.getRequestPK());
+ agvTaskCreateParam.setTargetRoute(agvTaskParamList);
+ agvTaskCreateParam.setCarrierInfo(carrierInfoParam);
+
+ }
+ private String doHttpRequest(AgvTaskCreateParam requestParam, String url, String path){
+ String response = "";
+ String success = "error";
+ Map<String, Object> map = new HashMap<>();
+ map.put("Content-Type", "application/json;charset=UTF-8");
+ map.put("X-lr-request-id", requestParam.getRobotTaskCode());
+ map.put("X-lr-version", 4.1);
+ map.put("X-lr-trace-id", "{{$guid}}");
+ try {
+ response = new HttpHandler.Builder()
+ .setHeaders(map)
+ .setUri(url)
+ .setHttps(true)
+ .setPath(path)
+ .setJson(JSONObject.toJSONString(requestParam))
+ .build()
+ .doPost();
+ JSONObject jsonObject = JSON.parseObject(response);
+
+ String code = jsonObject.get("code").toString();
+ if(code.equals("SUCCESS")){
+ success = "SUCCESS";
+ }else {
+ success = jsonObject.get("message").toString();
+ }
+ log.info("杞彂agv浠诲姟锛氳姹備綋:"+JSONObject.toJSONString(requestParam)+",杩斿洖鍊�:"+jsonObject);
+ }catch (Exception e){
+
+ }
+ return success;
+ }
+
+ public static String getWMStoWCSLocNo(String loc){
+ String locNo = "";
+ int row = Integer.parseInt(loc.substring(6,8));
+ int bay = Integer.parseInt(loc.substring(8,10));
+ int lev = Integer.parseInt(loc.substring(10,12));
+ if (row == 2){
+ row = 3;
+ }
+ locNo = row +"-"+bay+"-"+lev;
+ return locNo;
+ }
+}
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/service/impl/TaskCacheServiceImpl.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/service/impl/TaskCacheServiceImpl.java
new file mode 100644
index 0000000..5bdaeb7
--- /dev/null
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/service/impl/TaskCacheServiceImpl.java
@@ -0,0 +1,12 @@
+package com.zy.asrs.wcs.core.service.impl;
+
+import com.zy.asrs.wcs.core.mapper.TaskCacheMapper;
+import com.zy.asrs.wcs.core.entity.TaskCache;
+import com.zy.asrs.wcs.core.service.TaskCacheService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+@Service("taskCacheService")
+public class TaskCacheServiceImpl extends ServiceImpl<TaskCacheMapper, TaskCache> implements TaskCacheService {
+
+}
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/timer/TaskCacheTimer.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/timer/TaskCacheTimer.java
new file mode 100644
index 0000000..5bbafcb
--- /dev/null
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/timer/TaskCacheTimer.java
@@ -0,0 +1,85 @@
+package com.zy.asrs.wcs.core.timer;
+
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.zy.asrs.framework.exception.CoolException;
+import com.zy.asrs.wcs.core.domain.param.CreateWcsTaskParam;
+import com.zy.asrs.wcs.core.entity.BasConveyorSta;
+import com.zy.asrs.wcs.core.entity.TaskCache;
+import com.zy.asrs.wcs.core.service.BasConveyorStaService;
+import com.zy.asrs.wcs.core.service.OpenService;
+import com.zy.asrs.wcs.core.service.TaskCacheService;
+import com.zy.asrs.wcs.rcs.model.enums.WorkModeType;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.HashMap;
+import java.util.List;
+
+@Slf4j
+@Component
+public class TaskCacheTimer {
+
+ @Autowired
+ private TaskCacheService taskCacheService;
+ @Autowired
+ private BasConveyorStaService basConveyorStaService;
+ @Autowired
+ private OpenService openService;
+
+ @Scheduled(cron = "0/1 * * * * ? ")
+ @Transactional
+ public synchronized void executeTaskCache() {
+ //鍒ゆ柇鍑哄叆搴撴ā寮�
+ BasConveyorSta basConveyorSta = basConveyorStaService.getOne(new LambdaQueryWrapper<BasConveyorSta>()
+ .eq(BasConveyorSta::getSiteNo, 101));
+ if (basConveyorSta == null) {
+ return;
+ }
+
+ List<TaskCache> taskInCaches = taskCacheService.list(new LambdaQueryWrapper<TaskCache>().eq(TaskCache::getTaskType, 1));//鍏ュ簱缂撳瓨
+ List<TaskCache> taskOutCaches = taskCacheService.list(new LambdaQueryWrapper<TaskCache>().eq(TaskCache::getTaskType, 2));//鍑哄簱缂撳瓨
+
+ if (basConveyorSta.getWorkMode().equals((int) WorkModeType.PAKIN_MODE.id)) {
+ //鍏ュ簱妯″紡
+ if (!taskInCaches.isEmpty()) {
+ //瀛樺湪鍏ュ簱缂撳瓨
+ executeTaskCache(taskInCaches);
+ }else {
+ //涓嶅瓨鍦ㄥ叆搴撶紦瀛橈紝涓斿浜庡叆搴撴ā寮忥紝灏濊瘯鎵ц鍑哄簱缂撳瓨
+ executeTaskCache(taskOutCaches);
+ }
+ }else {
+ //鍑哄簱妯″紡
+ if (!taskOutCaches.isEmpty()) {
+ //瀛樺湪鍑哄簱缂撳瓨
+ executeTaskCache(taskOutCaches);
+ }else {
+ //涓嶅瓨鍦ㄥ嚭搴撶紦瀛橈紝涓斿浜庡嚭搴撴ā寮忥紝灏濊瘯鎵ц鍏ュ簱缂撳瓨
+ executeTaskCache(taskInCaches);
+ }
+ }
+ }
+
+ private synchronized void executeTaskCache(List<TaskCache> taskCaches) {
+ if(taskCaches.isEmpty()){
+ return;
+ }
+
+ for (TaskCache taskCache : taskCaches) {
+ CreateWcsTaskParam param = JSON.parseObject(taskCache.getTaskParam(), CreateWcsTaskParam.class);
+ HashMap<String, Object> result = openService.executeWcsTaskCache(param);
+ log.info("缂撳瓨鎵ц缁撴灉锛歿}", JSON.toJSONString(result));
+ if (result.get("success").toString().equals("1")) {
+ //鎵ц鎴愬姛锛屽垹闄ょ紦瀛�
+ if (!taskCacheService.removeById(taskCache.getId())) {
+ throw new CoolException("缂撳瓨鍒犻櫎澶辫触");
+ }
+ }
+ }
+ }
+
+}
diff --git a/zy-asrs-wcs/src/main/resources/mapper/core/TaskCacheMapper.xml b/zy-asrs-wcs/src/main/resources/mapper/core/TaskCacheMapper.xml
new file mode 100644
index 0000000..8943939
--- /dev/null
+++ b/zy-asrs-wcs/src/main/resources/mapper/core/TaskCacheMapper.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.zy.asrs.wcs.core.mapper.TaskCacheMapper">
+
+</mapper>
--
Gitblit v1.9.1