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

932 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
许何哲
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
yuxianghui
03cc5b2281 新增功能刀具组装对象取消组装时删除组装时所创建的功能刀具列表信息，删除了功能刀具组装对象组装时创建功能刀具预警、实时分布、出入库记录信息的功能。 2023-08-03 14:31:16 +08:00
马广威
8c963be133 Accept Merge Request #295: (feature/odoo16翻译研究 -> develop) 
Merge Request: 优化未生效翻译

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/295?initial=true
 2023-08-03 13:06:19 +08:00
mgw
1afd164712 优化未生效翻译 2023-08-03 13:05:49 +08:00
马广威
0eedca58e9 Accept Merge Request #294: (feature/odoo16翻译研究 -> develop) 
Merge Request: 新增翻译问题解决

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/294?initial=true
 2023-08-03 11:58:53 +08:00
mgw
95c57a3ffb 新增翻译问题解决 2023-08-03 11:55:46 +08:00
马广威
48d673a48e Accept Merge Request #293: (feature/odoo16翻译研究 -> develop) 
Merge Request: 制造订单处字段调整完成，翻译优化完成

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/293?initial=true
 2023-08-02 18:04:16 +08:00
mgw
3f3a72a905 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/odoo16翻译研究 2023-08-02 18:03:41 +08:00
mgw
3c934e3a4b 制造订单处字段调整完成，翻译优化完成 2023-08-02 18:01:28 +08:00
jinling.yang
24afa53028 新增功能夹具接口 2023-08-02 17:35:09 +08:00
禹翔辉
5c2a9f62dc Accept Merge Request #292: (feature/刀具管理 -> develop) 
Merge Request: 优化了刀具管理-功能刀具组装的刀具物料字段，新增功能刀具组装完成时新建功能刀具列表、预警、实时分布、出入库记录数据功能  

Created By: @禹翔辉
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/292?initial=true
 2023-08-02 17:30:45 +08:00
yuxianghui
57de3f9456 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/刀具管理 2023-08-02 17:29:31 +08:00
yuxianghui
6c001b6950 优化了刀具管理-功能刀具组装的刀具物料字段，新增功能刀具组装完成时新建功能刀具列表、预警、实时分布、出入库记录数据功能 2023-08-02 17:29:02 +08:00
马广威
f940d1bf24 Accept Merge Request #291: (feature/odoo16翻译研究 -> develop) 
Merge Request: 补充部分未生效翻译

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/291?initial=true
 2023-08-02 10:18:11 +08:00
mgw
aaeab9a241 补充部分未生效翻译 2023-08-02 10:17:00 +08:00
mgw
109674bdb5 修改 概述 为 生产线驾驶舱 2023-08-02 10:10:38 +08:00
马广威
49e0c64dfd Accept Merge Request #290: (feature/odoo16翻译研究 -> develop) 
Merge Request: 修改设备处翻译

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/290?initial=true
 2023-08-02 10:00:08 +08:00
mgw
f71c437b46 修改设备处翻译 2023-08-02 09:59:13 +08:00
马广威
26a6d01654 Accept Merge Request #289: (feature/odoo16翻译研究 -> develop) 
Merge Request: odoo16质量模块翻译本地测试完成

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/289?initial=true
 2023-08-02 09:33:41 +08:00
mgw
1670b3fd78 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/odoo16翻译研究 2023-08-02 09:31:56 +08:00
mgw
d7729028cf 质量模块的改造已完成，本地已测试 2023-08-02 09:31:06 +08:00
yuxianghui
858acf053e Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/刀具管理 2023-08-01 17:41:54 +08:00
yuxianghui
d574925122 1、刀具管理-机床换刀申请、CAM工单程序用刀计划、功能刀具组装增加了机床、功能刀具和功能刀具类型字段的关联关系，增加了tree视图功能按键 2、优化了CAM工单程序用刀计划的按键功能 3、对三个对象的字段的可读性进行了调整 2023-08-01 17:41:21 +08:00
jinling.yang
5c2e7c80da 1.产品模板优化：增加产品类别的搜索面板 
2.夹具型号注册到cloud：夹具型号的Tree和form视图去掉不可增删改操作，页面新增时编码根据夹具物料回显不同的编码；新增注册按钮及对应的注册接口
3.功能夹具注册到cloud：.功能夹具的Tree和form视图去掉不可增删改操作，页面新增时编码和名称根据功能夹具类型和对应的托盘型号所进行回显
 2023-08-01 17:39:40 +08:00
mgw
6abafcaf68 设备处翻译优化完成 2023-08-01 17:15:30 +08:00
杨金灵
f6e50161c6 Accept Merge Request #288: (feature/产品增加搜索面板 -> develop) 
Merge Request: 产品新增搜索面板

Created By: @杨金灵
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/288?initial=true
 2023-08-01 15:09:23 +08:00
jinling.yang
7c8e470199 产品新增搜索面板 2023-08-01 15:08:32 +08:00
马广威
a4f511b47b Accept Merge Request #287: (feature/odoo16翻译研究 -> develop) 
Merge Request: 测试制造模块的翻译效果

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/287?initial=true
 2023-08-01 10:17:44 +08:00
mgw
84aeb0d8eb Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/odoo16翻译研究 2023-08-01 10:17:08 +08:00
mgw
501756d4e7 测试制造模块更改后的翻译，本地已生效 2023-08-01 10:16:47 +08:00
龚启豪
06630fb85e Accept Merge Request #286: (feature/修改设备模块 -> develop) 
Merge Request: 修改设备模块bug

Created By: @龚启豪
Accepted By: @龚启豪
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/286?initial=true
 2023-07-28 15:46:37 +08:00
qihao.gong@jikimo.com
10fde2b175 Merge branch 'feature/修改设备基础参数' into develop 2023-07-28 15:33:55 +08:00
qihao.gong@jikimo.com
06de46c084 修改设备模块 2023-07-28 15:33:31 +08:00
qihao.gong@jikimo.com
2b69524c57 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改设备基础参数 2023-07-28 15:32:37 +08:00
杨金灵
7eca8110cf Accept Merge Request #285: (feature/同步的相关模型页面优化 -> develop) 
Merge Request: 同步的模型的页面不可增删改

Created By: @杨金灵
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/285?initial=true
 2023-07-27 15:47:01 +08:00
jinling.yang
47b2e8c709 1.同步的模型的页面不可增删改 
2.工单的物料里新增长宽高字段
 2023-07-27 15:45:45 +08:00
马广威
6380e1ad0a Accept Merge Request #284: (feature/库存扫码研究 -> develop) 
Merge Request: 修改位置占用bug

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/284?initial=true
 2023-07-27 09:23:49 +08:00
mgw
0e2973f01e 修改位置占用bug 2023-07-27 09:21:24 +08:00
jinling.yang
d7a7256929 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop 2023-07-26 18:57:56 +08:00