From 3d40ce7e16a9e53bad6637bbed824507f06148b4 Mon Sep 17 00:00:00 2001 From: 野心家 <1051256694@qq.com> Date: 星期一, 26 五月 2025 10:20:51 +0800 Subject: [PATCH] #ZH --- src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java | 8 src/main/java/com/zy/asrs/controller/LocMastController.java | 21 ++- src/main/java/com/zy/asrs/controller/OpenController.java | 101 +++---------------- src/main/java/com/zy/asrs/service/TaskWrkLogService.java | 4 src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 4 src/main/resources/mapper/LocMastMapper.xml | 5 src/main/java/com/zy/common/utils/HttpHandler.java | 2 src/main/webapp/views/taskWrkLog/taskWrkLog.html | 4 src/main/resources/application-prod.yml | 12 +- src/main/java/com/zy/asrs/service/impl/TaskWrkServiceImpl.java | 4 pom.xml | 12 +- src/main/java/com/zy/asrs/controller/TaskWrkLogController.java | 8 + src/main/java/com/zy/asrs/service/impl/TaskWrkLogServiceImpl.java | 4 src/main/java/com/zy/asrs/entity/TaskWrkLog.java | 6 + src/main/java/com/zy/core/thread/RgvThread.java | 46 +++++++++ src/main/java/com/zy/asrs/mapper/TaskWrkMapper.java | 4 src/main/java/com/zy/asrs/mapper/LocMastMapper.java | 6 src/main/java/com/zy/asrs/mapper/TaskWrkLogMapper.java | 4 src/main/java/com/zy/asrs/controller/TaskWrkController.java | 4 src/main/java/com/zy/asrs/service/TaskWrkService.java | 4 src/main/java/com/zy/asrs/controller/BasCrnErrorController.java | 2 src/main/java/com/zy/asrs/service/LocMastService.java | 4 22 files changed, 133 insertions(+), 136 deletions(-) diff --git a/pom.xml b/pom.xml index 2b6fe46..bf09a9c 100644 --- a/pom.xml +++ b/pom.xml @@ -61,12 +61,12 @@ <!-- </dependency>--> <!-- 鏄惧紡鎺掗櫎slf4j-simple --> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-simple</artifactId> - <version>1.7.30</version> - <scope>provided</scope> <!-- 鎴栫洿鎺ュ垹闄よ渚濊禆 --> - </dependency> +<!-- <dependency>--> +<!-- <groupId>org.slf4j</groupId>--> +<!-- <artifactId>slf4j-simple</artifactId>--> +<!-- <version>1.7.30</version>--> +<!-- <scope>provided</scope> <!– 鎴栫洿鎺ュ垹闄よ渚濊禆 –>--> +<!-- </dependency>--> <dependency> <groupId>com.dameng</groupId> <artifactId>DmJdbcDriver8</artifactId> diff --git a/src/main/java/com/zy/asrs/controller/BasCrnErrorController.java b/src/main/java/com/zy/asrs/controller/BasCrnErrorController.java index 2a3d596..44c3ec8 100644 --- a/src/main/java/com/zy/asrs/controller/BasCrnErrorController.java +++ b/src/main/java/com/zy/asrs/controller/BasCrnErrorController.java @@ -44,7 +44,7 @@ // return R.ok(basCrnErrorService.selectPage(new Page<>(curr, limit), wrapper)); List<BasCrnError> basCrnErrorList = basCrnErrorService.selectList(wrapper); - Page<BasCrnError> page = new Page<BasCrnError>(0, 100).setRecords(basCrnErrorList); + Page<BasCrnError> page = new Page<BasCrnError>(curr, limit).setRecords(basCrnErrorList); page.setTotal(basCrnErrorList.size()); return R.ok(page); } diff --git a/src/main/java/com/zy/asrs/controller/LocMastController.java b/src/main/java/com/zy/asrs/controller/LocMastController.java index 31fdefa..928085f 100644 --- a/src/main/java/com/zy/asrs/controller/LocMastController.java +++ b/src/main/java/com/zy/asrs/controller/LocMastController.java @@ -61,6 +61,7 @@ try{ String locNo = null; + String locSts = null; long whsType = 0L; Integer crnNo = 0; Integer row1 = 0; @@ -73,21 +74,23 @@ } if (entry.getKey().equals("whsType")) { whsType = Long.getLong(val); - }else if (entry.getKey().equals("locNo")) { + }else if (entry.getKey().equals("loc_no")) { locNo = val; - }else if (entry.getKey().equals("crnNo")) { - crnNo = Integer.getInteger(val); + }else if (entry.getKey().equals("crn_no")) { + crnNo = Integer.parseInt(val); }else if (entry.getKey().equals("row1")) { - row1 = Integer.getInteger(val); + row1 = Integer.parseInt(val); }else if (entry.getKey().equals("bay1")) { - bay1 = Integer.getInteger(val); + bay1 = Integer.parseInt(val); }else if (entry.getKey().equals("lev1")) { - lev1 = Integer.getInteger(val); + lev1 = Integer.parseInt(val); + }else if (entry.getKey().equals("loc_sts")) { + locSts = val; } } - List<LocMast> locMastList = locMastService.selectLocMastListSix(locNo,whsType,crnNo,row1,bay1,lev1,0,10); - Page<LocMast> page = new Page<LocMast>(0,10).setRecords(locMastList); - page.setTotal(locMastService.selectLocMastListTotalSix(locNo,whsType,crnNo,row1,bay1,lev1)); + List<LocMast> locMastList = locMastService.selectLocMastListSix(locSts,locNo,whsType,crnNo,row1,bay1,lev1,curr,limit); + Page<LocMast> page = new Page<LocMast>(curr,limit).setRecords(locMastList); + page.setTotal(locMastService.selectLocMastListTotalSix(locSts,locNo,whsType,crnNo,row1,bay1,lev1)); return R.ok(page); }catch (Exception e){ return R.error("寮傚父" + e); diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java index 605e473..ee44e22 100644 --- a/src/main/java/com/zy/asrs/controller/OpenController.java +++ b/src/main/java/com/zy/asrs/controller/OpenController.java @@ -11,6 +11,7 @@ import com.zy.asrs.entity.param.*; import com.zy.asrs.service.*; import com.zy.asrs.service.impl.BasCrnErrorServiceImpl; +import com.zy.asrs.service.impl.TaskWrkLogServiceImpl; import com.zy.asrs.utils.Utils; import com.zy.common.web.BaseController; import com.zy.core.CrnThread; @@ -70,6 +71,8 @@ public static final ArrayList<String> APP_KEY_LIST = new ArrayList<String>() {{ add("ea1f0459efc02a79f046f982767939ae"); }}; + @Autowired + private TaskWrkLogServiceImpl taskWrkLogService; //agv浠诲姟瀹屾垚 @PostMapping("/toAgvTaskOver") @@ -520,9 +523,10 @@ basCrnpWmsParam.sync(basCrnp); basCrnpWmsParam.setCrnNoH(crnProtocol.getLaneNo()); + basCrnpWmsParam.setCrnSts(crnProtocol.getStatus().intValue()); try{ - BasCrnError basCrnError = basCrnErrorService.selectById(basCrnp.getCrnErr()); + BasCrnError basCrnError = basCrnErrorService.selectById(crnProtocol.getAlarm()); basCrnpWmsParam.setCrnErrM(basCrnError.getErrName()); } catch (Exception e){ basCrnpWmsParam.setCrnErrM("鏈煡寮傚父"); @@ -569,93 +573,22 @@ return R.ok(wcsStatusResponseModel); } - + //璁惧鐘舵�佹煡璇㈡帴鍙� + @PostMapping("/taskWrkLogs") + @Transactional + public R taskWrkLogs(@RequestHeader String appkey, + HttpServletRequest request) { + List<TaskWrkLog> taskWrkLogs = taskWrkLogService.selectList(new EntityWrapper<>()); + return R.ok(taskWrkLogs); + } //璁惧鐘舵�佹煡璇㈡帴鍙� - @PostMapping("/errorRgv1") + @PostMapping("/error") @Transactional public R errorRgv(@RequestHeader String appkey, - HttpServletRequest request) { - auth(appkey, "璁惧鐘舵�佹煡璇㈡帴鍙�", request); - List<BasDevp> basDevps = basDevpService.selectList(new EntityWrapper<>()); - List<Object> list = new ArrayList<>(); - WcsStatusResponseModel wcsStatusResponseModel = new WcsStatusResponseModel(); - for (BasDevp basDevp:basDevps){ - BasDevpWmsParam basDevpWmsParam = new BasDevpWmsParam(); - basDevpWmsParam.setDevNo(basDevp.getDevNo()); - basDevpWmsParam.setWrkNo(basDevp.getWrkNo().longValue()); - basDevpWmsParam.setAutoing(basDevp.getAutoing()); - basDevpWmsParam.setLoading(basDevp.getLoading()); - basDevpWmsParam.setInEnable(basDevp.getInEnable()); - basDevpWmsParam.setOutEnable(basDevp.getOutEnable()); - basDevpWmsParam.setDevErr(basDevp.getStaErr().longValue()); - basDevpWmsParam.setDevErrM(basDevpWmsParam.getDevErr$()); -// list.add(basDevpWmsParam); - wcsStatusResponseModel.getChainList().add(basDevpWmsParam); - } - List<BasCrnpWmsParam> basCrnpWmsParamList = new ArrayList<>(); - for (CrnSlave crn : slaveProperties.getCrn()) { - // 鑾峰彇鍫嗗灈鏈轰俊鎭� - CrnThread crnThread = (CrnThread) SlaveConnection.get(SlaveType.Crn, crn.getId()); - CrnProtocol crnProtocol = crnThread.getCrnProtocol(); - if (crnProtocol == null) { continue; } - BasCrnp basCrnp = basCrnpService.selectById(crn.getId()); - if (basCrnp == null) { - log.error("{}鍙峰爢鍨涙満灏氭湭鍦ㄦ暟鎹簱杩涜缁存姢锛�", crn.getId()); - continue; - } - BasCrnpWmsParam basCrnpWmsParam = new BasCrnpWmsParam(); - basCrnpWmsParam.sync(basCrnp); - - basCrnpWmsParam.setCrnNoH(crnProtocol.getLaneNo()); - - try{ - BasCrnError basCrnError = basCrnErrorService.selectById(basCrnp.getCrnErr()); - basCrnpWmsParam.setCrnErrM(basCrnError.getErrName()); - } catch (Exception e){ - basCrnpWmsParam.setCrnErrM("鏈煡寮傚父"); - } - if (crnProtocol.getMode()!=3){ - basCrnpWmsParam.setCrnErr(999L); - basCrnpWmsParam.setCrnErrM("闈炶嚜鍔紒锛侊紒"); - } - basCrnpWmsParamList.add(basCrnpWmsParam); - -// list.add(basCrnpWmsParam); - } - wcsStatusResponseModel.setPilingCarList(basCrnpWmsParamList); - for (RgvSlave rgvSlave : slaveProperties.getRgv()) { - RgvProtocol rgvStatus = RgvStatusCache.getRgvStatus(rgvSlave.getId()); - if (Cools.isEmpty(rgvStatus)){ - continue; - } - BasRgvWmsParam basRgvWmsParam = new BasRgvWmsParam(); - basRgvWmsParam.setWrkNo(rgvStatus.getTaskNo()); - basRgvWmsParam.setCrnSts(rgvStatus.getStatus().intValue()); - basRgvWmsParam.setStatusType(rgvStatus.getStatusType().desc); - basRgvWmsParam.setSteNo(rgvSlave.getId()); - basRgvWmsParam.setSteErr(rgvStatus.getAlarm().longValue()); - basRgvWmsParam.setSteErrM(rgvStatus.getAlarmM()); - try{ -// BasRgvErr basRgvErr = basRgvErrService.selectById((long)rgvStatus.getAlarm$()); - -// basRgvWmsParam.setSteErrM(basRgvErr.getErrName()); - } catch (Exception e){ - basRgvWmsParam.setSteErrM("鏈煡寮傚父"); - } - if (rgvStatus.getMode()!=1){ - basRgvWmsParam.setSteErr(999L); - basRgvWmsParam.setSteErrM("闈炶嚜鍔紒锛侊紒"); - } -// list.add(basRgvWmsParam); - wcsStatusResponseModel.getRgvList().add(basRgvWmsParam); - - } -// List<BasCrnp> basCrnps = basCrnpService.selectList(new EntityWrapper<>()); -// for (BasCrnp basCrnp:basCrnps){ -// list.add(basCrnp); -// } - return R.ok(wcsStatusResponseModel); + HttpServletRequest request) { + List<TaskWrkLog> taskWrkLogs = taskWrkLogService.selectList(new EntityWrapper<>()); + return R.ok(taskWrkLogs); } diff --git a/src/main/java/com/zy/asrs/controller/TaskWrkController.java b/src/main/java/com/zy/asrs/controller/TaskWrkController.java index 77bfc5e..58e205d 100644 --- a/src/main/java/com/zy/asrs/controller/TaskWrkController.java +++ b/src/main/java/com/zy/asrs/controller/TaskWrkController.java @@ -68,7 +68,7 @@ try{ Integer wrkNo = null; - Integer taskNo = null; + String taskNo = null; Integer status = null; Date modiTimeStart = null, modiTimeEnd = null; for (Map.Entry<String, Object> entry : param.entrySet()) { @@ -83,7 +83,7 @@ } else if (entry.getKey().equals("wrk_no")) { wrkNo = Integer.parseInt(val); } else if (entry.getKey().equals("task_no")) { - taskNo = Integer.parseInt(val); + taskNo = val; } else if (entry.getKey().equals("status")) { status = Integer.parseInt(val); } diff --git a/src/main/java/com/zy/asrs/controller/TaskWrkLogController.java b/src/main/java/com/zy/asrs/controller/TaskWrkLogController.java index 5d01b7f..5ec4bc0 100644 --- a/src/main/java/com/zy/asrs/controller/TaskWrkLogController.java +++ b/src/main/java/com/zy/asrs/controller/TaskWrkLogController.java @@ -38,7 +38,7 @@ @RequestParam Map<String, Object> param){ try{ Integer wrkNo = null; - Integer taskNo = null; + String taskNo = null; Integer status = null; Date modiTimeStart = null, modiTimeEnd = null; for (Map.Entry<String, Object> entry : param.entrySet()) { @@ -53,13 +53,17 @@ } else if (entry.getKey().equals("wrk_no")) { wrkNo = Integer.parseInt(val); } else if (entry.getKey().equals("task_no")) { - taskNo = Integer.parseInt(val); + taskNo = val; } else if (entry.getKey().equals("status")) { status = Integer.parseInt(val); } } List<TaskWrkLog> taskWrkList = taskWrkLogService.selectTaskWrkLogList(wrkNo,taskNo,status,modiTimeStart,modiTimeEnd, curr, limit); Page<TaskWrkLog> page = new Page<TaskWrkLog>(curr, limit).setRecords(taskWrkList); + if (page.getRecords().size()==0){ + taskWrkList = taskWrkLogService.selectTaskWrkLogList(wrkNo,taskNo,status,modiTimeStart,modiTimeEnd, 1, limit); + page = new Page<TaskWrkLog>(1, limit).setRecords(taskWrkList); + } page.setTotal(taskWrkLogService.selectTaskWrkLogListTotal(wrkNo,taskNo,status,modiTimeStart,modiTimeEnd)); return R.ok(page); diff --git a/src/main/java/com/zy/asrs/entity/TaskWrkLog.java b/src/main/java/com/zy/asrs/entity/TaskWrkLog.java index bcd7c06..dc77efc 100644 --- a/src/main/java/com/zy/asrs/entity/TaskWrkLog.java +++ b/src/main/java/com/zy/asrs/entity/TaskWrkLog.java @@ -263,11 +263,15 @@ case 2: return "娲惧彂"; case 3: - return "姝ュ簭瀹屾垚"; + return "鍛戒护瀹屾垚"; case 4: return "鍙栨秷"; case 5: return "瀹岀粨"; + case 7: + return "鎵嬪姩瀹岀粨"; + case 9: + return "鍑哄簱鍒拌緭閫佺嚎"; default: return String.valueOf(this.status); } diff --git a/src/main/java/com/zy/asrs/mapper/LocMastMapper.java b/src/main/java/com/zy/asrs/mapper/LocMastMapper.java index fff410c..c3d1a2d 100644 --- a/src/main/java/com/zy/asrs/mapper/LocMastMapper.java +++ b/src/main/java/com/zy/asrs/mapper/LocMastMapper.java @@ -17,7 +17,8 @@ /** * 搴撲綅妯$硦鏌ヨ搴撲綅鍙� */ - List<LocMast> selectLocMastListSix(@Param("locNo") String locNo, + List<LocMast> selectLocMastListSix(@Param("locSts") String locSts, + @Param("locNo") String locNo, @Param("whsType") Long whsType, @Param("crnNo") Integer crnNo, @Param("row1") Integer row1, @@ -29,7 +30,8 @@ /** * 鍫嗗灈鏈哄搴旂殑鎺掑彿闆嗗悎 */ - Long selectLocMastListTotalSix(@Param("locNo") String locNo, + Long selectLocMastListTotalSix(@Param("locSts") String locSts, + @Param("locNo") String locNo, @Param("whsType") Long whsType, @Param("crnNo") Integer crnNo, @Param("row1") Integer row1, diff --git a/src/main/java/com/zy/asrs/mapper/TaskWrkLogMapper.java b/src/main/java/com/zy/asrs/mapper/TaskWrkLogMapper.java index 746faf6..83df432 100644 --- a/src/main/java/com/zy/asrs/mapper/TaskWrkLogMapper.java +++ b/src/main/java/com/zy/asrs/mapper/TaskWrkLogMapper.java @@ -14,7 +14,7 @@ public interface TaskWrkLogMapper extends BaseMapper<TaskWrkLog> { List<TaskWrkLog> selectTaskWrkLogList(@Param("wrkNo") Integer wrkNo, - @Param("taskNo") Integer taskNo, + @Param("taskNo") String taskNo, @Param("status") Integer status, @Param("modiTimeStart") Date modiTimeStart, @Param("modiTimeEnd") Date modiTimeEnd, @@ -22,7 +22,7 @@ @Param("pageSize") Integer limit); Long selectTaskWrkLogListTotal(@Param("wrkNo") Integer wrkNo, - @Param("taskNo") Integer taskNo, + @Param("taskNo") String taskNo, @Param("status") Integer status, @Param("modiTimeStart") Date modiTimeStart, @Param("modiTimeEnd") Date modiTimeEnd); diff --git a/src/main/java/com/zy/asrs/mapper/TaskWrkMapper.java b/src/main/java/com/zy/asrs/mapper/TaskWrkMapper.java index 448da66..ea133a8 100644 --- a/src/main/java/com/zy/asrs/mapper/TaskWrkMapper.java +++ b/src/main/java/com/zy/asrs/mapper/TaskWrkMapper.java @@ -44,7 +44,7 @@ List<TaskWrk> selectWorkingTask();//鑾峰彇宸ヤ綔涓殑浠诲姟 List<TaskWrk> selectTaskWrkList(@Param("wrkNo") Integer wrkNo, - @Param("taskNo") Integer taskNo, + @Param("taskNo") String taskNo, @Param("status") Integer status, @Param("modiTimeStart") Date modiTimeStart, @Param("modiTimeEnd") Date modiTimeEnd, @@ -52,7 +52,7 @@ @Param("pageSize") Integer limit); Long selectTaskWrkListTotal(@Param("wrkNo") Integer wrkNo, - @Param("taskNo") Integer taskNo, + @Param("taskNo") String taskNo, @Param("status") Integer status, @Param("modiTimeStart") Date modiTimeStart, @Param("modiTimeEnd") Date modiTimeEnd); diff --git a/src/main/java/com/zy/asrs/service/LocMastService.java b/src/main/java/com/zy/asrs/service/LocMastService.java index 775a3aa..8c6280c 100644 --- a/src/main/java/com/zy/asrs/service/LocMastService.java +++ b/src/main/java/com/zy/asrs/service/LocMastService.java @@ -11,12 +11,12 @@ /** * 搴撲綅妯$硦鏌ヨ搴撲綅鍙� */ - List<LocMast> selectLocMastListSix(String locNo,Long whsType,Integer crnNo,Integer row1,Integer bay1,Integer lev1, Integer curr, Integer limit); + List<LocMast> selectLocMastListSix(String locSts,String locNo,Long whsType,Integer crnNo,Integer row1,Integer bay1,Integer lev1, Integer curr, Integer limit); /** * 鍫嗗灈鏈哄搴旂殑鎺掑彿闆嗗悎 */ - Long selectLocMastListTotalSix(String locNo,Long whsType,Integer crnNo,Integer row1,Integer bay1,Integer lev1); + Long selectLocMastListTotalSix(String locSts,String locNo,Long whsType,Integer crnNo,Integer row1,Integer bay1,Integer lev1); /** * 搴撲綅妯$硦鏌ヨ搴撲綅鍙� diff --git a/src/main/java/com/zy/asrs/service/TaskWrkLogService.java b/src/main/java/com/zy/asrs/service/TaskWrkLogService.java index 299337f..6f6dc22 100644 --- a/src/main/java/com/zy/asrs/service/TaskWrkLogService.java +++ b/src/main/java/com/zy/asrs/service/TaskWrkLogService.java @@ -7,7 +7,7 @@ import java.util.List; public interface TaskWrkLogService extends IService<TaskWrkLog> { - List<TaskWrkLog> selectTaskWrkLogList(Integer wrkNo, Integer taskNo, Integer status, Date modiTimeStart, Date modiTimeEnd, Integer curr, Integer limit); - Long selectTaskWrkLogListTotal(Integer wrkNo,Integer taskNo,Integer status,Date modiTimeStart,Date modiTimeEnd); + List<TaskWrkLog> selectTaskWrkLogList(Integer wrkNo, String taskNo, Integer status, Date modiTimeStart, Date modiTimeEnd, Integer curr, Integer limit); + Long selectTaskWrkLogListTotal(Integer wrkNo,String taskNo,Integer status,Date modiTimeStart,Date modiTimeEnd); } diff --git a/src/main/java/com/zy/asrs/service/TaskWrkService.java b/src/main/java/com/zy/asrs/service/TaskWrkService.java index 5b19516..708832b 100644 --- a/src/main/java/com/zy/asrs/service/TaskWrkService.java +++ b/src/main/java/com/zy/asrs/service/TaskWrkService.java @@ -32,7 +32,7 @@ int saveToHistory(String taskNo);//灏嗕换鍔¤浆鍘嗗彶鏃ュ織 int saveToHistoryD(String taskNo);//灏嗕换鍔¤浆鍘嗗彶鏃ュ織 - List<TaskWrk> selectTaskWrkList(Integer wrkNo, Integer taskNo, Integer status, Date modiTimeStart, Date modiTimeEnd, Integer curr, Integer limit); - Long selectTaskWrkListTotal(Integer wrkNo,Integer taskNo,Integer status,Date modiTimeStart,Date modiTimeEnd); + List<TaskWrk> selectTaskWrkList(Integer wrkNo, String taskNo, Integer status, Date modiTimeStart, Date modiTimeEnd, Integer curr, Integer limit); + Long selectTaskWrkListTotal(Integer wrkNo,String taskNo,Integer status,Date modiTimeStart,Date modiTimeEnd); } diff --git a/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java index 15a4fc0..d90c6ac 100644 --- a/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java +++ b/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java @@ -32,13 +32,13 @@ private ApiLogService apiLogService; @Override - public List<LocMast> selectLocMastListSix(String locNo,Long whsType,Integer crnNo,Integer row1,Integer bay1,Integer lev1,Integer curr,Integer limit) { - return this.baseMapper.selectLocMastListSix(locNo,whsType,crnNo,row1,bay1,lev1,curr,limit); + public List<LocMast> selectLocMastListSix(String locSts,String locNo,Long whsType,Integer crnNo,Integer row1,Integer bay1,Integer lev1,Integer curr,Integer limit) { + return this.baseMapper.selectLocMastListSix(locSts,locNo,whsType,crnNo,row1,bay1,lev1,curr,limit); } @Override - public Long selectLocMastListTotalSix(String locNo,Long whsType,Integer crnNo,Integer row1,Integer bay1,Integer lev1) { - return this.baseMapper.selectLocMastListTotalSix(locNo,whsType,crnNo,row1,bay1,lev1); + public Long selectLocMastListTotalSix(String locSts,String locNo,Long whsType,Integer crnNo,Integer row1,Integer bay1,Integer lev1) { + return this.baseMapper.selectLocMastListTotalSix(locSts,locNo,whsType,crnNo,row1,bay1,lev1); } @Override diff --git a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java index c04fb9f..5af02a5 100644 --- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java +++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java @@ -206,7 +206,7 @@ TaskWrk taskWrk1 = taskWrkService.selectOne(new EntityWrapper<TaskWrk>().eq("barcode", barcode)); if (!Cools.isEmpty(taskWrk1)) { log.info("鎵樼洏鐮侊細" + barcode + "浠诲姟妗e瓨鍦�"); - if (taskWrk1.getIoType() == 1 && taskWrk1.getStartPoint().equals(staProtocol.getSiteId().toString())) { + if (taskWrk1.getIoType() == 1 && taskWrk1.getStatus() < 3 && taskWrk1.getStartPoint().equals(staProtocol.getSiteId().toString())) { StaDesc staDesc = staDescService.selectOne(new EntityWrapper<StaDesc>() .eq("CRN_NO", taskWrk1.getCrnNo()).eq("TYPE_NO", 1).eq("STN_NO", staProtocol.getSiteId())); @@ -509,7 +509,7 @@ if (!Cools.isEmpty(taskWrk1)) { log.info("鎵樼洏鐮侊細" + barcode + "浠诲姟妗e瓨鍦�"); - if (taskWrk1.getIoType() == 1 && taskWrk1.getStartPoint().equals(staProtocol.getSiteId().toString())) { + if (taskWrk1.getIoType() == 1 && taskWrk1.getStatus() < 3 && taskWrk1.getStartPoint().equals(staProtocol.getSiteId().toString())) { StaDesc staDesc = staDescService.selectOne(new EntityWrapper<StaDesc>() .eq("CRN_NO", taskWrk1.getCrnNo()).eq("TYPE_NO", 1).eq("STN_NO", staProtocol.getSiteId())); diff --git a/src/main/java/com/zy/asrs/service/impl/TaskWrkLogServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/TaskWrkLogServiceImpl.java index ea39010..22d7157 100644 --- a/src/main/java/com/zy/asrs/service/impl/TaskWrkLogServiceImpl.java +++ b/src/main/java/com/zy/asrs/service/impl/TaskWrkLogServiceImpl.java @@ -12,12 +12,12 @@ @Service("taskWrkLogService") public class TaskWrkLogServiceImpl extends ServiceImpl<TaskWrkLogMapper, TaskWrkLog> implements TaskWrkLogService { @Override - public List<TaskWrkLog> selectTaskWrkLogList(Integer wrkNo, Integer taskNo, Integer status, Date modiTimeStart, Date modiTimeEnd, Integer curr, Integer limit) { + public List<TaskWrkLog> selectTaskWrkLogList(Integer wrkNo, String taskNo, Integer status, Date modiTimeStart, Date modiTimeEnd, Integer curr, Integer limit) { return this.baseMapper.selectTaskWrkLogList(wrkNo,taskNo, status,modiTimeStart,modiTimeEnd,curr,limit); } @Override - public Long selectTaskWrkLogListTotal(Integer wrkNo,Integer taskNo,Integer status,Date modiTimeStart,Date modiTimeEnd) { + public Long selectTaskWrkLogListTotal(Integer wrkNo,String taskNo,Integer status,Date modiTimeStart,Date modiTimeEnd) { return this.baseMapper.selectTaskWrkLogListTotal(wrkNo,taskNo, status,modiTimeStart,modiTimeEnd); } } diff --git a/src/main/java/com/zy/asrs/service/impl/TaskWrkServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/TaskWrkServiceImpl.java index a1003f2..8c9ebc5 100644 --- a/src/main/java/com/zy/asrs/service/impl/TaskWrkServiceImpl.java +++ b/src/main/java/com/zy/asrs/service/impl/TaskWrkServiceImpl.java @@ -257,12 +257,12 @@ @Override - public List<TaskWrk> selectTaskWrkList(Integer wrkNo,Integer taskNo,Integer status,Date modiTimeStart,Date modiTimeEnd, Integer curr, Integer limit) { + public List<TaskWrk> selectTaskWrkList(Integer wrkNo,String taskNo,Integer status,Date modiTimeStart,Date modiTimeEnd, Integer curr, Integer limit) { return this.baseMapper.selectTaskWrkList(wrkNo,taskNo, status,modiTimeStart,modiTimeEnd,curr,limit); } @Override - public Long selectTaskWrkListTotal(Integer wrkNo,Integer taskNo,Integer status,Date modiTimeStart,Date modiTimeEnd) { + public Long selectTaskWrkListTotal(Integer wrkNo,String taskNo,Integer status,Date modiTimeStart,Date modiTimeEnd) { return this.baseMapper.selectTaskWrkListTotal(wrkNo,taskNo, status,modiTimeStart,modiTimeEnd); } diff --git a/src/main/java/com/zy/common/utils/HttpHandler.java b/src/main/java/com/zy/common/utils/HttpHandler.java index 438ea88..b305399 100644 --- a/src/main/java/com/zy/common/utils/HttpHandler.java +++ b/src/main/java/com/zy/common/utils/HttpHandler.java @@ -15,7 +15,7 @@ */ public class HttpHandler { - private static final Integer DEFAULT_TIMEOUT_SECONDS = 10; + private static final Integer DEFAULT_TIMEOUT_SECONDS = 5; private static final MediaType MEDIA_TYPE = MediaType.parse("application/json"); private String uri; diff --git a/src/main/java/com/zy/core/thread/RgvThread.java b/src/main/java/com/zy/core/thread/RgvThread.java index 2abca84..723c1c1 100644 --- a/src/main/java/com/zy/core/thread/RgvThread.java +++ b/src/main/java/com/zy/core/thread/RgvThread.java @@ -471,6 +471,29 @@ if (!staProtocol.isAutoing() || staProtocol.isLoading() || staProtocol.getWorkNo() != 0 ){ + if (targetPosition.equals(nowPosRunTask.getTargetPosition())){ + if (rgvProtocolOther.getRgvPosDestination() >= rgvProtocolOther.getRgvPos()-50) { + long avoid = rgvProtocolOther.getRgvPos() - rgvProtocolOther.getCarBodyJiaoMing() - avoidDistance - rgvProtocol.getCarBodyKunPeng(); + if (!new TrackRangeUtils().avoidRange(avoid, avoidRange[1])) { + log.error("RGV琛岃蛋瓒呭嚭鑼冨洿锛侊紒锛� ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort()); + try{ + DeviceErrorService deviceErrorService = SpringUtils.getBean(DeviceErrorService.class); + deviceErrorService.addDeviceError("rgv", slave.getId(), "RGV琛岃蛋瓒呭嚭鑼冨洿"); + } catch (Exception e2){ + log.error("e2:"+e2.getMessage()); + } + return false; + } + long avoidAbs = Math.abs(avoid - rgvProtocol.getRgvPos()); + if (avoidAbs<51){ + return false; + } + rgvTaskProtocol.setAvoid(1); + rgvTaskProtocol.setAvoidingTheDestination(avoid); + RgvTaskCache.updateRgvStatus(rgvTaskProtocol); + } + return false; + } signNowPosRun =false; } } @@ -584,6 +607,29 @@ if (!staProtocol.isAutoing() || staProtocol.isLoading() || staProtocol.getWorkNo() != 0 ){ + if (targetPosition.equals(nowPosRunTask.getTargetPosition())){ + if (rgvProtocolOther.getRgvPosDestination() <= rgvProtocolOther.getRgvPos() + 50) { + long avoid = rgvProtocolOther.getRgvPos() + rgvProtocolOther.getCarBodyKunPeng() + avoidDistance + rgvProtocol.getCarBodyJiaoMing(); + if (!new TrackRangeUtils().avoidRange(avoid, avoidRange[0])) { + log.error("RGV琛岃蛋瓒呭嚭鑼冨洿锛侊紒锛� ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort()); + try{ + DeviceErrorService deviceErrorService = SpringUtils.getBean(DeviceErrorService.class); + deviceErrorService.addDeviceError("rgv", slave.getId(), "RGV琛岃蛋瓒呭嚭鑼冨洿"); + } catch (Exception e2){ + log.error("e2:"+e2.getMessage()); + } + return false; + } + long avoidAbs = Math.abs(avoid - rgvProtocol.getRgvPos()); + if (avoidAbs<51){ + return false; + } + rgvTaskProtocol.setAvoid(1); + rgvTaskProtocol.setAvoidingTheDestination(avoid); + RgvTaskCache.updateRgvStatus(rgvTaskProtocol); + } + return false; + } signNowPosRun =false; } } diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml index d02a0f0..6b64f4a 100644 --- a/src/main/resources/application-prod.yml +++ b/src/main/resources/application-prod.yml @@ -88,13 +88,13 @@ staNo: 1023 # led: ${wcs-slave.led[0].id} # RGV绌挎杞�1 - rgv[0]: - id: 1 + rgv[1]: + id: 2 ip: 27.172.2.70 port: 502 rack: 0 slot: 0 - otherId: 2 + otherId: 1 carBodyJiaoMing: 2800 carBodyKunPeng: 13500 #RGV婧愮珯鐐� @@ -172,13 +172,13 @@ staNo: 1002 direction: false # RGV绌挎杞�2 - rgv[1]: - id: 2 + rgv[0]: + id: 1 ip: 27.172.2.71 port: 502 rack: 0 slot: 0 - otherId: 1 + otherId: 2 carBodyJiaoMing: 2800 carBodyKunPeng: 13500 #RGV婧愮珯鐐� diff --git a/src/main/resources/mapper/LocMastMapper.xml b/src/main/resources/mapper/LocMastMapper.xml index 766aa42..c94c129 100644 --- a/src/main/resources/mapper/LocMastMapper.xml +++ b/src/main/resources/mapper/LocMastMapper.xml @@ -42,8 +42,11 @@ </resultMap> <sql id="batchSeq"> + <if test="locSts != null and locSts != ''"> + and LOC_STS = #{locSts} + </if> <if test="locNo != null and locNo != ''"> - and LOC_NO like '%' + #{locNo} + '%' + and LOC_NO = #{locNo} </if> <if test="whsType != null and whsType != 0"> and WHS_TYPE = #{whsType} diff --git a/src/main/webapp/views/taskWrkLog/taskWrkLog.html b/src/main/webapp/views/taskWrkLog/taskWrkLog.html index d9d7d9d..9871a11 100644 --- a/src/main/webapp/views/taskWrkLog/taskWrkLog.html +++ b/src/main/webapp/views/taskWrkLog/taskWrkLog.html @@ -29,8 +29,10 @@ <el-select v-model="tableSearchParam.status" placeholder="浠诲姟鐘舵��"> <el-option label="鎺ユ敹" value="1"></el-option> <el-option label="娲惧彂" value="2"></el-option> - <el-option label="瀹岀粨" value="3"></el-option> + <el-option label="瀹岀粨" value="5"></el-option> <el-option label="鍙栨秷" value="4"></el-option> + <el-option label="鎵嬪姩瀹岀粨" value="7"></el-option> + <el-option label="鍑哄簱鍒拌緭閫佺嚎" value="9"></el-option> </el-select> </el-form-item> <el-form-item> -- Gitblit v1.9.1