From 4e2a1d3479dfa9a6e5a0d976cfcb8ed9a4cfc2f9 Mon Sep 17 00:00:00 2001
From: yxFwq <1>
Date: 星期四, 11 七月 2024 14:35:30 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java |   15 +++------------
 1 files changed, 3 insertions(+), 12 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 aeded4d..219590d 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -1091,8 +1091,6 @@
             throw new CoolException("鍙傛暟锛氱墿鏂欑紪鐮� matnr涓虹┖");
         }else if (Cools.isEmpty(param.getWeight())){
             throw new CoolException("鍙傛暟锛氱墿鏂欓噸閲� wright涓虹┖");
-        }else if (Cools.isEmpty(param.getColor())){
-            throw new CoolException("鍙傛暟锛氱墿鏂欓鑹� color涓虹┖");
         }
 
         Mat mat = matService.selectByMatnr(param.getMatnr());
@@ -1126,7 +1124,7 @@
         if (Cools.isEmpty(basDevp.getBarcode())){
             throw new CoolException("鐮佸灈浣嶇紪鍙� palletizingNo="+param.getStaNo()+" 鎵�澶勭珯鐐规枡绠辩爜寮傚父鐘舵�侊紱鏂欑鐮�==銆嬩负绌�"+basDevp.getBarcode());
         }
-        if (CodeDetectionUtil.barcodeDetection(basDevp.getBarcode(),8)){
+        if (!CodeDetectionUtil.barcodeDetection(basDevp.getBarcode(),8)){
             throw new CoolException("鐮佸灈浣嶇紪鍙� palletizingNo="+param.getStaNo()+" 鎵�澶勭珯鐐规枡绠辩爜寮傚父鐘舵�侊紱鏂欑鐮侊細"+basDevp.getBarcode());
         }
 
@@ -1180,8 +1178,6 @@
             throw new CoolException("鍙傛暟锛氬搧鍙� matnr涓虹┖");
         }else if (Cools.isEmpty(param.getWeight())){
             throw new CoolException("鍙傛暟锛氱墿鏂欓噸閲� wright涓虹┖");
-        }else if (Cools.isEmpty(param.getColor())){
-            throw new CoolException("鍙傛暟锛氱墿鏂欓鑹� color涓虹┖");
         }
 
         List<LocDetl> locDetls = locDetlService.selectList(new EntityWrapper<LocDetl>().eq("matnr", param.getMatnr()).eq("weight", param.getWeight()).eq("color", param.getColor()));
@@ -1209,10 +1205,7 @@
             throw new CoolException("鍙傛暟锛氱墿鏂欑紪鐮� matnr涓虹┖");
         }else if (Cools.isEmpty(param.getWeight())){
             throw new CoolException("鍙傛暟锛氱墿鏂欓噸閲� wright涓虹┖");
-        }else if (Cools.isEmpty(param.getColor())){
-            throw new CoolException("鍙傛暟锛氱墿鏂欓鑹� color涓虹┖");
         }
-
         Mat mat = matService.selectByMatnr(param.getMatnr());
         if (Cools.isEmpty(mat)) {
 //            mat = new Mat();
@@ -1244,7 +1237,7 @@
         if (Cools.isEmpty(basDevp.getBarcode())){
             throw new CoolException("鐮佸灈浣嶇紪鍙� palletizingNo="+param.getStaNo()+" 鎵�澶勭珯鐐规枡绠辩爜寮傚父鐘舵�侊紱鏂欑鐮�==銆嬩负绌�"+basDevp.getBarcode());
         }
-        if (CodeDetectionUtil.barcodeDetection(basDevp.getBarcode(),8)){
+        if (!CodeDetectionUtil.barcodeDetection(basDevp.getBarcode(),8)){
             throw new CoolException("鐮佸灈浣嶇紪鍙� palletizingNo="+param.getStaNo()+" 鎵�澶勭珯鐐规枡绠辩爜寮傚父鐘舵�侊紱鏂欑鐮侊細"+basDevp.getBarcode());
         }
 
@@ -1297,8 +1290,6 @@
             throw new CoolException("鍙傛暟锛氱墿鏂欑紪鐮� matnr涓虹┖");
         }else if (Cools.isEmpty(param.getWeight())){
             throw new CoolException("鍙傛暟锛氱墿鏂欓噸閲� wright涓虹┖");
-        }else if (Cools.isEmpty(param.getColor())){
-            throw new CoolException("鍙傛暟锛氱墿鏂欓鑹� color涓虹┖");
         }
 
         Mat mat = matService.selectByMatnr(param.getMatnr());
@@ -1321,7 +1312,7 @@
         if (Cools.isEmpty(basDevp.getBarcode())){
             throw new CoolException("鐮佸灈浣嶇紪鍙� palletizingNo="+param.getStaNo()+" 鎵�澶勭珯鐐规枡绠辩爜寮傚父鐘舵�侊紱鏂欑鐮�==銆嬩负绌�"+basDevp.getBarcode());
         }
-        if (CodeDetectionUtil.barcodeDetection(basDevp.getBarcode(),8)){
+        if (!CodeDetectionUtil.barcodeDetection(basDevp.getBarcode(),8)){
             throw new CoolException("鐮佸灈浣嶇紪鍙� palletizingNo="+param.getStaNo()+" 鎵�澶勭珯鐐规枡绠辩爜寮傚父鐘舵�侊紱鏂欑鐮侊細"+basDevp.getBarcode());
         }
 

--
Gitblit v1.9.1