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

940 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
许何哲
a2f5dbd70d Accept Merge Request #341: (feature/必填字段label添加星号 -> develop) 
Merge Request: 修改看板样式

Created By: @许何哲
Accepted By: @许何哲
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/341?initial=true
 2023-08-24 09:04:02 +08:00
WEB许何哲\xuhez
0f283c1eda Merge branch 'develop' into feature/必填字段label添加星号 2023-08-24 09:03:20 +08:00
WEB许何哲\xuhez
f67c8169bf 修改看板样式 2023-08-24 09:02:15 +08:00
jinling.yang
f9e4b73fb0 新增上传模型功能 2023-08-23 17:34:06 +08:00
禹翔辉
e31858c9d7 Accept Merge Request #340: (feature/刀具管理加粗字段调整及界面布局优化 -> develop) 
Merge Request: 刀具管理模块中的所有模型界面的加粗字段都改为name字段；优化了刀具物料查询界面布局。

Created By: @禹翔辉
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/340?initial=true
 2023-08-23 17:33:34 +08:00
yuxianghui
4f70f7ef70 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/刀具管理加粗字段调整及界面布局优化 2023-08-23 17:32:58 +08:00
yuxianghui
11a06df0a4 刀具管理模块中的所有模型界面的加粗字段都改为name字段；优化了刀具物料查询界面布局。 2023-08-23 17:32:22 +08:00
马广威
da8caf42f5 Accept Merge Request #339: (feature/生产排程 -> develop) 
Merge Request: 更新3D模型展示代码

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/339?initial=true
 2023-08-23 15:48:04 +08:00
mgw
0b30408aae 更新3D模型展示代码 2023-08-23 15:47:17 +08:00
龚启豪
e2f5ce42e6 Accept Merge Request #338: (feature/修改机床参数bug -> develop) 
Merge Request: 刀把类型新增bt50 处理品牌图片同步报错问题

Created By: @龚启豪
Accepted By: @龚启豪
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/338?initial=true
 2023-08-23 14:40:10 +08:00
qihao.gong@jikimo.com
90868d4a09 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改机床参数bug 2023-08-23 14:37:20 +08:00
qihao.gong@jikimo.com
b01a5a4216 刀把类型新增bt50 修改同步品牌图片报错问题 2023-08-23 14:37:02 +08:00
jinling.yang
c27bfb5990 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop 2023-08-23 10:31:21 +08:00
jinling.yang
589f99db1a Merge branch 'feature/同步夹具型号Bug修复' into develop 2023-08-23 10:31:01 +08:00
杨金灵
7d0e35a9f4 Accept Merge Request #337: (feature/同步夹具型号Bug修复 -> develop) 
Merge Request: 夹具型号同步修复和页面名称加大醒目

Created By: @杨金灵
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/337?initial=true
 2023-08-23 10:30:43 +08:00
jinling.yang
a64d24d8ff Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/同步夹具型号Bug修复 2023-08-23 10:29:09 +08:00
jinling.yang
2ae7b2c8ec 页面名称加大醒目 2023-08-23 10:28:54 +08:00
jinling.yang
cd33fb9fb9 夹具型号同步修复 2023-08-23 10:09:47 +08:00
禹翔辉
1176aee38b Accept Merge Request #336: (feature/产线设备资源设置模块优化 -> develop) 
Merge Request: 计划管理-基础设置内模型的界面布局和字段优化

Created By: @禹翔辉
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/336?initial=true
 2023-08-22 11:43:15 +08:00
yuxianghui
e781bce27e 1、优化了产线设备资源设置和工作日历设置界面布局；删除工作日历、班次、休息日模型的form视图，新增tree视图修改功能；2、修复产线设备资源设置的设备信息显示问题，修改了机台号字段名称；3、新增工作日历设置班次字段必填；4、调整产线设备资源设置和工作日历设置菜单位置 2023-08-22 11:40:35 +08:00
qihao.gong@jikimo.com
10292df48d Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改机床参数bug 2023-08-21 17:23:26 +08:00
qihao.gong@jikimo.com
76293f5cca 修改维保table 2023-08-21 17:22:53 +08:00
马广威
16de3e40df Accept Merge Request #335: (feature/cnc工单处增加下载按钮 -> develop) 
Merge Request: cnc工单处增加NC文件下载的功能已完成

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/335?initial=true
 2023-08-21 17:22:10 +08:00
mgw
642007d29b cnc工单处增加NC文件下载的功能已完成 2023-08-21 17:20:52 +08:00
龚启豪
3c281230cc Accept Merge Request #334: (feature/修改机床参数bug -> develop) 
Merge Request: 修改设备看板

Created By: @龚启豪
Accepted By: @龚启豪
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/334
 2023-08-21 15:42:12 +08:00
qihao.gong@jikimo.com
a5a9ae150f 修改设备看板 2023-08-21 15:41:40 +08:00
jinling.yang
c2e2de4ab5 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop 2023-08-21 15:37:34 +08:00
jinling.yang
e49e3b6981 Merge branch 'feature/页面布局' into develop 2023-08-21 15:37:20 +08:00
杨金灵
1b3c929fa7 Accept Merge Request #333: (feature/页面布局 -> develop) 
Merge Request: 去掉厂家型号字段

Created By: @杨金灵
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/333?initial=true
 2023-08-21 15:37:03 +08:00
jinling.yang
fb8ca5f145 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/页面布局 2023-08-21 15:35:50 +08:00
jinling.yang
dfc5c206fd Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop 2023-08-21 11:51:32 +08:00
jinling.yang
3ab0fcb337 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/页面布局 2023-08-21 11:50:36 +08:00
jinling.yang
f6841e5e9f 同步材料型号及优化材料型号页面及新增拉伸强度，硬度，粗加工，精加工 2023-08-21 11:49:24 +08:00
龚启豪
2cb84c5f55 Accept Merge Request #332: (feature/修改机床参数bug -> develop) 
Merge Request: 设备改成维保

Created By: @龚启豪
Accepted By: @龚启豪
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/332?initial=true
 2023-08-21 10:28:46 +08:00
qihao.gong@jikimo.com
ff60824291 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改机床参数bug 2023-08-21 10:28:12 +08:00
qihao.gong@jikimo.com
82322b5024 修改设备table和跳转到维保 设备改为维保 2023-08-21 10:27:50 +08:00
jinling.yang
bfa51d378c Merge branch 'feature/制造基础数据删除按钮放开' into develop 2023-08-21 10:25:13 +08:00
禹翔辉
78ddf4e52f Accept Merge Request #331: (feature/功能刀具优化 -> develop) 
Merge Request: 功能刀具优化

Created By: @禹翔辉
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/331?initial=true
 2023-08-21 10:21:25 +08:00
yuxianghui
8a50a10b23 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/功能刀具优化 2023-08-21 10:19:09 +08:00
杨金灵
80f7da7979 Accept Merge Request #330: (feature/制造基础数据删除按钮放开 -> develop) 
Merge Request: 制造基础数据删除按钮放开

Created By: @杨金灵
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/330?initial=true
 2023-08-21 10:18:17 +08:00
jinling.yang
eec6dce4fc Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造基础数据删除按钮放开 2023-08-21 10:16:47 +08:00
jinling.yang
cd671bdc88 1.删除按钮放开 
2.刀具类型同步代码还原
 2023-08-21 10:16:30 +08:00
yuxianghui
0fa2656aad 优化功能刀具的刀具物料字段 2023-08-21 10:11:54 +08:00
许何哲
109da940ba Accept Merge Request #329: (feature/必填字段label添加星号 -> develop) 
Merge Request: 修改制造订单页面样式bug

Created By: @许何哲
Accepted By: @许何哲
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/329?initial=true
 2023-08-21 10:10:45 +08:00
WEB许何哲\xuhez
64143798e0 Merge branch 'develop' into feature/必填字段label添加星号 2023-08-21 10:09:42 +08:00
WEB许何哲\xuhez
d8489a5f07 制造订单页面样式bug修改 2023-08-21 10:08:55 +08:00
禹翔辉
8ae4d0dce8 Accept Merge Request #328: (feature/生产线优化 -> develop) 
Merge Request: 生产线新增关联工作中心字段，优化看板和form视图布局

Created By: @禹翔辉
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/328?initial=true
 2023-08-18 15:14:41 +08:00
yuxianghui
f88dd790a0 生产线新增关联工作中心字段，优化看板和form视图布局 2023-08-18 15:11:36 +08:00
龚启豪
baea2d2a3e Accept Merge Request #327: (feature/修改机床参数bug -> develop) 
Merge Request: 品牌备注增加

Created By: @龚启豪
Accepted By: @龚启豪
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/327?initial=true
 2023-08-18 14:39:39 +08:00
qihao.gong@jikimo.com
43d6794151 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改机床参数bug 
# Conflicts:
#	sf_base/views/base_view.xml
#	sf_mrs_connect/models/sync_common.py
 2023-08-18 14:34:37 +08:00