From 3554fb87385f99296dbb372289631933e7603b48 Mon Sep 17 00:00:00 2001
From: gt-fuwuqi <3272660260@qq.com>
Date: 星期二, 29 十月 2024 16:37:49 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/BasCrnpServiceImpl.java | 14 +++++++-------
src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java | 1 +
2 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/BasCrnpServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/BasCrnpServiceImpl.java
index d1a6e17..30a2a24 100644
--- a/src/main/java/com/zy/asrs/service/impl/BasCrnpServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/BasCrnpServiceImpl.java
@@ -57,13 +57,13 @@
if (pakin) {
//鎺у埗鍏ュ簱鏆傚瓨鏁帮紝闃叉涓诲共閬撳牭濉烇紝2022-10-23 ADD 鏈疄瑁�
-// int maxCount = 2;
-// int storeCount = wrkMastService.getStoreCount(crnNo);
-//
-// if(storeCount >= maxCount){
-// log.error("{}鍙峰爢鍨涙満鏆傚瓨鏁板凡婊�!", crnNo);
-// return false;
-// }
+ int maxCount = 6;
+ int storeCount = wrkMastService.getStoreCount(crnNo);
+
+ if(storeCount >= maxCount && crnNo == 1){
+ log.error("{}鍙峰爢鍨涙満鏆傚瓨鏁板凡婊�!", crnNo);
+ return false;
+ }
if ("N".equals(crnp.getInEnable())) {
log.error("{}鍙峰爢鍨涙満涓嶅彲鍏�", crnNo);
diff --git a/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java b/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java
index d906d22..0ec8244 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java
@@ -105,6 +105,7 @@
WrkMastLog wrkMastLog = new WrkMastLog();
wrkMastLog.sync(wrkMast1);
wrkMastLog.setModiTime(now);
+ wrkMastLog.setWrkSts(wrkMast1.getWrkSts().intValue());
if (!wrkMastLogService.insert(wrkMastLog)){
exceptionHandle("淇濆瓨宸ヤ綔鍘嗗彶妗workNo={0}]澶辫触", wrkMast.getWrkNo());
}
--
Gitblit v1.9.1