From f5b7a2eb5125b17d470c9b8e0b9bb6ac1654dbae Mon Sep 17 00:00:00 2001
From: zhangchao <zc857179121@qq.com>
Date: 星期六, 02 十一月 2024 11:16:02 +0800
Subject: [PATCH] 合并代码，解决冲突
---
src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java | 8 ++++++++
1 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
index 81c4791..64fc99d 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -84,6 +84,10 @@
private DocTypeService docTypeService;
@Autowired
private AgvWaitPakinService agvWaitPakinService;
+ @Autowired
+ private AgvLocDetlService agvLocDetlService;
+ @Autowired
+ private FlowLogService flowLogService;
@Override
@Transactional
@@ -500,6 +504,7 @@
wrkMast.setCrnNo(outMost?outCrnNo:locMast.getCrnNo());
wrkMast.setSourceStaNo(sourceStaNo); // 婧愮珯
wrkMast.setStaNo(stnNo); // 鐩爣绔�
+ wrkMast.setPltType(locMast.getPltType());
if(ioType == 101 && taskDto.getStaNo()>=300){
wrkMast.setSourceStaNo(346); // 婧愮珯
wrkMast.setStaNo(346); // 鐩爣绔�
@@ -1119,10 +1124,12 @@
throw new CoolException("褰撳墠宸ヤ綔鐘舵�佹棤娉曞彇娑�");
}
// 璁㈠崟鍏宠仈
+ long flowId = snowflakeIdWorker.nextId();
List<WrkDetl> wrkDetls = wrkDetlService.selectByWrkNo(wrkMast.getWrkNo());
for (WrkDetl wrkDetl : wrkDetls) {
if (!Cools.isEmpty(wrkDetl.getOrderNo())) {
if (!BaseController.isJSON(wrkDetl.getOrderNo())) {
+
if (!orderDetlService.decrease(wrkDetl.getOrderNo(), wrkDetl.getMatnr(), wrkDetl.getBatch(), wrkDetl.getAnfme(),wrkDetl.getThreeCode(),wrkDetl.getDeadTime())) {
throw new CoolException("璁㈠崟鏁版嵁鍥炴粴澶辫触");
}
@@ -1150,6 +1157,7 @@
}
}
}
+
}
// 鍙栨秷鎿嶄綔浜哄憳璁板綍
wrkMast.setManuType("鎵嬪姩鍙栨秷");
--
Gitblit v1.9.1