From ae2fb12ff5a4740417d3ba6d6dfad990a7456307 Mon Sep 17 00:00:00 2001 From: lty <876263681@qq.com> Date: 星期三, 23 四月 2025 11:00:46 +0800 Subject: [PATCH] #库存盘点页面完成 --- src/main/resources/mapper/ManLocDetlMapper.xml | 1 src/main/webapp/views/locDetlStatis/check.html | 11 src/main/java/com/zy/asrs/controller/CheckDetlController.java | 39 +++ src/main/java/com/zy/asrs/controller/LocCheckController.java | 1 src/main/resources/mapper/LocDetlMapper.xml | 6 src/main/webapp/static/js/locDetlStatis/check.js | 490 ++++++++++++++++++++++++++++++++++++++++++++---- 6 files changed, 503 insertions(+), 45 deletions(-) diff --git a/src/main/java/com/zy/asrs/controller/CheckDetlController.java b/src/main/java/com/zy/asrs/controller/CheckDetlController.java new file mode 100644 index 0000000..862e4be --- /dev/null +++ b/src/main/java/com/zy/asrs/controller/CheckDetlController.java @@ -0,0 +1,39 @@ +package com.zy.asrs.controller; + +import com.alibaba.fastjson.JSONArray; +import com.baomidou.mybatisplus.mapper.EntityWrapper; +import com.core.annotations.ManagerAuth; +import com.core.common.Cools; +import com.core.common.R; +import com.zy.asrs.entity.CheckDetl; +import com.zy.asrs.entity.StaDesc; +import com.zy.asrs.service.CheckDetlService; +import com.zy.asrs.service.LocCheckService; +import com.zy.common.web.BaseController; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +@RestController + +public class CheckDetlController extends BaseController { + + @Autowired + private CheckDetlService checkDetlService; + + @RequestMapping(value = "/check/delete/auth") + @ManagerAuth(memo = "搴撳瓨鐩樼偣璁板綍鍒犻櫎") + public R delete(@RequestParam String param){ + List<CheckDetl> list = JSONArray.parseArray(param, CheckDetl.class); + if (Cools.isEmpty(list)){ + return R.error(); + } + for (CheckDetl entity : list){ + checkDetlService.delete(new EntityWrapper<>(entity)); + } + return R.ok(); + } +} diff --git a/src/main/java/com/zy/asrs/controller/LocCheckController.java b/src/main/java/com/zy/asrs/controller/LocCheckController.java index 8549423..90427b8 100644 --- a/src/main/java/com/zy/asrs/controller/LocCheckController.java +++ b/src/main/java/com/zy/asrs/controller/LocCheckController.java @@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.plugins.Page; import com.core.common.DateUtils; import com.zy.asrs.entity.LocCheck; +import com.zy.asrs.entity.StaDesc; import com.zy.asrs.service.LocCheckService; import com.core.annotations.ManagerAuth; import com.core.common.BaseRes; diff --git a/src/main/resources/mapper/LocDetlMapper.xml b/src/main/resources/mapper/LocDetlMapper.xml index 661d328..e96e5c2 100644 --- a/src/main/resources/mapper/LocDetlMapper.xml +++ b/src/main/resources/mapper/LocDetlMapper.xml @@ -52,6 +52,7 @@ <result column="maktx" property="maktx" /> <result column="specs" property="specs" /> <result column="batch" property="batch" /> + <result column="create_time" property="createTime"/> </resultMap> <sql id="batchSeq"> @@ -181,8 +182,10 @@ a.matnr, a.maktx, a.specs, - a.batch + a.batch, + a.create_time from asr_check_detl a + where 1=1 <include refid="stockOutCondition" /> ) t where t.row between ((#{pageNumber}-1)*#{pageSize}+1) and (#{pageNumber}*#{pageSize}) @@ -192,6 +195,7 @@ <select id="getStockCheckCount" parameterType="java.util.Map" resultType="java.lang.Integer"> select count(1) from asr_check_detl a + where 1=1 <include refid="stockOutCondition" /> </select> diff --git a/src/main/resources/mapper/ManLocDetlMapper.xml b/src/main/resources/mapper/ManLocDetlMapper.xml index 9b50f60..448cd06 100644 --- a/src/main/resources/mapper/ManLocDetlMapper.xml +++ b/src/main/resources/mapper/ManLocDetlMapper.xml @@ -39,6 +39,7 @@ <result column="maktx" property="maktx" /> <result column="specs" property="specs" /> <result column="batch" property="batch" /> + <result column="create_time" property="createTime"/> </resultMap> <sql id="locDetlCondition"> diff --git a/src/main/webapp/static/js/locDetlStatis/check.js b/src/main/webapp/static/js/locDetlStatis/check.js index a0eb687..b83b9c2 100644 --- a/src/main/webapp/static/js/locDetlStatis/check.js +++ b/src/main/webapp/static/js/locDetlStatis/check.js @@ -1,16 +1,5 @@ -var pageCurr; -function getCol() { - var cols = [ - {field: 'anfme', align: 'center',title: '搴撳瓨鏁伴噺', style: 'font-weight: bold'} - ]; - arrRemove(detlCols, "field", "anfme") - arrRemove(detlCols, "field", "zpallet") - cols.push.apply(cols, detlCols); - // cols.push({field: 'anfme', align: 'center',title: '鏁伴噺', style: 'font-weight: bold'} - // ) - return cols; -} +var pageCurr; layui.use(['table','laydate', 'form'], function(){ var table = layui.table; var $ = layui.jquery; @@ -24,17 +13,35 @@ headers: {token: localStorage.getItem('token')}, url: baseUrl+'/locDetl/check/auth', page: true, - limit: 20, - limits: [20, 30, 50, 100, 200, 500], + limit: 16, + limits: [16, 30, 50, 100, 200, 500], even: true, toolbar: '#toolbar', cellMinWidth: 50, - cols: [getCol()], + cols: [[ + {type: 'checkbox'}, +// ,{field: 'id', title: 'ID', sort: true,align: 'center', fixed: 'left', width: 80} +// ,{field: 'typeId', align: 'center',title: '璺緞ID'} + // ,{field: 'typeDesc', align: 'center',title: '浣滀笟绫诲瀷'} + {field: 'anfme', align: 'center',title: '搴撳瓨鏁伴噺(姝e皯/璐熷锛�', style: 'font-weight: bold'}, + {field: 'createTime$', align: 'center',title: '鍒涘缓鏃堕棿', style: 'font-weight: bold'}, + {field: 'matnr', align: 'center',title: '鍟嗗搧缂栧彿', style: 'font-weight: bold'}, + + {field: 'maktx', align: 'center',title: '鍟嗗搧鍚嶇О', style: 'font-weight: bold'}, + {field: 'specs', align: 'center',title: '瑙勬牸', style: 'font-weight: bold'}, + {field: 'batch', align: 'center',title: '鎵瑰彿', style: 'font-weight: bold'} + + // ,{field: 'appeUser$', align: 'center',title: '鍒涘缓鑰�',event: 'appeUser', style: 'cursor:pointer'} + // ,{field: 'appeTime$', align: 'center',title: '娣诲姞鏃堕棿'} + + ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:150} + ]], request: { pageName: 'curr', pageSize: 'limit' }, parseData: function (res) { + console.log(res) return { 'code': res.code, 'msg': res.msg, @@ -59,24 +66,38 @@ res.data[_index][data.value] = 'N'; } }); - /** - * 鏄剧ず搴撳瓨鎬绘暟閲� - */ - $.ajax({ - url: baseUrl+"/locDetl/count", - headers: {'token': localStorage.getItem('token')}, - contentType:'application/json;charset=UTF-8', - method: 'POST', - success: function (res) { - $("#countNum").text(res.data + '涓�'); - } - }); - } }); + // 椤甸潰淇敼 + table.on('edit(staDesc)', function (obj) { + layer.confirm('淇濆瓨淇敼?', function(){ + $.ajax({ + url: baseUrl+"/locDetl/check/auth", + headers: {'token': localStorage.getItem('token')}, + data: top.reObject({ + typeId: obj.data.typeId, + stnDesc: obj.value, + memo: obj.data.memo + }), + method: 'POST', + async: false, + success: function (res) { + layer.closeAll(); + if (res.code === 200){ + $(".layui-laypage-btn")[0].click(); + } else if (res.code === 403){ + top.location.href = baseUrl+"/"; + }else { + layer.msg(res.msg) + } + } + }) + }); + }); + // 鐩戝惉鎺掑簭浜嬩欢 - table.on('sort(locDetlStatis)', function (obj) { + table.on('sort(check)', function (obj) { var searchData = {}; $.each($('#search-box [name]').serializeArray(), function() { searchData[this.name] = this.value; @@ -99,14 +120,57 @@ }); // 鐩戝惉澶村伐鍏锋爮浜嬩欢 - table.on('toolbar(locDetlStatis)', function (obj) { + table.on('toolbar(check)', function (obj) { var checkStatus = table.checkStatus(obj.config.id); switch(obj.event) { - case 'exportAll': - layer.closeAll(); - layer.load(1, {shade: [0.1,'#fff']}); - location.href = baseUrl + "/locDetl/statis/export"; - layer.closeAll('loading'); + case 'addData': + layer.open({ + type: 2, + title: '鏂板', + maxmin: true, + area: ['40%', top.detailHeight], + shadeClose: false, + content: 'staDesc_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 'refreshData': + tableIns.reload({ + page: { + curr: pageCurr + } + }); + limit(); + 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+"/check/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(){ @@ -123,11 +187,11 @@ exportData[this.name] = this.value; }); var param = { - 'locDetl': exportData, + 'staDesc': exportData, 'fields': fields }; $.ajax({ - url: baseUrl+"/locDetl/export/auth", + url: baseUrl+"/staDesc/export/auth", headers: {'token': localStorage.getItem('token')}, data: JSON.stringify(param), dataType:'json', @@ -146,11 +210,55 @@ }); }); break; + case 'init': + layer.prompt({title: '璇疯緭鍏ュ彛浠わ紝骞跺垵濮嬪寲绔欑偣', formType: 1, shadeClose: true}, function(pass, idx){ + http.get(baseUrl+"/locMast/init/pwd", {pwd: pass}, function (res) { + if (res.data) { + layer.open({ + type: 1, + title: '鍒濆鍖栫珯鐐�', + area: ["500px"], + maxmin: true, + shadeClose: true, + content: $("#resetLocDiv"), + success: function (layero, index) { + + } + }) + } else { + layer.msg("鍙d护閿欒"); + } + layer.close(idx); + }) + }); + break; } }); + // 鍒濆鍖栦繚瀛� + form.on('submit(initDo)', function (data) { + $.ajax({ + url: baseUrl+"/staDesc/init/auth", + headers: {'token': localStorage.getItem('token')}, + data: data.field, + method: 'POST', + async: false, + success: function (res) { + if (res.code === 200){ + layer.msg(res.msg); + layer.closeAll(); + tableReload(false); + } else if (res.code === 403){ + parent.location.href = "/"; + }else { + layer.msg(res.msg) + } + } + }) + }); + // 鐩戝惉琛屽伐鍏蜂簨浠� - table.on('tool(locDetlStatis)', function(obj){ + table.on('tool(staDesc)', function(obj){ var data = obj.data; switch (obj.event) { // 璇︽儏 @@ -160,8 +268,8 @@ title: '璇︽儏', maxmin: true, area: [top.detailWidth, top.detailHeight], - shadeClose: false, - content: 'locDetl_detail.html', + shadeClose: true, + content: 'staDesc_detail.html', success: function(layero, index){ setFormVal(layer.getChildFrame('#detail', index), data, true); top.convertDisabled(layer.getChildFrame('#data-detail :input', index), true); @@ -172,10 +280,274 @@ } }); break; - + // 缂栬緫 + case 'edit': + layer.open({ + type: 2, + title: '淇敼', + maxmin: true, + area: ['40%', top.detailHeight], + shadeClose: false, + content: 'staDesc_detail.html', + success: function(layero, index){ + layer.getChildFrame('#data-detail-submit-save', index).hide(); + setFormVal(layer.getChildFrame('#detail', index), data, false); + top.convertDisabled(layer.getChildFrame('#data-detail :input', index), false); + top.convertDisabled(layer.getChildFrame('#typeId,#typeNo,#stnNo,#crnNo', index), true); + 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'); + } + }); + break; + case 'typeNo': + var param = top.reObject(data).typeNo; + if (param === undefined) { + layer.msg("鏃犳暟鎹�"); + } else { + layer.open({ + type: 2, + title: '鍏ュ嚭搴撹鎯�', + maxmin: true, + area: [top.detailWidth, top.detailHeight], + shadeClose: true, + content: '../basWrkIotype/basWrkIotype_detail.html', + success: function(layero, index){ + $.ajax({ + url: baseUrl+"/basWrkIotype/"+ 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){ + parent.location.href = "/"; + }else { + layer.msg(res.msg) + } + } + }) + } + }); + } + break; + case 'stnNo': + var param = top.reObject(data).stnNo; + if (param === undefined) { + layer.msg("鏃犳暟鎹�"); + } else { + layer.open({ + type: 2, + title: '浣滀笟璇︽儏', + maxmin: true, + area: [top.detailWidth, top.detailHeight], + shadeClose: true, + content: '../basDevp/basDevp_detail.html', + success: function(layero, index){ + $.ajax({ + url: baseUrl+"/basDevp/"+ 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){ + parent.location.href = "/"; + }else { + layer.msg(res.msg) + } + } + }) + } + }); + } + break; + case 'crnNo': + var param = top.reObject(data).crnNo; + if (param === undefined) { + layer.msg("鏃犳暟鎹�"); + } else { + layer.open({ + type: 2, + title: '鍫嗗灈鏈鸿鎯�', + maxmin: true, + area: [top.detailWidth, top.detailHeight], + shadeClose: true, + content: '../basCrnp/basCrnp_detail.html', + success: function(layero, index){ + $.ajax({ + url: baseUrl+"/basCrnp/"+ 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){ + parent.location.href = "/"; + }else { + layer.msg(res.msg) + } + } + }) + } + }); + } + break; + case 'crnStn': + var param = top.reObject(data).crnStn; + if (param === undefined) { + layer.msg("鏃犳暟鎹�"); + } else { + layer.open({ + type: 2, + title: '鍫嗗灈鏈虹珯鐐硅鎯�', + maxmin: true, + area: [top.detailWidth, top.detailHeight], + shadeClose: true, + content: '../basDevp/basDevp_detail.html', + success: function(layero, index){ + $.ajax({ + url: baseUrl+"/basDevp/"+ 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){ + parent.location.href = "/"; + }else { + layer.msg(res.msg) + } + } + }) + } + }); + } + break; + case 'modiUser': + var param = top.reObject(data).modiUser; + 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){ + parent.location.href = "/"; + }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(), + typeId: $('#typeId').val(), + typeNo: $('#typeNo').val(), + typeDesc: $('#typeDesc').val(), + stnNo: $('#stnNo').val(), + stnDesc: $('#stnDesc').val(), + crnNo: $('#crnNo').val(), + crnStn: $('#crnStn').val(), + memo: $('#memo').val(), + modiUser: $('#modiUser').val(), + modiTime: top.strToDate($('#modiTime\\$').val()), + appeUser: $('#appeUser').val(), + appeTime: top.strToDate($('#appeTime\\$').val()), + + }; + $.ajax({ + url: baseUrl+"/staDesc/"+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) { + var el = data.elem; + if (el.checked) { + $(el).val('Y'); + } else { + $(el).val('N'); + } + }); // 鎼滅储鏍忔悳绱簨浠� form.on('submit(search)', function (data) { @@ -237,6 +609,42 @@ }); } +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; diff --git a/src/main/webapp/views/locDetlStatis/check.html b/src/main/webapp/views/locDetlStatis/check.html index 717f7ad..7c1d732 100644 --- a/src/main/webapp/views/locDetlStatis/check.html +++ b/src/main/webapp/views/locDetlStatis/check.html @@ -42,12 +42,17 @@ </div> <script type="text/html" id="toolbar"> - <div class="layui-btn-container layui-col-md1"> - <button class="layui-btn" lay-event="exportAll" style="margin-top: -0px">瀵煎嚭鍏ㄩ儴</button> + <div class="layui-btn-container"> +<!-- <button class="layui-btn layui-btn-sm" id="btn-add" lay-event="addData">鏂板</button>--> +<!-- <button class="layui-btn layui-btn-primary" id="btn-init" lay-event="init">鍒濆鍖�</button>--> + <button class="layui-btn layui-btn-sm" id="btn-delete" lay-event="deleteData">鍒犻櫎</button> + <button class="layui-btn layui-btn-primary layui-btn-sm" id="btn-export" lay-event="exportData">瀵煎嚭</button> </div> </script> - +<script type="text/html" id="operate"> + <!-- <a class="layui-btn layui-btn-xs btn-edit" lay-event="edit">缂栬緫</a>--> +</script> <script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script> <script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></script> <script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script> -- Gitblit v1.9.1