#

yxFwq

14 小时以前 3059d50796c6b497b930933e9d9d2c5a812bb3c7

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

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