自动化立体仓库 - WMS系统
zjj
2023-05-31 811e1085c075d956f4c82041ab61905fd480339d
#货物状态自选
4个文件已修改
65 ■■■■■ 已修改文件
src/main/java/com/zy/asrs/controller/OrderController.java 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/webapp/static/js/basDevp/basDevp.js 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/webapp/static/js/order/order.js 28 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/webapp/views/order/order.html 27 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/controller/OrderController.java
@@ -94,14 +94,10 @@
    @ManagerAuth(memo = "手动添加订单")
    @Transactional
    public R formAdd(@RequestBody OrderDomainParam param){
        int payment = 0;
        String prefix = "";
        DocType docType = docTypeService.selectById(param.getDocType());
        if(!Cools.isEmpty(docType)){
            prefix = docType.getPakin() == 1 ? "RK" : "CK";
        }
        if (prefix.equals("CK")){
            payment = 1;
        }
        if(Cools.isEmpty(param.getOrderNo())){
            param.setOrderNo(prefix + snowflakeIdWorker.nextId());
@@ -184,7 +180,9 @@
                orderDetl.setUpdateTime(now);
                orderDetl.setStatus(1);
                orderDetl.setQty(0.0D);
                orderDetl.setPayment(payment);
                if(orderDetl.getPayment() == null){
                    orderDetl.setPayment(0);
                }
                orderDetl.setUuid(String.valueOf(System.currentTimeMillis()));
                if (!orderDetlService.insert(orderDetl)) {
                    throw new CoolException("保存订单明细档失败");
src/main/webapp/static/js/basDevp/basDevp.js
@@ -113,6 +113,7 @@
            statusCode: 200
        },
        done: function(res, curr, count) {
            if (res.code === 403) {
                top.location.href = baseUrl+"/";
            }
@@ -120,6 +121,7 @@
            limit();
            form.on('checkbox(tableCheckbox)', function (data) {
                var _index = $(data.elem).attr('table-index')||0;
                console.log(_index);
                if(data.elem.checked){
                    res.data[_index][data.value] = 'Y';
                }else{
src/main/webapp/static/js/order/order.js
@@ -256,6 +256,7 @@
                        return false;
                    }
                    let nList = admin.util.deepClone(xxDataList);
                    console.log(nList);
                    for (let xi = 0; xi < nList.length; xi++) {
                        if (nList[xi].anfme <= 0){
                            layer.msg('明细修改数量不合法', {icon: 2});
@@ -316,13 +317,36 @@
                        {field: 'specs', title: '规格'},
                        {field: 'anfme', title: '数量(修改)', style: 'color: blue;font-weight: bold', edit: true, minWidth: 110, width: 110},
                        {field: 'owner', title: '货主编号', style: 'color: blue;font-weight: bold', edit: true, minWidth: 110, width: 110},
                        {field: 'payment', title: '货主编号', style: 'color: blue;font-weight: bold', templet: '#payment'},
                        // {field: 'payment', title: '货物状态',align: 'center', templet: '#payment'},
                        {field: 'qty', title: '作业数量',  minWidth: 100, width: 100},
                        // {field: 'unit', title: '单位', width: 80},
                        {field: 'memo', title: '备注' , edit: true},
                        {align: 'center', title: '操作', toolbar: '#formSSXMTableBar', minWidth: 80, width: 80, fixed: 'right'}
                    ]],
                    done: function (res) {
                    done: function (res, curr, count) {
                        $(layero).find('.layui-table-view').css('margin', '0');
                        var options = this;
                        // 获取当前行数据
                        table.getRowData = function(elem){
                            var index = $(elem).closest('tr').data('index');
                            return table.cache[options.id][index] || {};
                        };
                        $('.select-primary').on('change', function(){
                            var value = this.value; // 获取选中项 value
                            var data = table.getRowData(this);
                            console.log(value);
                            xxDataList.forEach(res => {
                                if (data.id === res.id){
                                    console.log(res)
                                    res.payment = value;
                                }
                            })
                        });
                    },
                    size: ''
                };
@@ -557,4 +581,6 @@
        ,type: 'datetime'
        ,range: true
    });
});
src/main/webapp/views/order/order.html
@@ -248,6 +248,33 @@
    </div>
    {{/each}}
</script>
<script type="text/html" id="payment">
    <select id="select-primary" style="width: 100%" class="layui-border select-primary" lay-ignore >
        <option value="0"
                {{# if( d.payment === 0){ }}
                selected = "selected"
                {{# } }}
        >代采</option>
        <option value="1"
                {{# if( d.payment === 1){ }}
                selected = "selected"
                {{# } }}
        >仓储</option>
    </select>
</script>
<!--<script type="text/html" id="payment">-->
<!--    {{#  var cityList = d.cityList || ["北京","上海","广州","城市-1"]; }}-->
<!--    <select name="payment" class="layui-border select-demo-primary" lay-ignore>-->
<!--        <option value="">原生 select 框</option>-->
<!--        {{#  layui.each(cityList, function(i, v){ }}-->
<!--        <option value="{{= v }}" {{= v === d.city ? 'selected' : '' }}>{{= v }}</option>-->
<!--        {{#  }); }}-->
<!--    </select>-->
<!--</script>-->
</body>
</html>