From f8bdc51fe4c57a250fb1240056d767883b7d6739 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期二, 12 十二月 2023 16:49:17 +0800
Subject: [PATCH] Merge branch 'tzskasrs-1' of http://47.97.1.152:5880/r/zy-asrs into tzskasrs-1

---
 src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

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 801d692..9aeabad 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -77,9 +77,9 @@
     @Override
     @Transactional
     public void comb(CombParam param, Long userId) {
-        if (Cools.isEmpty(param.getBarcode(), param.getCombMats())) {
-            throw new CoolException(BaseRes.PARAM);
-        }
+//        if (Cools.isEmpty(param.getBarcode(), param.getCombMats())) {
+//            throw new CoolException(BaseRes.PARAM);
+//        }
         // 鍒ゆ柇鏄惁鏈夌浉鍚屾潯鐮佺殑鏁版嵁
         if (waitPakinService.selectCount(new EntityWrapper<WaitPakin>().
                 eq("zpallet", param.getBarcode()).eq("io_status", "N")) > 0) {

--
Gitblit v1.9.1