From e43b29a03ba1d6a5d022075daa8fc54c6f3b30c7 Mon Sep 17 00:00:00 2001
From: DELL <56479841@qq.com>
Date: 星期三, 26 六月 2024 17:00:36 +0800
Subject: [PATCH] 入库修改

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

diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index 7930dd8..ac2e0a7 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -7,6 +7,7 @@
 import com.core.common.Cools;
 import com.core.exception.CoolException;
 import com.zy.asrs.entity.*;
+import com.zy.asrs.mapper.LocMastMapper;
 import com.zy.asrs.service.*;
 import com.zy.asrs.utils.Utils;
 import com.zy.asrs.utils.VersionUtils;
@@ -46,6 +47,9 @@
     private LocDetlService locDetlService;
     @Autowired
     private SlaveProperties slaveProperties;
+
+    @Autowired
+    private LocMastMapper locMastMapper;
 
     /**
      * 鐢熸垚宸ヤ綔鍙�
@@ -109,9 +113,12 @@
         if (sourceStaNo < 200) {
             whsType = 1;
             crnNo=1;
-        } else if (sourceStaNo >= 200) {
+        } else if (sourceStaNo < 300) {
             whsType = 2;
             crnNo=2;
+        }else {
+            whsType = 3;
+            crnNo=3;
         }
 
         int workNo = getWorkNo(0);
@@ -218,7 +225,13 @@
                 } else {
                     curRow = sRow;
                 }
-                crnNo = whsType;
+                basCrnpService.checkSiteStatus(crnNo, true);
+            }else {
+                if (curRow == sRow) {
+                    curRow = eRow;
+                } else {
+                    curRow = sRow;
+                }
                 basCrnpService.checkSiteStatus(crnNo, true);
             }
         }
@@ -496,4 +509,93 @@
         }
     }
 
+    public StartupDto emptyIngetLocNo(Integer devpNo) {
+        int crnNo = 0;
+        // 鐩爣搴撲綅
+        LocMast locMast = null;
+        if (devpNo == 304) {
+            crnNo = 3;
+            locMast = locMastMapper.queryEmptyLocNoByStaNo(crnNo);
+        }
+
+        if (locMast == null) {
+            throw new CoolException("娌℃湁绌哄簱浣�");
+        }
+
+        // 鑾峰彇鐩爣绔�
+        Wrapper<StaDesc> wrapper = new EntityWrapper<StaDesc>()
+                .eq("type_no", 10)
+                .eq("stn_no", devpNo)
+                .eq("crn_no", crnNo);
+        StaDesc staDesc = staDescService.selectOne(wrapper);
+        if (Cools.isEmpty(staDesc)) {
+            log.error("鍏ュ簱璺緞涓嶅瓨鍦�, staDescId={}, sourceStaNo={}, crnNo={}", 10, devpNo, crnNo);
+            throw new CoolException("鍏ュ簱璺緞涓嶅瓨鍦�");
+        }
+
+        // 妫�娴嬬洰鏍囩珯
+        BasDevp staNo = basDevpService.selectById(staDesc.getCrnStn());
+        if (!staNo.getAutoing().equals("Y")) {
+            throw new CoolException("鐩爣绔�"+staDesc.getCrnStn()+"涓嶅彲鐢�");
+        }
+
+        basCrnpService.checkSiteStatus(crnNo, true);
+
+        // 杩斿洖dto
+        StartupDto startupDto = new StartupDto();
+        startupDto.setWorkNo(getWorkNo(0));
+        startupDto.setCrnNo(crnNo);
+        startupDto.setSourceStaNo(devpNo);
+        startupDto.setStaNo(devpNo);
+        startupDto.setLocNo(locMast.getLocNo());
+        return startupDto;
+    }
+
+    public StartupDto getLocNoBy304(String type) {
+
+        int row;
+        int devpNo = 304;
+        int crnNo = 3;
+        if (type.equals("1")) {
+            row =  7;
+        } else if (type.equals("2")) {
+            row = 6;
+        } else {
+            throw new CoolException("304鐗╂枡绫诲埆璇嗗埆閿欒锛�" + type);
+        }
+
+        // 鐩爣搴撲綅
+        LocMast locMast = locMastMapper.queryLocByBarCode(row);
+        if (locMast == null) {
+            throw new CoolException("304鍏ュ簱娌℃湁绌哄簱浣�");
+        }
+
+        // 鑾峰彇鐩爣绔�
+        Wrapper<StaDesc> wrapper = new EntityWrapper<StaDesc>()
+                .eq("type_no", 1)
+                .eq("stn_no", devpNo)
+                .eq("crn_no", crnNo);
+        StaDesc staDesc = staDescService.selectOne(wrapper);
+        if (Cools.isEmpty(staDesc)) {
+            log.error("鍏ュ簱璺緞涓嶅瓨鍦�, staDescId={}, sourceStaNo={}, crnNo={}", 1, devpNo, crnNo);
+            throw new CoolException("鍏ュ簱璺緞涓嶅瓨鍦�");
+        }
+
+        // 妫�娴嬬洰鏍囩珯
+        BasDevp staNo = basDevpService.selectById(staDesc.getCrnStn());
+        if (!staNo.getAutoing().equals("Y")) {
+            throw new CoolException("鐩爣绔�"+staDesc.getCrnStn()+"涓嶅彲鐢�");
+        }
+
+        basCrnpService.checkSiteStatus(crnNo, true);
+
+        // 杩斿洖dto
+        StartupDto startupDto = new StartupDto();
+        startupDto.setWorkNo(getWorkNo(0));
+        startupDto.setCrnNo(crnNo);
+        startupDto.setSourceStaNo(devpNo);
+        startupDto.setStaNo(devpNo);
+        startupDto.setLocNo(locMast.getLocNo());
+        return startupDto;
+    }
 }

--
Gitblit v1.9.1