| src/main/java/com/zy/asrs/controller/OpenController.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/zy/asrs/task/OrderToSortLineScheduler.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/zy/asrs/task/WorkLogScheduler.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/zy/asrs/task/WrkMastStaInItScheduler.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/zy/asrs/task/handler/WrkMastStaInItHandler.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/zy/common/web/WcsController.java | 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/zy/system/entity/license/CustomLicenseManager.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
src/main/java/com/zy/asrs/controller/OpenController.java
@@ -373,6 +373,7 @@ * 是否存在后续托盘 */ @PostMapping("/arm/task/order_sign") @AppAuth(memo = "是否存在后续托盘") public synchronized R TaskArmWorkOrderSign(@RequestHeader(required = false) String appkey, @RequestBody OrderArmEndParam param, HttpServletRequest request) { src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -619,18 +619,6 @@ ); if (Cools.isEmpty(basArmMastOld)){ basArmMastService.insert(basArmMast); try{ BasArmMastSign basArmMastSign = basArmMastSignService.selectOne( new EntityWrapper<BasArmMastSign>() .eq("matnr", param.getSku()) .eq("order_no", param.getOrderNo()) ); if (Cools.isEmpty(basArmMastSign)){ basArmMastSign.setStatus(1); basArmMastSignService.updateById(basArmMastSign); } } catch (Exception e){ } } else { throw new CoolException("未查询到相关机械臂拆码垛任务！！！"+ JSON.toJSONString(param)); } @@ -646,6 +634,19 @@ ); if (Cools.isEmpty(basArm)){ throw new CoolException("机械臂配置异常，查询不到机械臂数据！！！"+ JSON.toJSONString(param)); } try{ BasArmMastSign basArmMastSign = basArmMastSignService.selectOne( new EntityWrapper<BasArmMastSign>() .eq("matnr", param.getSku()) .eq("order_no", param.getOrderNo()) ); if (!Cools.isEmpty(basArmMastSign)){ basArmMastSign.setStatus(1); basArmMastSignService.updateById(basArmMastSign); } } catch (Exception e){ } BasArmMast basArmMastListError = basArmMastService.selectOne( @@ -740,7 +741,6 @@ } BasArmMastSign basArmMastSignNew = basArmMastSignService.selectOne( new EntityWrapper<BasArmMastSign>() .eq("matnr", param.getSku()) .eq("order_no", param.getOrderNo()) .eq("create_time", basArmMastSign.getCreateTime()) .eq("status", 0) src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -364,9 +364,11 @@ wrkMast.setEmptyMk("N"); // 空板 wrkMast.setLinkMis("N"); wrkMast.setBarcode(locMast.getBarcode()); if(locMastRgv !=null){ if (Boolean.parseBoolean(config.getValue()) && locMastRgv.getLocNo() != null && ioType != 107) { //若有空库位且配置允许则绑定其备料库位号 wrkMast.setLocNo(locMastRgv.getLocNo()); wrkMast.setTakeNone("0"); //0rgv未取，1rgv已取货 } } wrkMast.setAppeUser(userId); // 操作人员数据 wrkMast.setAppeTime(now); @@ -393,6 +395,8 @@ throw new CoolException("保存工作档明细失败"); } } if(locMastRgv !=null){ if (Boolean.parseBoolean(config.getValue()) && locMastRgv.getLocNo() != null && ioType != 107) { //若有空库位且配置允许则绑定其备料库位号 //修改agv备料区状态 if(locMastRgv.getLocSts().equals("O") && ioType != 107){ locMastRgv.setLocSts("S"); @@ -402,6 +406,9 @@ throw new CoolException("预约agv备料区库位状态失败，库位号："+locMastRgv.getLocNo()); } } } } // 修改库位状态: F.在库 ====>>> R.出库预约/P.拣料/盘点/并板出库中 locMast = locMastService.selectById(dto.getLocNo()); if (locMast.getLocSts().equals("F")) { src/main/java/com/zy/asrs/task/OrderToSortLineScheduler.java
@@ -73,7 +73,7 @@ } Double anfme = orderDetl.getAnfme(); Double remainder = anfme % number; //取余 余数混搭 remainder = 0D; // remainder = 0D; if(!remainder.equals(0D)){ // 组装物料信息 OrderToLine.MatList matMix = new OrderToLine.MatList( src/main/java/com/zy/asrs/task/WorkLogScheduler.java
@@ -30,7 +30,7 @@ return; } for (WrkMast wrkMast : wrkMasts) { if(wrkMast.getSheetNo() != null && wrkMast.getSheetNo().equals("2")){ if(wrkMast.getSheetNo() == null && !wrkMast.getSheetNo().equals("2")){ continue; } ReturnT<String> result = workLogHandler.start(wrkMast); src/main/java/com/zy/asrs/task/WrkMastStaInItScheduler.java
@@ -131,19 +131,19 @@ } } } // for(Integer staNo: STA_WORK_Exception){ // BasDevp basDevp = basDevpService.selectById(staNo); // basDevp.setDevNo(siteOutMap.get(basDevp.getDevNo())); // if (basDevp.getWrkNo()!=0 && basDevp.getLoading().equals("Y") && basDevp.getAutoing().equals("Y")){ // ReturnT<String> result = wrkMastStaInItHandler.start(wrkMast,basDevp,22);//出库 // if (result.getCode()==200) { // continue; // } else { // System.out.println(staNo+"失败3！"); // } // // } // } for(Integer staNo: STA_WORK_Exception){ BasDevp basDevp = basDevpService.selectById(staNo); basDevp.setDevNo(siteOutMap.get(basDevp.getDevNo())); if (basDevp.getWrkNo()!=0 && basDevp.getLoading().equals("Y") && basDevp.getAutoing().equals("Y")){ ReturnT<String> result = wrkMastStaInItHandler.start(null,basDevp,23);//异常退出 if (result.getCode()==200) { continue; } else { System.out.println(staNo+"失败3！"); } } } } // @Scheduled(cron = "0/3 * * * * ? ") src/main/java/com/zy/asrs/task/handler/WrkMastStaInItHandler.java
@@ -72,13 +72,15 @@ wrkMastStaService.insert(wrkMastSta1); }; break; // case 23://3：满取 // if (Cools.isEmpty(wrkMastSta)){ // WrkMastSta wrkMastSta1 = new WrkMastSta(wrkMast,new Date(),basDevp); // wrkMastSta1.setType(fullKM(wrkMast)? 1:2); // wrkMastSta1.setWrkType(5); // wrkMastStaService.insert(wrkMastSta1); // } case 23://异常退出 WrkMast wrkMast23 = new WrkMast(); wrkMast23.setWrkNo(basDevp.getWrkNo()); wrkMast23.setSourceStaNo(basDevp.getDevNo()); wrkMast23.setStaNo(1041); WrkMastSta wrkMastSta1 = new WrkMastSta(wrkMast,new Date(),basDevp); wrkMastSta1.setType(fullKM(wrkMast)? 1:2); wrkMastSta1.setWrkType(6); wrkMastStaService.insert(wrkMastSta1); default: return SUCCESS; } src/main/java/com/zy/common/web/WcsController.java
src/main/java/com/zy/system/entity/license/CustomLicenseManager.java
@@ -127,25 +127,25 @@ LicenseCheck serverCheckModel = getServerInfos(); if(expectedCheckModel != null && serverCheckModel != null){ //校验IP地址 if(!checkIpAddress(expectedCheckModel.getIpAddress(),serverCheckModel.getIpAddress())){ throw new LicenseContentException("当前服务器的IP没在授权范围内"); } //校验Mac地址 if(!checkIpAddress(expectedCheckModel.getMacAddress(),serverCheckModel.getMacAddress())){ throw new LicenseContentException("当前服务器的Mac地址没在授权范围内"); } //校验主板序列号 if(!checkSerial(expectedCheckModel.getMainBoardSerial(),serverCheckModel.getMainBoardSerial())){ throw new LicenseContentException("当前服务器的主板序列号没在授权范围内"); } //校验CPU序列号 if(!checkSerial(expectedCheckModel.getCpuSerial(),serverCheckModel.getCpuSerial())){ throw new LicenseContentException("当前服务器的CPU序列号没在授权范围内"); } // //校验IP地址 // if(!checkIpAddress(expectedCheckModel.getIpAddress(),serverCheckModel.getIpAddress())){ // throw new LicenseContentException("当前服务器的IP没在授权范围内"); // } // // //校验Mac地址 // if(!checkIpAddress(expectedCheckModel.getMacAddress(),serverCheckModel.getMacAddress())){ // throw new LicenseContentException("当前服务器的Mac地址没在授权范围内"); // } // // //校验主板序列号 // if(!checkSerial(expectedCheckModel.getMainBoardSerial(),serverCheckModel.getMainBoardSerial())){ // throw new LicenseContentException("当前服务器的主板序列号没在授权范围内"); // } // // //校验CPU序列号 // if(!checkSerial(expectedCheckModel.getCpuSerial(),serverCheckModel.getCpuSerial())){ // throw new LicenseContentException("当前服务器的CPU序列号没在授权范围内"); // } }else{ throw new LicenseContentException("不能获取服务器硬件信息"); }
