From 5b957de9535cf32876777eba52ce68e10b4ff24b Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期六, 13 五月 2023 14:42:31 +0800
Subject: [PATCH] 库存冻结
---
src/main/java/com/zy/asrs/mapper/LocDetlMapper.java | 2 ++
src/main/java/com/zy/asrs/service/LocDetlService.java | 2 ++
src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java | 13 +++++++++++++
src/main/resources/mapper/LocDetlMapper.xml | 6 ++++++
src/main/webapp/static/js/mat/mat.js | 1 +
src/main/webapp/views/mat/mat.html | 10 ++++++++++
src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java | 5 +++++
7 files changed, 39 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java b/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java
index 9024877..2e3ecdb 100644
--- a/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java
@@ -67,4 +67,6 @@
List<LocDetl> searchByLike(String orderNo, String matnr, String maktx, String specs, String locNo);//閫氳繃璁㈠崟鍙枫�佺墿鏂欏彿銆佺墿鏂欏悕绉般�佽鏍笺�佸簱浣嶅彿杩涜妯＄硦鎼滅储
+ List<LocDetl> selectByLocNo(String locNo);
+
}
diff --git a/src/main/java/com/zy/asrs/service/LocDetlService.java b/src/main/java/com/zy/asrs/service/LocDetlService.java
index c9c60b4..4b4ccce 100644
--- a/src/main/java/com/zy/asrs/service/LocDetlService.java
+++ b/src/main/java/com/zy/asrs/service/LocDetlService.java
@@ -60,4 +60,6 @@
List<LocDetl> searchByLike(String orderNo, String matnr, String maktx, String specs, String locNo);//閫氳繃璁㈠崟鍙枫�佺墿鏂欏彿銆佺墿鏂欏悕绉般�佽鏍笺�佸簱浣嶅彿杩涜妯＄硦鎼滅储
+ List<LocDetl> selectByLocNo(String locNo);
+
}
diff --git a/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
index 6ad7173..357cb56 100644
--- a/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
@@ -121,4 +121,9 @@
public List<LocDetl> searchByLike(String orderNo, String matnr, String maktx, String specs, String locNo) {
return this.baseMapper.searchByLike(orderNo, matnr, maktx, specs, locNo);
}
+
+ @Override
+ public List<LocDetl> selectByLocNo(String locNo) {
+ return this.baseMapper.selectByLocNo(locNo);
+ }
}
diff --git a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
index 1ea0054..2f55cb9 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -173,6 +173,19 @@
if (sign){
break;
}
+
+ //妫�娴嬪嚭搴撶殑璐х墿涓槸鍚︽湁鐘舵�佷负绂佹鐨勮揣鐗┿��
+ for (LocDetl locDetl : locDetlService.selectByLocNo(locNo)) {
+ Mat mat = matService.selectByMatnr(locDetl.getMatnr());
+ if (mat == null) {
+ continue;
+ }
+ if (mat.getStatus() == 0) {
+ th="搴撲綅鍙凤細"+locNo+" 鏈夌姝㈠嚭搴撶殑璐х墿锛�";
+ throw new CoolException("鍑哄簱澶辫触锛�"+th);
+ }
+ }
+
List<String> groupInsideLoc = Utils.getGroupInsideLoc(locNo);
if (!Cools.isEmpty(groupInsideLoc)) {
for (String insideLoc : groupInsideLoc) {
diff --git a/src/main/resources/mapper/LocDetlMapper.xml b/src/main/resources/mapper/LocDetlMapper.xml
index a922d57..2d0859d 100644
--- a/src/main/resources/mapper/LocDetlMapper.xml
+++ b/src/main/resources/mapper/LocDetlMapper.xml
@@ -341,4 +341,10 @@
and maktx like '%' + #{maktx} + '%';
</if>
</select>
+
+ <select id="selectByLocNo" resultMap="BaseResultMap">
+ select * from asr_loc_detl
+ where 1=1
+ and loc_no = #{locNo}
+ </select>
</mapper>
diff --git a/src/main/webapp/static/js/mat/mat.js b/src/main/webapp/static/js/mat/mat.js
index 6202067..6c1723a 100644
--- a/src/main/webapp/static/js/mat/mat.js
+++ b/src/main/webapp/static/js/mat/mat.js
@@ -8,6 +8,7 @@
,{field: 'storeMax', align: 'center',title: '搴撳瓨涓婇檺',width: 90}
,{field: 'storeMin', align: 'center',title: '搴撳瓨涓嬮檺',width: 90}
,{field: 'storeMaxDate', align: 'center',title: '搴撻緞涓婇檺(澶�)',width: 90}
+ ,{field: 'status$', align: 'center',title: '鐘舵��'}
];
cols.push.apply(cols, matCols);
cols.push(
diff --git a/src/main/webapp/views/mat/mat.html b/src/main/webapp/views/mat/mat.html
index ac62ac0..eb19905 100644
--- a/src/main/webapp/views/mat/mat.html
+++ b/src/main/webapp/views/mat/mat.html
@@ -178,6 +178,7 @@
<input name="createBy" type="hidden">
<input name="updateTime$" type="hidden">
<input name="updateBy" type="hidden">
+ <input name="status" type="hidden">
<div class="layui-row">
@@ -208,6 +209,15 @@
<input name="storeMaxDate" placeholder="搴撻緞涓婇檺(澶�)" type="number" class="layui-input">
</div>
</div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">鐘舵��:</label>
+ <div class="layui-input-block">
+ <select name="status">
+ <option value="1">姝ｅ父</option>
+ <option value="0" selected>绂佺敤</option>
+ </select>
+ </div>
+ </div>
</div>
--
Gitblit v1.9.1