From 6ec3505f6acceca7eae90693d9e4b109942f4185 Mon Sep 17 00:00:00 2001 From: zc <zc> Date: 星期四, 10 七月 2025 13:45:10 +0800 Subject: [PATCH] 接口对接调试 --- src/main/java/com/zy/asrs/controller/OrderController.java | 2 +- src/main/java/com/zy/third/erp/task/ERPOutHedTBScheduler.java | 2 +- src/main/java/com/zy/asrs/task/handler/AgvHandler.java | 4 ++++ src/main/java/com/zy/common/model/TaskDto.java | 4 ++++ src/main/resources/mapper/StaDescMapper.xml | 1 + src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 6 +++--- src/main/resources/application.yml | 4 ++-- 7 files changed, 16 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/zy/asrs/controller/OrderController.java b/src/main/java/com/zy/asrs/controller/OrderController.java index 2357f5e..2ee6830 100644 --- a/src/main/java/com/zy/asrs/controller/OrderController.java +++ b/src/main/java/com/zy/asrs/controller/OrderController.java @@ -67,7 +67,7 @@ } @RequestMapping(value = "/order/head/page/auth") - @ManagerAuth + //@ManagerAuth public R head(@RequestParam(defaultValue = "1")Integer curr, @RequestParam(defaultValue = "10")Integer limit, @RequestParam(required = false)String orderByField, 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 2dfd83b..5807e33 100644 --- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java +++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java @@ -202,16 +202,16 @@ // 鍑哄簱绔欑偣 Integer outSite = null; - List<BasDevp> devps = basDevpService.selectList(new EntityWrapper<BasDevp>().in("dev_no", 223, 123)); + List<BasDevp> devps = basDevpService.selectList(new EntityWrapper<BasDevp>().in("dev_no", 223, 123).orderBy("dev_no",false)); for (BasDevp basDevp : devps) { // 鏃犲伐浣滃彿锛屾棤鐗� - if (basDevp.getWrkNo() == 0 && basDevp.getLoading().equals("N")) { + if (basDevp.getWrkNo() == 0 && basDevp.getLoading().equals("Y")) { outSite = basDevp.getDevNo(); break; } } if (outSite == null) { - outSite = 123; + outSite = 223; } Date now = new Date(); diff --git a/src/main/java/com/zy/asrs/task/handler/AgvHandler.java b/src/main/java/com/zy/asrs/task/handler/AgvHandler.java index 07b3444..b706feb 100644 --- a/src/main/java/com/zy/asrs/task/handler/AgvHandler.java +++ b/src/main/java/com/zy/asrs/task/handler/AgvHandler.java @@ -65,6 +65,10 @@ log.error("鍑哄簱鍛煎彨agv鎺ヨ揣锛寋}宸ヤ綔鍙锋病鏈夋壘鍒板伐浣滄。", wrkNo); return; } + if (wrkMast.getInvWh() == null) { + log.error("鍑哄簱绔欑偣涓虹┖锛寋}", wrkNo); + return; + } // 宸茬粡鍛煎彨杩嘺gv鎺ヨ揣鍒欒烦杩� WrkMast琛ㄤ腑ref_wrkno鍙橀噺鐢ㄥ仛鏍囪瘑 0鏈懠鍙紝1鍛煎彨鎴愬姛 if (wrkMast.getIoType() != 101 && wrkMast.getIoType() != 103 || wrkMast.getRefWrkno() == 1) { diff --git a/src/main/java/com/zy/common/model/TaskDto.java b/src/main/java/com/zy/common/model/TaskDto.java index 286ab79..2d3ab9c 100644 --- a/src/main/java/com/zy/common/model/TaskDto.java +++ b/src/main/java/com/zy/common/model/TaskDto.java @@ -6,6 +6,7 @@ import com.core.exception.CoolException; import com.zy.asrs.entity.LocDetl; import com.zy.asrs.service.LocDetlService; +import com.zy.asrs.utils.MatCompareUtils; import lombok.Data; import java.util.*; @@ -106,6 +107,9 @@ continue; } } + if (!MatCompareUtils.compare(dto,locDetl)){ + continue; + } if (dto.getAnfme() > locDetl.getAnfme()) { throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇�"); } diff --git a/src/main/java/com/zy/third/erp/task/ERPOutHedTBScheduler.java b/src/main/java/com/zy/third/erp/task/ERPOutHedTBScheduler.java index e36b912..e52ef46 100644 --- a/src/main/java/com/zy/third/erp/task/ERPOutHedTBScheduler.java +++ b/src/main/java/com/zy/third/erp/task/ERPOutHedTBScheduler.java @@ -72,7 +72,7 @@ } } - + @Transactional(rollbackFor = Throwable.class) public void OutHedTBScheduler(String orderNo) { //log.info("OutHedTBScheduler寮�濮嬩簡"); if (!erpEnabled) return; diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index c598475..41805fa 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -1,5 +1,5 @@ server: - port: 8085 + port: 8080 servlet: context-path: /@pom.build.finalName@ @@ -10,7 +10,7 @@ enabled: false datasource: driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver - url: jdbc:sqlserver://127.0.0.1:50948;databasename=xgmFlasrs + url: jdbc:sqlserver://127.0.0.1:1433;databasename=xgmFlasrs username: sa password: sa@123 mvc: diff --git a/src/main/resources/mapper/StaDescMapper.xml b/src/main/resources/mapper/StaDescMapper.xml index 6bbea2d..e1d47ca 100644 --- a/src/main/resources/mapper/StaDescMapper.xml +++ b/src/main/resources/mapper/StaDescMapper.xml @@ -29,6 +29,7 @@ <if test="typeNo != null and typeNo !=''"> and asd.type_no = #{typeNo} </if> + order by asd.stn_no desc </select> <select id="queryCrnStn" resultMap="BaseResultMap"> -- Gitblit v1.9.1