Commit Graph

78 Commits

Author SHA1 Message Date
jinling.yang
271a5d4224 1.模型类型增加跟修改各字段
2.智能工厂成品名称优化
3.智能工厂产品根据产品类型增加默认筛选条件的优化(在筛选器内根据产品类型增加筛选条件)
4.智能工厂胚料名称的优化
5.自加工产品的制造订单优化
2023-01-29 17:48:45 +08:00
gqh
16cffc3ba5 单个制造显示问题 2023-01-29 16:33:56 +08:00
gqh
bdae9d9f95 恢复代码 2023-01-29 15:42:33 +08:00
gqh
9c473e6f32 优化sf 2023-01-23 20:21:00 +08:00
jinling.yang
5492d4f2fa 修复工作中心绑定机床和胚料外协供应商是否外包未勾选bug修复 2023-01-13 16:43:30 +08:00
gqh
8e51654f17 合并sf代码 2023-01-11 14:51:59 +08:00
gqh
eb162cb416 合并工单优化 2023-01-11 11:13:52 +08:00
jinling.yang
01cf30b03f 优化涉及到的接口 2023-01-11 11:05:06 +08:00
jinling.yang
d66687297d Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/工单文件优化
# Conflicts:
#	sf_manufacturing/models/mrp_workorder.py
2023-01-10 09:27:14 +08:00
gqh
311c7c723a sf1.0 2023-01-09 23:04:53 +08:00
gqh
d0497aa043 工单优化 2023-01-09 20:40:27 +08:00
jinling.yang
b7723f82d0 优化sf获取cnc程序和ftp 2023-01-09 19:54:02 +08:00
jinling.yang
a3e39d4fac 产品和制造订单新增模型和occ查看模型模块 2022-12-30 10:00:17 +08:00
jinling.yang
5fcb17d048 胚料bug修复,销售订单明细行路线修复,编程单下发优化 2022-12-27 17:28:47 +08:00
jinling.yang
a4be58098e 创建胚料的bug修复 2022-12-26 10:25:16 +08:00
jinling.yang
dd5c387585 解决代码冲突 2022-12-12 16:59:42 +08:00
jinling.yang
0b0f5c82ed Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
# Conflicts:
#	sf_dlm/data/product_data.xml
2022-12-12 16:56:04 +08:00
jinling.yang
70b7aa4c0f 工单修改 2022-12-12 16:52:58 +08:00
gqh
257ed593c9 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
# Conflicts:
#	sf_dlm/data/product_data.xml
#	sf_dlm/models/product_template.py
#	sf_manufacturing/models/mrp_workorder.py
#	sf_mrs_connect/controllers/controllers.py
2022-12-12 14:52:48 +08:00
gqh
e0a0b3d411 优化odoo16工单视图展示问题 2022-12-12 14:46:54 +08:00
jinling.yang
5e2d75b23e 修改胚料部分 2022-12-09 17:23:07 +08:00
jinling.yang
a18d55850a 优化文件内容 2022-12-01 17:18:49 +08:00
jinling.yang
b498637154 修改cnc编程单 2022-11-25 10:56:37 +08:00
jinling.yang
11a360222e cnc获取 2022-11-22 21:18:15 +08:00
jinling.yang
12615b3dba 销售和产品代码整合 2022-11-22 11:08:07 +08:00
jinling.yang
3cbd1140bb mrs为名的更改为sf 2022-11-22 10:20:18 +08:00
jinling.yang
e12d3acf4d 修改模块分类名称 2022-11-22 09:56:29 +08:00
jinling.yang
830f3bb35e 212 2022-11-21 20:04:56 +08:00