#

yxFwq

2024-12-09 9c98d630866b80627ae21ca539a8c3776baa7e73

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

@@ -5,6 +5,7 @@
import com.zy.asrs.entity.LocDetlRullUpDetail;
import com.zy.asrs.entity.Order;
import com.zy.asrs.entity.OrderDetl;
import com.zy.asrs.entity.WrkDetl;
import com.zy.asrs.service.LocDetlRullUpDetailService;
import com.zy.asrs.service.OrderService;
import io.swagger.models.License;
@@ -40,7 +41,7 @@
        private String position;//   是   字符串   木箱位置（拆垛时需要） origin             //上传
        private Double weight;//   是   小数型   重量                                   //上传
        private Integer anfme;//      数字型   木箱中铜箔数量                          //上传
        private String batch;//      字符串   箱号                                                               //PDA
        private String batch;//      字符串   批次                                                               //PDA
        private String specs;//      字符串   规格
        private String model;//      字符串   规格
//        private String standby4;//      卷信息Id                                   //上传
@@ -58,40 +59,25 @@

    public TrussCombParam(){}

    public TrussCombParam(TrussCombParam trussCombParam, Order order, List<OrderDetl> orderDetlList){
        LocDetlRullUpDetailService locDetlRullUpDetailService = SpringUtils.getBean(LocDetlRullUpDetailService.class);

        this.barcode = trussCombParam.getBarcode();
    public TrussCombParam( WrkDetl wrkDetl,Integer staEnd){
        this.barcode = wrkDetl.getZpallet();
        this.staStart = 147;
        this.palletizingNo2 = trussCombParam.getPalletizingNo2();
        this.staEnd = trussCombParam.getStaEnd();
        this.boxType = orderDetlList.get(0).getBrand();
        this.uuid = trussCombParam.getBarcode();
        this.orderNo = trussCombParam.getOrderNo();
        this.palletizingNo2 = staEnd;
        this.staEnd = staEnd;
        this.boxType = wrkDetl.getBrand();
        this.uuid = wrkDetl.getBarcode();
        this.orderNo = wrkDetl.getOrderNo();
        List<MatList> matLists = new ArrayList<>();
        for (OrderDetl orderDetl:orderDetlList){
            MatList matList = new MatList();
            matList.setMatnr(orderDetl.getMatnr());
            matList.setMaktx(orderDetl.getMaktx());
            matList.setAnfme(orderDetl.getAnfme().intValue());
            matList.setBatch(orderDetl.getBatch());
            matList.setBoxNo(orderDetl.getBatch());
            matList.setPosition("1");
            matList.setWeight(orderDetl.getWeight());
            matList.setSpecs(orderDetl.getSpecs());
            List<MatDetlList> matDetlLists= new ArrayList<>();
            List<LocDetlRullUpDetail> locDetlRullUpDetails = locDetlRullUpDetailService.selectList(new EntityWrapper<LocDetlRullUpDetail>().eq("uuid", orderDetl.getUnit()));
            for (LocDetlRullUpDetail locDetlRullUpDetail:locDetlRullUpDetails){
                MatDetlList matDetlList = new MatDetlList();
                matDetlList.setBoxNoDetl(locDetlRullUpDetail.getRollNo());
                matDetlList.setWeightDetl(locDetlRullUpDetail.getRollWeight());
                matDetlList.setBatchDetl(locDetlRullUpDetail.getStandby1());
                matDetlList.setSpecsDetl(locDetlRullUpDetail.getStandby2());
                matDetlLists.add(matDetlList);
            }
            matList.setMatDetlList(matDetlLists);
            matLists.add(matList);
        }
        MatList matList = new MatList();
        matList.setMatnr(wrkDetl.getMatnr());
        matList.setMaktx(wrkDetl.getMaktx());
        matList.setAnfme(wrkDetl.getAnfme().intValue());
        matList.setBatch(wrkDetl.getBatch());
        matList.setBoxNo(wrkDetl.getBatch());
        matList.setPosition(wrkDetl.getOrigin());
        matList.setWeight(wrkDetl.getWeight());
        matLists.add(matList);

        this.matList = matLists;
    }