From 748d2d7f2c1b898517b9debc4feb4d80c34e53e7 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期四, 11 七月 2024 17:52:15 +0800
Subject: [PATCH] 屏蔽深库位出库浅库位有货问题
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 74 +++++++++++++++++--------------------
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 17 +++++---
2 files changed, 45 insertions(+), 46 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 16c25ad..ba900d7 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -5,7 +5,6 @@
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;
import com.core.common.SpringUtils;
-import com.core.exception.CoolException;
import com.zy.asrs.domain.enums.TaskStatusType;
import com.zy.asrs.entity.*;
import com.zy.asrs.entity.param.TaskOverToWms;
@@ -173,36 +172,18 @@
}
continue;
}
-// // 鍏ュ簱绔欑偣瀵瑰簲鍫嗗灈鏈猴紝鍒ゆ柇鍫嗗灈鏈虹姸鎬侊紝涓嶆槸鑷姩,鍏堝脊绐�,鐒跺悗continue
-// if (getCrnByStaNo(inSta.getStaNo())) {
-// continue;
-// }
- // 鑾峰彇鏉＄爜鎵弿浠俊鎭�
- BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, inSta.getBarcode());
- if (barcodeThread == null) {
- continue;
- }
- String barcode = barcodeThread.getBarcode();
- staProtocol.setBarcode(barcode);
-
- if(Cools.isEmpty(barcode) || barcode.equals("00000000")) {
- continue;
- }
-
- TaskWrk taskWrk = taskWrkService.selectOne(new EntityWrapper<TaskWrk>().eq("barcode", barcode));
-
- if (!Cools.isEmpty(taskWrk) && staProtocol.isLoading()){
- // 鍐欑粍鎷撲俊鍙�
- MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(4, staProtocol));
-// Thread.sleep(500);
-// continue;
- }
// 鍒ゆ柇鏄惁婊¤冻鍏ュ簱鏉′欢
if (staProtocol.isAutoing() && staProtocol.isLoading()
&& staProtocol.isInEnable()
&& !staProtocol.isEmptyMk() && (workNo >= 0)
&& staProtocol.isPakMk()) {
-
+ // 鑾峰彇鏉＄爜鎵弿浠俊鎭�
+ BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, inSta.getBarcode());
+ if (barcodeThread == null) {
+ continue;
+ }
+ String barcode = barcodeThread.getBarcode();
+ staProtocol.setBarcode(barcode);
if(!Cools.isEmpty(barcode)) {
StaDescService staDescService = SpringUtils.getBean(StaDescService.class);
@@ -210,7 +191,11 @@
Map<String, Object> map = new HashMap<>();
map.put("x-api-key","7a15b5db-29b6-552c-8cff-0cfec3756da2");
+ TaskWrk taskWrk = taskWrkService.selectOne(new EntityWrapper<TaskWrk>().eq("barcode", barcode));
+ if (Cools.isEmpty(taskWrk)){
+ continue;
+ }
//StaDesc staDesc1 = staDescService.selectOne(new EntityWrapper<StaDesc>().eq("stn_no",inSta.getBackSta()));
boolean sign = true;
@@ -294,6 +279,15 @@
if (!taskWrkService.updateById(taskWrk)){
log.error("淇濆瓨wms搴撲綅鍙峰け璐�");
}
+// try {
+// // 鏇存柊搴撲綅涓哄叆搴撻绾�
+// LocMast locMast = locMastService.selectByLocNo(taskWrk.getTargetPoint());
+// locMast.setLocSts("S");
+// locMastService.updateById(locMast);
+// log.info("-----鍏ュ簱鏇存柊搴撲綅鐘舵�佷负锛歋鎴愬姛----------"+ locMast.getLocNo());
+// } catch (Exception e){
+// log.error("-----鍏ュ簱鏇存柊搴撲綅鐘舵�佷负锛歋寮傚父----------"+ e);
+// }
}else {
log.error("wms閫氳澶辫触,"+jsonObject.get("msg"));
@@ -612,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());
@@ -1059,8 +1053,8 @@
for (TaskWrk taskWrk : taskWrkService.selectReceive()) {
try {
taskWrkService.distribute(taskWrk.getTaskNo(), 9527L);
- } catch (CoolException e) {
-// log.info(e.getMessage());
+ } catch (Exception e) {
+ log.error("鑷姩娲惧彂浠诲姟寮傚父锛�"+e.getMessage()+"{" + taskWrk.toString());
}
}
}
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 e836478..81bdf3d 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -101,9 +101,7 @@
taskWrk.setWrkSts(1);
if (!Cools.isEmpty(param.getTargetPoint())) {
taskWrk.setTargetPoint(Utils.getWcsLocNo(param.getTargetPoint()));//缁堢偣
- wcsLocNo = taskWrk.getTargetPoint();
taskWrk.setOriginTargetPoint(param.getTargetPoint());
- stats = "S";
}
} else if (param.getIoType() == 2) {
@@ -131,10 +129,17 @@
taskWrk.setMemo(param.getMemo());//澶囨敞
}
- // 鏇存柊搴撲綅鐘舵��
- LocMast locMast = locMastService.selectByLocNo(wcsLocNo);
- locMast.setLocSts(stats);
- locMastService.updateById(locMast);
+ // 鏇存柊搴撲綅鐘舵��,鍏ュ簱杩樻病鍒嗛厤搴撲綅锛屾壂鐮佷箣鍚庢墠鍒嗛厤
+// 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