From c1ef2d1fc4c0dae2bc8452924dcd77a0ff3a1ef5 Mon Sep 17 00:00:00 2001 From: cpT <1@123> Date: 星期四, 19 六月 2025 15:02:52 +0800 Subject: [PATCH] #改造 --- src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 81 +++++++++++++++++++++++++++++----------- 1 files changed, 58 insertions(+), 23 deletions(-) diff --git a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java index 777dbde..8690b3d 100644 --- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java +++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.mapper.EntityWrapper; import com.core.common.Cools; import com.core.common.R; +import com.core.common.SpringUtils; import com.core.exception.CoolException; import com.zy.asrs.domain.enums.TaskStatusType; import com.zy.asrs.domain.enums.WorkNoType; @@ -65,16 +66,34 @@ public R taskCreate(TaskCreateParam param) { TaskWrk taskWrk = taskWrkService.selectByTaskNo(param.getTaskNo()); if (taskWrk != null) { + try{ + DeviceErrorService deviceErrorService = SpringUtils.getBean(DeviceErrorService.class); + deviceErrorService.addDeviceError("wms", 1, "浠诲姟宸插瓨鍦紝璇峰嬁閲嶅鎻愪氦,taskWrk:"+JSON.toJSONString(taskWrk)); + } catch (Exception e2){ +// log.error("e2:"+e2.getMessage()); + } throw new CoolException(param.getTaskNo() + "浠诲姟宸插瓨鍦紝璇峰嬁閲嶅鎻愪氦"); } if (param.getIoType().equals(0)){ + try{ + DeviceErrorService deviceErrorService = SpringUtils.getBean(DeviceErrorService.class); + deviceErrorService.addDeviceError("wms", 1, "鐢熸垚浠诲姟澶辫触锛屼换鍔$被鍨嬩笉瀛樺湪锛�,iotype:"+JSON.toJSONString(param.getIoType())); + } catch (Exception e2){ +// log.error("e2:"+e2.getMessage()); + } throw new CoolException("鐢熸垚浠诲姟澶辫触锛屼换鍔$被鍨嬩笉瀛樺湪锛�"); } Date now = new Date(); taskWrk = new TaskWrk(); - LocMast locMast=locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no",param.getStartPoint())); - int workNo1 = commonService.getWorkNo(WorkNoType.PAKOUT.type);//鑾峰彇鍏ュ簱宸ヤ綔鍙� + int workNo1 = 0;//鑾峰彇鍏ュ簱宸ヤ綔鍙� + if (param.getIoType() .equals(1)){ + workNo1 = commonService.getWorkNo(WorkNoType.PAKIN.type); + } else if (param.getIoType() .equals(2)){ + workNo1 = commonService.getWorkNo(WorkNoType.PAKOUT.type); + } else { + workNo1 = commonService.getWorkNo(WorkNoType.PICK.type); + } taskWrk.setTaskNo(param.getTaskNo());//浠诲姟鍙� taskWrk.setWrkNo(workNo1); taskWrk.setStatus(TaskStatusType.RECEIVE.id);//浠诲姟鐘舵�侊細鎺ユ敹 @@ -82,23 +101,29 @@ taskWrk.setModiTime(now); taskWrk.setAssignTime(new Date()); taskWrk.setModiUser(6666L); - try{ - if (param.getIoType()>1){ - if (Utils.locNoRowBoolean(locMast.getRow1())){ - param.setTaskPriority(11); - } - } - }catch (Exception e){ - } +// try{ +// if (param.getIoType()>1){ +// LocMast locMast=locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no",param.getStartPoint())); +// if (Utils.locNoRowBoolean(locMast.getRow1())){ +// param.setTaskPriority(11); +// } +// } +// }catch (Exception e){ +// } + taskWrk.setIoPri(param.getTaskPriority()); + taskWrk.setIoType(param.getIoType());//浠诲姟绫诲瀷 taskWrk.setIoPri(param.getTaskPriority());//浼樺厛绾� taskWrk.setBarcode(param.getBarcode());//鏉$爜 - taskWrk.setCrnNo(locMast.getCrnNo()); + taskWrk.setCrnNo(param.getCrn()); if(param.getIoType() == 1){ taskWrk.setWrkSts(1); if (!Cools.isEmpty(param.getTargetPoint())) { - taskWrk.setTargetPoint(Utils.getWcsLocNo(param.getTargetPoint()));//缁堢偣 - taskWrk.setOriginTargetPoint(param.getTargetPoint()); +// taskWrk.setTargetPoint(Utils.getWcsLocNo(param.getTargetPoint()));//缁堢偣 杞崲涓� + taskWrk.setTargetPoint(param.getTargetPoint());//缁堢偣 + taskWrk.setStartPoint(param.getStartPoint()); + taskWrk.setOriginStartPoint(param.getStartPointSta().toString()); + taskWrk.setOriginTargetPoint(param.getTargetPointSta().toString()); } } else if (param.getIoType() == 2) { @@ -108,11 +133,15 @@ taskWrk.setTargetPoint(param.getTargetPoint()); } taskWrk.setTargetPoint(param.getTargetPoint()); + taskWrk.setOriginStartPoint(param.getStartPointSta().toString()); + taskWrk.setOriginTargetPoint(param.getTargetPointSta().toString()); }else if (param.getIoType() == 3){ taskWrk.setWrkSts(11); if (!Cools.isEmpty(param.getStartPoint())) { taskWrk.setStartPoint(param.getStartPoint());//璧风偣 taskWrk.setTargetPoint(param.getTargetPoint()); + taskWrk.setOriginStartPoint("0"); + taskWrk.setOriginTargetPoint("0"); } } @@ -123,6 +152,12 @@ } if (!taskWrkService.insert(taskWrk)) { + try{ + DeviceErrorService deviceErrorService = SpringUtils.getBean(DeviceErrorService.class); + deviceErrorService.addDeviceError("wms", 1, "鍒涘缓浠诲姟澶辫触锛�,param:"+JSON.toJSONString(param)); + } catch (Exception e2){ +// log.error("e2:"+e2.getMessage()); + } return R.error("鍒涘缓浠诲姟澶辫触"); } return R.ok(); @@ -171,7 +206,7 @@ ,true ); - if (jsonObject.getInteger("code").equals(200)) { + if (!Cools.isEmpty(jsonObject.getInteger("code")) && jsonObject.getInteger("code").equals(200)) { //瑙f瀽 List<WMSAndAGVInterfaceParam> params = new ArrayList<>(); params.add(param); @@ -229,12 +264,12 @@ } else { staProtocol = staProtocol.clone(); } - Short workNo = staProtocol.getWorkNo(); + Integer workNo = staProtocol.getWorkNo(); if (wharfCode1.contains(param.getWharfCode())){ - if (!staProtocol.isLoading() && !staProtocol.isCar() && staProtocol.getWorkNo() >0){ + if (!staProtocol.isLoading() && staProtocol.getWorkNo() >0){ //AGV鍑哄簱瀹屾垚浠ュ悗 - staProtocol.setWorkNo((short) 0); - staProtocol.setStaNo((short)0); + staProtocol.setWorkNo( 0); + staProtocol.setStaNo(0); boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(3, staProtocol)); if (result) { @@ -246,10 +281,10 @@ for (DevpSlave.Sta inSta : devp.getInSta()) { if (inSta.getBackSta().equals(staDesc.getStnNo())){ - if (staProtocol.isLoading() && !staProtocol.isCar() && workNo == 0){ + if (staProtocol.isLoading() && workNo == 0){ //AGV鍏ュ簱瀹屾垚浠ュ悗 - staProtocol.setWorkNo((short) 9999); - staProtocol.setStaNo(inSta.getStaNo().shortValue()); + staProtocol.setWorkNo(9999); + staProtocol.setStaNo(inSta.getStaNo()); boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(3, staProtocol)); if (result) { @@ -322,7 +357,7 @@ } else { staProtocol = staProtocol.clone(); } - Short workNo = staProtocol.getWorkNo(); + Integer workNo = staProtocol.getWorkNo(); if (workNo == 0 && !staProtocol.isLoading()){ if (Cools.isEmpty( map.get(inSta.getStaNo()))){ continue; @@ -358,7 +393,7 @@ } else { staProtocol = staProtocol.clone(); } - Short workNo = staProtocol.getWorkNo(); + Integer workNo = staProtocol.getWorkNo(); if (workNo == 0 && !staProtocol.isLoading()){ if (Cools.isEmpty( map.get(inSta.getStaNo()))){ continue; -- Gitblit v1.9.1