From ff24b7e556eec919fc073e58f90fae0183742db8 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期五, 26 五月 2023 09:44:01 +0800
Subject: [PATCH] 库位地图,出库选择,出库拦截非空库位

---
 src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java |   87 ++++++++++++++++++++++++++++++++-----------
 1 files changed, 64 insertions(+), 23 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 61d8631..690e997 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -1,8 +1,6 @@
 package com.zy.asrs.service.impl;
 
 import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.baomidou.mybatisplus.mapper.Wrapper;
 import com.core.common.BaseRes;
@@ -93,7 +91,7 @@
         // 妫�绱㈠簱浣�
         LocTypeDto locTypeDto = new LocTypeDto(sourceStaNo);
         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);
+        StartupDto dto = commonService.getLocNo(DEFAULT_ROW_NO_TYPE, 1, param.getDevpNo(), matnrs, locTypeDto);
         // 鐢熸垚宸ヤ綔鍙�
         int workNo = dto.getWorkNo();
         // 鐢熸垚宸ヤ綔妗�
@@ -161,6 +159,40 @@
     @Override
     @Transactional
     public void startupFullTakeStore(StockOutParam param, Long userId) {
+        ArrayList<String> locNos = new ArrayList<>();
+        for (StockOutParam.LocDetl locDetl:param.getLocDetls()){
+            if (!locNos.contains(locDetl.getLocNo())){
+                locNos.add(locDetl.getLocNo());
+            }
+        }
+        //妫�娴嬫槸鍚︿负娴呭簱浣�
+        boolean sign = false;
+        String th = "";
+        for (String locNo : locNos) {
+            if (sign) {
+                break;
+            }
+            List<String> groupInsideLoc = Utils.getGroupLoc(locNo);
+            if (!Cools.isEmpty(groupInsideLoc)) {
+                for (String insideLoc : groupInsideLoc) {
+                    if (locNos.contains(insideLoc)) {
+                        break;
+                    }
+                    LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", insideLoc));
+                    if (locMast != null) {
+                        if (!locMast.getLocSts().equals("O") && !locMast.getLocSts().equals("R")) {
+                            sign = true;
+                            th = "搴撲綅鍙凤細" + locNo + " 娴呭簱浣嶆湁闈炵┖搴撲綅锛�";
+                            break;
+                        }
+                    }
+                }
+            }
+        }
+        if (sign){
+            throw new CoolException("鍑哄簱澶辫触锛�" + th);
+        }
+
         // 鐩爣绔欑偣鐘舵�佹娴�
         BasDevp staNo = basDevpService.checkSiteStatus(param.getOutSite());
         // 鑾峰彇搴撲綅鏄庣粏
@@ -230,7 +262,11 @@
             // 鑾峰彇搴撲綅
             LocMast locMast = locMastService.selectById(dto.getLocNo());
             // 鑾峰彇璺緞
-            StaDesc staDesc = staDescService.queryCrnStn(ioType, locMast.getCrnNo(), staNo.getDevNo());
+            StaDesc staDesc = staDescService.queryCrnStn(ioType, locMast.getCrnNo(), staNo.getDevNo(), locMast.getRow1());
+            if(staDesc == null){
+                throw new CoolException("鍑哄簱璺緞涓嶅瓨鍦�");
+            }
+
             // 鐢熸垚宸ヤ綔鍙�
             int workNo = commonService.getWorkNo(WorkNoType.getWorkNoType(ioType));
             // 鐢熸垚宸ヤ綔妗�
@@ -470,7 +506,7 @@
         BasDevp sourceStaNo = basDevpService.checkSiteStatus(devpNo, true);
         // 妫�绱㈠簱浣�
         LocTypeDto locTypeDto = new LocTypeDto(sourceStaNo);
-        StartupDto dto = commonService.getLocNo(DEFAULT_ROW_NO_TYPE, 10, devpNo, null, locTypeDto, 0);
+        StartupDto dto = commonService.getLocNo(DEFAULT_ROW_NO_TYPE, 10, devpNo, null, locTypeDto);
         int workNo = dto.getWorkNo();
         // 鐢熸垚宸ヤ綔妗�
         WrkMast wrkMast = new WrkMast();
@@ -771,25 +807,26 @@
                     continue;
                 }
                 if (locDetl.getMatnr().equals(adjust.getMatnr()) && Cools.eq(locDetl.getBatch(), adjust.getBatch())) {
-                    if (!locDetl.getAnfme().equals(adjust.getCount())) {
-                        // todo 鐩樼偣璁板綍
-                        // 淇敼搴撳瓨
-                        if (!locDetlService.updateAnfme(adjust.getCount(), locDetl.getLocNo(), locDetl.getMatnr(), locDetl.getBatch())) {
-                            throw new CoolException(locDetl.getLocNo() + "搴撲綅锛�" + locDetl.getMatnr() + "鍟嗗搧锛�" + locDetl.getBatch() + "搴忓垪鐮佷慨鏀规暟閲忓け璐�");
-                        }
-                        // 淇濆瓨璋冩暣璁板綍
-                        AdjDetl adjDetl = new AdjDetl();
-                        adjDetl.setLocNo(locDetl.getLocNo());
-                        adjDetl.setMatnr(locDetl.getMatnr());
-                        adjDetl.setBatch(locDetl.getBatch());
-                        adjDetl.setOriQty(locDetl.getAnfme());
-                        adjDetl.setAdjQty(adjust.getCount());
-                        adjDetl.setModiTime(now);
-                        adjDetl.setModiUser(userId);
-                        adjDetl.setAppeTime(now);
-                        adjDetl.setAppeUser(userId);
-                        adjDetlService.save(adjDetl, userId);
+                    // todo 鐩樼偣璁板綍
+                    // 淇敼搴撳瓨
+                    if (!locDetlService.updateAnfme(adjust.getCount(), locDetl.getLocNo(), locDetl.getMatnr(), locDetl.getBatch(), adjust.getManu(), adjust.getMemo())) {
+                        throw new CoolException(locDetl.getLocNo() + "搴撲綅锛�" + locDetl.getMatnr() + "鍟嗗搧锛�" + locDetl.getBatch() + "搴忓垪鐮佷慨鏀规暟閲忓け璐�");
                     }
+                    // 淇濆瓨璋冩暣璁板綍
+                    AdjDetl adjDetl = new AdjDetl();
+                    adjDetl.setLocNo(locDetl.getLocNo());
+                    adjDetl.setMatnr(locDetl.getMatnr());
+                    adjDetl.setBatch(locDetl.getBatch());
+                    adjDetl.setOriQty(locDetl.getAnfme());
+                    adjDetl.setAdjQty(adjust.getCount());
+                    adjDetl.setMemo(adjust.getMemo());
+                    adjDetl.setManu(adjust.getManu());
+                    adjDetl.setModiTime(now);
+                    adjDetl.setModiUser(userId);
+                    adjDetl.setAppeTime(now);
+                    adjDetl.setAppeUser(userId);
+                    adjDetlService.save(adjDetl, userId);
+
                     iterator.remove();
                     iterator1.remove();
                 }
@@ -827,6 +864,8 @@
             locDetl.setBatch(adjust.getBatch());
             locDetl.setLocNo(locMast.getLocNo());
             locDetl.setAnfme(adjust.getCount()); // 鏁伴噺
+            locDetl.setMemo(adjust.getMemo());
+            locDetl.setManu(adjust.getManu());
             locDetl.setModiUser(userId); // 鎿嶄綔浜哄憳淇℃伅
             locDetl.setModiTime(now);
             locDetl.setAppeUser(userId);
@@ -839,6 +878,8 @@
             adjDetl.setLocNo(locMast.getLocNo());
             adjDetl.setMatnr(adjust.getMatnr());
             adjDetl.setBatch(adjust.getBatch());
+            adjDetl.setMemo(adjust.getMemo());
+            adjDetl.setManu(adjust.getManu());
             adjDetl.setOriQty(0.0D);
             adjDetl.setAdjQty(adjust.getCount());
             adjDetl.setModiTime(now);

--
Gitblit v1.9.1