#

Junjie

2025-05-20 08f58a6d5a2038117a1f215772f095a6e267ad9b

 src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java

@@ -463,17 +463,19 @@



                    Boolean finsihed = orderDetlService.checkAllDetlFinish(wrkDetls101.get(0).getOrderNo());
                    if (finsihed) {
                        Boolean mastFinished = wrkMastService.checkFinishByOrder(wrkDetls101.get(0).getOrderNo());
                        if (mastFinished) {
                            Order order = orderService.selectByNo(wrkDetls101.get(0).getOrderNo());
                            if (!Cools.isEmpty(order)) {
                                orderService.updateSettle(order.getId(),4L,1L);

                            }
                        }
                    }
//                    Boolean finsihed = orderDetlService.checkAllDetlFinish(wrkDetls101.get(0).getOrderNo());
//                    if (finsihed) {
//                        Boolean mastFinished = wrkMastService.checkFinishByOrder(wrkDetls101.get(0).getOrderNo());
//                        if (mastFinished) {
//                            Order order = orderService.selectByNo(wrkDetls101.get(0).getOrderNo());
//                            if (!Cools.isEmpty(order)) {
//                                order.setMemo("0");//状态转换成开始下推
//                                orderService.updateById(order);
//                                orderService.updateSettle(order.getId(),4L,1L);
//
//                            }
//                        }
//                    }


                    break;