#

luxiaotao1123

2022-12-07 5cf5e532ffe25e098e9bbcc345b27427e85fc8ae

#

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

@@ -441,9 +441,9 @@
            Row row = sheet.getRow(i);
            // 订单编号
            String uuid = dataFormatter.formatCellValue(row.getCell(0));
            // 商品名称
            // 物料号
            String maktx = dataFormatter.formatCellValue(row.getCell(1));
            // 商品编码
            // 单据号
            String matnr = dataFormatter.formatCellValue(row.getCell(2));
            // 数量
            Double anfme = Double.parseDouble(dataFormatter.formatCellValue(row.getCell(3)));

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

@@ -38,9 +38,9 @@
    private String locNo;

    /**
     * 商品编号
     * 单据号
     */
    @ApiModelProperty(value= "商品编号")
    @ApiModelProperty(value= "单据号")
    private String matnr;

    /**

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

@@ -46,9 +46,9 @@
    private String docName;

    /**
     * 商品编号
     * 单据号
     */
    @ApiModelProperty(value= "商品编号")
    @ApiModelProperty(value= "单据号")
    private String matnr;

    /**
@@ -58,7 +58,7 @@
    private Double qua;

    /**
     * 结果 1: 成功  0: 失败  
     * 结果 1: 成功  0: 失败
     */
    @ApiModelProperty(value= "结果 1: 成功  0: 失败  ")
    private Integer success;
@@ -94,7 +94,7 @@
//            null,    // 单据编号
//            null,    // 单据类型
//            null,    // 单据名称
//            null,    // 商品编号
//            null,    // 单据号
//            null,    // 上报数量
//            null,    // 结果
//            null,    // 上报时间

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

@@ -35,12 +35,12 @@
    @ExcelProperty("数量")
    private Double anfme;

    @ApiModelProperty(value= "商品编号")
    @ExcelProperty("商品编号")
    @ApiModelProperty(value= "单据号")
    @ExcelProperty("单据号")
    private String matnr;

    @ApiModelProperty(value= "商品名称")
    @ExcelProperty("商品名称")
    @ApiModelProperty(value= "物料号")
    @ExcelProperty("物料号")
    private String maktx;

    @ApiModelProperty(value= "序列码")
@@ -55,7 +55,7 @@
    @ApiModelProperty(value= "规格")
    private String specs;

    @ApiModelProperty(value= "型号")
    @ApiModelProperty(value= "批次")
    private String model;

    @ApiModelProperty(value= "颜色")
@@ -73,19 +73,19 @@
    @ApiModelProperty(value= "sku")
    private String sku;

    @ApiModelProperty(value= "单位量")
    @ApiModelProperty(value= "包数")
    private Double units;

    @ApiModelProperty(value= "条码")
    private String barcode;

    @ApiModelProperty(value= "产地")
    @ApiModelProperty(value= "物料状态")
    private String origin;

    @ApiModelProperty(value= "厂家")
    private String manu;

    @ApiModelProperty(value= "生产日期")
    @ApiModelProperty(value= "单据时间")
    @TableField("manu_date")
    private String manuDate;


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

@@ -56,25 +56,25 @@
    private Long tagId;

    /**
     * 商品编号
     * 单据号
     */
    @ApiModelProperty(value= "商品编号")
    @ExcelProperty(value = "商品编码")
    @ApiModelProperty(value= "单据号")
    @ExcelProperty(value = "单据号")
    private String matnr;


    /**
     * 商品名称
     * 物料号
     */
    @ApiModelProperty(value= "商品名称")
    @ExcelProperty(value = "商品名称")
    @ApiModelProperty(value= "物料号")
    @ExcelProperty(value = "物料号")
    private String maktx;

    /**
     * 别名
     * 移动类型
     */
    @ApiModelProperty(value= "别名")
    @ExcelProperty(value = "别名")
    @ApiModelProperty(value= "移动类型")
    @ExcelProperty(value = "移动类型")
    private String name;

    /**
@@ -85,10 +85,10 @@
    private String specs;

    /**
     * 型号
     * 批次
     */
    @ApiModelProperty(value= "型号")
    @ExcelProperty(value = "型号")
    @ApiModelProperty(value= "批次")
    @ExcelProperty(value = "批次")
    private String model;

    /**
@@ -127,10 +127,10 @@
    private String sku;

    /**
     * 单位量
     * 包数
     */
    @ApiModelProperty(value= "单位量")
    @ExcelProperty(value = "单位量")
    @ApiModelProperty(value= "包数")
    @ExcelProperty(value = "包数")
    private Double units;

    /**
@@ -141,10 +141,10 @@
    private String barcode;

    /**
     * 产地
     * 物料状态
     */
    @ApiModelProperty(value= "产地")
    @ExcelProperty(value = "产地")
    @ApiModelProperty(value= "物料状态")
    @ExcelProperty(value = "物料状态")
    private String origin;

    /**
@@ -155,10 +155,10 @@
    private String manu;

    /**
     * 生产日期
     * 单据时间
     */
    @ApiModelProperty(value= "生产日期")
    @ExcelProperty(value = "生产日期")
    @ApiModelProperty(value= "单据时间")
    @ExcelProperty(value = "单据时间")
    @TableField("manu_date")
    private String manuDate;

@@ -351,21 +351,21 @@
//    Mat mat = new Mat(
//            null,    // 编号
//            null,    // 所属归类
//            null,    // 商品编号
//            null,    // 商品名称
//            null,    // 别名
//            null,    // 单据号
//            null,    // 物料号
//            null,    // 移动类型
//            null,    // 规格
//            null,    // 型号
//            null,    // 批次
//            null,    // 颜色
//            null,    // 品牌
//            null,    // 单位
//            null,    // 单价
//            null,    // sku
//            null,    // 单位量
//            null,    // 包数
//            null,    // 条码
//            null,    // 产地
//            null,    // 物料状态
//            null,    // 厂家
//            null,    // 生产日期
//            null,    // 单据时间
//            null,    // 品项数
//            null,    // 安全库存量
//            null,    // 重量

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

@@ -6,7 +6,7 @@
public class MatCodePrint {

    /**
     * 商品编号
     * 单据号
     */
    private String matNo;

@@ -16,7 +16,7 @@
    private String barcode;

    /**
     * 商品名称
     * 物料号
     */
    private String matName;


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

@@ -62,15 +62,15 @@
    private Double qty;

    /**
     * 商品编码
     * 单据号
     */
    @ApiModelProperty(value= "商品编码")
    @ApiModelProperty(value= "单据号")
    private String matnr;

    /**
     * 商品名称
     * 物料号
     */
    @ApiModelProperty(value= "商品名称")
    @ApiModelProperty(value= "物料号")
    private String maktx;

    /**
@@ -86,9 +86,9 @@
    private String specs;

    /**
     * 型号
     * 批次
     */
    @ApiModelProperty(value= "型号")
    @ApiModelProperty(value= "批次")
    private String model;

    /**
@@ -122,9 +122,9 @@
    private String sku;

    /**
     * 单位量
     * 包数
     */
    @ApiModelProperty(value= "单位量")
    @ApiModelProperty(value= "包数")
    private Double units;

    /**
@@ -134,9 +134,9 @@
    private String barcode;

    /**
     * 产地
     * 物料状态
     */
    @ApiModelProperty(value= "产地")
    @ApiModelProperty(value= "物料状态")
    private String origin;

    /**
@@ -146,9 +146,9 @@
    private String manu;

    /**
     * 生产日期
     * 单据时间
     */
    @ApiModelProperty(value= "生产日期")
    @ApiModelProperty(value= "单据时间")
    @TableField("manu_date")
    private String manuDate;


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

@@ -43,9 +43,9 @@
    private String barcode;

    /**
     * 商品编号
     * 单据号
     */
    @ApiModelProperty(value= "商品编号")
    @ApiModelProperty(value= "单据号")
    private String matnr;

    /**
@@ -119,7 +119,7 @@

//    Pack pack = new Pack(
//            null,    // 条码[非空]
//            null,    // 商品编号
//            null,    // 单据号
//            null,    // 序列码
//            null,    // 订单状态
//            null,    // 状态

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

@@ -38,10 +38,10 @@
    @ApiModelProperty(value= "数量")
    private Double anfme;

    @ApiModelProperty(value= "商品编号")
    @ApiModelProperty(value= "单据号")
    private String matnr;

    @ApiModelProperty(value= "商品名称")
    @ApiModelProperty(value= "物料号")
    private String maktx;

    @ApiModelProperty(value= "序列码")
@@ -54,7 +54,7 @@
    @ApiModelProperty(value= "规格")
    private String specs;

    @ApiModelProperty(value= "型号")
    @ApiModelProperty(value= "批次")
    private String model;

    @ApiModelProperty(value= "颜色")
@@ -72,19 +72,19 @@
    @ApiModelProperty(value= "sku")
    private String sku;

    @ApiModelProperty(value= "单位量")
    @ApiModelProperty(value= "包数")
    private Double units;

    @ApiModelProperty(value= "条码")
    private String barcode;

    @ApiModelProperty(value= "产地")
    @ApiModelProperty(value= "物料状态")
    private String origin;

    @ApiModelProperty(value= "厂家")
    private String manu;

    @ApiModelProperty(value= "生产日期")
    @ApiModelProperty(value= "单据时间")
    private String manu_date;

    @ApiModelProperty(value= "品项数")

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

@@ -48,10 +48,10 @@
    @ApiModelProperty(value= "数量")
    private Double anfme;

    @ApiModelProperty(value= "商品编号")
    @ApiModelProperty(value= "单据号")
    private String matnr;

    @ApiModelProperty(value= "商品名称")
    @ApiModelProperty(value= "物料号")
    private String maktx;

    @ApiModelProperty(value= "序列码")
@@ -63,7 +63,7 @@
    @ApiModelProperty(value= "规格")
    private String specs;

    @ApiModelProperty(value= "型号")
    @ApiModelProperty(value= "批次")
    private String model;

    @ApiModelProperty(value= "颜色")
@@ -81,19 +81,19 @@
    @ApiModelProperty(value= "sku")
    private String sku;

    @ApiModelProperty(value= "单位量")
    @ApiModelProperty(value= "包数")
    private Double units;

    @ApiModelProperty(value= "条码")
    private String barcode;

    @ApiModelProperty(value= "产地")
    @ApiModelProperty(value= "物料状态")
    private String origin;

    @ApiModelProperty(value= "厂家")
    private String manu;

    @ApiModelProperty(value= "生产日期")
    @ApiModelProperty(value= "单据时间")
    private String manu_date;

    @ApiModelProperty(value= "品项数")

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

@@ -27,10 +27,10 @@
    @TableField("loc_no")
    private String locNo;

    @ApiModelProperty(value= "商品编号")
    @ApiModelProperty(value= "单据号")
    private String matnr;

    @ApiModelProperty(value= "商品名称")
    @ApiModelProperty(value= "物料号")
    private String maktx;

    @ApiModelProperty(value= "序列码")
@@ -43,7 +43,7 @@
    @ApiModelProperty(value= "规格")
    private String specs;

    @ApiModelProperty(value= "型号")
    @ApiModelProperty(value= "批次")
    private String model;

    @ApiModelProperty(value= "颜色")
@@ -61,19 +61,19 @@
    @ApiModelProperty(value= "sku")
    private String sku;

    @ApiModelProperty(value= "单位量")
    @ApiModelProperty(value= "包数")
    private Double units;

    @ApiModelProperty(value= "条码")
    private String barcode;

    @ApiModelProperty(value= "产地")
    @ApiModelProperty(value= "物料状态")
    private String origin;

    @ApiModelProperty(value= "厂家")
    private String manu;

    @ApiModelProperty(value= "生产日期")
    @ApiModelProperty(value= "单据时间")
    @TableField("manu_date")
    private String manuDate;


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

@@ -26,10 +26,10 @@
    @TableField("loc_no")
    private String locNo;

    @ApiModelProperty(value= "商品编号")
    @ApiModelProperty(value= "单据号")
    private String matnr;

    @ApiModelProperty(value= "商品名称")
    @ApiModelProperty(value= "物料号")
    private String maktx;

    @ApiModelProperty(value= "序列码")
@@ -42,7 +42,7 @@
    @ApiModelProperty(value= "规格")
    private String specs;

    @ApiModelProperty(value= "型号")
    @ApiModelProperty(value= "批次")
    private String model;

    @ApiModelProperty(value= "颜色")
@@ -60,19 +60,19 @@
    @ApiModelProperty(value= "sku")
    private String sku;

    @ApiModelProperty(value= "单位量")
    @ApiModelProperty(value= "包数")
    private Double units;

    @ApiModelProperty(value= "条码")
    private String barcode;

    @ApiModelProperty(value= "产地")
    @ApiModelProperty(value= "物料状态")
    private String origin;

    @ApiModelProperty(value= "厂家")
    private String manu;

    @ApiModelProperty(value= "生产日期")
    @ApiModelProperty(value= "单据时间")
    @TableField("manu_date")
    private String manuDate;


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

@@ -49,13 +49,13 @@
    /**
     * 物料
     */
    @ApiModelProperty(value= "商品编号")
    @ApiModelProperty(value= "单据号")
    private String matnr;

    /**
     * 物料描述
     */
    @ApiModelProperty(value= "商品名称")
    @ApiModelProperty(value= "物料号")
    private String maktx;

    /**
@@ -78,9 +78,9 @@
    private String specs;

    /**
     * 型号
     * 批次
     */
    @ApiModelProperty(value= "型号")
    @ApiModelProperty(value= "批次")
    private String model;

    /**
@@ -114,9 +114,9 @@
    private String sku;

    /**
     * 单位量
     * 包数
     */
    @ApiModelProperty(value= "单位量")
    @ApiModelProperty(value= "包数")
    private Double units;

    /**
@@ -126,9 +126,9 @@
    private String barcode;

    /**
     * 产地
     * 物料状态
     */
    @ApiModelProperty(value= "产地")
    @ApiModelProperty(value= "物料状态")
    private String origin;

    /**
@@ -138,9 +138,9 @@
    private String manu;

    /**
     * 生产日期
     * 单据时间
     */
    @ApiModelProperty(value= "生产日期")
    @ApiModelProperty(value= "单据时间")
    @TableField("manu_date")
    private String manuDate;


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

@@ -48,13 +48,13 @@
    /**
     * 物料
     */
    @ApiModelProperty(value= "商品编号")
    @ApiModelProperty(value= "单据号")
    private String matnr;

    /**
     * 物料描述
     */
    @ApiModelProperty(value= "商品名称")
    @ApiModelProperty(value= "物料号")
    private String maktx;

    /**
@@ -77,9 +77,9 @@
    private String specs;

    /**
     * 型号
     * 批次
     */
    @ApiModelProperty(value= "型号")
    @ApiModelProperty(value= "批次")
    private String model;

    /**
@@ -113,9 +113,9 @@
    private String sku;

    /**
     * 单位量
     * 包数
     */
    @ApiModelProperty(value= "单位量")
    @ApiModelProperty(value= "包数")
    private Double units;

    /**
@@ -125,9 +125,9 @@
    private String barcode;

    /**
     * 产地
     * 物料状态
     */
    @ApiModelProperty(value= "产地")
    @ApiModelProperty(value= "物料状态")
    private String origin;

    /**
@@ -137,9 +137,9 @@
    private String manu;

    /**
     * 生产日期
     * 单据时间
     */
    @ApiModelProperty(value= "生产日期")
    @ApiModelProperty(value= "单据时间")
    @TableField("manu_date")
    private String manuDate;


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

@@ -21,7 +21,7 @@
    @Data
    public static class LocDetlAdjust {

        // 商品编号
        // 单据号
        private String matnr;

        // 序列码

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

@@ -22,7 +22,7 @@
        // 库位号
        private String locNo;

        // 商品编号
        // 单据号
        private String matnr;

        // 序列码

 src/main/java/com/zy/asrs/service/LocDetlService.java

@@ -30,7 +30,7 @@

    /**
     * 获取当天相同规格货物的深库位号
     * @param matnr 商品编号
     * @param matnr 单据号
     * @return locNo 库位号
     */
    List<String> getSameDetlToday(String matnr, Integer start, Integer end);

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

@@ -337,7 +337,7 @@
        Date now = new Date();
        pack = new Pack(
                param.getBarcode(),    // 条码[非空]
                analyse.getMatnr(),    // 商品编号
                analyse.getMatnr(),    // 单据号
                analyse.getBarcode(),    // 序列码
                1L,    // 订单状态
                1,    // 状态
@@ -433,7 +433,7 @@
            if (!matService.insert(mat)) {
                throw new CoolException("服务器内部错误，请联系管理员");
            } else {
                log.info("打包上线添加新物料[商品编号：{}]", mat.getMatnr());
                log.info("打包上线添加新物料[单据号：{}]", mat.getMatnr());
            }
        }
    }

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

@@ -132,7 +132,7 @@
            mat = excel;
            mat.setTagId(tagId);
            if (!matService.insert(mat)) {
                throw new CoolException("保存商品信息失败，商品编码：" + excel.getMatnr());
                throw new CoolException("保存商品信息失败，单据号：" + excel.getMatnr());
            }
            total++;
        }

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

@@ -15,7 +15,7 @@
//        wrkDetl.setMatnr(matCode.getMatNo()); // 物料编号
//        wrkDetl.setMaktx(matCode.getMatName()); // 物料描述
//        wrkDetl.setLgnum(matCode.getStr2()); // 规格
//        wrkDetl.setType(matCode.getStr5()); // 型号
//        wrkDetl.setType(matCode.getStr5()); // 批次
//        wrkDetl.setColor(matCode.getBarcode()); // 条码
//        wrkDetl.setSupplier(matCode.getStr6()); // 序列码
//        wrkDetl.setWarehouse(matCode.getStr7()); // 单据编号
@@ -30,7 +30,7 @@
//        wrkDetl.setBatch(locDetl.getBatch());
//        wrkDetl.setOrderNo(locDetl.getOrderNo());
//        wrkDetl.setLgnum(locDetl.getLgnum()); // 规格
//        wrkDetl.setType(locDetl.getType()); // 型号
//        wrkDetl.setType(locDetl.getType()); // 批次
//        wrkDetl.setColor(locDetl.getColor()); // 条码
//        wrkDetl.setSupplier(locDetl.getSupplier()); // 序列码
//        wrkDetl.setWarehouse(locDetl.getWarehouse()); // 单据编号
@@ -44,7 +44,7 @@
//        locDetl.setMatnr(matCode.getMatNo()); // 物料编号
//        locDetl.setMaktx(matCode.getMatName()); // 物料描述
//        locDetl.setLgnum(matCode.getStr2()); // 规格
//        locDetl.setType(matCode.getStr5()); // 型号
//        locDetl.setType(matCode.getStr5()); // 批次
//        locDetl.setColor(matCode.getBarcode()); // 条码
//        locDetl.setSupplier(matCode.getStr6()); // 序列码
//        locDetl.setWarehouse(matCode.getStr7()); // 单据编号
@@ -59,7 +59,7 @@
//        locDetl.setBatch(wrkDetl.getBatch());
//        locDetl.setOrderNo(wrkDetl.getOrderNo());
//        locDetl.setLgnum(wrkDetl.getLgnum()); // 规格
//        locDetl.setType(wrkDetl.getType()); // 型号
//        locDetl.setType(wrkDetl.getType()); // 批次
//        locDetl.setColor(wrkDetl.getColor()); // 条码
//        locDetl.setSupplier(wrkDetl.getSupplier()); // 序列码
//        locDetl.setWarehouse(wrkDetl.getWarehouse()); // 单据编号
@@ -73,7 +73,7 @@
//        waitPakIn.setMatnr(matCode.getMatNo()); // 物料编号
//        waitPakIn.setMaktx(matCode.getMatName()); // 物料描述
//        waitPakIn.setLgnum(matCode.getStr2()); // 规格
//        waitPakIn.setType(matCode.getStr5()); // 型号
//        waitPakIn.setType(matCode.getStr5()); // 批次
//        waitPakIn.setColor(matCode.getBarcode()); // 条码
//        waitPakIn.setSupplier(matCode.getStr6()); // 序列码
//        waitPakIn.setWarehouse(matCode.getStr7()); // 单据编号
@@ -95,7 +95,7 @@
//        waitPakIn.setBatch(orderDetl.getBatch());
//        waitPakIn.setOrderNo(orderDetl.getOrderNo());
//        waitPakIn.setLgnum(orderDetl.getSpecs()); // 规格
//        waitPakIn.setType(orderDetl.getModel()); // 型号
//        waitPakIn.setType(orderDetl.getModel()); // 批次
//        waitPakIn.setSupplier(orderDetl.getSupplier()); // 序列码
//        waitPakIn.setAltme(orderDetl.getUnit()); // 单位
//    }
@@ -106,7 +106,7 @@
//        wrkDetl.setBatch(orderDetl.getBatch());
//        wrkDetl.setOrderNo(orderDetl.getOrderNo());
//        wrkDetl.setLgnum(orderDetl.getSpecs()); // 规格
//        wrkDetl.setType(orderDetl.getModel()); // 型号
//        wrkDetl.setType(orderDetl.getModel()); // 批次
//        wrkDetl.setSupplier(orderDetl.getSupplier()); // 序列码
//        wrkDetl.setAltme(orderDetl.getUnit()); // 单位
//    }

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

@@ -22,7 +22,7 @@
//            ,{field: 'id', title: 'ID', sort: true,align: 'center', fixed: 'left', width: 80}
//             {field: 'adjId', align: 'center',title: '序号'}
            {field: 'locNo', align: 'center',title: '库位号'}
            ,{field: 'matnr', align: 'center',title: '商品编号'}
            ,{field: 'matnr', align: 'center',title: '单据号'}
            ,{field: 'batch', align: 'center',title: '序列码'}
            // ,{field: 'oriCtns', align: 'center',title: '原箱数'}
            ,{field: 'oriQty', align: 'center',title: '原数量'}

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

@@ -181,27 +181,25 @@
}

var matCols = [
    {field: 'matnr', align: 'center',title: '商品编号', width: 180}
    // {field: 'id', align: 'center',title: 'ID'}
    // ,{field: 'uuid', align: 'center',title: '编号'}
    // ,{field: 'tagId$', align: 'center',title: '所属归类'}
    ,{field: 'specs', align: 'center',title: '规格', width: 200}
    ,{field: 'maktx', align: 'center',title: '商品名称'}
    // ,{field: 'name', align: 'center',title: '别名'}
    ,{field: 'model', align: 'center',title: '代码', hide: true}
    {field: 'matnr', align: 'center',title: '单据号', width: 180}
    ,{field: 'name', align: 'center',title: '移动类型'}
    ,{field: 'maktx', align: 'center',title: '物料号', width: 150}
    ,{field: 'specs', align: 'center',title: '规格'}
    ,{field: 'model', align: 'center',title: '批次', hide: false}
    ,{field: 'manuDate', align: 'center',title: '单据时间', hide: false}
    ,{field: 'weight', align: 'center',title: '重量', hide: false}
    ,{field: 'units', align: 'center',title: '包数', hide: false}
    ,{field: 'origin', align: 'center',title: '物料状态', hide: true}

    ,{field: 'color', align: 'center',title: '颜色', hide: true}
    ,{field: 'brand', align: 'center',title: '品牌', hide: true}
    ,{field: 'unit', align: 'center',title: '单位', hide: true}
    ,{field: 'price', align: 'center',title: '单价', hide: true}
    ,{field: 'sku', align: 'center',title: 'sku', hide: true}
    ,{field: 'units', align: 'center',title: '单位量', hide: true}
    ,{field: 'barcode', align: 'center',title: '条码', hide: true}
    ,{field: 'origin', align: 'center',title: '产地', hide: true}
    ,{field: 'manu', align: 'center',title: '厂家', hide: true}
    ,{field: 'manuDate', align: 'center',title: '生产日期', hide: true}
    ,{field: 'itemNum', align: 'center',title: '品项数', hide: true}
    ,{field: 'safeQty', align: 'center',title: '安全库存量', hide: true}
    ,{field: 'weight', align: 'center',title: '单箱净重', hide: true}
    ,{field: 'length', align: 'center',title: '单箱毛重', hide: true}
    ,{field: 'volume', align: 'center',title: '单箱体积', hide: true}
    ,{field: 'threeCode', align: 'center',title: '箱子尺寸', hide: true}
@@ -222,28 +220,30 @@
]

var detlCols = [
    {field: 'matnr', align: 'center',title: '商品编号', sort:true}
    {field: 'matnr', align: 'center',title: '单据号', width: 180}
    ,{field: 'name', align: 'center',title: '移动类型'}
    ,{field: 'maktx', align: 'center',title: '物料号'}
    ,{field: 'specs', align: 'center',title: '规格'}
    ,{field: 'maktx', align: 'center',title: '商品名称', sort:true}
    ,{field: 'model', align: 'center',title: '批次', hide: true}
    ,{field: 'orderNo', align: 'center',title: '单据编号', hide: false}
    ,{field: 'batch', align: 'center',title: '序列码', width: 300, sort:true}
    ,{field: 'batch', align: 'center',title: '序列码', width: 300, sort:true, hide: true}
    ,{field: 'anfme', align: 'center',title: '数量'}
    ,{field: 'zpallet', align: 'center',title: '托盘条码'}
    ,{field: 'manuDate', align: 'center',title: '单据时间', hide: true}
    ,{field: 'weight', align: 'center',title: '重量', hide: true}
    ,{field: 'units', align: 'center',title: '包数', hide: true}
    ,{field: 'origin', align: 'center',title: '物料状态', hide: true}

    ,{field: 'model', align: 'center',title: '代码', hide: true}

    ,{field: 'color', align: 'center',title: '颜色', hide: true}
    ,{field: 'brand', align: 'center',title: '品牌', hide: true}
    ,{field: 'unit', align: 'center',title: '单位', hide: true}
    ,{field: 'price', align: 'center',title: '单价', hide: true}
    ,{field: 'sku', align: 'center',title: 'sku', hide: true}
    ,{field: 'units', align: 'center',title: '单位量', hide: true}
    ,{field: 'barcode', align: 'center',title: '条码', hide: true}
    ,{field: 'origin', align: 'center',title: '产地', hide: true}
    ,{field: 'manu', align: 'center',title: '厂家', hide: true}
    ,{field: 'manuDate', align: 'center',title: '生产日期', hide: true}
    ,{field: 'itemNum', align: 'center',title: '品项数', hide: true}
    ,{field: 'safeQty', align: 'center',title: '安全库存量', hide: true}
    ,{field: 'weight', align: 'center',title: '单箱净重', hide: true}
    ,{field: 'length', align: 'center',title: '单箱毛重', hide: true}
    ,{field: 'volume', align: 'center',title: '单箱体积', hide: true}
    ,{field: 'threeCode', align: 'center',title: '箱子尺寸', hide: true}

 src/main/webapp/static/js/locDetl/locDetl.js

@@ -2,8 +2,8 @@
function getCol() {
    var cols = [
        {field: 'locNo$', align: 'center',title: '库位号'},
        {field: 'matnr', align: 'center',title: '商品编号', sort:true}
        ,{field: 'maktx', align: 'center',title: '商品名称', sort:true}
        {field: 'matnr', align: 'center',title: '单据号', sort:true}
        ,{field: 'maktx', align: 'center',title: '物料号', sort:true}
        ,{field: 'orderNo', align: 'center',title: '单据编号', hide: false}
        ,{field: 'batch', align: 'center',title: '序列码', width: 300, sort:true}
        ,{field: 'anfme', align: 'center',title: '数量'}
@@ -16,11 +16,11 @@
        ,{field: 'unit', align: 'center',title: '单位', hide: true}
        ,{field: 'price', align: 'center',title: '单价', hide: true}
        ,{field: 'sku', align: 'center',title: 'sku', hide: true}
        ,{field: 'units', align: 'center',title: '单位量', hide: true}
        ,{field: 'units', align: 'center',title: '包数', hide: true}
        ,{field: 'barcode', align: 'center',title: '条码', hide: true}
        ,{field: 'origin', align: 'center',title: '产地', hide: true}
        ,{field: 'origin', align: 'center',title: '物料状态', hide: true}
        ,{field: 'manu', align: 'center',title: '厂家', hide: true}
        ,{field: 'manuDate', align: 'center',title: '生产日期', hide: true}
        ,{field: 'manuDate', align: 'center',title: '单据时间', hide: true}
        ,{field: 'itemNum', align: 'center',title: '品项数', hide: true}
        ,{field: 'safeQty', align: 'center',title: '安全库存量', hide: true}
        ,{field: 'weight', align: 'center',title: '单箱净重', hide: true}

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

@@ -129,8 +129,8 @@
                        cellMinWidth: 100,
                        cols: [[
                            {type: 'numbers'},
                            {field: 'matnr', title: '商品编码', width: 160},
                            {field: 'maktx', title: '商品名称', width: 160},
                            {field: 'matnr', title: '单据号', width: 160},
                            {field: 'maktx', title: '物料号', width: 160},
                            {field: 'batch', title: '序列码'},
                            {field: 'anfme', title: '数量'},
                            {field: 'qty', title: '作业数量', style: 'font-weight: bold'},
@@ -236,8 +236,8 @@
                    cellMinWidth: 100,
                    cols: [[
                        {type: 'numbers', title: '#'},
                        {field: 'matnr', title: '商品编码', width: 160},
                        {field: 'maktx', title: '商品名称', width: 200},
                        {field: 'matnr', title: '单据号', width: 160},
                        {field: 'maktx', title: '物料号', width: 200},
                        {field: 'batch', title: '序列码', edit: true},
                        {field: 'specs', title: '规格'},
                        {field: 'anfme', title: '数量(修改)', style: 'color: blue;font-weight: bold', edit: true, minWidth: 110, width: 110},

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

@@ -32,15 +32,15 @@
            {type: 'checkbox'}
            ,{type: 'numbers', title: '#'}
            ,{field: 'orderNo', align: 'center',title: '单据编号', templet: '#orderNoTpl', width: 160}
            ,{field: 'matnr', align: 'center',title: '商品编码', width: 160}
            ,{field: 'maktx', align: 'center',title: '商品名称', width: 200}
            ,{field: 'matnr', align: 'center',title: '单据号', width: 160}
            ,{field: 'maktx', align: 'center',title: '物料号', width: 200}
            ,{field: 'batch', align: 'center',title: '序列码'}
            ,{field: 'specs', align: 'center',title: '规格'}
            // ,{field: 'anfme', align: 'center',title: '数量'}
            // ,{field: 'qty', align: 'center',title: '作业数量', style: 'font-weight: bold'}
            ,{field: 'enableQty', align: 'center',title: '待出数量', style: 'font-weight: bold'}
            // ,{field: 'name', align: 'center',title: '名称'}
            // ,{field: 'model', align: 'center',title: '型号'}
            // ,{field: 'model', align: 'center',title: '批次'}
            ,{field: 'unit', align: 'center',title: '单位', hide: true}
            ,{field: 'barcode', align: 'center',title: '商品条码', hide: true}
            // ,{field: 'supplier', align: 'center',title: '供应商'}
@@ -385,8 +385,8 @@
                                cellMinWidth: 100,
                                cols: [[
                                    {type: 'checkbox'},
                                    {field: 'matnr', title: '商品编码', align: 'center', width: 350},
                                    {field: 'maktx', title: '商品名称', align: 'center'},
                                    {field: 'matnr', title: '单据号', align: 'center', width: 350},
                                    {field: 'maktx', title: '物料号', align: 'center'},
                                    {field: 'specs', title: '规格', align: 'center'},
                                    {field: 'batch', title: '批号', align: 'center'},
                                    {field: 'anfme', title: '数量', align: 'center', width: 90, style: 'font-weight: bold'},

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

@@ -25,11 +25,11 @@
            ,{field: 'id', align: 'center',title: 'ID'}
            ,{field: 'orderId$', align: 'center',title: '订单内码'}
            ,{field: 'anfme', align: 'center',title: '数量'}
            ,{field: 'matnr', align: 'center',title: '商品编码'}
            ,{field: 'maktx', align: 'center',title: '商品名称'}
            ,{field: 'matnr', align: 'center',title: '单据号'}
            ,{field: 'maktx', align: 'center',title: '物料号'}
            ,{field: 'name', align: 'center',title: '名称'}
            ,{field: 'specs', align: 'center',title: '规格'}
            ,{field: 'model', align: 'center',title: '型号'}
            ,{field: 'model', align: 'center',title: '批次'}
            ,{field: 'batch', align: 'center',title: '序列码'}
            ,{field: 'unit', align: 'center',title: '单位'}
            ,{field: 'barcode', align: 'center',title: '商品条码'}

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

@@ -24,7 +24,7 @@
            {type: 'checkbox'}
            // ,{field: 'id', align: 'center',title: 'ID'}
            ,{field: 'barcode',title: '条码'}
            ,{field: 'matnr', align: 'center',title: '商品编号', minWidth: 250, width: 250}
            ,{field: 'matnr', align: 'center',title: '单据号', minWidth: 250, width: 250}
            ,{field: 'batch', align: 'center',title: '序列码', hide: true}
            ,{field: 'settle$', align: 'center',title: '状态', templet: '#settleTpl',  minWidth: 160, width: 160}
            // ,{field: 'status$', align: 'center',title: '状态'}

 src/main/webapp/static/js/report/workCountIn.js

@@ -2,8 +2,8 @@
function getCol() {
    var cols = [
        {field: 'oneday', align: 'center', title: '入库日期', width: 200}
        ,{field: 'matnr', align: 'center',title: '商品编号'}
        ,{field: 'maktx', align: 'center',title: '商品名称'}
        ,{field: 'matnr', align: 'center',title: '单据号'}
        ,{field: 'maktx', align: 'center',title: '物料号'}
        ,{field: 'anfme', align: 'center',title: '数量'}
    ];


 src/main/webapp/static/js/report/workCountOut.js

@@ -2,8 +2,8 @@
function getCol() {
    var cols = [
        {field: 'oneday', align: 'center', title: '入库日期', width: 200}
        ,{field: 'matnr', align: 'center',title: '商品编号'}
        ,{field: 'maktx', align: 'center',title: '商品名称'}
        ,{field: 'matnr', align: 'center',title: '单据号'}
        ,{field: 'maktx', align: 'center',title: '物料号'}
        ,{field: 'anfme', align: 'center',title: '数量'}
    ];


 src/main/webapp/views/locDetl/locDetl.html

@@ -26,7 +26,7 @@
    </div>
    <div class="layui-inline">
        <div class="layui-input-inline">
            <input class="layui-input" type="text" name="matnr" placeholder="商品编号" autocomplete="off">
            <input class="layui-input" type="text" name="matnr" placeholder="单据号" autocomplete="off">
        </div>
    </div>
    <div class="layui-inline">

 src/main/webapp/views/locDetlStatis/locDetlStatis.html

@@ -16,7 +16,7 @@
<div id="search-box" class="layui-form layui-card-header">
    <div class="layui-inline">
        <div class="layui-input-inline">
            <input class="layui-input" type="text" name="matnr" placeholder="商品编号" autocomplete="off">
            <input class="layui-input" type="text" name="matnr" placeholder="单据号" autocomplete="off">
        </div>
    </div>
    <!-- 待添加 -->

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

@@ -86,13 +86,13 @@
                    <!-- 表格工具栏2 -->
                    <div id="search-box" class="layui-form toolbar"  style="padding-top: 5px">
                        <div class="layui-inline">
                            <label class="layui-form-label" style="padding: 8px 15px 8px 15px">商品编号:</label>
                            <label class="layui-form-label" style="padding: 8px 15px 8px 15px">单据号:</label>
                            <div class="layui-input-inline">
                                <input name="matnr" class="layui-input" placeholder="输入商品编号"/>
                            </div>
                        </div>
                        <div class="layui-inline">
                            <label class="layui-form-label" style="padding: 8px 15px 8px 15px">商品名称:</label>
                            <label class="layui-form-label" style="padding: 8px 15px 8px 15px">物料号:</label>
                            <div class="layui-input-inline">
                                <input name="maktx" class="layui-input" placeholder="输入商品名称"/>
                            </div>
@@ -167,8 +167,6 @@
        <input name="uuid" type="hidden">
        <input name="nodeId" type="hidden">
        <input name="tag_id" type="hidden">
        <input name="model" type="hidden">
        <input name="name" type="hidden">
        <input name="batch" type="hidden">
        <input name="docId" type="hidden">
        <input name="docNum" type="hidden">
@@ -192,26 +190,47 @@
                </div>

                <div class="layui-form-item">
                    <label class="layui-form-label layui-form-required">商品名称</label>
                    <label class="layui-form-label">物料号</label>
                    <div class="layui-input-block">
                        <input name="maktx" placeholder="请输入商品名称" class="layui-input" lay-vertype="tips" lay-verify="required" required="">
                        <input name="maktx" placeholder="请输入物料号" class="layui-input">
                    </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 name="memo" placeholder="请输入备注" class="layui-input">
                        <input name="name" placeholder="请输入移动类型" class="layui-input">
                    </div>
                </div>

                <div class="layui-form-item">
                    <label class="layui-form-label">重量</label>
                    <div class="layui-input-block">
                        <input type="number" name="weight" placeholder="请输入重量" class="layui-input">
                    </div>
                </div>

                <div class="layui-form-item">
                    <label class="layui-form-label">状态</label>
                    <div class="layui-input-block">
                        <input name="origin" placeholder="请输入状态" class="layui-input">
                    </div>
                </div>

<!--                <div class="layui-form-item">-->
<!--                    <label class="layui-form-label">备注</label>-->
<!--                    <div class="layui-input-block">-->
<!--                        <input name="memo" placeholder="请输入备注" class="layui-input">-->
<!--                    </div>-->
<!--                </div>-->

            </div>

            <div class="layui-col-md6">
                <div class="layui-form-item">
                    <label class="layui-form-label layui-form-required">商品编号</label>
                    <label class="layui-form-label layui-form-required">单据号</label>
                    <div class="layui-input-block">
                        <input id="matnr" name="matnr" placeholder="请输入商品编号" class="layui-input" lay-vertype="tips" lay-verify="required" required="">
                        <input id="matnr" name="matnr" placeholder="请输入单据号" class="layui-input" lay-vertype="tips" lay-verify="required" required="">
                    </div>
                </div>

@@ -219,6 +238,27 @@
                    <label class="layui-form-label">规格</label>
                    <div class="layui-input-block">
                        <input name="specs" placeholder="请输入规格" class="layui-input">
                    </div>
                </div>

                <div class="layui-form-item">
                    <label class="layui-form-label">批次</label>
                    <div class="layui-input-block">
                        <input name="model" placeholder="请输入批次" class="layui-input">
                    </div>
                </div>

                <div class="layui-form-item">
                    <label class="layui-form-label">单据时间</label>
                    <div class="layui-input-block">
                        <input name="manuDate" placeholder="请输入单据时间" class="layui-input">
                    </div>
                </div>

                <div class="layui-form-item">
                    <label class="layui-form-label">包数</label>
                    <div class="layui-input-block">
                        <input type="number" name="units" placeholder="请输入包数" class="layui-input">
                    </div>
                </div>

@@ -250,7 +290,7 @@
                <div id="template-preview-1" class="template-preview" style="display: inline-block">
                    <table class="contain" width="280" style="overflow: hidden;font-size: xx-small;table-layout: fixed;">
                        <tr style="height: 74px">
                            <td colspan="3" align="center" scope="col">商品编码</td>
                            <td colspan="3" align="center" scope="col">单据号</td>
                            <td class="barcode" colspan="9" align="center" scope="col">
                                <img class="template-code template-barcode" src="" width="90%;">
                                <div style="letter-spacing: 2px;margin-top: 1px; text-align: center;">
@@ -329,7 +369,7 @@
    {{#each data}}
    <table class="contain" width="280" style="overflow: hidden;font-size: small;table-layout: fixed;">
        <tr style="height: 74px">
            <td align="center" colspan="3" scope="col">商品编码</td>
            <td align="center" colspan="3" scope="col">单据号</td>
            <td align="center" class="barcode" colspan="9" scope="col">
                <img class="template-code" src="{{this.barcodeUrl}}" width="90%">
                <div style="letter-spacing: 2px;margin-top: 1px; text-align: center">

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

@@ -261,7 +261,7 @@
                            <thead>
                            <tr style="background: none">
                                <td>No.</td>
                                <td>商品编号</td>
                                <td>单据号</td>
                                <td>数量</td>
                            </tr>
                            </thead>

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

@@ -98,15 +98,15 @@
                    <form class="layui-form toolbar">
                        <div class="layui-form-item">
                            <div class="layui-inline">
                                <label class="layui-form-label">商品编码:</label>
                                <label class="layui-form-label">单据号:</label>
                                <div class="layui-input-inline">
                                    <input name="matnr" class="layui-input" placeholder="商品编码"/>
                                    <input name="matnr" class="layui-input" placeholder="单据号"/>
                                </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="maktx" class="layui-input" placeholder="商品名称"/>
                                    <input name="maktx" class="layui-input" placeholder="物料号"/>
                                </div>
                            </div>
                            <div class="layui-inline">

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

@@ -82,13 +82,13 @@
                    </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="matnr" placeholder="请输入商品编码">
                    </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="maktx" placeholder="请输入商品名称">
                    </div>
@@ -106,7 +106,7 @@
                    </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="model" placeholder="请输入型号">
                    </div>

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

@@ -97,7 +97,7 @@
                    </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="matnr" placeholder="请输入商品编号">
                    </div>

 src/main/webapp/views/pakStore/locDetlCheckQuery.html

@@ -53,7 +53,7 @@
        </div>
        <div class="layui-inline">
            <div class="layui-input-inline">
                <input class="layui-input" type="text" name="matnr" placeholder="商品编号"  autocomplete="off">
                <input class="layui-input" type="text" name="matnr" placeholder="单据号"  autocomplete="off">
            </div>
        </div>
        <div class="layui-inline">

 src/main/webapp/views/pakStore/locDetlQuery.html

@@ -53,7 +53,7 @@
        </div>
        <div class="layui-inline">
            <div class="layui-input-inline">
                <input class="layui-input" type="text" name="matnr" placeholder="商品编号"  autocomplete="off">
                <input class="layui-input" type="text" name="matnr" placeholder="单据号"  autocomplete="off">
            </div>
        </div>
        <div class="layui-inline">

 src/main/webapp/views/pakStore/matQuery.html

@@ -30,12 +30,12 @@
        <div id="search-box" class="layui-form layui-card-header">
            <div class="layui-inline">
                <div class="layui-input-inline">
                    <input class="layui-input" type="text" name="matnr" placeholder="商品编号" autocomplete="off">
                    <input class="layui-input" type="text" name="matnr" placeholder="单据号" autocomplete="off">
                </div>
            </div>
            <div class="layui-inline">
                <div class="layui-input-inline">
                    <input class="layui-input" type="text" name="maktx" placeholder="商品名称" autocomplete="off">
                    <input class="layui-input" type="text" name="maktx" placeholder="物料号" autocomplete="off">
                </div>
            </div>
            <!-- 日期范围 -->

 src/main/webapp/views/pda/comb.html

@@ -55,8 +55,8 @@
            cellMinWidth: 50,
            cols: [[
                {fixed: 'left', align: 'center', field: 'count', title: '数量', style:'color: blue', width:50},
                {field: 'matnr', align: 'center', title: '商品编号'},
                {field: 'maktx', align: 'center', title: '商品名称'}
                {field: 'matnr', align: 'center', title: '单据号'},
                {field: 'maktx', align: 'center', title: '物料号'}
            ]],
            done: function (res, curr, count) {
            }

 src/main/webapp/views/pda/locDetlIframe.html

@@ -79,11 +79,11 @@
        <input id="locNo" type="text" disabled="disabled">
    </div>
    <div class="form-item">
        <span>商品编号</span>
        <span>单据号</span>
        <input id="matnr" type="text" disabled="disabled">
    </div>
    <div class="form-item">
        <span>商品名称</span>
        <span>物料号</span>
        <input id="maktx" type="text" disabled="disabled">
    </div>
    <div class="form-item">
@@ -133,4 +133,4 @@
        countDom.val(countDom.val() - 1);
    }
</script>
</html>
</html>

 src/main/webapp/views/pda/matQuery.html

@@ -77,11 +77,11 @@

<div class="form-box">
    <div class="form-item">
        <span>商品编号</span>
        <span>单据号</span>
        <input id="matNo" type="text" placeholder="扫码 / 输入" onkeyup="find(this)" autocomplete="off">
    </div>
    <div class="form-item">
        <span>商品名称</span>
        <span>物料号</span>
        <input id="matName" type="text" disabled="disabled">
    </div>
    <div class="form-item">
@@ -183,4 +183,4 @@
    }

</script>
</html>
</html>

 src/main/webapp/views/pda/stockIn.html

@@ -120,8 +120,8 @@
            cellMinWidth: 50,
            cols: [[
                {fixed: 'left', align: 'center', field: 'count', title: '数量', style:'color: blue', width:50},
                {field: 'matnr', align: 'center', title: '商品编号'},
                {field: 'maktx', align: 'center', title: '商品名称'}
                {field: 'matnr', align: 'center', title: '单据号'},
                {field: 'maktx', align: 'center', title: '物料号'}
            ]],
            done: function (res, curr, count) {


 src/main/webapp/views/report/viewWorkCountIn.html

@@ -20,7 +20,7 @@
<div id="search-box" class="layui-form layui-card-header">
    <div class="layui-inline">
        <div class="layui-input-inline">
            <input class="layui-input" type="text" name="matnr" placeholder="商品编号" autocomplete="off">
            <input class="layui-input" type="text" name="matnr" placeholder="单据号" autocomplete="off">
        </div>
    </div>
    <div class="layui-inline" style="width: 300px">

 src/main/webapp/views/report/viewWorkCountOut.html

@@ -21,7 +21,7 @@
<div id="search-box" class="layui-form layui-card-header">
    <div class="layui-inline">
        <div class="layui-input-inline">
            <input class="layui-input" type="text" name="matnr" placeholder="商品编号" autocomplete="off">
            <input class="layui-input" type="text" name="matnr" placeholder="单据号" autocomplete="off">
        </div>
    </div>
    <div class="layui-inline" style="width: 300px">

 src/main/webapp/views/report/viewWorkIn.html

@@ -26,7 +26,7 @@
    </div>
    <div class="layui-inline">
        <div class="layui-input-inline">
            <input class="layui-input" type="text" name="matnr" placeholder="商品编号" autocomplete="off">
            <input class="layui-input" type="text" name="matnr" placeholder="单据号" autocomplete="off">
        </div>
    </div>
    <div class="layui-inline" style="width: 300px">

 src/main/webapp/views/report/viewWorkOut.html

@@ -26,7 +26,7 @@
    </div>
    <div class="layui-inline">
        <div class="layui-input-inline">
            <input class="layui-input" type="text" name="matnr" placeholder="商品编号" autocomplete="off">
            <input class="layui-input" type="text" name="matnr" placeholder="单据号" autocomplete="off">
        </div>
    </div>
    <div class="layui-inline" style="width: 300px">

 src/main/webapp/views/waitPakin/waitPakin.html

@@ -21,7 +21,7 @@
    </div>
    <div class="layui-inline">
        <div class="layui-input-inline">
            <input class="layui-input" type="text" name="matnr" placeholder="商品编号" autocomplete="off">
            <input class="layui-input" type="text" name="matnr" placeholder="单据号" autocomplete="off">
        </div>
    </div>
    <!-- 日期范围 -->

 src/main/webapp/views/waitPakin/waitPakin_detail.html

@@ -36,7 +36,7 @@
            </div>
        </div>
        <div class="layui-inline"  style="width:31%;">
            <label class="layui-form-label">商品编号：</label>
            <label class="layui-form-label">单据号：</label>
            <div class="layui-input-inline">
                <input id="matnr" class="layui-input" type="text">
            </div>

 src/main/webapp/views/waitPakinLog/waitPakinLog_detail.html

@@ -42,7 +42,7 @@
            </div>
        </div>
        <div class="layui-inline"  style="width:31%;">
            <label class="layui-form-label">商品编号：</label>
            <label class="layui-form-label">单据号：</label>
            <div class="layui-input-inline">
                <input id="matnr" class="layui-input" type="text">
            </div>