#

yxFwq

2 天以前 04908371e0955028fadedfa73d94cbe270474344

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

@@ -1247,11 +1247,13 @@
        ArrayList<LocDetl> locDetlArrayList = new ArrayList<>();
        Wrapper<LocDetl> wrapper = new EntityWrapper<LocDetl>()
                .eq("matnr", param.getMatnr())
                .eq("weight", param.getWeight())
                .orderBy("batch", true);
        if (param.getDevNo() == 536) {
                .eq("weight", param.getWeight());
        if (param.getDevNo() == 536){
            wrapper.eq("model", param.getModel())
                    .eq("specs", param.getOrderNo());
                    .eq("specs", param.getOrderNo())
                    .orderBy("appe_time", true);
        } else {
            wrapper.orderBy("batch", true);
        }

        List<LocDetl> locDetls = locDetlService.selectList(wrapper);
@@ -1274,12 +1276,16 @@
            Wrapper<LocDetl> locDetlWrapper = new EntityWrapper<LocDetl>().eq("matnr", param.getMatnr())
                    .lt("weight", param.getWeight() + mat.getUnits())
                    .and()
                    .gt("weight", param.getWeight())
                    .orderBy("batch", true)
                    .orderBy("weight", true);
                    .gt("weight", param.getWeight());
            if (param.getDevNo() == 536){
                locDetlWrapper.eq("model", param.getModel())
                        .eq("specs", param.getOrderNo());
                        .eq("specs", param.getOrderNo())
                        .orderBy("appe_time", true)
                        .orderBy("weight", true);
            } else {
                locDetlWrapper
                        .orderBy("batch", true)
                        .orderBy("weight", true);
            }
            locDetls = locDetlService.selectList(locDetlWrapper);
            if (locDetls.isEmpty()){
@@ -1300,12 +1306,16 @@
            Wrapper<LocDetl> locDetlWrapper = new EntityWrapper<LocDetl>().eq("matnr", param.getMatnr())
                    .gt("weight", param.getWeight() - mat.getUnits())
                    .and()
                    .lt("weight", param.getWeight())
                    .orderBy("batch", true)
                    .orderBy("weight", false);
                    .lt("weight", param.getWeight());
            if (param.getDevNo() == 536){
                locDetlWrapper.eq("model", param.getModel())
                        .eq("specs", param.getOrderNo());
                        .eq("specs", param.getOrderNo())
                        .orderBy("appe_time", true)
                        .orderBy("weight", false);
            } else {
                locDetlWrapper
                        .orderBy("batch", true)
                        .orderBy("weight", false);
            }
            locDetls = locDetlService.selectList(locDetlWrapper);