From d8c7f7a5715428f5c0034856ceaff0d091dad5d7 Mon Sep 17 00:00:00 2001
From: yxFwq <1>
Date: 星期四, 28 十一月 2024 09:32:27 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/task/handler/BareBoardHandler.java  |    2 +-
 src/main/java/com/zy/asrs/entity/param/CombParam.java         |    2 +-
 src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java |    8 ++++++--
 src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java   |    2 +-
 src/main/java/com/zy/asrs/utils/CodeDetectionUtil.java        |    7 +++++--
 5 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/zy/asrs/entity/param/CombParam.java b/src/main/java/com/zy/asrs/entity/param/CombParam.java
index b9af2f6..ba95e72 100644
--- a/src/main/java/com/zy/asrs/entity/param/CombParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/CombParam.java
@@ -32,7 +32,7 @@
         private String batch;
 
         // 鐗╂枡鏁伴噺
-        private Double anfme;
+        private Double anfme = 1.0;
 
         // 鍟嗗搧鍚嶇О
         private String maktx;
diff --git a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
index 50ea838..2762165 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -669,7 +669,9 @@
                 waitPakin.setBatch(detlDto.getBatch());
                 waitPakin.setZpallet(param.getBarcode());   // 鎵樼洏鐮�
                 waitPakin.setIoStatus("N");     // 鍏ュ嚭鐘舵��
-                waitPakin.setAnfme(detlDto.getAnfme());  // 鏁伴噺
+//                waitPakin.setAnfme(detlDto.getAnfme());  // 鏁伴噺
+                waitPakin.setAnfme(1.0);  // 鏁伴噺
+                waitPakin.setWeight(mat.getWeight());  // 閲嶉噺
                 waitPakin.setStatus("Y");    // 鐘舵��
                 waitPakin.setAppeUser(userId);
                 waitPakin.setAppeTime(now);
@@ -719,8 +721,10 @@
                 waitPakin.setBatch(detlDto.getBatch());     // 搴忓垪鐮�
                 waitPakin.setZpallet(param.getBarcode());   // 鎵樼洏鐮�
                 waitPakin.setIoStatus("N");     // 鍏ュ嚭鐘舵��
-                waitPakin.setAnfme(detlDto.getAnfme());  // 鏁伴噺
+//                waitPakin.setAnfme(detlDto.getAnfme());  // 鏁伴噺
+                waitPakin.setAnfme(1.0);  // 鏁伴噺
                 waitPakin.setStatus("Y");    // 鐘舵��
+                waitPakin.setWeight(mat.getWeight());  // 閲嶉噺
                 waitPakin.setAppeUser(userId);
                 waitPakin.setAppeTime(now);
                 waitPakin.setModiUser(userId);
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 401d9c5..b88327a 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -1199,7 +1199,7 @@
             throw new CoolException("鍝佸彿 matnr,璇峰厛涓嬪彂鍩虹妗f锛侊紒锛�");
         }
         if (Cools.isEmpty(mat.getUnits())){
-            throw new CoolException("鍝佸彿 matnr,閲嶉噺鑼冨洿鍋忕Щ鍊间负绌猴紒锛侊紒,璇峰厛涓嬪彂鍩虹妗f锛侊紒锛�");
+            throw new CoolException("鍝佸彿 matnr,閲嶉噺鑼冨洿鍋忕Щ鍊间负绌猴紒锛侊紒,璇峰厛缁存姢鍩虹妗f锛侊紒锛�");
         }
 
         ArrayList<Integer> crns =new ArrayList<>();
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 a4e411b..35f9a89 100644
--- a/src/main/java/com/zy/asrs/task/handler/BareBoardHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/BareBoardHandler.java
@@ -177,7 +177,7 @@
             }
             crnList.add(CodeDetectionUtil.crnCodeDetectionMax(new int[]{crnCount[0],crnCount[1]})[0]+1);
             crnList.add(CodeDetectionUtil.crnCodeDetectionMax(new int[]{crnCount[2],crnCount[3],crnCount[4]})[0]+3);
-            crnList.add(CodeDetectionUtil.crnCodeDetectionMaxT(new int[]{crnCount[2],crnCount[3],crnCount[4]},crnList.get(1))[0]+3);
+            crnList.add(CodeDetectionUtil.crnCodeDetectionMaxT(new int[]{crnCount[2],crnCount[3],crnCount[4]},crnList.get(1)-3)[0]+3);
             crnList.add(CodeDetectionUtil.crnCodeDetectionMax(new int[]{crnCount[5],crnCount[6]})[0]+6);
             crnList.add(1);
             crnList.add(2);
diff --git a/src/main/java/com/zy/asrs/utils/CodeDetectionUtil.java b/src/main/java/com/zy/asrs/utils/CodeDetectionUtil.java
index fd32bb9..f8df8bc 100644
--- a/src/main/java/com/zy/asrs/utils/CodeDetectionUtil.java
+++ b/src/main/java/com/zy/asrs/utils/CodeDetectionUtil.java
@@ -37,11 +37,14 @@
     /**
      * 妫�娴嬫暟缁勬渶澶у�煎強鍏剁储寮�
      */
-    public static int[] crnCodeDetectionMaxT(int[] arr,Integer crnNo) {
+    public static int[] crnCodeDetectionMaxT(int[] arr,Integer crnNoIndex) {
         int max = arr[0];
+        if (crnNoIndex == 0){
+            max = arr[1];
+        }
         int index = 0;
         for (int i = 0; i < arr.length; i++) {
-            if (crnNo == i+1){
+            if (crnNoIndex == i){
                 continue;
             }
             if (arr[i] > max) {

--
Gitblit v1.9.1