From a75b2d52ab0dcdb180705727dd2176bc5094d3a9 Mon Sep 17 00:00:00 2001
From: 王佳豪 <g675230687@126.com>
Date: 星期五, 12 三月 2021 09:26:24 +0800
Subject: [PATCH] 1.0.3 优化平仓管理，增加id主键传入，出库权限判断，增加出库和移除确认弹窗
---
src/main/java/com/zy/asrs/service/impl/LocNormalServiceImpl.java | 12 +++---
src/main/java/com/zy/asrs/controller/LocNormalController.java | 6 +-
src/main/webapp/static/js/locNormal/locNormal.js | 54 ++++++++++++++++++--------
src/main/java/com/zy/asrs/mapper/LocNormalMapper.java | 6 +-
src/main/resources/mapper/LocNormalMapper.xml | 6 +-
src/main/webapp/views/locNormal/locNormal.html | 4 ++
src/main/java/com/zy/asrs/service/LocNormalService.java | 7 ++-
7 files changed, 60 insertions(+), 35 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/LocNormalController.java b/src/main/java/com/zy/asrs/controller/LocNormalController.java
index 64d82cc..d2db347 100644
--- a/src/main/java/com/zy/asrs/controller/LocNormalController.java
+++ b/src/main/java/com/zy/asrs/controller/LocNormalController.java
@@ -103,7 +103,7 @@
public void updateLocNormal(LocNormal param) {
Long modiUser = getUserId();
Date modiTime = new Date();
- locNormalService.updateLocNormal(param.getMatnr(), param.getAnfme(), modiUser, modiTime);
+ locNormalService.updateLocNormal(param.getMatnr(), param.getAnfme(), modiUser, modiTime, param.getId());
}
@RequestMapping(value = "/locNormal/outLoc/auth")
@@ -111,7 +111,7 @@
public void outLocNormal(LocNormal param) {
Long modiUser = getUserId();
Date modiTime = new Date();
- locNormalService.outLocNormal(param.getMatnr(), modiUser, modiTime);
+ locNormalService.outLocNormal(param.getMatnr(), modiUser, modiTime, param.getId());
}
@RequestMapping(value = "/locNormal/removeLoc/auth")
@@ -119,7 +119,7 @@
public void removeLoc(LocNormal param) {
Long modiUser = getUserId();
Date modiTime = new Date();
- locNormalService.removeLocNormal(param.getMatnr(), modiUser, modiTime);
+ locNormalService.removeLocNormal(param.getMatnr(), modiUser, modiTime, param.getId());
}
/* 瀵煎叆 */
diff --git a/src/main/java/com/zy/asrs/mapper/LocNormalMapper.java b/src/main/java/com/zy/asrs/mapper/LocNormalMapper.java
index 52dcc8a..bda3fd0 100644
--- a/src/main/java/com/zy/asrs/mapper/LocNormalMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/LocNormalMapper.java
@@ -18,11 +18,11 @@
public interface LocNormalMapper extends BaseMapper<LocNormal> {
List<LocNormal> getLocNormalData();
- public void updateLocNormal(@Param("matnr") String matnr,@Param("anfme") BigDecimal anfme, @Param("modiUser") Long modiUser, @Param("modiTime") Date modiTime);
+ public void updateLocNormal(@Param("matnr") String matnr,@Param("anfme") BigDecimal anfme, @Param("modiUser") Long modiUser, @Param("modiTime") Date modiTime, @Param("id") Integer id);
- public void outLocNormal(@Param("matnr") String matnr, @Param("modiUser") Long modiUser, @Param("modiTime") Date modiTime);
+ public void outLocNormal(@Param("matnr") String matnr, @Param("modiUser") Long modiUser, @Param("modiTime") Date modiTime, @Param("id") Integer id);
- public void removeLocNormal(@Param("matnr") String matnr, @Param("modiUser") Long modiUser, @Param("modiTime") Date modiTime);
+ public void removeLocNormal(@Param("matnr") String matnr, @Param("modiUser") Long modiUser, @Param("modiTime") Date modiTime, @Param("id") Integer id);
public void locNormalIn(List<LocNormal> list);
diff --git a/src/main/java/com/zy/asrs/service/LocNormalService.java b/src/main/java/com/zy/asrs/service/LocNormalService.java
index 83c4ae9..bde76fa 100644
--- a/src/main/java/com/zy/asrs/service/LocNormalService.java
+++ b/src/main/java/com/zy/asrs/service/LocNormalService.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.service.IService;
import com.zy.asrs.entity.LocNormal;
+import io.swagger.models.auth.In;
import java.math.BigDecimal;
import java.util.Date;
@@ -10,11 +11,11 @@
public interface LocNormalService extends IService<LocNormal> {
List<LocNormal> getLocNormalData();
- public void updateLocNormal(String matnr, BigDecimal anfme, Long modiUser, Date modiTime);
+ public void updateLocNormal(String matnr, BigDecimal anfme, Long modiUser, Date modiTime, Integer id);
- public void outLocNormal(String matnr, Long modiUser, Date modiTime);
+ public void outLocNormal(String matnr, Long modiUser, Date modiTime, Integer id);
- public void removeLocNormal(String matnr, Long modiUser, Date modiTime);
+ public void removeLocNormal(String matnr, Long modiUser, Date modiTime, Integer id);
public void locNormalIn(List<LocNormal> list);
diff --git a/src/main/java/com/zy/asrs/service/impl/LocNormalServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/LocNormalServiceImpl.java
index 0451917..1a27ccd 100644
--- a/src/main/java/com/zy/asrs/service/impl/LocNormalServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/LocNormalServiceImpl.java
@@ -21,18 +21,18 @@
}
@Override
- public void updateLocNormal(String matnr, BigDecimal anfme, Long modiUser, Date modiTime) {
- baseMapper.updateLocNormal(matnr, anfme, modiUser, modiTime);
+ public void updateLocNormal(String matnr, BigDecimal anfme, Long modiUser, Date modiTime, Integer id) {
+ baseMapper.updateLocNormal(matnr, anfme, modiUser, modiTime, id);
}
@Override
- public void outLocNormal(String matnr, Long modiUser, Date modiTime) {
- baseMapper.outLocNormal(matnr, modiUser, modiTime);
+ public void outLocNormal(String matnr, Long modiUser, Date modiTime, Integer id) {
+ baseMapper.outLocNormal(matnr, modiUser, modiTime, id);
}
@Override
- public void removeLocNormal(String matnr, Long modiUser, Date modiTime) {
- baseMapper.removeLocNormal(matnr, modiUser, modiTime);
+ public void removeLocNormal(String matnr, Long modiUser, Date modiTime, Integer id) {
+ baseMapper.removeLocNormal(matnr, modiUser, modiTime, id);
}
@Override
diff --git a/src/main/resources/mapper/LocNormalMapper.xml b/src/main/resources/mapper/LocNormalMapper.xml
index e37045b..6246f17 100644
--- a/src/main/resources/mapper/LocNormalMapper.xml
+++ b/src/main/resources/mapper/LocNormalMapper.xml
@@ -30,17 +30,17 @@
<update id="updateLocNormal">
update asr_loc_normal set anfme = #{anfme,jdbcType=DECIMAL},
modi_user = #{modiUser, jdbcType=DECIMAL}, modi_time = #{modiTime, jdbcType=TIMESTAMP}
- where matnr = #{matnr,jdbcType=VARCHAR}
+ where matnr = #{matnr,jdbcType=VARCHAR} and id = #{id, jdbcType=DECIMAL}
</update>
<update id="outLocNormal">
update asr_loc_normal set state = '2',modi_user = #{modiUser, jdbcType=DECIMAL},
- modi_time = #{modiTime, jdbcType=TIMESTAMP} where matnr = #{matnr,jdbcType=VARCHAR}
+ modi_time = #{modiTime, jdbcType=TIMESTAMP} where matnr = #{matnr,jdbcType=VARCHAR} and id = #{id, jdbcType=DECIMAL}
</update>
<update id="removeLocNormal">
update asr_loc_normal set state = '3',modi_user = #{modiUser, jdbcType=DECIMAL},
- modi_time = #{modiTime, jdbcType=TIMESTAMP} where matnr = #{matnr,jdbcType=VARCHAR}
+ modi_time = #{modiTime, jdbcType=TIMESTAMP} where matnr = #{matnr,jdbcType=VARCHAR} and id = #{id, jdbcType=DECIMAL}
</update>
<insert id="locNormalIn">
diff --git a/src/main/webapp/static/js/locNormal/locNormal.js b/src/main/webapp/static/js/locNormal/locNormal.js
index fd64c13..607bb86 100644
--- a/src/main/webapp/static/js/locNormal/locNormal.js
+++ b/src/main/webapp/static/js/locNormal/locNormal.js
@@ -174,6 +174,7 @@
table.on('edit(locNormal)', function (obj) {
var count = obj.value;
var matnr = obj.data.matnr;
+ var id = obj.data.id;
if (isNaN(count)) {
layer.msg("璇疯緭鍏ユ暟瀛�");
@@ -198,6 +199,7 @@
const param = {
matnr: matnr,
anfme: count,
+ id: id,
}
$.ajax({
url: baseUrl + "/locNormal/update/auth",
@@ -227,30 +229,48 @@
var data = obj.data;
var param = {
matnr: data.matnr,
+ id: data.id,
}
switch (obj.event) {
case 'outLocNormal':
- // 鍑哄簱
- $.ajax({
- url: baseUrl + "/locNormal/outLoc/auth",
- headers: {'token': localStorage.getItem('token')},
- data: top.reObject(param),
- method: 'POST',
- success: function (res) {
- tableReload(false);
- },
+ layer.confirm('纭畾瑕佸嚭搴揫'+data.matnr+']鍚楋紵', {
+ btn: ['纭畾', '鍙栨秷'] //鍙互鏃犻檺涓寜閽�
+ }, function(index, layero){
+ //纭畾鍥炶皟-鍑哄簱
+ $.ajax({
+ url: baseUrl + "/locNormal/outLoc/auth",
+ headers: {'token': localStorage.getItem('token')},
+ data: top.reObject(param),
+ method: 'POST',
+ success: function (res) {
+ tableReload(false);
+ layer.closeAll();
+ layer.msg("鍑哄簱鎴愬姛");
+ },
+ });
+ }, function(index){
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
});
break;
case 'removeLocNormal':
// 绉婚櫎
- $.ajax({
- url: baseUrl + "/locNormal/removeLoc/auth",
- headers: {'token': localStorage.getItem('token')},
- data: top.reObject(param),
- method: 'POST',
- success: function (res) {
- tableReload(false);
- },
+ layer.confirm('纭畾瑕佺Щ闄'+data.matnr+']鍚楋紵', {
+ btn: ['纭畾', '鍙栨秷'] //鍙互鏃犻檺涓寜閽�
+ }, function(index, layero){
+ //纭畾鍥炶皟-绉婚櫎
+ $.ajax({
+ url: baseUrl + "/locNormal/removeLoc/auth",
+ headers: {'token': localStorage.getItem('token')},
+ data: top.reObject(param),
+ method: 'POST',
+ success: function (res) {
+ tableReload(false);
+ layer.closeAll();
+ layer.msg("绉婚櫎鎴愬姛");
+ },
+ });
+ }, function(index){
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
});
break;
}
diff --git a/src/main/webapp/views/locNormal/locNormal.html b/src/main/webapp/views/locNormal/locNormal.html
index 83b0570..6283083 100644
--- a/src/main/webapp/views/locNormal/locNormal.html
+++ b/src/main/webapp/views/locNormal/locNormal.html
@@ -163,7 +163,11 @@
}}
</script>
<script type="text/html" id="operate">
+ {{# if(d.state === '1'){ }}
<button class="layui-btn layui-btn-xs layui-btn-normal" lay-event="outLocNormal">鍑哄簱</button>
+ {{# } else { }}
+ <button class="layui-btn layui-btn-xs layui-btn-disabled">鍑哄簱</button>
+ {{# } }}
<button class="layui-btn layui-btn-xs layui-btn-danger" lay-event="removeLocNormal">绉婚櫎</button>
</script>
--
Gitblit v1.9.1