#物料

luxiaotao1123

2021-01-12 794941c21ec6a768a11e215c09ee2b0693a6fc64

#物料

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

@@ -123,7 +123,7 @@

    // 导出
    @RequestMapping(value = "/matCode/export/auth")
    @ManagerAuth(value = ManagerAuth.Auth.NONE, memo = "物料编码数据导出")
    @ManagerAuth(value = ManagerAuth.Auth.NONE, memo = "商品编号数据导出")
    public void export(@RequestParam(required = false) String fileName,
                       @RequestParam(required = false) Integer rowCount,
                       HttpServletResponse response) throws Exception {
@@ -138,7 +138,7 @@
        }
        response.setContentType("application/vnd.ms-excel");
        response.setCharacterEncoding("utf-8");
        fileName = URLEncoder.encode(Cools.isEmpty(fileName)?"物料编码":fileName, "UTF-8");
        fileName = URLEncoder.encode(Cools.isEmpty(fileName)?"商品编号":fileName, "UTF-8");
        response.setHeader("Content-disposition", "attachment;filename=" + fileName + ".xlsx");
        EasyExcel.write(response.getOutputStream(), MatCodeExcel.class)
                .registerWriteHandler(new LongestMatchColumnWidthStyleStrategy())
@@ -148,7 +148,7 @@

    // 导入
    @RequestMapping(value = "/matCode/import/auth")
    @ManagerAuth(memo = "物料编码数据导入")
    @ManagerAuth(memo = "商品编号数据导入")
    @Transactional
    public R matCodeImport(MultipartFile file) throws IOException, InterruptedException {
        MatCodeExcelListener listener = new MatCodeExcelListener(getUserId());
@@ -158,7 +158,7 @@

    // 打印
    @RequestMapping(value = "/matCode/print/auth")
    @ManagerAuth(memo = "物料编码打印")
    @ManagerAuth(memo = "商品编号打印")
    public R matCodePrint(@RequestParam(value = "param[]") String[] param) {
        if(Cools.isEmpty(param)) {
            return R.parse(CodeRes.EMPTY);
@@ -179,7 +179,7 @@
    }

    @RequestMapping(value = "/macCode/code/auth")
//    @ManagerAuth(memo = "物料编码条形码获取(type:1(条形码);2(二维码)")
//    @ManagerAuth(memo = "商品编号条形码获取(type:1(条形码);2(二维码)")
    public R matCodeBarcode(@RequestParam(defaultValue = "1") Integer type
                        , @RequestParam String param
                        , HttpServletResponse response) throws Exception {

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

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

    @ApiModelProperty(value= "物料")
    @ApiModelProperty(value= "商品编号")
    @TableId(value = "matnr", type = IdType.INPUT)
    private String matnr;

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

    @ApiModelProperty(value= "规格")
    private String lgnum;

    @ApiModelProperty(value= "物料类别")
    @ApiModelProperty(value= "型号")
    private String type;

    @ApiModelProperty(value= "颜色")
    @ApiModelProperty(value= "条码")
    private String color;

    @ApiModelProperty(value= "供应商")
    @ApiModelProperty(value= "批号")
    private String supplier;

    @ApiModelProperty(value= "仓库")
    @ApiModelProperty(value= "单据编号")
    private String warehouse;

    @ApiModelProperty(value= "品牌")
    @ApiModelProperty(value= "品项数")
    private String brand;

    @ApiModelProperty(value= "数量")
@@ -61,7 +61,7 @@
    @ApiModelProperty(value= "托盘条码")
    private String zpallet;

    @ApiModelProperty(value= "用户ID")
    @ApiModelProperty(value= "客户名称")
    private String bname;

    @ApiModelProperty(value= "备注")

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

@@ -20,9 +20,9 @@
    private static final long serialVersionUID = 1L;

    /**
     * 物料编码
     * 商品编号
     */
    @ApiModelProperty(value= "物料编码")
    @ApiModelProperty(value= "商品编号")
    @TableId(value = "mat_no", type = IdType.INPUT)
    @TableField("mat_no")
    private String matNo;
@@ -34,34 +34,34 @@
    private String barcode;

    /**
     * 物料名称
     * 商品名称
     */
    @ApiModelProperty(value= "物料名称")
    @ApiModelProperty(value= "商品名称")
    @TableField("mat_name")
    private String matName;

    /**
     * 物料单位
     */
    @ApiModelProperty(value= "物料单位")
    @ApiModelProperty(value= "单位")
    private String str1;

    @ApiModelProperty(value= "物料规格")
    @ApiModelProperty(value= "规格")
    private String str2;

    @ApiModelProperty(value= "颜色")
    @ApiModelProperty(value= "品项数")
    private String str3;

    @ApiModelProperty(value= "客户")
    @ApiModelProperty(value= "客户名称")
    private String str4;

    @ApiModelProperty(value= "")
    @ApiModelProperty(value= "型号")
    private String str5;

    @ApiModelProperty(value= "")
    @ApiModelProperty(value= "批号")
    private String str6;

    @ApiModelProperty(value= "")
    @ApiModelProperty(value= "单据编号")
    private String str7;

    @ApiModelProperty(value= "")
@@ -208,9 +208,9 @@

//    MatCode matCode = new MatCode(
//            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;

@@ -26,7 +26,7 @@
    private String str1;

    /**
     * 物料规格
     * 规格
     */
    private String str2;


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

@@ -29,12 +29,12 @@
    private String brand;    // 品牌
    
    private String loc_no;      //库位号
    private String mat_no;      //物料编码
    private String mat_no;      //商品编号
    private Long ctns;          //箱数
    private Long qty;           //数量
    private double wt;            //重量
    private String memo;        //备注
    private String mat_name;      //物料名称
    private String mat_name;      //商品名称
    private String str1;
    private String str2;
    private String str3;

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

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

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


@@ -38,31 +38,31 @@
    /**
     * 仓库号
     */
    @ApiModelProperty(value= "物料类别")
    @ApiModelProperty(value= "型号")
    private String type;

    /**
     * 仓库号
     */
    @ApiModelProperty(value= "颜色")
    @ApiModelProperty(value= "条码")
    private String color;

    /**
     * 仓库号
     */
    @ApiModelProperty(value= "供应商")
    @ApiModelProperty(value= "批号")
    private String supplier;

    /**
     * 仓库号
     */
    @ApiModelProperty(value= "仓库")
    @ApiModelProperty(value= "单据编号")
    private String warehouse;

    /**
     * 仓库号
     */
    @ApiModelProperty(value= "品牌")
    @ApiModelProperty(value= "品项数")
    private String brand;

    /**
@@ -86,7 +86,7 @@
    /**
     * 用户ID
     */
    @ApiModelProperty(value= "用户ID")
    @ApiModelProperty(value= "客户名称")
    private String bname;

    @ApiModelProperty(value= "库位号")

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

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

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


@@ -39,31 +39,31 @@
    /**
     * 仓库号
     */
    @ApiModelProperty(value= "物料类别")
    @ApiModelProperty(value= "型号")
    private String type;

    /**
     * 仓库号
     */
    @ApiModelProperty(value= "颜色")
    @ApiModelProperty(value= "条码")
    private String color;

    /**
     * 仓库号
     */
    @ApiModelProperty(value= "供应商")
    @ApiModelProperty(value= "批号")
    private String supplier;

    /**
     * 仓库号
     */
    @ApiModelProperty(value= "仓库")
    @ApiModelProperty(value= "单据编号")
    private String warehouse;

    /**
     * 仓库号
     */
    @ApiModelProperty(value= "品牌")
    @ApiModelProperty(value= "品项数")
    private String brand;

    /**
@@ -87,7 +87,7 @@
    /**
     * 用户ID
     */
    @ApiModelProperty(value= "用户ID")
    @ApiModelProperty(value= "客户名称")
    private String bname;

    @ApiModelProperty(value= "库位号")

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

@@ -36,15 +36,14 @@
    /**
     * 物料
     */
    @ApiModelProperty(value= "物料")
    @ApiModelProperty(value= "商品编号")
    private String matnr;

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


    /**
     * 仓库号
@@ -55,31 +54,31 @@
    /**
     * 仓库号
     */
    @ApiModelProperty(value= "物料类别")
    @ApiModelProperty(value= "型号")
    private String type;

    /**
     * 仓库号
     * 条码
     */
    @ApiModelProperty(value= "颜色")
    @ApiModelProperty(value= "条码")
    private String color;

    /**
     * 仓库号
     * 批号
     */
    @ApiModelProperty(value= "供应商")
    @ApiModelProperty(value= "批号")
    private String supplier;

    /**
     * 仓库号
     * 单据编号
     */
    @ApiModelProperty(value= "仓库")
    @ApiModelProperty(value= "单据编号")
    private String warehouse;

    /**
     * 仓库号
     * 品项数
     */
    @ApiModelProperty(value= "品牌")
    @ApiModelProperty(value= "品项数")
    private String brand;

    /**
@@ -101,9 +100,9 @@
    private String zpallet;

    /**
     * 用户ID
     * 客户名称
     */
    @ApiModelProperty(value= "用户ID")
    @ApiModelProperty(value= "客户名称")
    private String bname;

    /**

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

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

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


@@ -55,31 +55,31 @@
    /**
     * 仓库号
     */
    @ApiModelProperty(value= "物料类别")
    @ApiModelProperty(value= "型号")
    private String type;

    /**
     * 仓库号
     */
    @ApiModelProperty(value= "颜色")
    @ApiModelProperty(value= "条码")
    private String color;

    /**
     * 仓库号
     */
    @ApiModelProperty(value= "供应商")
    @ApiModelProperty(value= "批号")
    private String supplier;

    /**
     * 仓库号
     */
    @ApiModelProperty(value= "仓库")
    @ApiModelProperty(value= "单据编号")
    private String warehouse;

    /**
     * 仓库号
     */
    @ApiModelProperty(value= "品牌")
    @ApiModelProperty(value= "品项数")
    private String brand;

    /**
@@ -103,7 +103,7 @@
    /**
     * 用户ID
     */
    @ApiModelProperty(value= "用户ID")
    @ApiModelProperty(value= "客户名称")
    private String bname;

    /**

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

@@ -15,7 +15,7 @@

    public static class LocDetlAdjust {

        // 物料号
        // 商品编号
        private String matnr;

        // 变更数量

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

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

        // 物料号
        // 商品编号
        private String matnr;

        // 数量

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

@@ -19,7 +19,7 @@

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

 src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java

@@ -87,6 +87,8 @@
                            locDetl = new LocDetl();
                            locDetl.setLocNo(wrkMast.getLocNo()); // 库位号
                            VersionUtils.setLocDetl(locDetl, wrkDetl); // 版本控制
                            locDetl.setAnfme(wrkDetl.getAnfme()); // 数量
                            locDetl.setZpallet(wrkDetl.getZpallet()); // 托盘条码
                            locDetl.setModiTime(now);
                            locDetl.setAppeTime(now);
                            if (!locDetlService.insert(locDetl)) {
@@ -164,6 +166,8 @@
                            locDetl = new LocDetl();
                            locDetl.setLocNo(wrkMast.getLocNo()); // 库位号
                            VersionUtils.setLocDetl(locDetl, wrkDetl); // 版本控制
                            locDetl.setAnfme(wrkDetl.getAnfme()); // 数量
                            locDetl.setZpallet(wrkDetl.getZpallet()); // 托盘条码
                            locDetl.setModiTime(now);
                            locDetl.setAppeTime(now);
                            if (!locDetlService.insert(locDetl)) {

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

@@ -17,18 +17,26 @@
        wrkDetl.setMatnr(matCode.getMatNo()); // 物料编号
        wrkDetl.setMaktx(matCode.getMatName()); // 物料描述
        wrkDetl.setLgnum(matCode.getStr2()); // 规格
        wrkDetl.setColor(matCode.getStr3()); // 助记码
        wrkDetl.setType(matCode.getStr5()); // 型号
        wrkDetl.setColor(matCode.getBarcode()); // 条码
        wrkDetl.setSupplier(matCode.getStr6()); // 批号
        wrkDetl.setWarehouse(matCode.getStr7()); // 单据编号
        wrkDetl.setBrand(matCode.getStr3()); // 品项数
        wrkDetl.setAltme(matCode.getStr1()); // 单位
        wrkDetl.setBname(matCode.getStr4()); // 客户
        wrkDetl.setBname(matCode.getStr4()); // 客户名称
    }

    public static void setWrkDetl(WrkDetl wrkDetl, LocDetl locDetl) {
        wrkDetl.setMatnr(locDetl.getMatnr()); // 物料编号
        wrkDetl.setMaktx(locDetl.getMaktx()); // 物料描述
        wrkDetl.setLgnum(locDetl.getLgnum()); // 规格
        wrkDetl.setColor(locDetl.getColor()); // 助记码
        wrkDetl.setBname(locDetl.getBname()); // 客户
        wrkDetl.setType(locDetl.getType()); // 型号
        wrkDetl.setColor(locDetl.getColor()); // 条码
        wrkDetl.setSupplier(locDetl.getSupplier()); // 批号
        wrkDetl.setWarehouse(locDetl.getWarehouse()); // 单据编号
        wrkDetl.setBrand(locDetl.getBrand()); // 品项数
        wrkDetl.setAltme(locDetl.getAltme()); // 单位
        wrkDetl.setBname(locDetl.getBname()); // 客户名称
        wrkDetl.setZpallet(locDetl.getZpallet()); // 托盘条码
    }

@@ -36,19 +44,26 @@
        locDetl.setMatnr(matCode.getMatNo()); // 物料编号
        locDetl.setMaktx(matCode.getMatName()); // 物料描述
        locDetl.setLgnum(matCode.getStr2()); // 规格
        locDetl.setColor(matCode.getStr3()); // 助记码
        locDetl.setBname(matCode.getStr4()); // 客户
        locDetl.setType(matCode.getStr5()); // 型号
        locDetl.setColor(matCode.getBarcode()); // 条码
        locDetl.setSupplier(matCode.getStr6()); // 批号
        locDetl.setWarehouse(matCode.getStr7()); // 单据编号
        locDetl.setBrand(matCode.getStr3()); // 品项数
        locDetl.setAltme(matCode.getStr1()); // 单位
        locDetl.setBname(matCode.getStr4()); // 客户名称
    }

    public static void setLocDetl(LocDetl locDetl, WrkDetl wrkDetl) {
        locDetl.setMatnr(wrkDetl.getMatnr()); // 物料编号
        locDetl.setMaktx(wrkDetl.getMaktx()); // 物料描述
        locDetl.setLgnum(wrkDetl.getLgnum()); // 规格
        locDetl.setColor(wrkDetl.getColor()); // 助记码
        locDetl.setBname(wrkDetl.getBname()); // 客户
        locDetl.setAnfme(wrkDetl.getAnfme()); // 数量
        locDetl.setType(wrkDetl.getType()); // 型号
        locDetl.setColor(wrkDetl.getColor()); // 条码
        locDetl.setSupplier(wrkDetl.getSupplier()); // 批号
        locDetl.setWarehouse(wrkDetl.getWarehouse()); // 单据编号
        locDetl.setBrand(wrkDetl.getBrand()); // 品项数
        locDetl.setAltme(wrkDetl.getAltme()); // 单位
        locDetl.setBname(wrkDetl.getBname()); // 客户名称
        locDetl.setZpallet(wrkDetl.getZpallet()); // 托盘条码
    }

@@ -56,9 +71,13 @@
        waitPakIn.setMatnr(matCode.getMatNo()); // 物料编号
        waitPakIn.setMaktx(matCode.getMatName()); // 物料描述
        waitPakIn.setLgnum(matCode.getStr2()); // 规格
        waitPakIn.setColor(matCode.getStr3()); // 助记码
        waitPakIn.setType(matCode.getStr5()); // 型号
        waitPakIn.setColor(matCode.getBarcode()); // 条码
        waitPakIn.setSupplier(matCode.getStr6()); // 批号
        waitPakIn.setWarehouse(matCode.getStr7()); // 单据编号
        waitPakIn.setBrand(matCode.getStr3()); // 品项数
        waitPakIn.setAltme(matCode.getStr1()); // 单位
        waitPakIn.setBname(matCode.getStr4()); // 客户
        waitPakIn.setBname(matCode.getStr4()); // 客户名称
    }

    // excel ----------------------------------------------------------------------

 src/main/java/com/zy/common/service/CommonService.java

@@ -87,7 +87,7 @@
     * @param whsType 类型 1:双深式货架
     * @param staDescId 路径工作类型
     * @param sourceStaNo 源站
     * @param matNos 物料号集合
     * @param matNos 商品编号集合
     * @return locNo 检索到的库位号
     */
    @Transactional

 src/main/java/com/zy/common/web/FileController.java

@@ -70,7 +70,7 @@
    }

    @RequestMapping(value = "/barcode/qrcode/auth")
//    @ManagerAuth(memo = "物料编码条形码获取(type:1(条形码);2(二维码)")
//    @ManagerAuth(memo = "商品编号条形码获取(type:1(条形码);2(二维码)")
    public R matCodeBarcode(@RequestParam(defaultValue = "1") Integer type
                            , @RequestParam String param
                            , @RequestParam(required = false) Integer width

 src/main/resources/UpdateThread.cs

@@ -835,7 +835,7 @@
                                    goto re;
                                }

                                ///根据工作号，查询工作明细档物料编码
                                ///根据工作号，查询工作明细档商品编号
                                string sqlDetl = "";
                                string sqlWaitIn = "";
                                sql = "select lgnum,tbnum,tbpos,zmatid,matnr,maktx,werks,anfme,altme,zpallet,bname from asr_wrk_detl where wrk_no=" + li_wrk_no;
@@ -910,7 +910,7 @@
                            #endregion
                            #region 拣料再入库
                            case 53:
                                ///根据工作号，查询工作明细档物料编码
                                ///根据工作号，查询工作明细档商品编号
                                sqlDetl = "";
                                sqlWaitIn = "";
                                sql = "select lgnum,tbnum,tbpos,zmatid,matnr,maktx,werks,anfme,altme,zpallet,bname from asr_wrk_detl where wrk_no=" + li_wrk_no;
@@ -964,7 +964,7 @@
                            #endregion
                            #region 并板再入库
                            case 54:
                                ///根据工作号，查询工作明细档物料编码
                                ///根据工作号，查询工作明细档商品编号
                                sqlDetl = "";
                                sqlWaitIn = "";
                                sql = "select lgnum,tbnum,tbpos,zmatid,matnr,maktx,werks,anfme,altme,zpallet,bname from asr_wrk_detl where wrk_no=" + li_wrk_no;
@@ -1030,7 +1030,7 @@
                            #endregion
                            #region 盘点再入库
                            case 57:
                                ///根据工作号，查询工作明细档物料编码
                                ///根据工作号，查询工作明细档商品编号
                                sqlDetl = "";
                                sqlWaitIn = "";
                                sql = "select lgnum,tbnum,tbpos,matnr from asr_wrk_detl where wrk_no=" + li_wrk_no;
@@ -1133,7 +1133,7 @@
                        {
                            #region 全板出库
                            case 101:
                                ///根据工作号，查询工作明细档物料编码
                                ///根据工作号，查询工作明细档商品编号
                                string sqlWaitIn = "";
                                sql = "select lgnum,tbnum,tbpos,matnr from asr_wrk_detl where wrk_no=" + li_wrk_no;
                                DataView dv_wrkdetl = Common.ExecAsrsSelect(sql);

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

@@ -167,23 +167,30 @@
}

var matCols = [
    {field: 'matNo', align: 'center',title: '物料编码'}
    ,{field: 'matName', align: 'center',title: '物料名称'}
    ,{field: 'str2', align: 'center',title: '物料规格'}
    ,{field: 'str3', align: 'center',title: '颜色'}
    ,{field: 'num1', align: 'center',title: '数量'}
    ,{field: 'str1', align: 'center',title: '物料单位'}
    ,{field: 'str4', align: 'center',title: '客户'}
    {field: 'matNo', align: 'center',title: '商品编号'}
    ,{field: 'matName', align: 'center',title: '商品名称'}
    ,{field: 'str2', align: 'center',title: '规格'}
    ,{field: 'str5', align: 'center',title: '型号'}
    ,{field: 'str6', align: 'center',title: '批号'}
    ,{field: 'str1', align: 'center',title: '单位'}
    ,{field: 'barcode', align: 'center',title: '条码'}
    ,{field: 'str7', align: 'center',title: '单据编号'}
    ,{field: 'str3', align: 'center',title: '品项数'}
    ,{field: 'str4', align: 'center',title: '客户名称'}
]

var detlCols = [
    {field: 'matnr', align: 'center',title: '物料号'}
    ,{field: 'maktx', align: 'center',title: '物料名称'}
    {field: 'matnr', align: 'center',title: '商品编号'}
    ,{field: 'maktx', align: 'center',title: '商品名称'}
    ,{field: 'lgnum', align: 'center',title: '规格'}
    ,{field: 'color', align: 'center',title: '颜色'}
    ,{field: 'type', align: 'center',title: '型号'}
    ,{field: 'supplier', align: 'center',title: '批号'}
    ,{field: 'anfme', align: 'center',title: '数量'}
    ,{field: 'altme', align: 'center',title: '单位'}
    ,{field: 'color', align: 'center',title: '条码'}
    ,{field: 'warehouse', align: 'center',title: '单据编号'}
    ,{field: 'brand', align: 'center',title: '品项数'}
    ,{field: 'zpallet', align: 'center',title: '托盘条码'}
    ,{field: 'bname', align: 'center',title: '客户'}
    ,{field: 'bname', align: 'center',title: '客户名称'}
]


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

@@ -241,9 +241,13 @@
                matnr: data[i].matNo,
                maktx: data[i].matName,
                lgnum: data[i].str2,
                color: data[i].str3,
                bname: data[i].str4,
                type: data[i].str5,
                color: data[i].barcode,
                supplier: data[i].str6,
                warehouse: data[i].str7,
                brand: data[i].str3,
                altme: data[i].str1,
                bname: data[i].str4,
            })
        }
    }

 src/main/webapp/views/locDetl/locDetl.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>
    <div class="layui-inline">

 src/main/webapp/views/matCode/matCode.html

@@ -54,7 +54,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="mat_no" placeholder="物料编码" autocomplete="off">
            <input class="layui-input" type="text" name="mat_no" placeholder="商品编号" autocomplete="off">
        </div>
    </div>
    <!-- 日期范围 -->
@@ -161,7 +161,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;">
@@ -170,7 +170,7 @@
                            </td>
                        </tr>
                        <tr style="height: 74px">
                            <td align="center" colspan="3">物料名称</td>
                            <td align="center" colspan="3">商品名称</td>
                            <td align="center" colspan="5">xxxxxx-xx/xx</td>
                            <td align="center" colspan="2">单位</td>
                            <td align="center" colspan="2">xx</td>
@@ -182,7 +182,7 @@
                <div id="template-preview-2" class="template-preview" style="display: none">
                    <table class="contain" width="280" style="overflow: hidden;font-size: xx-small;table-layout: fixed;">
                        <tr style="height: 30px">
                            <td align="center" width="20%">物料名称</td>
                            <td align="center" width="20%">商品名称</td>
                            <td align="center" width="80%" style="overflow:hidden; white-space:nowrap; text-overflow:ellipsis;">xxxxxxx</td>
                        </tr>
                        <tr style="height: 30px">
@@ -204,7 +204,7 @@
                <div id="template-preview-3" class="template-preview" style="display: none">
                    <table class="contain" width="280" style="overflow: hidden;font-size: xx-small;table-layout: fixed;">
                        <tr style="height: 74px">
                            <td align="center" scope="col" colspan="1">物料名称</td>
                            <td align="center" scope="col" colspan="1">商品名称</td>
                            <td align="center" scope="col" colspan="1" style="">xxxxxx-xx/xx</td>
                            <td align="center" scope="col" colspan="2" rowspan="2">
                                <img class="template-code template-qrcode" src="" width="80%">
@@ -240,7 +240,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">
@@ -249,7 +249,7 @@
            </td>
        </tr>
        <tr style="height: 74px">
            <td align="center" colspan="3">物料名称</td>
            <td align="center" colspan="3">商品名称</td>
            <td align="center" colspan="5" style="overflow: hidden; white-space: nowrap;text-overflow: ellipsis;">{{this.matName}}</td>
            <td align="center" colspan="2">单位</td>
            <td align="center" colspan="2">{{this.str1}}</td>
@@ -262,7 +262,7 @@
    {{#each data}}
    <table class="contain" width="280" style="overflow: hidden;font-size: xx-small;table-layout: fixed;">
        <tr style="height: 35px">
            <td align="center" width="20%">物料名称</td>
            <td align="center" width="20%">商品名称</td>
            <td align="center" width="80%" style="overflow:hidden; white-space:nowrap; text-overflow:ellipsis;">{{this.matName}}</td>
        </tr>
        <tr style="height: 35px">
@@ -285,7 +285,7 @@
    {{#each data}}
    <table class="contain" width="280" style="overflow: hidden;font-size: xx-small;table-layout: fixed;">
        <tr style="height: 74px" >
            <td align="center" scope="col" colspan="1">物料名称</td>
            <td align="center" scope="col" colspan="1">商品名称</td>
            <td align="center" scope="col" colspan="1" style="
                display: inline-block;
                line-height: 20px;

 src/main/webapp/views/matCode/matCode_detail.html

@@ -24,7 +24,7 @@
            </div>
        -->
        <div class="layui-inline"  style="width:31%;">
            <label class="layui-form-label"><span class="not-null">*</span>物料编码：</label>
            <label class="layui-form-label"><span class="not-null">*</span>商品编号：</label>
            <div class="layui-input-inline">
                <input id="matNo" class="layui-input" type="text" onkeyup="check(this.id, 'matCode')" lay-verify="required" >
            </div>
@@ -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="matName" class="layui-input" type="text">
            </div>
@@ -48,7 +48,7 @@
            </div>
        </div>
        <div class="layui-inline"  style="width:31%;display: none">
            <label class="layui-form-label">物料规格：</label>
            <label class="layui-form-label">规格：</label>
            <div class="layui-input-inline">
                <input id="str2" class="layui-input" type="text">
            </div>

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

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

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

@@ -27,7 +27,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="mat_no" placeholder="物料编码" autocomplete="off">
                <input class="layui-input" type="text" name="mat_no" 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: 'matNo', align: 'center', title: '物料编码'},
                {field: 'matName', align: 'center', title: '物料名称'}
                {field: 'matNo', align: 'center', title: '商品编号'},
                {field: 'matName', 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">

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

@@ -77,15 +77,15 @@

<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">
        <span>物料规格</span>
        <span>规格</span>
        <input id="str2" type="text" disabled="disabled">
    </div>
    <div class="form-item">
@@ -108,7 +108,7 @@
    var pageCurr;

    /**
     * 根据物料编码查询物料详情
     * 根据商品编号查询物料详情
     */
    function find(el){
        if (isEmpty(el.value)) {

 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: 'matNo', align: 'center', title: '物料编码'},
                {field: 'matName', align: 'center', title: '物料名称'}
                {field: 'matNo', align: 'center', title: '商品编号'},
                {field: 'matName', align: 'center', title: '商品名称'}
            ]],
            done: function (res, curr, count) {


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

@@ -77,7 +77,7 @@
    }

    /**
     * 根据物料号查找库存明细
     * 根据商品编号查找库存明细
     */
    function findByMatNo(el){
        if (isEmpty(el.value)) {

 src/main/webapp/views/pdaCe/index.html

@@ -487,7 +487,7 @@

    function help() {
        window.alert("① 按F1输入条码\n" +
            "② 按F2输入物料号，按ENTER查询，选择数量后提取\n" +
            "② 按F2输入商品编号，按ENTER查询，选择数量后提取\n" +
            "③ 按F3开始组托\n" +
            "其它：按F5刷新页面");
    }

 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>