From 9fefa2da59e6affea94eee07b57dcf3e23887b0c Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期三, 30 三月 2022 09:52:18 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/service/impl/WrkDetlServiceImpl.java |   25 ++++++++++++++-----------
 1 files changed, 14 insertions(+), 11 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 536b2ea..80546b5 100644
--- a/src/main/java/com/zy/asrs/service/impl/WrkDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WrkDetlServiceImpl.java
@@ -5,10 +5,11 @@
 import com.core.exception.CoolException;
 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 com.zy.common.model.DetlDto;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -24,12 +25,12 @@
 
     @Override
     @Transactional
-    public void createWorkDetail(Integer workNo, List<MatCodeCountDto> matCodeCountDtos, Long userId) {
-        if (matCodeCountDtos.isEmpty()){
+    public void createWorkDetail(Integer workNo, List<DetlDto> detlDtos, String barcode, Long userId) {
+        if (detlDtos.isEmpty()){
             return;
         }
-        for (MatCodeCountDto dto : matCodeCountDtos) {
-            MatCode matCode = matCodeService.selectById(dto.getMatNo());
+        for (DetlDto dto : detlDtos) {
+            MatCode matCode = matCodeService.selectById(dto.getMatnr());
             if (Cools.isEmpty(matCode)){
                 throw new CoolException("鐗╂枡鏉$爜鏁版嵁涓虹┖");
             }
@@ -37,12 +38,9 @@
             WrkDetl wrkDetl = new WrkDetl();
             wrkDetl.setWrkNo(workNo);
             wrkDetl.setIoTime(new Date());
-            wrkDetl.setMatnr(matCode.getMatNo()); // 鐗╂枡缂栧彿
-            wrkDetl.setAnfme((double) dto.getCount()); // 鏁伴噺
-            wrkDetl.setLgnum("寰呭畾"); // todo
-            wrkDetl.setTbnum(0); // todo
-            wrkDetl.setTbpos(0); // todo
-            wrkDetl.setZmatid("寰呭畾"); // todo
+            wrkDetl.setAnfme(dto.getAnfme()); // 鏁伴噺
+            VersionUtils.setWrkDetl(wrkDetl, matCode); // 鐗堟湰鎺у埗
+            wrkDetl.setZpallet(barcode); // 鎵樼洏鏉$爜
             wrkDetl.setAppeUser(userId);
             wrkDetl.setAppeTime(new Date());
             wrkDetl.setModiUser(userId);
@@ -52,4 +50,9 @@
             }
         }
     }
+
+    @Override
+    public List<WrkDetl> selectByWrkNo(Integer wrkNo) {
+        return this.baseMapper.selectByWrkNo(wrkNo);
+    }
 }

--
Gitblit v1.9.1