1.0.3

admin

2021-08-28 5ea75676b5decb2994d77d92553ad5151277dfc7

1.0.3

 src/main/java/com/zy/asrs/controller/StatisController.java

@@ -42,7 +42,6 @@
                         @RequestParam(defaultValue = "14")Integer limit,
//                         @RequestParam(required = false)String condition,
                         @RequestParam Map<String, Object> param) {
        System.out.println(param);
        Page<LocDetl> stockStatis = locDetlService.getStockStatis(toPage(curr, limit, param, LocDetl.class));
        for (LocDetl locDetl : stockStatis.getRecords()) {
            MatCode mat = matCodeService.selectOne(new EntityWrapper<MatCode>().eq("mat_no",locDetl.getMatNo()).eq("str8",locDetl.getColor()));

 src/main/java/com/zy/asrs/entity/param/LocDetlAdjustParam.java

@@ -7,12 +7,26 @@
 */
public class LocDetlAdjustParam {

    //托盘号
    private String zpallet;


    // 库位号
    private String locNo;

    // 调整库存明细集合
    private List<LocDetlAdjust> list;



    public String getZpallet() {
        return zpallet;
    }

    public void setZpallet(String zpallet) {
        this.zpallet = zpallet;
    }

    public static class LocDetlAdjust {

        // 产品号

 src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java

@@ -545,10 +545,13 @@
    @Override
    @Transactional
    public void adjustLocDetl(LocDetlAdjustParam param, Long userId) {
        //根据库位号找寻库位
        LocMast locMast = locMastService.selectById(param.getLocNo());
        //判断
        if (Cools.isEmpty(locMast)) {
            throw new CoolException("库位不存在");
        }

        for (LocDetlAdjustParam.LocDetlAdjust adjust : param.getList()) {
            if (Cools.isEmpty(adjust.getMatNo())) {
                throw new CoolException(BaseRes.PARAM);
@@ -571,6 +574,7 @@
                locDetl.setModiTime(new Date());
                locDetl.setAppeUser(userId);
                locDetl.setAppeTime(new Date());
                locDetl.setZpallet(param.getZpallet());//托盘号
                if (!locDetlService.insert(locDetl)) {
                    throw new CoolException("保存库存明细失败");
                }

 src/main/resources/mapper/WaitMatinMapper.xml

@@ -28,11 +28,11 @@
    </resultMap>

    <sql id="condition">
        <if test="bill_no!=null and bill_no!='' ">
            and bill_no like '%' + #{bill_no} + '%'
        <if test="loc_no!=null and loc_no!='' ">
            and a.loc_no like '%' + #{loc_no} + '%'
        </if>
        <if test="bill_type!=null and bill_type!='' ">
            and bill_type like '%' + #{bill_type} + '%'
        <if test="mat_no!=null and mat_no!='' ">
            and a.mat_no like '%' + #{mat_no} + '%'
        </if>
        <if test="mat_name!=null and mat_name!='' ">
            and a.mat_name like '%' + #{mat_name} + '%'
@@ -44,35 +44,27 @@
            and a.unit like '%' + #{unit} + '%'
        </if>
        <if test="startTime!=null and endTime!=null">
            and appe_time between #{startTime} and #{endTime}
            and a.modi_time between #{startTime} and #{endTime}
        </if>
    </sql>

    <select id="getHeadPage" resultMap="BaseResultMap">
        select * from
        (
            select *,
            ROW_NUMBER() over (order by appe_time) as row
            from (
                select distinct bill_no, bill_type, appe_time
                from ints_wait_matin
                where 1=1
                <include refid="condition"></include>
            ) r
        select distinct bill_no, bill_type, appe_time,
        ROW_NUMBER() over (order by appe_time) as row
        from ints_wait_matin
        <include refid="condition"></include>
        ) t where t.row between ((#{pageNumber}-1)*#{pageSize}+1) and (#{pageNumber}*#{pageSize})
    </select>

    <select id="getHeadPageCount" parameterType="java.util.Map" resultType="java.lang.Integer">
        select count(1) from
        (
            select *,
            ROW_NUMBER() over (order by appe_time) as row
            from (
                select distinct bill_no, bill_type, appe_time
                from ints_wait_matin
                where 1=1
                <include refid="condition"></include>
            ) r
        select distinct bill_no, bill_type, appe_time,
        ROW_NUMBER() over (order by appe_time) as row
        from ints_wait_matin
        <include refid="condition"></include>
        ) t
    </select>


 src/main/webapp/static/js/basCrnStatus/basCrnStatus.js

@@ -26,7 +26,6 @@
            ,{field: 'modiTime$', align: 'center',title: '修改时间'}
            // ,{field: 'appeUser$', align: 'center',title: '创建者',event: 'appeUser', style: 'text-decoration: underline;cursor:pointer'}
            // ,{field: 'appeTime$', align: 'center',title: '添加时间'}

            ,{fixed: 'right', title:'操作', align: 'center', toolbar: '#operate', width:150}
        ]],
        request: {
@@ -390,6 +389,7 @@
});

function tableReload(child) {

    var searchData = {};
    $.each($('#search-box [name]').serializeArray(), function() {
        searchData[this.name] = this.value;

 src/main/webapp/static/js/ioComplete/ioComplete.js

@@ -377,7 +377,6 @@
            success: function (res) {
                if (res.code === 200){
                    parent.layer.closeAll();
                    parent.$(".layui-laypage-btn")[0].click();
                    $("#data-detail :input").each(function () {
                        $(this).val("");
                    });

 src/main/webapp/static/js/ioCompleteLog/ioCompleteLog.js

@@ -23,18 +23,18 @@
            ,{field: 'id', align: 'center',title: 'ID'}
            ,{field: 'billNo', align: 'center',title: '单据编号'}
            ,{field: 'seqNo', align: 'center',title: '序号'}
            ,{field: 'taskType$', align: 'center',title: '任务类型'}
            ,{field: 'taskType$', align: 'center',title: '任务类型',hide:true}
            ,{field: 'locNo$', align: 'center',title: '库位号',event: 'locNo', style: 'cursor:pointer'}
            ,{field: 'zpallet', align: 'center',title: '托盘号'}
            ,{field: 'matNo', align: 'center',title: '物料编码'}
            ,{field: 'matName', align: 'center',title: '物料名称'}
            ,{field: 'qty', align: 'center',title: '数量'}
            ,{field: 'updStatus$', align: 'center',title: '完成状态'}
            ,{field: 'errorMemo', align: 'center',title: '异常信息'}
            ,{field: 'modiUser$', align: 'center',title: '修改人员',event: 'modiUser', style: 'cursor:pointer'}
            ,{field: 'modiTime$', align: 'center',title: '修改时间'}
            ,{field: 'appeUser$', align: 'center',title: '建档人员',event: 'appeUser', style: 'cursor:pointer'}
            ,{field: 'appeTime$', align: 'center',title: '建档时间'}
            ,{field: 'errorMemo', align: 'center',title: '异常信息',hide:true}
            ,{field: 'modiUser$', align: 'center',title: '修改人员',event:'modiUser', style: 'cursor:pointer',hide:true}
            ,{field: 'modiTime$', align: 'center',title: '修改时间',hide:true}
            ,{field: 'appeUser$', align: 'center',title: '建档人员',event:'appeUser', style: 'cursor:pointer',hide:true}
            ,{field: 'appeTime$', align: 'center',title: '建档时间',hide:true}

            ,{fixed: 'right', title:'操作', align: 'center', toolbar: '#operate', width:150}
        ]],

 src/main/webapp/static/js/pakStore/locCheckOut.js

@@ -142,7 +142,7 @@
        })
    }
})
``

// 提取产品
var locDetlLayerIdx;
function getLocDetl() {

 src/main/webapp/static/js/pakStore/stockAdjust.js

@@ -5,7 +5,7 @@
function getCol() {
    var cols = [
        {fixed: 'left', field: 'count', title: '实际数量', align: 'center', edit:'text', width: 120,  style:'color: blue;font-weight: bold'}
        ,{field: 'anfme', align: 'center',title: '数量'}
        // ,{field: 'anfme', align: 'center',title: '数量'}
    ];
    arrRemove(detlCols, "field", "anfme")
    cols.push.apply(cols, detlCols);
@@ -35,7 +35,7 @@

    // 页面修改
    table.on('edit(chooseData)', function (obj) {
        updateMatCodeData(obj.data.matnr, Number(obj.value));
        updateMatCodeData(obj.data.matNo, Number(obj.value));
    });

    // 监听头工具栏事件
@@ -52,6 +52,7 @@
                    return;
                }
                for (var i=0;i<matCodeData.length;i++){

                    if (isNaN(matCodeData[i].count)) {
                        layer.msg("请输入数字");
                        return;
@@ -67,7 +68,8 @@
                        headers: {'token': localStorage.getItem('token')},
                        data: JSON.stringify({
                            locNo: currLocNo,
                            list: matCodeData
                            list: matCodeData,
                            zpallet:zpa
                        }),
                        contentType:'application/json;charset=UTF-8',
                        method: 'POST',
@@ -90,11 +92,12 @@

    // 监听行工具事件
    table.on('tool(chooseData)', function(obj){

        var data = obj.data;
        switch (obj.event) {
            case 'remove':
                for (var i = matCodeData.length - 1; i >= 0; i--) {
                    if (matCodeData[i].matnr === data.matnr) {
                    if (matCodeData[i].matNo === data.matNo) {
                        matCodeData.splice(i, 1);
                    }
                }
@@ -174,13 +177,13 @@
        }
    }

    function updateMatCodeData(matnr, count) {
    function updateMatCodeData(matNo, count) {
        if (isNaN(count)) {
            layer.msg("请输入数字");
        } else {
            if (count >= 0) {
                for (var i=0;i<matCodeData.length;i++){
                    if (matCodeData[i]["matnr"] === matnr){
                    if (matCodeData[i]["matNo"] === matNo){
                        matCodeData[i]["count"] = count;
                    }
                }
@@ -221,29 +224,33 @@
        el.css("border-color", "#b8b8b8");
    }, 1000);
}

var zpa=0
// 添加表格数据
function addTableData(data) {
    let applyData = [];
    for (var i=0;i<data.length;i++){
        let pass = false;
        for (var j=0;j<matCodeData.length;j++){
            if (data[i].matNo === matCodeData[j].matnr) {
            zpa=matCodeData[0].zpallet
            if (data[i].matNo === matCodeData[j].matNo) {
                pass = true;
                break;
            }
        }

        if (!pass) {
            applyData.push({
                count: initCountVal,
                anfme: initAnfmeVal,
                removeBtn: true,
                matnr: data[i].matNo,
                maktx: data[i].matName,
                lgnum: data[i].str2,
                color: data[i].str3,
                bname: data[i].str4,
                altme: data[i].str1,
                matNo: data[i].matNo,
                matName: data[i].matName,
                specs: data[i].specs,
                color: data[i].color,
                size: data[i].size,
                unit: data[i].unit,
                zpallet:zpa,
                qty:0
            })
        }
    }

 src/main/webapp/static/js/waitMatin/waitMatin.js

@@ -1,29 +1,48 @@
var pageCurr;
layui.config({
    base: baseUrl + "/static/layui/lay/modules/"
}).use(['layer', 'form', 'table', 'util', 'admin', 'xmSelect', 'laydate'], function () {
}).use(['table','laydate', 'form', 'admin'], function(){
    var table = layui.table;
    var $ = layui.jquery;
    var layer = layui.layer;
    var form = layui.form;
    var table = layui.table;
    var util = layui.util;
    var admin = layui.admin;
    var xmSelect = layui.xmSelect;
    var layDate = layui.laydate;
    var form = layui.form;
    var admin = layui.admin;

    // 渲染表格
    var insTb = table.render({
    // 数据渲染
    tableIns = table.render({
        elem: '#waitMatin',
        url: baseUrl+'/waitMatin/head/page/auth',
        headers: {token: localStorage.getItem('token')},
        url: baseUrl+'/waitMatin/list/auth',
        page: true,
        cellMinWidth: 100,
        limit: 16,
        limits: [16, 30, 50, 100, 200, 500],
        toolbar: '#toolbar',
        cellMinWidth: 50,
        cols: [[
            {type: 'numbers'},
            {field: 'billNo', title: '单据编号', sort: true},
            {field: 'billType$', align: 'center', title: '类型',  minWidth: 140, width: 140},
            {align: 'center', title: '明细', toolbar: '#tbLook', minWidth: 140, width: 140},
            {field: 'appeTime$', title: '创建时间', minWidth: 180, width: 180},
            {align: 'center', title: '操作', toolbar: '#operate', minWidth: 130, width: 130}
            {type: 'checkbox'}
            ,{field: 'billNo', align: 'center',title: '单据编号'}
            ,{field: 'seqNo', align: 'center',title: '序号'}
            ,{field: 'billType$', align: 'center',title: '单据类型'}
            ,{field: 'matNo', align: 'center',title: '物料编码'}
            ,{field: 'matName', align: 'center',title: '物料名称'}
            ,{field: 'qty', align: 'center',title: '数量'}
            ,{field: 'specs', align: 'center',title: '规格'}
            ,{field: 'unit', align: 'center',title: '单位'}
            ,{field: 'size', align: 'center',title: '尺寸', hide: true}
            ,{field: 'color', align: 'center',title: '颜色', hide: true}
            ,{field: 'weight', align: 'center',title: '单重', hide: true}
            ,{field: 'memo', align: 'center',title: '备注', hide: true}
            ,{field: 'inQty', align: 'center',title: '已入库量'}
            ,{field: 'linkErp$', align: 'center',title: 'ERP连线'}
            ,{field: 'ioStatus$', align: 'center',title: '完成状态'}
            ,{field: 'ioTime$', align: 'center',title: '完成时间', hide: true}
            ,{field: 'modiUser$', align: 'center',title: '修改人员',event: 'modiUser', style: 'cursor:pointer', hide: true}
            ,{field: 'modiTime$', align: 'center',title: '修改时间', hide: true}
            ,{field: 'appeUser$', align: 'center',title: '建档人员',event: 'appeUser', style: 'cursor:pointer', hide: true}
            ,{field: 'appeTime$', align: 'center',title: '建档时间', hide: true}

            ,{fixed: 'right', title:'操作', align: 'center', toolbar: '#operate', width:150}
        ]],
        request: {
            pageName: 'curr',
@@ -40,337 +59,160 @@
        response: {
            statusCode: 200
        },
        done: function (res, curr, count) {
        done: function(res, curr, count) {
            if (res.code === 403) {
                top.location.href = baseUrl+"/";
            }
            pageCurr=curr;
            limit();
        }
    });

    // 搜索
    form.on('submit(eCourseTbSearch)', function (data) {
        insTb.reload({where: data.field, page: {curr: 1}});
    // 监听排序事件
    table.on('sort(waitMatin)', 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}
        });
    });

    // 添加
    $("#eCourseAddBtn").click(function () {
        showEditModel();
    });

    // 工具条点击事件
    table.on('tool(waitMatin)', function (obj) {
        var data = obj.data;
        var layEvent = obj.event;
        if (layEvent === 'edit') {
            showEditModel(data);
        } else if (layEvent === 'del') {
            doDel(data.billNo);
        } else if (layEvent === 'look') {
            var $a = $(obj.tr).find('a[lay-event="look"]');
            var offset = $a.offset();
            var top = offset.top;
            var left = offset.left;
            layer.open({
                type: 1,
                title: false,
                area: '630px',
                offset: [top + 'px', (left - 530 + $a.outerWidth()) + 'px'],
                shade: .01,
                shadeClose: true,
                fixed: false,
                content: '<table id="lookSSXMTable" lay-filter="lookSSXMTable"></table>',
                success: function (layero) {
                    table.render({
                        elem: '#lookSSXMTable',
                        headers: {token: localStorage.getItem('token')},
                        url: baseUrl+'/waitMatin/list/auth',
                        where: {
                            bill_no: data.billNo
                        },
                        page: true,
                        cellMinWidth: 100,
                        cols: [[
                            {type: 'numbers'},
                            {field: 'matNo', title: '物料编码'},
                            {field: 'matName', title: '物料名称', width: 160},
                            {field: 'qty', title: '数量'},
                            {
                                field: 'createTime$', title: '创建时间', sort: true, templet: function (d) {
                                    return util.toDateString(d.createTime);
                                },  width: 180
                            }
                        ]],
                        request: {
                            pageName: 'curr',
                            pageSize: 'limit'
                        },
                        parseData: function (res) {
                            return {
                                'code': res.code,
                                'msg': res.msg,
                                'count': res.data.total,
                                'data': res.data.records
                            }
                        },
                        response: {
                            statusCode: 200
                        },
                        done: function () {
                            $(layero).find('.layui-table-view').css('margin', '0');
                        },
                        size: ''
    // 监听头工具栏事件
    table.on('toolbar(waitMatin)', function (obj) {
        var checkStatus = table.checkStatus(obj.config.id).data;
        switch(obj.event) {
            case 'addData':
                showEditModel();
                break;
            case 'deleteData':
               if (checkStatus.length === 0) {
                   layer.msg('请选择要删除的数据', {icon: 2});
                   return;
               }
               var ids = checkStatus.map(function (d) {
                   return d.seqNo;
               });
               del(ids);
               break;
            case 'exportData':
                layer.confirm('确定导出Excel吗', {shadeClose: true}, function(){
                    var titles=[];
                    var fields=[];
                    obj.config.cols[0].map(function (col) {
                        if (col.type === 'normal' && col.hide === false && col.toolbar == null) {
                            titles.push(col.title);
                            fields.push(col.field);
                        }
                    });
                }
            });
                    var exportData = {};
                    $.each($('#search-box [name]').serializeArray(), function() {
                        exportData[this.name] = this.value;
                    });
                    var param = {
                        'waitMatin': exportData,
                        'fields': fields
                    };
                    $.ajax({
                        url: baseUrl+"/waitMatin/export/auth",
                        headers: {'token': localStorage.getItem('token')},
                        data: JSON.stringify(param),
                        dataType:'json',
                        contentType:'application/json;charset=UTF-8',
                        method: 'POST',
                        success: function (res) {
                            layer.closeAll();
                            if (res.code === 200) {
                                table.exportFile(titles,res.data,'xls');
                            } else if (res.code === 403) {
                                top.location.href = baseUrl+"/";
                            } else {
                                layer.msg(res.msg, {icon: 2})
                            }
                        }
                    });
                });
                break;
        }
    });

    // 显示表单弹窗
    function showEditModel(expTpe) {
    // 监听行工具事件
    table.on('tool(waitMatin)', function(obj){
        var data = obj.data;
        switch (obj.event) {
            case 'edit':
                showEditModel(data);
                break;
            case "del":
                var ids = [data.seqNo];
                del(ids);
                break;
        }
    });

    /* 弹窗 - 新增、修改 */
    function showEditModel(mData) {
        admin.open({
            type: 1,
            title: (expTpe ? '修改' : '添加') + '单据',
            area: '600px',
            title: (mData ? '修改' : '添加') + '订单状态',
            content: $('#editDialog').html(),
            area: '700px',
            success: function (layero, dIndex) {
                $(layero).children('.layui-layer-content').css('overflow', 'visible');
                var url = expTpe ? '../../json/ok.json' : '../../json/ok.json';
                var isExpAdd = !expTpe;
                // 回显数据
                form.val('editForm', expTpe);
                // 表单提交事件
                form.on('submit(waitMatinEditSubmit)', function (data) {
                    // 组装数据
                    if (xxDataList.length <= 0) {
                        layer.tips('请添加单据明细', '#matAddBtnComment', {tips: [1, '#ff4c4c']});
                        return false;
                    }
                    var param = [];
                    var nList = admin.util.deepClone(xxDataList);
                    for (var xi = 0; xi < nList.length; xi++) {
                        if (nList[xi].qty > 0) {
                            param.push({
                                billNo: data.field.billNo,
                                billType: data.field.billType,
                                matNo: nList[xi].matNo,
                                matName: nList[xi].matName,
                                qty: nList[xi].qty,
                            })
                        }
                    }
                    if (param.length === 0) {
                        layer.msg('单据明细数量不合法', {icon: 2});
                        return false;
                    }
                    if (isExpAdd) {
                        layer.load(2);
                        $.ajax({
                            url: baseUrl+"/waitMatin/add/auth",
                            headers: {'token': localStorage.getItem('token')},
                            data: JSON.stringify(param),
                            contentType:'application/json;charset=UTF-8',
                            method: 'POST',
                            success: function (res) {
                                layer.closeAll('loading');
                                if (res.code === 200){
                                    layer.close(dIndex);
                                    insTb.reload({page: {curr: 1}});
                                    layer.msg(res.msg, {icon: 1});
                                } else if (res.code === 403){
                                    top.location.href = baseUrl+"/";
                                }else {
                                    layer.msg(res.msg, {icon: 2});
                                }
                layDateRender();
                form.val('detail', mData);
                form.on('submit(editSubmit)', function (data) {
                    var loadIndex = layer.load(2);
                    $.ajax({
                        url: baseUrl+"/waitMatin/"+(mData?'update':'add')+"/auth",
                        headers: {'token': localStorage.getItem('token')},
                        data: data.field,
                        method: 'POST',
                        success: function (res) {
                            layer.close(loadIndex);
                            if (res.code === 200){
                                layer.close(dIndex);
                                layer.msg(res.msg, {icon: 1});
                                tableReload();
                            } else if (res.code === 403){
                                top.location.href = baseUrl+"/";
                            }else {
                                layer.msg(res.msg, {icon: 2});
                            }
                        })
                    }
                        }
                    })
                    return false;
                });
                // 明细表格
                var xxDataList = [];
                var tbOptions = {
                    elem: '#formSSXMTable',
                    data: xxDataList,
                    page: true,
                    height: '350px;',
                    cellMinWidth: 100,
                    cols: [[
                        {type: 'numbers'},
                        {field: 'matNo', title: '物料编码'},
                        {field: 'matName', title: '物料名称', width: 160},
                        {field: 'qty', title: '修改数量', style: 'color: blue;font-weight: bold', edit: true, minWidth: 100, width: 100},
                        {align: 'center', title: '操作', toolbar: '#formSSXMTableBar', minWidth: 80, width: 80}
                    ]],
                    done: function () {
                        $(layero).find('.layui-table-view').css('margin', '0');
                    },
                    size: ''
                };
                if (!isExpAdd) {
                    tbOptions.data = undefined;
                    tbOptions.url = '../../json/e-course-tb2.json?experimentTypeId=' + expTpe.experimentTypeId;
                }
                var insTbSSXM = table.render(tbOptions);
                // 工具条点击事件
                table.on('tool(formSSXMTable)', function (obj) {
                    var data = obj.data;
                    var layEvent = obj.event;
                    if (layEvent === 'edit') {
                        showEditModel2(data);
                    } else if (layEvent === 'del') {
                        layer.confirm('确定要删除吗？', {
                            shade: .1,
                            skin: 'layui-layer-admin'
                        }, function (i) {
                            layer.close(i);
                            for (var j = 0; j < xxDataList.length; j++) {
                                if (xxDataList[j].matNo === data.matNo) {
                                    xxDataList.splice(j, 1);
                                }
                            }
                            insTbSSXM.reload({data: xxDataList, page: {curr: 1}});
                        });
                    }
                });
                // 数量修改
                table.on('edit(formSSXMTable)', function (obj) {
                    let count = Number(obj.value);
                    if (isNaN(count)) {
                        layer.msg("请输入数字");
                    } else {
                        if (count > 0) {
                            for (var i=0;i<xxDataList.length;i++){
                                if (xxDataList[i]["matNo"] === obj.data.matNo){
                                    xxDataList[i]["qty"] = count;
                                    break;
                                }
                            }
                        } else {
                            layer.msg("数量必须大于零");
                        }
                    }
                    insTbSSXM.reload({data: xxDataList});
                });
                //
                $('#matAddBtnComment').click(function () {
                    showEditModel2();
                });

                // 显示添加明细表单弹窗
                function showEditModel2(exp) {
                    admin.open({
                        type: 1,
                        offset: '150px',
                        area: '480px',
                        title: (exp ? '修改' : '添加') + '明细',
                        content: $('#matEditDialog').html(),
                        success: function (layero, dIndex) {
                            $(layero).children('.layui-layer-content').css('overflow', 'visible');
                            var url = exp ? '../../json/ok.json' : '../../json/ok.json';
                            // 回显数据
                            form.val('matEditForm', exp);
                            // 表单提交事件
                            form.on('submit(matEditSubmit)', function (data) {
                                var existMats = [];
                                xxDataList.forEach(function(elem) {
                                    existMats.push(elem.matNo);
                                });
                                var selectList = matXmSelect.getValue();
                                for (var i = 0; i<selectList.length; i++) {
                                    var item = selectList[i];
                                    if (existMats.indexOf(item.value) === -1) {
                                        // 查询物料详情
                                        $.ajax({
                                            url: baseUrl+"/matCode/"+item.value+"/auth",
                                            headers: {'token': localStorage.getItem('token')},
                                            method: 'GET',
                                            async: false,
                                            success: function (res) {
                                                if (res.code === 200){
                                                    var mat = res.data;
                                                    xxDataList.push({
                                                        matNo: mat.matNo,
                                                        matName: mat.matName,
                                                        qty: 0.0
                                                    });
                                                    insTbSSXM.reload({data: xxDataList, page: {curr: 1}});
                                                } else if (res.code === 403){
                                                    top.location.href = baseUrl+"/";
                                                }else {
                                                    layer.msg(res.msg, {icon: 2})
                                                }
                                            }
                                        })
                                    }
                                }
                                layer.close(dIndex);
                                return false;
                            });
                            // 渲染物料选择
                            var matXmSelect = xmSelect.render({
                                el: '#mat',
                                style: {
                                    width: '340px',
                                },
                                autoRow: true,
                                toolbar: { show: true },
                                filterable: true,
                                remoteSearch: true,
                                remoteMethod: function(val, cb, show){
                                    $.ajax({
                                        url: baseUrl+"/mat/all/get/kv",
                                        headers: {'token': localStorage.getItem('token')},
                                        data: {
                                            condition: val
                                        },
                                        method: 'POST',
                                        success: function (res) {
                                            if (res.code === 200){
                                                cb(res.data)
                                            } else {
                                                cb([]);
                                                layer.msg(res.msg, {icon: 2});
                                            }
                                        }
                                    });
                                }
                            })
                            // 弹窗不出现滚动条
                            $(layero).children('.layui-layer-content').css('overflow', 'visible');
                            layui.form.render('select');
                        }
                    });
                }

                $(layero).children('.layui-layer-content').css('overflow', 'visible');
                layui.form.render('select');
            }
        });
    }

    // 删除单据
    function doDel(billNo) {
        layer.confirm('确定要删除吗？', {
            shade: .1,
            skin: 'layui-layer-admin'
    /* 删除 */
    function del(ids) {
        layer.confirm('确定要删除选中数据吗？', {
            skin: 'layui-layer-admin',
            shade: .1
        }, function (i) {
            layer.close(i);
            layer.load(2);

            var loadIndex = layer.load(2);
            $.ajax({
                url: baseUrl+"/waitMatin/delete/auth",
                headers: {'token': localStorage.getItem('token')},
                data: {
                    billNo: billNo
                },
                // contentType:'application/json;charset=UTF-8',
                data: {ids: ids},
                method: 'POST',
                success: function (res) {
                    layer.closeAll('loading');
                    layer.close(loadIndex);
                    if (res.code === 200){
                        insTb.reload({page: {curr: 1}});
                        layer.msg(res.msg, {icon: 1});
                        tableReload();
                    } else if (res.code === 403){
                        top.location.href = baseUrl+"/";
                    }else {
                    } else {
                        layer.msg(res.msg, {icon: 2});
                    }
                }
@@ -378,9 +220,55 @@
        });
    }

    layDate.render({
        elem: '.layui-laydate-range'
        ,type: 'datetime'
        ,range: true
    // 搜索
    form.on('submit(search)', function (data) {
        pageCurr = 1;
        tableReload(false);
    });
});

    // 重置
    form.on('submit(reset)', function (data) {
        pageCurr = 1;
        clearFormVal($('#search-box'));
        tableReload(false);
    });

    // 时间选择器
    function layDateRender() {
            layDate.render({
        elem: '#ioTime\\$',
        type: 'datetime'
        });
        layDate.render({
        elem: '#modiTime\\$',
        type: 'datetime'
        });
        layDate.render({
        elem: '#appeTime\\$',
        type: 'datetime'
        });
        layDate.render({
            elem: '.layui-laydate-range'
            ,type: 'datetime'
            ,range: true
        });
    }
    layDateRender();

});

// 关闭动作
$(document).on('click','#data-detail-close', function () {
    parent.layer.closeAll();
});

function tableReload(child) {
    var searchData = {};
    $.each($('#search-box [name]').serializeArray(), function() {
        searchData[this.name] = this.value;
    });
    tableIns.reload({
        where: searchData,
        page: {curr: pageCurr}
     });
}

 src/main/webapp/static/js/waitMatinLog/waitMatinLog.js

@@ -30,16 +30,16 @@
            ,{field: 'unit', align: 'center',title: '单位'}
            ,{field: 'size', align: 'center',title: '尺寸'}
            ,{field: 'color', align: 'center',title: '颜色'}
            ,{field: 'weight', align: 'center',title: '单重'}
            ,{field: 'memo', align: 'center',title: '备注'}
            ,{field: 'inQty', align: 'center',title: '已入库量'}
            ,{field: 'linkErp$', align: 'center',title: 'ERP连线'}
            ,{field: 'ioStatus$', align: 'center',title: '完成状态'}
            ,{field: 'ioTime$', align: 'center',title: '完成时间'}
            ,{field: 'modiUser$', align: 'center',title: '修改人员',event: 'modiUser', style: 'cursor:pointer'}
            ,{field: 'modiTime$', align: 'center',title: '修改时间'}
            ,{field: 'appeUser$', align: 'center',title: '建档人员',event: 'appeUser', style: 'cursor:pointer'}
            ,{field: 'appeTime$', align: 'center',title: '建档时间'}
            ,{field: 'weight', align: 'center',title: '单重',hide:true}
            ,{field: 'memo', align: 'center',title: '备注',hide:true}
            ,{field: 'inQty', align: 'center',title: '已入库量',hide:true}
            ,{field: 'linkErp$', align: 'center',title: 'ERP连线',hide:true}
            ,{field: 'ioStatus$', align: 'center',title: '完成状态',hide:true}
            ,{field: 'ioTime$', align: 'center',title: '完成时间',hide:true}
            ,{field: 'modiUser$', align: 'center',title: '修改人员',event: 'modiUser', style: 'cursor:pointer',hide:true}
            ,{field: 'modiTime$', align: 'center',title: '修改时间',hide:true}
            ,{field: 'appeUser$', align: 'center',title: '建档人员',event: 'appeUser', style: 'cursor:pointer',hide:true}
            ,{field: 'appeTime$', align: 'center',title: '建档时间',hide:true}

            ,{fixed: 'right', title:'操作', align: 'center', toolbar: '#operate', width:150}
        ]],

 src/main/webapp/static/js/waitMatout/waitMatout.js

@@ -41,7 +41,6 @@
            ,{field: 'modiTime$', align: 'center',title: '修改时间', hide: true}
            ,{field: 'appeUser$', align: 'center',title: '建档人员',event: 'appeUser', style: 'cursor:pointer', hide: true}
            ,{field: 'appeTime$', align: 'center',title: '建档时间', hide: true}

            ,{fixed: 'right', title:'操作', align: 'center', toolbar: '#operate', width:150}
        ]],
        request: {

 src/main/webapp/static/js/waitMatoutLog/waitMatoutLog.js

@@ -26,20 +26,20 @@
            ,{field: 'matNo', align: 'center',title: '物料编码'}
            ,{field: 'matName', align: 'center',title: '物料名称'}
            ,{field: 'qty', align: 'center',title: '数量'}
            ,{field: 'specs', align: 'center',title: '规格'}
            ,{field: 'unit', align: 'center',title: '单位'}
            ,{field: 'specs', align: 'center',title: '规格',hide:true}
            ,{field: 'unit', align: 'center',title: '单位',hide:true}
            ,{field: 'size', align: 'center',title: '尺寸'}
            ,{field: 'color', align: 'center',title: '颜色'}
            ,{field: 'weight', align: 'center',title: '单重'}
            ,{field: 'memo', align: 'center',title: '备注'}
            ,{field: 'weight', align: 'center',title: '单重',hide:true}
            ,{field: 'memo', align: 'center',title: '备注',hide:true}
            ,{field: 'outQty', align: 'center',title: '已出库量'}
            ,{field: 'linkErp$', align: 'center',title: 'ERP连线'}
            ,{field: 'ioStatus$', align: 'center',title: '完成状态'}
            ,{field: 'ioTime$', align: 'center',title: '完成时间'}
            ,{field: 'modiUser$', align: 'center',title: '修改人员',event: 'modiUser', style: 'cursor:pointer'}
            ,{field: 'modiTime$', align: 'center',title: '修改时间'}
            ,{field: 'appeUser$', align: 'center',title: '建档人员',event: 'appeUser', style: 'cursor:pointer'}
            ,{field: 'appeTime$', align: 'center',title: '建档时间'}
            ,{field: 'linkErp$', align: 'center',title: 'ERP连线',hide:true}
            ,{field: 'ioStatus$', align: 'center',title: '完成状态',hide:true}
            ,{field: 'ioTime$', align: 'center',title: '完成时间',hide:true}
            ,{field: 'modiUser$', align: 'center',title: '修改人员',event: 'modiUser', style: 'cursor:pointer',hide:true}
            ,{field: 'modiTime$', align: 'center',title: '修改时间',hide:true}
            ,{field: 'appeUser$', align: 'center',title: '建档人员',event: 'appeUser', style: 'cursor:pointer',hide:true}
            ,{field: 'appeTime$', align: 'center',title: '建档时间',hide:true}

            ,{fixed: 'right', title:'操作', align: 'center', toolbar: '#operate', width:150}
        ]],

 src/main/webapp/views/basCrnStatus/basCrnStatus.html

@@ -20,6 +20,8 @@
        </div>
    </div>



    <!-- 待添加 -->
    <div id="data-search-btn" class="layui-btn-container layui-form-item" style="display: inline-block">
        <button id="search" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit lay-filter="search">搜索</button>

 src/main/webapp/views/waitMatchkLog/waitMatchkLog.html

@@ -16,7 +16,7 @@
<div id="search-box" class="layui-form layui-card-header">
    <div class="layui-inline">
        <div class="layui-input-inline">
            <input class="layui-input" type="text" name="id" placeholder="编号" autocomplete="off">
            <input class="layui-input" type="text" name="bill_no" placeholder="编号" autocomplete="off">
        </div>
    </div>
    <div class="layui-inline">

 src/main/webapp/views/waitMatin/waitMatin.html

@@ -25,25 +25,9 @@
            <div class="layui-form toolbar">
                <div class="layui-form-item">
                    <div class="layui-inline">
                        <label class="layui-form-label w-auto">单据编号：</label>
                        <div class="layui-input-inline mr0">
                            <input name="bill_no" class="layui-input" type="text" placeholder="输入单据编号"/>
                        </div>
                    </div>
                    <div class="layui-inline">
                        <div class="layui-input-inline mr0">
                            <select name="bill_type" placeholder="请选择单据类型">
                                <option value="" style="display: none"></option>
                                <option value="1">采购入库</option>
                                <option value="2">生产入库</option>
                                <option value="3">调拨入库</option>
                                <option value="4">销售退回入库</option>
                                <option value="5">其他入库</option>
                            </select>
                        </div>
                    </div>
                    <div class="layui-inline" style="width: 300px">
                        <div class="layui-input-inline">
                            <input class="layui-input layui-laydate-range" name="appe_time" type="text" placeholder="起始时间 - 终止时间" autocomplete="off" style="width: 300px">
                            <input name="experimentTypeName" class="layui-input" type="text" placeholder="输入单据编号"/>
                        </div>
                    </div>
                    <div class="layui-inline">
@@ -138,7 +122,365 @@
<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>
<script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/waitMatin/waitMatin.js" charset="utf-8"></script>
<!--<script type="text/javascript" src="../../static/js/waitMatin/waitMatin.js" charset="utf-8"></script>-->
<script>
    var pageCurr;
    layui.config({
        base: baseUrl + "/static/layui/lay/modules/"
    }).use(['layer', 'form', 'table', 'util', 'admin', 'xmSelect'], function () {
        var $ = layui.jquery;
        var layer = layui.layer;
        var form = layui.form;
        var table = layui.table;
        var util = layui.util;
        var admin = layui.admin;
        var xmSelect = layui.xmSelect;

        // 渲染表格
        var insTb = table.render({
            elem: '#waitMatin',
            url: baseUrl+'/waitMatin/head/page/auth',
            headers: {token: localStorage.getItem('token')},
            page: true,
            cellMinWidth: 100,
            cols: [[
                {type: 'numbers'},
                {field: 'billNo', title: '单据编号', sort: true},
                {field: 'billType$', align: 'center', title: '类型',  minWidth: 140, width: 140},
                // {align: 'center', title: '星期', templet: '#eCourseTbWeek', minWidth: 350, width: 350},
                {align: 'center', title: '明细', toolbar: '#tbLook', minWidth: 140, width: 140},
                {
                    field: 'appeTime$', title: '创建时间', sort: true, templet: function (d) {
                        return util.toDateString(d.createTime);
                    }, width: 180
                },
                {align: 'center', title: '操作', toolbar: '#operate', minWidth: 130, width: 130}
            ]],
            request: {
                pageName: 'curr',
                pageSize: 'limit'
            },
            parseData: function (res) {
                return {
                    'code': res.code,
                    'msg': res.msg,
                    'count': res.data.total,
                    'data': res.data.records
                }
            },
            response: {
                statusCode: 200
            },
            done: function (res) {
                if (res.code === 403) {
                    top.location.href = baseUrl+"/";
                }
                pageCurr=curr;
            }
        });

        // 搜索
        form.on('submit(eCourseTbSearch)', function (data) {
            insTb.reload({where: data.field, page: {curr: 1}});
        });

        // 添加
        $("#eCourseAddBtn").click(function () {
            showEditModel();
        });

        // 工具条点击事件
        table.on('tool(waitMatin)', function (obj) {
            var data = obj.data;
            var layEvent = obj.event;
            if (layEvent === 'edit') {
                showEditModel(data);
            } else if (layEvent === 'del') {
                doDel(data.experimentTypeId);
            } else if (layEvent === 'look') {
                var $a = $(obj.tr).find('a[lay-event="look"]');
                var offset = $a.offset();
                var top = offset.top;
                var left = offset.left;
                layer.open({
                    type: 1,
                    title: false,
                    area: '630px',
                    offset: [top + 'px', (left - 530 + $a.outerWidth()) + 'px'],
                    shade: .01,
                    shadeClose: true,
                    fixed: false,
                    content: '<table id="lookSSXMTable" lay-filter="lookSSXMTable"></table>',
                    success: function (layero) {
                        table.render({
                            elem: '#lookSSXMTable',
                            headers: {token: localStorage.getItem('token')},
                            url: baseUrl+'/waitMatin/list/auth',
                            where: {
                                bill_no: data.billNo
                            },
                            page: true,
                            cellMinWidth: 100,
                            cols: [[
                                {type: 'numbers'},
                                {field: 'matNo', title: '物料编码'},
                                {field: 'matName', title: '物料名称', width: 160},
                                {field: 'qty', title: '数量'},
                                {
                                    field: 'createTime$', title: '创建时间', sort: true, templet: function (d) {
                                        return util.toDateString(d.createTime);
                                    },  width: 180
                                }
                            ]],
                            request: {
                                pageName: 'curr',
                                pageSize: 'limit'
                            },
                            parseData: function (res) {
                                return {
                                    'code': res.code,
                                    'msg': res.msg,
                                    'count': res.data.total,
                                    'data': res.data.records
                                }
                            },
                            response: {
                                statusCode: 200
                            },
                            done: function () {
                                $(layero).find('.layui-table-view').css('margin', '0');
                            },
                            size: ''
                        });
                    }
                });
            }
        });

        // 显示表单弹窗
        function showEditModel(expTpe) {
            console.log(expTpe)
            admin.open({
                type: 1,
                title: (expTpe ? '修改' : '添加') + '单据',
                content: $('#editDialog').html(),
                area: '700px',
                success: function (layero, dIndex) {
                    $(layero).children('.layui-layer-content').css('overflow', 'visible');
                    var url = expTpe ? '../../json/ok.json' : '../../json/ok.json';
                    var isExpAdd = !expTpe;
                    // 回显数据
                    form.val('editForm', expTpe);
                    // 表单提交事件
                    form.on('submit(waitMatinEditSubmit)', function (data) {
                        if (isExpAdd) {
                            if (xxDataList.length <= 0) {
                                layer.tips('请添加单据明细', '#matAddBtnComment', {tips: [1, '#ff4c4c']});
                                return false;
                            }
                            var nList = admin.util.deepClone(xxDataList);
                            for (var xi = 0; xi < nList.length; xi++) {
                                nList[xi].experimentId = undefined;
                            }
                            data.field.expListJson = JSON.stringify(nList);
                        }
                        layer.load(2);
                        $.get(url, data.field, function (res) {
                            layer.closeAll('loading');
                            if (res.code === 200) {
                                layer.close(dIndex);
                                insTb.reload({page: {curr: 1}});
                                layer.msg(res.msg, {icon: 1});
                            } else {
                                layer.msg(res.msg, {icon: 2});
                            }
                        }, 'json');
                        return false;
                    });
                    // 明细表格
                    var xxDataList = [];
                    var tbOptions = {
                        elem: '#formSSXMTable',
                        data: xxDataList,
                        page: true,
                        height: '350px;',
                        cellMinWidth: 100,
                        cols: [[
                            {type: 'numbers'},
                            {field: 'matNo', title: '物料编码'},
                            {field: 'matName', title: '物料名称', width: 160},
                            {field: 'qty', title: '修改数量', style: 'color: blue;font-weight: bold', edit: true, minWidth: 100, width: 100},
                            {align: 'center', title: '操作', toolbar: '#formSSXMTableBar', minWidth: 80, width: 80}
                        ]],
                        done: function () {
                            $(layero).find('.layui-table-view').css('margin', '0');
                        },
                        size: ''
                    };
                    if (!isExpAdd) {
                        tbOptions.data = undefined;
                        tbOptions.url = '../../json/e-course-tb2.json?experimentTypeId=' + expTpe.experimentTypeId;
                    }
                    var insTbSSXM = table.render(tbOptions);
                    // 工具条点击事件
                    table.on('tool(formSSXMTable)', function (obj) {
                        var data = obj.data;
                        var layEvent = obj.event;
                        if (layEvent === 'edit') {
                            showEditModel2(data);
                        } else if (layEvent === 'del') {
                            layer.confirm('确定要删除吗？', {
                                shade: .1,
                                skin: 'layui-layer-admin'
                            }, function (i) {
                                layer.close(i);
                                for (var j = 0; j < xxDataList.length; j++) {
                                    if (xxDataList[j].matNo === data.matNo) {
                                        xxDataList.splice(j, 1);
                                    }
                                }
                                insTbSSXM.reload({data: xxDataList, page: {curr: 1}});
                            });
                        }
                    });
                    // 数量修改
                    table.on('edit(formSSXMTable)', function (obj) {
                        let count = Number(obj.value);
                        if (isNaN(count)) {
                            layer.msg("请输入数字");
                        } else {
                            if (count > 0) {
                                for (var i=0;i<xxDataList.length;i++){
                                    if (xxDataList[i]["matNo"] === obj.data.matNo){
                                        xxDataList[i]["qty"] = count;
                                        break;
                                    }
                                }
                            } else {
                                layer.msg("数量必须大于零");
                            }
                        }
                        insTbSSXM.reload({data: xxDataList});
                    });
                    //
                    $('#matAddBtnComment').click(function () {
                        showEditModel2();
                    });

                    // 显示添加明细表单弹窗
                    function showEditModel2(exp) {
                        admin.open({
                            type: 1,
                            offset: '150px',
                            area: '480px',
                            title: (exp ? '修改' : '添加') + '明细',
                            content: $('#matEditDialog').html(),
                            success: function (layero, dIndex) {
                                $(layero).children('.layui-layer-content').css('overflow', 'visible');
                                var url = exp ? '../../json/ok.json' : '../../json/ok.json';
                                // 回显数据
                                form.val('matEditForm', exp);
                                // 表单提交事件
                                form.on('submit(matEditSubmit)', function (data) {
                                    var existMats = [];
                                    xxDataList.forEach(function(elem) {
                                        existMats.push(elem.matNo);
                                    });
                                    var selectList = matXmSelect.getValue();
                                    for (var i = 0; i<selectList.length; i++) {
                                        var item = selectList[i];
                                        if (existMats.indexOf(item.value) === -1) {
                                            // 查询物料详情
                                            $.ajax({
                                                url: baseUrl+"/matCode/"+item.value+"/auth",
                                                headers: {'token': localStorage.getItem('token')},
                                                method: 'GET',
                                                async: false,
                                                success: function (res) {
                                                    if (res.code === 200){
                                                        var mat = res.data;
                                                        xxDataList.push({
                                                            matNo: mat.matNo,
                                                            matName: mat.matName,
                                                            qty: 0.0
                                                        });
                                                        insTbSSXM.reload({data: xxDataList, page: {curr: 1}});
                                                    } else if (res.code === 403){
                                                        top.location.href = baseUrl+"/";
                                                    }else {
                                                        layer.msg(res.msg, {icon: 2})
                                                    }
                                                }
                                            })
                                        }
                                    }
                                    layer.close(dIndex);
                                    return false;
                                });
                                // 渲染物料选择
                                var matXmSelect = xmSelect.render({
                                    el: '#mat',
                                    style: {
                                        width: '340px',
                                    },
                                    autoRow: true,
                                    toolbar: { show: true },
                                    filterable: true,
                                    remoteSearch: true,
                                    remoteMethod: function(val, cb, show){
                                        $.ajax({
                                            url: baseUrl+"/mat/all/get/kv",
                                            headers: {'token': localStorage.getItem('token')},
                                            data: {
                                                condition: val
                                            },
                                            method: 'POST',
                                            success: function (res) {
                                                if (res.code === 200){
                                                    cb(res.data)
                                                } else {
                                                    cb([]);
                                                    layer.msg(res.msg, {icon: 2});
                                                }
                                            }
                                        });
                                    }
                                })
                                // 弹窗不出现滚动条
                                $(layero).children('.layui-layer-content').css('overflow', 'visible');
                                layui.form.render('select');
                            }
                        });
                    }

                }
            });
        }

        // 删除
        function doDel(experimentTypeId) {
            layer.confirm('确定要删除吗？', {
                shade: .1,
                skin: 'layui-layer-admin'
            }, function (i) {
                layer.close(i);
                layer.load(2);
                $.post('../../json/ok.json', {
                    experimentTypeId: experimentTypeId
                }, function (res) {
                    layer.closeAll('loading');
                    if (res.code === 200) {
                        layer.msg(res.msg, {icon: 1});
                        insTb.reload({page: {curr: 1}});
                    } else {
                        layer.msg(res.msg, {icon: 2});
                    }
                }, 'json');
            });
        }

    });
</script>
</body>
</html>


 src/main/webapp/views/waitMatinLog/waitMatinLog.html

@@ -16,7 +16,7 @@
<div id="search-box" class="layui-form layui-card-header">
    <div class="layui-inline">
        <div class="layui-input-inline">
            <input class="layui-input" type="text" name="id" placeholder="编号" autocomplete="off">
            <input class="layui-input" type="text" name="bill_no" placeholder="编号" autocomplete="off">
        </div>
    </div>
    <div class="layui-inline">

 src/main/webapp/views/waitMatoutLog/waitMatoutLog.html

@@ -16,7 +16,7 @@
<div id="search-box" class="layui-form layui-card-header">
    <div class="layui-inline">
        <div class="layui-input-inline">
            <input class="layui-input" type="text" name="id" placeholder="编号" autocomplete="off">
            <input class="layui-input" type="text" name="bill_no" placeholder="编号" autocomplete="off">
        </div>
    </div>
    <div class="layui-inline">