jinling.yang a3f6fdda2a Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop ...

# Conflicts:
#	sf_tool_management/__init__.py
#	sf_tool_management/models/base.py

2023-12-11 14:54:23 +08:00

..

data

Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/权限去掉继承

2023-12-11 14:47:34 +08:00

models

Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/权限去掉继承

2023-12-11 14:47:34 +08:00

security

1、基于原生的移动历史重构功能刀具出入库记录模型；2、功能刀具列表模型新增查询当前功能刀具出入库记录按钮；3、删除旧的功能刀具出入库记录模型和出入库记录人模型；4、机台换刀申请模型的功能刀具名称字段改为绑定功能刀具组装单；5、优化功能刀具组装单确认组装功能的创建移动历史记录功能。

2023-11-23 17:15:34 +08:00

static/src

新增批量出库功能（功能已完成，按键未增加），新增自动组装方法（todo），新增出库按键弹窗样式修改

2023-06-29 09:36:54 +08:00

views

Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/权限去掉继承

2023-12-11 14:47:34 +08:00

wizard

Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/权限去掉继承

2023-12-11 14:47:34 +08:00

__init__.py

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

2023-12-11 14:54:23 +08:00

__manifest__.py

1、新增刀具管理模块安装时根据已有机床设备存在的刀位创建机台换刀申请记录

2023-12-11 14:41:31 +08:00