From 9c468fe6e597c5bb70d64872aa94835d49a60036 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期四, 14 九月 2023 09:47:33 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/mapper/LocDetlMapper.java | 2 ++
src/main/java/com/zy/asrs/service/LocDetlService.java | 3 +++
src/main/webapp/views/saasLog/saasLog.html | 12 ++++++++++--
src/main/java/com/zy/asrs/controller/LocDetlController.java | 10 ++++++++++
src/main/webapp/static/js/locDetlStatis/locDetlStatis.js | 3 +++
src/main/resources/mapper/LocDetlMapper.xml | 19 +++++++++++++++----
src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java | 6 ++++++
7 files changed, 49 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/LocDetlController.java b/src/main/java/com/zy/asrs/controller/LocDetlController.java
index d0ccb1c..746b520 100644
--- a/src/main/java/com/zy/asrs/controller/LocDetlController.java
+++ b/src/main/java/com/zy/asrs/controller/LocDetlController.java
@@ -413,5 +413,15 @@
return R.ok(page);
}
+ @RequestMapping(value = "/locDetl/selectLocF")
+ @ManagerAuth
+ public Boolean selectLocF(@RequestParam String locNo){
+ String s = locDetlService.selectLocNoF(locNo);
+ if (s.equals("F")){
+ return false;
+ }
+ return true;
+ }
+
}
diff --git a/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java b/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java
index 28b280d..c68537d 100644
--- a/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java
@@ -94,4 +94,6 @@
int selectAllPymentcount(LocDetlDTO locDetlDTO);
Double sumAll();
+
+ String selectLocNoF(String locNo);
}
diff --git a/src/main/java/com/zy/asrs/service/LocDetlService.java b/src/main/java/com/zy/asrs/service/LocDetlService.java
index 77b1739..9d0c188 100644
--- a/src/main/java/com/zy/asrs/service/LocDetlService.java
+++ b/src/main/java/com/zy/asrs/service/LocDetlService.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.plugins.Page;
import com.baomidou.mybatisplus.service.IService;
+import com.core.common.R;
import com.zy.asrs.entity.LocDetl;
import com.zy.asrs.entity.result.LocDetlAll;
import com.zy.asrs.entity.result.LocDetlDTO;
@@ -74,4 +75,6 @@
int selectAllCount(LocDetlDTO locDetlDTO);
int selectAllPymentcount(LocDetlDTO locDetlDTO);
+
+ String selectLocNoF(String locNo);
}
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 b083fa9..4f44449 100644
--- a/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.plugins.Page;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import com.core.common.Cools;
+import com.core.common.R;
import com.zy.asrs.entity.LocDetl;
import com.zy.asrs.entity.result.LocDetlAll;
import com.zy.asrs.entity.result.LocDetlDTO;
@@ -183,4 +184,9 @@
public int selectAllPymentcount(LocDetlDTO locDetlDTO) {
return this.baseMapper.selectAllPymentcount(locDetlDTO);
}
+
+ @Override
+ public String selectLocNoF(String locNo) {
+ return this.baseMapper.selectLocNoF(locNo);
+ }
}
diff --git a/src/main/resources/mapper/LocDetlMapper.xml b/src/main/resources/mapper/LocDetlMapper.xml
index 6a64a57..85fba3b 100644
--- a/src/main/resources/mapper/LocDetlMapper.xml
+++ b/src/main/resources/mapper/LocDetlMapper.xml
@@ -558,17 +558,21 @@
</select>
<select id="getStockStatisAll" resultType="com.zy.asrs.entity.result.LocDetlAll">
- select * from
+ select t.*,m.specs from
(
select
ROW_NUMBER() over (order by sum(a.anfme) desc) as row
, a.matnr
, sum(a.anfme) as anfme
+ ,owner
+ ,payment
from asr_loc_detl_all a
where 1=1
<include refid="stockOutCondition"></include>
- group by a.matnr
- ) t where t.row between ((#{pageNumber}-1)*#{pageSize}+1) and (#{pageNumber}*#{pageSize})
+ group by a.matnr,a.owner,a.payment
+ ) t
+ LEFT JOIN man_mat m on t.matnr = m.matnr
+ where t.row between ((#{pageNumber}-1)*#{pageSize}+1) and (#{pageNumber}*#{pageSize})
</select>
<select id="getStockStatisCountAll" parameterType="java.util.Map" resultType="java.lang.Integer">
@@ -576,16 +580,23 @@
(
select
a.matnr
+ ,owner
+ ,payment
from asr_loc_detl_all a
where 1=1
<include refid="stockOutCondition"></include>
- group by a.matnr
+ group by a.matnr,a.owner,a.payment
) b
</select>
<select id="sumAll" resultType="java.lang.Double">
SELECT SUM(anfme) FROM asr_loc_detl_all
</select>
+ <select id="selectLocNoF" resultType="java.lang.String">
+ select loc_sts from asr_loc_detl_F_view
+ where loc_no = #{locNo}
+
+ </select>
</mapper>
diff --git a/src/main/webapp/static/js/locDetlStatis/locDetlStatis.js b/src/main/webapp/static/js/locDetlStatis/locDetlStatis.js
index fd1da33..1cc77fc 100644
--- a/src/main/webapp/static/js/locDetlStatis/locDetlStatis.js
+++ b/src/main/webapp/static/js/locDetlStatis/locDetlStatis.js
@@ -5,6 +5,9 @@
];
arrRemove(detlCols, "field", "anfme")
arrRemove(detlCols, "field", "zpallet")
+ arrRemove(detlCols, "field", "batch")
+ arrRemove(detlCols, "field", "model")
+ arrRemove(detlCols, "field", "weight")
cols.push.apply(cols, detlCols);
// cols.push({field: 'anfme', align: 'center',title: '鏁伴噺', style: 'font-weight: bold'}
// )
diff --git a/src/main/webapp/views/saasLog/saasLog.html b/src/main/webapp/views/saasLog/saasLog.html
index 2211671..25f4b40 100644
--- a/src/main/webapp/views/saasLog/saasLog.html
+++ b/src/main/webapp/views/saasLog/saasLog.html
@@ -18,9 +18,17 @@
<div class="layui-form toolbar" id="search-box">
<div class="layui-form-item">
<div class="layui-inline">
- <label class="layui-form-label">缂栧彿:</label>
+ <label class="layui-form-label">搴撲綅鍙�:</label>
<div class="layui-input-inline">
- <input class="layui-input" type="text" name="id" placeholder="缂栧彿" autocomplete="off">
+ <input class="layui-input" type="text" name="loc_no" placeholder="璇疯緭鍏ュ簱浣嶅彿" autocomplete="off">
+ </div>
+ <label class="layui-form-label">鐗╂枡鍙�:</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="matnr" placeholder="璇疯緭鍏ョ墿鏂欏彿" autocomplete="off">
+ </div>
+ <label class="layui-form-label">鎿嶄綔浜�:</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="create_by_name" placeholder="璇疯緭鍏ユ搷浣滀汉" autocomplete="off">
</div>
</div>
<div class="layui-inline"> 
--
Gitblit v1.9.1