diff --git a/jikimo_hide_options/models/models.py b/jikimo_hide_options/models/models.py index 84aee828..8f30543c 100644 --- a/jikimo_hide_options/models/models.py +++ b/jikimo_hide_options/models/models.py @@ -324,4 +324,4 @@ def unlink(self): BaseModel._create = _create -BaseModel.unlink = unlink \ No newline at end of file +# BaseModel.unlink = unlink \ No newline at end of file diff --git a/sf_base/models/common.py b/sf_base/models/common.py index 65dfe13d..9553c60c 100644 --- a/sf_base/models/common.py +++ b/sf_base/models/common.py @@ -96,7 +96,7 @@ class MrsProductionProcess(models.Model): # workcenter_ids = fields.Many2many('mrp.workcenter', 'rel_workcenter_process', required=True) processing_day = fields.Float('加工天数/d') travel_day = fields.Float('路途天数/d') - + sequence = fields.Integer('排序') # class MrsProcessingTechnology(models.Model): # _name = 'sf.processing.technology' @@ -148,6 +148,7 @@ class MrsProductionProcessParameter(models.Model): processing_day = fields.Float('加工天数/d') travel_day = fields.Float('路途天数/d') active = fields.Boolean('有效', default=True) + processing_mm = fields.Char('加工厚度/mm') def name_get(self): result = [] diff --git a/sf_base/views/common_view.xml b/sf_base/views/common_view.xml index 533a3e04..334eaa32 100644 --- a/sf_base/views/common_view.xml +++ b/sf_base/views/common_view.xml @@ -16,7 +16,7 @@ sf.production.process.parameter -
+

@@ -33,11 +33,12 @@ + - + @@ -52,7 +53,7 @@ - + @@ -140,7 +141,7 @@ sf.production.process.category - + @@ -163,7 +164,8 @@ sf.production.process - + + @@ -174,7 +176,7 @@ sf.production.process - +

@@ -192,11 +194,11 @@ - - - + + + - + diff --git a/sf_bf_connect/models/process_status.py b/sf_bf_connect/models/process_status.py index 9c939edd..d0657a83 100644 --- a/sf_bf_connect/models/process_status.py +++ b/sf_bf_connect/models/process_status.py @@ -31,7 +31,7 @@ class StatusChange(models.Model): res = super(StatusChange, self).action_confirm() # 原有方法执行后,进行额外的操作(如调用外部API) - process_start_time = str(datetime.now()) + process_start_time = datetime.now().strftime('%Y-%m-%d %H:%M:%S') config = self.env['res.config.settings'].get_values() json1 = { 'params': { diff --git a/sf_mrs_connect/models/sync_common.py b/sf_mrs_connect/models/sync_common.py index e37d460a..e812bd03 100644 --- a/sf_mrs_connect/models/sync_common.py +++ b/sf_mrs_connect/models/sync_common.py @@ -329,6 +329,7 @@ class sfProductionProcess(models.Model): production_process.processing_day = item['processing_day'] production_process.travel_day = item['travel_day'] production_process.active = item['active'] + production_process.sequence = item['sequence'] else: self.create({ "name": item['name'], @@ -338,6 +339,7 @@ class sfProductionProcess(models.Model): "processing_day": item['processing_day'], "travel_day": item['travel_day'], "active": item['active'], + "sequence": item['sequence'] }) else: raise ValidationError("表面工艺认证未通过") @@ -365,6 +367,7 @@ class sfProductionProcess(models.Model): "processing_day": item['processing_day'], "travel_day": item['travel_day'], "active": item['active'], + "sequence": item['sequence'] }) else: production_process.name = item['name'] @@ -373,6 +376,7 @@ class sfProductionProcess(models.Model): production_process.processing_day = item['processing_day'] production_process.travel_day = item['travel_day'] production_process.active = item['active'] + production_process.sequence = item['sequence'] else: raise ValidationError("表面工艺认证未通过") @@ -1088,6 +1092,7 @@ class sfProductionProcessParameter(models.Model): production_process_parameter.process_id = process.id production_process_parameter.materials_model_ids = self.env['sf.materials.model'].search( [('materials_no', 'in', item['materials_model_ids_codes'])]) + production_process_parameter.processing_mm = item['processing_mm'] else: self.create({ "name": item['name'], @@ -1099,6 +1104,7 @@ class sfProductionProcessParameter(models.Model): "process_id": process.id, "materials_model_ids": self.env['sf.materials.model'].search( [('materials_no', 'in', item['materials_model_ids_codes'])]), + "processing_mm": item['processing_mm'] }) else: raise ValidationError("表面工艺可选参数认证未通过") # 定时同步表面工艺 @@ -1129,6 +1135,7 @@ class sfProductionProcessParameter(models.Model): "process_id": process.id, 'materials_model_ids': self.env['sf.materials.model'].search( [('materials_no', 'in', item['materials_model_ids_codes'])]), + 'processing_mm': item['processing_mm'] }) else: production_process_parameter.name = item['name'] @@ -1139,6 +1146,7 @@ class sfProductionProcessParameter(models.Model): production_process_parameter.materials_model_ids = self.env['sf.materials.model'].search( [('materials_no', 'in', item['materials_model_ids_codes'])]) production_process_parameter.active = item['active'] + production_process_parameter.processing_mm = item['processing_mm'] else: raise ValidationError("表面工艺可选参数认证未通过") diff --git a/sf_sale/views/sale_order_view.xml b/sf_sale/views/sale_order_view.xml index d5af8ebd..73996954 100644 --- a/sf_sale/views/sale_order_view.xml +++ b/sf_sale/views/sale_order_view.xml @@ -50,6 +50,7 @@ ('check_status', '!=', 'approved'),('state', 'in', ['draft','cancel']),'&','&',('check_status', '=', 'approved'),('state', 'in', ['sale','cancel']),('delivery_status', '!=', False)]} + 拒绝接单 1 diff --git a/sf_tool_management/views/tool_base_views.xml b/sf_tool_management/views/tool_base_views.xml index 2fc9d5ba..390fcb15 100644 --- a/sf_tool_management/views/tool_base_views.xml +++ b/sf_tool_management/views/tool_base_views.xml @@ -842,21 +842,21 @@ - - - - - - -