From e8cf4d70206fb9f4d09a4fc5a23aad2424e1369d Mon Sep 17 00:00:00 2001
From: 野心家 <1051256694@qq.com>
Date: 星期二, 27 五月 2025 23:35:06 +0800
Subject: [PATCH] 合格

---
 src/main/java/com/zy/asrs/entity/WrkDetlLog.java                             |    6 ++-
 src/main/java/com/zy/asrs/entity/OrderDetl.java                              |    6 ++-
 src/main/webapp/static/js/wrkDetlSingle/wrkDetlSingle.js                     |    2 
 src/main/webapp/static/js/manLocDetl/manLocDetl.js                           |    2 
 src/main/webapp/static/js/saas/locDetl.js                                    |    2 
 src/main/java/com/zy/asrs/entity/param/PalletizingCompleteTwoFloorParam.java |    2 
 src/main/java/com/zy/asrs/entity/WrkDetlSingle.java                          |    6 ++-
 src/main/webapp/static/js/locDetl/locDetl.js                                 |    2 
 src/main/java/com/zy/asrs/entity/WaitPakinLog.java                           |    6 ++-
 src/main/java/com/zy/asrs/entity/WaitPakin.java                              |    6 ++-
 src/main/java/com/zy/asrs/entity/LocDetl.java                                |    6 ++-
 src/main/java/com/zy/asrs/entity/Mat.java                                    |    6 ++-
 src/main/java/com/zy/asrs/entity/WrkDetl.java                                |    6 ++-
 src/main/java/com/zy/asrs/entity/OrderDetlGift.java                          |    6 ++-
 src/main/webapp/static/js/common.js                                          |    4 +-
 src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java                  |    1 
 src/main/webapp/static/js/orderDetlGift/orderDetlGift.js                     |    2 
 17 files changed, 45 insertions(+), 26 deletions(-)

diff --git a/src/main/java/com/zy/asrs/entity/LocDetl.java b/src/main/java/com/zy/asrs/entity/LocDetl.java
index 03aa67d..c2a38d8 100644
--- a/src/main/java/com/zy/asrs/entity/LocDetl.java
+++ b/src/main/java/com/zy/asrs/entity/LocDetl.java
@@ -218,9 +218,11 @@
         if (null == this.danger){ return null; }
         switch (this.danger){
             case 1:
-                return "鏄�";
+                return "鍚堟牸";
+            case 2:
+                return "涓嶅悎鏍�";
             case 0:
-                return "鍚�";
+                return "寰呭垽";
             default:
                 return String.valueOf(this.danger);
         }
diff --git a/src/main/java/com/zy/asrs/entity/Mat.java b/src/main/java/com/zy/asrs/entity/Mat.java
index d06aea8..9994147 100644
--- a/src/main/java/com/zy/asrs/entity/Mat.java
+++ b/src/main/java/com/zy/asrs/entity/Mat.java
@@ -440,9 +440,11 @@
         if (null == this.danger){ return null; }
         switch (this.danger){
             case 1:
-                return "鏄�";
+                return "鍚堟牸";
+            case 2:
+                return "涓嶅悎鏍�";
             case 0:
-                return "鍚�";
+                return "寰呭垽";
             default:
                 return String.valueOf(this.danger);
         }
diff --git a/src/main/java/com/zy/asrs/entity/OrderDetl.java b/src/main/java/com/zy/asrs/entity/OrderDetl.java
index 64d160d..ca63284 100644
--- a/src/main/java/com/zy/asrs/entity/OrderDetl.java
+++ b/src/main/java/com/zy/asrs/entity/OrderDetl.java
@@ -420,9 +420,11 @@
         if (null == this.danger){ return null; }
         switch (this.danger){
             case 1:
-                return "鏄�";
+                return "鍚堟牸";
+            case 2:
+                return "涓嶅悎鏍�";
             case 0:
-                return "鍚�";
+                return "寰呭垽";
             default:
                 return String.valueOf(this.danger);
         }
diff --git a/src/main/java/com/zy/asrs/entity/OrderDetlGift.java b/src/main/java/com/zy/asrs/entity/OrderDetlGift.java
index 86bef2b..ff583178 100644
--- a/src/main/java/com/zy/asrs/entity/OrderDetlGift.java
+++ b/src/main/java/com/zy/asrs/entity/OrderDetlGift.java
@@ -433,9 +433,11 @@
         if (null == this.danger){ return null; }
         switch (this.danger){
             case 1:
-                return "鏄�";
+                return "鍚堟牸";
+            case 2:
+                return "涓嶅悎鏍�";
             case 0:
-                return "鍚�";
+                return "寰呭垽";
             default:
                 return String.valueOf(this.danger);
         }
diff --git a/src/main/java/com/zy/asrs/entity/WaitPakin.java b/src/main/java/com/zy/asrs/entity/WaitPakin.java
index 4bae423..daf8067 100644
--- a/src/main/java/com/zy/asrs/entity/WaitPakin.java
+++ b/src/main/java/com/zy/asrs/entity/WaitPakin.java
@@ -216,9 +216,11 @@
         if (null == this.danger){ return null; }
         switch (this.danger){
             case 1:
-                return "鏄�";
+                return "鍚堟牸";
+            case 2:
+                return "涓嶅悎鏍�";
             case 0:
-                return "鍚�";
+                return "寰呭垽";
             default:
                 return String.valueOf(this.danger);
         }
diff --git a/src/main/java/com/zy/asrs/entity/WaitPakinLog.java b/src/main/java/com/zy/asrs/entity/WaitPakinLog.java
index 5c09f47..5f8814f 100644
--- a/src/main/java/com/zy/asrs/entity/WaitPakinLog.java
+++ b/src/main/java/com/zy/asrs/entity/WaitPakinLog.java
@@ -203,9 +203,11 @@
         if (null == this.danger){ return null; }
         switch (this.danger){
             case 1:
-                return "鏄�";
+                return "鍚堟牸";
+            case 2:
+                return "涓嶅悎鏍�";
             case 0:
-                return "鍚�";
+                return "寰呭垽";
             default:
                 return String.valueOf(this.danger);
         }
diff --git a/src/main/java/com/zy/asrs/entity/WrkDetl.java b/src/main/java/com/zy/asrs/entity/WrkDetl.java
index f07627f..c81ff35 100644
--- a/src/main/java/com/zy/asrs/entity/WrkDetl.java
+++ b/src/main/java/com/zy/asrs/entity/WrkDetl.java
@@ -348,9 +348,11 @@
         if (null == this.danger){ return null; }
         switch (this.danger){
             case 1:
-                return "鏄�";
+                return "鍚堟牸";
+            case 2:
+                return "涓嶅悎鏍�";
             case 0:
-                return "鍚�";
+                return "寰呭垽";
             default:
                 return String.valueOf(this.danger);
         }
diff --git a/src/main/java/com/zy/asrs/entity/WrkDetlLog.java b/src/main/java/com/zy/asrs/entity/WrkDetlLog.java
index cf70ea5..2fe66f8 100644
--- a/src/main/java/com/zy/asrs/entity/WrkDetlLog.java
+++ b/src/main/java/com/zy/asrs/entity/WrkDetlLog.java
@@ -346,9 +346,11 @@
         if (null == this.danger){ return null; }
         switch (this.danger){
             case 1:
-                return "鏄�";
+                return "鍚堟牸";
+            case 2:
+                return "涓嶅悎鏍�";
             case 0:
-                return "鍚�";
+                return "寰呭垽";
             default:
                 return String.valueOf(this.danger);
         }
diff --git a/src/main/java/com/zy/asrs/entity/WrkDetlSingle.java b/src/main/java/com/zy/asrs/entity/WrkDetlSingle.java
index 857ec01..c46e733 100644
--- a/src/main/java/com/zy/asrs/entity/WrkDetlSingle.java
+++ b/src/main/java/com/zy/asrs/entity/WrkDetlSingle.java
@@ -423,9 +423,11 @@
         if (null == this.danger){ return null; }
         switch (this.danger){
             case 1:
-                return "鏄�";
+                return "鍚堟牸";
+            case 2:
+                return "涓嶅悎鏍�";
             case 0:
-                return "鍚�";
+                return "寰呭垽";
             default:
                 return String.valueOf(this.danger);
         }
diff --git a/src/main/java/com/zy/asrs/entity/param/PalletizingCompleteTwoFloorParam.java b/src/main/java/com/zy/asrs/entity/param/PalletizingCompleteTwoFloorParam.java
index 4d7a462..3b5d4fe 100644
--- a/src/main/java/com/zy/asrs/entity/param/PalletizingCompleteTwoFloorParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/PalletizingCompleteTwoFloorParam.java
@@ -29,7 +29,7 @@
         private Double rollExtent;//	鏄�	灏忔暟鍨�	鍗烽暱搴�
         private int joint = 0;//	鏄�	鏁村瀷	鎺ュご
         private int cutting = 2;//	鏄�	鏁村瀷	鏄惁鍒嗗垏锛歿1:鏄��2:鍚
-        private int qualified = 2;//	鏄�	鏁村瀷 鏄惁鍚堟牸锛歿1:鏄��2:鍚
+        private int qualified = 0;//	鏄�	鏁村瀷 鏄惁鍚堟牸锛歿1:鏄��2:鍚
         private String modelFront = "";//	鏄�	鍒嗗垏鍓嶇鍙�
         private String batchFront = "";//	鏄�	鍒嗗垏鍓嶅嵎鍙�
 
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 c5bd39a..afd56b9 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -812,6 +812,7 @@
             waitPakin.setVolume(matList.getRoughWeight());  //姣涢噸
             waitPakin.setPrice(matList.getRollExtent());   //闀垮害
             waitPakin.setSpecs(String.valueOf(matList.getJoint()));   //鎺ュご
+            waitPakin.setDanger(matList.getQualified());   //寰呭垽
             waitPakin.setIoStatus("N");     // 鍏ュ嚭鐘舵��
             waitPakin.setAnfme(matList.getAnfme());  // 鏁伴噺
             waitPakin.setStatus("Y");    // 鐘舵��
diff --git a/src/main/webapp/static/js/common.js b/src/main/webapp/static/js/common.js
index 7018df0..571eac8 100644
--- a/src/main/webapp/static/js/common.js
+++ b/src/main/webapp/static/js/common.js
@@ -213,7 +213,7 @@
     ,{field: 'deadWarn', align: 'center',title: '棰勮澶╂暟', hide: true}
     ,{field: 'source$', align: 'center',title: '鍒惰喘', hide: true}
     ,{field: 'check$', align: 'center',title: '瑕佹眰妫�楠�', hide: true}
-    ,{field: 'danger$', align: 'center',title: '鍗遍櫓鍝�', hide: true}
+    ,{field: 'danger$', align: 'center',title: '寰呭垽', hide: false}
     // ,{field: 'status$', align: 'center',title: '鐘舵��'}
     // ,{field: 'createBy$', align: 'center',title: '娣诲姞浜哄憳'}
     // ,{field: 'createTime$', align: 'center',title: '娣诲姞鏃堕棿'}
@@ -256,7 +256,7 @@
     ,{field: 'deadWarn', align: 'center',title: '棰勮澶╂暟', hide: true}
     ,{field: 'source$', align: 'center',title: '鍒惰喘', hide: true}
     ,{field: 'check$', align: 'center',title: '瑕佹眰妫�楠�', hide: true}
-    ,{field: 'danger$', align: 'center',title: '鍗遍櫓鍝�', hide: true}
+    ,{field: 'danger$', align: 'center',title: '寰呭垽', hide: false}
     ,{field: 'rollUp', align: 'center',title: '鍗蜂俊鎭�', hide: true}
 ]
 
diff --git a/src/main/webapp/static/js/locDetl/locDetl.js b/src/main/webapp/static/js/locDetl/locDetl.js
index 5e624fb..9072da6 100644
--- a/src/main/webapp/static/js/locDetl/locDetl.js
+++ b/src/main/webapp/static/js/locDetl/locDetl.js
@@ -34,7 +34,7 @@
         ,{field: 'deadWarn', align: 'center',title: '棰勮澶╂暟', hide: true}
         ,{field: 'source$', align: 'center',title: '鍒惰喘', hide: true}
         ,{field: 'check$', align: 'center',title: '瑕佹眰妫�楠�', hide: true}
-        ,{field: 'danger$', align: 'center',title: '鍗遍櫓鍝�', hide: true}
+        ,{field: 'danger$', align: 'center',title: '寰呭垽', hide: false}
 
     ];
 
diff --git a/src/main/webapp/static/js/manLocDetl/manLocDetl.js b/src/main/webapp/static/js/manLocDetl/manLocDetl.js
index 7744711..6012422 100644
--- a/src/main/webapp/static/js/manLocDetl/manLocDetl.js
+++ b/src/main/webapp/static/js/manLocDetl/manLocDetl.js
@@ -34,7 +34,7 @@
         ,{field: 'deadWarn', align: 'center',title: '棰勮澶╂暟', hide: true}
         ,{field: 'source$', align: 'center',title: '鍒惰喘', hide: true}
         ,{field: 'check$', align: 'center',title: '瑕佹眰妫�楠�', hide: true}
-        ,{field: 'danger$', align: 'center',title: '鍗遍櫓鍝�', hide: true}
+        ,{field: 'danger$', align: 'center',title: '寰呭垽', hide: false}
 
     ];
 
diff --git a/src/main/webapp/static/js/orderDetlGift/orderDetlGift.js b/src/main/webapp/static/js/orderDetlGift/orderDetlGift.js
index 2ee0e49..bbcdefa 100644
--- a/src/main/webapp/static/js/orderDetlGift/orderDetlGift.js
+++ b/src/main/webapp/static/js/orderDetlGift/orderDetlGift.js
@@ -55,7 +55,7 @@
             ,{field: 'deadWarn', align: 'center',title: '棰勮澶╂暟'}
             ,{field: 'source$', align: 'center',title: '鍒惰喘'}
             ,{field: 'inspect$', align: 'center',title: '瑕佹眰妫�楠�'}
-            ,{field: 'danger$', align: 'center',title: '鍗遍櫓鍝�'}
+            ,{field: 'danger$', align: 'center',title: '寰呭垽', hide: false}
             ,{field: 'status$', align: 'center',title: '鐘舵��'}
             ,{field: 'createBy$', align: 'center',title: '娣诲姞浜哄憳'}
             ,{field: 'createTime$', align: 'center',title: '娣诲姞鏃堕棿'}
diff --git a/src/main/webapp/static/js/saas/locDetl.js b/src/main/webapp/static/js/saas/locDetl.js
index 4358fc9..e88414f 100644
--- a/src/main/webapp/static/js/saas/locDetl.js
+++ b/src/main/webapp/static/js/saas/locDetl.js
@@ -35,7 +35,7 @@
         ,{field: 'deadWarn', align: 'center',title: '棰勮澶╂暟', hide: true}
         ,{field: 'source$', align: 'center',title: '鍒惰喘', hide: true}
         ,{field: 'check$', align: 'center',title: '瑕佹眰妫�楠�', hide: true}
-        ,{field: 'danger$', align: 'center',title: '鍗遍櫓鍝�', hide: true}
+        ,{field: 'danger$', align: 'center',title: '寰呭垽', hide: false}
 
     ];
 
diff --git a/src/main/webapp/static/js/wrkDetlSingle/wrkDetlSingle.js b/src/main/webapp/static/js/wrkDetlSingle/wrkDetlSingle.js
index 2103c50..ec92194 100644
--- a/src/main/webapp/static/js/wrkDetlSingle/wrkDetlSingle.js
+++ b/src/main/webapp/static/js/wrkDetlSingle/wrkDetlSingle.js
@@ -56,7 +56,7 @@
             ,{field: 'deadWarn', align: 'center',title: '棰勮澶╂暟'}
             ,{field: 'source$', align: 'center',title: '鍒惰喘'}
             ,{field: 'inspect$', align: 'center',title: '瑕佹眰妫�楠�'}
-            ,{field: 'danger$', align: 'center',title: '鍗遍櫓鍝�'}
+            ,{field: 'danger$', align: 'center',title: '寰呭垽', hide: false}
             ,{field: 'modiUser$', align: 'center',title: '淇敼浜哄憳'}
             ,{field: 'modiTime$', align: 'center',title: '淇敼鏃堕棿'}
             ,{field: 'appeUser$', align: 'center',title: '娣诲姞浜哄憳'}

--
Gitblit v1.9.1