From e2d6a43d4f7d083233896755573d2c55444fb66f Mon Sep 17 00:00:00 2001 From: 野心家 <1051256694@qq.com> Date: 星期五, 14 三月 2025 09:40:07 +0800 Subject: [PATCH] # --- src/main/java/com/zy/asrs/controller/OpenController.java | 94 ------------------ src/main/java/com/zy/asrs/controller/TaskWrkController.java | 2 src/main/resources/application-prod.yml | 45 --------- src/main/java/com/zy/asrs/task/SameLayerTransferScheduler.java | 7 + src/main/java/com/zy/core/thread/SiemensDevpThread.java | 128 ------------------------- src/main/resources/application.yml | 4 6 files changed, 9 insertions(+), 271 deletions(-) diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java index 18db281..460f85b 100644 --- a/src/main/java/com/zy/asrs/controller/OpenController.java +++ b/src/main/java/com/zy/asrs/controller/OpenController.java @@ -222,100 +222,6 @@ } } - //AGV璇锋眰鍏ュ簱鐮佸ご鎺ュ彛 - @PostMapping("/targetWharfApply") - @AppAuth(memo = "AGV璇锋眰鍏ュ簱鐮佸ご鎺ュ彛") - public R targetWharfApply(@RequestHeader String appkey, - @RequestBody WMSAndAGVInterfaceParam param, - HttpServletRequest request) throws IOException { - auth(appkey,param,request); - - if (Cools.isEmpty(param)){ - return R.error("鍙傛暟涓虹┖锛�"); - } else if (Cools.isEmpty(param.getTaskNo())){ - return R.error("宸ヤ綔鍙蜂负绌猴紒"); - } else if (Cools.isEmpty(param.getContainerCode())){ - return R.error("鎵樼洏缂栫爜涓虹┖锛�"); - } else if (Cools.isEmpty(param.getWharfSource())){ - return R.error("婧愮爜澶翠负绌猴紒"); - } else if (Cools.isEmpty(param.getFreeWharfs()) || param.getFreeWharfs().size()==0){ - return R.error("绌洪棽鐨勫叆搴撶爜澶达紙AGV锛変负绌猴紒"); - } - R r = openService.AgvToWCSToWms(param); - apiLogService.save("AGV璇锋眰鍏ュ簱鐮佸ご鎺ュ彛" - ,request.getRemoteAddr()+request.getRequestURI() - ,appkey - ,request.getRemoteAddr() - ,JSON.toJSONString(param) - ,r.toString() - ,true - ); - return r; - } - - //AGV璇锋眰鍔ㄤ綔鎺ュ彛 - @PostMapping("/agvTaskRequest") - @AppAuth(memo = "AGV璇锋眰鍔ㄤ綔鎺ュ彛") - public R agvTaskRequest(@RequestHeader String appkey, - @RequestBody WMSAndAGVInterfaceParam param, - HttpServletRequest request) { - auth(appkey, param, request); - if (Cools.isEmpty(param)){ - return R.error("鍙傛暟涓虹┖锛�"); - } else if (Cools.isEmpty(param.getRequestType())){ - return R.error("璇锋眰绫诲瀷涓虹┖锛�"); - } else if (Cools.isEmpty(param.getWharfCode())){ - return R.error("鐮佸ご缂栧彿涓虹┖锛�"); - } - - Map<String,Integer> map = new HashMap<>(); - map.put("J-1102",102);map.put("J-1101",101); - map.put("J-1103",105);map.put("J-1104",106); - map.put("J-1105",109);map.put("J-1106",110); - map.put("J-1107",113);map.put("J-1108",114); - map.put("J-1109",117);map.put("J-1110",118); - map.put("J-1111",121);map.put("J-1112",122); - map.put("H-1102",300);map.put("H-1101",305); - map.put("G-1102",400);map.put("G-1101",405); -// StaDesc staDesc = staDescService.selectOne(new EntityWrapper<StaDesc>() -// .eq("stn_desc", param.getWharfCode())); -// -// if (Cools.isEmpty(staDesc)){ -// return R.error("绋嬪簭鎶ラ敊锛屾湭鏌ヨ鍒扮珯鐐�"); -// } - if (Cools.isEmpty(map.get(param.getWharfCode()))){ - return R.error("鏈煡璇㈠埌绔欑偣"); - } - BasDevp basDevp = basDevpService.selectById(map.get(param.getWharfCode())); -// BasDevp basDevp = basDevpService.selectById(staDesc.getStnNo()); - if (basDevp.getAutoing().equals("Y") && (basDevp.getInEnable().equals("Y") || basDevp.getOutEnable().equals("Y"))){ - apiLogService.save("AGV璇锋眰鍏ュ簱鐮佸ご鎺ュ彛" - ,request.getRemoteAddr()+request.getRequestURI() - ,appkey - ,request.getRemoteAddr() - ,JSON.toJSONString(param) - ,R.ok().toString() - ,true - ); - return R.ok("鍙叆"); - }else { - apiLogService.save("AGV璇锋眰鍏ュ簱鐮佸ご鎺ュ彛" - ,request.getRemoteAddr()+request.getRequestURI() - ,appkey - ,request.getRemoteAddr() - ,JSON.toJSONString(param) - ,R.error("绔欑偣鐘舵�佷笉鍙叆").toString() - ,true - ); - return R.error("绔欑偣鐘舵�佷笉鍙叆"); - } - - - - - - } - //浠诲姟涓嬪彂鎺ュ彛 @PostMapping("/outboundTaskSend") @Transactional diff --git a/src/main/java/com/zy/asrs/controller/TaskWrkController.java b/src/main/java/com/zy/asrs/controller/TaskWrkController.java index c58963d..d090386 100644 --- a/src/main/java/com/zy/asrs/controller/TaskWrkController.java +++ b/src/main/java/com/zy/asrs/controller/TaskWrkController.java @@ -364,7 +364,7 @@ } if(notifyDto.getMsgType().equals("task_complete")&&taskWrk.getIoType()==3){ - taskWrk.setWrkSts(8);//鏇存柊鏁版嵁瀹屾垚锛岀洿鎺ヨ浆鍘嗗彶妗� + taskWrk.setWrkSts(7);//鏇存柊鏁版嵁瀹屾垚锛岀洿鎺ヨ浆鍘嗗彶妗� //鏇存柊婧愬簱浣嶇姸鎬佷负绌哄簱浣� LocMast locMast = locMastService.selectByLocNo(taskWrk.getStartPoint()); diff --git a/src/main/java/com/zy/asrs/task/SameLayerTransferScheduler.java b/src/main/java/com/zy/asrs/task/SameLayerTransferScheduler.java index 0d2d46b..d73799b 100644 --- a/src/main/java/com/zy/asrs/task/SameLayerTransferScheduler.java +++ b/src/main/java/com/zy/asrs/task/SameLayerTransferScheduler.java @@ -13,6 +13,7 @@ import com.zy.system.entity.Config; import com.zy.system.service.ConfigService; import lombok.extern.slf4j.Slf4j; +import org.apache.poi.ss.formula.functions.T; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; @@ -45,9 +46,13 @@ if (config.getValue().equals("true")) { List<TaskWrk> taskWrks = taskWrkService.selectList(new EntityWrapper<TaskWrk>()); - if (Cools.isEmpty(taskWrks)) { + if (taskWrks.size() < 3) { List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>().eq("loc_sts", "F")); for (LocMast locMast : locMasts) { + TaskWrk taskWrk1 = taskWrkService.selectOne(new EntityWrapper<TaskWrk>().eq("start_point",locMast.getLocNo())); + if(!Cools.isEmpty(taskWrk1)){ + continue; + } List<LocMast> list = locMastService.selectList(new EntityWrapper<LocMast>().eq("loc_sts", "O").eq("lev1", locMast.getLev1())); String[] locMs = new String[list.size()]; diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java index a8f5b06..b50d818 100644 --- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java +++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java @@ -238,74 +238,6 @@ } } } - -// OperateResultExOne<byte[]> resultAgvAndPlc = siemensS7Net.Read("DB102.0", (short) 30); -// if (resultAgvAndPlc.IsSuccess) { -// for (int i = 0; i < staNoSize; i++) { -// int sign =(i+2)/2-1; -// if ((i+2)%2!=0){ -// Integer siteId = staNos.get(i); // 绔欑偣缂栧彿 -// StaProtocol staProtocol = station.get(siteId); -// if (null == staProtocol) { -// staProtocol = new StaProtocol(); -// staProtocol.setSiteId(siteId); -// station.put(siteId, staProtocol); -// } -// staProtocol.setAgvStartPick(siemensS7Net.getByteTransform().TransInt16(resultAgvAndPlc.Content, sign*6+4)); // 鍏佽鍙栬揣 -// staProtocol.setAgvStartPlace((short)0); // 鍏佽鏀捐揣 -// continue; -// } -// Integer siteId = staNos.get(i); // 绔欑偣缂栧彿 -// StaProtocol staProtocol = station.get(siteId); -// if (null == staProtocol) { -// staProtocol = new StaProtocol(); -// staProtocol.setSiteId(siteId); -// station.put(siteId, staProtocol); -// } -// staProtocol.setAgvStartPick(siemensS7Net.getByteTransform().TransInt16(resultAgvAndPlc.Content, sign*6)); // 鍏佽鍙栬揣 -// staProtocol.setAgvStartPlace(siemensS7Net.getByteTransform().TransInt16(resultAgvAndPlc.Content, sign*6 + 2)); // 鍏佽鏀捐揣 -// } -// } - -// OperateResultExOne<byte[]> resultAgvAndPlcOk = siemensS7Net.Read("DB132.0", (short) 30); -// if (resultAgvAndPlcOk.IsSuccess) { -// for (int i = 0; i < staNoSize; i++) { -// int sign =(i+2)/2-1; -// if ((i+2)%2!=0){ -// Integer siteId = staNos.get(i); // 绔欑偣缂栧彿 -// StaProtocol staProtocol = station.get(siteId); -// if (null == staProtocol) { -// staProtocol = new StaProtocol(); -// staProtocol.setSiteId(siteId); -// station.put(siteId, staProtocol); -// } -// staProtocol.setAgvTargetPick(siemensS7Net.getByteTransform().TransInt16(resultAgvAndPlcOk.Content, sign*6+4)); // 鍏佽鍙栬揣 -// staProtocol.setAgvTargetPlace((short)0); // 鍏佽鏀捐揣 -// continue; -// } -// Integer siteId = staNos.get(i); // 绔欑偣缂栧彿 -// StaProtocol staProtocol = station.get(siteId); -// if (null == staProtocol) { -// staProtocol = new StaProtocol(); -// staProtocol.setSiteId(siteId); -// station.put(siteId, staProtocol); -// } -// try{ -// staProtocol.setAgvTargetPick(siemensS7Net.getByteTransform().TransInt16(resultAgvAndPlcOk.Content, sign*6)); // 鍙栬揣瀹屾垚 -// if (staProtocol.getAgvTargetPick()!=0){ -// System.out.println(staProtocol.getAgvTargetPick()); -// } -// staProtocol.setAgvTargetPlace(siemensS7Net.getByteTransform().TransInt16(resultAgvAndPlcOk.Content, sign*6 + 2)); // 鏀捐揣瀹屾垚 -// if (staProtocol.getAgvTargetPlace()!=0){ -// System.out.println(staProtocol.getAgvTargetPlace()); -// } -// }catch (Exception e){ -// log.error(""+e); -// } -// } -// } - - if (slave.getId() == 1) { //鏉$爜 //Thread.sleep(200); @@ -319,67 +251,9 @@ } } } - - //澶栧舰妫�娴� - OperateResultExOne<byte[]> resultErr1 = siemensS7Net.Read("DB101.810.0", (short) (barcodeSize*1)); - StaProtocol staProtocol1 = station.get(116); - boolean[] status1 = siemensS7Net.getByteTransform().TransBool(resultErr1.Content, 0, 1); - staProtocol1.setFrontErr(status1[0]); - staProtocol1.setBackErr(status1[1]); - staProtocol1.setHighErr(status1[2]); - staProtocol1.setLeftErr(status1[3]); - staProtocol1.setRightErr(status1[4]); - staProtocol1.setWeightErr(status1[5]); - staProtocol1.setBarcodeErr(status1[6]); - - OperateResultExOne<byte[]> resultErr = siemensS7Net.Read("DB101.922.0", (short) (staNoSize * 4)); - if (resultErr.IsSuccess) { - for (int i = 0; i < staNoSize; i++) { - Integer siteId = staNos.get(i); // 绔欑偣缂栧彿 - boolean[] status = siemensS7Net.getByteTransform().TransBool(resultErr.Content, i * 4, 1); - StaProtocol staProtocol = station.get(siteId); - staProtocol.setBreakerErr(status[0]); - staProtocol.setInfraredErr(status[1]); - staProtocol.setOutTimeErr(status[2]); - staProtocol.setSeizeSeatErr(status[3]); - staProtocol.setWrkYgoodsN(status[4]); - staProtocol.setInverterErr(status[5]); - staProtocol.setContactErr(status[6]); - staProtocol.setUpcontactErr(status[7]); - - } - } - } - - -// //RGV鍙拌溅浣嶇疆 -// Thread.sleep(200); -// OperateResultExOne<byte[]> result3 = siemensS7Net.Read("DB100.0",(short)4); -// if (result3.IsSuccess) { -// for (int i = 0; i < 2; i++) { -// Integer siteId = i==0 ? 1 : 2; // 绔欑偣缂栧彿 -// StaProtocol staProtocol = station.get(siteId); -// if (null == staProtocol) { -// staProtocol = new StaProtocol(); -// staProtocol.setSiteId(siteId); -// station.put(siteId, staProtocol); -// } -// staProtocol.setNearbySta(String.valueOf(siemensS7Net.getByteTransform().TransInt16(result3.Content, i*2))); -//// String aa = staProtocol.getNearbySta(); -//// System.out.println(siteId + "===>>" + staProtocol.getNearbySta()); -// } -// } - -// OperateResultExOne<Short> result2 = siemensS7Net.ReadInt16("DB200.0"); -// if (result2.IsSuccess) { -// this.ioMode = IoModeType.get(result2.Content); -// } - if (result.IsSuccess ) { - OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆慬id:{1}] <<<<< 瀹炴椂鏁版嵁鏇存柊鎴愬姛",DateUtils.convert(new Date()), slave.getId())); - // 鏍规嵁瀹炴椂淇℃伅鏇存柊鏁版嵁搴� try { List<BasDevp> basDevps = new ArrayList<>(); @@ -387,7 +261,6 @@ StaProtocol staProtocol = station.get(siteId); basDevps.add(staProtocol.toSqlModel()); } - BasDevpService basDevpService = SpringUtils.getBean(BasDevpService.class); if (null != basDevpService && !basDevpService.updateBatchById(basDevps)) { throw new Exception("鏇存柊鏁版嵁搴撴暟鎹け璐�"); @@ -397,7 +270,6 @@ OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆戞洿鏂版暟鎹簱鏁版嵁澶辫触 ===>> [id:{1}] [ip:{2}] [port:{3}] [rack:{4}] [slot:{5}]", DateUtils.convert(new Date()), slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot())); log.error("鏇存柊鏁版嵁搴撴暟鎹け璐� ===>> [id:{}] [ip:{}] [port:{}] [rack:{}] [slot:{}]", slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot()); } - DeviceErrorService deviceErrorService = SpringUtils.getBean(DeviceErrorService.class); deviceErrorService.deleteDeviceError("devp", slave.getId()); } else { diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml index 9af468b..828fcb4 100644 --- a/src/main/resources/application-prod.yml +++ b/src/main/resources/application-prod.yml @@ -1,49 +1,4 @@ wcs-slave: - doubleDeep: true #鍙屾繁 - doubleLocs: 1,4,5,8 #鍙屾繁搴撲綅鎺掑彿 1,4,5,8 - groupCount: 4 #涓�涓爢鍨涙満璐熻矗鐨勮揣鏋舵帓鏁� - crn[0]: #鍫嗗灈鏈�1 - id: 1 - ip: 10.10.10.110 - slot: 0 - demo: false - rack: 0 - offset: 2 #鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2 - port: 102 - crnOutStn[0]: #鍫嗗灈鏈哄嚭搴撶珯鐐� - staNo: 125 - row: 3 - bay: 1 - lev: 2 - devpPlcId: ${wcs-slave.devp[0].id} - crnInStn[0]: #鍫嗗灈鏈哄叆搴撶珯鐐�1 - staNo: 100 - row: 2 - bay: 1 - lev: 2 - backSta: 102 - devpPlcId: ${wcs-slave.devp[0].id} - crn[1]: #鍫嗗灈鏈�2 - id: 2 - ip: 10.10.10.120 - slot: 0 - demo: false - rack: 0 - offset: 2 #鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2 - port: 102 - crnOutStn[0]: #鍫嗗灈鏈哄嚭搴撶珯鐐� - staNo: 115 - row: 7 - bay: 1 - lev: 2 - devpPlcId: ${wcs-slave.devp[0].id} - crnInStn[0]: #鍫嗗灈鏈哄叆搴撶珯鐐�1 - staNo: 120 - row: 6 - bay: 1 - lev: 2 - backSta: 106 - devpPlcId: ${wcs-slave.devp[0].id} devp[0]: #杈撻�佺嚎 id: 1 ip: 10.10.10.130 diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 537b138..d7e1f58 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -50,7 +50,7 @@ #url: 10.32.53.195:8080 # WMS绯荤粺ip # url: 10.210.157.109:8090 - url: 10.10.10.222:2410 + url: 127.0.0.1:2410 # 鍏ュ簱浠诲姟鐢宠鎺ュ彛 #inboundTaskApplyPath: api/InterFace/inboundTaskApply inboundTaskApplyPath: api/StereoscopicCallBack/AcceptTaskStatus @@ -62,7 +62,7 @@ # 绉诲簱鐢宠鎺ュ彛 movePath: api/InterFace/get_InterFace_TestStorage wcs: - urlWcs: 10.10.20.200:9090/wcs + urlWcs: 127.0.0.1:9091/wcs #鍏ュ簱浠诲姟鐢宠 inboundTaskApplyPathWcs: openapi/createInTask #鍑哄簱浠诲姟鐢宠 -- Gitblit v1.9.1