From 3185048d258d7a709af56333c83e641e46c6f989 Mon Sep 17 00:00:00 2001
From: 18516761980 <4761516tqsxp>
Date: 星期二, 24 五月 2022 13:04:30 +0800
Subject: [PATCH] #
---
src/main/webapp/views/basDevp/basDevp_detail.html | 4 +-
src/main/java/com/zy/asrs/service/impl/BasCrnpServiceImpl.java | 60 ++++++++++++++++++++++++++---
src/main/webapp/static/js/basDevp/basDevp.js | 2
3 files changed, 56 insertions(+), 10 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 d5fc975..2354694 100644
--- a/src/main/java/com/zy/asrs/service/impl/BasCrnpServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/BasCrnpServiceImpl.java
@@ -4,8 +4,10 @@
import com.core.common.Cools;
import com.core.exception.CoolException;
import com.zy.asrs.entity.BasCrnp;
+import com.zy.asrs.entity.BasDevp;
import com.zy.asrs.mapper.BasCrnpMapper;
import com.zy.asrs.service.BasCrnpService;
+import com.zy.asrs.service.BasDevpService;
import com.zy.asrs.service.WrkMastService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -18,9 +20,8 @@
@Autowired
private WrkMastService wrkMastService;
-
- @Value("${store.bufferCount}")
- private int bufferCount;
+ @Autowired
+ private BasDevpService basDevpService;
@Override
public BasCrnp checkSiteStatus(Integer crnId) {
@@ -46,11 +47,56 @@
}
if (pakin) {
//TODO鎺у埗鍏ュ簱鏆傚瓨鏁帮紝闃叉涓诲共閬撳牭濉烇紝2022-5-24 ADD
- int storeCount = wrkMastService.getStoreCount(crnNo);
- int maxCount = bufferCount;
- if(crnNo==1){
- maxCount = 3;
+ int staNo = 0;
+ switch (crnNo){
+ case 1:
+ staNo = 123;
+ break;
+ case 2:
+ staNo = 121;
+ break;
+ case 3:
+ staNo = 119;
+ break;
+ case 4:
+ staNo = 117;
+ break;
+ case 5:
+ staNo = 115;
+ break;
+ case 6:
+ staNo = 113;
+ break;
+ case 7:
+ staNo = 111;
+ break;
+ case 8:
+ staNo = 109;
+ break;
+ case 9:
+ staNo = 107;
+ break;
+ case 10:
+ staNo = 105;
+ break;
+ case 11:
+ staNo = 103;
+ break;
+ case 12:
+ staNo = 101;
+ break;
}
+ int maxCount = 2;
+ BasDevp devp = basDevpService.selectById(staNo);
+ if(!Cools.isEmpty(devp)){
+ maxCount = devp.getInQty();
+ }
+
+ int storeCount = wrkMastService.getStoreCount(crnNo);
+// int maxCount = bufferCount;
+// if(crnNo==1){
+// maxCount = 3;
+// }
if(storeCount >= maxCount){
log.error("{}鍙峰爢鍨涙満鏆傚瓨鏁板凡婊�!", crnNo);
diff --git a/src/main/webapp/static/js/basDevp/basDevp.js b/src/main/webapp/static/js/basDevp/basDevp.js
index 452d0a6..587e779 100644
--- a/src/main/webapp/static/js/basDevp/basDevp.js
+++ b/src/main/webapp/static/js/basDevp/basDevp.js
@@ -79,7 +79,7 @@
// ,{field: 'wrkNo1', align: 'center',title: ''}
,{field: 'locType1$', align: 'center',title: '楂樹綆'}
,{field: 'barcode', align: 'center',title: '鏉″舰鐮�'}
- // ,{field: 'inQty', align: 'center',title: ''}
+ ,{field: 'inQty', align: 'center',title: '鍏ュ簱鏆傚瓨'}
// ,{field: 'row1', align: 'center',title: ''}
// ,{field: 'ioTime$', align: 'center',title: ''}
// ,{field: 'area', align: 'center',title: ''}
diff --git a/src/main/webapp/views/basDevp/basDevp_detail.html b/src/main/webapp/views/basDevp/basDevp_detail.html
index 6e8155a..aa35a7a 100644
--- a/src/main/webapp/views/basDevp/basDevp_detail.html
+++ b/src/main/webapp/views/basDevp/basDevp_detail.html
@@ -132,8 +132,8 @@
<input id="barcode" class="layui-input" type="text">
</div>
</div>
- <div class="layui-inline" style="width:31%;display: none">
- <label class="layui-form-label">锛�</label>
+ <div class="layui-inline" style="width:31%;">
+ <label class="layui-form-label">鍏ュ簱鏆傚瓨锛�</label>
<div class="layui-input-inline">
<input id="inQty" class="layui-input" type="text">
</div>
--
Gitblit v1.9.1