zy-asrs.git - Gitblit

parent: 37960b90 | 补丁 | 提交 | ignore whitespace

wang..123

2021-11-25 0ad0c7ec53ea6a81f8f392c6ca6526757a4adb78

3个文件已修改

	src/main/java/com/zy/asrs/controller/WrkMastLogController.java	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/webapp/views/pakStore/locDetlCheckQuery.html	69 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/webapp/views/pakStore/locDetlQuery.html	63 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

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

@@ -65,9 +65,9 @@
                wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
            } else {
                if (entry.getKey().equals("io_type")) {
                   wrapper.like(entry.getKey(), val).eq("io_type", val);
                   wrapper.eq("io_type", val);
                } else if(entry.getKey().equals("wrk_sts")){
                    wrapper.like(entry.getKey(), val).eq("wrk_sts", val);
                    wrapper.eq("wrk_sts", val);
                } else {
                    wrapper.like(entry.getKey(), val);
                }

 src/main/webapp/views/pakStore/locDetlCheckQuery.html

@@ -35,7 +35,6 @@
        #data-search-btn.layui-btn-container .layui-btn {
            margin-right: 20px;
        }

    </style>
</head>
<body>
@@ -52,12 +51,12 @@
        </div>
        <div class="layui-inline">
            <div class="layui-input-inline">
                <input class="layui-input" type="text" name="mat_no" placeholder="产品号"  autocomplete="off">
                <input class="layui-input" type="text" name="mat_no" placeholder="物料号"  autocomplete="off">
            </div>
        </div>
        <div class="layui-inline">
            <div class="layui-input-inline">
                <input class="layui-input" type="text" name="mat_name" placeholder="产品描述" autocomplete="off">
                <input class="layui-input" type="text" name="mat_name" placeholder="物料描述" autocomplete="off">
            </div>
        </div>
        <!-- 日期范围 -->
@@ -117,8 +116,7 @@
            headers: {token: localStorage.getItem('token')},
            url: baseUrl+'/stock/out/list/auth',
            page: true,
            limit: 20,
            limits: [20, 50, 100, 200, 500],
            limit: 10,
            even: true,
            toolbar: '#toolbar',
            cellMinWidth: 50,
@@ -143,8 +141,14 @@
                    top.location.href = baseUrl+"/";
                }
                pageCurr=curr;
                $('.layui-form-checkbox').css("pointer-events", "none");
                $('td[data-field="0').css("cursor", "pointer")
                form.on('checkbox(tableCheckbox)', function (data) {
                    var _index = $(data.elem).attr('table-index')||0;
                    if(data.elem.checked){
                        res.data[_index][data.value] = 'Y';
                    }else{
                        res.data[_index][data.value] = 'N';
                    }
                });
            }
        });

@@ -158,26 +162,6 @@
                        layer.msg("请选择数据");
                        return;
                    }
                    var locNos = [];
                    data.forEach(function(elem) {
                        locNos.push(elem.locNo);
                    });
                    $.ajax({
                        url: baseUrl+"/locDetl/auth",
                        headers: {'token': localStorage.getItem('token')},
                        data: {locNos:locNos},
                        method: 'POST',
                        async: false,
                        success: function (res) {
                            if (res.code === 200) {
                                data = res.data;
                            } else if (res.code === 403) {
                                top.location.href = baseUrl + "/";
                            } else {
                                layer.msg(res.msg)
                            }
                        }
                    })
                    parent.addTableData(data);
                    break;
            }
@@ -203,20 +187,6 @@
        });
    })

    var b = true;
    $(function(){
        $(document.body).on('click','td[data-field="0"]',function(){
            var locNo = $(this).next().children("div").html();
            if (b) {
                b = false;
                $("tr td[data-field=locNo\\$] div:contains("+ locNo +")").parent().prev().children().children("div").click();
                setTimeout(function () {
                    b = true;
                }, 200)
            }
        });
    })

    function tableReload(child) {
        var searchData = {};
        $.each($('#search-box [name]').serializeArray(), function() {
@@ -232,12 +202,25 @@
                    top.location.href = baseUrl+"/";
                }
                pageCurr=curr;
                $('.layui-form-checkbox').css("pointer-events", "none");
                $('td[data-field="0').css("cursor", "pointer")
                if (res.data.length === 0 && count !== 0) {
                    locDetlTableIns.reload({
                        where: searchData,
                        page: {
                            curr: pageCurr-1
                        }
                    });
                    pageCurr -= 1;
                }
            }
        });
    }

    function clearFormVal(el) {
        $(':input', el)
            .val('')
            .removeAttr('checked')
            .removeAttr('selected');
    }
</script>
</html>


 src/main/webapp/views/pakStore/locDetlQuery.html

@@ -51,12 +51,12 @@
        </div>
        <div class="layui-inline">
            <div class="layui-input-inline">
                <input class="layui-input" type="text" name="mat_no" placeholder="产品号"  autocomplete="off">
                <input class="layui-input" type="text" name="mat_no" placeholder="物料号"  autocomplete="off">
            </div>
        </div>
        <div class="layui-inline">
            <div class="layui-input-inline">
                <input class="layui-input" type="text" name="mat_name" placeholder="产品描述" autocomplete="off">
                <input class="layui-input" type="text" name="mat_name" placeholder="物料描述" autocomplete="off">
            </div>
        </div>
        <!-- 日期范围 -->
@@ -99,9 +99,7 @@
            ,{field: 'locNo$', align: 'center',title: '库位号'}
        ];
        cols.push.apply(cols, detlCols);
        cols.push(
            {field: 'memo', align: 'center',title: '备注'}
            ,{field: 'modiUser$', align: 'center',title: '修改人员', hide: true}
        cols.push({field: 'modiUser$', align: 'center',title: '修改人员', hide: true}
            ,{field: 'modiTime$', align: 'center',title: '修改时间'})
        return cols;
    }
@@ -143,8 +141,14 @@
                    top.location.href = baseUrl+"/";
                }
                pageCurr=curr;
                $('.layui-form-checkbox').css("pointer-events", "none");
                $('td[data-field="0').css("cursor", "pointer")
                form.on('checkbox(tableCheckbox)', function (data) {
                    var _index = $(data.elem).attr('table-index')||0;
                    if(data.elem.checked){
                        res.data[_index][data.value] = 'Y';
                    }else{
                        res.data[_index][data.value] = 'N';
                    }
                });
            }
        });

@@ -158,26 +162,6 @@
                        layer.msg("请选择数据");
                        return;
                    }
                    var locNos = [];
                    data.forEach(function(elem) {
                        locNos.push(elem.locNo);
                    });
                    $.ajax({
                        url: baseUrl+"/locDetl/auth",
                        headers: {'token': localStorage.getItem('token')},
                        data: {locNos:locNos},
                        method: 'POST',
                        async: false,
                        success: function (res) {
                            if (res.code === 200) {
                                data = res.data;
                            } else if (res.code === 403) {
                                top.location.href = baseUrl + "/";
                            } else {
                                layer.msg(res.msg)
                            }
                        }
                    })
                    parent.addTableData(data);
                    break;
            }
@@ -203,20 +187,6 @@
        });
    })

    var b = true;
    $(function(){
        $(document.body).on('click','td[data-field="0"]',function(){
            var locNo = $(this).next().children("div").html();
            if (b) {
                b = false;
                $("tr td[data-field=locNo\\$] div:contains("+ locNo +")").parent().prev().children().children("div").click();
                setTimeout(function () {
                    b = true;
                }, 200)
            }
        });
    })

    function tableReload(child) {
        var searchData = {};
        $.each($('#search-box [name]').serializeArray(), function() {
@@ -232,8 +202,15 @@
                    top.location.href = baseUrl+"/";
                }
                pageCurr=curr;
                $('.layui-form-checkbox').css("pointer-events", "none");
                $('td[data-field="0').css("cursor", "pointer")
                if (res.data.length === 0 && count !== 0) {
                    locDetlTableIns.reload({
                        where: searchData,
                        page: {
                            curr: pageCurr-1
                        }
                    });
                    pageCurr -= 1;
                }
            }
        });
    }

			@@ -65,9 +65,9 @@
			wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
			} else {
			if (entry.getKey().equals("io_type")) {
			wrapper.like(entry.getKey(), val).eq("io_type", val);
			wrapper.eq("io_type", val);
			} else if(entry.getKey().equals("wrk_sts")){
			wrapper.like(entry.getKey(), val).eq("wrk_sts", val);
			wrapper.eq("wrk_sts", val);
			} else {
			wrapper.like(entry.getKey(), val);
			}

			@@ -35,7 +35,6 @@
			#data-search-btn.layui-btn-container .layui-btn {
			margin-right: 20px;
			}

			</style>
			</head>
			<body>
			@@ -52,12 +51,12 @@
			</div>
			<div class="layui-inline">
			<div class="layui-input-inline">
			<input class="layui-input" type="text" name="mat_no" placeholder="产品号" autocomplete="off">
			<input class="layui-input" type="text" name="mat_no" placeholder="物料号" autocomplete="off">
			</div>
			</div>
			<div class="layui-inline">
			<div class="layui-input-inline">
			<input class="layui-input" type="text" name="mat_name" placeholder="产品描述" autocomplete="off">
			<input class="layui-input" type="text" name="mat_name" placeholder="物料描述" autocomplete="off">
			</div>
			</div>
			<!-- 日期范围 -->
			@@ -117,8 +116,7 @@
			headers: {token: localStorage.getItem('token')},
			url: baseUrl+'/stock/out/list/auth',
			page: true,
			limit: 20,
			limits: [20, 50, 100, 200, 500],
			limit: 10,
			even: true,
			toolbar: '#toolbar',
			cellMinWidth: 50,
			@@ -143,8 +141,14 @@
			top.location.href = baseUrl+"/";
			}
			pageCurr=curr;
			$('.layui-form-checkbox').css("pointer-events", "none");
			$('td[data-field="0').css("cursor", "pointer")
			form.on('checkbox(tableCheckbox)', function (data) {
			var _index = $(data.elem).attr('table-index')\|\|0;
			if(data.elem.checked){
			res.data[_index][data.value] = 'Y';
			}else{
			res.data[_index][data.value] = 'N';
			}
			});
			}
			});

			@@ -158,26 +162,6 @@
			layer.msg("请选择数据");
			return;
			}
			var locNos = [];
			data.forEach(function(elem) {
			locNos.push(elem.locNo);
			});
			$.ajax({
			url: baseUrl+"/locDetl/auth",
			headers: {'token': localStorage.getItem('token')},
			data: {locNos:locNos},
			method: 'POST',
			async: false,
			success: function (res) {
			if (res.code === 200) {
			data = res.data;
			} else if (res.code === 403) {
			top.location.href = baseUrl + "/";
			} else {
			layer.msg(res.msg)
			}
			}
			})
			parent.addTableData(data);
			break;
			}
			@@ -203,20 +187,6 @@
			});
			})

			var b = true;
			$(function(){
			$(document.body).on('click','td[data-field="0"]',function(){
			var locNo = $(this).next().children("div").html();
			if (b) {
			b = false;
			$("tr td[data-field=locNo\\$] div:contains("+ locNo +")").parent().prev().children().children("div").click();
			setTimeout(function () {
			b = true;
			}, 200)
			}
			});
			})

			function tableReload(child) {
			var searchData = {};
			$.each($('#search-box [name]').serializeArray(), function() {
			@@ -232,12 +202,25 @@
			top.location.href = baseUrl+"/";
			}
			pageCurr=curr;
			$('.layui-form-checkbox').css("pointer-events", "none");
			$('td[data-field="0').css("cursor", "pointer")
			if (res.data.length === 0 && count !== 0) {
			locDetlTableIns.reload({
			where: searchData,
			page: {
			curr: pageCurr-1
			}
			});
			pageCurr -= 1;
			}
			}
			});
			}

			function clearFormVal(el) {
			$(':input', el)
			.val('')
			.removeAttr('checked')
			.removeAttr('selected');
			}
			</script>
			</html>

			@@ -51,12 +51,12 @@
			</div>
			<div class="layui-inline">
			<div class="layui-input-inline">
			<input class="layui-input" type="text" name="mat_no" placeholder="产品号" autocomplete="off">
			<input class="layui-input" type="text" name="mat_no" placeholder="物料号" autocomplete="off">
			</div>
			</div>
			<div class="layui-inline">
			<div class="layui-input-inline">
			<input class="layui-input" type="text" name="mat_name" placeholder="产品描述" autocomplete="off">
			<input class="layui-input" type="text" name="mat_name" placeholder="物料描述" autocomplete="off">
			</div>
			</div>
			<!-- 日期范围 -->
			@@ -99,9 +99,7 @@
			,{field: 'locNo$', align: 'center',title: '库位号'}
			];
			cols.push.apply(cols, detlCols);
			cols.push(
			{field: 'memo', align: 'center',title: '备注'}
			,{field: 'modiUser$', align: 'center',title: '修改人员', hide: true}
			cols.push({field: 'modiUser$', align: 'center',title: '修改人员', hide: true}
			,{field: 'modiTime$', align: 'center',title: '修改时间'})
			return cols;
			}
			@@ -143,8 +141,14 @@
			top.location.href = baseUrl+"/";
			}
			pageCurr=curr;
			$('.layui-form-checkbox').css("pointer-events", "none");
			$('td[data-field="0').css("cursor", "pointer")
			form.on('checkbox(tableCheckbox)', function (data) {
			var _index = $(data.elem).attr('table-index')\|\|0;
			if(data.elem.checked){
			res.data[_index][data.value] = 'Y';
			}else{
			res.data[_index][data.value] = 'N';
			}
			});
			}
			});

			@@ -158,26 +162,6 @@
			layer.msg("请选择数据");
			return;
			}
			var locNos = [];
			data.forEach(function(elem) {
			locNos.push(elem.locNo);
			});
			$.ajax({
			url: baseUrl+"/locDetl/auth",
			headers: {'token': localStorage.getItem('token')},
			data: {locNos:locNos},
			method: 'POST',
			async: false,
			success: function (res) {
			if (res.code === 200) {
			data = res.data;
			} else if (res.code === 403) {
			top.location.href = baseUrl + "/";
			} else {
			layer.msg(res.msg)
			}
			}
			})
			parent.addTableData(data);
			break;
			}
			@@ -203,20 +187,6 @@
			});
			})

			var b = true;
			$(function(){
			$(document.body).on('click','td[data-field="0"]',function(){
			var locNo = $(this).next().children("div").html();
			if (b) {
			b = false;
			$("tr td[data-field=locNo\\$] div:contains("+ locNo +")").parent().prev().children().children("div").click();
			setTimeout(function () {
			b = true;
			}, 200)
			}
			});
			})

			function tableReload(child) {
			var searchData = {};
			$.each($('#search-box [name]').serializeArray(), function() {
			@@ -232,8 +202,15 @@
			top.location.href = baseUrl+"/";
			}
			pageCurr=curr;
			$('.layui-form-checkbox').css("pointer-events", "none");
			$('td[data-field="0').css("cursor", "pointer")
			if (res.data.length === 0 && count !== 0) {
			locDetlTableIns.reload({
			where: searchData,
			page: {
			curr: pageCurr-1
			}
			});
			pageCurr -= 1;
			}
			}
			});
			}