From 68a67eab771eb281f5f105b1af87b05d58953bc6 Mon Sep 17 00:00:00 2001 From: zyx <zyx123456> Date: 星期二, 02 四月 2024 15:38:51 +0800 Subject: [PATCH] 变更:同个容器多次组托 --- src/main/java/com/zy/common/service/erp/task/ErpScheduler.java | 3 +-- src/main/java/com/zy/asrs/controller/AgvMobileController.java | 2 +- src/main/java/com/zy/asrs/service/impl/AgvMobileServiceImpl.java | 8 ++++---- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/zy/asrs/controller/AgvMobileController.java b/src/main/java/com/zy/asrs/controller/AgvMobileController.java index 23dd1e1..48c754f 100644 --- a/src/main/java/com/zy/asrs/controller/AgvMobileController.java +++ b/src/main/java/com/zy/asrs/controller/AgvMobileController.java @@ -54,7 +54,7 @@ public R combBinding(@RequestBody Map<String,Object> map){ String barcode = map.get("barcode").toString(); String stationCode = map.get("stationCode").toString(); - Short containerType = Short.valueOf(map.get("containerType").toString()); + Short containerType = Short.valueOf(barcode.substring(0,2)); agvMobileService.combBinding(barcode,stationCode,containerType); return R.ok("鎵樼洏缁戝畾绔欑偣鎴愬姛"); } diff --git a/src/main/java/com/zy/asrs/service/impl/AgvMobileServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/AgvMobileServiceImpl.java index be025c6..ae17e90 100644 --- a/src/main/java/com/zy/asrs/service/impl/AgvMobileServiceImpl.java +++ b/src/main/java/com/zy/asrs/service/impl/AgvMobileServiceImpl.java @@ -57,10 +57,10 @@ } param.setContainerType(Short.valueOf(param.getBarcode().substring(0,2))); - //妫�鏌ユ槸鍚﹀凡瀛樺湪鐩稿悓鐨勬墭鐩樻潯鐮侊紝瀛樺湪鍒欐姏鍑哄紓甯� - if (agvWaitPakinService.selectCount(new EntityWrapper<AgvWaitPakin>().eq("supp_code", param.getBarcode())) > 0) { - throw new CoolException(param.getBarcode() + "鏂欐兂鐮佸凡瀛樺湪AGV鍏ュ簱閫氱煡妗d腑"); - } +// //妫�鏌ユ槸鍚﹀凡瀛樺湪鐩稿悓鐨勬墭鐩樻潯鐮侊紝瀛樺湪鍒欐姏鍑哄紓甯� +// if (agvWaitPakinService.selectCount(new EntityWrapper<AgvWaitPakin>().eq("supp_code", param.getBarcode())) > 0) { +// throw new CoolException(param.getBarcode() + "鏂欐兂鐮佸凡瀛樺湪AGV鍏ュ簱閫氱煡妗d腑"); +// } //妫�鏌ュ簱瀛樻槸鍚︽湁鐩稿悓鏂欑锛屽瓨鍦ㄥ垯鎶涘嚭寮傚父 if(!Cools.isEmpty(agvLocDetlService.selectOne(new EntityWrapper<AgvLocDetl>().eq("supp_code",param.getBarcode())))){ diff --git a/src/main/java/com/zy/common/service/erp/task/ErpScheduler.java b/src/main/java/com/zy/common/service/erp/task/ErpScheduler.java index 9819fde..9296f87 100644 --- a/src/main/java/com/zy/common/service/erp/task/ErpScheduler.java +++ b/src/main/java/com/zy/common/service/erp/task/ErpScheduler.java @@ -11,7 +11,6 @@ import com.zy.common.service.erp.entity.WlzhVStRd; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; import java.util.ArrayList; @@ -37,7 +36,7 @@ private InventoryVarianceService inventoryVarianceService; - @Scheduled(cron = "0 0 2 * * ? ") + //@Scheduled(cron = "0 0 2 * * ? ") public void syncLocDetl(){ log.info("搴撳瓨宸紓淇℃伅娓呴櫎"); inventoryVarianceService.deleteAll(); -- Gitblit v1.9.1