From 5a60eed5b19dd2c44c86007493a6dce2d3d5d24c Mon Sep 17 00:00:00 2001 From: hujiaying Date: Wed, 14 Aug 2024 12:48:40 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E8=81=94=E8=B0=83=E5=8A=A0=E5=B7=A5?= =?UTF-8?q?=E8=AE=A2=E5=8D=95=E4=BB=8E=E5=BE=85=E7=A1=AE=E8=AE=A4=E5=88=B0?= =?UTF-8?q?=E5=8A=A0=E5=B7=A5=E4=B8=AD=EF=BC=8C=E7=BB=8F=E8=BF=87=E7=9A=84?= =?UTF-8?q?=E5=86=85=E9=83=A8=E7=AE=A1=E7=90=86=E7=B3=BB=E7=BB=9F=EF=BC=8C?= =?UTF-8?q?bfm,sf=E6=8E=A5=E5=8F=A3=E6=B5=8B=E8=AF=95=E8=81=94=E8=B0=83?= =?UTF-8?q?=EF=BC=8C=E4=BF=AE=E6=94=B9=E5=AF=B9=E5=BA=94=E6=8E=A5=E6=94=B6?= =?UTF-8?q?=E7=9A=84=E5=8F=82=E6=95=B0=E5=80=BC=E6=94=B9=E5=8F=98=E3=80=82?= =?UTF-8?q?=E9=87=87=E8=B4=AD=E8=AE=A2=E5=8D=95=E5=8A=A0=E5=B7=A5=E4=B8=AD?= =?UTF-8?q?=E5=90=8C=E6=AD=A5=E5=88=B0=E5=86=85=E9=83=A8=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E5=A4=B1=E8=B4=A5=EF=BC=8C=E5=88=99=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E5=88=B0=E5=90=8C=E6=AD=A5=E8=A1=A8=EF=BC=8C=E7=94=B1?= =?UTF-8?q?=E5=90=8C=E6=AD=A5=E8=A1=A8=E5=AE=9A=E6=97=B6=E5=8F=91=E8=B5=B7?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E9=87=8D=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sf_bf_connect/models/process_status.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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': { From deef246a6d6b9a4f49d576266e4b7fb8701da770 Mon Sep 17 00:00:00 2001 From: hujiaying Date: Mon, 26 Aug 2024 11:10:52 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=A1=A8=E9=9D=A2?= =?UTF-8?q?=E5=B7=A5=E8=89=BA=E5=AD=97=E6=AE=B5=E5=90=8C=E6=AD=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sf_base/models/common.py | 3 ++- sf_mrs_connect/models/sync_common.py | 8 ++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) 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_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("表面工艺可选参数认证未通过") From 89cb61f244ce9c145fa8d6ffc257e89ecf0c308d Mon Sep 17 00:00:00 2001 From: hujiaying Date: Mon, 26 Aug 2024 12:47:15 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=90=8C=E6=AD=A5?= =?UTF-8?q?=E8=A1=A8=E9=9D=A2=E5=B7=A5=E8=89=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sf_base/views/common_view.xml | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/sf_base/views/common_view.xml b/sf_base/views/common_view.xml index 533a3e04..ed39f9a4 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 @@ + - + @@ -163,7 +164,8 @@ sf.production.process - + + @@ -174,7 +176,7 @@ sf.production.process - +

@@ -192,11 +194,11 @@ - - - + + + - + From fbbce6332d52cc62c1b2051c4c798f052cd07be4 Mon Sep 17 00:00:00 2001 From: hujiaying Date: Mon, 26 Aug 2024 15:02:33 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=A1=A8=E9=9D=A2?= =?UTF-8?q?=E5=B7=A5=E8=89=BA=E5=90=8C=E6=AD=A5=E6=B5=8B=E8=AF=95=EF=BC=8C?= =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=90=8C=E6=AD=A5=E4=BA=A4=E6=9C=9F=EF=BC=8C?= =?UTF-8?q?=E5=90=8C=E6=AD=A5=E5=91=A8=E6=9C=9F=E8=8F=9C=E5=8D=95=E5=8F=8A?= =?UTF-8?q?=E5=90=8C=E6=AD=A5=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sf_base/views/common_view.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sf_base/views/common_view.xml b/sf_base/views/common_view.xml index ed39f9a4..334eaa32 100644 --- a/sf_base/views/common_view.xml +++ b/sf_base/views/common_view.xml @@ -53,7 +53,7 @@ - + @@ -141,7 +141,7 @@ sf.production.process.category - + From eb9b43dc91e6c1396620818729bfaa756cdc6986 Mon Sep 17 00:00:00 2001 From: yuxianghui <3437689193@qq.com> Date: Mon, 26 Aug 2024 16:11:40 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E8=A7=A3=E5=86=B3=20=20=20=E3=80=90?= =?UTF-8?q?=E5=BA=93=E5=AD=98=E6=A6=82=E8=A7=88=E5=86=85=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E6=94=B6=E8=97=8F=E7=9A=84=E9=BB=98=E8=AE=A4=E7=AD=9B=E9=80=89?= =?UTF-8?q?=E9=A1=B9=E5=90=8E=EF=BC=8C=E5=88=A0=E9=99=A4=E6=8A=A5=E9=94=99?= =?UTF-8?q?=EF=BC=88=E5=8E=9F=E7=94=9F=E6=8A=A5=E9=94=99=EF=BC=89=E3=80=91?= =?UTF-8?q?=20=20=20=E7=BC=BA=E9=99=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jikimo_hide_options/models/models.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From da02d68c1289e35e99c349b6b2fbb8b510a20b40 Mon Sep 17 00:00:00 2001 From: yuxianghui <3437689193@qq.com> Date: Mon, 26 Aug 2024 16:58:54 +0800 Subject: [PATCH 6/6] =?UTF-8?q?1=E3=80=81=E5=B0=86=E9=94=80=E5=94=AE?= =?UTF-8?q?=E5=8D=95=E7=9A=84=E3=80=90=E5=8F=96=E6=B6=88=E3=80=91=E6=94=B9?= =?UTF-8?q?=E4=B8=BA=E3=80=90=E6=8B=92=E7=BB=9D=E6=8E=A5=E5=8D=95=E3=80=91?= =?UTF-8?q?=EF=BC=9B2=E3=80=81=E5=8F=96=E6=B6=88=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=E5=88=80=E5=85=B7=E6=8B=86=E8=A7=A3=E5=8D=95=E7=9A=84=E5=88=80?= =?UTF-8?q?=E6=9F=84=E6=98=AF=E5=90=A6=E6=8A=A5=E5=BA=9F=E6=8C=89=E9=92=AE?= =?UTF-8?q?=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sf_sale/views/sale_order_view.xml | 1 + sf_tool_management/views/tool_base_views.xml | 28 ++++++++++---------- 2 files changed, 15 insertions(+), 14 deletions(-) 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 @@ - - - - - - -