From e47d5da578f11efd67b1d66242519c09c3cf7c56 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期三, 31 五月 2023 15:10:58 +0800
Subject: [PATCH] 出库合并
---
src/main/webapp/views/home/map.html | 84 +++++++++++++++++++++++++++++++----------
1 files changed, 63 insertions(+), 21 deletions(-)
diff --git a/src/main/webapp/views/home/map.html b/src/main/webapp/views/home/map.html
index 60d7273..5a9e43c 100644
--- a/src/main/webapp/views/home/map.html
+++ b/src/main/webapp/views/home/map.html
@@ -414,9 +414,9 @@
<!--搴撲綅-->
<div v-else-if="map[index][idx].value == 0" @contextmenu.prevent="rightEvent(index,idx,$event)">
<div v-if="map[index][idx].locSts == 'O'" class="pointBox pointBoxBlue">{{ map[index][idx].locSts }}</div>
- <div v-else-if="map[index][idx].locSts == 'F'" @click.left.stop="selectLoc(index,idx)" :class="{'pointBoxSelected':map[index][idx].locOutSelected,'pointBoxSearch':map[index][idx].searchStatus}" class="pointBox pointBoxRed">{{ map[index][idx].locSts }}</div>
+ <div v-else-if="map[index][idx].locSts == 'F'" @click.left="selectLoc(index,idx)" :class="{'pointBoxSelected':map[index][idx].locOutSelected,'pointBoxSearch':map[index][idx].searchStatus}" class="pointBox pointBoxRed">{{ map[index][idx].locSts }}</div>
<div v-else-if="map[index][idx].locSts == 'D'" class="pointBox pointBoxEmpty">{{ map[index][idx].locSts }}</div>
- <div v-else-if="map[index][idx].locSts == 'P'" class="pointBox pointBoxOut">{{ map[index][idx].locSts }}</div>
+ <div v-else-if="map[index][idx].locSts == 'P'" :class="{'pointBoxSearch':map[index][idx].searchStatus}" class="pointBox pointBoxOut">{{ map[index][idx].locSts }}</div>
<div v-else-if="map[index][idx].locSts == 'R'" :class="{'pointBoxSearch':map[index][idx].searchStatus}" class="pointBox pointBoxOutYy">{{ map[index][idx].locSts }}</div>
<div v-else-if="map[index][idx].locSts == 'S'" class="pointBox pointBoxInYy">{{ map[index][idx].locSts }}</div>
<div v-else class="pointBox pointBoxDefault">{{ map[index][idx].locSts }}</div>
@@ -481,6 +481,9 @@
<!-- </div>-->
<div>
<button @click="init" class="layui-btn layui-btn-sm">鍒锋柊</button>
+ </div>
+ <div style="margin-left: 10px;">
+ <button @click="resetSearch" class="layui-btn layui-btn-sm">閲嶇疆</button>
</div>
<div v-if="!locOutStatus" style="margin-left: 10px;">
<button @click="locOutStatus = true" class="layui-btn layui-btn-sm">鍑哄簱閫夋嫨</button>
@@ -689,6 +692,13 @@
deep: true,
handler(val) {
this.init()
+ if (this.searchMatnr != ""
+ || this.searchOrderNo != ""
+ || this.searchSpecs != ""
+ || this.searchMaktx != ""
+ || this.searchLocNo != "") {
+ this.searchLoc()
+ }
}
}
},
@@ -708,6 +718,14 @@
this.locOutLocNo = []
this.getLocStsList();//鑾峰彇搴撲綅鐘舵�佸垪琛�
+ },
+ resetSearch(){
+ this.searchMatnr = ""
+ this.searchOrderNo = ""
+ this.searchSpecs = ""
+ this.searchMaktx = ""
+ this.searchLocNo = ""
+ this.searchLoc()
},
printData() {
this.mapData = JSON.stringify(this.map)
@@ -893,7 +911,26 @@
async: false,
success: function (res) {
if (res.code === 200) {
- locDetls = res.data
+ // locDetls = res.data
+ let data = res.data
+ //鍚堝苟鍚岀被鍨�
+ let tmpLocDetls = []
+ data.forEach((item,index) => {
+ let keyIdx = -1;
+ tmpLocDetls.forEach((val,idx) => {
+ if (val.matnr == item.matnr) {
+ keyIdx = idx
+ }
+ })
+
+ if (keyIdx == -1) {
+ tmpLocDetls.push(item);
+ }else {
+ tmpLocDetls[keyIdx].anfme += item.anfme
+ }
+ })
+
+ locDetls = tmpLocDetls
} else if (res.code === 403) {
top.location.href = baseUrl + "/";
} else {
@@ -902,29 +939,34 @@
}
})
+ let alertText = "鍗冲皢鍑哄簱" + locDetls.length + "涓墿鏂�<br/>"
locDetls.forEach((item,index) => {
item.count = item.anfme
+ alertText += "鐗╂枡鍙凤細" + item.matnr + "锛�" + item.anfme + "涓�<br/>"
})
- $.ajax({
- url: baseUrl + "/plate/out/start",
- headers: {'token': localStorage.getItem('token')},
- data: JSON.stringify({
- outSite: this.outSite,
- locDetls: locDetls
- }),
- contentType:'application/json;charset=UTF-8',
- method: 'POST',
- success: function (res) {
- if (res.code === 200){
- $layui.layer.msg(res.msg);
- that.init()
- } else if (res.code === 403){
- top.location.href = baseUrl+"/";
- } else {
- $layui.layer.msg(res.msg)
+ layer.confirm(alertText, {title: '鍑哄簱浣滀笟', shadeClose: true, area: ['auto']}, function(){
+ $.ajax({
+ url: baseUrl + "/plate/out/start",
+ headers: {'token': localStorage.getItem('token')},
+ data: JSON.stringify({
+ outSite: that.outSite,
+ locDetls: locDetls
+ }),
+ contentType:'application/json;charset=UTF-8',
+ method: 'POST',
+ success: function (res) {
+ if (res.code === 200){
+ $layui.layer.msg(res.msg);
+ that.init()
+ } else if (res.code === 403){
+ top.location.href = baseUrl+"/";
+ } else {
+ $layui.layer.msg(res.msg)
+ }
}
- }
+ });
+ layer.closeAll();
});
},
searchDataIndex(data,dist) {
--
Gitblit v1.9.1