From 09f658d805f714fc2b90794e4b772aa802ca55a3 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期三, 10 七月 2024 08:27:59 +0800
Subject: [PATCH] 更新库位状态修改
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 254 +++++++++++++++++++++++++++++++++++++-------------
1 files changed, 186 insertions(+), 68 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 bdc694d..16c25ad 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,18 +173,36 @@
}
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);
@@ -189,16 +210,22 @@
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;
- }
- List<Integer> list = new ArrayList<>();
- list.add(taskWrk.getCrnNo());
+
//StaDesc staDesc1 = staDescService.selectOne(new EntityWrapper<StaDesc>().eq("stn_no",inSta.getBackSta()));
- if (taskWrk.getTargetPoint() != null && taskWrk.getStartPoint() != null){
+ boolean sign = true;
+ if (inSta.getBarcode() == 7 || inSta.getBarcode() == 8){
+
+ }else {
+ if (taskWrk.getCrnNo() != inSta.getBarcode()){
+ sign = false;
+ }
+ }
+ if (taskWrk.getTargetPoint() != null && taskWrk.getStartPoint() != null && sign){
if ( taskWrk.getWrkNo() != null && taskWrk.getWrkNo().shortValue() == workNo ){
+ continue;
+ }
+ if (taskWrk.getStatus() != 2){
continue;
}
//鑾峰彇鍫嗗灈鏈虹珯鐐�
@@ -219,7 +246,18 @@
toWmsDTO.setWarehouseId("1688469798893297665");
toWmsDTO.setContainerCode(barcode);
toWmsDTO.setApplyType("TUNNEL_LOCATION");
- toWmsDTO.setTaskTunnel(taskWrk.getCrnNo());
+ List<Integer> list = new ArrayList<>();
+
+ if (inSta.getBarcode() == 7 || inSta.getBarcode() == 8){
+ toWmsDTO.setTaskTunnel(taskWrk.getCrnNo());
+ list.add(taskWrk.getCrnNo());
+ }else {
+ toWmsDTO.setTaskTunnel(inSta.getBarcode());
+ list.add(inSta.getBarcode());
+ }
+
+
+
toWmsDTO.setCanInboundTunnels(list);
String response = null;
try {
@@ -248,6 +286,11 @@
taskWrk.setOriginTargetPoint(getWmsDto.getTargetLocationCode());
taskWrk.setTargetPoint(Utils.getWcsLocNo(getWmsDto.getTargetLocationCode()));
taskWrk.setStartPoint(String.valueOf(inSta.getBackSta()));
+ if (inSta.getBarcode() == 7 || inSta.getBarcode() == 8){
+
+ }else {
+ taskWrk.setCrnNo(inSta.getBarcode());
+ }
if (!taskWrkService.updateById(taskWrk)){
log.error("淇濆瓨wms搴撲綅鍙峰け璐�");
}
@@ -265,6 +308,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;
+// }
/**
@@ -323,9 +372,20 @@
log.error("杈撻�佺嚎鍛戒护涓嬫柟澶辫触锛侊紒锛� [宸ヤ綔鍙�:{}]", taskWrk.getWrkNo());
continue;//鍛戒护涓嬪彂澶辫触
}
-
// 澶嶄綅鍫嗗灈鏈�
crnThread.setResetFlag(true);
+
+ if (taskWrk.getIoType() == 1 || taskWrk.getIoType() == 3){
+ taskWrk.setWrkSts(4);
+ } else if (taskWrk.getIoType() == 2) {
+ taskWrk.setWrkSts(14);
+ }
+ Date now = new Date();
+ taskWrk.setCompleteTime(now);
+ if (!taskWrkService.updateById(taskWrk)){
+ log.error(taskWrk.getTaskNo()+ " 鍫嗗灈鏈轰换鍔″畬鎴愶紝鏀瑰彉浠诲姟鐘舵�佸け璐�");
+ }
+
}
}
@@ -425,6 +485,22 @@
if (taskWrkMapper.selectCrnWorking(slave.getId()) != null) {
continue;
}
+ // 淇敼宸ヤ綔妗ｇ姸鎬� 2.璁惧涓婅蛋 => 3.鍚婅溅鍏ュ簱涓�
+ log.error("杩涘叆淇敼宸ヤ綔妗ｆ祦绋�");
+ Date now = new Date();
+ taskWrk.setWrkSts(3);
+ taskWrk.setExecuteTime(now);
+ taskWrk.setModiTime(now);
+ if (taskWrkMapper.updateById(taskWrk) == 0) {
+ log.error("淇敼宸ヤ綔妗ｇ姸鎬� 2.璁惧涓婅蛋 => 3.鍚婅溅鍏ュ簱涓� 澶辫触锛侊紒锛屽伐浣滃彿={}", taskWrk.getWrkNo());
+ }
+ TaskWrk taskWrk2 = taskWrkService.selectByWrkNo(taskWrk.getWrkNo());
+
+ if (taskWrk2.getWrkSts() != 3){
+ continue;
+ }
+ log.error("杩涘叆淇敼宸ヤ綔妗ｆ祦绋嬪畬鎴�,taskWrk=", taskWrk.getWrkNo());
+
//鍙栧嚭鍛戒护
List<CommandInfo> commandInfos = commandInfoService.selectByTaskNo(taskWrk.getTaskNo());
@@ -439,13 +515,6 @@
if (!MessageQueue.offer(SlaveType.Crn, taskWrk.getCrnNo(), new Task(2, crnCommand))) {
log.error("鍫嗗灈鏈哄懡浠や笅鍙戝け璐ワ紝鍫嗗灈鏈哄彿={}锛屼换鍔℃暟鎹�={}", taskWrk.getCrnNo(), JSON.toJSON(crnCommand));
} else {
- // 淇敼宸ヤ綔妗ｇ姸鎬� 2.璁惧涓婅蛋 => 3.鍚婅溅鍏ュ簱涓�
- Date now = new Date();
- taskWrk.setWrkSts(3);
- taskWrk.setModiTime(now);
- if (taskWrkMapper.updateById(taskWrk) == 0) {
- log.error("淇敼宸ヤ綔妗ｇ姸鎬� 2.璁惧涓婅蛋 => 3.鍚婅溅鍏ュ簱涓� 澶辫触锛侊紒锛屽伐浣滃彿={}", taskWrk.getWrkNo());
- }
//寮�濮嬭繍琛�
String response = CrnStartRunning(taskWrk);
JSONObject jsonObject = JSON.parseObject(response);
@@ -543,6 +612,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());
@@ -599,6 +680,7 @@
// 淇敼宸ヤ綔妗ｇ姸鎬� 11.鐢熸垚鍑哄簱ID => 12.鍚婅溅鍑哄簱涓�
Date now = new Date();
taskWrk.setWrkSts(12);
+ taskWrk.setExecuteTime(now);
taskWrk.setModiTime(now);
if (taskWrkMapper.updateById(taskWrk) == 0) {
log.error("淇敼宸ヤ綔妗ｇ姸鎬� 11.鐢熸垚鍑哄簱ID => 12.鍚婅溅鍑哄簱涓� 澶辫触锛侊紒锛屽伐浣滃彿={}", taskWrk.getWrkNo());
@@ -762,30 +844,40 @@
}
//鑾峰彇鎸囦护ID
- Integer commandId = crnProtocol.getCommandId();
- CommandInfo commandInfo = new CommandInfo();
- if (Cools.isEmpty(commandId)){
- commandInfo = commandInfoService.selectOne(new EntityWrapper<CommandInfo>()
- .eq("wrk_no",crnProtocol.getTaskNo())
- .eq("device","Crn"));
- }else {
- commandInfo = commandInfoService.selectById(commandId);
- }
+// Integer commandId = crnProtocol.getCommandId();
+// CommandInfo commandInfo = new CommandInfo();
+// if (Cools.isEmpty(commandId)){
+// commandInfo = commandInfoService.selectOne(new EntityWrapper<CommandInfo>()
+// .eq("wrk_no",crnProtocol.getTaskNo())
+// .eq("device","Crn"));
+// }else {
+// commandInfo = commandInfoService.selectById(commandId);
+// }
- if (commandInfo == null) {
- //鎸囦护涓嶅瓨鍦�
- continue;
- }
- if (commandInfo.getCommandStatus() == 3){
- continue;
- }
- commandInfo.setCommandStatus(CommandStatusType.COMPLETE.id);//鎸囦护瀹屾垚
- commandInfo.setCompleteTime(new Date());//鎸囦护瀹屾垚鏃堕棿
- if (commandInfoService.updateById(commandInfo)) {//淇敼鎴愬姛鍚庡浣嶅爢鍨涙満
+// if (commandInfo == null) {
+// //鎸囦护涓嶅瓨鍦�
+// continue;
+// }
+// if (commandInfo.getCommandStatus() == 3){
+// continue;
+// }
+// commandInfo.setCommandStatus(CommandStatusType.COMPLETE.id);//鎸囦护瀹屾垚
+// commandInfo.setCompleteTime(new Date());//鎸囦护瀹屾垚鏃堕棿
+// if (commandInfoService.updateById(commandInfo)) {//淇敼鎴愬姛鍚庡浣嶅爢鍨涙満
// 鍫嗗灈鏈哄浣�
crnThread.setResetFlag(true);
- }
+ if (taskWrk.getIoType() == 1 || taskWrk.getIoType() == 3){
+ taskWrk.setWrkSts(4);
+ } else if (taskWrk.getIoType() == 2) {
+ taskWrk.setWrkSts(14);
+ }
+ Date now = new Date();
+ taskWrk.setCompleteTime(now);
+ if (!taskWrkService.updateById(taskWrk)){
+ log.error(taskWrk.getTaskNo()+ " 鍫嗗灈鏈轰换鍔″畬鎴愶紝鏀瑰彉浠诲姟鐘舵�佸け璐�");
+ }
+// }
}
}
}
@@ -968,7 +1060,7 @@
try {
taskWrkService.distribute(taskWrk.getTaskNo(), 9527L);
} catch (CoolException e) {
- log.info(e.getMessage());
+// log.info(e.getMessage());
}
}
}
@@ -977,24 +1069,27 @@
public synchronized void autoCompleteTask() {
List<TaskWrk> taskWrks = taskWrkMapper.selectWorkingTask();
for (TaskWrk taskWrk : taskWrks) {
- //鑾峰彇鍛戒护闆嗗悎
- List<CommandInfo> commandInfos = commandInfoService.selectByTaskNo(taskWrk.getTaskNo());
- if (taskWrk.getCommandStep() < commandInfos.size()) {
- continue;//褰撳墠姝ュ簭娌℃湁鍒拌揪鏈�鍚庝竴鏉″懡浠�
- }
+// //鑾峰彇鍛戒护闆嗗悎
+// List<CommandInfo> commandInfos = commandInfoService.selectByTaskNo(taskWrk.getTaskNo());
+// if (taskWrk.getCommandStep() < commandInfos.size()) {
+// continue;//褰撳墠姝ュ簭娌℃湁鍒拌揪鏈�鍚庝竴鏉″懡浠�
+// }
+//
+// //鍒ゆ柇鏈鍛戒护鏄惁鎵ц瀹屾垚
+// if (!commandInfos.isEmpty()){
+// CommandInfo commandInfo = commandInfos.get(commandInfos.size() - 1);
+// if (commandInfo.getCommandStatus() != CommandStatusType.COMPLETE.id) {
+// continue;//鎸囦护鏈畬鎴�
+// }
+// }
- //鍒ゆ柇鏈鍛戒护鏄惁鎵ц瀹屾垚
- CommandInfo commandInfo = commandInfos.get(commandInfos.size() - 1);
- if (commandInfo.getCommandStatus() != CommandStatusType.COMPLETE.id) {
- continue;//鎸囦护鏈畬鎴�
- }
Date now = new Date();
//鎸囦护宸插畬鎴愶紝鏇存柊浠诲姟
- if (taskWrk.getIoType() == 1) {
+ if (taskWrk.getIoType() == 1 && taskWrk.getWrkSts() == 5) {
//鍏ュ簱浠诲姟
- taskWrk.setWrkSts(4);//3.鍚婅溅鍏ュ簱涓� => 4.鍏ュ簱瀹屾垚
- //taskWrk.setStatus(TaskStatusType.COMPLETE.id);
+// taskWrk.setWrkSts(4);//3.鍚婅溅鍏ュ簱涓� => 4.鍏ュ簱瀹屾垚
+ taskWrk.setStatus(TaskStatusType.OVER.id);
taskWrk.setModiTime(now);
taskWrkService.updateById(taskWrk);
@@ -1005,10 +1100,10 @@
locMast.setModiTime(now);
locMast.setModiUser(9999L);
locMastService.updateById(locMast);
- } else if (taskWrk.getIoType() == 2) {
+ } else if (taskWrk.getIoType() == 2 && taskWrk.getWrkSts() == 15) {
//鍑哄簱浠诲姟
- taskWrk.setWrkSts(14);//12.鍚婅溅鍑哄簱涓� => 14.鍑哄簱瀹屾垚
-// taskWrk.setStatus(TaskStatusType.COMPLETE.id);
+// taskWrk.setWrkSts(14);//12.鍚婅溅鍑哄簱涓� => 14.鍑哄簱瀹屾垚
+ taskWrk.setStatus(TaskStatusType.OVER.id);
taskWrk.setModiTime(now);
taskWrkService.updateById(taskWrk);
@@ -1019,6 +1114,29 @@
locMast.setModiTime(now);
locMast.setModiUser(9999L);
locMastService.updateById(locMast);
+ } else if (taskWrk.getIoType() == 3 && taskWrk.getWrkSts() == 5) {
+
+ //鏇存柊璧峰搴撲綅鐘舵��
+ LocMast locMastStart = locMastService.selectByLocNo(taskWrk.getStartPoint());
+ locMastStart.setLocSts("K");//O.绌哄簱浣�
+ locMastStart.setBarcode("");//鎵樼洏鐮�
+ locMastStart.setModiTime(now);
+ locMastStart.setModiUser(9999L);
+ locMastService.updateById(locMastStart);
+
+ //鏇存柊鐩爣搴撲綅鐘舵��
+ LocMast locMast = locMastService.selectByLocNo(taskWrk.getTargetPoint());
+ locMast.setLocSts("Z");//F.鍦ㄥ簱
+ locMast.setBarcode(taskWrk.getBarcode());//鎵樼洏鐮�
+ locMast.setModiTime(now);
+ locMast.setModiUser(9999L);
+ locMastService.updateById(locMast);
+
+ taskWrk.setStatus(TaskStatusType.OVER.id);
+ taskWrk.setModiTime(now);
+ taskWrkService.updateById(taskWrk);
+
+
}
}
}
--
Gitblit v1.9.1