xtywms.git - Gitblit

parent: fb405f12 | 补丁 | 提交 | ignore whitespace

zjj

2024-04-03 52c94f01b291968f331fc0d2def2f7dd885609cb

#平转立

1个文件已添加

3个文件已修改

	src/main/java/com/zy/asrs/entity/param/CombParam.java	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java	8 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/webapp/views/pda/combLToP.html	3 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/webapp/views/pda/matQuery2.html	259 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

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

@@ -21,6 +21,8 @@
    // 生产单号
    private String mnemonic;



    private String billNo;

    // 小车取货点
@@ -28,6 +30,8 @@

    private Integer move;



    public Integer getMove() {
        return move;
    }

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

@@ -326,6 +326,13 @@
                    // 如果生成单号不为空插入生产单号
                    if (!Cools.isEmpty(combMat.getMnemonic())) {
                        waitPakin.setMnemonic(combMat.getMnemonic());
                    }else {
                        throw new CoolException("生产单号为空,请输入");
                    }
                    if (!Cools.isEmpty(combMat.getMnemonic())) {
                        waitPakin.setSupplier(combMat.getSupplier());
                    }else {
                        throw new CoolException("通知单号为空,请输入");
                    }

                    if (!waitPakinService.insert(waitPakin)) {
@@ -336,6 +343,7 @@
                        locNormalEntityWrapper.eq("matnr",waitPakin.getMatnr());
                        locNormalEntityWrapper.eq("mnemonic",waitPakin.getMnemonic());
                        locNormalEntityWrapper.eq("state","1");
                        locNormalEntityWrapper.eq("supplier",waitPakin.getSupplier());
                        LocNormal locNormal = locNormalService.selectOne(locNormalEntityWrapper);
                        if (Cools.isEmpty(locNormal)){
                            throw new CoolException("未找到平库相同库存");

 src/main/webapp/views/pda/combLToP.html

@@ -76,6 +76,7 @@
            cols: [[
                {field: 'matNo', align: 'center', title: '物料编码'},
                {field: 'mnemonic', align: 'center', title: '生产单号'},
                {field: 'supplier', align: 'center', title: '通知单号'},
                {field: 'count', align: 'center', title: '数量', style:'color: blue', width:50},
                {field: 'matName', align: 'center', title: '物料名称'}
            ]],
@@ -108,7 +109,7 @@
            title: '提取物料',
            shade: [0.3,'#000'],
            area: ['90%', '90%'],
            content: 'matQuery.html',
            content: 'matQuery2.html',
            success: function(layero, index){
                $('.layui-layer-title').css('font-size', '16px');
            },

 src/main/webapp/views/pda/matQuery2.html

New file
@@ -0,0 +1,259 @@
<!DOCTYPE html>
<html lang="en">
<head>
    <meta charset="UTF-8">
    <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no"/>
    <title>物料提取</title>
    <link rel="stylesheet" href="../../static/layui/css/layui.css" media="all">
    <script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
    <script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></script>
    <script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>
    <script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script>
    <script type="text/javascript" src="../../static/js/handlebars/handlebars-v4.5.3.js"></script>
    <style>

        .form-box {
            padding: 15px 5px 5px 5px;
            font-size: 16px;
            text-align: center;
        }

        .form-item {
            margin-bottom: 10px;
        }

        .form-box span {
            font-size: 16px;
            display: inline-block;
            text-align: right;
        }
        .form-box input {
            width: 160px;
            padding-left: 5px;
            height: 30px;
            border: 1px solid #777777;
            overflow:hidden;
            white-space:nowrap;
            text-overflow:ellipsis;
        }
        #confirm {
            margin-top: 10px;
            padding: 5px 20px;
        }

        .number-tool {
            margin-left: 10px;
            padding: 1px 0 1px 5px;
            display: inline-block;
            width: 120px;
        }
        .number-tool:after {
            clear: both;
            content: "";
            display: table;
        }
        .number-tool button {
            background-color: #fff;
            margin-top: 3px;
            font-size: 16px;
            height: 25px;
            float: left;
            width: 25px;
            border: 1px solid #777777;
        }
        .number-tool input {
            text-align: center;
            height: 30px;
            float: left;
            margin: 0 5px;
            width: 40px;
            padding: 0;
        }
    </style>
</head>
<body>

<div class="form-box">
    <div class="form-item">
        <table style="display: inline">
            <tr>
                <td>
                    <span style="width: 35px; margin-right: 5px">编码</span>
                </td>
                <td style="text-align: left">
                    <input id="matNo" type="text" placeholder="扫码 / 输入" onkeyup="find(this)" autocomplete="off">
                </td>
            </tr>
        </table>
    </div>
    <div class="form-item">
        <table style="display: inline">
            <tr>
                <td style="vertical-align: top">
                    <span style="width: 35px; margin-right: 5px">名称</span>
                </td>
                <td style="text-align: left">
                    <textarea rows="4" style="width: 165px; resize: none" id="matName" type="text" disabled="disabled" readonly="readonly"></textarea>
                </td>
            </tr>
        </table>
    </div>
    <div class="form-item">
        <table style="display: inline">
            <tr>
                <td>
                    <span style="width: 35px; margin-right: 5px">规格</span>
                </td>
                <td style="text-align: left">
                    <input id="str2" type="text" disabled="disabled">
                </td>
            </tr>
        </table>
    </div>
    <div class="form-item">
    <table style="display: inline">
        <tr>
            <td>
                <span style="width: 35px; margin-right: 5px">生产单</span>
            </td>
            <td style="text-align: left">
                <input id="mnemonic" type="text" autocomplete="off">
            </td>
        </tr>
    </table>
</div>
    <div class="form-item">
        <table style="display: inline">
            <tr>
                <td>
                    <span style="width: 35px; margin-right: 5px">通知单</span>
                </td>
                <td style="text-align: left">
                    <input id="supplier" type="text" autocomplete="off">
                </td>
            </tr>
        </table>
    </div>
    <!--<div class="form-item">-->
        <!--<span>单位</span>-->
        <!--<input id="str1" type="text" disabled="disabled">-->
    <!--</div>-->
    <div class="form-item">
        <span style="vertical-align: middle">数量</span>
        <div class="number-tool" style="vertical-align: middle">
            <button onclick="reduce()">-</button><input id="count" type="number" min="1" onblur="checkCount()"><button onclick="add()">+</button>
        </div>
    </div>
    <button id="confirm" onclick="confirm()">提取</button>
</div>

</body>
<script>
    var layer;
    layui.use(['table', 'laydate', 'form'], function () {
        var layer = layui.layer;
    });

    var countDom = $('#count');
    var initMatCount = 1;
    var pageCurr;

    /**
     * 根据物料编码查询物料详情
     */
    function find(el){
        if (isEmpty(el.value)) {
            return;
        }
        $.ajax({
            url: baseUrl + "/matCode/auth",
            headers: {'token': localStorage.getItem('token')},
            data: {
                id: el.value
            },
            method: 'POST',
            success: function (res) {
                if (res.code === 200) {
                    if (res.data != null) {
                        $('#matName').val(res.data.matName);
                        $('#str1').val(res.data.str1);
                        $('#str2').val(res.data.str2);
                        countDom.val(initMatCount);
                        $('#count').focus().select();
                    }
                } else if (res.code === 403) {
                    top.location.href = baseUrl + "/pda";
                } else {
                    alert(res.msg)
                }
            }
        })
    }

    /**
     * 提取
     */
    function confirm(){
        var data = {
            matNo: $('#matNo').val(),
            matName: $('#matName').val(),
            count: countDom.val(),
            mnemonic: $("#mnemonic").val(),
            supplier: $("#supplier").val()
        };
        var pdaUrl = window.document.referrer;
        if (pdaUrl.indexOf("areaType") == -1) {
            if (isEmpty(data.mnemonic)) {
                layer.msg("请输入生产单号");
                return;
            }
            if (isEmpty(data.supplier)) {
                layer.msg("请输入通知单号");
                return;
            }
        }

        parent.addTableData(data);
        parent.layer.close(parent.matCodeLayerIdx);
    }

    window.onload = function(){document.getElementById("matNo").focus();}
    $(document).on('click','#confirm', function () {
    })

    // $('body').keydown(function () {
    //     if (event.keyCode === 13) {
    //         $("#confirm").click();
    //     }
    // });

    function add() {
        countDom.val(Number(countDom.val()) + 1);
    }
    function reduce() {
        if (countDom.val() <= initMatCount) {
            return;
        }
        countDom.val(countDom.val() - 1);
    }


    document.onkeyup = function (e) {
        if (window.event)//如果window.event对象存在，就以此事件对象为准
            e = window.event;
        var key = e.charCode || e.keyCode;
        if (key === 115) {
            confirm();
        }
    }

    // 校正最小数量
    function checkCount() {
        var countValue = $("#count").val();
        if (countValue <= 0) {
            $("#count").val(1);
        }
    }

</script>
</html>

			@@ -21,6 +21,8 @@
			// 生产单号
			private String mnemonic;



			private String billNo;

			// 小车取货点
			@@ -28,6 +30,8 @@

			private Integer move;



			public Integer getMove() {
			return move;
			}

			@@ -326,6 +326,13 @@
			// 如果生成单号不为空插入生产单号
			if (!Cools.isEmpty(combMat.getMnemonic())) {
			waitPakin.setMnemonic(combMat.getMnemonic());
			}else {
			throw new CoolException("生产单号为空,请输入");
			}
			if (!Cools.isEmpty(combMat.getMnemonic())) {
			waitPakin.setSupplier(combMat.getSupplier());
			}else {
			throw new CoolException("通知单号为空,请输入");
			}

			if (!waitPakinService.insert(waitPakin)) {
			@@ -336,6 +343,7 @@
			locNormalEntityWrapper.eq("matnr",waitPakin.getMatnr());
			locNormalEntityWrapper.eq("mnemonic",waitPakin.getMnemonic());
			locNormalEntityWrapper.eq("state","1");
			locNormalEntityWrapper.eq("supplier",waitPakin.getSupplier());
			LocNormal locNormal = locNormalService.selectOne(locNormalEntityWrapper);
			if (Cools.isEmpty(locNormal)){
			throw new CoolException("未找到平库相同库存");

			@@ -76,6 +76,7 @@
			cols: [[
			{field: 'matNo', align: 'center', title: '物料编码'},
			{field: 'mnemonic', align: 'center', title: '生产单号'},
			{field: 'supplier', align: 'center', title: '通知单号'},
			{field: 'count', align: 'center', title: '数量', style:'color: blue', width:50},
			{field: 'matName', align: 'center', title: '物料名称'}
			]],
			@@ -108,7 +109,7 @@
			title: '提取物料',
			shade: [0.3,'#000'],
			area: ['90%', '90%'],
			content: 'matQuery.html',
			content: 'matQuery2.html',
			success: function(layero, index){
			$('.layui-layer-title').css('font-size', '16px');
			},

New file
			@@ -0,0 +1,259 @@
			<!DOCTYPE html>
			<html lang="en">
			<head>
			<meta charset="UTF-8">
			<meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no"/>
			<title>物料提取</title>
			<link rel="stylesheet" href="../../static/layui/css/layui.css" media="all">
			<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
			<script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></script>
			<script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>
			<script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script>
			<script type="text/javascript" src="../../static/js/handlebars/handlebars-v4.5.3.js"></script>
			<style>

			.form-box {
			padding: 15px 5px 5px 5px;
			font-size: 16px;
			text-align: center;
			}

			.form-item {
			margin-bottom: 10px;
			}

			.form-box span {
			font-size: 16px;
			display: inline-block;
			text-align: right;
			}
			.form-box input {
			width: 160px;
			padding-left: 5px;
			height: 30px;
			border: 1px solid #777777;
			overflow:hidden;
			white-space:nowrap;
			text-overflow:ellipsis;
			}
			#confirm {
			margin-top: 10px;
			padding: 5px 20px;
			}

			.number-tool {
			margin-left: 10px;
			padding: 1px 0 1px 5px;
			display: inline-block;
			width: 120px;
			}
			.number-tool:after {
			clear: both;
			content: "";
			display: table;
			}
			.number-tool button {
			background-color: #fff;
			margin-top: 3px;
			font-size: 16px;
			height: 25px;
			float: left;
			width: 25px;
			border: 1px solid #777777;
			}
			.number-tool input {
			text-align: center;
			height: 30px;
			float: left;
			margin: 0 5px;
			width: 40px;
			padding: 0;
			}
			</style>
			</head>
			<body>

			<div class="form-box">
			<div class="form-item">
			<table style="display: inline">
			<tr>
			<td>
			<span style="width: 35px; margin-right: 5px">编码</span>
			</td>
			<td style="text-align: left">
			<input id="matNo" type="text" placeholder="扫码 / 输入" onkeyup="find(this)" autocomplete="off">
			</td>
			</tr>
			</table>
			</div>
			<div class="form-item">
			<table style="display: inline">
			<tr>
			<td style="vertical-align: top">
			<span style="width: 35px; margin-right: 5px">名称</span>
			</td>
			<td style="text-align: left">
			<textarea rows="4" style="width: 165px; resize: none" id="matName" type="text" disabled="disabled" readonly="readonly"></textarea>
			</td>
			</tr>
			</table>
			</div>
			<div class="form-item">
			<table style="display: inline">
			<tr>
			<td>
			<span style="width: 35px; margin-right: 5px">规格</span>
			</td>
			<td style="text-align: left">
			<input id="str2" type="text" disabled="disabled">
			</td>
			</tr>
			</table>
			</div>
			<div class="form-item">
			<table style="display: inline">
			<tr>
			<td>
			<span style="width: 35px; margin-right: 5px">生产单</span>
			</td>
			<td style="text-align: left">
			<input id="mnemonic" type="text" autocomplete="off">
			</td>
			</tr>
			</table>
			</div>
			<div class="form-item">
			<table style="display: inline">
			<tr>
			<td>
			<span style="width: 35px; margin-right: 5px">通知单</span>
			</td>
			<td style="text-align: left">
			<input id="supplier" type="text" autocomplete="off">
			</td>
			</tr>
			</table>
			</div>
			<!--<div class="form-item">-->
			<!--<span>单位</span>-->
			<!--<input id="str1" type="text" disabled="disabled">-->
			<!--</div>-->
			<div class="form-item">
			<span style="vertical-align: middle">数量</span>
			<div class="number-tool" style="vertical-align: middle">
			<button onclick="reduce()">-</button><input id="count" type="number" min="1" onblur="checkCount()"><button onclick="add()">+</button>
			</div>
			</div>
			<button id="confirm" onclick="confirm()">提取</button>
			</div>

			</body>
			<script>
			var layer;
			layui.use(['table', 'laydate', 'form'], function () {
			var layer = layui.layer;
			});

			var countDom = $('#count');
			var initMatCount = 1;
			var pageCurr;

			/**
			* 根据物料编码查询物料详情
			*/
			function find(el){
			if (isEmpty(el.value)) {
			return;
			}
			$.ajax({
			url: baseUrl + "/matCode/auth",
			headers: {'token': localStorage.getItem('token')},
			data: {
			id: el.value
			},
			method: 'POST',
			success: function (res) {
			if (res.code === 200) {
			if (res.data != null) {
			$('#matName').val(res.data.matName);
			$('#str1').val(res.data.str1);
			$('#str2').val(res.data.str2);
			countDom.val(initMatCount);
			$('#count').focus().select();
			}
			} else if (res.code === 403) {
			top.location.href = baseUrl + "/pda";
			} else {
			alert(res.msg)
			}
			}
			})
			}

			/**
			* 提取
			*/
			function confirm(){
			var data = {
			matNo: $('#matNo').val(),
			matName: $('#matName').val(),
			count: countDom.val(),
			mnemonic: $("#mnemonic").val(),
			supplier: $("#supplier").val()
			};
			var pdaUrl = window.document.referrer;
			if (pdaUrl.indexOf("areaType") == -1) {
			if (isEmpty(data.mnemonic)) {
			layer.msg("请输入生产单号");
			return;
			}
			if (isEmpty(data.supplier)) {
			layer.msg("请输入通知单号");
			return;
			}
			}

			parent.addTableData(data);
			parent.layer.close(parent.matCodeLayerIdx);
			}

			window.onload = function(){document.getElementById("matNo").focus();}
			$(document).on('click','#confirm', function () {
			})

			// $('body').keydown(function () {
			// if (event.keyCode === 13) {
			// $("#confirm").click();
			// }
			// });

			function add() {
			countDom.val(Number(countDom.val()) + 1);
			}
			function reduce() {
			if (countDom.val() <= initMatCount) {
			return;
			}
			countDom.val(countDom.val() - 1);
			}


			document.onkeyup = function (e) {
			if (window.event)//如果window.event对象存在，就以此事件对象为准
			e = window.event;
			var key = e.charCode \|\| e.keyCode;
			if (key === 115) {
			confirm();
			}
			}

			// 校正最小数量
			function checkCount() {
			var countValue = $("#count").val();
			if (countValue <= 0) {
			$("#count").val(1);
			}
			}

			</script>
			</html>