jinling.yang 61da25a031 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/销售权限 ...

# Conflicts:
#	sf_manufacturing/models/product_template.py

2023-11-23 17:39:35 +08:00

..

data

1、创建创建功能刀具该批次/序列号位置

2023-10-27 17:46:19 +08:00

models

Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/销售权限

2023-11-23 17:39:35 +08:00

security

开发测试制造模块权限，修改设备机床类别的布局以及编码规则

2023-11-22 17:36:50 +08:00

static/src

规范问题优化

2023-11-22 10:29:04 +08:00

views

开发测试制造模块权限，修改设备机床类别的布局以及编码规则

2023-11-22 17:36:50 +08:00

__init__.py

1.新增销售和计划权限组2.优化代码格式

2023-11-21 16:10:05 +08:00

__manifest__.py

Merge branch refs/heads/develop into refs/heads/feature/修改机床参数bug

2023-11-23 16:37:53 +08:00

.DS_Store

更改制造模块名

2022-11-22 09:41:52 +08:00