Merge remote-tracking branch 'origin/jshdasrs' into jshdasrs

lty

3 天以前 c6e32e5da5d30ce2f74f0e32c3290d421c0951f2

 src/main/java/com/zy/asrs/task/OrderToSortLineScheduler.java

@@ -31,6 +31,8 @@
    @Autowired
    private OrderToLineHandler orderToLineHandler;
    @Autowired
    private MatService matService;
    @Autowired
    private BasArmMastSignService basArmMastSignService;

    @Scheduled(cron = "0/3 * * * * ? ")
@@ -63,16 +65,18 @@
                    }
                    List<ItemUtilParam.Item> items = new ArrayList<>();
                    for (OrderDetlPakin orderDetl:orderDetlPakinList){
                        Integer number =  basArmRulesService.getNumber(orderDetl.getWeight(),orderDetl.getVolume(),orderDetl.getManLength(),orderDetl.getWidth(),orderDetl.getHeight());
                        Mat mat = matService.selectByMatnr(orderDetl.getMatnr());
                        Integer number =  basArmRulesService.getNumber(mat.getWeight(),mat.getVolume(),mat.getManLength(),mat.getWidth(),mat.getHeight());
                        if (number == null) {
                            BasArmRules basArmRules = new BasArmRules();
                            basArmRules.setMaterialHeight(orderDetl.getHeight());
                            basArmRules.setMaterialWeight(orderDetl.getWeight());
                            basArmRules.setMaterialLength(orderDetl.getManLength());
                            basArmRules.setMaterialWidth(orderDetl.getWidth());
                            basArmRules.setMaterialHeight(mat.getHeight());
                            basArmRules.setMaterialWeight(mat.getWeight());
                            basArmRules.setMaterialLength(mat.getManLength());
                            basArmRules.setMaterialWidth(mat.getWidth());
                            basArmRulesService.insert(basArmRules);
                            return;
                        } else if (number == 0){

                            Integer status =  basArmRulesService.getStatus(orderDetl.getWeight(),orderDetl.getVolume(),orderDetl.getManLength(),orderDetl.getWidth(),orderDetl.getHeight());
                            if (!Cools.isEmpty(status) && status == 2){
                                continue;