Merge remote-tracking branch 'refs/remotes/origin/stasrs' into stasrs

Junjie

2023-03-14 163bdd3a71de83b9e36340be3fe6380b6758e4fd

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

@@ -349,7 +349,10 @@
                        Boolean mastFinished = wrkMastService.checkFinishByOrder(wrkDetls101.get(0).getOrderNo());
                        if (mastFinished) {
                            Order order = orderService.selectByNo(wrkDetls101.get(0).getOrderNo());
                            orderService.updateSettle(order.getId(),4L,1L);
                            if (!Cools.isEmpty(order)) {
                                orderService.updateSettle(order.getId(),4L,1L);

                            }
                        }
                    }