1

zhang

5 天以前 99b819fb7354c86ef4111a1b3465f63d6d263fd7

 src/main/java/com/zy/asrs/controller/OrderDetlController.java

@@ -17,6 +17,7 @@
import com.zy.asrs.mapper.AgvWrkDetlMapper;
import com.zy.asrs.service.*;
import com.zy.common.web.BaseController;
import com.zy.system.service.ConfigService;
import lombok.Synchronized;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -44,6 +45,8 @@

    @Autowired
    private AgvWrkDetlMapper agvWrkDetlMapper;
    @Autowired
    private ConfigService configService;

    @RequestMapping(value = "/orderDetl/{id}/auth")
    @ManagerAuth
@@ -216,7 +219,17 @@
                        docIds.add(pakin.getDocId());
                    }
                }
                wrapper.andNew().like("matnr", "401", SqlLike.RIGHT).or().like("matnr", "402", SqlLike.RIGHT).andNew().in("source", docIds);
                wrapper.in("source", docIds);
                List<String> m = configService.getMatCode();
                if (!Cools.isEmpty(m)) {
                    for (int i = 0; i < m.size(); i++) {
                        if (i == 0) {
                            wrapper.andNew().like("matnr", m.get(i), SqlLike.RIGHT);
                        } else {
                            wrapper.or().like("matnr", m.get(i), SqlLike.RIGHT);
                        }
                    }
                }
                flag = true;
            } else {
                wrapper.in("source", split);