From 701542ac0a90cf0e3a0a81ec2bb8066b5de68e75 Mon Sep 17 00:00:00 2001
From: zyh <zyh@123>
Date: 星期六, 28 三月 2026 11:21:17 +0800
Subject: [PATCH] 更新为正式部署许可证
---
src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java | 116 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 114 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
index 6ce6963..554edd9 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
@@ -3,11 +3,13 @@
import com.alibaba.excel.util.StringUtils;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.mapper.Wrapper;
import com.core.common.Cools;
import com.core.exception.CoolException;
import com.zy.asrs.entity.*;
import com.zy.asrs.entity.mes.MesReturn;
import com.zy.asrs.enums.LocStsType;
+import com.zy.asrs.mapper.CanFinMapper;
import com.zy.asrs.service.*;
import com.zy.asrs.service.impl.*;
import com.zy.asrs.task.AbstractHandler;
@@ -57,6 +59,11 @@
private TaskDetlService taskDetlService;
@Autowired
private BasStationServiceImpl basStationService;
+ @Autowired
+ private CanFinMapper canFinMapper;
+ @Autowired
+ private OrderPakoutService orderPakoutService;
+
@Value("${mes.url}")
private String url;
@@ -455,11 +462,51 @@
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
return FAIL.setMsg("鏇存柊鍏ュ簱瀹屾垚鐘舵�佸け璐�; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getLocNo() + "]");
}
+
+ // 灏唚aitPakin琛ㄤ腑鐨勬暟鎹爣璁颁负宸插鐞�
+ if (wrkMast.getIoType() == 1) { // 鍏ㄦ澘鍏ュ簱
+ Wrapper<WaitPakin> wrapper = new EntityWrapper<WaitPakin>().eq("zpallet", wrkMast.getBarcode());
+ WaitPakin setParam = new WaitPakin();
+ setParam.setStatus("N");
+ setParam.setModiTime(new Date());
+ waitPakinService.update(setParam, wrapper);
+ log.info("鏇存柊搴撳瓨鎴愬姛锛佹墭鐩樼爜锛歿}", wrkMast.getBarcode());
+ }
+
+
+
} catch (Exception e) {
log.error("fail", e);
e.printStackTrace();
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
return FAIL.setMsg(e.getMessage());
+ }
+
+ try{
+ CanFin canFin = new CanFin();
+ List<CanFin> canFinList = canFinMapper.selectList(
+ new EntityWrapper<CanFin>()
+ .orderBy("apply_time", true)
+ );
+ if (canFinList != null){
+ CanFin firstCanFin = canFinList.get(0);
+ if (firstCanFin.getAgvType().equals("agv-in")){
+// if (firstCanFin.getAgvType().equals("agv-in-out")){
+ canFinMapper.deleteById(firstCanFin.getId());
+
+ if (canFinList.size() > 1){
+ CanFin firstCanFin1 = canFinList.get(1);
+ firstCanFin1.setTaskStatus("canout");
+ log.info("can_fin琛ㄥ凡鏇存柊锛屽叆搴撳崟鐘舵�亄}", firstCanFin1.getOutType());
+ canFinMapper.updateById(firstCanFin1);
+ }
+ }
+// else if(firstCanFin.getAgvType().equals("agv-in")){
+// canFinMapper.deleteById(firstCanFin.getId());
+// }
+ }
+ } catch (Exception e) {
+ log.error("鏈鍏ュ簱娌℃湁浠诲姟鍗�");
}
return SUCCESS;
@@ -598,6 +645,69 @@
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
return FAIL.setMsg(e.getMessage());
}
+
+
+ try{
+ List<CanFin> firstCanFinList = canFinMapper.selectList(
+ new EntityWrapper<CanFin>()
+ .orderBy("apply_time", true)
+ );
+ CanFin firstCanfin = firstCanFinList.get(0);
+ if (firstCanfin.getOutNo() != null && firstCanfin.getAgvType().equals("agv-out")){
+ log.info("can_fin琛ㄥ凡鏇存柊锛屽嚭搴撳崟{}宸插垹闄�",firstCanfin.getOutNo());
+ canFinMapper.deleteById(firstCanfin.getId());
+ }
+ if (firstCanfin.getOutNo() == null && firstCanfin.getAgvType().equals("agv-out")){
+ log.info("can_fin琛ㄥ凡鏇存柊锛屽嚭搴撲换鍔″凡鍒犻櫎锛屽綋鍓嶅嚭搴撴棤浠诲姟鍗�");
+ canFinMapper.deleteById(firstCanfin.getId());
+ }
+ if (firstCanFinList.size() > 1){
+ CanFin secondCanFin = firstCanFinList.get(1);
+ secondCanFin.setTaskStatus("canout");
+ canFinMapper.updateById(secondCanFin);
+ }
+// else {
+// OrderPakout isOut = orderPakoutService.selectOne(
+// new EntityWrapper<OrderPakout>()
+// .eq("settle", 2L)
+// .eq("doc_type", 12L));
+// String outOrderNo = isOut.getOrderNo();
+// List<CanFin> canFinList = canFinMapper.selectList(
+// new EntityWrapper<CanFin>()
+// .eq("agv_type", "agv-in-out")
+// .orderBy("apply_time", true)
+// );
+// if (canFinList != null){
+// CanFin firstCanFin = canFinList.get(0);
+//
+// OrderPakout isOut = orderPakoutService.selectOne(
+// new EntityWrapper<OrderPakout>()
+// .eq("orderNo", firstCanFin.getOutNo()));
+//
+// String outOrderNo = isOut.getOrderNo();
+// if (outOrderNo.equals(firstCanFin.getOutNo())){
+// log.info("can_fin琛ㄥ凡鏇存柊锛岃浆搴忓嚭搴撳崟{}宸插垹闄�", firstCanFin.getOutNo());
+// canFinMapper.deleteById(firstCanFin.getId());
+// }else {
+// log.info("鏈壘鍒拌鍑哄簱鍗曪紝can_fin琛ㄦ湭鏇存柊");
+// }
+// List<CanFin> canFinList1 = canFinMapper.selectList(
+// new EntityWrapper<CanFin>()
+// .eq("agv_type", "agv-in-out")
+// .orderBy("apply_time", true));
+// if (!canFinList1.isEmpty()){
+// CanFin firstCanFin2 = canFinList.get(0);
+// firstCanFin2.setTaskType("Y");
+// log.info("can_fin琛ㄥ凡鏇存柊锛岃浆搴忓嚭搴撳崟鍙互杞簭", firstCanFin2.getOutNo());
+// canFinMapper.updateById(firstCanFin2);
+// }
+// }
+// }
+ } catch (Exception e) {
+ log.error("鏈鍑哄簱娌℃湁浠诲姟鍗�");
+ return null;
+ }
+
return SUCCESS;
}
@@ -613,13 +723,14 @@
WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", task.getWrkNo()));
if (wrkMast != null) {
if (wrkMast.getIoType()==110&& wrkMast.getWrkSts()>12){
- wrkMast.setWrkSts(32L);//32.绛夊緟缁勬墭
- }else if (wrkMast.getIoType()==101){
+ wrkMast.setWrkSts(15L);//32.绛夊緟缁勬墭
+ }else if (wrkMast.getIoType()==101 && wrkMast.getWrkSts()>12){
wrkMast.setWrkSts(15L);//15.鍑哄簱鏇存柊瀹屾垚
}else if (wrkMast.getIoType()==103 && wrkMast.getWrkSts()>12){
wrkMast.setWrkSts(20L);//20.绛夊緟鍥炲簱
}
wrkMast.setModiTime(new Date());
+ wrkMast.setOveMk("Y");
wrkMastService.updateById(wrkMast);
task.setWrkSts(305L);//浠诲姟鐘舵�佷粠304--銆�305
task.setModiTime(new Date());
@@ -629,6 +740,7 @@
}else if(task.getTaskType().equals("ZX-AGV")){
HashMap<String,Object> map = new HashMap<>();
map.put("taskno", task.getTaskNo());
+ map.put("agvFactory", "2");
String mesUrl = url+"AGVArrivalCompletedFit";
String response = RcsServiceImpl.sendPost(mesUrl, JSONObject.toJSONString(map));
if (!StringUtils.isEmpty(response) && response.contains("Success")){
--
Gitblit v1.9.1