From 718da33ba17db8b97f25e4b57fb722d798805513 Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期三, 07 八月 2024 14:34:04 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/WrkDetlServiceImpl.java | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 53 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/WrkDetlServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WrkDetlServiceImpl.java
index 263ee27..b542e65 100644
--- a/src/main/java/com/zy/asrs/service/impl/WrkDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WrkDetlServiceImpl.java
@@ -4,6 +4,7 @@
import com.core.common.Cools;
import com.core.exception.CoolException;
import com.zy.asrs.entity.Mat;
+import com.zy.asrs.entity.MatCodeCountDto;
import com.zy.asrs.entity.WrkDetl;
import com.zy.asrs.mapper.WrkDetlMapper;
import com.zy.asrs.service.MatService;
@@ -24,11 +25,10 @@
@Override
@Transactional
- public void createWorkDetail(Integer workNo, List<DetlDto> detlDtos, String barcode, Long userId) {
+ public void createWorkDetail(Integer workNo, List<DetlDto> detlDtos, String barcode, Long userId, Date now) {
if (detlDtos.isEmpty()){
return;
}
- Date now = new Date();
for (DetlDto dto : detlDtos) {
Mat mat = matService.selectByMatnr(dto.getMatnr());
if (Cools.isEmpty(mat)){
@@ -53,6 +53,37 @@
}
@Override
+ public void createWorkDetail2(Integer workNo, List<MatCodeCountDto> matCodeCountDtos, String barcode, Long userId) {
+ if (matCodeCountDtos.isEmpty()){
+ return;
+ }
+ for (MatCodeCountDto dto : matCodeCountDtos) {
+ Mat mat = matService.selectByMatnr(dto.getMatNo());
+ if (Cools.isEmpty(mat)){
+ throw new CoolException(dto.getMatNo() + "鍟嗗搧缁存姢澶辫触");
+ }
+ // 淇濇寔宸ヤ綔妗ｆ槑缁�
+ WrkDetl wrkDetl = new WrkDetl();
+ wrkDetl.sync(mat);
+ wrkDetl.setWrkNo(workNo);
+ wrkDetl.setIoTime(new Date());
+ wrkDetl.setAnfme(dto.getCount()); // 鏁伴噺
+ wrkDetl.setMemo("");
+ wrkDetl.setBatch(dto.getBatch());
+// VersionUtils.setWrkDetl(wrkDetl, matCode); // 鐗堟湰鎺у埗
+// wrkDetl.setBname(dto.getStr4());
+ wrkDetl.setZpallet(barcode); // 鎵樼洏鏉＄爜
+ wrkDetl.setAppeUser(userId);
+ wrkDetl.setAppeTime(new Date());
+ wrkDetl.setModiUser(userId);
+ wrkDetl.setModiTime(new Date());
+ if (!this.insert(wrkDetl)) {
+ throw new CoolException("淇濆瓨宸ヤ綔鏄庣粏澶辫触");
+ }
+ }
+ }
+
+ @Override
public List<WrkDetl> selectByWrkNo(Integer wrkNo) {
return this.baseMapper.selectByWrkNo(wrkNo);
}
@@ -65,4 +96,24 @@
return baseMapper.updateAnfme(anfme, wrkNo, matnr, batch) > 0;
}
}
+
+ @Override
+ public List<WrkDetl> selectAndLogByOrderNo(String orderNo) {
+ return this.baseMapper.selectAndLogByOrderNo(orderNo);
+ }
+
+ @Override
+ public boolean updateInspect(Integer wrkNo, String matnr, String batch) {
+ return this.baseMapper.updateInspect(wrkNo, matnr, batch) > 0;
+ }
+
+ @Override
+ public List<WrkDetl> selectPakoutQuery(Integer staNo, String matnr) {
+ return this.baseMapper.selectPakoutQuery(staNo, matnr);
+ }
+
+ @Override
+ public Double getBomQty(String bomCode,String matnr) {
+ return this.baseMapper.getBomQty(bomCode,matnr);
+ }
}
--
Gitblit v1.9.1