1

zhang

2 天以前 17533e5e1044e3d157c916ecb360f3e46923ed6d

1

 src/main/java/com/zy/asrs/importexcle/ImportReviewDto.java

@@ -16,30 +16,38 @@
    @ExcelProperty(value = "单据编号", index = 0)
    private String column1;

    @ExcelProperty(value = "物料编号", index = 1)
    @ExcelProperty(value = "规格", index = 3)
    private String column2;

    @ExcelProperty(value = "物料名称", index = 2)

    @ExcelProperty(value = "批次号", index = 6)
    private String column3;

    @ExcelProperty(value = "规格", index = 3)
    private String column4;

    @ExcelProperty(value = "出库数量", index = 8)
    private Double column4;


    @ExcelProperty(value = "物料编号", index = 1)
    private String column5;


    @ExcelProperty(value = "物料名称", index = 2)
    private String column6;




    @ExcelProperty(value = "单位", index = 4)
    private String column5;

    @ExcelProperty(value = "品级", index = 5)
    private String column6;

    @ExcelProperty(value = "批次号", index = 6)
    private String column7;

    @ExcelProperty(value = "卷号", index = 7)
    @ExcelProperty(value = "品级", index = 5)
    private String column8;

    @ExcelProperty(value = "出库数量", index = 8)
    private Double column9;

    @ExcelProperty(value = "卷号", index = 7)
    private String column9;


    @ExcelProperty(value = "出库日期", index = 9)
    private String column10;

 src/main/java/com/zy/asrs/importexcle/ImportReviewListener.java

@@ -136,14 +136,15 @@
            }
            ReviewDetl orderDetl = new ReviewDetl();
            orderDetl.setOrderNo(importOrderDto.getColumn1());
            orderDetl.setMatnr(importOrderDto.getColumn2());
            orderDetl.setMaktx(importOrderDto.getColumn3());
            orderDetl.setSpecs(importOrderDto.getColumn4());
            orderDetl.setUnit(importOrderDto.getColumn5());
            orderDetl.setSpecs(importOrderDto.getColumn2());
            orderDetl.setBatch(importOrderDto.getColumn3());
            orderDetl.setAnfme(importOrderDto.getColumn4());

            orderDetl.setMatnr(importOrderDto.getColumn5());
            orderDetl.setMaktx(importOrderDto.getColumn6());
            orderDetl.setUnit(importOrderDto.getColumn7());
            //orderDetl.set(importOrderDto.getColumn6());
            orderDetl.setBatch(importOrderDto.getColumn7());
            orderDetl.setModel(importOrderDto.getColumn8());
            orderDetl.setAnfme(importOrderDto.getColumn9());
            orderDetl.setModel(importOrderDto.getColumn9());
            orderDetl.setDeadTime(importOrderDto.getColumn10());

            orderDetl.setOrderId(importOrderDto.getOrderId());

 src/main/webapp/static/js/review/review.js

@@ -227,7 +227,7 @@
            layer.open({
                type: 1,
                title: false,
                area: '1220px',
                area: '1020px',
                offset: [top + 'px', (left - 530 + $a.outerWidth()) + 'px'],
                shade: .01,
                shadeClose: true,
@@ -244,13 +244,13 @@
                        page: true,
                        cellMinWidth: 100,
                        cols: [[
                            {field: 'matnr', title: '物质编码'},
                            {field: 'maktx', title: '产品名称'},
                            //{field: 'matnr', title: '物质编码'},
                            //{field: 'maktx', title: '产品名称'},
                            {field: 'specs', title: '规格型号'},
                            {field: 'batch', title: '批次号'},
                            {field: 'model', title: '卷号'},
                            //{field: 'model', title: '卷号'},
                            {field: 'anfme', title: '出库数量'},
                            {field: 'deadTime', title: '出库日期'},
                            //{field: 'deadTime', title: '出库日期'},
                            {field: 'inspect$', title: '复核状态'},
                            {field: 'threeCode', title: '复核人'},
                            {field: 'memo', title: '复核备注'}