From e192789a33964b1c3a213d55602dbe787eecdc84 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期二, 16 七月 2024 08:08:45 +0800
Subject: [PATCH] 深浅库位冲突方法修改
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 4 +++-
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 20 ++++++++++----------
2 files changed, 13 insertions(+), 11 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 8a682c6..d9054a9 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -609,7 +609,7 @@
// 鑾峰彇娴呭簱浣嶏紝鐘舵�佷负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")) {
+ if (locMast.getLocSts().equals("Z")) {
List<TaskWrk> wrkMastList = taskWrkMapper.selectList(new EntityWrapper<TaskWrk>().eq("start_point", locMast.getLocNo()));
if (!wrkMastList.isEmpty()) {
TaskWrk wrkMast = wrkMastList.get(0);
@@ -617,6 +617,8 @@
taskWrkMapper.updateById(wrkMast);
log.warn("{}瀵瑰簲娴呭簱浣嶆湁璐э紝鎻愬崌{}搴撲綅浼樺厛绾�",taskWrk.getStartPoint(),wrkMast.getStartPoint());
continue;
+ } else {
+ log.error("{}瀵瑰簲娴呭簱浣嶆湁璐э紝浣嗘病鏈夌Щ搴撲换鍔�",taskWrk.getStartPoint());
}
}
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 4a231f0..81bdf3d 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