#

luxiaotao1123

2022-04-23 3c4dca5268cc4d1aed38c8b7235e4b1a163b7153

#

 src/main/java/com/zy/asrs/entity/AdjDetl.java

@@ -44,9 +44,9 @@
    private String matnr;

    /**
     * 批号
     * 序列码
     */
    @ApiModelProperty(value= "批号")
    @ApiModelProperty(value= "序列码")
    private String batch;

    /**
@@ -147,7 +147,7 @@
    //    AdjDetl adjDetl = new AdjDetl(
//            null,    // 库位号[非空]
//            null,    // 物料编号[非空]
//            null,    // 批号
//            null,    // 序列码
//            null,    // 原箱数
//            null,    // 原数量
//            null,    // 原重量

 src/main/java/com/zy/asrs/entity/LocDetl.java

@@ -43,8 +43,8 @@
    @ExcelProperty("商品名称")
    private String maktx;

    @ApiModelProperty(value= "批号")
    @ExcelProperty("批号")
    @ApiModelProperty(value= "序列码")
    @ExcelProperty("序列码")
    private String batch;

    @ApiModelProperty(value= "单据编号")

 src/main/java/com/zy/asrs/entity/OrderDetl.java

@@ -74,9 +74,9 @@
    private String maktx;

    /**
     * 批号
     * 序列码
     */
    @ApiModelProperty(value= "批号")
    @ApiModelProperty(value= "序列码")
    private String batch;

    /**

 src/main/java/com/zy/asrs/entity/Pack.java

@@ -49,9 +49,9 @@
    private String matnr;

    /**
     * 批号
     * 序列码
     */
    @ApiModelProperty(value= "批号")
    @ApiModelProperty(value= "序列码")
    private String batch;

    /**
@@ -61,7 +61,7 @@
    private Long settle;

    /**
     * 状态 1: 正常  0: 禁用  
     * 状态 1: 正常  0: 禁用
     */
    @ApiModelProperty(value= "状态 1: 正常  0: 禁用  ")
    private Integer status;
@@ -120,7 +120,7 @@
//    Pack pack = new Pack(
//            null,    // 条码[非空]
//            null,    // 商品编号
//            null,    // 批号
//            null,    // 序列码
//            null,    // 订单状态
//            null,    // 状态
//            null,    // 添加时间

 src/main/java/com/zy/asrs/entity/ViewStayTimeBean.java

@@ -44,7 +44,7 @@
    @ApiModelProperty(value= "商品名称")
    private String maktx;

    @ApiModelProperty(value= "批号")
    @ApiModelProperty(value= "序列码")
    private String batch;

    @ApiModelProperty(value= "单据编号")

 src/main/java/com/zy/asrs/entity/ViewWorkInBean.java

@@ -55,7 +55,7 @@
    @ApiModelProperty(value= "商品名称")
    private String maktx;

    @ApiModelProperty(value= "批号")
    @ApiModelProperty(value= "序列码")
    private String batch;

    @ApiModelProperty(value= "单据编号")

 src/main/java/com/zy/asrs/entity/WaitPakin.java

@@ -33,7 +33,7 @@
    @ApiModelProperty(value= "商品名称")
    private String maktx;

    @ApiModelProperty(value= "批号")
    @ApiModelProperty(value= "序列码")
    private String batch;

    @ApiModelProperty(value= "单据编号")

 src/main/java/com/zy/asrs/entity/WaitPakinLog.java

@@ -32,7 +32,7 @@
    @ApiModelProperty(value= "商品名称")
    private String maktx;

    @ApiModelProperty(value= "批号")
    @ApiModelProperty(value= "序列码")
    private String batch;

    @ApiModelProperty(value= "单据编号")

 src/main/java/com/zy/asrs/entity/WrkDetl.java

@@ -59,9 +59,9 @@
    private String maktx;

    /**
     * 批号
     * 序列码
     */
    @ApiModelProperty(value= "批号")
    @ApiModelProperty(value= "序列码")
    private String batch;

    /**

 src/main/java/com/zy/asrs/entity/WrkDetlLog.java

@@ -58,9 +58,9 @@
    private String maktx;

    /**
     * 批号
     * 序列码
     */
    @ApiModelProperty(value= "批号")
    @ApiModelProperty(value= "序列码")
    private String batch;

    /**

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

@@ -24,7 +24,7 @@
        // 物料编号
        private String matnr;

        // 批号
        // 序列码
        private String batch;

        // 物料数量

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

@@ -25,7 +25,7 @@
        // 物料编号
        private String matnr;

        // 批号
        // 序列码
        private String batch;

        // 物料数量

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

@@ -24,7 +24,7 @@
        // 商品编号
        private String matnr;

        // 批号
        // 序列码
        private String batch;

        // 变更数量

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

@@ -25,7 +25,7 @@
        // 商品编号
        private String matnr;

        // 批号
        // 序列码
        private String batch;

        // 数量

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

@@ -147,7 +147,7 @@
                WaitPakin waitPakin = new WaitPakin();
                waitPakin.sync(mat);
                waitPakin.setOrderNo(order.getOrderNo());   // 单据编号
                waitPakin.setBatch(detlDto.getBatch());     // 批号
                waitPakin.setBatch(detlDto.getBatch());     // 序列码
                waitPakin.setZpallet(param.getBarcode());   // 托盘码
                waitPakin.setIoStatus("N");     // 入出状态
                waitPakin.setAnfme(detlDto.getAnfme());  // 数量
@@ -199,7 +199,7 @@
                        // todo 盘点记录、保存调整记录
                        // 修改明细
                        if (!wrkDetlService.updateAnfme(wrkDetl1.getAnfme(), wrkMast.getWrkNo(), wrkDetl.getMatnr(), wrkDetl.getBatch())) {
                            throw new CoolException(wrkMast.getWrkNo() + "盘点任务，" + wrkDetl.getMatnr() + "商品，" + wrkDetl.getBatch() + "批号修改数量失败");
                            throw new CoolException(wrkMast.getWrkNo() + "盘点任务，" + wrkDetl.getMatnr() + "商品，" + wrkDetl.getBatch() + "序列码修改数量失败");
                        }
                    }
                    iterator.remove();
@@ -212,7 +212,7 @@
        for (WrkDetl wrkDetl : wrkDetls) {
            // todo 盘点记录、保存调整记录
            if (!wrkDetlService.updateAnfme(-1.0D, wrkMast.getWrkNo(), wrkDetl.getMatnr(), wrkDetl.getBatch())) {
                throw new CoolException("删除" + wrkMast.getWrkNo() + "盘点任务，" + wrkDetl.getMatnr() + "商品，" + wrkDetl.getBatch() + "批号任务明细失败");
                throw new CoolException("删除" + wrkMast.getWrkNo() + "盘点任务，" + wrkDetl.getMatnr() + "商品，" + wrkDetl.getBatch() + "序列码任务明细失败");
            }
        }

@@ -229,7 +229,7 @@
            wrkDetl.setAppeTime(now);
            wrkDetl.setAppeUser(userId);
            if (!wrkDetlService.insert(wrkDetl)) {
                throw new CoolException("添加" + wrkMast.getWrkNo() + "盘点任务，" + wrkDetl.getMatnr() + "商品，" + wrkDetl.getBatch() + "批号任务明细失败");
                throw new CoolException("添加" + wrkMast.getWrkNo() + "盘点任务，" + wrkDetl.getMatnr() + "商品，" + wrkDetl.getBatch() + "序列码任务明细失败");
            }
        }


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

@@ -338,7 +338,7 @@
        pack = new Pack(
                param.getBarcode(),    // 条码[非空]
                analyse.getMatnr(),    // 商品编号
                analyse.getBarcode(),    // 批号
                analyse.getBarcode(),    // 序列码
                1L,    // 订单状态
                1,    // 状态
                now,    // 添加时间

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

@@ -612,7 +612,7 @@
                        // todo 盘点记录
                        // 修改库存
                        if (!locDetlService.updateAnfme(adjust.getCount(), locDetl.getLocNo(), locDetl.getMatnr(), locDetl.getBatch())) {
                            throw new CoolException(locDetl.getLocNo() + "库位，" + locDetl.getMatnr() + "商品，" + locDetl.getBatch() + "批号修改数量失败");
                            throw new CoolException(locDetl.getLocNo() + "库位，" + locDetl.getMatnr() + "商品，" + locDetl.getBatch() + "序列码修改数量失败");
                        }
                        // 保存调整记录
                        AdjDetl adjDetl = new AdjDetl();
@@ -637,7 +637,7 @@
        for (LocDetl locDetl : locDetls) {
            // todo 盘点记录
            if (!locDetlService.updateAnfme(-1.0D, locDetl.getLocNo(), locDetl.getMatnr(), locDetl.getBatch())) {
                throw new CoolException("删除" + locDetl.getLocNo() + "库位，" + locDetl.getMatnr() + "商品，" + locDetl.getBatch() + "批号库存明细失败");
                throw new CoolException("删除" + locDetl.getLocNo() + "库位，" + locDetl.getMatnr() + "商品，" + locDetl.getBatch() + "序列码库存明细失败");
            }
            // 保存调整记录
            AdjDetl adjDetl = new AdjDetl();
@@ -667,7 +667,7 @@
            locDetl.setAppeUser(userId);
            locDetl.setAppeTime(now);
            if (!locDetlService.insert(locDetl)) {
                throw new CoolException("添加" + locDetl.getLocNo() + "库位，" + locDetl.getMatnr() + "商品，" + locDetl.getBatch() + "批号库存明细失败");
                throw new CoolException("添加" + locDetl.getLocNo() + "库位，" + locDetl.getMatnr() + "商品，" + locDetl.getBatch() + "序列码库存明细失败");
            }
            // 保存调整记录
            AdjDetl adjDetl = new AdjDetl();

 src/main/java/com/zy/asrs/utils/VersionUtils.java

@@ -17,7 +17,7 @@
//        wrkDetl.setLgnum(matCode.getStr2()); // 规格
//        wrkDetl.setType(matCode.getStr5()); // 型号
//        wrkDetl.setColor(matCode.getBarcode()); // 条码
//        wrkDetl.setSupplier(matCode.getStr6()); // 批号
//        wrkDetl.setSupplier(matCode.getStr6()); // 序列码
//        wrkDetl.setWarehouse(matCode.getStr7()); // 单据编号
//        wrkDetl.setBrand(matCode.getStr3()); // 品项数
//        wrkDetl.setAltme(matCode.getStr1()); // 单位
@@ -32,7 +32,7 @@
//        wrkDetl.setLgnum(locDetl.getLgnum()); // 规格
//        wrkDetl.setType(locDetl.getType()); // 型号
//        wrkDetl.setColor(locDetl.getColor()); // 条码
//        wrkDetl.setSupplier(locDetl.getSupplier()); // 批号
//        wrkDetl.setSupplier(locDetl.getSupplier()); // 序列码
//        wrkDetl.setWarehouse(locDetl.getWarehouse()); // 单据编号
//        wrkDetl.setBrand(locDetl.getBrand()); // 品项数
//        wrkDetl.setAltme(locDetl.getAltme()); // 单位
@@ -46,7 +46,7 @@
//        locDetl.setLgnum(matCode.getStr2()); // 规格
//        locDetl.setType(matCode.getStr5()); // 型号
//        locDetl.setColor(matCode.getBarcode()); // 条码
//        locDetl.setSupplier(matCode.getStr6()); // 批号
//        locDetl.setSupplier(matCode.getStr6()); // 序列码
//        locDetl.setWarehouse(matCode.getStr7()); // 单据编号
//        locDetl.setBrand(matCode.getStr3()); // 品项数
//        locDetl.setAltme(matCode.getStr1()); // 单位
@@ -61,7 +61,7 @@
//        locDetl.setLgnum(wrkDetl.getLgnum()); // 规格
//        locDetl.setType(wrkDetl.getType()); // 型号
//        locDetl.setColor(wrkDetl.getColor()); // 条码
//        locDetl.setSupplier(wrkDetl.getSupplier()); // 批号
//        locDetl.setSupplier(wrkDetl.getSupplier()); // 序列码
//        locDetl.setWarehouse(wrkDetl.getWarehouse()); // 单据编号
//        locDetl.setBrand(wrkDetl.getBrand()); // 品项数
//        locDetl.setAltme(wrkDetl.getAltme()); // 单位
@@ -75,7 +75,7 @@
//        waitPakIn.setLgnum(matCode.getStr2()); // 规格
//        waitPakIn.setType(matCode.getStr5()); // 型号
//        waitPakIn.setColor(matCode.getBarcode()); // 条码
//        waitPakIn.setSupplier(matCode.getStr6()); // 批号
//        waitPakIn.setSupplier(matCode.getStr6()); // 序列码
//        waitPakIn.setWarehouse(matCode.getStr7()); // 单据编号
//        waitPakIn.setBrand(matCode.getStr3()); // 品项数
//        waitPakIn.setAltme(matCode.getStr1()); // 单位
@@ -86,7 +86,7 @@
//        orderDetl.setMatnr(matCode.getMatNo()); // 物料编号
//        orderDetl.setMaktx(matCode.getMatName()); // 物料描述
//        orderDetl.setSpecs(matCode.getStr2()); // 规格
//        orderDetl.setSupplier(matCode.getStr6()); // 批号
//        orderDetl.setSupplier(matCode.getStr6()); // 序列码
//    }
//
//    public static void setWaitPakIn(WaitPakin waitPakIn, OrderDetl orderDetl) {
@@ -96,7 +96,7 @@
//        waitPakIn.setOrderNo(orderDetl.getOrderNo());
//        waitPakIn.setLgnum(orderDetl.getSpecs()); // 规格
//        waitPakIn.setType(orderDetl.getModel()); // 型号
//        waitPakIn.setSupplier(orderDetl.getSupplier()); // 批号
//        waitPakIn.setSupplier(orderDetl.getSupplier()); // 序列码
//        waitPakIn.setAltme(orderDetl.getUnit()); // 单位
//    }
//
@@ -107,7 +107,7 @@
//        wrkDetl.setOrderNo(orderDetl.getOrderNo());
//        wrkDetl.setLgnum(orderDetl.getSpecs()); // 规格
//        wrkDetl.setType(orderDetl.getModel()); // 型号
//        wrkDetl.setSupplier(orderDetl.getSupplier()); // 批号
//        wrkDetl.setSupplier(orderDetl.getSupplier()); // 序列码
//        wrkDetl.setAltme(orderDetl.getUnit()); // 单位
//    }


 src/main/java/com/zy/common/model/TaskDto.java

@@ -68,7 +68,7 @@
    }

    public boolean isAll(){
        // 汇总不考虑批号
        // 汇总不考虑序列码
        List<DetlDto> detlDtos = new ArrayList<>();
        for (LocDto locDto : this.getLocDtos()) {
            DetlDto dto = new DetlDto(locDto.getMatnr(), locDto.getBatch(), locDto.getAnfme());

 src/main/webapp/static/js/adjDetl/adjDetl.js

@@ -23,7 +23,7 @@
//             {field: 'adjId', align: 'center',title: '序号'}
            {field: 'locNo', align: 'center',title: '库位号'}
            ,{field: 'matnr', align: 'center',title: '商品编号'}
            ,{field: 'batch', align: 'center',title: '批号'}
            ,{field: 'batch', align: 'center',title: '序列码'}
            // ,{field: 'oriCtns', align: 'center',title: '原箱数'}
            ,{field: 'oriQty', align: 'center',title: '原数量'}
            // ,{field: 'oriWt', align: 'center',title: '原重量'}

 src/main/webapp/static/js/common.js

@@ -214,7 +214,7 @@
    {field: 'matnr', align: 'center',title: '商品编号'}
    ,{field: 'maktx', align: 'center',title: '商品名称'}
    ,{field: 'orderNo', align: 'center',title: '单据编号', hide: false}
    ,{field: 'batch', align: 'center',title: '批号'}
    ,{field: 'batch', align: 'center',title: '序列码'}
    ,{field: 'anfme', align: 'center',title: '数量'}
    ,{field: 'zpallet', align: 'center',title: '托盘条码'}


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

@@ -100,7 +100,7 @@
                            {type: 'numbers'},
                            {field: 'matnr', title: '商品编码'},
                            {field: 'maktx', title: '商品名称', width: 160},
                            {field: 'batch', title: '批号'},
                            {field: 'batch', title: '序列码'},
                            {field: 'anfme', title: '数量'},
                            {field: 'qty', title: '作业数量', style: 'font-weight: bold'},
                            {field: 'unit', title: '单位'},
@@ -207,7 +207,7 @@
                        {type: 'numbers', title: '#'},
                        {field: 'matnr', title: '商品编码', width: 160},
                        {field: 'maktx', title: '商品名称', width: 200},
                        {field: 'batch', title: '批号', edit: true},
                        {field: 'batch', title: '序列码', edit: true},
                        {field: 'specs', title: '规格'},
                        {field: 'anfme', title: '数量(修改)', style: 'color: blue;font-weight: bold', edit: true, minWidth: 110, width: 110},
                        // {field: 'inQty', title: '已入库量',  minWidth: 100, width: 100},

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

@@ -32,7 +32,7 @@
            ,{field: 'orderNo', align: 'center',title: '单据编号', templet: '#orderNoTpl', width: 160}
            ,{field: 'matnr', align: 'center',title: '商品编码', width: 160}
            ,{field: 'maktx', align: 'center',title: '商品名称', width: 200}
            ,{field: 'batch', align: 'center',title: '批号'}
            ,{field: 'batch', align: 'center',title: '序列码'}
            ,{field: 'specs', align: 'center',title: '规格'}
            // ,{field: 'anfme', align: 'center',title: '数量'}
            // ,{field: 'qty', align: 'center',title: '作业数量', style: 'font-weight: bold'}
@@ -154,7 +154,7 @@
                                    // {type: 'checkbox', merge: ['orderNo']},
                                    {field: 'orderNo', title: '单据编号', merge: true, align: 'center'},
                                    {field: 'title', title: '商品', merge: true, align: 'center', width: 350},
                                    {field: 'batch', title: '批号', align: 'center'},
                                    {field: 'batch', title: '序列码', align: 'center'},
                                    {field: 'anfme', title: '数量', align: 'center', width: 90, style: 'font-weight: bold'},
                                    {field: 'locNo', title: '货位', align: 'center', width: 100, templet: '#locNoTpl'},
                                    {field: 'staNos', align: 'center', title: '出库站', merge: ['locNo'], templet: '#tbBasicTbStaNos'},

 src/main/webapp/static/js/orderDetl/orderDetl.js

@@ -30,7 +30,7 @@
            ,{field: 'name', align: 'center',title: '名称'}
            ,{field: 'specs', align: 'center',title: '规格'}
            ,{field: 'model', align: 'center',title: '型号'}
            ,{field: 'batch', align: 'center',title: '批号'}
            ,{field: 'batch', align: 'center',title: '序列码'}
            ,{field: 'unit', align: 'center',title: '单位'}
            ,{field: 'barcode', align: 'center',title: '商品条码'}
            ,{field: 'supplier', align: 'center',title: '供应商'}

 src/main/webapp/static/js/pack/pack.js

@@ -25,7 +25,7 @@
            // ,{field: 'id', align: 'center',title: 'ID'}
            ,{field: 'barcode',title: '条码'}
            ,{field: 'matnr', align: 'center',title: '商品编号', minWidth: 250, width: 250}
            ,{field: 'batch', align: 'center',title: '批号', hide: true}
            ,{field: 'batch', align: 'center',title: '序列码', hide: true}
            ,{field: 'settle$', align: 'center',title: '状态', templet: '#settleTpl',  minWidth: 160, width: 160}
            // ,{field: 'status$', align: 'center',title: '状态'}
            // ,{field: 'createTime$', align: 'center',title: '添加时间'}

 src/main/webapp/static/js/pakStore/pakStore.js

@@ -4,7 +4,7 @@
function getCol() {
    var cols = [
        {fixed: 'left', field: 'anfme', title: '数量（必填）', align: 'center', edit:'text', width: 120,  style:'color: blue;font-weight: bold'},
        {field: 'batch', title: '批号（选填）', align: 'center', edit:'text', width: 200,  style:'color: block;font-weight: bold'}
        {field: 'batch', title: '序列码（选填）', align: 'center', edit:'text', width: 200,  style:'color: block;font-weight: bold'}
    ];
    cols.push.apply(cols, matCols);
    cols.push({fixed: 'right', title:'操作', align: 'center', toolbar: '#operate', width: 80})

 src/main/webapp/static/js/pakStore/stockAdjust.js

@@ -7,7 +7,7 @@
    var cols = [
        {fixed: 'left', field: 'count', title: '实际数量', align: 'center', edit:'text', width: 120,  style:'color: blue;font-weight: bold'}
        ,{field: 'anfme', align: 'center',title: '数量'}
        ,{field: 'batch', align: 'center',title: '批号（编辑）', edit: true, style: 'font-weight:bold'}
        ,{field: 'batch', align: 'center',title: '序列码（编辑）', edit: true, style: 'font-weight:bold'}
    ];
    arrRemove(detlCols, "field", "anfme");
    arrRemove(detlCols, "field", "batch");

 src/main/webapp/views/order/out.html

@@ -107,9 +107,9 @@
                                </div>
                            </div>
                            <div class="layui-inline">
                                <label class="layui-form-label">批号:</label>
                                <label class="layui-form-label">序列码:</label>
                                <div class="layui-input-inline">
                                    <input name="batch" class="layui-input" placeholder="批号"/>
                                    <input name="batch" class="layui-input" placeholder="序列码"/>
                                </div>
                            </div>
<!--                            <div class="layui-inline">-->

 src/main/webapp/views/orderDetl/orderDetl.html

@@ -112,9 +112,9 @@
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label">批号: </label>
                    <label class="layui-form-label">序列码: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="batch" placeholder="请输入批号">
                        <input class="layui-input" name="batch" placeholder="请输入序列码">
                    </div>
                </div>
                <div class="layui-form-item">

 src/main/webapp/views/pack/pack.html

@@ -93,9 +93,9 @@
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label">批号: </label>
                    <label class="layui-form-label">序列码: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="batch" placeholder="请输入批号">
                        <input class="layui-input" name="batch" placeholder="请输入序列码">
                    </div>
                </div>
                <div class="layui-form-item">