From f8adb8fbfbf9c52cf412ef4ac5742b3e5fe76748 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期四, 21 十二月 2023 21:01:47 +0800
Subject: [PATCH] #检料盘点工作档更新

---
 src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java    |   28 +++++++++++---
 src/main/java/com/zy/asrs/service/impl/WrkMastServiceImpl.java |   38 +++++++------------
 2 files changed, 36 insertions(+), 30 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 188d814..0e4e957 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -284,6 +284,7 @@
             }
         }
 
+        ArrayList<String> outerLocs = new ArrayList<>();
         //妫�娴嬫槸鍚︿负娴呭簱浣�
         boolean sign=false;
         String th = "";
@@ -301,17 +302,32 @@
                     LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", outerLoc));
                     if (locMast != null) {
                         if (!locMast.getLocSts().equals("O") && !locMast.getLocSts().equals("R")) {
-                            sign = true;
-                            th = "搴撲綅鍙凤細" + locNo + " 娴呭簱浣嶆湁闈炵┖搴撲綅锛�";
-                            break;
+//                            sign = true;
+//                            th = "搴撲綅鍙凤細" + locNo + " 娴呭簱浣嶆湁闈炵┖搴撲綅锛�";
+//                            break;
+
+                            OutLocDto outLocDto = new OutLocDto();
+                            outLocDto.setLocNo(locMast.getLocNo());
+                            List<LocDetlDto> locDetlDtos1 = new ArrayList<>();
+                            for (LocDetl locDetl : locDetlService.selectByLocNo(locMast.getLocNo())) {
+                                LocDetlDto locDetlDto = new LocDetlDto();
+                                locDetlDto.setLocDetl(locDetl);
+                                locDetlDto.setCount(locDetl.getAnfme());
+                                locDetlDtos1.add(locDetlDto);
+                            }
+                            outLocDto.setLocDetlDtos(locDetlDtos1);
+                            if (!outerLocs.contains(locMast.getLocNo())) {
+                                dtos.add(outLocDto);
+                                outerLocs.add(locMast.getLocNo());
+                            }
                         }
                     }
                 }
             }
         }
-        if (sign){
-            throw new CoolException("鍑哄簱澶辫触锛�"+th);
-        }
+//        if (sign){
+//            throw new CoolException("鍑哄簱澶辫触锛�"+th);
+//        }
 
         //**************325銆�331銆�333銆�339绔欑偣棰濆閫昏緫浠g爜**************
         HashMap<String, Object> tmpMap = new HashMap<>();
diff --git a/src/main/java/com/zy/asrs/service/impl/WrkMastServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WrkMastServiceImpl.java
index a7d7031..e9cf7f1 100644
--- a/src/main/java/com/zy/asrs/service/impl/WrkMastServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WrkMastServiceImpl.java
@@ -46,31 +46,21 @@
         if (Cools.isEmpty(ioType, locNo)) {
             return 100.0D;
         }
-        if (ioType != 11) {
-            // 鍏ュ簱
-            if (ioType < 100) {
-                List<String> groupInnerLoc = Utils.getGroupInnerLoc(locNo);
-                if (!Cools.isEmpty(groupInnerLoc)) {
-                    for (String innerLoc : groupInnerLoc) {
-                        WrkMast wrkMast = this.baseMapper.selectByLocNoOfPakin(innerLoc);
-                        if (wrkMast != null) {
-                            defaultIoPri = wrkMast.getIoPri() - 2;
-                        }
-                    }
-                }
-            // 鍑哄簱
-            } else {
-                List<String> groupOuterLoc = Utils.getGroupOuterLoc(locNo);
-                if (!Cools.isEmpty(groupOuterLoc)) {
-                    for (String outerLoc : groupOuterLoc) {
-                        WrkMast wrkMast = this.baseMapper.selectBySourceLocNoOfPakout(outerLoc);
-                        if (wrkMast != null) {
-                            defaultIoPri = wrkMast.getIoPri() - 2;
-                        }
-                    }
-                }
-            }
+        int row = Utils.getRow(locNo);
+        if (row == 6) {
+            return 101D;
         }
+
+        if (row == 13) {
+            return 103D;
+        }
+        if (row == 14) {
+            return 102D;
+        }
+        if (row == 15) {
+            return 101D;
+        }
+
         return defaultIoPri == null ? 100.0D : defaultIoPri;
     }
 

--
Gitblit v1.9.1