#订单导入等界面功能修改

lty

6 天以前 3954c28bb43412328694afd56bbf3946be60749a

#订单导入等界面功能修改

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

@@ -100,8 +100,9 @@
                    locDto.setLocNo(locDetls.get(0).getLocNo());
//                    wrkDetl.setMatnr(roll.getSpecs()); // 规格
//                    wrkDetl.setMaktx(roll.getSpecs()); //规格
//                    locDto.setBatch(locDetl.getBatch()); // 箱号
//                    locDto.setModel(locDetl.getModel()); // 卷号
                    locDto.setUnit(locDetls.get(0).getUnit()); // 箱号
                    locDto.setModel(locDetls.get(0).getModel()); // 卷号
                    locDto.setThreeCode(locDetls.get(0).getThreeCode());
                    locDto.setBrand(orderDetl.getBrand()); // 包装组号
//                    locDto.setOrigin(locDetl.getOrigin()); // 木箱在托盘位置
//                    locDto.setWeight(locDetl.getWeight()); // 净重

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

@@ -17,7 +17,12 @@
    @ExcelProperty(value = "出库单号/单据类型/客户名称/备注/目标库位",index = 1)
    private String column2;

    @ExcelProperty(value = "目标巷道",index = 2)
    @ExcelProperty(value = "目标巷道/客户名称",index = 2)
    private String column3;

    @ExcelProperty(value = "备注",index = 3)
    private String column4;



}

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

@@ -69,7 +69,7 @@
    public void invoke(ImportOrderDto data, AnalysisContext context) {
        log.info("解析到第 {} 条数据:{}", ++count, JSON.toJSONString(data));
        list.add(data);
        if (context.getCurrentRowNum() == 5) {
        if (context.getCurrentRowNum() == 3) {
            String time = DateUtils.convert(new Date(),DateUtils.yyyyMMddHHmmss_F);
            Order order2 = orderService.selectByNo(list.get(0).getColumn2()); // 订单号
            if(order2 != null) {
@@ -86,8 +86,8 @@
            order.setOrderNo(orderNo);
            order.setOrderTime(time);
            order.setDocType(docType.getDocId());
            order.setCstmrName(Cools.isEmpty(list.get(2).getColumn2()) ? "" : list.get(2).getColumn2()); // 客户名称
            order.setMemo(Cools.isEmpty(list.get(3).getColumn2()) ? "" : list.get(3).getColumn2()); // 备注
//            order.setCstmrName(Cools.isEmpty(list.get(2).getColumn2()) ? "" : list.get(2).getColumn2()); // 客户名称
//            order.setMemo(Cools.isEmpty(list.get(3).getColumn2()) ? "" : list.get(3).getColumn2()); // 备注
            order.setSettle(1L);
            order.setStatus(1);
            order.setCreateBy(userId);
@@ -178,6 +178,8 @@
                }
            } else {
                orderDetl.setBrand(importOrderDto.getColumn1());
                orderDetl.setSupp(importOrderDto.getColumn3());
                orderDetl.setMemo(importOrderDto.getColumn4());
            }

            orderDetl.setBatch("");

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

@@ -47,6 +47,8 @@
    private Integer staNo;
    private Integer tkType;

    private String unit;
    private String threeCode;
    public LocDto() {
    }

@@ -109,6 +111,8 @@
        this.volume = locDetl.getVolume();
        this.price = locDetl.getPrice();
        this.origin = locDetl.getOrigin();
        this.unit = locDetl.getUnit();
        this.threeCode = locDetl.getThreeCode();
    }

    public String getTitle() {

 src/main/resources/mapper/OrderDetlMapper.xml

@@ -186,7 +186,7 @@
    </insert>
    <insert id="batchDetls">
        INSERT INTO
        man_order_detl(brand,batch,order_id,order_no,specs,model,be_batch,create_by,create_time,status,qty,anfme)
        man_order_detl(brand,batch,order_id,order_no,specs,model,be_batch,create_by,create_time,status,qty,anfme,supp,memo)
        VALUES
        <foreach collection="list" item="item" index="index" separator=",">
            (
@@ -201,7 +201,9 @@
            #{item.createTime},
            #{item.status},
            #{item.qty},
            #{item.anfme}
            #{item.anfme},
             #{item.supp},
             #{item.memo}
            )</foreach>
    </insert>


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

@@ -248,8 +248,8 @@
                            {type: 'numbers'},
                            {field: 'brand', title: '包装组号', width: 160},
                            // {field: 'maktx', title: '商品名称', width: 160},
                            // {field: 'batch', title: '箱号'},
                            // {field: 'anfme', title: '数量'},
                            {field: 'supp', title: '客户名称'},
                            {field: 'memo', title: '备注'},
                            // {field: 'workQty', title: '作业数量'},

                            // {field: 'unit', title: '单位'},

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

@@ -38,11 +38,11 @@
            // ,{field: 'specs', align: 'center',title: '接头'}
            // ,{field: 'anfme', align: 'center',title: '数量'}
            ,{field: 'brand', align: 'center',title: '包装组号'}
            ,{field: 'supp', align: 'center',title: '客户名称', hide: false}
            ,{field: 'memo', align: 'center',title: '备注', hide: false}
            ,{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: '卷号', hide: false}
            ,{field: 'threeCode', align: 'center',title: '合格否', hide: false}
            // ,{field: 'unit', align: 'center',title: '单位', hide: true}
            // ,{field: 'barcode', align: 'center',title: '商品条码', hide: true}
            // ,{field: 'supplier', align: 'center',title: '供应商'}
@@ -161,8 +161,17 @@
                                    // {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: 'model', title: '卷号', align: 'center', hide: false},
                                    {field: 'unit', title: '箱号', align: 'center',hide:false},
                                    {field: 'model', title: '卷号', align: 'center', hide: false},
                                    {
                                        field: 'threeCode',
                                        align: 'center',
                                        title: '合格否',
                                        hide: false,
                                        templet: function(d) {
                                            return d.threeCode ? d.threeCode : '待判';
                                        }
                                    },
                                    // {field: 'specs', title: '接头', align: 'center'},
                                    {field: 'brand', align: 'center',title: '包装组号', merge: true, hide: false},
                                    // {field: 'brand$', align: 'center',title: '木箱类型', hide: false},