#

whycq

2024-01-12 ef106c9a6002872892de9db355ef7cd37512dba5

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

@@ -210,10 +210,6 @@
            LocMast locMast = locMastService.selectById(dto.getLocNo());

            Integer outSta = staNo.getDevNo();
            //2号堆垛机全板出库站指定为204站，拣料站指定为202
            if(locMast.getCrnNo()==2){
                outSta = ioType == 101 ? 204 : 202;
            }

            // 获取路径
            StaDesc staDesc = staDescService.queryCrnStn(ioType, locMast.getCrnNo(), outSta);
@@ -904,26 +900,27 @@
                    }
                    // 生成新的出库作业
//                        stockOutRe(wrkMast, wrkDetls);
                }
                //修改订单主表状态,没有作业数量时才可以修改
                boolean flag = true;
                List<OrderDetl> orderDetls = orderDetlService.selectList(new EntityWrapper<OrderDetl>().eq("order_no",wrkDetl.getOrderNo()));
                for(OrderDetl orderDetl : orderDetls){
                    if(orderDetl.getWorkQty() > 0){
                        flag = false;
                    //修改订单主表状态,没有作业数量时才可以修改
                    boolean flag = true;
                    List<OrderDetl> orderDetls = orderDetlService.selectList(new EntityWrapper<OrderDetl>().eq("order_no",wrkDetl.getOrderNo()));
                    for(OrderDetl orderDetl : orderDetls){
                        if(orderDetl.getWorkQty() > 0){
                            flag = false;
                        }
                    }
                    if(flag){
                        Order order = orderService.selectOne(new EntityWrapper<Order>().eq("order_no",wrkDetl.getOrderNo()));
                        if(!Cools.isEmpty(order) && order.getSettle()==2){
                            order.setSettle(1L);
                            order.setUpdateBy(userId);
                            order.setUpdateTime(now);
                        }
                        if(!orderService.update(order,new EntityWrapper<Order>().eq("order_no",wrkDetl.getOrderNo()))){
                            throw new CoolException("修改订单状态失败");
                        }
                    }
                }
                if(flag){
                    Order order = orderService.selectOne(new EntityWrapper<Order>().eq("order_no",wrkDetl.getOrderNo()));
                    if(!Cools.isEmpty(order) && order.getSettle()==2){
                        order.setSettle(1L);
                        order.setUpdateBy(userId);
                        order.setUpdateTime(now);
                    }
                    if(!orderService.update(order,new EntityWrapper<Order>().eq("order_no",wrkDetl.getOrderNo()))){
                        throw new CoolException("修改订单状态失败");
                    }
                }

            }

        }