qihao.gong@jikimo.com 1fab9ad253 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改机床参数bug ...

# Conflicts:
#	sf_manufacturing/models/product_template.py

2024-01-09 10:36:13 +08:00

..

data

1、新增安装时自动配置刀具房位置，重新配置了刀具组装入库的作业类型，增加名称为刀具组装入库的参考序列配置；2、功能刀具所以的装刀长改为总长度；3、机床换刀申请和刀具组装单弹窗界面做字段必填控制，对新刀隐藏切削相关字段；4、刀具组装单弹窗增加一些字段的数值自动填写和计算；

2023-12-19 17:31:37 +08:00

models

Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改机床参数bug

2024-01-09 10:36:13 +08:00

security

Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改机床参数bug

2024-01-08 15:56:44 +08:00

static/src

优化警告问题

2023-11-27 21:30:45 +08:00

views

Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改机床参数bug

2024-01-09 10:36:13 +08:00

__init__.py

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

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

__manifest__.py

库存模块权限开发

2023-12-05 17:24:19 +08:00

.DS_Store

更改制造模块名

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