#

1

1 天以前 c78e0ff5c908de0b15348c9e59db43861a1252c0

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

@@ -35,7 +35,7 @@
    @Autowired
    private BasArmMastSignService basArmMastSignService;

//    @Scheduled(cron = "0/3 * * * * ? ")
    @Scheduled(cron = "0/3 * * * * ? ")
    private void orderToSortLine() {
        //获取未下发单据
        List<String> orderNos = orderPakinService.AllStatusSatisfyOrder(0);
@@ -46,6 +46,13 @@

        //遍历单据
        for (String orderNo : orderNos) {
            OrderPakin orderPakin = orderPakinService.selectOne(new EntityWrapper<OrderPakin>().eq("order_no",orderNo));
            if(orderPakin.getDocType() == 16){
                orderPakin.setMoveStatus(1);
                orderPakinService.updateById(orderPakin);
                continue;
            }

            try{
                List<OrderDetlPakin> orderDetlPakinListAll = orderDetlPakinService.selectList(new EntityWrapper<OrderDetlPakin>().eq("order_no",orderNo).eq("inspect",0));
                if (orderDetlPakinListAll.size()<1){
@@ -69,15 +76,15 @@
                        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());
                            Integer status =  basArmRulesService.getStatus(mat.getWeight(),mat.getVolume(),mat.getManLength(),mat.getWidth(),mat.getHeight());
                            if (!Cools.isEmpty(status) && status == 2){
                                continue;
                            } else {