jikimo/test
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/new111

Browse Source
This commit is contained in:
jinling.yang
2024-11-29 15:55:44 +08:00
parent a7d97f137b 1a7059aad1
commit 47d886ef6d
3 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sf_manufacturing/security/ir.model.access.csv
View File

@@ -167,10 +167,12 @@ access_sf_agv_scheduling_group_sf_mrp_manager,sf_agv_scheduling_group_sf_mrp_man
access_sf_agv_scheduling_group_sf_equipment_user,sf_agv_scheduling_group_sf_equipment_user,model_sf_agv_scheduling,sf_base.group_sf_equipment_user,1,1,1,0
access_sf_technology_design_group_plan_dispatch,sf_technology_design_group_plan_dispatch,model_sf_technology_design,sf_base.group_plan_dispatch,1,1,1,0
access_sf_technology_design_group_sf_mrp_manager,sf_technology_design_group_sf_mrp_manager,model_sf_technology_design,sf_base.group_sf_mrp_manager,1,1,1,0
access_sf_technology_design_group_sf_mrp_manager,sf_technology_design_group_sf_mrp_manager,model_sf_technology_design,sf_base.group_sf_mrp_manager,1,0,0,0
access_sf_technology_design_group_production_engineer,sf_technology_design_group_production_engineer,model_sf_technology_design,sf_base.group_production_engineer,1,1,1,0
access_sf_technology_design_group_sf_equipment_user,sf_technology_design_group_sf_equipment_user,model_sf_technology_design,sf_base.group_sf_equipment_user,1,0,0,0
access_sf_technology_design_group_sf_order_user,sf_technology_design_group_sf_order_user,model_sf_technology_design,sf_base.group_sf_order_user,1,0,0,0
access_sf_production_technology_wizard_group_plan_dispatch,sf_production_technology_wizard_group_plan_dispatch,model_sf_production_technology_wizard,sf_base.group_plan_dispatch,1,1,1,0
access_sf_production_technology_wizard_group_sf_mrp_manager,sf_production_technology_wizard_group_sf_mrp_manager,model_sf_production_technology_wizard,sf_base.group_sf_mrp_manager,1,1,1,0
access_sf_production_technology_wizard_group_sf_mrp_manager,sf_production_technology_wizard_group_sf_mrp_manager,model_sf_production_technology_wizard,sf_base.group_sf_mrp_manager,1,0,0,0
access_sf_production_technology_wizard_group_production_engineer,sf_production_technology_wizard_group_production_engineer,model_sf_production_technology_wizard,sf_base.group_production_engineer,1,1,1,0
access_sf_production_technology_re_adjust_wizard_group_plan_dispatch,sf_production_technology_re_adjust_wizard_group_plan_dispatch,model_sf_production_technology_re_adjust_wizard,sf_base.group_plan_dispatch,1,1,1,0
access_sf_production_technology_re_adjust_wizard_group_sf_mrp_manager,sf_production_technology_re_adjust_wizard_group_sf_mrp_manager,model_sf_production_technology_re_adjust_wizard,sf_base.group_sf_mrp_manager,1,1,1,0
1 id name model_id:id group_id:id perm_read perm_write perm_create perm_unlink
167 access_sf_production_technology_re_adjust_wizard_group_production_engineer access_sf_production_technology_re_adjust_wizard_group_plan_dispatch sf_production_technology_re_adjust_wizard_group_production_engineer sf_production_technology_re_adjust_wizard_group_plan_dispatch model_sf_production_technology_re_adjust_wizard sf_base.group_production_engineer sf_base.group_plan_dispatch 1 1 1 0
168 access_sf_manual_product_model_type_routing_sort_group_sf_mrp_user access_sf_production_technology_re_adjust_wizard_group_sf_mrp_manager sf_manual_product_model_type_routing_sort sf_production_technology_re_adjust_wizard_group_sf_mrp_manager model_sf_manual_product_model_type_routing_sort model_sf_production_technology_re_adjust_wizard sf_base.group_sf_mrp_user sf_base.group_sf_mrp_manager 1 0 1 0 1 0
169 access_sf_manual_product_model_type_routing_sort_manager access_sf_production_technology_re_adjust_wizard_group_production_engineer sf_manual_product_model_type_routing_sort sf_production_technology_re_adjust_wizard_group_production_engineer model_sf_manual_product_model_type_routing_sort model_sf_production_technology_re_adjust_wizard sf_base.group_sf_mrp_manager sf_base.group_production_engineer 1 1 1 1 0
170 access_sf_manual_product_model_type_routing_sort_group_plan_dispatch access_sf_manual_product_model_type_routing_sort_group_sf_mrp_user sf_manual_product_model_type_routing_sort_group_plan_dispatch sf_manual_product_model_type_routing_sort model_sf_manual_product_model_type_routing_sort sf_base.group_plan_dispatch sf_base.group_sf_mrp_user 1 0 0 0
171 access_sf_detection_result_manager access_sf_manual_product_model_type_routing_sort_manager sf_detection_result_manager sf_manual_product_model_type_routing_sort model_sf_detection_result model_sf_manual_product_model_type_routing_sort sf_base.group_sf_mrp_manager 1 1 1 1
172 access_sf_manual_product_model_type_routing_sort_group_plan_dispatch sf_manual_product_model_type_routing_sort_group_plan_dispatch model_sf_manual_product_model_type_routing_sort sf_base.group_plan_dispatch 1 0 0 0
173 access_sf_detection_result_manager sf_detection_result_manager model_sf_detection_result 1 1 1 1
174
175
176
177
178

2
sf_plan_management/i18n/zh_CN.po
View File

@@ -15907,7 +15907,7 @@ msgstr "内部参考"
#: model_terms:ir.ui.view,arch_db:account.account_journal_dashboard_kanban_view
#, python-format
msgid "Internal Transfer"
msgstr "内部转账"
msgstr "厂内出入库"
#. module: account
#: model:ir.model.fields,field_description:account.field_res_config_settings__transfer_account_id

2
web_gantt/static/src/js/gantt_row.js
View File

@@ -602,7 +602,7 @@ var GanttRow = Widget.extend({
// pill._color = self._getColor(pill[self.colorField]);
// 设置pill背景颜色2 修改时间2024年6月25日17:09:43
let isDelay = false
if(pill.state != 'processing' && pill.state != 'finished') { // 判断待加工
if(pill.state != 'processing' && pill.state != 'finished' && pill.order_deadline) { // 判断待加工
isDelay = pill.order_deadline.isBefore(new Date())
}
if(isDelay) {