From d60d755c814e97d5c77daefad89265ee15d087c2 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期五, 05 七月 2024 17:01:55 +0800
Subject: [PATCH] 1.深库位出库让浅库位先出
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 41 +++++++++++++++++++++++++++++++++--------
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 11 ++++++++++-
2 files changed, 43 insertions(+), 9 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..3a0a9f4 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,18 @@
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 +31,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 +87,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;
@@ -170,6 +173,10 @@
}
continue;
}
+// // 鍏ュ簱绔欑偣瀵瑰簲鍫嗗灈鏈猴紝鍒ゆ柇鍫嗗灈鏈虹姸鎬侊紝涓嶆槸鑷姩,鍏堝脊绐�,鐒跺悗continue
+// if (getCrnByStaNo(inSta.getStaNo())) {
+// continue;
+// }
// 鍒ゆ柇鏄惁婊¤冻鍏ュ簱鏉′欢
if (staProtocol.isAutoing() && staProtocol.isLoading()
&& staProtocol.isInEnable()
@@ -291,6 +298,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 +602,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());
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 ada6fe8..4386b97 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -26,7 +26,6 @@
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
-import javax.servlet.http.HttpServletRequest;
import java.io.IOException;
import java.util.*;
@@ -94,11 +93,13 @@
taskWrk.setIoPri(param.getTaskPriority());//浼樺厛绾�
taskWrk.setBarcode(param.getBarcode());//鏉＄爜
taskWrk.setCrnNo(param.getCrn());
+ String stats = "";
if(param.getIoType() == 1){
taskWrk.setWrkSts(1);
if (!Cools.isEmpty(param.getTargetPoint())) {
taskWrk.setTargetPoint(Utils.getWcsLocNo(param.getTargetPoint()));//缁堢偣
taskWrk.setOriginTargetPoint(param.getTargetPoint());
+ stats = "S";
}
} else if (param.getIoType() == 2) {
@@ -106,6 +107,7 @@
if (!Cools.isEmpty(param.getStartPoint())) {
taskWrk.setStartPoint(Utils.getWcsLocNo(param.getStartPoint()));//璧风偣
taskWrk.setOriginStartPoint(param.getStartPoint());
+ stats = "R";
}
taskWrk.setTargetPoint(param.getTargetPoint());
}else if (param.getIoType() == 3){
@@ -113,6 +115,7 @@
if (!Cools.isEmpty(param.getStartPoint())) {
taskWrk.setStartPoint(Utils.getWcsLocNo(param.getStartPoint()));//璧风偣
taskWrk.setOriginStartPoint(param.getStartPoint());
+ stats = "R";
}
}
@@ -122,6 +125,12 @@
taskWrk.setMemo(param.getMemo());//澶囨敞
}
+ // 鏇存柊搴撲綅鐘舵��
+ String wcsLocNo = Utils.getWcsLocNo(param.getStartPoint());
+ LocMast locMast = locMastService.selectByLocNo(wcsLocNo);
+ locMast.setLocSts(stats);
+ locMastService.updateById(locMast);
+
if (!taskWrkService.insert(taskWrk)) {
return R.error("鍒涘缓浠诲姟澶辫触");
}
--
Gitblit v1.9.1