From 685f52f102a2fe6d519041400b6f2e7face9cd6d Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期四, 11 七月 2024 17:55:32 +0800
Subject: [PATCH] 打开深库位出库浅库位有货问题
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 24 ++++++++++++------------
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 20 ++++++++++----------
2 files changed, 22 insertions(+), 22 deletions(-)
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 ba900d7..c7ae3cc 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -606,18 +606,18 @@
// 鍙屾繁搴撲綅涓旀祬搴撲綅鏈夎揣锛屽垯闇�鍏堝娴呭簱浣嶈繘琛屽簱浣嶇Щ杞�
if (Utils.isDeepLoc(slaveProperties, taskWrk.getStartPoint())) {
-// // 鑾峰彇娴呭簱浣嶏紝鐘舵�佷负S鐩存帴鍑猴紝鐘舵�佷负R锛屽垯鎵惧埌杩欎釜搴撲綅鐨勫伐浣滄。锛屾彁鍗囦紭鍏堢骇鍏堝嚭
-// String shallowLoc = Utils.getShallowLoc(slaveProperties, taskWrk.getStartPoint());
-// LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", shallowLoc));
-// if (locMast.getLocSts().equals("R")) {
-// List<TaskWrk> wrkMastList = taskWrkMapper.selectList(new EntityWrapper<TaskWrk>().eq("source_loc_no", locMast.getLocNo()));
-// if (!wrkMastList.isEmpty()) {
-// TaskWrk wrkMast = wrkMastList.get(0);
-// wrkMast.setIoPri(99);
-// taskWrkMapper.updateById(wrkMast);
-// continue;
-// }
-// }
+ // 鑾峰彇娴呭簱浣嶏紝鐘舵�佷负S鐩存帴鍑猴紝鐘舵�佷负R锛屽垯鎵惧埌杩欎釜搴撲綅鐨勫伐浣滄。锛屾彁鍗囦紭鍏堢骇鍏堝嚭
+ String shallowLoc = Utils.getShallowLoc(slaveProperties, taskWrk.getStartPoint());
+ LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", shallowLoc));
+ if (locMast.getLocSts().equals("R")) {
+ List<TaskWrk> wrkMastList = taskWrkMapper.selectList(new EntityWrapper<TaskWrk>().eq("source_loc_no", locMast.getLocNo()));
+ if (!wrkMastList.isEmpty()) {
+ TaskWrk wrkMast = wrkMastList.get(0);
+ wrkMast.setIoPri(99);
+ taskWrkMapper.updateById(wrkMast);
+ continue;
+ }
+ }
taskWrkMapper.selectPakOutIoType(taskWrk.getCrnNo());
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 81bdf3d..4a231f0 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -130,16 +130,16 @@
}
// 鏇存柊搴撲綅鐘舵��,鍏ュ簱杩樻病鍒嗛厤搴撲綅锛屾壂鐮佷箣鍚庢墠鍒嗛厤
-// if (param.getIoType() == 2 || param.getIoType() == 3) {
-// try {
-// LocMast locMast = locMastService.selectByLocNo(wcsLocNo);
-// locMast.setLocSts(stats);
-// log.info("-----鍏ュ簱鏇存柊搴撲綅鐘舵�佷负锛歊鎴愬姛----------"+ locMast.getLocNo());
-// locMastService.updateById(locMast);
-// } catch (Exception e){
-// log.error("-----鍑哄簱鏇存柊搴撲綅鐘舵�佷负锛歊寮傚父----------"+ e);
-// }
-// }
+ if (param.getIoType() == 2 || param.getIoType() == 3) {
+ try {
+ LocMast locMast = locMastService.selectByLocNo(wcsLocNo);
+ locMast.setLocSts(stats);
+ log.info("-----鍏ュ簱鏇存柊搴撲綅鐘舵�佷负锛歊鎴愬姛----------"+ locMast.getLocNo());
+ locMastService.updateById(locMast);
+ } catch (Exception e){
+ log.error("-----鍑哄簱鏇存柊搴撲綅鐘舵�佷负锛歊寮傚父----------"+ e);
+ }
+ }
if (!taskWrkService.insert(taskWrk)) {
return R.error("鍒涘缓浠诲姟澶辫触");
--
Gitblit v1.9.1