#

yxFwq

23 小时以前 7714207440d4774b84b6490406bdebf228c1fee6

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

@@ -1249,9 +1249,9 @@
                .eq("matnr", param.getMatnr())
                .eq("weight", param.getWeight());
        if (param.getDevNo() == 536){
            wrapper.eq("model", param.getTaskNo())
                    .eq("specs", param.getOrderNo())
                    .orderBy("appe_time", true);
//            .eq("model", param.getTaskNo())
//                    .eq("specs", param.getOrderNo())
            wrapper.orderBy("appe_time", true);
        } else {
            wrapper.orderBy("batch", true);
        }
@@ -1278,8 +1278,9 @@
                    .and()
                    .gt("weight", param.getWeight());
            if (param.getDevNo() == 536){
                locDetlWrapper.eq("model", param.getTaskNo())
                        .eq("specs", param.getOrderNo())
//                        .eq("model", param.getTaskNo())
//                        .eq("specs", param.getOrderNo())
                locDetlWrapper
                        .orderBy("appe_time", true)
                        .orderBy("weight", true);
            } else {
@@ -1308,8 +1309,9 @@
                    .and()
                    .lt("weight", param.getWeight());
            if (param.getDevNo() == 536){
                locDetlWrapper.eq("model", param.getTaskNo())
                        .eq("specs", param.getOrderNo())
//                        .eq("model", param.getTaskNo())
//                        .eq("specs", param.getOrderNo())
                locDetlWrapper
                        .orderBy("appe_time", true)
                        .orderBy("weight", false);
            } else {