From d8e766f29d47e56e3015f72544b994d50afc7a0d Mon Sep 17 00:00:00 2001
From: 王佳豪 <g675230687@126.com>
Date: 星期三, 10 三月 2021 14:00:34 +0800
Subject: [PATCH] 1.0.5 修复库存明细管理的全局模糊查询
---
src/main/java/com/zy/asrs/service/LocDetlService.java | 2 +-
src/main/java/com/zy/asrs/controller/LocDetlController.java | 4 ++--
src/main/java/com/zy/asrs/entity/LocDetl.java | 6 ------
src/main/resources/mapper/LocDetlMapper.xml | 2 +-
src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java | 4 ++--
5 files changed, 6 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/LocDetlController.java b/src/main/java/com/zy/asrs/controller/LocDetlController.java
index 4dad1f7..10d09bf 100644
--- a/src/main/java/com/zy/asrs/controller/LocDetlController.java
+++ b/src/main/java/com/zy/asrs/controller/LocDetlController.java
@@ -194,7 +194,7 @@
*/
@RequestMapping(value = "/locDetl/getAllLocDetlData")
@ManagerAuth
- public List<LocDetl> getAllLocDetlData(String loc_no, String matnr, String matStatusFlag) {
- return locDetlService.getAllLocDetlData(loc_no, matnr, matStatusFlag);
+ public List<LocDetl> getAllLocDetlData(String loc_no, String matnr, String mat_status) {
+ return locDetlService.getAllLocDetlData(loc_no, matnr, mat_status);
}
}
diff --git a/src/main/java/com/zy/asrs/entity/LocDetl.java b/src/main/java/com/zy/asrs/entity/LocDetl.java
index 77279ea..1c860bc 100644
--- a/src/main/java/com/zy/asrs/entity/LocDetl.java
+++ b/src/main/java/com/zy/asrs/entity/LocDetl.java
@@ -87,12 +87,6 @@
@TableField("mat_status")
private String matStatus;
- /**
- * 鐗╂枡鐘舵�佹壒閲忎慨鏀规爣璇�
- */
- @TableField(exist = false)
- private String matStatusFlag;
-
public String getLocNo$(){
LocMastService service = SpringUtils.getBean(LocMastService.class);
LocMast locMast = service.selectById(this.locNo);
diff --git a/src/main/java/com/zy/asrs/service/LocDetlService.java b/src/main/java/com/zy/asrs/service/LocDetlService.java
index cd6a205..617f320 100644
--- a/src/main/java/com/zy/asrs/service/LocDetlService.java
+++ b/src/main/java/com/zy/asrs/service/LocDetlService.java
@@ -30,5 +30,5 @@
* @param matnr
* @return
*/
- List<LocDetl> getAllLocDetlData(String loc_no, String matnr, String matStatusFlag);
+ List<LocDetl> getAllLocDetlData(String loc_no, String matnr, String mat_status);
}
diff --git a/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
index 7bdc702..f78510a 100644
--- a/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
@@ -41,10 +41,10 @@
}
@Override
- public List<LocDetl> getAllLocDetlData(String loc_no, String matnr, String matStatusFlag) {
+ public List<LocDetl> getAllLocDetlData(String loc_no, String matnr, String mat_status) {
List<LocDetl> allLocDetlData = baseMapper.getAllLocDetlData(loc_no, matnr);
for (int i = 0; i < allLocDetlData.size(); i++) {
- allLocDetlData.get(i).setMatStatusFlag(matStatusFlag);
+ allLocDetlData.get(i).setMatStatus(mat_status);
}
baseMapper.updateMatStatus(allLocDetlData);
return baseMapper.getAllLocDetlData(loc_no, matnr);
diff --git a/src/main/resources/mapper/LocDetlMapper.xml b/src/main/resources/mapper/LocDetlMapper.xml
index 9548d3b..81360a4 100644
--- a/src/main/resources/mapper/LocDetlMapper.xml
+++ b/src/main/resources/mapper/LocDetlMapper.xml
@@ -95,7 +95,7 @@
BEGIN
<foreach collection="list" item="item" index="index">
update dbo.asr_loc_detl
- set mat_status = #{item.matStatusFlag,jdbcType=VARCHAR}
+ set mat_status = #{item.matStatus,jdbcType=VARCHAR}
where 1 = 1
<if test="item.locNo!=null and item.locNo!='' ">
and loc_no = #{item.locNo,jdbcType=VARCHAR}
--
Gitblit v1.9.1