From 186505641e95a73bac6cf3ddfe640acb3d06de6d Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期五, 26 三月 2021 09:09:28 +0800
Subject: [PATCH] #
---
src/main/resources/mapper/PriorMapper.xml | 61 ++++++-
src/main/java/zy/cloud/wms/manager/mapper/PriorMapper.java | 5
src/main/java/zy/cloud/wms/manager/service/impl/PriorServiceImpl.java | 8 +
src/main/java/zy/cloud/wms/manager/service/PriorService.java | 6
src/main/java/zy/cloud/wms/manager/controller/PriorController.java | 19 +-
src/main/webapp/static/js/safeSto/safeSto.js | 331 ----------------------------------------
6 files changed, 80 insertions(+), 350 deletions(-)
diff --git a/src/main/java/zy/cloud/wms/manager/controller/PriorController.java b/src/main/java/zy/cloud/wms/manager/controller/PriorController.java
index f12a80e..52cda01 100644
--- a/src/main/java/zy/cloud/wms/manager/controller/PriorController.java
+++ b/src/main/java/zy/cloud/wms/manager/controller/PriorController.java
@@ -13,9 +13,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import zy.cloud.wms.common.web.BaseController;
-import zy.cloud.wms.manager.entity.Mat;
-import zy.cloud.wms.manager.entity.Node;
-import zy.cloud.wms.manager.entity.Prior;
+import zy.cloud.wms.manager.entity.*;
import zy.cloud.wms.manager.service.MatService;
import zy.cloud.wms.manager.service.NodeService;
import zy.cloud.wms.manager.service.PriorService;
@@ -32,18 +30,19 @@
@Autowired
private NodeService nodeService;
+ /**
+ * 瀹夊叏搴撳瓨璀﹀憡鍒嗛〉
+ * @param curr
+ * @param limit
+ * @param param
+ * @return
+ */
@RequestMapping(value = "/safeSto/list/auth")
@ManagerAuth
public R safeStoList(@RequestParam(defaultValue = "1")Integer curr,
@RequestParam(defaultValue = "10")Integer limit,
- @RequestParam(required = false)String orderByField,
- @RequestParam(required = false)String orderByType,
@RequestParam Map<String, Object> param){
- EntityWrapper<Prior> wrapper = new EntityWrapper<>();
- excludeTrash(param);
- convert(param, wrapper);
- if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
- return R.ok(priorService.selectPage(new Page<>(curr, limit), wrapper));
+ return R.ok(priorService.getSafeQtyPage(toPage(curr, limit, param, SafeStoDo.class)));
}
/***************************************************/
diff --git a/src/main/java/zy/cloud/wms/manager/mapper/PriorMapper.java b/src/main/java/zy/cloud/wms/manager/mapper/PriorMapper.java
index 01f9044..f09d975 100644
--- a/src/main/java/zy/cloud/wms/manager/mapper/PriorMapper.java
+++ b/src/main/java/zy/cloud/wms/manager/mapper/PriorMapper.java
@@ -7,11 +7,14 @@
import zy.cloud.wms.manager.entity.SafeStoDo;
import java.util.List;
+import java.util.Map;
@Mapper
@Repository
public interface PriorMapper extends BaseMapper<Prior> {
- List<SafeStoDo> selectSafeStoPage();
+ List<SafeStoDo> selectSafeStoPage(Map<String, Object> map);
+
+ Integer selectSafeStoPageCount(Map<String, Object> map);
}
diff --git a/src/main/java/zy/cloud/wms/manager/service/PriorService.java b/src/main/java/zy/cloud/wms/manager/service/PriorService.java
index 6fdf02d..ebea4d1 100644
--- a/src/main/java/zy/cloud/wms/manager/service/PriorService.java
+++ b/src/main/java/zy/cloud/wms/manager/service/PriorService.java
@@ -1,8 +1,12 @@
package zy.cloud.wms.manager.service;
-import zy.cloud.wms.manager.entity.Prior;
+import com.baomidou.mybatisplus.plugins.Page;
import com.baomidou.mybatisplus.service.IService;
+import zy.cloud.wms.manager.entity.Prior;
+import zy.cloud.wms.manager.entity.SafeStoDo;
public interface PriorService extends IService<Prior> {
+ Page<SafeStoDo> getSafeQtyPage(Page<SafeStoDo> page);
+
}
diff --git a/src/main/java/zy/cloud/wms/manager/service/impl/PriorServiceImpl.java b/src/main/java/zy/cloud/wms/manager/service/impl/PriorServiceImpl.java
index 0e8d061..0037ca8 100644
--- a/src/main/java/zy/cloud/wms/manager/service/impl/PriorServiceImpl.java
+++ b/src/main/java/zy/cloud/wms/manager/service/impl/PriorServiceImpl.java
@@ -1,5 +1,7 @@
package zy.cloud.wms.manager.service.impl;
+import com.baomidou.mybatisplus.plugins.Page;
+import zy.cloud.wms.manager.entity.SafeStoDo;
import zy.cloud.wms.manager.mapper.PriorMapper;
import zy.cloud.wms.manager.entity.Prior;
import zy.cloud.wms.manager.service.PriorService;
@@ -9,4 +11,10 @@
@Service("priorService")
public class PriorServiceImpl extends ServiceImpl<PriorMapper, Prior> implements PriorService {
+ @Override
+ public Page<SafeStoDo> getSafeQtyPage(Page<SafeStoDo> page) {
+ page.setRecords(baseMapper.selectSafeStoPage(page.getCondition()));
+ page.setTotal(baseMapper.selectSafeStoPageCount(page.getCondition()));
+ return page;
+ }
}
diff --git a/src/main/resources/mapper/PriorMapper.xml b/src/main/resources/mapper/PriorMapper.xml
index c3e8e23..1dc19d2 100644
--- a/src/main/resources/mapper/PriorMapper.xml
+++ b/src/main/resources/mapper/PriorMapper.xml
@@ -24,23 +24,62 @@
</resultMap>
+
+ <sql id="pageCondition">
+ <if test="loc_no != null and loc_no != ''">
+ and mld.loc_no like concat('%',#{loc_no},'%')
+ </if>
+ <if test="matnr != null and matnr != ''">
+ and mld.matnr like concat('%',#{matnr},'%')
+ </if>
+ <if test="maktx != null and maktx != ''">
+ and mld.maktx like concat('%',#{maktx},'%')
+ </if>
+ <if test="startTime!=null and endTime!=null">
+ and mld.update_time between #{startTime} and #{endTime}
+ </if>
+ </sql>
+
<select id="selectSafeStoPage" resultType="zy.cloud.wms.manager.entity.SafeStoDo">
+ select * from
+ (
+ select
+ ROW_NUMBER() over (order by mp.create_time desc) as row,
+ mp.node_id,
+ mp.matnr,
+ mp.safe_qua,
+ ls.amount,
+ (cast(round((ls.amount/(mp.safe_qua*1.0))*100,2) as varchar)+'%') as pe
+ from man_prior mp
+ inner join
+ (
+ select
+ node_id,
+ matnr,
+ sum(anfme) as amount
+ from man_loc_detl
+ group by node_id, matnr
+ ) as ls on ls.node_id = mp.node_id and ls.matnr = mp.matnr
+ where 1=1
+ <include refid="pageCondition"></include>
+ ) t where t.row between ((#{pageNumber}-1)*#{pageSize}+1) and (#{pageNumber}*#{pageSize})
+ </select>
+
+ <select id="selectSafeStoPageCount" resultType="java.lang.Integer">
select
- mp.node_id,
- mp.matnr,
- mp.safe_qua,
- ls.amount,
- (cast(round((ls.amount/(mp.safe_qua*1.0))*100,2) as varchar)+'%') as pe
+ count(1) as count
from man_prior mp
inner join
(
- select
- node_id,
- matnr,
- sum(anfme) as amount
- from man_loc_detl
- group by node_id, matnr
+ select
+ node_id,
+ matnr,
+ sum(anfme) as amount
+ from man_loc_detl
+ group by node_id, matnr
) as ls on ls.node_id = mp.node_id and ls.matnr = mp.matnr
+ where 1=1
+ <include refid="pageCondition"></include>
</select>
</mapper>
diff --git a/src/main/webapp/static/js/safeSto/safeSto.js b/src/main/webapp/static/js/safeSto/safeSto.js
index 7d73a3d..1fc4a07 100644
--- a/src/main/webapp/static/js/safeSto/safeSto.js
+++ b/src/main/webapp/static/js/safeSto/safeSto.js
@@ -10,7 +10,7 @@
tableIns = table.render({
elem: '#safeSto',
headers: {token: localStorage.getItem('token')},
- url: baseUrl+'/prior/list/auth',
+ url: baseUrl+'/safeSto/list/auth',
page: true,
limit: 16,
limits: [16, 30, 50, 100, 200, 500],
@@ -19,24 +19,13 @@
cellMinWidth: 50,
cols: [[
{type: 'checkbox'}
-// ,{field: 'id', title: 'ID', sort: true,align: 'center', fixed: 'left', width: 80}
-// ,{field: 'id', align: 'center',title: 'ID'}
-// ,{field: 'uuid', align: 'center',title: '缂栧彿'}
-// ,{field: 'name', align: 'center',title: '鎺ㄨ崘鍚�', hide: true}
- // ,{field: 'matId$', align: 'center',title: '鍏宠仈鍟嗗搧'}
,{field: 'matnr', align: 'center',title: '鍟嗗搧缂栧彿'}
,{field: 'maktx', align: 'center',title: '鍟嗗搧鍚嶇О'}
// ,{field: 'nodeId$', align: 'center',title: '鍏宠仈璐т綅'}
- ,{field: 'nodeName', align: 'center',title: '璐т綅鍚嶇О'}
+ ,{field: 'nodeId', align: 'center',title: '璐т綅鍚嶇О'}
,{field: 'safeQua', align: 'center',title: '瀹夊叏搴撳瓨'}
- ,{field: 'prio', align: 'center',title: '浼樺厛绾�'}
- ,{field: 'barcode', align: 'center',title: '鏉＄爜', hide: true}
- ,{field: 'status$', align: 'center',title: '鐘舵��', hide: true}
- // ,{field: 'createBy$', align: 'center',title: '娣诲姞浜哄憳',event: 'createBy', style: 'cursor:pointer'}
- // ,{field: 'createTime$', align: 'center',title: '娣诲姞鏃堕棿'}
- // ,{field: 'updateBy$', align: 'center',title: '淇敼浜哄憳',event: 'updateBy', style: 'cursor:pointer'}
- // ,{field: 'updateTime$', align: 'center',title: '淇敼鏃堕棿'}
- ,{field: 'memo', align: 'center',title: '澶囨敞', hide: true}
+ ,{field: 'amount', align: 'center',title: '瀹為檯搴撳瓨'}
+ ,{field: 'pe', align: 'center',title: '杩涘害'}
,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:150}
]],
@@ -72,73 +61,11 @@
}
});
- // 鐩戝惉鎺掑簭浜嬩欢
- table.on('sort(safeSto)', function (obj) {
- var searchData = {};
- $.each($('#search-box [name]').serializeArray(), function() {
- searchData[this.name] = this.value;
- });
- searchData['orderByField'] = obj.field;
- searchData['orderByType'] = obj.type;
- tableIns.reload({
- where: searchData,
- page: {
- curr: 1
- },
- done: function (res, curr, count) {
- if (res.code === 403) {
- top.location.href = baseUrl+"/";
- }
- pageCurr=curr;
- limit();
- }
- });
- });
// 鐩戝惉澶村伐鍏锋爮浜嬩欢
table.on('toolbar(safeSto)', function (obj) {
var checkStatus = table.checkStatus(obj.config.id);
switch(obj.event) {
- case 'addData':
- layer.open({
- type: 2,
- title: '鏂板',
- maxmin: true,
- area: ['30%', top.detailHeight],
- content: 'prior_detail.html',
- success: function(layero, index){
- layer.getChildFrame('#data-detail-submit-edit', index).hide();
- clearFormVal(layer.getChildFrame('#detail', index));
- layer.iframeAuto(index);layer.style(index, {top: (($(window).height()-layer.getChildFrame('#data-detail', index).height())/3)+"px"});
- }
- });
- break;
- case 'deleteData':
- var data = checkStatus.data;
- if (data.length === 0){
- layer.msg('璇烽�夋嫨鏁版嵁');
- } else {
- layer.confirm('纭畾鍒犻櫎'+(data.length===1?'姝�':data.length)+'鏉℃暟鎹悧', function(){
- $.ajax({
- url: baseUrl+"/prior/delete/auth",
- headers: {'token': localStorage.getItem('token')},
- data: {param: JSON.stringify(data)},
- method: 'POST',
- traditional:true,
- success: function (res) {
- if (res.code === 200){
- layer.closeAll();
- tableReload(false);
- } else if (res.code === 403){
- top.location.href = baseUrl+"/";
- } else {
- layer.msg(res.msg)
- }
- }
- })
- });
- }
- break;
case 'exportData':
layer.confirm('纭畾瀵煎嚭Excel鍚�', {shadeClose: true}, function(){
var titles=[];
@@ -222,214 +149,10 @@
}
});
break;
- case 'matId':
- var param = top.reObject(data).matId;
- if (param === undefined) {
- layer.msg("鏃犳暟鎹�");
- } else {
- layer.open({
- type: 2,
- title: '鍏宠仈鍟嗗搧璇︽儏',
- maxmin: true,
- area: [top.detailWidth, top.detailHeight],
- shadeClose: true,
- content: '../mat/mat_detail.html',
- success: function(layero, index){
- $.ajax({
- url: "baseUrl+/mat/"+ param +"/auth",
- headers: {'token': localStorage.getItem('token')},
- method: 'GET',
- success: function (res) {
- if (res.code === 200){
- setFormVal(layer.getChildFrame('#detail', index), res.data, true);
- top.convertDisabled(layer.getChildFrame('#data-detail :input', index), true);
- layer.getChildFrame('#data-detail-submit-save,#data-detail-submit-edit,#prompt', index).hide();
- layer.iframeAuto(index);layer.style(index, {top: (($(window).height()-layer.getChildFrame('#data-detail', index).height())/3)+"px"});
- layero.find('iframe')[0].contentWindow.layui.form.render('select');
- layero.find('iframe')[0].contentWindow.layui.form.render('checkbox');
- } else if (res.code === 403){
- top.location.href = baseUrl+"/";
- }else {
- layer.msg(res.msg)
- }
- }
- })
- }
- });
- }
- break;
- case 'nodeId':
- var param = top.reObject(data).nodeId;
- if (param === undefined) {
- layer.msg("鏃犳暟鎹�");
- } else {
- layer.open({
- type: 2,
- title: '鍏宠仈璐т綅璇︽儏',
- maxmin: true,
- area: [top.detailWidth, top.detailHeight],
- shadeClose: true,
- content: '../node/node_detail.html',
- success: function(layero, index){
- $.ajax({
- url: "baseUrl+/node/"+ param +"/auth",
- headers: {'token': localStorage.getItem('token')},
- method: 'GET',
- success: function (res) {
- if (res.code === 200){
- setFormVal(layer.getChildFrame('#detail', index), res.data, true);
- top.convertDisabled(layer.getChildFrame('#data-detail :input', index), true);
- layer.getChildFrame('#data-detail-submit-save,#data-detail-submit-edit,#prompt', index).hide();
- layer.iframeAuto(index);layer.style(index, {top: (($(window).height()-layer.getChildFrame('#data-detail', index).height())/3)+"px"});
- layero.find('iframe')[0].contentWindow.layui.form.render('select');
- layero.find('iframe')[0].contentWindow.layui.form.render('checkbox');
- } else if (res.code === 403){
- top.location.href = baseUrl+"/";
- }else {
- layer.msg(res.msg)
- }
- }
- })
- }
- });
- }
- break;
- case 'createBy':
- var param = top.reObject(data).createBy;
- if (param === undefined) {
- layer.msg("鏃犳暟鎹�");
- } else {
- layer.open({
- type: 2,
- title: '娣诲姞浜哄憳璇︽儏',
- maxmin: true,
- area: [top.detailWidth, top.detailHeight],
- shadeClose: true,
- content: '../user/user_detail.html',
- success: function(layero, index){
- $.ajax({
- url: "baseUrl+/user/"+ param +"/auth",
- headers: {'token': localStorage.getItem('token')},
- method: 'GET',
- success: function (res) {
- if (res.code === 200){
- setFormVal(layer.getChildFrame('#detail', index), res.data, true);
- top.convertDisabled(layer.getChildFrame('#data-detail :input', index), true);
- layer.getChildFrame('#data-detail-submit-save,#data-detail-submit-edit,#prompt', index).hide();
- layer.iframeAuto(index);layer.style(index, {top: (($(window).height()-layer.getChildFrame('#data-detail', index).height())/3)+"px"});
- layero.find('iframe')[0].contentWindow.layui.form.render('select');
- layero.find('iframe')[0].contentWindow.layui.form.render('checkbox');
- } else if (res.code === 403){
- top.location.href = baseUrl+"/";
- }else {
- layer.msg(res.msg)
- }
- }
- })
- }
- });
- }
- break;
- case 'updateBy':
- var param = top.reObject(data).updateBy;
- if (param === undefined) {
- layer.msg("鏃犳暟鎹�");
- } else {
- layer.open({
- type: 2,
- title: '淇敼浜哄憳璇︽儏',
- maxmin: true,
- area: [top.detailWidth, top.detailHeight],
- shadeClose: true,
- content: '../user/user_detail.html',
- success: function(layero, index){
- $.ajax({
- url: "baseUrl+/user/"+ param +"/auth",
- headers: {'token': localStorage.getItem('token')},
- method: 'GET',
- success: function (res) {
- if (res.code === 200){
- setFormVal(layer.getChildFrame('#detail', index), res.data, true);
- top.convertDisabled(layer.getChildFrame('#data-detail :input', index), true);
- layer.getChildFrame('#data-detail-submit-save,#data-detail-submit-edit,#prompt', index).hide();
- layer.iframeAuto(index);layer.style(index, {top: (($(window).height()-layer.getChildFrame('#data-detail', index).height())/3)+"px"});
- layero.find('iframe')[0].contentWindow.layui.form.render('select');
- layero.find('iframe')[0].contentWindow.layui.form.render('checkbox');
- } else if (res.code === 403){
- top.location.href = baseUrl+"/";
- }else {
- layer.msg(res.msg)
- }
- }
- })
- }
- });
- }
- break;
}
});
- // 鏁版嵁淇濆瓨鍔ㄤ綔
- form.on('submit(save)', function () {
- if (banMsg != null){
- layer.msg(banMsg);
- return;
- }
- method("add");
- });
-
- // 鏁版嵁淇敼鍔ㄤ綔
- form.on('submit(edit)', function () {
- method("update")
- });
-
- function method(name){
- var index = layer.load(1, {
- shade: [0.5,'#000'] //0.1閫忔槑搴︾殑鑳屾櫙
- });
- var data = {
-// id: $('#id').val(),
- id: $('#id').val(),
- uuid: $('#uuid').val(),
- name: $('#name').val(),
- matId: $('#matId').val(),
- matnr: $('#matnr').val(),
- maktx: $('#maktx').val(),
- nodeId: $('#nodeId').val(),
- nodeName: $('#nodeName').val(),
- safeQua: $('#safeQua').val(),
- prio: $('#prio').val(),
- barcode: $('#barcode').val(),
- status: $('#status').val(),
- createBy: $('#createBy').val(),
- createTime: top.strToDate($('#createTime\\$').val()),
- updateBy: $('#updateBy').val(),
- updateTime: top.strToDate($('#updateTime\\$').val()),
- memo: $('#memo').val(),
-
- };
- $.ajax({
- url: baseUrl+"/prior/"+name+"/auth",
- headers: {'token': localStorage.getItem('token')},
- data: top.reObject(data),
- method: 'POST',
- success: function (res) {
- if (res.code === 200){
- parent.layer.closeAll();
- parent.$(".layui-laypage-btn")[0].click();
- $("#data-detail :input").each(function () {
- $(this).val("");
- });
- } else if (res.code === 403){
- top.location.href = baseUrl+"/";
- }else {
- layer.msg(res.msg)
- }
- layer.close(index);
- }
- })
- }
// 澶嶉�夋浜嬩欢
form.on('checkbox(detailCheckbox)', function (data) {
@@ -501,53 +224,7 @@
});
}
-function setFormVal(el, data, showImg) {
- for (var val in data) {
- var find = el.find(":input[id='" + val + "']");
- if (find[0]!=null){
- if (find[0].type === 'checkbox'){
- if (data[val]==='Y'){
- find.attr("checked","checked");
- find.val('Y');
- } else {
- find.remove("checked");
- find.val('N');
- }
- continue;
- }
- }
- find.val(data[val]);
- if (showImg){
- var next = find.next();
- if (next.get(0)){
- if (next.get(0).localName === "img") {
- find.hide();
- next.attr("src", data[val]);
- next.show();
- }
- }
- }
- }
-}
-function clearFormVal(el) {
- $(':input', el)
- .val('')
- .removeAttr('checked')
- .removeAttr('selected');
-}
-
-function detailScreen(index) {
- var detail = layer.getChildFrame('#data-detail', index);
- var height = detail.height()+60;
- if (height > ($(window).height()*0.9)) {
- height = ($(window).height()*0.8);
- }
- layer.style(index, {
-// top: (($(window).height()-height)/3)+"px",
- height: height+'px'
- });
-}
$('body').keydown(function () {
if (event.keyCode === 13) {
--
Gitblit v1.9.1