From 75dc23fc85b58eda27f5df277a7e55cdb0e49c38 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期六, 06 三月 2021 13:28:04 +0800
Subject: [PATCH] #
---
src/main/webapp/views/home/console.html | 105 ++++++++--------------------------
src/main/resources/mapper/LocDetlMapper.xml | 7 ++
src/main/java/zy/cloud/wms/manager/controller/ConsoleController.java | 9 +++
src/main/java/zy/cloud/wms/manager/mapper/LocDetlMapper.java | 2
src/main/java/zy/cloud/wms/manager/service/LocDetlService.java | 8 ++
src/main/java/zy/cloud/wms/manager/service/impl/LocDetlServiceImpl.java | 6 ++
src/main/java/zy/cloud/wms/common/service/MainService.java | 13 +++-
7 files changed, 68 insertions(+), 82 deletions(-)
diff --git a/src/main/java/zy/cloud/wms/common/service/MainService.java b/src/main/java/zy/cloud/wms/common/service/MainService.java
index dbc4645..a3779ee 100644
--- a/src/main/java/zy/cloud/wms/common/service/MainService.java
+++ b/src/main/java/zy/cloud/wms/common/service/MainService.java
@@ -73,9 +73,16 @@
if (!pakoutService.insert(pakout)) {
throw new CoolException("淇濆瓨鍑哄簱閫氱煡鍗曞け璐�");
}
- // 淇敼搴撳瓨鏄庣粏鏁伴噺
- if (!locDetlService.reduceStock(locDetl.getNodeId(), mat.getMatnr(), issued>=locDetl.getAnfme()?locDetl.getAnfme():issued)) {
- throw new CoolException("淇敼搴撳瓨鏄庣粏鏁伴噺澶辫触");
+ if (issued>=locDetl.getAnfme()) {
+ // 鍒犻櫎搴撳瓨鏄庣粏
+ if (!locDetlService.removeStock(locDetl.getNodeId(), mat.getMatnr())) {
+ throw new CoolException("鍒犻櫎搴撳瓨鏄庣粏澶辫触");
+ }
+ } else {
+ // 淇敼搴撳瓨鏄庣粏鏁伴噺
+ if (!locDetlService.reduceStock(locDetl.getNodeId(), mat.getMatnr(), issued)) {
+ throw new CoolException("淇敼搴撳瓨鏄庣粏鏁伴噺澶辫触");
+ }
}
// 鍓╀綑寰呭嚭鏁伴噺閫掑噺
issued = issued - locDetl.getAnfme();
diff --git a/src/main/java/zy/cloud/wms/manager/controller/ConsoleController.java b/src/main/java/zy/cloud/wms/manager/controller/ConsoleController.java
index ac158ae..daebb99 100644
--- a/src/main/java/zy/cloud/wms/manager/controller/ConsoleController.java
+++ b/src/main/java/zy/cloud/wms/manager/controller/ConsoleController.java
@@ -113,11 +113,20 @@
for (int i=0;i<safeQuaList.size();i++) {
safeQuaList.get(i).put("no", i+1);
}
+ // 搴撳瓨婊炵暀
+ List<Map<String, Object>> retentionList = jdbcTemplate.queryForList("select top 6 CONVERT(decimal, DATEDIFF(second, man_loc_detl.create_time, GETDATE()) / 86400.0, 9) AS stayDays, * from man_loc_detl order by create_time desc");
+ for (int i=0;i<retentionList.size();i++) {
+ retentionList.get(i).put("no", i+1);
+ Object create_time = combList.get(i).get("create_time");
+ retentionList.get(i).put("createTime", String.valueOf(create_time).substring(0, 11));
+
+ }
return R.ok().add(Cools
.add("combList", combList) // 缁勬墭鏈�鏂板姩鎬�
.add("pakoutList", pakoutList) // 鏈�鏂版嫞璐у崟
.add("safeQuaList", safeQuaList) // 瀹夊叏搴撳瓨璀﹀憡
+ .add("retentionList", retentionList) // 搴撳瓨婊炵暀鏁版嵁
);
}
diff --git a/src/main/java/zy/cloud/wms/manager/mapper/LocDetlMapper.java b/src/main/java/zy/cloud/wms/manager/mapper/LocDetlMapper.java
index 7fd26eb..8571c54 100644
--- a/src/main/java/zy/cloud/wms/manager/mapper/LocDetlMapper.java
+++ b/src/main/java/zy/cloud/wms/manager/mapper/LocDetlMapper.java
@@ -21,6 +21,8 @@
Integer reduceStock(@Param("nodeId") Long nodeId, @Param("matnr") String matnr, @Param("anfme") Double anfme);
+ Integer removeStock(@Param("nodeId") Long nodeId, @Param("matnr") String matnr);
+
List<LocDetl> selectByPrior(@Param("matnr") String matnr, @Param("nodeId") Long nodeId);
}
diff --git a/src/main/java/zy/cloud/wms/manager/service/LocDetlService.java b/src/main/java/zy/cloud/wms/manager/service/LocDetlService.java
index 7fb30c0..63fe39d 100644
--- a/src/main/java/zy/cloud/wms/manager/service/LocDetlService.java
+++ b/src/main/java/zy/cloud/wms/manager/service/LocDetlService.java
@@ -25,4 +25,12 @@
*/
Boolean reduceStock(Long nodeId, String matnr, Double anfme);
+ /**
+ * 鍒犻櫎搴撳瓨
+ * @param nodeId
+ * @param matnr
+ * @return
+ */
+ Boolean removeStock(Long nodeId, String matnr);
+
}
diff --git a/src/main/java/zy/cloud/wms/manager/service/impl/LocDetlServiceImpl.java b/src/main/java/zy/cloud/wms/manager/service/impl/LocDetlServiceImpl.java
index c95d61b..0578a6e 100644
--- a/src/main/java/zy/cloud/wms/manager/service/impl/LocDetlServiceImpl.java
+++ b/src/main/java/zy/cloud/wms/manager/service/impl/LocDetlServiceImpl.java
@@ -82,5 +82,11 @@
return this.baseMapper.reduceStock(nodeId, matnr, anfme)>0;
}
+ @Override
+ public Boolean removeStock(Long nodeId, String matnr) {
+ return this.baseMapper.removeStock(nodeId, matnr)>0;
+ }
+
+
}
diff --git a/src/main/resources/mapper/LocDetlMapper.xml b/src/main/resources/mapper/LocDetlMapper.xml
index 752afc0..2589254 100644
--- a/src/main/resources/mapper/LocDetlMapper.xml
+++ b/src/main/resources/mapper/LocDetlMapper.xml
@@ -76,6 +76,13 @@
and matnr = #{matnr}
</update>
+ <update id="removeStock">
+ delete from man_loc_detl
+ where 1=1
+ and node_id = #{nodeId}
+ and matnr = #{matnr}
+ </update>
+
<select id="selectByPrior" resultMap="BaseResultMap">
select
mld.*
diff --git a/src/main/webapp/views/home/console.html b/src/main/webapp/views/home/console.html
index 6e8561e..ee9aa1f 100644
--- a/src/main/webapp/views/home/console.html
+++ b/src/main/webapp/views/home/console.html
@@ -306,91 +306,19 @@
<col/>
<col/>
<col/>
- <col width="160"/>
+ <col width="300"/>
</colgroup>
<thead>
<tr>
<td></td>
- <td>椤圭洰鍚嶇О</td>
- <td align="center">寮�濮嬫椂闂�</td>
- <td align="center">鎴嚦鏃堕棿</td>
- <td align="center">鐘舵��</td>
- <td align="center">杩涘害</td>
+ <td align="center">璐т綅</td>
+ <td align="center">缃叆鏃堕棿</td>
+ <td align="center">婊炵暀澶╂暟</td>
+ <td align="center">鍟嗗搧缂栫爜</td>
+ <td align="center">鍟嗗搧鍚嶇О</td>
</tr>
</thead>
- <tbody>
- <tr>
- <td>1</td>
- <td><span class="layui-text"><a>浠撳簱绠＄悊绯荤粺</a></span></td>
- <td align="center">2020-03-01</td>
- <td align="center">2020-06-01</td>
- <td align="center"><span class="text-success">杩涜涓�</span></td>
- <td>
- <div class="layui-progress" lay-showPercent="yes">
- <div class="layui-progress-bar" lay-percent="30%"></div>
- </div>
- </td>
- </tr>
- <tr>
- <td>2</td>
- <td><span class="layui-text"><a>妗ｆ绠＄悊绯荤粺</a></span></td>
- <td align="center">2020-03-01</td>
- <td align="center">2020-08-01</td>
- <td align="center"><span class="text-success">杩涜涓�</span></td>
- <td>
- <div class="layui-progress" lay-showPercent="yes">
- <div class="layui-progress-bar" lay-percent="10%"></div>
- </div>
- </td>
- </tr>
- <tr>
- <td>3</td>
- <td><span class="layui-text"><a>鍚庡彴绠＄悊绯荤粺</a></span></td>
- <td align="center">2020-01-01</td>
- <td align="center">2020-05-01</td>
- <td align="center"><span class="text-danger">宸插欢鏈�</span></td>
- <td>
- <div class="layui-progress" lay-showPercent="yes">
- <div class="layui-progress-bar" lay-percent="60%"></div>
- </div>
- </td>
- </tr>
- <tr>
- <td>4</td>
- <td><span class="layui-text"><a>绮儏鐩戞祴绯荤粺</a></span></td>
- <td align="center">2020-06-01</td>
- <td align="center">2020-10-01</td>
- <td align="center"><span class="text-warning">鏈紑濮�</span></td>
- <td>
- <div class="layui-progress" lay-showPercent="yes">
- <div class="layui-progress-bar" lay-percent="0%"></div>
- </div>
- </td>
- </tr>
- <tr>
- <td>5</td>
- <td><span class="layui-text"><a>椤圭洰00000001</a></span></td>
- <td align="center">2020-01-01</td>
- <td align="center">2020-04-01</td>
- <td align="center"><span class="text-muted">宸插畬鎴�</span></td>
- <td>
- <div class="layui-progress" lay-showPercent="yes">
- <div class="layui-progress-bar" lay-percent="90%"></div>
- </div>
- </td>
- </tr>
- <tr>
- <td>6</td>
- <td><span class="layui-text"><a>椤圭洰00000002</a></span></td>
- <td align="center">2020-01-01</td>
- <td align="center">2020-03-01</td>
- <td align="center"><span class="text-muted">宸插畬鎴�</span></td>
- <td>
- <div class="layui-progress" lay-showPercent="yes">
- <div class="layui-progress-bar" lay-percent="100%"></div>
- </div>
- </td>
- </tr>
+ <tbody id="retentionList">
</tbody>
</table>
</div>
@@ -550,6 +478,11 @@
var template3 = Handlebars.compile(tpl3);
var html3 = template3(res.data);
$('#safeQuaList').append(html3);
+ // 搴撳瓨婊炵暀
+ var tpl4 = $('#retentionTpl').html();
+ var template4 = Handlebars.compile(tpl4);
+ var html4 = template4(res.data);
+ $('#retentionList').append(html4);
} else if (res.code === 403) {
top.location.href = baseUrl + "/";
} else {
@@ -597,5 +530,19 @@
</div>
{{/each}}
</script>
+<script type="text/template" id="retentionTpl">
+ {{#each retentionList}}
+ <tr>
+ <td>{{no}}</td>
+ <td align="center"><span class="layui-text"><a>{{loc_no}}</a></span></td>
+ <td align="center">{{createTime}}</td>
+ <td align="center"><span style="font-weight: bold">{{stayDays}}</span> 澶�</td>
+ <td align="center"><span class="text-success">{{matnr}}</span></td>
+ <td align="center">
+ <span style="overflow: hidden;text-overflow: ellipsis;white-space: nowrap;">{{maktx}}</span>
+ </td>
+ </tr>
+ {{/each}}
+</script>
</body>
</html>
--
Gitblit v1.9.1