From e90544b3ab05170775b132e5c567bb33eb436ab4 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期一, 15 七月 2024 08:55:57 +0800
Subject: [PATCH] 深浅库位冲突
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 56 ++++++++++++++++++++++++++------------------------------
1 files changed, 26 insertions(+), 30 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..8a682c6 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"));
@@ -616,11 +610,12 @@
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()));
+ List<TaskWrk> wrkMastList = taskWrkMapper.selectList(new EntityWrapper<TaskWrk>().eq("start_point", locMast.getLocNo()));
if (!wrkMastList.isEmpty()) {
TaskWrk wrkMast = wrkMastList.get(0);
wrkMast.setIoPri(99);
taskWrkMapper.updateById(wrkMast);
+ log.warn("{}瀵瑰簲娴呭簱浣嶆湁璐э紝鎻愬崌{}搴撲綅浼樺厛绾�",taskWrk.getStartPoint(),wrkMast.getStartPoint());
continue;
}
}
@@ -838,11 +833,12 @@
if (crnProtocol.getTaskFinish() == 0 && crnProtocol.statusType == CrnStatusType.HANDLING_COMPLETED && crnProtocol.getTaskNo() != 0) {
//鑾峰彇鍏ュ簱寰呯‘璁ゅ伐浣滄。
TaskWrk taskWrk = taskWrkMapper.selectCrnNoInWorking(crn.getId(),crnProtocol.getTaskNo().intValue());
+
if (Cools.isEmpty(taskWrk)) {
// log.error("鍫嗗灈鏈哄浜庣瓑寰呯‘璁や笖浠诲姟瀹屾垚鐘舵�侊紝浣嗘湭鎵惧埌宸ヤ綔妗ｃ�傚爢鍨涙満鍙�={}锛屽伐浣滃彿={}", crn.getId(), crnProtocol.getTaskNo());
continue;
}
-
+ log.info("鏀跺埌鐢宠瀹屾垚璇锋眰锛�" + taskWrk);
//鑾峰彇鎸囦护ID
// Integer commandId = crnProtocol.getCommandId();
// CommandInfo commandInfo = new CommandInfo();
@@ -1059,8 +1055,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());
}
}
}
--
Gitblit v1.9.1