@@ -337,7 +337,7 @@
-
@@ -462,7 +462,7 @@
-
+
From 7906ff28367ce42d18935948e38825195c4236a1 Mon Sep 17 00:00:00 2001
From: mgw <1392924357@qq.com>
Date: Tue, 26 Mar 2024 18:09:23 +0800
Subject: [PATCH 2/8] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=BF=BB=E8=AF=91?=
=?UTF-8?q?=E3=80=81=E6=8E=92=E5=BA=8F=E3=80=81=E6=9D=83=E9=99=90=E9=97=AE?=
=?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
sf_base/security/group_security.xml | 2 +-
sf_base/security/ir.model.access.csv | 1 +
sf_quality/security/ir.model.access.csv | 2 --
sf_sale/security/ir.model.access.csv | 5 +++++
sf_tool_management/security/ir.model.access.csv | 2 +-
sf_warehouse/models/model.py | 4 ++--
sf_warehouse/security/ir.model.access.csv | 8 +-------
sf_warehouse/views/change_stock_move_views.xml | 2 +-
8 files changed, 12 insertions(+), 14 deletions(-)
diff --git a/sf_base/security/group_security.xml b/sf_base/security/group_security.xml
index 478d41b9..1321bae2 100644
--- a/sf_base/security/group_security.xml
+++ b/sf_base/security/group_security.xml
@@ -65,7 +65,7 @@
计划调度岗
-
+
diff --git a/sf_base/security/ir.model.access.csv b/sf_base/security/ir.model.access.csv
index 4eaddff0..2a3cd471 100644
--- a/sf_base/security/ir.model.access.csv
+++ b/sf_base/security/ir.model.access.csv
@@ -145,6 +145,7 @@ access_purchase_order_group_purchase,access_purchase_order_group_purchase,purcha
access_purchase_order_line_group_purchase,access_purchase_order_line_group_purchase,purchase.model_purchase_order_line,sf_base.group_purchase,1,1,1,0
access_spindle_taper_type,spindle_taper_type,model_spindle_taper_type,base.group_user,1,1,1,1
access_sf_tool_groups_group_plan_dispatch,sf_tool_groups,model_sf_tool_groups,sf_base.group_plan_dispatch,1,0,0,0
+access_sf_tool_groups_group_plan_director,sf_tool_groups,model_sf_tool_groups,sf_base.group_plan_director,1,1,1,0
access_sf_tool_groups_group_sf_tool_user,sf_tool_groups,model_sf_tool_groups,sf_base.group_sf_tool_user,1,1,1,1
access_purchase_order,purchase.order,purchase.model_purchase_order,sf_base.group_plan_dispatch,1,0,0,0
access_res_partner,res.partner,base.model_res_partner,sf_base.group_plan_dispatch,1,0,0,0
diff --git a/sf_quality/security/ir.model.access.csv b/sf_quality/security/ir.model.access.csv
index 4374715d..b147a1df 100644
--- a/sf_quality/security/ir.model.access.csv
+++ b/sf_quality/security/ir.model.access.csv
@@ -43,8 +43,6 @@ access_quality_alert_team_group_sf_mrp_manager,quality_alert_team_group_sf_mrp_m
access_product_template_group_quality,product_template_group_quality,product.model_product_template,sf_base.group_quality,1,0,0,0
access_product_template_group_quality_director,product_template_group_quality_director,product.model_product_template,sf_base.group_quality_director,1,0,0,0
-access_product_template_group_plan_dispatch,product_template_group_plan_dispatch,product.model_product_template,sf_base.group_plan_dispatch,1,0,0,0
-access_product_template_group_plan_director,product_template_group_plan_director,product.model_product_template,sf_base.group_plan_director,1,0,0,0
access_product_template_group_sf_equipment_user,product_template_group_sf_equipment_user,product.model_product_template,sf_base.group_sf_equipment_user,1,0,0,0
access_product_template_group_sf_tool_user,product_template_group_sf_tool_user,product.model_product_template,sf_base.group_sf_tool_user,1,0,0,0
access_product_template_group_sf_order_user,product_template_group_sf_order_user,product.model_product_template,sf_base.group_sf_order_user,1,0,0,0
diff --git a/sf_sale/security/ir.model.access.csv b/sf_sale/security/ir.model.access.csv
index 34cea19a..451396e3 100644
--- a/sf_sale/security/ir.model.access.csv
+++ b/sf_sale/security/ir.model.access.csv
@@ -14,6 +14,8 @@ access_product_product_group_sale_salemanager,product_product_group_sale_saleman
access_product_product_group_sale_director,product_product_group_sale_director,product.model_product_product,sf_base.group_sale_director,1,1,1,0
access_product_product_group_purchase,product_product_group_purchase,product.model_product_product,sf_base.group_purchase,1,0,0,0
access_product_product_group_purchase_director,product_product_group_purchase_director,product.model_product_product,sf_base.group_purchase_director,1,1,1,0
+access_product_product_group_plan_dispatch,product_product_group_plan_dispatch,product.model_product_product,sf_base.group_plan_dispatch,1,0,0,0
+access_product_product_group_plan_director,product_product_group_plan_director,product.model_product_product,sf_base.group_plan_director,1,1,1,0
access_product_template_group_sale_salemanager,product_template_group_sale_salemanager,product.model_product_template,sf_base.group_sale_salemanager,1,0,0,0
access_product_template_group_sale_director,product_template_group_sale_director,product.model_product_template,sf_base.group_sale_director,1,1,1,0
access_product_template_group_purchase,product_template_group_purchase,product.model_product_template,sf_base.group_purchase,1,0,0,0
@@ -90,6 +92,9 @@ access_sale_report_group_sale_director,sale_report_group_sale_director,sale.mode
access_product_supplierinfo_group_purchase_director,product.supplierinfo group_purchase_director,product.model_product_supplierinfo,sf_base.group_purchase_director,1,1,1,0
access_product_category_group_purchase_director,product.category group_purchase_director,product.model_product_category,sf_base.group_purchase_director,1,1,1,0
+access_product_supplierinfo_group_plan_director,product.supplierinfo user,product.model_product_supplierinfo,sf_base.group_plan_director,1,1,1,0
+access_product_category_group_plan_director,product.category user,product.model_product_category,sf_base.group_plan_director,1,1,1,0
+
diff --git a/sf_tool_management/security/ir.model.access.csv b/sf_tool_management/security/ir.model.access.csv
index 35217493..bfb92998 100644
--- a/sf_tool_management/security/ir.model.access.csv
+++ b/sf_tool_management/security/ir.model.access.csv
@@ -18,7 +18,7 @@ access_sf_fixture_material_search,sf.fixture.material.search,model_sf_fixture_ma
access_sf_functional_cutting_tool_entity_group_plan_dispatch,sf.functional.cutting.tool.entity,model_sf_functional_cutting_tool_entity,sf_base.group_plan_dispatch,1,0,0,0
access_sf_functional_tool_warning_group_plan_dispatch,sf.functional.tool.warning,model_sf_functional_tool_warning,sf_base.group_plan_dispatch,1,0,0,0
-access_sf_real_time_distribution_of_functional_tools_group_plan_dispatch,sf.real.time.distribution.of.functional.tools,model_sf_real_time_distribution_of_functional_tools,sf_base.group_plan_dispatch,1,0,0,0
+access_sf_real_time_distribution_of_functional_tools_group_plan_dispatch,sf.real.time.distribution.of.functional.tools,model_sf_real_time_distribution_of_functional_tools,sf_base.group_plan_dispatch,1,1,0,0
access_sf_cam_work_order_program_knife_plan_group_plan_dispatch,sf.cam.work.order.program.knife.plan,model_sf_cam_work_order_program_knife_plan,sf_base.group_plan_dispatch,1,0,0,0
access_sf_machine_table_tool_changing_apply_group_plan_dispatch,sf.machine.table.tool.changing.apply,model_sf_machine_table_tool_changing_apply,sf_base.group_plan_dispatch,1,0,0,0
diff --git a/sf_warehouse/models/model.py b/sf_warehouse/models/model.py
index 43f84d69..2228d2d5 100644
--- a/sf_warehouse/models/model.py
+++ b/sf_warehouse/models/model.py
@@ -229,7 +229,7 @@ class SfLocation(models.Model):
class SfShelf(models.Model):
_name = 'sf.shelf'
_description = '货架'
- _order = 'name'
+ _order = 'create_date desc'
name = fields.Char('货架名称', required=True, size=20)
barcode = fields.Char('编码', copy=False, size=15, required=True)
@@ -310,7 +310,7 @@ class SfShelf(models.Model):
class ShelfLocation(models.Model):
_name = 'sf.shelf.location'
_description = '货位'
- _order = 'name, id'
+ _order = 'create_date desc'
# current_location_id = fields.Many2one('sf.shelf.location', string='当前位置')
# # 目的位置
diff --git a/sf_warehouse/security/ir.model.access.csv b/sf_warehouse/security/ir.model.access.csv
index 06f69669..db246adc 100644
--- a/sf_warehouse/security/ir.model.access.csv
+++ b/sf_warehouse/security/ir.model.access.csv
@@ -102,17 +102,11 @@ access_mrp_production_group_sf_stock_user,mrp.production,mrp.model_mrp_productio
access_sf_shelf_location_group_plan_dispatch,sf.shelf.location,model_sf_shelf_location,sf_base.group_plan_dispatch,1,0,0,0
access_stock_move,stock.move,stock.model_stock_move,sf_base.group_plan_dispatch,1,1,1,0
-access_stock_picking,stock.picking,stock.model_stock_picking,sf_base.group_plan_dispatch,1,0,0,0
+access_stock_picking_group_plan_dispatch,stock.picking,stock.model_stock_picking,sf_base.group_plan_dispatch,1,0,0,0
access_stock_lot_group_plan_dispatch,stock.lot,stock.model_stock_lot,sf_base.group_plan_dispatch,1,0,0,0
access_stock_lot_group_plan_director,stock.lot,stock.model_stock_lot,sf_base.group_plan_director,1,1,1,0
access_stock_warehouse_orderpoint,stock.warehouse.orderpoint,stock.model_stock_warehouse_orderpoint,sf_base.group_plan_dispatch,1,1,0,0
-
-access_product_product,product.product,product.model_product_product,sf_base.group_plan_dispatch,1,0,0,0
-access_product_template,product.template,product.model_product_template,sf_base.group_plan_dispatch,1,0,0,0
-access_product_product,product.product,product.model_product_product,sf_base.group_plan_director,1,1,1,0
-access_product_template,product.template,product.model_product_template,sf_base.group_plan_director,1,1,1,0
-
access_stock_inventory_conflict,stock.inventory.conflict,stock.model_stock_inventory_conflict,sf_base.group_plan_dispatch,1,0,0,0
access_stock_inventory_warning,stock.inventory.warning,stock.model_stock_inventory_warning,sf_base.group_plan_dispatch,1,0,0,0
access_stock_inventory_adjustment_name,stock.inventory.adjustment.name,stock.model_stock_inventory_adjustment_name,sf_base.group_plan_dispatch,1,0,0,0
diff --git a/sf_warehouse/views/change_stock_move_views.xml b/sf_warehouse/views/change_stock_move_views.xml
index 77021663..cc4213c6 100644
--- a/sf_warehouse/views/change_stock_move_views.xml
+++ b/sf_warehouse/views/change_stock_move_views.xml
@@ -117,7 +117,7 @@
-
From f7f9cf1e43798560227bd0b58682e80250942210 Mon Sep 17 00:00:00 2001
From: mgw <1392924357@qq.com>
Date: Wed, 27 Mar 2024 10:26:46 +0800
Subject: [PATCH 3/8] =?UTF-8?q?=E6=8E=A7=E5=88=B6cnc=E5=8F=AA=E8=83=BD?=
=?UTF-8?q?=E7=9C=8B=E5=88=B0cnc=E4=BA=A7=E7=BA=BF=EF=BC=9B=E5=A2=9E?=
=?UTF-8?q?=E5=8A=A0=E5=BF=85=E5=A1=AB=E6=A0=87=E8=AF=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
jikimo_frontend/static/src/js/custom_form_status_indicator.js | 2 ++
sf_plan/views/view.xml | 2 +-
sf_plan/wizard/action_plan_some.xml | 2 +-
3 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/jikimo_frontend/static/src/js/custom_form_status_indicator.js b/jikimo_frontend/static/src/js/custom_form_status_indicator.js
index 10f4b07d..7db13b4b 100644
--- a/jikimo_frontend/static/src/js/custom_form_status_indicator.js
+++ b/jikimo_frontend/static/src/js/custom_form_status_indicator.js
@@ -42,6 +42,8 @@ const filedRequiredList = {
// 制造大模块
'production_line_id': { multiple: false, noLabel: false },
'date_approve': { multiple: false, noLabel: false },
+ 'date_planned_start': { multiple: false, noLabel: false },
+ 'date_planned_finished': { multiple: false, noLabel: false },
}
patch(FormStatusIndicator.prototype, 'jikimo_frontend.FormStatusIndicator', {
// 你可以重写或者添加一些方法和属性
diff --git a/sf_plan/views/view.xml b/sf_plan/views/view.xml
index 1e7ff0f6..68772142 100644
--- a/sf_plan/views/view.xml
+++ b/sf_plan/views/view.xml
@@ -71,7 +71,7 @@
-
+
diff --git a/sf_plan/wizard/action_plan_some.xml b/sf_plan/wizard/action_plan_some.xml
index 2c52658a..b659da03 100644
--- a/sf_plan/wizard/action_plan_some.xml
+++ b/sf_plan/wizard/action_plan_some.xml
@@ -6,7 +6,7 @@
@@ -231,6 +231,9 @@
+
+
+
diff --git a/sf_dlm_management/views/product_template_management_view.xml b/sf_dlm_management/views/product_template_management_view.xml
index 264a1c95..453de6a3 100644
--- a/sf_dlm_management/views/product_template_management_view.xml
+++ b/sf_dlm_management/views/product_template_management_view.xml
@@ -41,14 +41,15 @@
context="{'default_cutting_tool_type': cutting_tool_type,'default_standard_library_id':cutting_tool_model_id}"
attrs="{'invisible': [('categ_type', '!=', '刀具')],'required': [('categ_type', '=', '刀具')],'readonly': [('id', '!=', False)]}"
domain="[('standard_library_id','=',cutting_tool_model_id)]"/>
-
diff --git a/sf_tool_management/models/base.py b/sf_tool_management/models/base.py
index 968f6841..8e25ae1f 100644
--- a/sf_tool_management/models/base.py
+++ b/sf_tool_management/models/base.py
@@ -830,7 +830,7 @@ class FunctionalToolAssembly(models.Model):
code = fields.Char('功能刀具编码', readonly=True)
rfid = fields.Char('Rfid', readonly=True)
tool_groups_id = fields.Many2one('sf.tool.groups', '刀具组', readonly=True)
- name = fields.Char(string='名称', readonly=True, compute='_compute_name')
+ name = fields.Char(string='名称', readonly=True, compute='_compute_name', store=True)
assembly_order_code = fields.Char(string='组装单编码', readonly=True)
functional_tool_name_id = fields.Many2one('product.product', string='功能刀具', readonly=True)
From 4115bbb05e59b4086e6734766c5d4bfb2ac3286d Mon Sep 17 00:00:00 2001
From: yuxianghui <3437689193@qq.com>
Date: Thu, 28 Mar 2024 17:30:16 +0800
Subject: [PATCH 8/8] =?UTF-8?q?1=E3=80=81=E4=BC=98=E5=8C=96=E5=8A=9F?=
=?UTF-8?q?=E8=83=BD=E5=88=80=E5=85=B7=E5=AE=89=E5=85=A8=E5=BA=93=E5=AD=98?=
=?UTF-8?q?=E4=BF=A1=E6=81=AF=E6=9B=B4=E6=96=B0=E6=97=B6=E6=B2=A1=E6=9C=89?=
=?UTF-8?q?=E5=8F=8A=E6=97=B6=E6=B3=A8=E5=86=8C=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
sf_tool_management/models/base.py | 8 --------
sf_tool_management/models/functional_tool_enroll.py | 6 ++++++
sf_tool_management/wizard/wizard.py | 1 +
3 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/sf_tool_management/models/base.py b/sf_tool_management/models/base.py
index 8e25ae1f..766bb8a9 100644
--- a/sf_tool_management/models/base.py
+++ b/sf_tool_management/models/base.py
@@ -471,14 +471,6 @@ class RealTimeDistributionOfFunctionalTools(models.Model):
records = super(RealTimeDistributionOfFunctionalTools, self).create(vals_list)
return records
- def write(self, vals):
- res = super().write(vals)
- for item in self:
- if item:
- if vals.get('min_stock_num') or vals.get('max_stock_num'):
- item.enroll_functional_tool_real_time_distribution()
- return res
-
class MachineTableToolChangingApply(models.Model):
_name = 'sf.machine.table.tool.changing.apply'
diff --git a/sf_tool_management/models/functional_tool_enroll.py b/sf_tool_management/models/functional_tool_enroll.py
index c1687cde..d762c865 100644
--- a/sf_tool_management/models/functional_tool_enroll.py
+++ b/sf_tool_management/models/functional_tool_enroll.py
@@ -362,3 +362,9 @@ class RealTimeDistributionFunctionalTools(models.Model):
if record:
record.enroll_functional_tool_real_time_distribution()
return records
+
+ def write(self, vals):
+ res = super().write(vals)
+ if vals.get('sf_functional_cutting_tool_entity_ids') or vals.get('min_stock_num') or vals.get('max_stock_num'):
+ self.enroll_functional_tool_real_time_distribution()
+ return res
diff --git a/sf_tool_management/wizard/wizard.py b/sf_tool_management/wizard/wizard.py
index 25fcdde9..dbece7b7 100644
--- a/sf_tool_management/wizard/wizard.py
+++ b/sf_tool_management/wizard/wizard.py
@@ -540,6 +540,7 @@ class FunctionalToolAssemblyOrder(models.TransientModel):
return {
'barcode_id': stock_lot.id,
'code': self.tool_code,
+ 'name': self.after_assembly_functional_tool_name,
'rfid': self.rfid,
'tool_groups_id': self.tool_groups_id.id,
'integral_code_id': self.integral_code_id.id,