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

713 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
jinling.yang
eebc4f7a63 Merge branch 'feature/Bug修复' into develop 2023-07-26 18:55:24 +08:00
杨金灵
0f3f27ff26 Accept Merge Request #283: (feature/Bug修复 -> develop) 
Merge Request: 夹具优化

Created By: @杨金灵
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/283?initial=true
 2023-07-26 18:54:18 +08:00
jinling.yang
21a69a1048 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/Bug修复 2023-07-26 18:52:56 +08:00
jinling.yang
7ee652d021 1.夹具物料,联装类型，功能夹具类型的Tree视图去掉删除方法和删除操作;同步的方法里新增active字段 
2.品牌模型新增厂家型号字段
3.修复3D模型全屏展示及不显示模型Bug
 2023-07-26 18:52:27 +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
马广威
459a9c3fbb Accept Merge Request #282: (feature/修复粗心导致的同步bug -> develop) 
Merge Request: 修复同步bug

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/282?initial=true
 2023-07-26 16:53:36 +08:00
mgw
7671830648 修复同步bug 2023-07-26 16:52:56 +08:00
马广威
b1ea52cbe3 Accept Merge Request #281: (feature/修改缺陷 -> develop) 
Merge Request: 去掉自定义barcode，暂时取消功能刀具的同步

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/281?initial=true
 2023-07-26 15:27:09 +08:00
mgw
503361a847 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改缺陷 2023-07-26 15:25:42 +08:00
mgw
bace7aa175 去掉自定义barcode，暂时取消同步功能刀具 2023-07-26 15:25:12 +08:00
禹翔辉
fd7875b24e Accept Merge Request #280: (feature/刀具管理 -> develop) 
Merge Request: 刀具管理-功能刀具列表、预警、实时分布、出入库记录优化

Created By: @禹翔辉
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/280?initial=true
 2023-07-26 15:19:50 +08:00
yuxianghui
e5c5aa6cdd 刀具管理-新增功能刀具预警、功能刀具实时分布、功能刀具出入库记录对象（tree视图、form视图已完成）；功能刀具管理对象修改为功能刀具列表对象，并优化了字段信息，优化了tree视图展示字段，新增form视图；解除了功能刀具列表对象与功能刀具对象的继承关系。 2023-07-26 15:17:12 +08:00
yuxianghui
98f9269766 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/刀具管理 2023-07-25 17:43:02 +08:00
yuxianghui
d3c7f8cd56 新增了功能刀具列表的form视图，简化了tree视图字段 2023-07-25 17:42:47 +08:00
qihao.gong@jikimo.com
f246827d3d 修改设备模块布局 2023-07-25 17:27:11 +08:00
禹翔辉
bcec481268 Accept Merge Request #279: (feature/刀具管理 -> develop) 
Merge Request: 新增了刀具管理的机床换刀申请、CAM工单程序用刀计划、功能刀具组装的form视图，简化了tree视图的字段

Created By: @禹翔辉
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/279?initial=true
 2023-07-25 14:40:12 +08:00
yuxianghui
810ec1fd6c Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/刀具管理 2023-07-25 14:38:24 +08:00
yuxianghui
fc2d77a0dc 新增了刀具管理的机床换刀申请、CAM工单程序用刀计划、功能刀具组装的form视图，简化了tree视图的字段， 2023-07-25 14:38:06 +08:00
qihao.gong@jikimo.com
65157e93a9 设备新需求（根据维保项目生成维保计划） 2023-07-24 17:44:07 +08:00