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

1336 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
mgw
5148ad3952 工作中心看板样式修改 2023-09-15 10:58:53 +08:00
yuxianghui
be3df9817c Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/刀具优化 2023-09-15 10:57:19 +08:00
yuxianghui
95e095c184 解决功能刀具组装时选取刀具型号报错问题； 2023-09-15 10:56:58 +08:00
mgw
db5d9863b1 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
#	sf_manufacturing/views/mrp_workcenter_views.xml
 2023-09-15 10:40:30 +08:00
mgw
2cc03c21ed 优化图文展示样式 2023-09-15 10:37:20 +08:00
禹翔辉
480d628125 Accept Merge Request #388: (feature/刀具优化 -> develop) 
Merge Request: 修改机床换刀申请字段状态，新增选择字段提示；

Created By: @禹翔辉
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/388?initial=true
 2023-09-15 09:52:01 +08:00
yuxianghui
9e212a2684 修改机床换刀申请字段状态，新增选择字段提示； 2023-09-15 09:51:53 +08:00
jinling.yang
a7da1dbadd Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/bug修复 2023-09-14 18:08:05 +08:00
jinling.yang
99f078fad9 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop 2023-09-14 18:07:47 +08:00
jinling.yang
0445c3bbc4 Merge branch 'feature/页面优化' into develop 2023-09-14 18:07:35 +08:00
杨金灵
23214ae6e6 Accept Merge Request #387: (feature/页面优化 -> develop) 
Merge Request: 优化销售和报价及快速订单

Created By: @杨金灵
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/387?initial=true
 2023-09-14 18:07:07 +08:00
jinling.yang
b966bdd8da Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/页面优化 2023-09-14 18:04:41 +08:00
jinling.yang
5fa9d1e16e 1.优化生成销售订单和产品的接口：bfm分配工厂时将“结算方式”和“支付方式”传到该接口内的生成报价订单方法里 
2.优化销售和报价查询及详情页面：新增“结算方式”和“支付方式”两个字段;销售的tree列表的“号码”显示改为“订单号”；报价的tree列表的“号码”显示改为“订单号”，创建时间改为“下单时间”
3.优化快速订单：tree列表去掉“表面工艺参数”字段，新增“创建人”和“创建时间”2个字段；详情页面新增“加工时长”字段
 2023-09-14 18:04:04 +08:00
许何哲
c45c45607f Accept Merge Request #386: (feature/sf看板样式统一 -> develop) 
Merge Request: sf看板样式统一

Created By: @许何哲
Accepted By: @许何哲
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/386?initial=true
 2023-09-14 17:25:37 +08:00
WEB许何哲\xuhez
69506af2ab sf看板样式统一 2023-09-14 17:23:50 +08:00
龚启豪
00cb9cb8db Accept Merge Request #385: (feature/修改机床参数bug -> develop) 
Merge Request: 维保计划关联维保项目many2many

Created By: @龚启豪
Accepted By: @龚启豪
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/385?initial=true
 2023-09-14 10:57:29 +08:00
qihao.gong@jikimo.com
757a1ef102 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改机床参数bug 2023-09-14 10:56:03 +08:00
qihao.gong@jikimo.com
5416ecb709 维保计划关联维保项目 2023-09-14 10:55:43 +08:00
jinling.yang
766771e435 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/页面优化 2023-09-14 09:47:14 +08:00
jinling.yang
eb0d83aa3a Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/页面优化 
# Conflicts:
#	sf_manufacturing/models/stock.py
 2023-09-14 09:46:28 +08:00
禹翔辉
826119aea6 Accept Merge Request #384: (feature/刀具优化 -> develop) 
Merge Request: 解决图文展示中图片不显示问题；新增刀具物料能力对象的form视图。

Created By: @禹翔辉
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/384?initial=true
 2023-09-14 09:45:22 +08:00
jinling.yang
650bf2cf86 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/bug修复 2023-09-14 09:30:48 +08:00
jinling.yang
ad0603f921 报价和销售订单页面优化 2023-09-14 09:29:03 +08:00
马广威
4613dc791b Accept Merge Request #383: (feature/制造-计划优化 -> develop) 
Merge Request: 排产代码优化后合并

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/383?initial=true
 2023-09-14 09:19:49 +08:00
mgw
6026244783 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造-计划优化 2023-09-14 09:18:05 +08:00
mgw
43d9c54626 优化代码结构 2023-09-14 09:17:38 +08:00
yuxianghui
400f4b6201 解决图文展示中图片不显示问题；新增刀具物料能力对象的form视图。 2023-09-13 17:13:21 +08:00
龚启豪
ce62f90ede Accept Merge Request #382: (feature/修改机床参数bug -> develop) 
Merge Request: 设备图文展示

Created By: @龚启豪
Accepted By: @龚启豪
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/382?initial=true
 2023-09-13 16:54:29 +08:00
qihao.gong@jikimo.com
778ce3e409 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改机床参数bug 2023-09-13 16:52:56 +08:00
qihao.gong@jikimo.com
532e4a4c7a 设备图文展示 2023-09-13 16:52:40 +08:00