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

920 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
yuxianghui
eccc4c3ade 新增功能刀具组装对象组装新刀具时创建功能刀具预警、功能刀具实时分布、功能刀具出入库记录的记录；新增新刀具取消组装时删除功能刀具预警、功能刀具实时分布、功能刀具出入库记录的记录；新增同步功能刀具列表数据到功能刀具预警、功能刀具实时分布、功能刀具出入库记录对象；新增同步功能刀具组装数据到功能刀具预警对象；新增功能刀具出入库记录和功能刀具实时分布对象分组展示全部功能刀具类型。 2023-08-10 16:41:41 +08:00
禹翔辉
a764f42d23 Accept Merge Request #306: (feature/刀具管理问题优化 -> develop) 
Merge Request: 优化了刀具管理模块的功能刀具组装、CAM工单程序用刀计划、机床换刀申请模型的问题。

Created By: @禹翔辉
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/306?initial=true
 2023-08-09 15:04:02 +08:00
yuxianghui
650a29b74f Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/刀具管理问题优化 2023-08-09 15:01:39 +08:00
yuxianghui
1e1b0dd359 新增功能刀具组装界面和CAM工单程序用刀计划界面、机床换刀申请界面相互跳转功能按钮；功能刀具预警新增展示分组展示全部CNC机床，功能刀具实时分布修改数量相关字段类型为Integer，并新增自动计算合计数和总数功能 2023-08-09 15:00:59 +08:00
龚启豪
8d126a0024 Accept Merge Request #305: (feature/修改设备模块 -> develop) 
Merge Request: 修改路线多规则条件选取

Created By: @龚启豪
Accepted By: @龚启豪
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/305?initial=true
 2023-08-09 10:00:17 +08:00
qihao.gong@jikimo.com
06d73a815f Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改设备模块 2023-08-09 09:59:11 +08:00
qihao.gong@jikimo.com
386b5eb11c 修改采购入库路线多规则条件选取 2023-08-09 09:58:51 +08:00
jinling.yang
9fe58a1fba 刀具型号页面布局 2023-08-08 18:17:49 +08:00
yuxianghui
924b838a83 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/刀具管理问题优化 2023-08-08 18:09:49 +08:00
yuxianghui
b2012c004a 新增刀具管理按键使用提示，调整相关按键布局；新增机床换刀申请、CAM装刀申请界面、功能刀具组装界面的tree视图左侧分组显示全部信息；优化三个界面相关字段；新增功能刀具组装界面刀具物料信息无数据隐藏，功能刀具组装申请组装界面刀具物料信息根据不同情况隐藏；新增功能刀具组装的刀具物料字段根据所选型号自动带出。 2023-08-08 18:08:53 +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
许何哲
be53b012f1 Accept Merge Request #304: (feature/tree视图表格样式修改 -> develop) 
Merge Request: 调试线上sf的bug

Created By: @许何哲
Accepted By: @许何哲
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/304?initial=true
 2023-08-08 14:45:47 +08:00
WEB许何哲\xuhez
35ef00a8cd Merge branch 'develop' into feature/tree视图表格样式修改 2023-08-08 14:43:48 +08:00
WEB许何哲\xuhez
0e292ea597 调试线上sf的bug 2023-08-08 14:42:10 +08:00
jinling.yang
b3f2065edd 夹具物料注册 2023-08-07 17:29:17 +08:00
许何哲
7fb585dfdd Accept Merge Request #303: (feature/tree视图表格样式修改 -> develop) 
Merge Request: 标签页筛选完后看板视图的样式修改

Created By: @许何哲
Accepted By: @许何哲
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/303?initial=true
 2023-08-07 16:58:41 +08:00
WEB许何哲\xuhez
194bb28085 Merge branch 'develop' into feature/tree视图表格样式修改 2023-08-07 16:51:09 +08:00
WEB许何哲\xuhez
46f40ec480 修改标签页筛选完后看板视图的样式 2023-08-07 16:49:36 +08:00
龚启豪
a99fe44408 Accept Merge Request #302: (feature/修改设备模块 -> develop) 
Merge Request: 修改设备基础参数以及同步方法

Created By: @龚启豪
Accepted By: @龚启豪
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/302?initial=true
 2023-08-07 16:06:08 +08:00
qihao.gong@jikimo.com
432920b100 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改设备模块 2023-08-07 16:03:13 +08:00
qihao.gong@jikimo.com
f0e1939b95 修改设备参数以及机床型号基础参数以及同步cloud方法 2023-08-07 16:00:26 +08:00
WEB许何哲\xuhez
f85a0e4c85 删除searchPannel 2023-08-07 15:06:35 +08:00
WEB许何哲\xuhez
578d9c46d9 Merge branch 'develop' into feature/tree视图表格样式修改 
# Conflicts:
#	sf_manufacturing/static/src/js/kanban_change.js
#	sf_manufacturing/static/src/scss/kanban_change.scss
#	sf_manufacturing/views/mrp_workcenter_views.xml
 2023-08-07 14:51:55 +08:00
WEB许何哲\xuhez
5a28ec7579 工作中心看板视图标签页的动态添加并实现点击筛选 2023-08-07 14:48:55 +08:00
马广威
d971cbd5f1 Accept Merge Request #301: (feature/坯料排程 -> develop) 
Merge Request: 看板视图一句标签进行筛选基础功能已完成

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/301?initial=true
 2023-08-07 14:39:48 +08:00
mgw
72a0be3a54 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/坯料排程 2023-08-07 14:38:18 +08:00
mgw
5f04cbb896 看板视图css调整（老许做的） 2023-08-07 14:37:58 +08:00
mgw
4f893929ca 工作中心看板视图动态添加标签页并可初步进行点击晒选 2023-08-07 10:50:44 +08:00
mgw
de32f5db78 看板视图筛选实现功能的条件已具备（看板已抠，字段存在），待优化 2023-08-07 08:58:50 +08:00
jinling.yang
aa7e39c28a 新增采购入库时实时注册夹具产品到cloud 2023-08-04 17:33:21 +08:00
qihao.gong@jikimo.com
0838ff417f Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改设备模块 2023-08-04 17:32:09 +08:00
qihao.gong@jikimo.com
2321304e2a 修改设备 2023-08-04 17:31:47 +08:00
禹翔辉
1910b461f3 Accept Merge Request #300: (feature/刀具管理 -> develop) 
Merge Request: 优化了功能刀具组装对象组装和取消组装时功能刀具列表的many2many类型字段赋值为[]时值不修改的问题  

Created By: @禹翔辉
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/300?initial=true
 2023-08-04 16:54:36 +08:00
yuxianghui
2a1b39b0fb Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/刀具管理 2023-08-04 16:24:43 +08:00
yuxianghui
cd042a8073 优化了功能刀具组装对象组装和取消组装时功能刀具列表的many2many类型字段赋值为[]时值不修改的问题 2023-08-04 16:24:12 +08:00
禹翔辉
c75e1b3c19 Accept Merge Request #299: (feature/刀具管理 -> develop) 
Merge Request: 优化了功能刀具组装出库bug，优化了功能刀具组装对象组装旧刀具时的bug 

Created By: @禹翔辉
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/299?initial=true
 2023-08-04 10:43:02 +08:00
yuxianghui
7f6ea605d2 优化了功能刀具组装出库bug，优化了功能刀具组装对象组装旧刀具时的bug 2023-08-04 10:40:35 +08:00
yuxianghui
9203f13161 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/刀具管理 2023-08-04 09:20:31 +08:00
许何哲
cb011a9bd7 Accept Merge Request #298: (feature/tree视图表格样式修改 -> develop) 
Merge Request: sf工作中心看板视图标签页的动态添加

Created By: @许何哲
Accepted By: @许何哲
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/298?initial=true
 2023-08-03 17:36:29 +08:00
WEB许何哲\xuhez
da7184d841 Merge branch 'develop' into feature/tree视图表格样式修改 
# Conflicts:
#	sf_manufacturing/static/src/xml/kanban_change.xml
 2023-08-03 17:34:54 +08:00
WEB许何哲\xuhez
921336ad13 no message 2023-08-03 17:32:43 +08:00
WEB许何哲\xuhez
17476fdcf4 工作中心看板视图动态添加标签页 2023-08-03 17:31:11 +08:00
yuxianghui
fe310de31d 新增功能刀具列表缓存对象，新增组装旧刀是创建缓存数据，新增取消组装时清除缓存数据 2023-08-03 17:29:26 +08:00
马广威
d0fab40b03 Accept Merge Request #297: (feature/odoo16前端rpc拿取后端生产线数据 -> develop) 
Merge Request: 实现基础的rpc拿取后端生产线数据功能

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/297?initial=true
 2023-08-03 17:25:06 +08:00
mgw
810ef41c05 实现基础的rpc拿取后端生产线数据功能 2023-08-03 17:24:37 +08:00
杨金灵
30ad60c2c1 Accept Merge Request #296: (feature/夹具型号和功能夹具反向注册到cloud -> develop) 
Merge Request: 制造模块里的配置内的页面优化

Created By: @杨金灵
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/296?initial=true
 2023-08-03 16:57:56 +08:00
jinling.yang
5df00e14da 制造模块里的配置内的页面优化 2023-08-03 16:57:18 +08:00
jinling.yang
1929fb1b57 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/夹具型号和功能夹具反向注册到cloud 2023-08-03 15:58:18 +08:00
jinling.yang
06bb0f77c9 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/夹具型号和功能夹具反向注册到cloud 2023-08-03 15:57:38 +08:00
yuxianghui
aed5ac4c3d Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/刀具管理 2023-08-03 14:31:46 +08:00