#
luxiaotao1123
2021-03-31 60a48ba8f8e82f35c3f6262c45eee00b70289c0e
#
2个文件已添加
1 文件已重命名
1个文件已删除
6个文件已修改
557 ■■■■■ 已修改文件
src/main/java/zy/cloud/wms/common/config/AdminInterceptor.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/zy/cloud/wms/common/model/MatnrDto.java 15 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/zy/cloud/wms/manager/controller/WorkController.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/zy/cloud/wms/manager/entity/param/PakinParam.java 18 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/zy/cloud/wms/manager/service/WorkService.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/zy/cloud/wms/manager/service/impl/WorkServiceImpl.java 18 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/webapp/views/pda/index.html 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/webapp/views/pda/pakin.html 254 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/webapp/views/pda/stockIn.html 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/webapp/views/pda/stockInPro.html 235 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/zy/cloud/wms/common/config/AdminInterceptor.java
@@ -97,7 +97,7 @@
//            long timestamp = Long.parseLong(deToken.substring(0, 13));
            // 15分钟后过期
            if (System.currentTimeMillis() - userLogin.getCreateTime().getTime() > 900000){
            if (System.currentTimeMillis() - userLogin.getCreateTime().getTime() > 86400000){
                Http.response(response, BaseRes.DENIED);
                return false;
            }
src/main/java/zy/cloud/wms/common/model/MatnrDto.java
New file
@@ -0,0 +1,15 @@
package zy.cloud.wms.common.model;
import lombok.Data;
/**
 * Created by vincent on 2021/3/31
 */
@Data
public class MatnrDto {
    private String matnr;
    private Double count;
}
src/main/java/zy/cloud/wms/manager/controller/WorkController.java
@@ -41,6 +41,12 @@
    @Autowired
    private CustOrderService custOrderService;
    @RequestMapping("/stock/pakin")
    @ManagerAuth(memo = "入库")
    public R stockPakin(@RequestBody PakinParam number) {
        return workService.stockPakin(number, getUserId());
    }
    @RequestMapping("/stock/in")
    @ManagerAuth(memo = "上架")
    public R stockIn(@RequestBody StockInParam stockInParam) {
src/main/java/zy/cloud/wms/manager/entity/param/PakinParam.java
New file
@@ -0,0 +1,18 @@
package zy.cloud.wms.manager.entity.param;
import lombok.Data;
import zy.cloud.wms.common.model.MatnrDto;
import java.util.List;
/**
 * Created by vincent on 2021/3/26
 */
@Data
public class PakinParam {
    private String nodeId;
    private List<MatnrDto> mats;
}
src/main/java/zy/cloud/wms/manager/service/WorkService.java
@@ -7,6 +7,8 @@
public interface WorkService {
    R stockPakin(PakinParam param, Long userId);
    R stockIn(StockInParam param, Long userId);
    R stockOutCheck(String number, Long userId);
src/main/java/zy/cloud/wms/manager/service/impl/WorkServiceImpl.java
@@ -8,6 +8,7 @@
import org.springframework.transaction.annotation.Transactional;
import zy.cloud.wms.common.config.CodeCoolException;
import zy.cloud.wms.common.model.BillDto;
import zy.cloud.wms.common.model.MatnrDto;
import zy.cloud.wms.common.model.OrderStoDto;
import zy.cloud.wms.common.service.MainService;
import zy.cloud.wms.common.service.asrs.AsrsService;
@@ -55,6 +56,23 @@
    @Override
    @Transactional
    public R stockPakin(PakinParam param, Long userId) {
        Node node = nodeService.selectByUuid(param.getNodeId());
        if (node == null) {
            return R.error("货位不存在");
        }
        if (Cools.isEmpty(param.getMats())) {
            return R.error("入库物料不能为空");
        }
        for (MatnrDto dto : param.getMats()) {
        }
        return R.ok("入库成功");
    }
    @Override
    @Transactional
    public R stockIn(StockInParam param, Long userId) {
        Node node = nodeService.selectByUuid(param.getNodeId());
        if (node == null) {
src/main/webapp/views/pda/index.html
@@ -76,6 +76,7 @@
<ul class="nav">
    <li><a id="comb" onclick="nav(this.id)" class="nav-select" href="#">组托</a></li>
    <li><a id="stockIn" onclick="nav(this.id)" class="nav-unselect" href="#">上架</a></li>
    <li><a id="pakin" onclick="nav(this.id)" class="nav-unselect" href="#">入库</a></li>
    <li><a id="stockOut" onclick="nav(this.id)" class="nav-unselect" href="#">拣货</a></li>
    <li><a id="stockCheck" onclick="nav(this.id)" class="nav-unselect" href="#">盘点</a></li>
</ul>
src/main/webapp/views/pda/pakin.html
File was renamed from src/main/webapp/views/pda/combPro.html
@@ -3,7 +3,7 @@
<head>
    <meta charset="UTF-8">
    <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no"/>
    <title>组托</title>
    <title>入库</title>
    <link rel="stylesheet" href="../../static/layui/css/layui.css" media="all">
    <link rel="stylesheet" href="../../static/css/pda.css" media="all">
    <script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
@@ -50,18 +50,29 @@
            padding: 5px 20px;
            color: darkred;
        }
        /**绿色勾*/
        #node-ok {
            float: left;
            width: 15px;
            height: 15px;
            border-radius: 50%;
            margin-top: 13px;
            background-color: #2ac845;
            display: none;
        }
    </style>
</head>
<body>
<!-- 头部 -->
<header>
    <div class="layui-input-inline">
        <label class="layui-form-label">条码</label>
        <input class="layui-input" type="number" id="code" onkeyup="findCode(this)" oninput="if(value.length>8)value=value.slice(0,8)" placeholder="扫码 / 输入" autocomplete="off">
    <div style="" class="layui-input-inline">
        <label class="layui-form-label">入库货位</label>
        <input style="float: left" class="layui-input" type="text" id="node" onkeyup="findNode(this)" placeholder="扫码 / 输入" autocomplete="off">
        <span id="node-ok"></span>
    </div>
    <div class="layui-input-inline" style="margin-top: 5px">
        <label class="layui-form-label">单号</label>
        <input class="layui-input" id="billNo" onkeyup="find(this)" placeholder="扫码 / 输入" autocomplete="off" style="width: 75%; height: 40px; margin-right: 0;">
    <div style="margin: 5px 5px">
        <button id="mat-btn" type="button" class="layui-btn layui-btn-normal" onclick="getMat()"><i class="layui-icon">+</i>提取</button>
    </div>
</header>
@@ -73,20 +84,19 @@
<footer>
    <div class="layui-btn-container">
        <button type="button" id="reset-btn" class="layui-btn layui-btn-primary" onclick="reset()">重置</button>
        <button type="button" id="comb-btn" class="layui-btn layui-btn-normal " onclick="comb()" style="margin-left: 20px">组托</button>
        <button type="button" id="comb-btn" class="layui-btn layui-btn-normal " onclick="pakin()" style="margin-left: 20px">入库</button>
        <span id="tips"></span>
    </div>
</footer>
<!-- 修改数量弹窗 -->
<div id="modify" style="display: none; text-align: center;padding-top: 10px">
    <div class="form-item">
        <span>物料</span>
        <input id="matNo" type="text" disabled="disabled" style="width: 70%">
        <input id="matnr" type="text" disabled="disabled" style="width: 70%">
    </div>
    <div class="form-item">
        <span>名称</span>
        <input id="matName" type="text" disabled="disabled" style="width: 70%">
        <input id="maktx" type="text" disabled="disabled" style="width: 70%">
    </div>
    <div class="form-item" style="margin-top: 5px">
        <span style="vertical-align: middle">数量</span>
@@ -99,9 +109,7 @@
</div>
</body>
<script>
    window.onload = function(){document.getElementById("code").focus();}
    var tableIns;
    var countLayer;
    layui.use(['table','laydate', 'form'], function() {
        var table = layui.table;
        var $ = layui.jquery;
@@ -114,9 +122,9 @@
            limit: 500,
            cellMinWidth: 50,
            cols: [[
                {fixed: 'left', align: 'center', field: 'count', title: '数量', event: 'modify', style:'cursor: pointer;color: blue', width:50},
                {field: 'matNo', align: 'center', title: '物料编码'},
                {field: 'matName', align: 'center', title: '物料名称'}
                {fixed: 'left', align: 'center', field: 'count', title: '数量', event: 'modify', style:'color: blue', width:50},
                {field: 'matnr', align: 'center', title: '物料编码'},
                {field: 'maktx', align: 'center', title: '物料名称'}
            ]],
            done: function (res, curr, count) {
            }
@@ -135,8 +143,8 @@
                        area: ['80%', '200px'],
                        content: $("#modify"),
                        success: function (layero, index) {
                            $('#matNo').val(data.matNo);
                            $('#matName').val(data.matName);
                            $('#matnr').val(data.matnr);
                            $('#maktx').val(data.maktx);
                            $('#count').val(data.count);
                            maxCount = data.count;
                        }
@@ -147,51 +155,106 @@
    });
    function findCode(el) {
        if (el.value.length === 7) {
            $('#billNo').focus();
        }
    }
    // 添加表格数据
    var matData = [];
    function addTableData(data) {
        for (var i=0;i<data.length;i++) {
            var toPush = true;
            for (var j=0;j<matData.length;j++){
                if (data[i].matNo === matData[j].matNo) {
                    matData[j].count = Number(matData[j].count) + Number(data[i].count);
                    toPush  = false;
                }
            }
            if (toPush) {
                matData.push(data[i]);
            }
        }
        tableIns.reload({data: matData});
        $("#comb-btn").focus();
    }
    /**
     * 根据通知单号查询物料详情
     */
    function find(el){
    function findNode(el) {
        if (isEmpty(el.value)) {
            $('#node-ok').hide();
            return;
        }
        $.ajax({
            url: baseUrl + "/mobile/bill/query/auth",
            url: baseUrl + "/mobile/inStock/node/auth",
            headers: {'token': localStorage.getItem('token')},
            data: {
                billNo: el.value
                node: el.value
            },
            method: 'POST',
            success: function (res) {
                if (res.code === 200) {
                    if (res.data != null) {
                        addTableData(res.data);
                        $('#node-ok').show();
                    } else {
                        $('#node-ok').hide();
                    }
                } else if (res.code === 403) {
                    top.location.href = baseUrl + "/pda";
                } else {
                    tips(res.msg, true);
                }
            }
        })
    }
    var matCodeLayerIdx;
    function getMat() {
        matCodeLayerIdx = layer.open({
            type: 2,
            title: '提取商品',
            shade: [0.3,'#000'],
            area: ['90%', '80%'],
            content: 'matQuery.html',
            success: function(layero, index){
                $('.layui-layer-title').css('font-size', '16px');
            },
            end: function () {
                $('#mat-btn').focus();
            }
        });
    }
    // 添加表格数据
    var matData = [];
    function addTableData(data) {
        if (isEmpty(data.maktx)){
            tips("提取失败", true);
            return;
        }
        var toPush = true;
        for (var j=0;j<matData.length;j++){
            if (data.matnr === matData[j].matnr) {
                matData[j].count = Number(matData[j].count) + Number(data.count);
                toPush  = false;
            }
        }
        if (toPush) {
            matData.push(data);
        }
        tips("提取成功");
        tableIns.reload({data: matData});
    }
    // 重置
    function reset() {
        $('#node').val("");
        matData = [];
        tableIns.reload({data: matData});
        $('#node-ok').hide();
    }
    // 入库
    function pakin() {
        layer.confirm('当前物料开始入库?', {shadeClose: true}, function(){
            var node = $('#node').val();
            if (isEmpty(node)) {
                tips("货位为空", true);
                return;
            }
            if (matData.length === 0) {
                tips("请提取物料", true);
                return;
            }
            $.ajax({
                url: baseUrl+"/work/stock/pakin",
                headers: {'token': localStorage.getItem('token')},
                data: JSON.stringify({
                    nodeId: node,
                    mats: matData
                }),
                contentType:'application/json;charset=UTF-8',
                method: 'POST',
                async: false,
                success: function (res) {
                    if (res.code === 200) {
                        reset();
                        tips("入库成功")
                } else if (res.code === 403) {
                    top.location.href = baseUrl + "/pda";
                } else {
@@ -199,6 +262,7 @@
                }
            }
        })
        });
    }
    /*************************************  数量  ****************************************/
@@ -206,9 +270,9 @@
    var minCount = 1;
    var maxCount = 1;
    function add() {
        if (countDom.val() >= maxCount) {
            return;
        }
        // if (countDom.val() >= maxCount) {
        //     return;
        // }
        countDom.val(Number(countDom.val()) + 1);
    }
    function reduce() {
@@ -220,11 +284,12 @@
    // 修改数量
    function confirm(){
        var matNo = $('#matNo').val();
        var matnr = $('#matnr').val();
        var count = $('#count').val();
        for (var j=0;j<matData.length;j++){
            if (matNo === matData[j].matNo) {
                if (count > maxCount || count < minCount) {
            if (matnr === matData[j].matnr) {
                // if (count > maxCount || count < minCount) {
                if (count < minCount) {
                    tips("数量不能超过范围", true);
                    return;
                }
@@ -238,82 +303,15 @@
    // 移除物料
    function remove() {
        var matNo = $('#matNo').val();
        var matnr = $('#matnr').val();
        for (var j=0;j<matData.length;j++){
            if (matNo === matData[j].matNo) {
            if (matnr === matData[j].matnr) {
                matData.splice(j, 1);
            }
        }
        tableIns.reload({data: matData});
        layer.close(countLayer);
        tips("移除成功");
    }
    // 重置
    function reset() {
        $('#code').val("");
        $('#billNo').val("");
        matData = [];
        tableIns.reload({data: matData});
    }
    // 组托
    function comb() {
        var barcode = $('#code').val();
        if (isEmpty(barcode)) {
            tips("托盘条码为空", true);
            // document.getElementById("code").focus();
            return;
        }
        if (barcode.length !== 7) {
            tips("条码必须为7位", true);
            return;
        }
        if (matData.length === 0) {
            tips("请提取物料", true);
            return;
        }
        var billNo = $('#billNo').val();
        $.ajax({
            url: baseUrl+"/mobile/comb/auth",
            headers: {'token': localStorage.getItem('token')},
            data: JSON.stringify({
                barcode: barcode,
                combMats: matData,
                billNo: billNo
            }),
            contentType:'application/json;charset=UTF-8',
            method: 'POST',
            async: false,
            success: function (res) {
                if (res.code === 200) {
                    reset();
                    tips("组托成功")
                } else if (res.code === 403) {
                    top.location.href = baseUrl + "/pda";
                } else {
                    tips(res.msg, true)
                }
            }
        })
    }
    /**
@@ -333,8 +331,8 @@
            $("#comb-btn").focus();
            comb();
        } else if (key === 113) {
            $("#code").val("");
            $("#code").focus();
            $("#node").val("");
            $("#node").focus();
        }
    }
</script>
src/main/webapp/views/pda/stockIn.html
@@ -3,7 +3,7 @@
<head>
    <meta charset="UTF-8">
    <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no"/>
    <title>入库</title>
    <title>上架</title>
    <link rel="stylesheet" href="../../static/layui/css/layui.css" media="all">
    <link rel="stylesheet" href="../../static/css/pda.css" media="all">
    <script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
@@ -128,7 +128,6 @@
        document.getElementById("code").focus();
    }
    layui.use(['table','laydate', 'form'], function() {
        var table = layui.table;
        var $ = layui.jquery;
@@ -197,7 +196,6 @@
            success: function (res) {
                if (res.code === 200) {
                    if (res.data != null) {
                        // $('#pakin').focus();
                        $('#node-ok').show();
                    } else {
                        $('#node-ok').hide();
@@ -205,7 +203,7 @@
                } else if (res.code === 403) {
                    top.location.href = baseUrl + "/pda";
                } else {
                    alert(res.msg)
                    tips(res.msg, true);
                }
            }
        })
src/main/webapp/views/pda/stockInPro.html
File was deleted