From e64a8134fa282704744dff90fb64ab5f666c823d Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期五, 01 四月 2022 14:27:17 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java |  129 ++++++++++++-------------------------------
 1 files changed, 36 insertions(+), 93 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 d9b42a0..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,13 +13,11 @@
 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;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -40,6 +38,8 @@
     private static final int DEFAULT_ROW_NO_TYPE = 1;
 
     @Autowired
+    private MatService matService;
+    @Autowired
     private WrkMastService wrkMastService;
     @Autowired
     private WrkDetlService wrkDetlService;
@@ -53,8 +53,6 @@
     private StaDescService staDescService;
     @Autowired
     private LocDetlService locDetlService;
-    @Autowired
-    private MatCodeService matCodeService;
     @Autowired
     private AdjDetlService adjDetlService;
     @Autowired
@@ -80,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();
         // 鐢熸垚宸ヤ綔妗�
@@ -112,7 +110,14 @@
         // 鐢熸垚宸ヤ綔妗f槑缁�
         List<DetlDto> detlDtos = new ArrayList<>();
         param.getList().forEach(elem -> {
-            detlDtos.add(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;
+                detlDto1.setAnfme(detlDto1.getAnfme() + detlDto.getAnfme());
+            } else {
+                detlDtos.add(detlDto);
+            }
         });
         wrkDetlService.createWorkDetail(workNo, detlDtos, param.getBarcode(), userId);
         // 鏇存柊婧愮珯鐐逛俊鎭�
@@ -146,10 +151,7 @@
         List<LocDetlDto> locDetlDtos = new ArrayList<>();
         for (StockOutParam.LocDetl paramLocDetl : param.getLocDetls()) {
             if (!Cools.isEmpty(paramLocDetl.getLocNo(), paramLocDetl.getMatnr(), paramLocDetl.getCount())) {
-                LocDetl sqlParam = new LocDetl();
-                sqlParam.setLocNo(paramLocDetl.getLocNo());
-                sqlParam.setMatnr(paramLocDetl.getMatnr());
-                LocDetl one = locDetlService.selectOne(new EntityWrapper<>(sqlParam));
+                LocDetl one = locDetlService.selectItem(paramLocDetl.getLocNo(), paramLocDetl.getMatnr(), paramLocDetl.getBatch());
                 if (null != one) locDetlDtos.add(new LocDetlDto(one, paramLocDetl.getCount()));
             }
         }
@@ -157,7 +159,7 @@
             // 鍚姩鍑哄簱寮�濮� 101.鍑哄簱
             stockOut(staNo, locDetlDtos, null, userId);
         } else {
-            throw new CoolException("搴撲綅鐗╂枡涓嶅瓨鍦�");
+            throw new CoolException("搴撳瓨涓嶅瓨鍦�");
         }
     }
 
@@ -167,20 +169,22 @@
         Date now = new Date();
         // 鍚堝苟鍚岀被椤�
         Set<String> locNos = new HashSet<>();
-        locDetlDtos.forEach(dto -> locNos.add(dto.getLocDetl().getLocNo()));
         List<OutLocDto> dtos = new ArrayList<>();
-        for (String locNo : locNos) {
-            List<LocDetlDto> list = new ArrayList<>();
-            Iterator<LocDetlDto> iterator = locDetlDtos.iterator();
-            while (iterator.hasNext()) {
-                LocDetlDto dto = iterator.next();
-                if (locNo.equals(dto.getLocDetl().getLocNo())) {
-                    list.add(dto);
-                    iterator.remove();
+        for (LocDetlDto locDetlDto : locDetlDtos) {
+            String locNo = locDetlDto.getLocDetl().getLocNo();
+            if (locNos.contains(locNo)) {
+                for (OutLocDto dto : dtos) {
+                    if (dto.getLocNo().equals(locNo)) {
+                        dto.getLocDetlDtos().add(locDetlDto);
+                        break;
+                    }
                 }
+            } else {
+                locNos.add(locNo);
+                dtos.add(new OutLocDto(locNo, locDetlDto));
             }
-            dtos.add(new OutLocDto(locNo, list));
         }
+
         // 鐢熸垚宸ヤ綔妗�
         for (OutLocDto dto : dtos) {
             // 鍒ゆ柇鍏ュ嚭搴撶被鍨嬶細101.鍏ㄦ澘鍑哄簱 or 103.鎷f枡鍑哄簱
@@ -190,14 +194,7 @@
             // 鑾峰彇搴撲綅
             LocMast locMast = locMastService.selectById(dto.getLocNo());
             // 鑾峰彇璺緞
-            Wrapper<StaDesc> wrapper = new EntityWrapper<StaDesc>()
-                    .eq("type_no", ioType)
-                    .eq("stn_no", staNo.getDevNo())
-                    .eq("crn_no", locMast.getCrnNo());
-            StaDesc staDesc = staDescService.selectOne(wrapper);
-            if (Cools.isEmpty(staDesc)) {
-                throw new CoolException("鍑哄簱璺緞涓嶅瓨鍦�");
-            }
+            StaDesc staDesc = staDescService.queryCrnStn(ioType, locMast.getCrnNo(), staNo.getDevNo());
             // 鐢熸垚宸ヤ綔鍙�
             int workNo = commonService.getWorkNo(WorkNoType.getWorkNoType(ioType));
             // 鐢熸垚宸ヤ綔妗�
@@ -225,14 +222,13 @@
             }
             // 鐢熸垚宸ヤ綔妗f槑缁�
             for (LocDetlDto detlDto : dto.getLocDetlDtos()) {
-                // 鍑哄簱鏃讹紝鏁伴噺涓�0鐨勭洿鎺ュ拷鐣�
                 if (detlDto.getCount()==null || detlDto.getCount() <= 0.0D) {continue;}
                 WrkDetl wrkDetl = new WrkDetl();
+                wrkDetl.sync(detlDto.getLocDetl());
                 wrkDetl.setWrkNo(workNo);
-                wrkDetl.setIoTime(new Date());
+                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);
@@ -301,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);
@@ -459,12 +455,9 @@
         // 鑾峰彇搴撲綅鏄庣粏
         List<LocDetlDto> locDetlDtos = new ArrayList<>();
         for (StockOutParam.LocDetl paramLocDetl : param.getLocDetls()) {
-            if (!Cools.isEmpty(paramLocDetl.getLocNo(), paramLocDetl.getMatnr())) {
-                LocDetl sqlParam = new LocDetl();
-                sqlParam.setLocNo(paramLocDetl.getLocNo());
-                sqlParam.setMatnr(paramLocDetl.getMatnr());
-                LocDetl one = locDetlService.selectOne(new EntityWrapper<>(sqlParam));
-                if (null != one) locDetlDtos.add(new LocDetlDto(one, one.getAnfme()));
+            if (!Cools.isEmpty(paramLocDetl.getLocNo(), paramLocDetl.getMatnr(), paramLocDetl.getCount())) {
+                LocDetl one = locDetlService.selectItem(paramLocDetl.getLocNo(), paramLocDetl.getMatnr(), paramLocDetl.getBatch());
+                if (null != one) locDetlDtos.add(new LocDetlDto(one, paramLocDetl.getCount()));
             }
         }
         if (!locDetlDtos.isEmpty()) {
@@ -519,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());
@@ -604,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);
@@ -821,56 +814,6 @@
         if (!locMastService.updateById(locMast)) {
             throw new CoolException("淇敼搴撲綅鐘舵�佸け璐�");
         }
-    }
-
-    @Autowired
-    private JdbcTemplate jdbcTemplate;
-    private boolean pickSite = false;
-    private void stockOutRe(WrkMast wrkMast, List<WrkDetl> wrkDetls) {
-        for (WrkDetl wrkDetl : wrkDetls) {
-            List<LocDetl> locDetls = locDetlService.selectPakoutByRule(wrkDetl.getMatnr());
-            double issued = wrkDetl.getAnfme();
-            for (LocDetl locDetl : locDetls) {
-                if (issued > 0) {
-                    // 鐢熸垚鍑哄簱宸ヤ綔妗�
-                    // 鍏ㄦ澘
-                    if (issued>=locDetl.getAnfme()) {
-                        BasDevp staNo = basDevpService.checkSiteStatus(103);
-                        List<LocDetlDto> detlDtos = new ArrayList<>();
-                        LocDetlDto dto = new LocDetlDto();
-                        dto.setLocDetl(locDetl);
-                        dto.setCount(issued>=locDetl.getAnfme()?locDetl.getAnfme():issued);
-                        detlDtos.add(dto);
-                        stockOut(staNo, detlDtos, 101, 9527L);
-                        // 鎷f枡
-                    } else {
-                        int priorCount = jdbcTemplate.queryForObject("select isnull(count(*),0) from man_prior where 1=1 and matnr = '" + wrkDetl.getMatnr() + "'", Integer.class);
-                        if (priorCount > 0) {
-                            BasDevp staNo = basDevpService.checkSiteStatus(103);
-                            List<LocDetlDto> detlDtos = new ArrayList<>();
-                            LocDetlDto dto = new LocDetlDto();
-                            dto.setLocDetl(locDetl);
-                            dto.setCount(locDetl.getAnfme());
-                            detlDtos.add(dto);
-                            stockOut(staNo, detlDtos, 101, 9527L);
-                        } else {
-                            BasDevp staNo = basDevpService.checkSiteStatus(pickSite?113:109);
-                            List<LocDetlDto> detlDtos = new ArrayList<>();
-                            LocDetlDto dto = new LocDetlDto();
-                            dto.setLocDetl(locDetl);
-                            dto.setCount(issued>=locDetl.getAnfme()?locDetl.getAnfme():issued);
-                            detlDtos.add(dto);
-                            stockOut(staNo, detlDtos, 103, 9527L);
-                        }
-
-                    }
-
-                    // 鍓╀綑寰呭嚭鏁伴噺閫掑噺
-                    issued = issued - locDetl.getAnfme();
-                }
-            }
-        }
-        pickSite = !pickSite;
     }
 
 }

--
Gitblit v1.9.1