解决合并develop冲突

2025-07-07 10:03:09 +08:00
parent 86bacee926 20df1c0365
commit bd6f35a16f
25 changed files with 714 additions and 441 deletions
--- a/sf_demand_plan/models/stock_route.py
+++ b/sf_demand_plan/models/stock_route.py
@@ -19,7 +19,11 @@ class SfStockRoute(models.Model):
                    [('supply_method', 'in', stock_route_group)])
                if demand_plan_ids:
                    sr.demand_plan_ids = demand_plan_ids.ids
+<<<<<<< HEAD
                    continue
+=======
+                    break
+>>>>>>> develop
            sr.demand_plan_ids = None

    # def name_get(self):