From 04908371e0955028fadedfa73d94cbe270474344 Mon Sep 17 00:00:00 2001
From: yxFwq <1>
Date: 星期四, 31 七月 2025 15:19:13 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/task/handler/BareBoardHandler.java |    5 ++
 src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java  |   20 +++++++++
 src/main/webapp/views/operateLog/operateLog.html             |    5 ++
 src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java  |   34 +++++++++++------
 4 files changed, 51 insertions(+), 13 deletions(-)

diff --git a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
index 4205f08..439d873 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -1247,11 +1247,13 @@
         ArrayList<LocDetl> locDetlArrayList = new ArrayList<>();
         Wrapper<LocDetl> wrapper = new EntityWrapper<LocDetl>()
                 .eq("matnr", param.getMatnr())
-                .eq("weight", param.getWeight())
-                .orderBy("batch", true);
-        if (param.getDevNo() == 536) {
+                .eq("weight", param.getWeight());
+        if (param.getDevNo() == 536){
             wrapper.eq("model", param.getModel())
-                    .eq("specs", param.getOrderNo());
+                    .eq("specs", param.getOrderNo())
+                    .orderBy("appe_time", true);
+        } else {
+            wrapper.orderBy("batch", true);
         }
 
         List<LocDetl> locDetls = locDetlService.selectList(wrapper);
@@ -1274,12 +1276,16 @@
             Wrapper<LocDetl> locDetlWrapper = new EntityWrapper<LocDetl>().eq("matnr", param.getMatnr())
                     .lt("weight", param.getWeight() + mat.getUnits())
                     .and()
-                    .gt("weight", param.getWeight())
-                    .orderBy("batch", true)
-                    .orderBy("weight", true);
+                    .gt("weight", param.getWeight());
             if (param.getDevNo() == 536){
                 locDetlWrapper.eq("model", param.getModel())
-                        .eq("specs", param.getOrderNo());
+                        .eq("specs", param.getOrderNo())
+                        .orderBy("appe_time", true)
+                        .orderBy("weight", true);
+            } else {
+                locDetlWrapper
+                        .orderBy("batch", true)
+                        .orderBy("weight", true);
             }
             locDetls = locDetlService.selectList(locDetlWrapper);
             if (locDetls.isEmpty()){
@@ -1300,12 +1306,16 @@
             Wrapper<LocDetl> locDetlWrapper = new EntityWrapper<LocDetl>().eq("matnr", param.getMatnr())
                     .gt("weight", param.getWeight() - mat.getUnits())
                     .and()
-                    .lt("weight", param.getWeight())
-                    .orderBy("batch", true)
-                    .orderBy("weight", false);
+                    .lt("weight", param.getWeight());
             if (param.getDevNo() == 536){
                 locDetlWrapper.eq("model", param.getModel())
-                        .eq("specs", param.getOrderNo());
+                        .eq("specs", param.getOrderNo())
+                        .orderBy("appe_time", true)
+                        .orderBy("weight", false);
+            } else {
+                locDetlWrapper
+                        .orderBy("batch", true)
+                        .orderBy("weight", false);
             }
             locDetls = locDetlService.selectList(locDetlWrapper);
 
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 7db3935..33c49a6 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -219,6 +219,9 @@
                         .eq("stn_no", param.getOutSite())
                         .eq("crn_no", locMast.getCrnNo());
                 StaDesc staDesc = staDescService.selectOne(wrapper);
+                if (Cools.isEmpty(staDesc)) {
+                    throw new CoolException("鍑哄簱璺緞涓嶅瓨鍦�");
+                }
                 Integer sourceStaNo = staDesc.getCrnStn();
                 if (Cools.isEmpty(sourceStaNo)) {
                     throw new CoolException("妫�绱㈡簮绔欏け璐�");
@@ -290,6 +293,9 @@
                         .eq("stn_no", param.getOutSite())
                         .eq("crn_no", locMast.getCrnNo());
                 StaDesc staDesc = staDescService.selectOne(wrapper);
+                if (Cools.isEmpty(staDesc)) {
+                    throw new CoolException("鍑哄簱璺緞涓嶅瓨鍦�");
+                }
                 Integer sourceStaNo = staDesc.getCrnStn();
                 if (Cools.isEmpty(sourceStaNo)) {
                     throw new CoolException("妫�绱㈡簮绔欏け璐�");
@@ -782,6 +788,9 @@
                     .eq("stn_no", param.getOutSite())
                     .eq("crn_no", locMast.getCrnNo());
             StaDesc staDesc = staDescService.selectOne(wrapper);
+            if (Cools.isEmpty(staDesc)) {
+                throw new CoolException("鍑哄簱璺緞涓嶅瓨鍦�");
+            }
             Integer sourceStaNo = staDesc.getCrnStn();
             if (Cools.isEmpty(sourceStaNo)) {
                 throw new CoolException("妫�绱㈡簮绔欏け璐�");
@@ -841,6 +850,9 @@
                         .eq("stn_no", param.getOutSite())
                         .eq("crn_no", locMast.getCrnNo());
                 StaDesc staDesc = staDescService.selectOne(wrapper);
+                if (Cools.isEmpty(staDesc)) {
+                    throw new CoolException("鍑哄簱璺緞涓嶅瓨鍦�");
+                }
                 Integer sourceStaNo = staDesc.getCrnStn();
                 if (Cools.isEmpty(sourceStaNo)) {
                     throw new CoolException("妫�绱㈡簮绔欏け璐�");
@@ -912,6 +924,9 @@
                         .eq("stn_no", param.getOutSite())
                         .eq("crn_no", locMast.getCrnNo());
                 StaDesc staDesc = staDescService.selectOne(wrapper);
+                if (Cools.isEmpty(staDesc)) {
+                    throw new CoolException("鍑哄簱璺緞涓嶅瓨鍦�");
+                }
                 Integer sourceStaNo = staDesc.getCrnStn();
                 if (Cools.isEmpty(sourceStaNo)) {
                     throw new CoolException("妫�绱㈡簮绔欏け璐�");
@@ -1090,6 +1105,9 @@
                     .eq("stn_no", param.getOutSite())
                     .eq("crn_no", locMast.getCrnNo());
             StaDesc staDesc = staDescService.selectOne(wrapper);
+            if (Cools.isEmpty(staDesc)) {
+                throw new CoolException("鍑哄簱璺緞涓嶅瓨鍦�");
+            }
             Integer sourceStaNo = staDesc.getCrnStn();
             if (Cools.isEmpty(sourceStaNo)) {
                 throw new CoolException("妫�绱㈡簮绔欏け璐�");
@@ -1401,7 +1419,7 @@
     public void cancelWrkMast(String workNo, Long userId) {
         Date now = new Date();
         WrkMast wrkMast = wrkMastService.selectById(workNo);
-        if (Cools.isEmpty(wrkMast)){
+        if (Cools.isEmpty(wrkMast) || wrkMast.getWrkSts()>12 || (wrkMast.getWrkSts()>3 && wrkMast.getWrkSts()<5)){
             throw new CoolException(workNo+"宸ヤ綔妗d笉瀛樺湪");
         }
         if (Cools.isEmpty(wrkMast.getLocNo()) && Cools.isEmpty(wrkMast.getSourceLocNo())){
diff --git a/src/main/java/com/zy/asrs/task/handler/BareBoardHandler.java b/src/main/java/com/zy/asrs/task/handler/BareBoardHandler.java
index 35f9a89..bf0bab6 100644
--- a/src/main/java/com/zy/asrs/task/handler/BareBoardHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/BareBoardHandler.java
@@ -95,6 +95,11 @@
                             .eq("stn_no", staNo)
                             .eq("crn_no", locMast.getCrnNo());
                     StaDesc staDesc = staDescService.selectOne(wrapper);
+                    if (Cools.isEmpty(staDesc)) {
+//                        throw new CoolException("鍑哄簱璺緞涓嶅瓨鍦�");
+                        sign = false;
+                        continue;
+                    }
                     Integer sourceStaNo = staDesc.getCrnStn();
                     if (Cools.isEmpty(sourceStaNo)) {
 //                    throw new CoolException("妫�绱㈡簮绔欏け璐�");
diff --git a/src/main/webapp/views/operateLog/operateLog.html b/src/main/webapp/views/operateLog/operateLog.html
index 1ef2137..c3e02b4 100644
--- a/src/main/webapp/views/operateLog/operateLog.html
+++ b/src/main/webapp/views/operateLog/operateLog.html
@@ -32,6 +32,11 @@
     </div>
     <div class="layui-inline">
         <div class="layui-input-inline">
+            <input class="layui-input" type="text" name="action" placeholder="鎿嶄綔鍐呭" autocomplete="off">
+        </div>
+    </div>
+    <div class="layui-inline">
+        <div class="layui-input-inline">
             <input class="layui-input" type="text" name="request" placeholder="璇锋眰鏁版嵁" autocomplete="off">
         </div>
     </div>

--
Gitblit v1.9.1