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 | 51 ++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 40 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 0ae1e4f..ba900d7 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -4,21 +4,17 @@
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;
-import com.core.common.R;
import com.core.common.SpringUtils;
-import com.core.exception.CoolException;
-import com.fasterxml.jackson.databind.ObjectMapper;
import com.zy.asrs.domain.enums.TaskStatusType;
import com.zy.asrs.entity.*;
import com.zy.asrs.entity.param.TaskOverToWms;
-import com.zy.asrs.entity.param.WMSAndAGVInterfaceParam;
-import com.zy.asrs.entity.param.taskCreateParam;
-import com.zy.asrs.mapper.*;
+import com.zy.asrs.mapper.BasCrnErrorMapper;
+import com.zy.asrs.mapper.StaDescMapper;
+import com.zy.asrs.mapper.TaskWrkMapper;
+import com.zy.asrs.mapper.WrkMastMapper;
import com.zy.asrs.service.*;
import com.zy.asrs.utils.CommandUtils;
-import com.zy.asrs.utils.PostMesDataUtils;
import com.zy.asrs.utils.Utils;
-import com.zy.common.service.CommonService;
import com.zy.common.utils.HttpHandler;
import com.zy.core.CrnThread;
import com.zy.core.DevpThread;
@@ -34,7 +30,6 @@
import com.zy.core.model.protocol.StaProtocol;
import com.zy.core.properties.SlaveProperties;
import com.zy.core.thread.BarcodeThread;
-import com.zy.core.thread.LedThread;
import com.zy.core.thread.SiemensDevpThread;
import com.zy.system.entity.Config;
import com.zy.system.service.ConfigService;
@@ -91,6 +86,13 @@
@Autowired
private ApiLogService apiLogService;
+//
+// // 鍏ュ簱绔欑偣鍙峰搴旂殑鍫嗗灈鏈�
+// private static final Map<Integer,Integer> staNoToCrnMap = new HashMap<Integer,Integer>(){{
+// put(103,1); put(205,1); put(107,2); put(211,2);
+// put(111,3); put(217,3); put(115,4); put(223,4);
+// put(119,5); put(229,5); put(123,6); put(235,6);
+// }};
@Value("${wms.url}")
private String wmsUrl;
@@ -277,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"));
@@ -291,6 +302,12 @@
}
}
}
+//
+// private boolean getCrnByStaNo(Integer staNo) {
+// int crn = staNoToCrnMap.get(staNo);
+// BasCrnp crnp = basCrnpService.selectOne(new EntityWrapper<BasCrnp>().eq("crn_no", crn));
+// return crnp.getCrnSts() == 0;
+// }
/**
@@ -589,6 +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;
+// }
+// }
taskWrkMapper.selectPakOutIoType(taskWrk.getCrnNo());
@@ -1024,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());
}
}
}
--
Gitblit v1.9.1