From 2cf7eb592181c2d0baaffcdb66f302bce30ab164 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期四, 24 十月 2024 14:50:34 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java |   14 ++++++++++++++
 1 files changed, 14 insertions(+), 0 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 181a918..e5ba7e8 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -876,6 +876,17 @@
             throw new CoolException("鍙傛暟锛氱墿鏂欐槑缁� matLists涓虹┖");
         }
 
+//        if (Cools.isEmpty(param.getBarcode())){
+//            throw new CoolException("鍙傛暟锛氭墭鐩樼爜 barcode涓虹┖");
+//        }
+//        WrkMast wrkMastMatrix = wrkMastService.selectByBarcode(param.getBarcode());
+//        if (Cools.isEmpty(wrkMastMatrix)){
+//            throw new CoolException("鍙傛暟锛氭墭鐩樼爜鏌ヨ宸ヤ綔妗eけ璐ワ細"+param.getBarcode());
+//        }
+//        if (!wrkMastMatrix.getSheetNo().equals("1")){
+//            throw new CoolException("鍙傛暟锛氭浠诲姟鏈笂鎶ョ姝㈠畬鎴愶細"+param.getBarcode());
+//        }
+
         ArrayList<WrkDetl> wrkDetlsNew = new ArrayList<>();
         ArrayList<WrkDetlSingle> wrkDetlsOld = new ArrayList<>();
         //鍒ゆ柇matLists鍙傛暟
@@ -958,6 +969,9 @@
         if (Cools.isEmpty(wrkMastMatrix)){
             throw new CoolException("鍙傛暟锛氭墭鐩樼爜鏌ヨ宸ヤ綔妗eけ璐ワ細"+param.getBarcode());
         }
+        if (!wrkMastMatrix.getSheetNo().equals("1")){
+            throw new CoolException("鍙傛暟锛氭浠诲姟鏈笂鎶ョ姝㈠畬鎴愶細"+param.getBarcode());
+        }
 
         wrkMastMatrix.setSheetNo("2");
         if (!wrkMastService.updateById(wrkMastMatrix)){

--
Gitblit v1.9.1