*

lsh

23 小时以前 85fbeb9e06932acd931695c66f26f68af7cfbf86

*

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

@@ -58,6 +58,7 @@
        private Double volume;
        private Double price;
        private String color;
        private Integer danger;

        public void setAnfme(Double anfme){
            this.anfme=anfme;

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

@@ -266,6 +266,7 @@
                orderDetl.setSpecs(locDetl.getSpecs());//规格
                orderDetl.setBrand(locDetl.getBrand());//木箱类型
                orderDetl.setBarcode(locDetl.getZpallet());//木箱类型
                orderDetl.setDanger(locDetl.getDanger());//木箱类型
                orderDetl.setWeight(locDetl.getWeight());
//                orderDetl.setWorkQty(locDetl.getAnfme());
                orderDetl.setWorkQty(0.0);

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

@@ -222,6 +222,7 @@
                locDetl.setOrigin(locDto.getOrigin());
                locDetl.setWeight(locDto.getWeight());
                locDetl.setMemo(locDto.getMemo());
                locDetl.setDanger(locDto.getDanger());

                locDetls.add(locDetl);
            }

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

@@ -48,6 +48,7 @@

    private Integer staNo;
    private Integer tkType;
    private Integer danger;

    public LocDto() {
    }
@@ -124,6 +125,7 @@
        this.price = locDetl.getPrice();
        this.origin = locDetl.getOrigin();
        this.memo = locDetl.getMemo();
        this.danger = locDetl.getDanger();
    }

    public String getTitle() {

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

@@ -264,6 +264,7 @@
                            // {field: 'inQty', title: '已入库量'},
                            // {field: 'color', title: '颜色'},
                            {field: 'specs', title: '接头'},
                            {field: 'danger$', title: '待判'},
                            {field: 'qty$', title: '状态', style: 'font-weight: bold'},
                            {field: 'source$', title: '是否确认', style: 'font-weight: bold'}
                        ]],