jikimo/test
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,266 Commits 134 Branches 31 Tags
3be0d1ffad41b0e84b2e7c9d65e4cb2ef035ce02
Commit Graph

1266 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
mgw
81cae99093 屏蔽测试内容 2023-09-26 14:24:43 +08:00
mgw
587daef6ee Merge branch 'feature/制造-计划优化' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造-计划优化 2023-09-26 14:11:51 +08:00
mgw
9217372097 调整代码结构 2023-09-26 14:09:25 +08:00
mgw
256d86567e Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造-计划优化 
# Conflicts:
#	jikimo_frontend/static/src/scss/custom_style.scss
 2023-09-26 11:36:59 +08:00
mgw
37541fdcd6 优化gantt的间隔为变量 2023-09-26 11:34:03 +08:00
mgw
b574175a56 调整菜单顺序，修改”开票“翻译为”应收应付“，增加背景图片 2023-09-26 11:31:14 +08:00
许何哲
8e13d2011c Accept Merge Request #404: (feature/sf看板样式统一 -> develop) 
Merge Request: 表头固定bug修改

Created By: @许何哲
Accepted By: @许何哲
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/404?initial=true
 2023-09-25 15:12:03 +08:00
WEB许何哲\xuhez
aba664375f 表头固定bug修改 2023-09-25 15:10:50 +08:00
禹翔辉
a50501e75e Accept Merge Request #403: (feature/功能刀具优化 -> develop) 
Merge Request: 计划管理模块和刀具管理模块优化

Created By: @禹翔辉
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/403?initial=true
 2023-09-25 13:44:19 +08:00
yuxianghui
16534bb348 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/功能刀具优化 2023-09-25 13:43:27 +08:00
yuxianghui
a538477272 1、计划管理-产线设备资源设置模块优化，工作日历设置模块优化，添加选择提示；2、刀具管理-功能刀具组装、列表、预警、实时分布、出入库记录和组装界面的刀具物料字段绑定对象更改为库存下的刀具物料；3、功能刀具组装-组装界面添加选择提示，4、功能刀具列表下的能力参数对没有选择的图片不展示 2023-09-25 13:43:08 +08:00
许何哲
9c2d4dbc24 Accept Merge Request #402: (feature/sf看板样式统一 -> develop) 
Merge Request: 工作中心增加字段并调整样式

Created By: @许何哲
Accepted By: @许何哲
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/402?initial=true
 2023-09-25 09:21:11 +08:00
WEB许何哲\xuhez
1acfefa555 Merge branch 'develop' into feature/sf看板样式统一 2023-09-22 17:34:57 +08:00
mgw
52a7e2d698 新时间尺度下pill已可正确展示（包括左边距和宽度） 2023-09-22 17:34:45 +08:00
WEB许何哲\xuhez
d8363f2637 看板添加字段并调整样式 2023-09-22 17:33:56 +08:00
龚启豪
f42383fd10 Accept Merge Request #401: (feature/修改机床参数bug -> develop) 
Merge Request: 设备类别增加参数

Created By: @龚启豪
Accepted By: @龚启豪
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/401
 2023-09-22 17:20:32 +08:00
qihao.gong@jikimo.com
c919f0724a Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改机床参数bug 2023-09-22 17:01:28 +08:00
qihao.gong@jikimo.com
681b769356 设备类别新增选项 2023-09-22 17:01:03 +08:00
mgw
cee39f3e1f 优化看板样式展示 2023-09-22 11:13:13 +08:00
mgw
9dc653694a 修改前暂存 2023-09-22 09:31:56 +08:00
jinling.yang
a9f51df151 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/bug修复 2023-09-21 16:11:04 +08:00
jinling.yang
3aa34ee0cf http权限代码优化 2023-09-21 16:10:18 +08:00
马广威
cde801a837 Accept Merge Request #400: (feature/制造-计划优化 -> develop) 
Merge Request: 增加排程结果反馈给制造订单的功能

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/400?initial=true
 2023-09-21 14:33:32 +08:00
mgw
e9e25c582e 增加排程结果反馈给制造订单的功能 2023-09-21 14:32:05 +08:00
禹翔辉
90fa7c159a Accept Merge Request #399: (feature/功能刀具优化 -> develop) 
Merge Request: 功能刀具优化

Created By: @禹翔辉
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/399?initial=true
 2023-09-19 17:32:33 +08:00
yuxianghui
d4180df7e9 1、刀具管理模块下的功能刀具内的刀具物料字段类型从many2many更改为many2one，绑定对象从刀具型号更改为刀具物料；2、对功能刀具组装的组装功能和取消组装功能进行了逻辑优化；3、新增功能刀具组装弹窗对象的刀具物料信息根据所选功能刀具字段计算功能；4、关闭了功能刀具列表、预警、实时分布、出入库记录的创建、修改、删除功能；5、功能刀具列表对象新增刀具能力参数；6、优化了刀具管理模块的权限相关警告； 2023-09-19 16:14:29 +08:00
jinling.yang
ab42bde8f2 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/bug修复 2023-09-18 17:42:13 +08:00
jinling.yang
a96c7a34c1 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/bug修复 2023-09-18 17:40:30 +08:00
龚启豪
0ac82acbad Accept Merge Request #398: (feature/修改机床参数bug -> develop) 
Merge Request: 优化sf容器

Created By: @龚启豪
Accepted By: @龚启豪
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/398
 2023-09-18 10:41:33 +08:00
qihao.gong@jikimo.com
f03b77f9bb Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改机床参数bug 2023-09-18 10:40:48 +08:00
qihao.gong@jikimo.com
dc796abd4a 优化sf容器 2023-09-18 10:40:29 +08:00
龚启豪
cf7551011e Accept Merge Request #397: (feature/修改机床参数bug -> develop) 
Merge Request: 优化sf容器

Created By: @龚启豪
Accepted By: @龚启豪
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/397?initial=true
 2023-09-18 10:08:31 +08:00
qihao.gong@jikimo.com
586dc5dbe2 优化sf容器 2023-09-18 10:07:52 +08:00
许何哲
3dbc6f0d6a Accept Merge Request #396: (feature/sf看板样式统一 -> develop) 
Merge Request: 表头固定优化

Created By: @许何哲
Accepted By: @许何哲
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/396?initial=true
 2023-09-15 17:18:30 +08:00
WEB许何哲\xuhez
0ae5d724d6 表头固定优化 2023-09-15 17:15:35 +08:00
许何哲
2dcd9bef53 Accept Merge Request #395: (feature/sf看板样式统一 -> develop) 
Merge Request: 优化表头固定

Created By: @许何哲
Accepted By: @许何哲
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/395?initial=true
 2023-09-15 14:44:50 +08:00
WEB许何哲\xuhez
38331f1501 优化表头固定 2023-09-15 14:42:12 +08:00
龚启豪
e35b4af123 Accept Merge Request #394: (feature/修改机床参数bug -> develop) 
Merge Request: 取消注释occ

Created By: @龚启豪
Accepted By: @龚启豪
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/394?initial=true
 2023-09-15 14:37:14 +08:00
qihao.gong@jikimo.com
618d4718c9 取消注释occ 2023-09-15 14:36:29 +08:00
龚启豪
f36e9c3d99 Accept Merge Request #393: (feature/修改机床参数bug -> develop) 
Merge Request: BT50

Created By: @龚启豪
Accepted By: @龚启豪
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/393?initial=true
 2023-09-15 14:28:25 +08:00
qihao.gong@jikimo.com
0de26c4f2f Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改机床参数bug 
# Conflicts:
#	sf_maintenance/views/maintenance_views.xml
 2023-09-15 14:27:16 +08:00
qihao.gong@jikimo.com
d78fe872ae BT50 2023-09-15 14:26:04 +08:00
马广威
3c25b829e2 Accept Merge Request #392: (feature/制造-计划优化 -> develop) 
Merge Request: 增加表头固定

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/392?initial=true
 2023-09-15 11:19:50 +08:00
mgw
fd60505eec Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造-计划优化 2023-09-15 11:17:32 +08:00
mgw
42cc64db74 表头固定 2023-09-15 11:17:07 +08:00
许何哲
496fb40807 Accept Merge Request #391: (feature/sf看板样式统一 -> develop) 
Merge Request: 设备清单看板优化

Created By: @许何哲
Accepted By: @许何哲
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/391?initial=true
 2023-09-15 11:16:51 +08:00
WEB许何哲\xuhez
e3e717ea60 设备清单看板优化 2023-09-15 11:15:40 +08:00
马广威
1e29f7010a Accept Merge Request #390: (feature/制造-计划优化 -> develop) 
Merge Request: 工作中心看板、图文展示样式修改

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/390?initial=true
 2023-09-15 11:00:33 +08:00
mgw
c514af2511 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造-计划优化 2023-09-15 10:59:28 +08:00
禹翔辉
6d4221a565 Accept Merge Request #389: (feature/刀具优化 -> develop) 
Merge Request: 解决功能刀具组装时选取刀具型号报错问题；

Created By: @禹翔辉
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/389?initial=true
 2023-09-15 10:59:06 +08:00