From c696444b826009c82180f504fb0ed8d49a284565 Mon Sep 17 00:00:00 2001
From: skyouc <creaycat@gmail.com>
Date: 星期五, 12 十二月 2025 17:19:07 +0800
Subject: [PATCH] no message
---
src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java | 63 ++++++++++++++++++++-----------
1 files changed, 41 insertions(+), 22 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 2179a15..2417e9d 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
@@ -6,10 +6,7 @@
import com.zy.asrs.entity.*;
import com.zy.asrs.enums.LocStsType;
import com.zy.asrs.service.*;
-import com.zy.asrs.service.impl.BasStationServiceImpl;
-import com.zy.asrs.service.impl.LocCacheServiceImpl;
-import com.zy.asrs.service.impl.OrderPakinServiceImpl;
-import com.zy.asrs.service.impl.TaskDetlServiceImpl;
+import com.zy.asrs.service.impl.*;
import com.zy.asrs.task.AbstractHandler;
import com.zy.asrs.task.core.ReturnT;
import lombok.extern.slf4j.Slf4j;
@@ -61,6 +58,8 @@
private CheckOrderDetlService checkOrderDetlService;
@Autowired
private WaitPakinLogService waitPakinLogService;
+ @Autowired
+ private BasStationDetlService basStationDetlService;
public ReturnT<String> start(WrkMast wrkMast) {
// 4.鍏ュ簱瀹屾垚
@@ -142,6 +141,8 @@
} else {
locDetl = new LocDetl();
locDetl.sync(wrkDetl);
+ locDetl.setAreaId(locMast.getAreaId());
+ locMast.setAreaName(locMast.getAreaName());
locDetl.setLocNo(wrkMast.getLocNo()); // 搴撲綅鍙�
locDetl.setAnfme(wrkDetl.getAnfme()); // 鏁伴噺
locDetl.setZpallet(wrkDetl.getZpallet()); // 鎵樼洏鏉＄爜
@@ -711,6 +712,7 @@
* @description: AGV鍑哄簱浠诲姟
* @version 1.0
*/
+ @Transactional(rollbackFor = Exception.class)
public ReturnT<String> agvDoOut(Task task) {
if (task.getIoType().equals(101)) {
Date now = new Date();
@@ -726,6 +728,18 @@
return FAIL.setMsg(
"鍏ㄦ澘鍑哄簱 ===>> 宸ヤ綔鏄庣粏妗ｄ负绌�; [workNo=" + task.getWrkNo() + "],[locNo=" + task.getSourceLocNo() + "]");
}
+
+ BasStation devNo = basStationService
+ .selectOne(new EntityWrapper<BasStation>().eq("dev_no", task.getStaNo()));
+ if (Objects.isNull(devNo)) {
+ throw new CoolException("绔欑偣锛�" + task.getSourceStaNo() + ", 涓嶅瓨鍦紒锛�");
+ }
+ devNo.setLocSts(LocStsType.LOC_STS_TYPE_F.type);
+ devNo.setModiTime(new Date());
+ if (!basStationService.updateById(devNo)) {
+ throw new CoolException("绔欑偣淇℃伅淇敼澶辫触锛侊紒");
+ }
+
for (TaskDetl wrkDetl : wrkDetls101) {
// 鏇存柊璁㈠崟瀹屾垚鏁伴噺
OrderDetlPakout orderDetlPakout = orderDetlPakoutService.selectItem(wrkDetl.getOrderNo(),
@@ -751,6 +765,15 @@
}
}
} catch (Exception ignore) {
+
+ }
+
+ BasStationDetl stationDetl = new BasStationDetl();
+ BeanUtils.copyProperties(wrkDetl, stationDetl);
+ stationDetl.setDevNo(devNo.getDevNo())
+ .setOrderNo(wrkDetl.getOrderNo());
+ if (!basStationDetlService.insert(stationDetl)) {
+ throw new CoolException("绔欑偣鏄庣粏淇濆瓨澶辫触锛侊紒");
}
}
// 鍒犻櫎宸ヤ綔妗ｆ簮搴撲綅鐨勫簱瀛樻槑缁�
@@ -774,16 +797,8 @@
throw new CoolException("褰撳墠搴撲綅鐘舵��" + locMast.getLocSts() + ", 鏃犳硶鎵ц鍑哄簱鎿嶄綔锛侊紒");
}
- BasStation devNo = basStationService
- .selectOne(new EntityWrapper<BasStation>().eq("dev_no", task.getStaNo()));
- if (Objects.isNull(devNo)) {
- throw new CoolException("绔欑偣锛�" + task.getSourceStaNo() + ", 涓嶅瓨鍦紒锛�");
- }
- devNo.setLocSts(LocStsType.LOC_STS_TYPE_F.type);
- devNo.setModiTime(new Date());
- if (!basStationService.updateById(devNo)) {
- throw new CoolException("绔欑偣淇℃伅淇敼澶辫触锛侊紒");
- }
+
+
task.setWrkSts(15L);
if (!taskService.updateById(task)) {
throw new CoolException("浠诲姟鐘舵�佷慨鏀瑰け璐ワ紒锛�");
@@ -841,18 +856,21 @@
throw new CoolException(
"褰撳墠搴撲綅鐘舵�佷负锛�" + LocStsType.LOC_STS_TYPE_S.type + "." + LocStsType.LOC_STS_TYPE_S.desc + "锛屼笉鏄嚭搴撻绾︾姸鎬�");
}
- List<WaitPakin> apallet = waitPakinService
- .selectList(new EntityWrapper<WaitPakin>().eq("zpallet", wrkMast.getBarcode()));
- if (Objects.isNull(apallet)) {
+
+ List<TaskDetl> taskDetls = taskDetlService
+ .selectList(new EntityWrapper<TaskDetl>().eq("zpallet", wrkMast.getBarcode()));
+
+ if (Objects.isNull(taskDetls)) {
throw new CoolException("鏁版嵁閿欒锛氱粍鎵樻暟鎹笉瀛樺湪锛侊紒");
}
- apallet.forEach(pakin -> {
+ log.info(taskDetls.size() + "-------------------------------------------------------------------");
+ taskDetls.forEach(pakin -> {
LocDetl detl = new LocDetl();
BeanUtils.copyProperties(pakin, detl);
-
detl.setBarcode(pakin.getBarcode());
detl.setAnfme(pakin.getAnfme());
detl.setBrand(pakin.getBrand());
+ detl.setSuppCode(pakin.getSuppCode());
detl.setAppeTime(new Date());
detl.setSpecs(pakin.getSpecs());
detl.setColor(pakin.getColor());
@@ -881,14 +899,16 @@
throw new CoolException("浠诲姟鐘舵�佷慨鏀瑰け璐ワ紒锛�");
}
- for (WaitPakin pakin : apallet){
+ List<WaitPakin> apallets = waitPakinService
+ .selectList(new EntityWrapper<WaitPakin>().eq("zpallet", wrkMast.getBarcode()));
+ for (WaitPakin pakin : apallets){
WaitPakinLog waitPakinLog = new WaitPakinLog();
BeanUtils.copyProperties(pakin, waitPakinLog);
waitPakinLogService.insert(waitPakinLog);
waitPakinService.deleteById(pakin.getId());
}
- Set<Long> list = apallet.stream().map(WaitPakin::getOrderId).collect(Collectors.toSet());
+ Set<Long> list = apallets.stream().map(WaitPakin::getOrderId).collect(Collectors.toSet());
List<OrderPakin> pakins = orderPakinService.selectList(new EntityWrapper<OrderPakin>().in("id", list));
if (Objects.isNull(pakins) || pakins.isEmpty()) {
// throw new CoolException("鍗曟嵁涓嶅瓨鍦紒锛�");
@@ -904,7 +924,6 @@
+ wrkMast.getLocNo() + "]");
}
for (TaskDetl wrkDetl : wrkDetls53) {
-
LocDetl locDetl = locDetlService.selectItem(locCache.getLocNo(), wrkDetl.getMatnr(),
wrkDetl.getBatch(), wrkDetl.getBrand(), wrkDetl.getStandby1(), wrkDetl.getStandby2(),
wrkDetl.getStandby3(), wrkDetl.getBoxType1(), wrkDetl.getBoxType2(),
--
Gitblit v1.9.1