From de67c95651efbf649704450e03fdb2d16c2e6bcc Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期三, 29 七月 2020 17:07:04 +0800
Subject: [PATCH] #当前本版十分完美、冻结

---
 src/main/java/com/zy/common/service/CommonService.java |   26 ++++++++++++++++++++++++++
 1 files changed, 26 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index 8f5465b..ed5ceb6 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -2,6 +2,7 @@
 
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.baomidou.mybatisplus.mapper.Wrapper;
+import com.core.common.Arith;
 import com.core.common.Cools;
 import com.core.exception.CoolException;
 import com.zy.asrs.entity.*;
@@ -34,6 +35,8 @@
     private BasDevpService basDevpService;
     @Autowired
     private LocMastService locMastService;
+    @Autowired
+    private LocDetlService locDetlService;
 
     /**
      * 鐢熸垚宸ヤ綔鍙�
@@ -96,6 +99,21 @@
             int eRow = rowLastno.geteRow();
             int crn_qty = rowLastno.getCrnQty();
             int rowCount = eRow - sRow + 1;
+
+            // 鍚屼竴澶╁悓瑙勬牸璐х墿闈犺繎鎽嗘硶瑙勫垯 todo
+            List<String> locNos = locDetlService.getSameDetlToday("X004073XX");
+            for (String locNo : locNos) {
+                // 鑾峰彇鎺�
+                int row = Integer.parseInt(locNo.substring(0, 2));
+                // 鍒ゆ柇鏄惁涓烘繁搴撲綅
+                double remainder = Arith.remainder(row, rowCount / crn_qty);
+                if (remainder != 0 && remainder != 1) {
+                    continue;
+                }
+                // 寰楀埌褰撳墠搴撲綅鐨勫鍥村簱浣�
+                System.out.println();
+            }
+
             // 鑾峰彇鐩爣绔欐墍鍦ㄨ揣鏋舵帓鍙�
             Shelves shelves = new Shelves(rowCount, crn_qty);
             curRow = shelves.start(curRow);
@@ -143,8 +161,16 @@
             } else {
                 throw new CoolException("鐩爣绔�"+staDesc.getCrnStn()+"涓嶅彲鐢�");
             }
+        } else {
+            throw new CoolException(rowLastno.getWhsType()+"鍙峰簱浣嶆帓鍙峰垎閰嶈鍒欎笉鍙敤");
         }
         return startupDto;
     }
 
+    public static void main(String[] args) {
+        System.out.println(Arith.remainder(1, 4));
+        System.out.println("0200201".substring(0, 2));
+
+    }
+
 }
\ No newline at end of file

--
Gitblit v1.9.1