#

zjj

2023-08-31 14aa8a9a4369fe0dc23ea8abfaab10caea78c9e7

#

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

@@ -169,14 +169,7 @@
        }
        List<DetlDto> list = new ArrayList<>();
        for (OrderDetl orderDetl : param.getOrderDetlList()) {
            if (Cools.isEmpty(orderDetl.getOwner())){
                throw new CoolException("保存订单明细档失败,请输入货主编号");
            }else {
                LocOwner locOwner = locOwnerService.selectById(orderDetl.getOwner());
                if (Cools.isEmpty(locOwner)){
                    throw new CoolException("保存订单明细档失败,请输入存在的货主编号（整数）");
                }
            }

            if (orderDetl.getBatch() == null) {
                orderDetl.setBatch("");
            }
@@ -197,9 +190,6 @@
                orderDetl.setUpdateTime(now);
                orderDetl.setStatus(1);
                orderDetl.setQty(0.0D);
                if(orderDetl.getPayment() == null){
                    orderDetl.setPayment(1);
                }
                orderDetl.setUuid(String.valueOf(System.currentTimeMillis()));
                if (!orderDetlService.insert(orderDetl)) {
                    throw new CoolException("保存订单明细档失败");

 src/main/webapp/static/js/order/order.js

@@ -192,8 +192,7 @@
                            {type: 'numbers'},
                            {field: 'matnr', title: '商品编码', width: 160},
                            {field: 'maktx', title: '商品名称', width: 160},
                            {field: 'owner$', title: '货主', width: 160},
                            {field: 'payment$', title: '货物特征', width: 160},

                            // {field: 'batch', title: '批号'},
                            {field: 'anfme', title: '数量'},
                            {field: 'workQty', title: '作业数量'},
@@ -271,12 +270,7 @@
                            return false;
                        }
                    }
                    for (let xi = 0; xi < nList.length; xi++) {
                        if (nList[xi].owner <= 0){
                            layer.msg('货主编号请查看货主档案', {icon: 2});
                            return false;
                        }
                    }

                    layer.load(2);
                    $.ajax({
                        url: baseUrl+"/order/form/" + (isExpAdd?"add":"modify") + "/auth",

 src/main/webapp/views/mat/mat.html

@@ -193,9 +193,16 @@
                </div>

                <div class="layui-form-item">
                    <label class="layui-form-label">配置</label>
                    <label class="layui-form-label">库龄上限</label>
                    <div class="layui-input-block">
                        <input name="specs" placeholder="请输入配置" class="layui-input">
                        <input name="inventoryAgeMax" placeholder="请输入库龄上限" class="layui-input">
                    </div>
                </div>

                <div class="layui-form-item">
                    <label class="layui-form-label">库存上限</label>
                    <div class="layui-input-block">
                        <input name="inventoryMax" placeholder="请输入库存上限" class="layui-input">
                    </div>
                </div>

@@ -226,7 +233,7 @@
                <div class="layui-form-item">
                    <label class="layui-form-label">规格</label>
                    <div class="layui-input-block">
                        <input name="specs" placeholder="请输入代码" class="layui-input">
                        <input name="specs" placeholder="请输入规格" class="layui-input">
                    </div>
                </div>

@@ -237,6 +244,13 @@
                    </div>
                </div>

                <div class="layui-form-item">
                    <label class="layui-form-label">库存下限</label>
                    <div class="layui-input-block">
                        <input name="inventoryMin" placeholder="请输入库存下限" class="layui-input">
                    </div>
                </div>

<!--                <div class="layui-form-item">-->
<!--                    <label class="layui-form-label">单箱毛重</label>-->
<!--                    <div class="layui-input-block">-->