yangdamao 1 سال پیش
والد
کامیت
11a126233b

+ 9 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/top/goods/service/impl/TopOldOrderServiceImpl.java

@@ -5173,6 +5173,15 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
                                 //账款未收完 不能完单
                                 throw new CustomException(String.format("订单审核状态未通过,不能完单【%s】", orderSn));
                             }
+                            if (order.getOrderFrom() == 1) {
+                                //新系统
+                                orderService.update(new LambdaUpdateWrapper<Order>()
+                                        .set(Order::getFinishStatus, bo.getFinishStatus())//未完单
+                                        .set(Order::getDivideStatus,2)//待审核
+                                        .eq(Order::getOrderSn, orderSn)
+                                        .eq(Order::getTenantId, order.getTenantId()));
+                                return;
+                            }
                             //成本设置项
                             String costJson = order.getCostJson();
                             if (StringUtils.isBlank(costJson)) {