优化修改理货的接口

ccs_base/wizard/add_exception_info_wizard.py

@@ -43,10 +43,10 @@ class AddExceptionInfoWizard(models.TransientModel):
             'action_type': action_type,
             'big_package_ids': [(6, 0, big_package_ids)],
             'exception_ids': [(6, 0, exception_ids)],
-            'send_email': True,
+            'send_email': send_email,
             'email_language': email_language,
         }
-        return vals
+        return self.create(vals)
 
     def confirm(self):
         for record in self:

ccs_connect_tiktok/models/cc_bill_loading.py

@@ -429,18 +429,31 @@ class CcBigPackage(models.Model):
         """
         理货 tally/尾程交接 handover
         """
+        
         action_type = kwargs.get('action_type')
+        for item in self:
+            if action_type == 'tally' and item.tally_state == 'unprocessed_goods':
+                # 更新理货信息
+                self._update_info(item, kwargs, 'tally')
+            elif action_type == 'handover' and item.tally_state != 'handover_completed':
+                # 更新交接信息
+                self._update_info(item, kwargs, 'handover')
+
+    def _update_info(self, item, kwargs, action_type):
+        """
+        更新信息的通用方法
+        """
         if action_type == 'tally':
-            if self.tally_state == 'unprocessed_goods':
             if kwargs.get('tally_state'):
-                    self.tally_state = kwargs['tally_state']
+                item.tally_state = kwargs['tally_state']
             if kwargs.get('tally_user_id'):
-                    self.tally_user_id = kwargs['tally_user_id']
+                item.tally_user_id = kwargs['tally_user_id']
             if kwargs.get('tally_time'):
-                    self.tally_time = kwargs['tally_time']
+                item.tally_time = kwargs['tally_time']
         elif action_type == 'handover':
-            if self.tally_state != 'handover_completed':
+            if kwargs.get('tally_state'):
+                item.tally_state = kwargs['tally_state']
             if kwargs.get('tally_user_id'):
-                    self.delivery_user_id = kwargs['tally_user_id']
+                item.delivery_user_id = kwargs['tally_user_id']
             if kwargs.get('tally_time'):
-                    self.delivery_time = kwargs['tally_time']
+                item.delivery_time = kwargs['tally_time']