From b6c164d8df3582664f8f77ec405dfd070a5694be Mon Sep 17 00:00:00 2001 From: 18516761980 <4761516tqsxp> Date: 星期二, 24 五月 2022 10:59:07 +0800 Subject: [PATCH] # --- src/main/java/com/zy/asrs/service/WrkMastService.java | 6 ++++++ src/main/java/com/zy/asrs/service/impl/BasCrnpServiceImpl.java | 18 ++++++++++++++++++ src/main/java/com/zy/asrs/service/impl/WrkMastServiceImpl.java | 6 ++++++ src/main/resources/application.yml | 4 ++++ 4 files changed, 34 insertions(+), 0 deletions(-) diff --git a/src/main/java/com/zy/asrs/service/WrkMastService.java b/src/main/java/com/zy/asrs/service/WrkMastService.java index 379f629..ff9c2ba 100644 --- a/src/main/java/com/zy/asrs/service/WrkMastService.java +++ b/src/main/java/com/zy/asrs/service/WrkMastService.java @@ -15,4 +15,10 @@ WrkMast selectByBarcode(String barcode); + /** + * 浠庡伐浣滄。寰楀埌绔欑偣鍏ュ簱鏆傚瓨鏁� + * @param crnNo + * @return + */ + int getStoreCount(Integer crnNo); } 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 9000b84..20287f1 100644 --- a/src/main/java/com/zy/asrs/service/impl/BasCrnpServiceImpl.java +++ b/src/main/java/com/zy/asrs/service/impl/BasCrnpServiceImpl.java @@ -6,12 +6,21 @@ import com.zy.asrs.entity.BasCrnp; import com.zy.asrs.mapper.BasCrnpMapper; import com.zy.asrs.service.BasCrnpService; +import com.zy.asrs.service.WrkMastService; import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; @Slf4j @Service("basCrnpService") public class BasCrnpServiceImpl extends ServiceImpl<BasCrnpMapper, BasCrnp> implements BasCrnpService { + + @Autowired + private WrkMastService wrkMastService; + + @Value("${store.bufferCount}") + private int bufferCount; @Override public BasCrnp checkSiteStatus(Integer crnId) { @@ -36,6 +45,15 @@ return false; } if (pakin) { + //TODO鎺у埗鍏ュ簱鏆傚瓨鏁帮紝闃叉涓诲共閬撳牭濉烇紝2022-5-24 ADD + int storeCount = wrkMastService.getStoreCount(crnNo); +// int maxCount = 2; + + if(storeCount >= bufferCount){ + log.error("{}鍙峰爢鍨涙満鏆傚瓨鏁板凡婊�!", crnNo); + return false; + } + if ("N".equals(crnp.getInEnable())) { log.error("{}鍙峰爢鍨涙満涓嶅彲鍏�", crnNo); return false; diff --git a/src/main/java/com/zy/asrs/service/impl/WrkMastServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WrkMastServiceImpl.java index 85ef4d2..ab394ec 100644 --- a/src/main/java/com/zy/asrs/service/impl/WrkMastServiceImpl.java +++ b/src/main/java/com/zy/asrs/service/impl/WrkMastServiceImpl.java @@ -39,4 +39,10 @@ return wrkMasts.get(0); } + @Override + public int getStoreCount(Integer crnNo) { + return selectCount(new EntityWrapper<WrkMast>().eq("crn_no", crnNo) + .last(" and (wrk_sts in (1,2) or (wrk_sts=3 and wrk_no in (select wrk_no from asr_bas_devp)))")); + } + } diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 28be799..fb9b212 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -51,3 +51,7 @@ # 涓�涓爢鍨涙満璐熻矗鐨勮揣鏋舵帓鏁� groupCount: 4 +#鍏ュ簱鏆傚瓨鏁� +store: + bufferCount: 2 + -- Gitblit v1.9.1