1.所有序列码修改成批号

zwl

2025-10-17 eea9c3e06de7b3559c6e1558ea276fd5e8646eb9

1.所有序列码修改成批号

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

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

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

@@ -120,7 +120,7 @@
//    Pack pack = new Pack(
//            null,    // 条码[非空]
//            null,    // 商品编号
//            null,    // 序列码
//            null,    // 批号
//            null,    // 订单状态
//            null,    // 状态
//            null,    // 添加时间

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

@@ -48,7 +48,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

@@ -238,7 +238,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());  // 数量

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

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

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

@@ -19,7 +19,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()); // 单位
@@ -34,7 +34,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()); // 单位
@@ -48,7 +48,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()); // 单位
@@ -63,7 +63,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()); // 单位
@@ -77,7 +77,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()); // 单位
@@ -88,7 +88,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) {
@@ -98,7 +98,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()); // 单位
//    }
//
@@ -109,7 +109,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()); // 单位
//    }
    public static void setPakin(Pakin pakin, Mat mat) {

 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/order/out.js

@@ -34,7 +34,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'}
@@ -160,7 +160,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/order/outAll.js

@@ -34,7 +34,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'}
@@ -160,7 +160,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/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/order/outAll.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">-->