jikimo/test
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
485 Commits 134 Branches 31 Tags
0d7c269c3bb7c4e2ea9c849d5943f8cac67155cd
Commit Graph

485 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
mgw
0d7c269c3b 继承原生库存模块，为位置模型增加库区库位等字段 2023-07-04 20:05:59 +08:00
马广威
4199a86264 Accept Merge Request #221: (feature/刀具管理同步优化，增加字段 -> develop) 
Merge Request: 修改依赖关系，解决依赖冲突

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/221?initial=true
 2023-06-30 15:17:49 +08:00
mgw
e0315bafc7 修改依赖关系，解决依赖冲突 2023-06-30 15:17:10 +08:00
马广威
1a937a7476 Accept Merge Request #220: (feature/刀具管理同步优化，增加字段 -> develop) 
Merge Request: 解决代码冲突


Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/220?initial=true
 2023-06-29 20:00:14 +08:00
mgw
576d2d7758 解决代码冲突 2023-06-29 19:59:39 +08:00
杨金灵
1f61cf7b5a Accept Merge Request #219: (feature/释放模型转换格式代码 -> develop) 
Merge Request: 刀具产品模板根据型号展示不同字段和值


Created By: @杨金灵
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/219?initial=true
 2023-06-29 18:55:52 +08:00
jinling.yang
05227b9022 刀具产品模板根据型号展示不同字段和值 2023-06-29 18:53:11 +08:00
马广威
4212340519 Accept Merge Request #218: (feature/刀具管理同步优化，增加字段 -> develop) 
Merge Request: 解决代码冲突问题


Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/218?initial=true
 2023-06-29 17:43:44 +08:00
mgw
dbb3ea8a35 解决代码冲突问题 2023-06-29 17:43:16 +08:00
jinling.yang
36fe0cab18 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop 2023-06-29 17:17:05 +08:00
jinling.yang
8f841314b5 Merge branch 'feature/新增夹具功能' into develop 2023-06-29 17:16:51 +08:00
杨金灵
5bcd1e579d Accept Merge Request #217: (feature/新增夹具功能 -> develop) 
Merge Request: 新增夹具功能

Created By: @杨金灵
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/217?initial=true
 2023-06-29 17:16:35 +08:00
jinling.yang
2c71439a96 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/新增夹具功能 2023-06-29 17:15:33 +08:00
jinling.yang
0f7f67aade Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/新增夹具功能 2023-06-29 17:14:48 +08:00
禹翔辉
0c515cd563 Accept Merge Request #216: (feature/sf刀具功能分支 -> develop) 
Merge Request: 优化了功能刀具自动申请装刀功能的数据显示问题


Created By: @禹翔辉
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/216?initial=true
 2023-06-29 16:54:10 +08:00
yuxianghui
80a88b8afb 优化了功能刀具自动申请装刀功能的数据显示问题 2023-06-29 16:54:18 +08:00
yuxianghui
69cb1adc3e 优化了功能刀具组装的出库弹窗里的确定、取消按键的显示，新增CAM装刀来源的任务出库后修改CAM用刀计划的状态改变为已完成 2023-06-29 15:56:08 +08:00
禹翔辉
7795cfef29 Accept Merge Request #215: (feature/sf刀具功能分支 -> develop) 
Merge Request: 优化了功能刀具组装的出库弹窗里的确定、取消按键的显示，新增CAM装刀来源的任务出库后修改CAM用刀计划的状态改变为已完成


Created By: @禹翔辉
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/215?initial=true
 2023-06-29 15:55:58 +08:00
马广威
e77eb4d20d Accept Merge Request #214: (feature/刀具管理同步优化，增加字段 -> develop) 
Merge Request: 刀具物料查询功能本地测试完成，推至线上测试


Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/214?initial=true
 2023-06-29 14:23:53 +08:00
mgw
8664c196f0 刀具物料查询功能本地测试完成，推至线上测试 2023-06-29 14:23:10 +08:00
yuxianghui
d5938bf407 优化了申请换刀功能的数据， 2023-06-29 14:16:10 +08:00
禹翔辉
b32722ca54 Accept Merge Request #213: (feature/sf刀具功能分支 -> develop) 
Merge Request: 优化了申请换刀功能的数据

Created By: @禹翔辉
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/213?initial=true
 2023-06-29 14:15:57 +08:00
jinling.yang
3907901dc3 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop 2023-06-29 11:18:13 +08:00
jinling.yang
6ad7a1e613 Merge branch 'feature/刀具产品模板优化' into develop 2023-06-29 11:17:49 +08:00
杨金灵
89475f46a3 Accept Merge Request #212: (feature/刀具产品模板优化 -> develop) 
Merge Request: 刀具产品模板优化

Created By: @杨金灵
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/212?initial=true
 2023-06-29 11:17:30 +08:00
jinling.yang
37b834b3cf 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-06-29 11:15:40 +08:00
马广威
78c13acbab Accept Merge Request #211: (feature/刀具管理同步优化，增加字段 -> develop) 
Merge Request: 刀具管理同步优化基本完成

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/211?initial=true
 2023-06-29 09:57:55 +08:00
mgw
2aae162f73 优化sf字段形式 2023-06-29 09:56:31 +08:00
禹翔辉
79dfa10d4e Accept Merge Request #210: (feature/sf刀具功能分支 -> develop) 
Merge Request: 新增批量出库功能（功能已完成，按键未增加），新增自动组装方法（todo），新增出库按键弹窗样式修改


Created By: @禹翔辉
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/210?initial=true
 2023-06-29 09:37:09 +08:00
yuxianghui
ec95e09553 新增批量出库功能（功能已完成，按键未增加），新增自动组装方法（todo），新增出库按键弹窗样式修改 2023-06-29 09:36:54 +08:00
mgw
7689701ab1 刀具同步优化完成，字段已添加 2023-06-28 20:49:16 +08:00
jinling.yang
b02cb16dc9 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/刀具产品模板优化 
# Conflicts:
#	sf_tool_management/__manifest__.py
#	sf_tool_management/views/tool_base_views.xml
 2023-06-28 18:34:39 +08:00
jinling.yang
eab6f0ceee 刀具产品页面刀具物料及型号字段修改 2023-06-28 18:32:45 +08:00
龚启豪
05e69d21fa Accept Merge Request #209: (feature/设备维保 -> develop) 
Merge Request: 设备维保模块

Created By: @龚启豪
Accepted By: @龚启豪
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/209
 2023-06-28 10:39:28 +08:00
龚启豪
ec0da8cf76 Merge branch refs/heads/develop into refs/heads/feature/设备维保 2023-06-28 10:39:23 +08:00
马广威
6dc167fae1 Accept Merge Request #208: (feature/sf刀具基础信息管理 -> develop) 
Merge Request: 优化search筛选框界面显示异常


Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/208?initial=true
 2023-06-28 10:17:45 +08:00
禹翔辉
cb56a3ed83 Accept Merge Request #207: (feature/sf刀具功能分支 -> develop) 
Merge Request: 新增功能刀具计划模型（已完成），新增功能刀具组装（未完成），优化了功能刀具管理和功能刀具有关的代码

Created By: @禹翔辉
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/207?initial=true
 2023-06-28 10:07:21 +08:00
mgw
59ae98a21c 优化search筛选框界面显示异常 2023-06-28 10:03:24 +08:00
yuxianghui
5dba31576a 优化了功能刀具管理的代码 2023-06-28 10:02:59 +08:00
yuxianghui
c94c661506 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/sf刀具功能分支 
# Conflicts:
#	sf_tool_management/views/tool_base_views.xml
 2023-06-28 09:15:55 +08:00
qihao.gong@jikimo.com
1eea2bb1c3 处理设备与设备维保标准的关联关系方法，新增设备故障报警日志页面 2023-06-27 17:32:24 +08:00
yuxianghui
d6f749fff5 新增功能刀具组装的组装弹窗按键功能（功能已完成）、取消组装功能按键（功能已完成）、出库弹窗按键（已完成视图） 2023-06-27 17:31:49 +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
马广威
8b94696dc3 Accept Merge Request #205: (feature/sf刀具基础信息管理 -> develop) 
Merge Request: sf刀具重构完成，同步方法测试完成


Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/205?initial=true
 2023-06-27 16:27:32 +08:00
yuxianghui
e880b020c6 增加了机台换刀申请和CAM程序用刀计划的搜索视图，增加了机台换刀申请的自动换刀功能，增加了CAM程序用刀计划的自动换刀申请功能（待完善） 2023-06-27 10:20:31 +08:00
yuxianghui
1348712c83 新增了功能刀具组装界面，新增了功能刀具计划的按键功能，以及按键的显示功能 2023-06-26 18:10:37 +08:00
jinling.yang
87e3f6d04e 新增夹具和功能夹具，及同步mrs的夹具和功能夹具 2023-06-26 18:07:44 +08:00
qihao.gong@jikimo.com
cf91ef5604 设备维保计划 2023-06-26 17:32:56 +08:00
qihao.gong@jikimo.com
8b227d9ac9 设备维保 2023-06-25 17:37:55 +08:00