#

luxiaotao1123

2021-03-26 186505641e95a73bac6cf3ddfe640acb3d06de6d

#

 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)));
    }

    /***************************************************/

 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);

}

 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);

}

 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;
    }
}

 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>

 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) {