From 33cc8de8a39b88d619cce6e80f13564a85e5dce0 Mon Sep 17 00:00:00 2001
From: 18516761980 <56479841@qq.com>
Date: 星期二, 02 八月 2022 13:00:18 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/OutStockServiceImpl.java | 19 ++++++---
src/main/webapp/views/pakStore/outStockDetail.html | 72 ++++++++++++++++++++++++++++++++---
src/main/resources/application.yml | 2
3 files changed, 78 insertions(+), 15 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/OutStockServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OutStockServiceImpl.java
index c32a211..4cac85d 100644
--- a/src/main/java/com/zy/asrs/service/impl/OutStockServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OutStockServiceImpl.java
@@ -73,13 +73,13 @@
if (tempLocList.size() > 0) {
for (Integer j = 0; j < tempLocList.size(); j ++) {
locNum = locNum.add(new BigDecimal(tempLocList.get(j).getAnfme()));
- /* 璁＄畻闇�瑕佺殑鏁伴噺锛岀鍚堟暟閲忓悗缁撴潫寰幆 */
- if (needNum.compareTo(locNum) == 1) {
+// /* 璁＄畻闇�瑕佺殑鏁伴噺锛岀鍚堟暟閲忓悗缁撴潫寰幆 */
+// if (needNum.compareTo(locNum) == 1) {
locList.add(tempLocList.get(j));
- } else {
- locList.add(tempLocList.get(j));
- break;
- }
+// } else {
+// locList.add(tempLocList.get(j));
+// break;
+// }
}
}
}
@@ -166,7 +166,8 @@
// 鑾峰彇搴撲綅鏄庣粏
List<LocDetlDto> locDetlDtos = new ArrayList<>();
for (StockOutParam.LocDetl paramLocDetl : param.getLocDetls()) {
- if (!Cools.isEmpty(paramLocDetl.getLocNo(), paramLocDetl.getMatnr(), paramLocDetl.getCount())) {
+ if (!Cools.isEmpty(paramLocDetl.getLocNo(), paramLocDetl.getMatnr(), paramLocDetl.getCount())
+ && paramLocDetl.getCount() > 0) {
LocDetl sqlParam = new LocDetl();
sqlParam.setLocNo(paramLocDetl.getLocNo());
sqlParam.setMatnr(paramLocDetl.getMatnr());
@@ -209,6 +210,10 @@
// }
// 鑾峰彇搴撲綅
LocMast locMast = locMastService.selectById(dto.getLocNo());
+ //濡傛灉鎵樼洏鏉＄爜涓虹┖锛屽氨涓嶈兘杩涜鎷ｆ枡锛屾棤娉曞啀鍏ュ簱
+ if(ioType==103 && null!=locMast && Cools.isEmpty(locMast.getBarcode())){
+ throw new CoolException("搴撲綅娌℃湁鎵樼洏鐮侊紝鏃犳硶鎷ｆ枡浣滀笟===>>" + locMast.getLocNo());
+ }
// 鑾峰彇璺緞
Wrapper<StaDesc> wrapper = new EntityWrapper<StaDesc>()
.eq("type_no", ioType)
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index e44999a..2b912a0 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -45,7 +45,7 @@
erp:
db:
driver_class_name: com.microsoft.sqlserver.jdbc.SQLServerDriver
- ur: jdbc:sqlserver://192.168.0.253:1433;databasename=xtyasrs_dual
+ ur: jdbc:sqlserver://localhost:1433;databasename=xtyasrs_dual
# ur: jdbc:sqlserver://192.168.4.208:1433;databasename=xtyasrs_dual
username: sa
password: sa@123
diff --git a/src/main/webapp/views/pakStore/outStockDetail.html b/src/main/webapp/views/pakStore/outStockDetail.html
index 76d6039..352fba7 100644
--- a/src/main/webapp/views/pakStore/outStockDetail.html
+++ b/src/main/webapp/views/pakStore/outStockDetail.html
@@ -21,12 +21,18 @@
<option value="">璇烽�夋嫨绔欑偣</option>
</select>
</div>
- <button class="layui-btn layui-btn-sm" style="display: inline-block" id="btn-outbound" lay-event="outbound"
- onclick="outbound()">鍚姩鍑哄簱
- </button>
+<!-- <button class="layui-btn layui-btn-sm" style="display: inline-block" id="btn-outbound" lay-event="outbound"-->
+<!-- onclick="outbound()">鍚姩鍑哄簱-->
+<!-- </button>-->
</div>
<table class="layui-hide" id="stockOut" lay-filter="stockOut"></table>
</div>
+
+<script type="text/html" id="toolbar">
+ <div class="layui-btn-container">
+ <button class="layui-btn" id="btn-confirm" lay-event="outbound" style="">鍚姩鍑哄簱</button>
+ </div>
+</script>
<script type="text/template" id="takeSiteSelectTemplate">
{{#each data}}
@@ -48,9 +54,10 @@
function getCol() {
var cols = [
- {field: '', align: 'center', title: '', width: 50, type: 'numbers'}
- , {field: 'locNo$', align: 'center', title: '搴撲綅鍙�'}
- , {field: 'matnr', align: 'center',title: '鐗╂枡缂栫爜'}
+ {type: 'checkbox'}
+ ,{field: '', align: 'center', title: '', width: 50, type: 'numbers'}
+ ,{field: 'locNo$', align: 'center', title: '搴撲綅鍙�'}
+ ,{field: 'matnr', align: 'center',title: '鐗╂枡缂栫爜'}
,{field: 'maktx', align: 'center',title: '鐗╂枡鍚嶇О', width: 500}
,{field: 'lgnum', align: 'center',title: '瑙勬牸'}
,{field: 'type', align: 'center',title: '鐗╂枡绫诲埆'}
@@ -80,6 +87,7 @@
limit: 9999,
limits: [9999],
even: true,
+ toolbar: '#toolbar',
// cellMinWidth: 50,
cols: [getCol()],
request: {
@@ -99,7 +107,7 @@
if (res.code === 403) {
top.location.href = baseUrl + "/";
}
- locData = res.data;
+ // locData = res.data;
}
});
@@ -122,6 +130,56 @@
}
}
});
+
+ // 鐩戝惉澶村伐鍏锋爮浜嬩欢
+ table.on('toolbar(stockOut)', function (obj) {
+ var checkStatus = table.checkStatus(obj.config.id);
+ locData = checkStatus.data;
+ switch(obj.event) {
+ case 'outbound':
+ if (locData.length === 0){
+ layer.msg("璇烽�夋嫨鏁版嵁");
+ return;
+ }
+ debugger;
+ var staNo = $("#staNoSelect").val();
+ if (staNo === "" || staNo === null){
+ layer.msg("璇烽�夋嫨鍑哄簱鍙�");
+ return;
+ }
+ var locDetls = [];
+ locData.forEach(function(elem) {
+ if (elem.anfme > 0) {
+ locDetls.push({locNo: elem.locNo, matnr: elem.matnr, count: elem.anfme});
+ }
+ });
+ let param = {
+ outSite: staNo,
+ locDetls: locDetls,
+ fbillNo: orderData.fbillNo,
+ }
+ // 璋冪敤鍑哄簱鎺ュ彛
+ $.ajax({
+ url: baseUrl+"/plate/outStock/start",
+ headers: {'token': localStorage.getItem('token')},
+ data: JSON.stringify(param),
+ contentType:'application/json;charset=UTF-8',
+ method: 'POST',
+ success: function (res) {
+ if (res.code === 200){
+ parent.closeDetail(res.msg);
+ parent.tableReload();
+ } else if (res.code === 403){
+ top.location.href = baseUrl+"/";
+ } else {
+ layer.msg(res.msg)
+ }
+ }
+ });
+ break;
+ }
+ });
+
});
/* 鍚姩鍑哄簱 */
--
Gitblit v1.9.1