From 8e504e7057ec0911547b9c935b2e5e5beef7842c Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期五, 01 四月 2022 15:21:42 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java |   21 ++++++++++-----------
 1 files changed, 10 insertions(+), 11 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 a098b78..d257470 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -13,7 +13,6 @@
 import com.zy.asrs.entity.param.LocDetlAdjustParam;
 import com.zy.asrs.entity.param.StockOutParam;
 import com.zy.asrs.service.*;
-import com.zy.asrs.utils.VersionUtils;
 import com.zy.common.model.*;
 import com.zy.common.model.enums.WorkNoType;
 import com.zy.common.service.CommonService;
@@ -39,6 +38,8 @@
     private static final int DEFAULT_ROW_NO_TYPE = 1;
 
     @Autowired
+    private MatService matService;
+    @Autowired
     private WrkMastService wrkMastService;
     @Autowired
     private WrkDetlService wrkDetlService;
@@ -52,8 +53,6 @@
     private StaDescService staDescService;
     @Autowired
     private LocDetlService locDetlService;
-    @Autowired
-    private MatCodeService matCodeService;
     @Autowired
     private AdjDetlService adjDetlService;
     @Autowired
@@ -79,8 +78,8 @@
         BasDevp sourceStaNo = basDevpService.checkSiteStatus(param.getDevpNo(), true);
         // 妫�绱㈠簱浣�
         LocTypeDto locTypeDto = new LocTypeDto(sourceStaNo);
-        List<String> matNos = param.getList().stream().map(FullStoreParam.MatCodeStore::getMatNo).distinct().collect(Collectors.toList());
-        StartupDto dto = commonService.getLocNo(DEFAULT_ROW_NO_TYPE, 1, param.getDevpNo(), matNos, locTypeDto, 0);
+        List<String> matnrs = param.getList().stream().map(FullStoreParam.MatCodeStore::getMatnr).distinct().collect(Collectors.toList());
+        StartupDto dto = commonService.getLocNo(DEFAULT_ROW_NO_TYPE, 1, param.getDevpNo(), matnrs, locTypeDto, 0);
         // 鐢熸垚宸ヤ綔鍙�
         int workNo = dto.getWorkNo();
         // 鐢熸垚宸ヤ綔妗�
@@ -111,7 +110,7 @@
         // 鐢熸垚宸ヤ綔妗ｆ槑缁�
         List<DetlDto> detlDtos = new ArrayList<>();
         param.getList().forEach(elem -> {
-            DetlDto detlDto = new DetlDto(elem.getMatNo(), elem.getBatch(), elem.getAnfme());
+            DetlDto detlDto = new DetlDto(elem.getMatnr(), elem.getBatch(), elem.getAnfme());
             if (DetlDto.has(detlDtos, detlDto)) {
                 DetlDto detlDto1 = DetlDto.find(detlDtos, detlDto.getMatnr(), detlDto.getBatch());
                 assert detlDto1 != null;
@@ -225,11 +224,11 @@
             for (LocDetlDto detlDto : dto.getLocDetlDtos()) {
                 if (detlDto.getCount()==null || detlDto.getCount() <= 0.0D) {continue;}
                 WrkDetl wrkDetl = new WrkDetl();
+                wrkDetl.sync(detlDto.getLocDetl());
                 wrkDetl.setWrkNo(workNo);
                 wrkDetl.setIoTime(now);
                 Double anfme = ioType==101?detlDto.getLocDetl().getAnfme():detlDto.getCount();
                 wrkDetl.setAnfme(anfme); // 鏁伴噺
-                VersionUtils.setWrkDetl(wrkDetl, detlDto.getLocDetl()); // 鐗堟湰鎺у埗
                 wrkDetl.setAppeTime(now);
                 wrkDetl.setAppeUser(userId);
                 wrkDetl.setModiTime(now);
@@ -298,12 +297,12 @@
             if (locDto.getAnfme()==null || locDto.getAnfme() <= 0.0D) { continue; }
             OrderDetl orderDetl = orderDetlService.selectItem(locDto.getOrderNo(), locDto.getMatnr(), locDto.getBatch());
             WrkDetl wrkDetl = new WrkDetl();
+            wrkDetl.sync(orderDetl);
             wrkDetl.setIoTime(now);
             wrkDetl.setWrkNo(workNo);
             wrkDetl.setBatch(locDto.getBatch());
             wrkDetl.setOrderNo(locDto.getOrderNo());
             wrkDetl.setAnfme(locDto.getAnfme()); // 鏁伴噺
-            VersionUtils.setWrkDetl(wrkDetl, orderDetl); // 鐗堟湰鎺у埗
             wrkDetl.setAppeTime(now);
             wrkDetl.setAppeUser(userId);
             wrkDetl.setModiTime(now);
@@ -513,10 +512,10 @@
         List<LocDetl> locDetls = locDetlService.selectList(new EntityWrapper<LocDetl>().eq("loc_no", sourceLocNo));
         for (LocDetl locDetl : locDetls) {
             WrkDetl wrkDetl = new WrkDetl();
+            wrkDetl.sync(locDetl);
             wrkDetl.setWrkNo(workNo);
             wrkDetl.setIoTime(new Date());
             wrkDetl.setAnfme(locDetl.getAnfme());
-            VersionUtils.setWrkDetl(wrkDetl, locDetl); // 鐗堟湰鎺у埗
             wrkDetl.setAppeTime(new Date());
             wrkDetl.setAppeUser(userId);
             wrkDetl.setModiTime(new Date());
@@ -598,11 +597,11 @@
                 if (adjust.getCount() == 0){
                     continue;
                 }
-                MatCode matCode = matCodeService.selectById(adjust.getMatnr());
+                Mat mat = matService.selectByMatnr(adjust.getMatnr());
                 LocDetl locDetl = new LocDetl();
+                locDetl.sync(mat);
                 locDetl.setLocNo(locMast.getLocNo());
                 locDetl.setAnfme(adjust.getCount()); // 鏁伴噺
-                VersionUtils.setLocDetl(locDetl, matCode); // 鐗堟湰鎺у埗
                 locDetl.setModiUser(userId); // 鎿嶄綔浜哄憳淇℃伅
                 locDetl.setModiTime(new Date());
                 locDetl.setAppeUser(userId);

--
Gitblit v1.9.1