qihao.gong@jikimo.com
|
aa810bbda2
|
零件质检接口 修改coding缺陷
|
2024-01-18 17:26:31 +08:00 |
|
yuxianghui
|
d1c10f56d1
|
1、sf_base新增刀具组模型；2、所以功能刀具相关模型添加刀具组对象字段（进行中）；
|
2024-01-05 17:33:06 +08:00 |
|
mgw
|
2339f75517
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造代码优化
|
2023-12-29 15:28:40 +08:00 |
|
yuxianghui
|
b2bb2e33de
|
1、新增夹具物料基本参数模型，重构工厂的夹具型号模型，重新优化夹具物料form视图；2、优化刀具标准库模型，优化切削速度模型，优化每齿走刀量模型，新增切削宽度和深度模型，新增坡铣角度模型；3、优化功能刀具安全库存最低安全库存可以高于最高库存的bug；
|
2023-12-28 17:06:34 +08:00 |
|
mgw
|
8e61d5f87c
|
优化权限相关
|
2023-12-28 10:50:44 +08:00 |
|
mgw
|
a7d760bc5e
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造代码优化
|
2023-12-22 15:00:30 +08:00 |
|
龚启豪
|
34d0e989d6
|
Accept Merge Request #726: (feature/修改机床参数bug -> develop)
Merge Request: 机床型号同步以及设备机床参数修改以及机床注册接口
Created By: @龚启豪
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @龚启豪
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/726?initial=true
|
2023-12-21 17:38:15 +08:00 |
|
mgw
|
ff904ad68c
|
权限暂存
|
2023-12-20 17:54:14 +08:00 |
|
mgw
|
e73fb5791a
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造代码优化
|
2023-12-17 10:50:18 +08:00 |
|
mgw
|
6738a855bb
|
优化权限相关
|
2023-12-17 10:48:51 +08:00 |
|
qihao.gong@jikimo.com
|
2391c08485
|
修改i机床接口同步以及参数
|
2023-12-14 17:33:28 +08:00 |
|
jinling.yang
|
e4f6bc4632
|
权限去掉继承
|
2023-12-11 14:36:34 +08:00 |
|
jinling.yang
|
26ec1c9f6e
|
修改质量模块的权限组名称
|
2023-12-06 14:53:38 +08:00 |
|
jinling.yang
|
71147eb7f9
|
新增质量权限组
|
2023-12-05 17:28:32 +08:00 |
|
jinling.yang
|
45df8f5bc2
|
新增采购权限
|
2023-12-04 17:34:23 +08:00 |
|
jinling.yang
|
6cf26e8029
|
新增采购权限组
|
2023-11-29 17:25:40 +08:00 |
|
jinling.yang
|
61da25a031
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/销售权限
# Conflicts:
# sf_manufacturing/models/product_template.py
|
2023-11-23 17:39:35 +08:00 |
|
龚启豪
|
9bb3b88fd6
|
Merge branch refs/heads/develop into refs/heads/feature/修改机床参数bug
|
2023-11-23 16:37:53 +08:00 |
|
qihao.gong@jikimo.com
|
baaeac10eb
|
修改设备生成名称规则，修改制造模块权限组定义
|
2023-11-23 16:33:09 +08:00 |
|
jinling.yang
|
5292826c72
|
新增销售权限
|
2023-11-22 17:58:41 +08:00 |
|
qihao.gong@jikimo.com
|
b4b5207aea
|
开发测试制造模块权限，修改设备机床类别的布局以及编码规则
|
2023-11-22 17:36:50 +08:00 |
|
qihao.gong@jikimo.com
|
e6bb5db0e1
|
开发sf制造模块权限角色
|
2023-11-21 17:42:36 +08:00 |
|
jinling.yang
|
f0e66c6d90
|
新增销售权限
|
2023-11-21 17:30:07 +08:00 |
|
jinling.yang
|
6ec6094c5e
|
1.新增销售和计划权限组2.优化代码格式
|
2023-11-21 16:10:05 +08:00 |
|
jinling.yang
|
e7df6c14b1
|
同步刀具标准库
|
2023-10-19 10:49:54 +08:00 |
|
jinling.yang
|
9acdcc0429
|
新增同步cloud的刀具标准库接口
|
2023-10-13 17:29:34 +08:00 |
|
qihao.gong@jikimo.com
|
b9d6e0ea35
|
材料型号同步接口修改 新增国际标准和材料应用
|
2023-10-09 17:35:39 +08:00 |
|
yuxianghui
|
35afdd3b2a
|
刀具物料功能模型从sf_base模块迁移到sf_manufacturing模块；新增每齿走刀量模型；整体式刀具物料新增关联每齿走刀量对象字段；
|
2023-09-08 10:20:52 +08:00 |
|
yuxianghui
|
ae3f7c9c0c
|
新增切削速度Vc对象，产品-整体式刀具物料新增切削速度Vc关联字段；删除部分产品-整体式刀具同步配置-刀具型号-整体式刀具参数。
|
2023-09-06 17:24:08 +08:00 |
|
yuxianghui
|
c8129478d5
|
新增加工方式、刀尖特征、柄部类型、走刀方向、适合冷却液五个模型对象；刀具物料查询新增上述五个关联对象；对产品的整体式刀具物料能力参数进行补充。
|
2023-09-04 17:29:20 +08:00 |
|
jinling.yang
|
6e6b0b66d3
|
去掉警告
|
2023-08-29 10:22:12 +08:00 |
|
qihao.gong@jikimo.com
|
08ac2978a1
|
移除托盘对象 并清除所有关联关系
|
2023-08-17 16:33:40 +08:00 |
|
jinling.yang
|
b1da9ff18b
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/页面展示优化
|
2023-07-17 16:48:44 +08:00 |
|
jinling.yang
|
5beb7b3417
|
优化装夹工单，新增工件装夹page，名字为组件的page名称改为物料，去掉单独的工件装夹功能
|
2023-07-13 16:57:48 +08:00 |
|
jinling.yang
|
a0570cb999
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/新增工件装夹
|
2023-07-07 17:38:04 +08:00 |
|
yuxianghui
|
5b5d41559c
|
优化了工作日历时间输入，新增工作日历设置自动计算时长功能，修改了生产线模型的位置（移至sf_maintenance模块下），优化了部分的产线设备资源设置模型
|
2023-07-07 14:36:27 +08:00 |
|
yuxianghui
|
123adcfc76
|
在sf_base下新增生产线模型，优化了计划管理-工作日历设置的手动输入时间和手动输入班次的格式
|
2023-07-06 17:38:08 +08:00 |
|
jinling.yang
|
66cd682f7d
|
优化工件装夹
|
2023-07-05 17:34:43 +08:00 |
|
jinling.yang
|
aea68f5239
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/新增夹具功能
# Conflicts:
# sf_base/__manifest__.py
# sf_base/models/__init__.py
# sf_mrs_connect/data/ir_cron_data.xml
# sf_mrs_connect/models/sync_common.py
|
2023-06-27 16:40:58 +08:00 |
|
jinling.yang
|
d18b1808d9
|
新增同步夹具相关的定时器
|
2023-06-27 16:35:30 +08:00 |
|
jinling.yang
|
87e3f6d04e
|
新增夹具和功能夹具，及同步mrs的夹具和功能夹具
|
2023-06-26 18:07:44 +08:00 |
|
mgw
|
65c8d4a4e9
|
sf刀具重构完成，同步方法测试完成
|
2023-06-25 16:44:10 +08:00 |
|
jinling.yang
|
c7ec8be141
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/刀具基础信息生成产品模板
|
2023-06-15 16:14:50 +08:00 |
|
jinling.yang
|
34cc5bf125
|
新增刀具及刀具型号联动展示相关字段并显示对应信息，不同刀具的页面布局
|
2023-06-14 19:22:52 +08:00 |
|
mgw
|
f6651ffffb
|
删除测试模型
|
2023-06-14 17:36:39 +08:00 |
|
mgw
|
93c5bcebe1
|
增加刀具物料同步功能
|
2023-06-14 16:33:53 +08:00 |
|
jinling.yang
|
6068a55b79
|
新增sf的刀具模板的相关刀具物料字段
|
2023-06-13 17:30:35 +08:00 |
|
mgw
|
3d1d5e6ef3
|
智能工厂刀具物料模型、关联关系及其界面已建立
|
2023-06-13 14:13:15 +08:00 |
|
yuxianghui
|
3a8c65c8d1
|
解决sf代码冲突问题
|
2023-06-13 11:19:06 +08:00 |
|
mgw
|
e0983d0530
|
解决权限冲突
|
2023-06-12 14:12:16 +08:00 |
|