From dbae31a7a7cd59048ada9b51fe8faff545324c59 Mon Sep 17 00:00:00 2001 From: zjj <3272660260@qq.com> Date: 星期五, 15 三月 2024 16:02:53 +0800 Subject: [PATCH] # --- src/main/java/com/zy/asrs/controller/CrnController.java | 555 ++++++++++++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 502 insertions(+), 53 deletions(-) diff --git a/src/main/java/com/zy/asrs/controller/CrnController.java b/src/main/java/com/zy/asrs/controller/CrnController.java index 579cc5a..b719ac1 100644 --- a/src/main/java/com/zy/asrs/controller/CrnController.java +++ b/src/main/java/com/zy/asrs/controller/CrnController.java @@ -1,6 +1,7 @@ package com.zy.asrs.controller; import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.mapper.EntityWrapper; import com.core.annotations.ManagerAuth; import com.core.common.Cools; @@ -10,18 +11,20 @@ import com.zy.asrs.domain.param.CrnDemoParam; import com.zy.asrs.domain.param.CrnOperatorParam; import com.zy.asrs.domain.vo.CommandLogVo; +import com.zy.asrs.domain.vo.CrnListVo; import com.zy.asrs.domain.vo.CrnMsgTableVo; import com.zy.asrs.domain.vo.CrnStateTableVo; -import com.zy.asrs.entity.BasCrnError; -import com.zy.asrs.entity.BasCrnp; -import com.zy.asrs.entity.LocMast; -import com.zy.asrs.entity.WrkMast; +import com.zy.asrs.entity.*; import com.zy.asrs.mapper.BasCrnErrorMapper; +import com.zy.asrs.service.ApiLogService; import com.zy.asrs.service.BasCrnpService; import com.zy.asrs.service.LocMastService; import com.zy.asrs.service.WrkMastService; import com.zy.asrs.service.impl.MainServiceImpl; +import com.zy.asrs.utils.CommandUtils; +import com.zy.asrs.utils.Utils; import com.zy.asrs.utils.VersionUtils; +import com.zy.common.utils.HttpHandler; import com.zy.core.CrnThread; import com.zy.core.cache.MessageQueue; import com.zy.core.cache.OutputQueue; @@ -36,12 +39,12 @@ import com.zy.core.properties.SlaveProperties; import com.zy.core.properties.SystemProperties; import lombok.extern.slf4j.Slf4j; +import org.hibernate.validator.internal.engine.messageinterpolation.parser.ELState; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.web.bind.annotation.*; +import java.io.IOException; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -53,9 +56,16 @@ */ @Slf4j @RestController -@RequestMapping("/crn") public class CrnController { + @Value("${wms.url}") + private String wmsUrl; + @Value("${wms.movePath}") + private String movePath; + + + @Autowired + private ApiLogService apiLogService; @Autowired private SlaveProperties slaveProperties; @Autowired @@ -71,7 +81,7 @@ @ManagerAuth(memo = "杩涜涓殑鍛戒护") - @PostMapping("/command/ongoing") + @PostMapping("/crn/command/ongoing") public R ongoingCommand(){ List<CommandLogVo> list = new ArrayList<>(); for (CrnSlave crn : slaveProperties.getCrn()) { @@ -97,7 +107,7 @@ return R.ok().add(list); } - @PostMapping("/table/crn/state") + @PostMapping("/crn/table/crn/state") @ManagerAuth(memo = "鍫嗗灈鏈轰俊鎭〃") public R crnStateTable(){ List<CrnStateTableVo> list = new ArrayList<>(); @@ -119,7 +129,7 @@ vo.setWorkNo(crnProtocol.getTaskNo()); // 浠诲姟鍙� vo.setStatusType(crnProtocol.modeType.desc); // 妯″紡鐘舵�� vo.setStatus(crnProtocol.getStatusType().desc); // 鐘舵�� - vo.setLoading(( Cools.isEmpty(crnProtocol.getLoaded()) && crnProtocol.getLoaded()==1)?"鏈夌墿":"鏃犵墿"); // 鏈夌墿 + vo.setLoading((crnProtocol.getLoaded() != null && crnProtocol.getLoaded() == 1) ? "鏈夌墿" : "鏃犵墿"); // 鏈夌墿 vo.setBay(crnProtocol.getBay()); // 鍒� vo.setLev(crnProtocol.getLevel()); // 灞� @@ -127,15 +137,49 @@ vo.setLiftPos(crnProtocol.getLiftPosType().desc); vo.setWalkPos(crnProtocol.getWalkPos()==1?"涓嶅湪瀹氫綅":"鍦ㄥ畾浣�"); vo.setWarnCode(String.valueOf(crnProtocol.getAlarm1())); - if (crnProtocol.getAlarm1() > 0) { - BasCrnError crnError = basCrnErrorMapper.selectById(crnProtocol.getAlarm1()); + if (crnProtocol.getAlarm() > 0) { + BasCrnError crnError = basCrnErrorMapper.selectById(crnProtocol.getAlarm()); vo.setAlarm(crnError==null?"鏈煡寮傚父":crnError.getErrName()); } } return R.ok().add(list); } - @PostMapping("/table/crn/msg") + @PostMapping("/crn/table/crn/{id}/state") + @ManagerAuth(memo = "鍫嗗灈鏈轰俊鎭〃") + public R crnStateTable(@PathVariable("id") Integer id){ + BasCrnp basCrnp = basCrnpService.selectOne(new EntityWrapper<BasCrnp>().eq("crn_no", id).orderBy("crn_no")); + // 琛ㄦ牸琛� + CrnStateTableVo vo = new CrnStateTableVo(); + vo.setCrnNo(basCrnp.getCrnNo()); // 鍫嗗灈鏈哄彿 + // 鑾峰彇鍫嗗灈鏈轰俊鎭� + CrnThread crnThread = (CrnThread) SlaveConnection.get(SlaveType.Crn, basCrnp.getCrnNo()); + if (crnThread == null) { + return R.error(); + } + CrnProtocol crnProtocol = crnThread.getCrnProtocol(); + if (crnProtocol == null) { + return R.error(); + } + vo.setWorkNo(crnProtocol.getTaskNo()); // 浠诲姟鍙� + vo.setStatusType(crnProtocol.modeType.desc); // 妯″紡鐘舵�� + vo.setStatus(crnProtocol.getStatusType().desc); // 鐘舵�� + vo.setLoading((crnProtocol.getLoaded() != null && crnProtocol.getLoaded() == 1) ? "鏈夌墿" : "鏃犵墿"); // 鏈夌墿 + vo.setBay(crnProtocol.getBay()); // 鍒� + vo.setLev(crnProtocol.getLevel()); // 灞� + + vo.setForkOffset(crnProtocol.getForkPosType().desc); // 璐у弶浣嶇疆 + vo.setLiftPos(crnProtocol.getLiftPosType().desc); + vo.setWalkPos(crnProtocol.getWalkPos()==1?"涓嶅湪瀹氫綅":"鍦ㄥ畾浣�"); + vo.setWarnCode(String.valueOf(crnProtocol.getAlarm1())); + if (crnProtocol.getAlarm1() > 0) { + BasCrnError crnError = basCrnErrorMapper.selectById(crnProtocol.getAlarm1()); + vo.setAlarm(crnError==null?"鏈煡寮傚父":crnError.getErrName()); + } + return R.ok().add(vo); + } + + @PostMapping("/crn/table/crn/msg") @ManagerAuth(memo = "鍫嗗灈鏈烘暟鎹〃") public R crnMsgTable(){ List<CrnMsgTableVo> list = new ArrayList<>(); @@ -179,7 +223,108 @@ return R.ok().add(list); } - @PostMapping("/output/site") + @PostMapping("/crn/table/crn/{id}/msg") + @ManagerAuth(memo = "鍫嗗灈鏈烘暟鎹〃") + public R crnMsgTable(@PathVariable("id") Integer id){ + BasCrnp basCrnp = basCrnpService.selectOne(new EntityWrapper<BasCrnp>().eq("crn_no", id).orderBy("crn_no")); + // 琛ㄦ牸琛� + CrnMsgTableVo vo = new CrnMsgTableVo(); + vo.setCrnNo(basCrnp.getCrnNo()); // 鍫嗗灈鏈哄彿 + // 鑾峰彇鍫嗗灈鏈轰俊鎭� + CrnThread crnThread = (CrnThread) SlaveConnection.get(SlaveType.Crn, basCrnp.getCrnNo()); + if (crnThread == null) { + return R.error(); + } + CrnProtocol crnProtocol = crnThread.getCrnProtocol(); + if (crnProtocol == null) { + return R.error(); + } + + vo.setWorkNo(crnProtocol.getTaskNo()); // 浠诲姟鍙� + if (crnProtocol.getTaskNo()>0) { + WrkMast wrkMast = wrkMastService.selectById(crnProtocol.getTaskNo()); + if (wrkMast != null) { + vo.setStatus(CrnStatusType.process(wrkMast.getIoType()).getDesc()); // 妯″紡鐘舵�� + vo.setSourceStaNo(wrkMast.getSourceStaNo$()); // 婧愮珯 + vo.setStaNo(wrkMast.getStaNo$()); // 鐩爣绔� + vo.setSourceLocNo(wrkMast.getSourceLocNo()); // 婧愬簱浣� + vo.setLocNo(wrkMast.getLocNo()); // 鐩爣搴撲綅 + } + } else { + vo.setStatus(crnProtocol.modeType.equals(CrnModeType.AUTO)? CrnStatusType.MACHINE_AUTO.getDesc(): CrnStatusType.MACHINE_UN_AUTO.getDesc()); // 妯″紡鐘舵�� + } + vo.setXspeed(crnProtocol.getXSpeed()); // 璧拌閫熷害锛坢/min) + vo.setYspeed(crnProtocol.getYSpeed()); // 鍗囬檷閫熷害锛坢/min) + vo.setZspeed(crnProtocol.getZSpeed()); // 鍙夌墮閫熷害锛坢/min) + vo.setXdistance(crnProtocol.getXDistance()); // 璧拌璺濈(Km) + vo.setYdistance(crnProtocol.getYDistance()); // 鍗囬檷璺濈(Km) + vo.setXduration(crnProtocol.getXDuration()); // 璧拌鏃堕暱(H) + vo.setYduration(crnProtocol.getYDuration()); // 鍗囬檷鏃堕暱(H) + return R.ok().add(vo); + } + + @GetMapping("/crn/list/auth") + @ManagerAuth(memo = "鍫嗗灈鏈烘暟鎹〃") + public R crnList(){ + List<CrnListVo> list = new ArrayList<>(); + List<BasCrnp> crnps = basCrnpService.selectList(new EntityWrapper<BasCrnp>().orderBy("crn_no")); + for (BasCrnp basCrnp : crnps) { + // 琛ㄦ牸琛� + CrnListVo vo = new CrnListVo(); + vo.setCrnNo(basCrnp.getCrnNo()); // 鍫嗗灈鏈哄彿 + list.add(vo); + // 鑾峰彇鍫嗗灈鏈轰俊鎭� + CrnThread crnThread = (CrnThread) SlaveConnection.get(SlaveType.Crn, basCrnp.getCrnNo()); + if (crnThread == null) { + continue; + } + CrnProtocol crnProtocol = crnThread.getCrnProtocol(); + if (crnProtocol == null) { + continue; + } + + vo.setWorkNo(crnProtocol.getTaskNo()); // 浠诲姟鍙� + if (crnProtocol.getTaskNo()>0) { + WrkMast wrkMast = wrkMastService.selectById(crnProtocol.getTaskNo()); + if (wrkMast != null) { + vo.setDeviceStatus(CrnStatusType.process(wrkMast.getIoType()).getDesc()); // 妯″紡鐘舵�� + vo.setSourceStaNo(wrkMast.getSourceStaNo$()); // 婧愮珯 + vo.setStaNo(wrkMast.getStaNo$()); // 鐩爣绔� + vo.setSourceLocNo(wrkMast.getSourceLocNo()); // 婧愬簱浣� + vo.setLocNo(wrkMast.getLocNo()); // 鐩爣搴撲綅 + } + } else { + vo.setDeviceStatus(crnProtocol.modeType.equals(CrnModeType.AUTO)? CrnStatusType.MACHINE_AUTO.getDesc(): CrnStatusType.MACHINE_UN_AUTO.getDesc()); // 妯″紡鐘舵�� + } + vo.setXspeed(crnProtocol.getXSpeed()); // 璧拌閫熷害锛坢/min) + vo.setYspeed(crnProtocol.getYSpeed()); // 鍗囬檷閫熷害锛坢/min) + vo.setZspeed(crnProtocol.getZSpeed()); // 鍙夌墮閫熷害锛坢/min) + vo.setXdistance(crnProtocol.getXDistance()); // 璧拌璺濈(Km) + vo.setYdistance(crnProtocol.getYDistance()); // 鍗囬檷璺濈(Km) + vo.setXduration(crnProtocol.getXDuration()); // 璧拌鏃堕暱(H) + vo.setYduration(crnProtocol.getYDuration()); // 鍗囬檷鏃堕暱(H) + + vo.setStatusType(crnProtocol.modeType.desc); // 妯″紡鐘舵�� + vo.setWrkStatus(crnProtocol.getStatusType().id); // 浠诲姟鐘舵�� + vo.setLoading((crnProtocol.getLoaded() != null && crnProtocol.getLoaded() == 1) ? "鏈夌墿" : "鏃犵墿"); // 鏈夌墿 + vo.setBay(crnProtocol.getBay()); // 鍒� + vo.setLev(crnProtocol.getLevel()); // 灞� + + vo.setForkOffset(crnProtocol.getForkPosType().desc); // 璐у弶浣嶇疆 + vo.setLiftPos(crnProtocol.getLiftPosType().desc); + vo.setWalkPos(crnProtocol.getWalkPos()==1?"涓嶅湪瀹氫綅":"鍦ㄥ畾浣�"); + vo.setWarnCode(String.valueOf(crnProtocol.getAlarm1())); + if (crnProtocol.getAlarm1() > 0) { + BasCrnError crnError = basCrnErrorMapper.selectById(crnProtocol.getAlarm1()); + vo.setAlarm(crnError==null?"鏈煡寮傚父":crnError.getErrName()); + } + vo.setInEnable(basCrnp.getInEnable()); + vo.setOutEnable(basCrnp.getOutEnable()); + } + return R.ok().add(list); + } + + @PostMapping("/crn/output/site") @ManagerAuth(memo = "鍫嗗灈鏈烘姤鏂囨棩蹇楄緭鍑�") public R crnOutput(){ StringBuilder str = new StringBuilder(); @@ -193,7 +338,7 @@ } - @GetMapping("/demo/status") + @GetMapping("/crn/demo/status") public R demoStatus(){ List<Map<String, Object>> res = new ArrayList<>(); for (CrnSlave crnSlave : slaveProperties.getCrn()) { @@ -206,7 +351,7 @@ } - @PostMapping("/demo/switch") + @PostMapping("/crn/demo/switch") @ManagerAuth(memo = "鍫嗗灈鏈烘紨绀�") public R crnDemo(CrnDemoParam param) throws InterruptedException { if (Cools.isEmpty(param.getCrnId())){ @@ -235,64 +380,100 @@ /****************************************************************/ @ManagerAuth(memo = "鍏ュ簱") - @PostMapping("/operator/put") + @PostMapping("/crn/operator/put") public R crnPut(CrnOperatorParam param){ +// // 绯荤粺杩愯鐘舵�佸垽鏂� +// if (SystemProperties.WCS_RUNNING_STATUS.get()) { +// return R.error("wcs绯荤粺鐘舵�佷负寮�鍚�"); +// } CrnCommand command = new CrnCommand(); command.setCrnNo(param.getCrnNo()); // 鍫嗗灈鏈虹紪鍙� command.setTaskNo((short) 0); // 宸ヤ綔鍙� command.setAckFinish((short) 0); // 浠诲姟瀹屾垚纭浣� command.setTaskMode(CrnTaskModeType.PAKIN); // 浠诲姟妯″紡 - command.setSourcePosX(param.getSourceRow()); // 婧愬簱浣嶆帓 - command.setSourcePosY(param.getSourceBay()); // 婧愬簱浣嶅垪 - command.setSourcePosZ(param.getSourceLev()); // 婧愬簱浣嶅眰 - command.setDestinationPosX(param.getRow()); // 鐩爣搴撲綅鎺� - command.setDestinationPosY(param.getBay()); // 鐩爣搴撲綅鍒� - command.setDestinationPosZ(param.getLev()); // 鐩爣搴撲綅灞� + command.setSourcePosZ(param.getSourceRow()); // 婧愬簱浣嶆帓 + command.setSourcePosX(param.getSourceBay()); // 婧愬簱浣嶅垪 + command.setSourcePosY(param.getSourceLev()); // 婧愬簱浣嶅眰 + command.setDestinationPosZ(param.getRow()); // 鐩爣搴撲綅鎺� + command.setDestinationPosX(param.getBay()); // 鐩爣搴撲綅鍒� + command.setDestinationPosY(param.getLev()); // 鐩爣搴撲綅灞� + command.setCommand((short)1); + String locNo =String.format("%2d",param.getRow()) + String.format("%3d",param.getBay()) + String.format("%2d",param.getLev()); + String startlocNo =String.format("%2d",param.getSourceRow()) + String.format("%3d",param.getSourceBay()) + String.format("%2d",param.getSourceLev()); + boolean wmsLocStatus = toWmsLocStatus(1, startlocNo, locNo, param.getBarcode(), param.getBarcodeType(), param.getEmptyContainer()); + if (!wmsLocStatus){ + return R.error("搴撲綅鏇存柊澶辫触"); + } return crnControl(command)?R.ok():R.error(); } @ManagerAuth(memo = "鍑哄簱") - @PostMapping("/operator/take") + @PostMapping("/crn/operator/take") public R crnTake(CrnOperatorParam param){ + // 绯荤粺杩愯鐘舵�佸垽鏂� +// if (SystemProperties.WCS_RUNNING_STATUS.get()) { +// return R.error("wcs绯荤粺鐘舵�佷负寮�鍚�"); +// } CrnCommand command = new CrnCommand(); command.setCrnNo(param.getCrnNo()); // 鍫嗗灈鏈虹紪鍙� command.setTaskNo((short) 0); // 宸ヤ綔鍙� command.setAckFinish((short) 0); // 浠诲姟瀹屾垚纭浣� command.setTaskMode(CrnTaskModeType.PAKOUT); // 浠诲姟妯″紡 - command.setSourcePosX(param.getSourceRow()); // 婧愬簱浣嶆帓 - command.setSourcePosY(param.getSourceBay()); // 婧愬簱浣嶅垪 - command.setSourcePosZ(param.getSourceLev()); // 婧愬簱浣嶅眰 - command.setDestinationPosX(param.getRow()); // 鐩爣搴撲綅鎺� - command.setDestinationPosY(param.getBay()); // 鐩爣搴撲綅鍒� - command.setDestinationPosZ(param.getLev()); // 鐩爣搴撲綅灞� + command.setSourcePosZ(param.getSourceRow()); // 婧愬簱浣嶆帓 + command.setSourcePosX(param.getSourceBay()); // 婧愬簱浣嶅垪 + command.setSourcePosY(param.getSourceLev()); // 婧愬簱浣嶅眰 + command.setDestinationPosZ(param.getRow()); // 鐩爣搴撲綅鎺� + command.setDestinationPosX(param.getBay()); // 鐩爣搴撲綅鍒� + command.setDestinationPosY(param.getLev()); // 鐩爣搴撲綅灞� + String locNo =String.format("%2d",param.getRow()) + String.format("%3d",param.getBay()) + String.format("%2d",param.getLev()); + String startlocNo =String.format("%2d",param.getSourceRow()) + String.format("%3d",param.getSourceBay()) + String.format("%2d",param.getSourceLev()); + boolean wmsLocStatus = toWmsLocStatus(2, startlocNo, locNo, param.getBarcode(), param.getBarcodeType(), param.getEmptyContainer()); + if (!wmsLocStatus){ + return R.error("搴撲綅鏇存柊澶辫触"); + } return crnControl(command)?R.ok():R.error(); } @ManagerAuth(memo = "搴撲綅杞Щ") - @PostMapping("/operator/stockMove") + @PostMapping("/crn/operator/stockMove") public R crnStockMove(CrnOperatorParam param){ + // 绯荤粺杩愯鐘舵�佸垽鏂� +// if (SystemProperties.WCS_RUNNING_STATUS.get()) { +// return R.error("wcs绯荤粺鐘舵�佷负寮�鍚�"); +// } CrnCommand command = new CrnCommand(); command.setCrnNo(param.getCrnNo()); // 鍫嗗灈鏈虹紪鍙� command.setTaskNo((short) 0); // 宸ヤ綔鍙� command.setAckFinish((short) 0); // 浠诲姟瀹屾垚纭浣� command.setTaskMode(CrnTaskModeType.LOC_MOVE); // 浠诲姟妯″紡 - command.setSourcePosX(param.getSourceRow()); // 婧愬簱浣嶆帓 - command.setSourcePosY(param.getSourceBay()); // 婧愬簱浣嶅垪 - command.setSourcePosZ(param.getSourceLev()); // 婧愬簱浣嶅眰 - command.setDestinationPosX(param.getRow()); // 鐩爣搴撲綅鎺� - command.setDestinationPosY(param.getBay()); // 鐩爣搴撲綅鍒� - command.setDestinationPosZ(param.getLev()); // 鐩爣搴撲綅灞� + command.setSourcePosZ(param.getSourceRow()); // 婧愬簱浣嶆帓 + command.setSourcePosX(param.getSourceBay()); // 婧愬簱浣嶅垪 + command.setSourcePosY(param.getSourceLev()); // 婧愬簱浣嶅眰 + command.setDestinationPosZ(param.getRow()); // 鐩爣搴撲綅鎺� + command.setDestinationPosX(param.getBay()); // 鐩爣搴撲綅鍒� + command.setDestinationPosY(param.getLev()); // 鐩爣搴撲綅灞� + command.setCommand((short)1); LocMast sourceLoc = locMastService.selectOne(new EntityWrapper<LocMast>().eq("row1", command.getSourcePosX()) .eq("bay1", command.getSourcePosY()).eq("lev1", command.getSourcePosZ())); LocMast loc = locMastService.selectOne(new EntityWrapper<LocMast>().eq("row1", command.getDestinationPosX()) .eq("bay1", command.getDestinationPosY()).eq("lev1", command.getDestinationPosZ())); VersionUtils.locMoveCheckLocType(sourceLoc, loc); + String locNo =String.format("%2d",param.getRow()) + String.format("%3d",param.getBay()) + String.format("%2d",param.getLev()); + String startlocNo =String.format("%2d",param.getSourceRow()) + String.format("%3d",param.getSourceBay()) + String.format("%2d",param.getSourceLev()); + boolean wmsLocStatus = toWmsLocStatus(3, startlocNo, locNo, param.getBarcode(), param.getBarcodeType(), param.getEmptyContainer()); + if (!wmsLocStatus){ + return R.error("搴撲綅鏇存柊澶辫触"); + } return crnControl(command)?R.ok():R.error(); } @ManagerAuth(memo = "绔欏埌绔�") - @PostMapping("/operator/siteMove") + @PostMapping("/crn/operator/siteMove") public R crnSiteMove(CrnOperatorParam param){ + // 绯荤粺杩愯鐘舵�佸垽鏂� +// if (SystemProperties.WCS_RUNNING_STATUS.get()) { +// return R.error("wcs绯荤粺鐘舵�佷负寮�鍚�"); +// } CrnCommand command = new CrnCommand(); command.setCrnNo(param.getCrnNo()); // 鍫嗗灈鏈虹紪鍙� command.setTaskNo((short) 0); // 宸ヤ綔鍙� @@ -308,8 +489,12 @@ } @ManagerAuth(memo = "鍥炲師鐐�") - @PostMapping("/operator/bacOrigin") + @PostMapping("/crn/operator/bacOrigin") public R crnBacOrigin(CrnOperatorParam param){ + // 绯荤粺杩愯鐘舵�佸垽鏂� +// if (SystemProperties.WCS_RUNNING_STATUS.get()) { +// return R.error("wcs绯荤粺鐘舵�佷负寮�鍚�"); +// } CrnCommand command = new CrnCommand(); command.setCrnNo(param.getCrnNo()); // 鍫嗗灈鏈虹紪鍙� command.setTaskNo((short) 0); // 宸ヤ綔鍙� @@ -325,8 +510,12 @@ } @ManagerAuth(memo = "鍙嶅師鐐�") - @PostMapping("/operator/reverseOrigin") + @PostMapping("/crn/operator/reverseOrigin") public R reverseOrigin(CrnOperatorParam param){ + // 绯荤粺杩愯鐘舵�佸垽鏂� +// if (SystemProperties.WCS_RUNNING_STATUS.get()) { +// return R.error("wcs绯荤粺鐘舵�佷负寮�鍚�"); +// } CrnCommand command = new CrnCommand(); command.setCrnNo(param.getCrnNo()); // 鍫嗗灈鏈虹紪鍙� command.setTaskNo((short) 0); // 宸ヤ綔鍙� @@ -336,8 +525,8 @@ command.setSourcePosY((short) 0); // 婧愬簱浣嶅垪 command.setSourcePosZ((short) 0); // 婧愬簱浣嶅眰 command.setDestinationPosX((short) 0); // 鐩爣搴撲綅鎺� - command.setDestinationPosY((short) 34); // 鐩爣搴撲綅鍒� - command.setDestinationPosZ((short) 5); // 鐩爣搴撲綅灞� + command.setDestinationPosY((short) 22); // 鐩爣搴撲綅鍒� + command.setDestinationPosZ((short) 1); // 鐩爣搴撲綅灞� return crnControl(command)?R.ok():R.error(); } @@ -360,8 +549,12 @@ // } @ManagerAuth(memo = "浠诲姟瀹屾垚") - @PostMapping("/operator/taskComplete") + @PostMapping("/crn/operator/taskComplete") public R crnTaskComplete(CrnOperatorParam param){ + // 绯荤粺杩愯鐘舵�佸垽鏂� +// if (SystemProperties.WCS_RUNNING_STATUS.get()) { +// return R.error("wcs绯荤粺鐘舵�佷负寮�鍚�"); +// } CrnCommand command = new CrnCommand(); command.setCrnNo(param.getCrnNo()); // 鍫嗗灈鏈虹紪鍙� command.setTaskNo((short) 0); // 宸ヤ綔鍙� @@ -389,8 +582,12 @@ // } @ManagerAuth(memo = "娓呴櫎鍛戒护") - @PostMapping("/operator/clearCommand") + @PostMapping("/crn/operator/clearCommand") public R crnClearCommand(CrnOperatorParam param){ + // 绯荤粺杩愯鐘舵�佸垽鏂� +// if (SystemProperties.WCS_RUNNING_STATUS.get()) { +// return R.error("wcs绯荤粺鐘舵�佷负寮�鍚�"); +// } if (param.getCrnNo() == null) { throw new CoolException("璇烽�夋嫨鍫嗗灈鏈�"); } @@ -409,8 +606,12 @@ } @ManagerAuth(memo = "鎵嬪姩澶嶄綅") - @PostMapping("/operator/handleReset") + @PostMapping("/crn/operator/handleReset") public R handleReset(CrnOperatorParam param) throws Exception { + // 绯荤粺杩愯鐘舵�佸垽鏂� +// if (SystemProperties.WCS_RUNNING_STATUS.get()) { +// return R.error("wcs绯荤粺鐘舵�佷负寮�鍚�"); +// } if (param.getCrnNo() == null) { throw new CoolException("璇烽�夋嫨鍫嗗灈鏈�"); } @@ -433,7 +634,7 @@ crnCommand.setCommand((short) 0); // 浠诲姟瀹屾垚纭浣� // 寤舵椂鍙戦�� Thread.sleep(1000L); - if (MessageQueue.offer(SlaveType.Crn, crn.getId(), new Task(2, crnCommand))) { + if (CommandUtils.offer(SlaveType.Crn, crn.getId(), new Task(5, crnCommand), false)) { return R.ok(); } else { throw new CoolException("鍛戒护涓嬪彂澶辫触"); @@ -445,6 +646,164 @@ return R.error(); } + + @ManagerAuth(memo = "鍒囨崲鑱旀満妯″紡") + @PostMapping("/crn/operator/auto") + public R crnAuto(CrnOperatorParam param){ + // 绯荤粺杩愯鐘舵�佸垽鏂� +// if (SystemProperties.WCS_RUNNING_STATUS.get()) { +// return R.error("wcs绯荤粺鐘舵�佷负寮�鍚�"); +// } + short[] array = new short[9]; + CrnCommand command = new CrnCommand(); + command.setCrnNo(param.getCrnNo()); // 鍫嗗灈鏈虹紪鍙� + command.setTaskNo((short) 0); // 宸ヤ綔鍙� + command.setAuto((short)1); + + return crnControl2(command)?R.ok():R.error(); + } + @ManagerAuth(memo = "鍒囨崲鍗婃墜鍔ㄦā寮�") + @PostMapping("/crn/operator/semiAutomatic") + public R crnsemiAutomatic(CrnOperatorParam param){ + // 绯荤粺杩愯鐘舵�佸垽鏂� +// if (SystemProperties.WCS_RUNNING_STATUS.get()) { +// return R.error("wcs绯荤粺鐘舵�佷负寮�鍚�"); +// } + short[] array = new short[9]; + CrnCommand command = new CrnCommand(); + command.setCrnNo(param.getCrnNo()); // 鍫嗗灈鏈虹紪鍙� + command.setTaskNo((short) 0); // 宸ヤ綔鍙� + command.setAuto((short)2); + + return crnControl2(command)?R.ok():R.error(); + } + @ManagerAuth(memo = "鍒囨崲鎵嬪姩妯″紡") + @PostMapping("/crn/operator/hand") + public R onlineWrk1(CrnOperatorParam param){ + // 绯荤粺杩愯鐘舵�佸垽鏂� +// if (SystemProperties.WCS_RUNNING_STATUS.get()) { +// return R.error("wcs绯荤粺鐘舵�佷负寮�鍚�"); +// } + short[] array = new short[9]; + CrnCommand command = new CrnCommand(); + command.setCrnNo(param.getCrnNo()); // 鍫嗗灈鏈虹紪鍙� + command.setTaskNo((short) 0); // 宸ヤ綔鍙� + command.setAuto((short)3); + + return crnControl2(command)?R.ok():R.error(); + } + @ManagerAuth(memo = "鐢宠瀹屾垚浠诲姟") + @PostMapping("/crn/operator/onlineWrk1") + public R onlineWrk2(CrnOperatorParam param){ + // 绯荤粺杩愯鐘舵�佸垽鏂� +// if (SystemProperties.WCS_RUNNING_STATUS.get()) { +// return R.error("wcs绯荤粺鐘舵�佷负寮�鍚�"); +// } + short[] array = new short[9]; + CrnCommand command = new CrnCommand(); + command.setCrnNo(param.getCrnNo()); // 鍫嗗灈鏈虹紪鍙� + command.setTaskNo((short) 0); // 宸ヤ綔鍙� + command.setOnlineWrk1((short)1); + + return crnControl2(command)?R.ok():R.error(); + } + @ManagerAuth(memo = "鐢宠鍙栨秷浠诲姟") + @PostMapping("/crn/operator/onlineWrk2") + public R onlineWrk3(CrnOperatorParam param){ + // 绯荤粺杩愯鐘舵�佸垽鏂� +// if (SystemProperties.WCS_RUNNING_STATUS.get()) { +// return R.error("wcs绯荤粺鐘舵�佷负寮�鍚�"); +// } + short[] array = new short[9]; + CrnCommand command = new CrnCommand(); + command.setCrnNo(param.getCrnNo()); // 鍫嗗灈鏈虹紪鍙� + command.setTaskNo((short) 0); // 宸ヤ綔鍙� + command.setOnlineWrk2((short)1); + + return crnControl2(command)?R.ok():R.error(); + } + @ManagerAuth(memo = "娓呴櫎鑱旀満浠诲姟") + @PostMapping("/crn/operator/onlineWrk3") + public R onlineWrk4(CrnOperatorParam param){ + // 绯荤粺杩愯鐘舵�佸垽鏂� +// if (SystemProperties.WCS_RUNNING_STATUS.get()) { +// return R.error("wcs绯荤粺鐘舵�佷负寮�鍚�"); +// } + short[] array = new short[9]; + CrnCommand command = new CrnCommand(); + command.setCrnNo(param.getCrnNo()); // 鍫嗗灈鏈虹紪鍙� + command.setTaskNo((short) 0); // 宸ヤ綔鍙� + command.setOnlineWrk3((short)1); + + return crnControl2(command)?R.ok():R.error(); + } + @ManagerAuth(memo = "鎭㈠鑱旀満浠诲姟") + @PostMapping("/crn/operator/onlineWrk4") + public R crnHand(CrnOperatorParam param){ + // 绯荤粺杩愯鐘舵�佸垽鏂� +// if (SystemProperties.WCS_RUNNING_STATUS.get()) { +// return R.error("wcs绯荤粺鐘舵�佷负寮�鍚�"); +// } + short[] array = new short[9]; + CrnCommand command = new CrnCommand(); + command.setCrnNo(param.getCrnNo()); // 鍫嗗灈鏈虹紪鍙� + command.setTaskNo((short) 0); // 宸ヤ綔鍙� + command.setOnlineWrk4((short)1); + + return crnControl2(command)?R.ok():R.error(); + } + + @ManagerAuth(memo = "澶嶄綅") + @PostMapping("/crn/operator/reset") + public R crnReset(CrnOperatorParam param){ + // 绯荤粺杩愯鐘舵�佸垽鏂� +// if (SystemProperties.WCS_RUNNING_STATUS.get()) { +// return R.error("wcs绯荤粺鐘舵�佷负寮�鍚�"); +// } + short[] array = new short[9]; + CrnCommand command = new CrnCommand(); + command.setCrnNo(param.getCrnNo()); // 鍫嗗灈鏈虹紪鍙� + command.setTaskNo((short) 0); // 宸ヤ綔鍙� + command.setReset((short)1); + + return crnControl2(command)?R.ok():R.error(); + } + + + + private boolean crnControl2(CrnCommand command){ + if (command.getCrnNo() == null) { + throw new CoolException("璇烽�夋嫨鍫嗗灈鏈�"); + } + for (CrnSlave crn : slaveProperties.getCrn()) { + // 鑾峰彇鍫嗗灈鏈轰俊鎭� + if (command.getCrnNo().equals(crn.getId())) { + CrnThread crnThread = (CrnThread) SlaveConnection.get(SlaveType.Crn, crn.getId()); + if (crnThread == null) { + throw new CoolException("鍫嗗灈鏈轰笉鍦ㄧ嚎"); + } + CrnProtocol crnProtocol = crnThread.getCrnProtocol(); + if (crnProtocol == null) { + throw new CoolException("鍫嗗灈鏈轰笉鍦ㄧ嚎"); + } + // 绌洪棽鍒ゆ柇 +// if (crnProtocol.getStatusType().equals(com.zy.core.enums.CrnStatusType.IDLE) && crnProtocol.getTaskNo() == 0) { + if (MessageQueue.offer(SlaveType.Crn, crn.getId(), new Task(4, command))) { + return true; + } else { + throw new CoolException("鍛戒护涓嬪彂澶辫触"); + } +// } else { +// throw new CoolException("鍫嗗灈鏈轰笉鍦ㄧ┖闂茬姸鎬�"); +// } + } + } + return false; + } + + + + private boolean crnControl(CrnCommand command){ if (command.getCrnNo() == null) { @@ -463,11 +822,11 @@ } // 绌洪棽鍒ゆ柇 // if (crnProtocol.getStatusType().equals(com.zy.core.enums.CrnStatusType.IDLE) && crnProtocol.getTaskNo() == 0) { - if (MessageQueue.offer(SlaveType.Crn, crn.getId(), new Task(2, command))) { - return true; - } else { - throw new CoolException("鍛戒护涓嬪彂澶辫触"); - } + if (CommandUtils.offer(SlaveType.Crn, crn.getId(), new Task(2, command), false)) { + return true; + } else { + throw new CoolException("鍛戒护涓嬪彂澶辫触"); + } // } else { // throw new CoolException("鍫嗗灈鏈轰笉鍦ㄧ┖闂茬姸鎬�"); // } @@ -501,5 +860,95 @@ } } + // /crn/list/auth + @RequestMapping(value = "/crnListQuery/auth") + @ManagerAuth + public R listQuery(String condition){ + ArrayList<HashMap<String, Object>> list = new ArrayList<>(); + for (CrnSlave crn : slaveProperties.getCrn()) { + // 鑾峰彇鍫嗗灈鏈轰俊鎭� + CrnThread crnThread = (CrnThread) SlaveConnection.get(SlaveType.Crn, crn.getId()); + if (crnThread == null) { + continue; + } + CrnProtocol crnProtocol = crnThread.getCrnProtocol(); + if (crnProtocol == null) { + continue; + } + + HashMap<String, Object> map = new HashMap<>(); + map.put("id", crn.getId()); + map.put("value", "鍫嗗灈鏈�" + crn.getId() + "鍙�"); + if (condition != "" && !condition.equals(crn.getId().toString())) { + continue; + } + + list.add(map); + } + return R.ok().add(list); + } + + public boolean toWmsLocStatus(Integer type,String startlocNo,String locNo,String barcode,String barcodeType,String emptyContainer){ + Map<String, Object> map = new HashMap<>(); + map.put("x-api-key","7a15b5db-29b6-552c-8cff-0cfec3756da2"); + WmsLocStatus param = new WmsLocStatus(); + param.setWarehouseId("1688469798893297665"); + param.setLocationCode(Utils.getWmsLocNo(locNo)); + if (emptyContainer.equals("1")){ + param.setEmptyContainer("Y"); + }else { + param.setEmptyContainer("N"); + } + param.setStatus("QY"); + param.setContainerCode(barcode); + param.setContainerTypeCode(barcodeType); + + String response = null; + try { + response = new HttpHandler.Builder() + .setHeaders(map) + .setUri(wmsUrl) + .setPath("wcsManager/wcsInterface/locationUpdate") + .setJson(JSON.toJSONString(param)) + .build() + .doPost(); + }catch (Exception e){ + log.error("搴撲綅鏇存柊澶辫触"); + } + JSONObject jsonObject = JSON.parseObject(response); + if (jsonObject.getInteger("code").equals(200)){ + LocMast originLoc = locMastService.selectByLocNo(startlocNo); + LocMast locMast = locMastService.selectByLocNo(locNo); + if (type == 1){ + locMast.setBarcode(barcode); + locMast.setLocSts("Z"); + locMastService.updateById(locMast); + }else if (type == 2){ + originLoc.setLocSts("K"); + originLoc.setBarcode(""); + locMastService.updateById(originLoc); + }else if (type == 3){ + originLoc.setLocSts("K"); + originLoc.setBarcode(""); + locMast.setBarcode(barcode); + locMast.setLocSts("Z"); + locMastService.updateById(originLoc); + locMastService.updateById(locMast); + } + + apiLogService.save("Wms鍙樻洿璐т綅鐘舵��" + ,wmsUrl+"wcsManager/wcsInterface/inboundTaskApply" + ,null + ,"127.0.0.1" + ,JSON.toJSONString(param) + ,response + ,true + ); + return true; + } + return false; + + } + } -- Gitblit v1.9.1