WEB许何哲\xuhez d023848c70 Merge branch 'develop' into feature/sf看板样式统一 ...

# Conflicts:
#	jikimo_frontend/static/src/scss/custom_style.scss

2023-10-20 16:31:40 +08:00

..

__init__.py

修改故障日志bug

2023-09-27 14:30:38 +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

修改故障日志bug

2023-09-27 14:30:38 +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

修改故障日志bug

2023-09-27 14:30:38 +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

Merge branch 'develop' into feature/sf看板样式统一

2023-10-20 16:31:40 +08:00

production_line_base.py

修改维保生成编码和名称的规则

2023-09-26 17:29:14 +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

解决图文展示中图片不显示问题；新增刀具物料能力对象的form视图。

2023-09-13 17:13:21 +08:00