From 5d53d2306e8c93baeb61b1dc3579256775f0dc20 Mon Sep 17 00:00:00 2001
From: lsh <1>
Date: 星期六, 13 一月 2024 19:51:43 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java |   10 ++++++----
 1 files changed, 6 insertions(+), 4 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 ff3bf4a..d17cace 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -79,9 +79,8 @@
     @Override
     @Transactional
     public void trussComb(TrussCombParam param, Long userId) {
-//        if (Cools.isEmpty(param.getBarcode(), param.getCombMats())) {
-//            throw new CoolException(BaseRes.PARAM);
-//        }
+        param.setUuid(String.valueOf(new Date().getTime()));
+
     }
     @Override
     @Transactional
@@ -690,7 +689,10 @@
         wrkMast.setEmptyMk("N"); // 绌烘澘
         wrkMast.setLinkMis("N");
         wrkMast.setAppeUser(userId); // 鎿嶄綔浜哄憳鏁版嵁
-        wrkMast.setSheetNo("0");  //寰愬伐姹変簯鎷嗗灈鏍囪锛�0: 鏈媶  1: 宸叉媶  2:宸插鐞嗗彲涓嬩竴姝ワ紙杞巻鍙叉。锛�
+        wrkMast.setSheetNo("0");  //寰愬伐姹変簯鎷嗗灈鏍囪锛�0: 鍒濆  1: 鏈媶  2:宸叉媶 3锛氬凡澶勭悊鍙笅涓�姝ワ紙杞巻鍙叉。锛�
+        if (wrkMast.getStaNo()<118 || wrkMast.getStaNo()>121){
+            wrkMast.setSheetNo("3");
+        }
         wrkMast.setAppeTime(now);
         wrkMast.setModiUser(userId);
         wrkMast.setModiTime(now);

--
Gitblit v1.9.1