jikimo/jikimo_sf
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,702 Commits 134 Branches 0 Tags
461bc1f86eb440c57b3004ab5af857986c91f4dc
Commit Graph

308 Commits

Author SHA1 Message Date
yuxianghui
ae3f7c9c0c 新增切削速度Vc对象，产品-整体式刀具物料新增切削速度Vc关联字段；删除部分产品-整体式刀具同步配置-刀具型号-整体式刀具参数。 2023-09-06 17:24:08 +08:00
yuxianghui
5353630975 撤销制造-配置-刀具型号新增的参数；对产品刀具物料字段的限制优化 2023-09-06 16:48:07 +08:00
yuxianghui
0b8042f07a 配置-刀具型号新增整体式刀具能力参数补充；补充产品-整体式刀具同步配置-刀具型号-整体式刀具参数。 2023-09-06 11:02:55 +08:00
yuxianghui
f8c5553837 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/整体式刀具能力参数补充 2023-09-05 17:22:45 +08:00
yuxianghui
a6ddfa22a1 对产品的整体式刀具能力参数进行补充，对参数字段进行优化；对刀具物料查询的字段类型进行调整。 2023-09-05 17:21:39 +08:00
WEB许何哲\xuhez
26f07a00c3 Merge branch 'develop' into feature/sf品牌页面表格样式的修改 2023-09-05 16:45:32 +08:00
WEB许何哲\xuhez
b47dbe29c0 修改tree视图样式bug 2023-09-05 16:44:42 +08:00
马广威
dbeb975cf6 Accept Merge Request #362: (feature/生产排程 -> develop) 
Merge Request: 创建制造订单时同步创建排程单

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/362?initial=true
 2023-09-05 10:41:22 +08:00
mgw
e5213d06ae 创建制造订单时同步创建排程单 2023-09-05 10:40:25 +08:00
马广威
a0affba407 Accept Merge Request #361: (feature/生产排程 -> develop) 
Merge Request: 基本排程功能合并

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/361?initial=true
 2023-09-05 09:33:01 +08:00
jinling.yang
d07098bae1 产品库存应用没有在cloud生成动态的夹具和刀具物料Bug修复 2023-08-31 17:32:42 +08:00
jinling.yang
908e8b3ff2 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
jinling.yang
e9afce298d SF点击后获取cnc程序按钮，cloud生成的编程单的编号未显示Bug修复 2023-08-29 17:40:16 +08:00
qihao.gong@jikimo.com
27571942c9 增肌OCC 2023-08-29 15:49:14 +08:00
WEB许何哲\xuhez
7713ade077 sf品牌页面表格样式的修改 2023-08-29 15:13:59 +08:00
yuxianghui
be0f62ffe0 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/自建模块日志警告信息处理 
# Conflicts:
#	sf_base/models/fixture.py
#	sf_manufacturing/models/model_type.py
#	sf_manufacturing/models/product_template.py
#	sf_sale/models/quick_easy_order.py
 2023-08-29 11:21:13 +08:00
jinling.yang
6e6b0b66d3 去掉警告 2023-08-29 10:22:12 +08:00
yuxianghui
39feda07e5 自建模块日志警告信息处理 2023-08-28 17:31:41 +08:00
mgw
e3f58ccee8 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/生产排程 2023-08-25 10:43:39 +08:00
mgw
7e071151a8 删除制造订单处排程相关的部分，排程模块架构改造完成 2023-08-25 10:43:22 +08:00
mgw
eda57036bd Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/生产排程 2023-08-25 09:14:34 +08:00
mgw
e33a25e47a 更改排程结构前备份 2023-08-25 09:14:15 +08:00
jinling.yang
e7d32e5041 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/新增上传模型功能 2023-08-24 17:32:59 +08:00
jinling.yang
55504c2725 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/新增上传模型功能 2023-08-24 17:32:25 +08:00
qihao.gong@jikimo.com
3b3847990d 工作重心看板展示设备状态以及图片，设备看板增加负责人 2023-08-24 14:51:03 +08:00
mgw
bf7ef78b20 搭建排程基础架构 2023-08-24 11:24:27 +08:00
yuxianghui
f88dd790a0 生产线新增关联工作中心字段，优化看板和form视图布局 2023-08-18 15:11:36 +08:00
jinling.yang
3cef87ea46 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/刀具物料与夹具物料的反注册 
# Conflicts:
#	sf_base/views/base_view.xml
#	sf_base/views/common_view.xml
#	sf_tool_management/models/base.py
 2023-08-17 18:09:19 +08:00
jinling.yang
97fcf6d91f Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/刀具物料与夹具物料的反注册 
# Conflicts:
#	sf_base/views/base_view.xml
 2023-08-17 18:03:12 +08:00
qihao.gong@jikimo.com
08ac2978a1 移除托盘对象 并清除所有关联关系 2023-08-17 16:33:40 +08:00
jinling.yang
8a99bd8589 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/刀具物料与夹具物料的反注册 2023-08-15 17:31:49 +08:00
jinling.yang
e638245b8a Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/刀具物料与夹具物料的反注册 
# Conflicts:
#	sf_mrs_connect/models/res_config_setting.py
 2023-08-08 17:18:06 +08:00
jinling.yang
b3f2065edd 夹具物料注册 2023-08-07 17:29:17 +08:00
WEB许何哲\xuhez
5a28ec7579 工作中心看板视图标签页的动态添加并实现点击筛选 2023-08-07 14:48:55 +08:00
mgw
de32f5db78 看板视图筛选实现功能的条件已具备（看板已抠，字段存在），待优化 2023-08-07 08:58:50 +08:00
jinling.yang
aa7e39c28a 新增采购入库时实时注册夹具产品到cloud 2023-08-04 17:33:21 +08:00
jinling.yang
5c2e7c80da 1.产品模板优化：增加产品类别的搜索面板 
2.夹具型号注册到cloud：夹具型号的Tree和form视图去掉不可增删改操作，页面新增时编码根据夹具物料回显不同的编码；新增注册按钮及对应的注册接口
3.功能夹具注册到cloud：.功能夹具的Tree和form视图去掉不可增删改操作，页面新增时编码和名称根据功能夹具类型和对应的托盘型号所进行回显
 2023-08-01 17:39:40 +08:00
jinling.yang
72b3e736c0 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/Bug修复 2023-07-26 18:39:59 +08:00
jinling.yang
ae2fdad4f1 1.物料page里的库存模型新增物料长宽高三个字段 
2.修复功能夹具同步Bug
3.夹具物料新增不可删除控制
 2023-07-21 17:35:44 +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
f68dce9ee2 修复产品模板中产品类别为刀具和夹具时，根据产品类别为刀具和夹具时，新增的page页面里的字段显示及回显Bug 2023-07-17 16:46:01 +08:00
mgw
c0d14daf44 修复工作中心计划报错的问题，修改制造模块目录结构 2023-07-17 15:37:23 +08:00
jinling.yang
98d3e61d66 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化夹具产品模板 
# Conflicts:
#	sf_maintenance/__manifest__.py
#	sf_manufacturing/__manifest__.py
 2023-07-14 10:05:01 +08:00
qihao.gong@jikimo.com
8f795096c3 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/订单计划 
# Conflicts:
#	sf_maintenance/__manifest__.py
#	sf_manufacturing/views/mrp_workcenter_views.xml
 2023-07-14 09:02:48 +08:00
jinling.yang
7a690abe1a Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/新增工件装夹 
# Conflicts:
#	sf_maintenance/__manifest__.py
 2023-07-13 16:58:49 +08:00
jinling.yang
5beb7b3417 优化装夹工单，新增工件装夹page，名字为组件的page名称改为物料，去掉单独的工件装夹功能 2023-07-13 16:57:48 +08:00
yuxianghui
81842dc5ec 将生产线模型从设备模块搬移到了制造模块，新增工作日历设置修改休息日字段则工作日历创建新记录 2023-07-13 16:05:38 +08:00
jinling.yang
7743c9658c 工单菜单优化 2023-07-10 17:33:17 +08:00
qihao.gong@jikimo.com
78fd5a7ac3 修改工作中心与设备关联关系 2023-07-10 10:03:02 +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