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

699 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
WEB许何哲\xuhez
65ec935a9f 0626提交 2023-06-26 17:35:55 +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
yuxianghui
c37166397e 完成了机台换刀申请的换刀申请按键弹窗数据同步回机台换刀申请界面以及转移按键界面、CAM工单程序用刀计划的申请装刀界面 2023-06-25 17:36:33 +08:00
mgw
65c8d4a4e9 sf刀具重构完成，同步方法测试完成 2023-06-25 16:44:10 +08:00
yuxianghui
f135f0a5e7 完成了弹窗换刀需求信息的视图和默认数据的同步 2023-06-21 17:21:58 +08:00
yuxianghui
6caae0325a 功能刀具计划（换刀申请和CAM工单程序用刀计划）视图已完成 2023-06-20 16:51:06 +08:00
杨金灵
15304d6eb5 Accept Merge Request #204: (feature/采购刀具产品优化序列号生成规则 -> develop) 
Merge Request: 采购刀具产品入库优化序列号生成规则

Created By: @杨金灵
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/204?initial=true
 2023-06-16 17:13:09 +08:00
jinling.yang
6dc2935741 采购入库若选择的产品是刀具，则优化序列号生成规则 2023-06-16 17:10:31 +08:00
禹翔辉
8c9a211295 Accept Merge Request #203: (feature/sf刀具功能分支 -> develop) 
Merge Request: 智能工厂类型备注样式调整

Created By: @禹翔辉
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/203?initial=true
 2023-06-16 11:13:21 +08:00
龚启豪
7d6bd9119b Accept Merge Request #202: (feature/功能刀具页面 -> develop) 
Merge Request: 处理bug

Created By: @龚启豪
Accepted By: @龚启豪
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/202?initial=true
 2023-06-16 11:02:15 +08:00
yuxianghui
062b50d34c 智能工厂类型备注样式调整 2023-06-16 11:01:24 +08:00
qihao.gong@jikimo.com
23aba08c87 处理bug 2023-06-16 10:56:25 +08:00
yuxianghui
b835103cef 功能刀具管理根据所选功能刀具类型自动填充功能刀具数据（该功能已注释） 2023-06-16 10:07:35 +08:00
qihao.gong@jikimo.com
018fecfc59 处理冲突 2023-06-16 10:02:33 +08:00
qihao.gong@jikimo.com
e9ad452c43 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/功能刀具页面 
# Conflicts:
#	sf_tool_management/__init__.py
#	sf_tool_management/__manifest__.py
#	sf_tool_management/models/__init__.py
#	sf_tool_management/models/base.py
#	sf_tool_management/security/ir.model.access.csv
#	sf_tool_management/views/menu_view.xml
#	sf_tool_management/views/tool_base_views.xml
 2023-06-16 10:01:23 +08:00
禹翔辉
376731fbd9 Accept Merge Request #201: (feature/sf刀具功能分支 -> develop) 
Merge Request: 优化了功能刀具实时分布和出入库记录的视图显示效果

Created By: @禹翔辉
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/201?initial=true
 2023-06-15 17:05:26 +08:00
yuxianghui
4f7489f471 优化了功能刀具实时分布和出入库记录的视图显示效果 2023-06-15 17:04:40 +08:00
jinling.yang
ff904c2c02 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop 2023-06-15 16:19:05 +08:00
WEB许何哲\xuhez
c81730d7ba 0615t提交 2023-06-15 16:18:34 +08:00
jinling.yang
f455f1e7b4 Merge branch 'feature/刀具基础信息生成产品模板' into develop 2023-06-15 16:18:27 +08:00
杨金灵
0259270ece Accept Merge Request #200: (feature/刀具基础信息生成产品模板 -> develop) 
Merge Request: 刀具基础信息生成产品模板

Created By: @杨金灵
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/200?initial=true
 2023-06-15 16:18:04 +08:00
jinling.yang
8a0d89161b Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/刀具基础信息生成产品模板 2023-06-15 16:15:28 +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
马广威
95870699d5 Accept Merge Request #199: (feature/sf刀具基础信息管理 -> develop) 
Merge Request: 修复同步bug

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/199?initial=true
 2023-06-15 15:41:41 +08:00
mgw
ba93adfb7b 修复同步bug（刀片类型字段无值） 2023-06-15 15:40:23 +08:00
马广威
a219a17165 Accept Merge Request #198: (feature/sf刀具基础信息管理 -> develop) 
Merge Request: 型号对象增加搜索视图

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/198?initial=true
 2023-06-15 12:21:00 +08:00
mgw
b1da7a8fda 型号对象增加搜索视图 2023-06-15 12:20:26 +08:00
禹翔辉
8b549a19a8 Accept Merge Request #197: (feature/sf刀具功能分支 -> develop) 
Merge Request: 关联了功能刀具和功能刀具管理俩个对象

Created By: @禹翔辉
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/197
 2023-06-15 10:00:20 +08:00
yuxianghui
fc6b756aaf 关联了功能刀具和功能刀具管理俩个对象 2023-06-15 09:57:14 +08:00
禹翔辉
1eeafeddb9 Accept Merge Request #196: (feature/sf刀具功能分支 -> develop) 
Merge Request: 增加了功能刀具实时分布和出入库记录功能模型

Created By: @禹翔辉
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/196?initial=true
 2023-06-15 09:08:56 +08:00
jinling.yang
34cc5bf125 新增刀具及刀具型号联动展示相关字段并显示对应信息，不同刀具的页面布局 2023-06-14 19:22:52 +08:00
马广威
a205220acd Accept Merge Request #195: (feature/sf刀具基础信息管理 -> develop) 
Merge Request: 删除测试模型及其界面

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/195
 2023-06-14 17:38:14 +08:00
mgw
f6651ffffb 删除测试模型 2023-06-14 17:36:39 +08:00
qihao.gong@jikimo.com
b8dc06a7c7 sf功能刀具管理页面 2023-06-14 17:18:03 +08:00
马广威
08f8d7f03a Accept Merge Request #194: (feature/sf刀具基础信息管理 -> develop) 
Merge Request: 增加物料刀具同步功能，修复一些问题

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/194?initial=true
 2023-06-14 16:35:54 +08:00
mgw
93c5bcebe1 增加刀具物料同步功能 2023-06-14 16:33:53 +08:00
yuxianghui
24fd92fa3b 对功能刀具预警、实时分布和出入库记录的代码进行了合并优化 2023-06-14 16:27:16 +08:00
qihao.gong@jikimo.com
c919dac8cb 刀具管理 2023-06-13 17:33:38 +08:00
WEB许何哲\xuhez
414f485c17 0613修改侧边栏 2023-06-13 17:32:21 +08:00
jinling.yang
6068a55b79 新增sf的刀具模板的相关刀具物料字段 2023-06-13 17:30:35 +08:00
yuxianghui
3236d477c0 sf的功能刀具实时分布和功能刀具出入库记录视图界面已建立 2023-06-13 17:13:15 +08:00