From 55ae06700679184e017d9868000870ecf4e6c4aa Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期四, 18 六月 2020 15:08:22 +0800
Subject: [PATCH] #
---
src/main/webapp/static/js/pakStore/stockAdjust.js | 3 ++-
src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java | 14 ++++++++++++++
src/main/webapp/views/pakStore/stockAdjust.html | 2 ++
src/main/webapp/views/pakStore/matQuery.html | 3 +++
4 files changed, 21 insertions(+), 1 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 b4b5928..449f603 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -460,7 +460,21 @@
}
@Override
+ @Transactional
public void adjustLocDetl(LocDetlAdjustParam param, Long userId) {
+ LocMast locMast = locMastService.selectById(param.getLocNo());
+ if (Cools.isEmpty(locMast)) {
+ throw new CoolException("搴撲綅涓嶅瓨鍦�");
+ }
+ // 娓呴櫎鏃у簱瀛樻槑缁�
+ locDetlService.delete(new EntityWrapper<LocDetl>().eq("loc_no", locMast.getLocNo()));
+ // 淇濆瓨鏂板簱瀛樻槑缁�
+ for (LocDetlAdjustParam.LocDetlAdjust adjust : param.getList()) {
+ LocDetl locDetl = new LocDetl();
+ if (!locDetlService.insert(locDetl)) {
+ throw new CoolException("淇濆瓨搴撳瓨鏄庣粏澶辫触");
+ }
+ }
}
diff --git a/src/main/webapp/static/js/pakStore/stockAdjust.js b/src/main/webapp/static/js/pakStore/stockAdjust.js
index 28bbd96..ebb896d 100644
--- a/src/main/webapp/static/js/pakStore/stockAdjust.js
+++ b/src/main/webapp/static/js/pakStore/stockAdjust.js
@@ -1,5 +1,6 @@
var initCountVal = 0;
var initAnfmeVal = "-";
+var removeBtn = true;
var matCodeData = [];
var currLocNo;
layui.use(['table','laydate', 'form'], function() {
@@ -118,7 +119,7 @@
anfme: data[i].anfme,
matNo: data[i].matnr,
matName: data[i].maktx,
-
+ removeBtn: false
})
}
locTips(true, locNo);
diff --git a/src/main/webapp/views/pakStore/matQuery.html b/src/main/webapp/views/pakStore/matQuery.html
index 44e1dcc..ccc8cba 100644
--- a/src/main/webapp/views/pakStore/matQuery.html
+++ b/src/main/webapp/views/pakStore/matQuery.html
@@ -121,6 +121,9 @@
if (!isEmpty(parent.initAnfmeVal)) {
data[i]["anfme"] = parent.initAnfmeVal;
}
+ if (!isEmpty(parent.removeBtn)) {
+ data[i]["removeBtn"] = parent.removeBtn;
+ }
}
data.push.apply(data, parent.matCodeData);
parent.matCodeData = data;
diff --git a/src/main/webapp/views/pakStore/stockAdjust.html b/src/main/webapp/views/pakStore/stockAdjust.html
index 2a50bd3..d01976d 100644
--- a/src/main/webapp/views/pakStore/stockAdjust.html
+++ b/src/main/webapp/views/pakStore/stockAdjust.html
@@ -107,7 +107,9 @@
<!-- 琛� -->
<script type="text/html" id="operate">
+ {{# if(d.removeBtn){ }}
<a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="remove">绉婚櫎</a>
+ {{# } }}
</script>
<!-- 琛ㄦ牸 -->
--
Gitblit v1.9.1