Accept Merge Request #1125: (feature/sf物流方面缺陷与优化 -> develop)

Merge Request: 优化订单状态条件及物流的容错处理

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1125?initial=true

sf_bf_connect/models/jd_eclp.py

@@ -175,7 +175,7 @@ class JdEclp(models.Model):
                 'type': 'success',
                 'message': '物流下单成功',
                 'sticky': False,
-                'next': {'type': 'ir.actions.client', 'tag': 'soft_reload'}
+                'next': {'type': 'ir.actions.client', 'tag': 'reload'}
             }
         }
 

sf_manufacturing/models/mrp_production.py

@@ -111,7 +111,7 @@ class MrpProduction(models.Model):
                 production.state = 'progress'
 
             # # 新添加的状态逻辑
-            if production.state == 'to_close' and production.schedule_state == '未排':
+            if (production.state == 'to_close' or production.state == 'progress') and production.schedule_state == '未排':
                 production.state = 'confirmed'
             elif production.state == 'to_close' and production.schedule_state == '已排':
                 production.state = 'pending_cam'