From 61593c7f55cf24d81746aa041e60d0ccccd8b80a Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期五, 19 六月 2020 09:30:08 +0800
Subject: [PATCH] #
---
src/main/webapp/static/js/pakStore/stockAdjust.js | 25 ++++++++----
src/main/webapp/views/pakStore/stockOut.html | 2 -
src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java | 4 +-
src/main/webapp/views/pakStore/locDetlQuery.html | 7 ---
src/main/webapp/static/js/pakStore/pakStore.js | 13 ++++++
src/main/webapp/static/js/pakStore/stockOut.js | 22 +++++++++++
6 files changed, 54 insertions(+), 19 deletions(-)
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 0cee4ff..e69c42a 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -143,8 +143,6 @@
@Override
@Transactional
public void stockOut(BasDevp staNo, List<LocDetlDto> locDetlDtos, Long userId) {
- // 鐢熸垚宸ヤ綔鍙�
- int workNo = commonService.getWorkNo(DEFAULT_WORK_NO_TYPE);
// 鍚堝苟鍚岀被椤�
Set<String> locNos = new HashSet<>();
locDetlDtos.forEach(dto -> locNos.add(dto.getLocDetl().getLocNo()));
@@ -174,6 +172,8 @@
if (Cools.isEmpty(staDesc)) {
throw new CoolException("鍑哄簱璺緞涓嶅瓨鍦�");
}
+ // 鐢熸垚宸ヤ綔鍙�
+ int workNo = commonService.getWorkNo(DEFAULT_WORK_NO_TYPE);
// 鐢熸垚宸ヤ綔妗�
WrkMast wrkMast = new WrkMast();
wrkMast.setWrkNo(workNo);
diff --git a/src/main/webapp/static/js/pakStore/pakStore.js b/src/main/webapp/static/js/pakStore/pakStore.js
index 1bccce2..2e2c251 100644
--- a/src/main/webapp/static/js/pakStore/pakStore.js
+++ b/src/main/webapp/static/js/pakStore/pakStore.js
@@ -177,7 +177,18 @@
// 娣诲姞琛ㄦ牸鏁版嵁
function addTableData(data) {
for (var i=0;i<data.length;i++){
- data[i]["count"] = initCountVal;
+ let pass = false;
+ for (var j=0;j<matCodeData.length;j++){
+ if (data[i].matNo === matCodeData[j].matNo) {
+ pass = true;
+ break;
+ }
+ }
+ if (pass) {
+ data.splice(i--, 1);
+ } else {
+ data[i]["count"] = initCountVal;
+ }
}
matCodeData.push.apply(matCodeData, data);
tableIns.reload({data: matCodeData});
diff --git a/src/main/webapp/static/js/pakStore/stockAdjust.js b/src/main/webapp/static/js/pakStore/stockAdjust.js
index d227469..2275614 100644
--- a/src/main/webapp/static/js/pakStore/stockAdjust.js
+++ b/src/main/webapp/static/js/pakStore/stockAdjust.js
@@ -229,14 +229,23 @@
function addTableData(data) {
let applyData = [];
for (var i=0;i<data.length;i++){
- applyData.push({
- count: initCountVal,
- anfme: initAnfmeVal,
- removeBtn: true,
- matnr: data[i].matNo,
- maktx: data[i].matName,
- altme: data[i].str1,
- })
+ let pass = false;
+ for (var j=0;j<matCodeData.length;j++){
+ if (data[i].matNo === matCodeData[j].matnr) {
+ pass = true;
+ break;
+ }
+ }
+ if (!pass) {
+ applyData.push({
+ count: initCountVal,
+ anfme: initAnfmeVal,
+ removeBtn: true,
+ matnr: data[i].matNo,
+ maktx: data[i].matName,
+ altme: data[i].str1,
+ })
+ }
}
matCodeData.push.apply(matCodeData,applyData);
tableIns.reload({data: matCodeData});
diff --git a/src/main/webapp/static/js/pakStore/stockOut.js b/src/main/webapp/static/js/pakStore/stockOut.js
index 65e3c95..dc7c6d1 100644
--- a/src/main/webapp/static/js/pakStore/stockOut.js
+++ b/src/main/webapp/static/js/pakStore/stockOut.js
@@ -160,3 +160,25 @@
}
});
}
+
+// 娣诲姞琛ㄦ牸鏁版嵁
+function addTableData(data) {
+ for (var i=0;i<data.length;i++){
+ let pass = false;
+ for (var j=0;j<locDetlData.length;j++){
+ if (data[i].matnr === locDetlData[j].matnr && data[i].locNo$ === locDetlData[j].locNo$) {
+ pass = true;
+ break;
+ }
+ }
+ if (pass) {
+ data.splice(i--, 1);
+ } else {
+ data[i]["count"] = data[i]["anfme"];
+ }
+
+ }
+ locDetlData.push.apply(locDetlData, data);
+ tableIns.reload({data: locDetlData});
+ layer.close(locDetlLayerIdx);
+}
\ No newline at end of file
diff --git a/src/main/webapp/views/pakStore/locDetlQuery.html b/src/main/webapp/views/pakStore/locDetlQuery.html
index 3dbec62..7aa9f1e 100644
--- a/src/main/webapp/views/pakStore/locDetlQuery.html
+++ b/src/main/webapp/views/pakStore/locDetlQuery.html
@@ -161,12 +161,7 @@
layer.msg("璇烽�夋嫨鏁版嵁");
return;
}
- for (var i=0;i<data.length;i++){
- data[i]["count"] = data[i]["anfme"];
- }
- parent.locDetlData.push.apply(parent.locDetlData, data);
- parent.tableIns.reload({data: parent.locDetlData});
- parent.layer.close(parent.locDetlLayerIdx);
+ parent.addTableData(data);
break;
}
});
diff --git a/src/main/webapp/views/pakStore/stockOut.html b/src/main/webapp/views/pakStore/stockOut.html
index f74eb0a..39da831 100644
--- a/src/main/webapp/views/pakStore/stockOut.html
+++ b/src/main/webapp/views/pakStore/stockOut.html
@@ -22,8 +22,6 @@
padding-bottom: 20px;
}
-
-
#staNoSpan {
text-align: center;
display: inline-block;
--
Gitblit v1.9.1