From 445facd938541f2d5362fdb591020c41d8b485c7 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期一, 08 九月 2025 14:06:44 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/common/service/CommonService.java |   18 ++++++++++--------
 1 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index 6b29b4d..ca16ea9 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -169,15 +169,17 @@
                 }
             }
 
-            //妫�娴嬫槸鍚︿负鍛嗘粸鏂�
-            String matnr = findLocNoAttributeVo.getMatnr();
-            Mat mat = matService.selectByMatnr(matnr);
-            if (mat == null) {
-                throw new CoolException(matnr + "鐗╂枡淇℃伅涓嶅瓨鍦�");
-            }
+            if (staDescId != 10) {
+                //妫�娴嬫槸鍚︿负鍛嗘粸鏂�
+                String matnr = findLocNoAttributeVo.getMatnr();
+                Mat mat = matService.selectByMatnr(matnr);
+                if (mat == null) {
+                    throw new CoolException(matnr + "鐗╂枡淇℃伅涓嶅瓨鍦�");
+                }
 
-            if (mat.getTscp() != null && mat.getTscp() == 1) {
-                crnList.add(0, 1);
+                if (mat.getTscp() != null && mat.getTscp() == 1) {
+                    crnList.add(0, 1);
+                }
             }
         }else if (barcode.startsWith("16")) {
             crnList.add(6);

--
Gitblit v1.9.1