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

988 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
yuxianghui
35afdd3b2a 刀具物料功能模型从sf_base模块迁移到sf_manufacturing模块；新增每齿走刀量模型；整体式刀具物料新增关联每齿走刀量对象字段； 2023-09-08 10:20:52 +08:00
yuxianghui
ae3f7c9c0c 新增切削速度Vc对象，产品-整体式刀具物料新增切削速度Vc关联字段；删除部分产品-整体式刀具同步配置-刀具型号-整体式刀具参数。 2023-09-06 17:24:08 +08:00
yuxianghui
9331a22a10 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/整体式刀具能力参数补充 2023-09-06 16:48:43 +08:00
yuxianghui
5353630975 撤销制造-配置-刀具型号新增的参数；对产品刀具物料字段的限制优化 2023-09-06 16:48:07 +08:00
禹翔辉
1983271a9b Accept Merge Request #366: (feature/整体式刀具能力参数补充 -> develop) 
Merge Request: 配置-刀具型号新增整体式刀具能力参数补充；补充产品-整体式刀具同步配置-刀具型号-整体式刀具参数。

Created By: @禹翔辉
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/366?initial=true
 2023-09-06 11:11:55 +08:00
yuxianghui
0b8042f07a 配置-刀具型号新增整体式刀具能力参数补充；补充产品-整体式刀具同步配置-刀具型号-整体式刀具参数。 2023-09-06 11:02:55 +08:00
马广威
1f5cabad1a Accept Merge Request #365: (feature/生产排程 -> develop) 
Merge Request: 生产计划优化

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/365?initial=true
 2023-09-06 09:23:50 +08:00
mgw
48e30865af 生产计划优化 2023-09-06 09:22:58 +08:00
yuxianghui
fe78d91fa9 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/整体式刀具能力参数补充 2023-09-06 09:12:11 +08:00
许何哲
4ac95c20ad Accept Merge Request #364: (feature/sf品牌页面表格样式的修改 -> develop) 
Merge Request: 对sf样式进行集中管理

Created By: @许何哲
Accepted By: @许何哲
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/364?initial=true
 2023-09-05 17:24:19 +08:00
WEB许何哲\xuhez
4a712ff9f1 Merge branch 'develop' into feature/sf品牌页面表格样式的修改 2023-09-05 17:22:58 +08:00
yuxianghui
f8c5553837 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/整体式刀具能力参数补充 2023-09-05 17:22:45 +08:00
WEB许何哲\xuhez
7ea997219b 对sf的css样式进行集中管理 2023-09-05 17:22:37 +08:00
yuxianghui
a6ddfa22a1 对产品的整体式刀具能力参数进行补充，对参数字段进行优化；对刀具物料查询的字段类型进行调整。 2023-09-05 17:21:39 +08:00
许何哲
b6a071d33a Accept Merge Request #363: (feature/sf品牌页面表格样式的修改 -> develop) 
Merge Request: 修改tree视图样式bug

Created By: @许何哲
Accepted By: @许何哲
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/363?initial=true
 2023-09-05 16:46:42 +08:00
WEB许何哲\xuhez
26f07a00c3 Merge branch 'develop' into feature/sf品牌页面表格样式的修改 2023-09-05 16:45:32 +08:00
WEB许何哲\xuhez
b47dbe29c0 修改tree视图样式bug 2023-09-05 16:44:42 +08:00
马广威
dbeb975cf6 Accept Merge Request #362: (feature/生产排程 -> develop) 
Merge Request: 创建制造订单时同步创建排程单

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/362?initial=true
 2023-09-05 10:41:22 +08:00
mgw
e5213d06ae 创建制造订单时同步创建排程单 2023-09-05 10:40:25 +08:00
马广威
a0affba407 Accept Merge Request #361: (feature/生产排程 -> develop) 
Merge Request: 基本排程功能合并

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/361?initial=true
 2023-09-05 09:33:01 +08:00
禹翔辉
940d2cead8 Accept Merge Request #360: (feature/整体式刀具能力参数补充 -> develop) 
Merge Request: 新增加工方式、刀尖特征、柄部类型、走刀方向、适合冷却液五个模型对象；刀具物料查询新增上述五个关联对象；对产品的整体式刀具物料能力参数进行补充。

Created By: @禹翔辉
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/360?initial=true
 2023-09-04 17:38:39 +08:00
yuxianghui
c8129478d5 新增加工方式、刀尖特征、柄部类型、走刀方向、适合冷却液五个模型对象；刀具物料查询新增上述五个关联对象；对产品的整体式刀具物料能力参数进行补充。 2023-09-04 17:29:20 +08:00
禹翔辉
4342a2a175 Accept Merge Request #359: (feature/整体式刀具能力参数补充 -> develop) 
Merge Request: 整体式刀具基本参数补充，float类型字段增加非零验证，增加相关字段必填属性。

Created By: @禹翔辉
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/359?initial=true
 2023-09-01 17:18:50 +08:00
yuxianghui
19f19d5fd0 整体式刀具基本参数补充，float类型字段增加非零验证，增加相关字段必填属性。 2023-09-01 17:17:56 +08:00
jinling.yang
699728963c Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop 2023-08-31 17:39:15 +08:00
jinling.yang
d66d320e7d Merge branch 'feature/快速订单Bug修复' into develop 2023-08-31 17:38:55 +08:00
杨金灵
c56be1641e Accept Merge Request #358: (feature/快速订单Bug修复 -> develop) 
Merge Request: 快速订单Bug修复

Created By: @杨金灵
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/358?initial=true
 2023-08-31 17:38:39 +08:00
jinling.yang
7351ea675b Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/快速订单Bug修复 2023-08-31 17:37:27 +08:00
jinling.yang
e51fc8a68e Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop 2023-08-31 17:36:59 +08:00
jinling.yang
4ec6e7c7a4 Merge branch 'feature/产品点击库存应用没有在cloud生成动态的夹具和刀具物料Bug修复' into develop 2023-08-31 17:36:44 +08:00
杨金灵
44872d4c9f Accept Merge Request #357: (feature/产品点击库存应用没有在cloud生成动态的夹具和刀具物料Bug修复 -> develop) 
Merge Request: 产品库存应用没有在cloud生成动态的夹具和刀具物料Bug修复

Created By: @杨金灵
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/357?initial=true
 2023-08-31 17:36:32 +08:00
jinling.yang
8bf726382d Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/产品点击库存应用没有在cloud生成动态的夹具和刀具物料Bug修复 2023-08-31 17:35:05 +08:00
jinling.yang
d07098bae1 产品库存应用没有在cloud生成动态的夹具和刀具物料Bug修复 2023-08-31 17:32:42 +08:00
许何哲
c575ea51cd Accept Merge Request #356: (feature/sf品牌页面表格样式的修改 -> develop) 
Merge Request: sf品牌页面表格的样式修改

Created By: @许何哲
Accepted By: @许何哲
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/356?initial=true
 2023-08-31 10:18:26 +08:00
WEB许何哲\xuhez
2b22215853 sf品牌页面表格的样式修改 2023-08-31 10:16:16 +08:00
mgw
b4eb57f3df 修改原生gantt图样式（日期格式等去符合国内习惯） 2023-08-30 17:52:13 +08:00
mgw
41566a4d74 基础排程基本完成 2023-08-30 17:50:43 +08:00
jinling.yang
e64cf88809 1.加工工艺去掉form表单展示 
2.机床型号页面优化
 2023-08-30 16:26:19 +08:00
jinling.yang
2fdcd3a009 快速订单页面优化 2023-08-30 16:19:38 +08:00
jinling.yang
76af8c6f2d Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop 2023-08-29 17:44:03 +08:00
jinling.yang
eae06ccdd7 Merge branch 'feature/获取cnc工单Bug修复' into develop 2023-08-29 17:43:51 +08:00
杨金灵
d322754798 Accept Merge Request #355: (feature/获取cnc工单Bug修复 -> develop) 
Merge Request: 获取cnc工单Bug修复

Created By: @杨金灵
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/355?initial=true
 2023-08-29 17:43:23 +08:00
jinling.yang
908e8b3ff2 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/获取cnc工单Bug修复 2023-08-29 17:41:23 +08:00
jinling.yang
e9afce298d SF点击后获取cnc程序按钮，cloud生成的编程单的编号未显示Bug修复 2023-08-29 17:40:16 +08:00
禹翔辉
f373c69430 Accept Merge Request #354: (feature/自建模块日志警告信息处理 -> develop) 
Merge Request: 库存模块日志警告信息处理

Created By: @禹翔辉
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/354?initial=true
 2023-08-29 17:29:26 +08:00
yuxianghui
8ece696775 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/自建模块日志警告信息处理 2023-08-29 17:28:49 +08:00
yuxianghui
5ea6158e8d 库存模块日志警告信息处理 2023-08-29 17:28:20 +08:00
龚启豪
a799793ca8 Accept Merge Request #353: (feature/修改机床参数bug -> develop) 
Merge Request: 修改设备table，品牌图片改成图片

Created By: @龚启豪
Accepted By: @龚启豪
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/353?initial=true
 2023-08-29 15:50:08 +08:00
qihao.gong@jikimo.com
27571942c9 增肌OCC 2023-08-29 15:49:14 +08:00
qihao.gong@jikimo.com
e6a68eb1eb Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改机床参数bug 2023-08-29 15:48:48 +08:00