jinling.yang eb0d83aa3a Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/页面优化 ...

# Conflicts:
#	sf_manufacturing/models/stock.py

2023-09-14 09:46:28 +08:00

..

__init__.py

刀具物料功能模型从sf_base模块迁移到sf_manufacturing模块；新增每齿走刀量模型；整体式刀具物料新增关联每齿走刀量对象字段；

2023-09-08 10:20:52 +08:00

model_type.py

Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/自建模块日志警告信息处理

2023-08-29 11:21:13 +08:00

mrp_maintenance.py

更改制造模块名

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

mrp_production.py

删除制造订单处排程相关的部分，排程模块架构改造完成

2023-08-25 10:43:22 +08:00

mrp_routing_workcenter.py

优化及调试表面工艺外协出入库单，‘胚料’修改为‘坯料’

2023-04-20 19:39:12 +08:00

mrp_workcenter.py

处理机床能力数据

2023-09-13 14:32:32 +08:00

mrp_workorder.py

Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/获取cnc工单Bug修复

2023-08-29 17:41:23 +08:00

product_template.py

报价和销售订单页面优化

2023-09-14 09:29:03 +08:00

production_line_base.py

生产线新增关联工作中心字段，优化看板和form视图布局

2023-08-18 15:11:36 +08:00

quality.py

合并企业版代码(未测试，先提交到测试分支)

2023-04-14 17:42:23 +08:00

res_user.py

代码规范整理，产品页面模型和胚料的模型类型字段做显示

2023-02-09 15:26:08 +08:00

stock.py

Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/页面优化

2023-09-14 09:46:28 +08:00

tool_other_features.py

解决产品-整体式刀具-刃部直径字段数据同步问题。

2023-09-13 15:21:51 +08:00

tray.py

移除托盘对象 并清除所有关联关系

2023-08-17 16:33:40 +08:00