From e590b02a84d728251727a6b982de706bf051990e Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期六, 29 七月 2023 13:08:04 +0800
Subject: [PATCH] Map适配较多库位
---
src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java | 41 ++++++++++++++++++++++++++++++++---------
1 files changed, 32 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java
index 059d889..4d06510 100644
--- a/src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java
@@ -3,12 +3,8 @@
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;
import com.core.exception.CoolException;
-import com.zy.asrs.entity.AgvBasDevp;
-import com.zy.asrs.entity.AgvLocMast;
-import com.zy.asrs.entity.AgvWaitPakin;
-import com.zy.asrs.entity.AgvWrkMast;
+import com.zy.asrs.entity.*;
import com.zy.asrs.service.*;
-import com.zy.common.model.DetlDto;
import com.zy.common.model.StartupDto;
import com.zy.common.service.AgvCommonService;
import lombok.extern.slf4j.Slf4j;
@@ -16,7 +12,6 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
-import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@@ -44,6 +39,8 @@
private AgvWrkMastService agvWrkMastService;
@Autowired
private AgvWrkDetlService agvWrkDetlService;
+ @Autowired
+ private MatService matService;
@Override
public StartupDto createWaitPainWrkMastStart(List<AgvBasDevp> agvBasDevpList, Long userId) {
@@ -66,7 +63,7 @@
//鐢熸垚宸ヤ綔妗�
AgvWrkMast wrkMast = createWrkMast(agvBasDevp, agvLocMast, now, userId);
//鐢熸垚宸ヤ綔妗ｆ槑缁�
- createWrkDetl(agvWaitPakinList,wrkMast,userId);
+ createWrkDetlReWrite(agvWaitPakinList,wrkMast,userId);
//鏇存柊婧愮珯鐐逛俊鎭�
updateAgvBasDevp(agvBasDevp);
//鏇存柊鐩爣搴撲綅鐘舵��
@@ -96,7 +93,7 @@
/*
鐢熸垚宸ヤ綔妗ｆ槑缁�
*/
- private void createWrkDetl(List<AgvWaitPakin> agvWaitPakinList, AgvWrkMast wrkMast, Long userId){
+ /* private void createWrkDetl(List<AgvWaitPakin> agvWaitPakinList, AgvWrkMast wrkMast, Long userId){
List<DetlDto> detlDtos = new ArrayList<>();
agvWaitPakinList.forEach(agvWaitPakin -> {
DetlDto detlDto = new DetlDto(agvWaitPakin.getMatnr(), agvWaitPakin.getBatch(), agvWaitPakin.getAnfme());
@@ -109,7 +106,33 @@
}
});
agvWrkDetlService.createWorkDetail(wrkMast.getWrkNo(), detlDtos, wrkMast.getBarcode(), userId);
-
+ }*/
+ /*
+ 鐢熸垚宸ヤ綔妗ｆ槑缁�
+ */
+ private void createWrkDetlReWrite(List<AgvWaitPakin> agvWaitPakinList, AgvWrkMast wrkMast, Long userId){
+ Date now = new Date();
+ agvWaitPakinList.stream().forEach(agvWaitPakin -> {
+ Mat mat = matService.selectByMatnr(agvWaitPakin.getMatnr());
+ if (Cools.isEmpty(mat)) {
+ throw new CoolException(agvWaitPakin.getMatnr() + "鍟嗗搧缁存姢澶辫触");
+ }
+ AgvWrkDetl wrkDetl = new AgvWrkDetl();
+ wrkDetl.sync(mat);
+ wrkDetl.setWrkNo(wrkMast.getWrkNo());
+ wrkDetl.setOrderNo(agvWaitPakin.getOrderNo());
+ wrkDetl.setIoTime(now);
+ wrkDetl.setBatch(agvWaitPakin.getBatch());
+ wrkDetl.setAnfme(agvWaitPakin.getAnfme()); // 鏁伴噺
+ wrkDetl.setZpallet(agvWaitPakin.getZpallet()); // 鎵樼洏鏉＄爜
+ wrkDetl.setAppeUser(userId);
+ wrkDetl.setAppeTime(now);
+ wrkDetl.setModiUser(userId);
+ wrkDetl.setModiTime(now);
+ if (!agvWrkDetlService.insert(wrkDetl)) {
+ throw new CoolException("淇濆瓨宸ヤ綔鏄庣粏澶辫触");
+ }
+ });
}
/*
--
Gitblit v1.9.1