From 6e4a1fa5dfb97e2ed07a9598524cead18bf3a3d7 Mon Sep 17 00:00:00 2001
From: wang..123 <brook_w@163.com>
Date: 星期三, 17 十一月 2021 14:24:06 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/WrkDetlServiceImpl.java | 27 +++++++++++++++++++++++----
1 files changed, 23 insertions(+), 4 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 3dcdf3d..8c41d80 100644
--- a/src/main/java/com/zy/asrs/service/impl/WrkDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WrkDetlServiceImpl.java
@@ -3,12 +3,14 @@
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import com.core.common.Cools;
import com.core.exception.CoolException;
+import com.zy.asrs.entity.LocDetl;
import com.zy.asrs.entity.MatCode;
import com.zy.asrs.entity.WrkDetl;
import com.zy.asrs.entity.MatCodeCountDto;
import com.zy.asrs.mapper.WrkDetlMapper;
import com.zy.asrs.service.MatCodeService;
import com.zy.asrs.service.WrkDetlService;
+import com.zy.asrs.utils.VersionUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -24,21 +26,24 @@
@Override
@Transactional
- public void createWorkDetail(Integer workNo, List<MatCodeCountDto> matCodeCountDtos, Long userId) {
+ public void createWorkDetail(Integer workNo, List<MatCodeCountDto> matCodeCountDtos, String barcode, Long userId) {
if (matCodeCountDtos.isEmpty()){
return;
}
for (MatCodeCountDto dto : matCodeCountDtos) {
MatCode matCode = matCodeService.selectById(dto.getMatNo());
if (Cools.isEmpty(matCode)){
- throw new CoolException("鐗╂枡鏉＄爜鏁版嵁涓虹┖");
+ throw new CoolException("浜у搧鏉＄爜鏁版嵁涓虹┖");
}
// 淇濇寔宸ヤ綔妗ｆ槑缁�
WrkDetl wrkDetl = new WrkDetl();
wrkDetl.setWrkNo(workNo);
wrkDetl.setIoTime(new Date());
- wrkDetl.setMatnr(matCode.getMatNo()); // 鐗╂枡缂栧彿
- wrkDetl.setAnfme((double) dto.getCount()); // 鏁伴噺
+ wrkDetl.setQty(dto.getCount()); // 鏁伴噺
+ VersionUtils.setWrkDetl(wrkDetl, matCode); // 鐗堟湰鎺у埗
+ wrkDetl.setBillNo((null != dto.getBillNo()) ? dto.getBillNo() : "0");
+ wrkDetl.setSeqNo((null != dto.getSeqNo()) ? dto.getSeqNo() : 0);
+ wrkDetl.setZpallet(barcode); // 鎵樼洏鏉＄爜
wrkDetl.setAppeUser(userId);
wrkDetl.setAppeTime(new Date());
wrkDetl.setModiUser(userId);
@@ -48,4 +53,18 @@
}
}
}
+
+ @Override
+ @Transactional
+ public List<WrkDetl> queryWrkDetl(String matNo, String locNo) {
+ return baseMapper.queryWrkDetl(matNo, locNo);
+ }
+
+ /**
+ * PDA鐩樼偣鏍规嵁鍑哄簱鍙ｆ煡璇㈠搴旂墿鏂欎俊鎭�
+ */
+ @Override
+ public List<WrkDetl> queryMatFromDevNo(Integer devNo) {
+ return baseMapper.queryMatFromDevNo(devNo);
+ }
}
--
Gitblit v1.9.1