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

2220 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
龚启豪
cba007b374 Accept Merge Request #131: (feature/优化工单 -> develop) 
Merge Request: 优化工单

Created By: @龚启豪
Accepted By: @龚启豪
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/131
 2023-02-03 17:16:46 +08:00
gqh
19d742d20f 优化工单 2023-02-03 17:14:17 +08:00
马广威
f7cca137c6 Accept Merge Request #130: (feature/优化进度反馈 -> develop) 
Merge Request: 优化工单界面展示

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/130
 2023-02-03 17:11:54 +08:00
mgw
a4bee8bb6b 优化工单界面显示 2023-02-03 17:10:31 +08:00
mgw
4d4b0098ce 更新模块信息 2023-02-03 10:32:53 +08:00
马广威
eee02d2ff1 Accept Merge Request #129: (feature/对接业务平台返回状态 -> develop) 
Merge Request: 对接业务平台返回进度已完成主体部分

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/129
 2023-02-03 09:53:25 +08:00
mgw
2a713b6cc4 去掉测试按钮 2023-02-03 09:48:31 +08:00
mgw
973bb748c2 优化模块分类 2023-02-03 09:47:09 +08:00
mgw
4975835cf3 对接业务平台，返回加工中状态 2023-02-03 01:18:02 +08:00
jinling.yang
0f062dad96 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop 2023-02-02 18:12:59 +08:00
龚启豪
79ee28e0dd Accept Merge Request #127: (feature/sf优化界面 -> develop) 
Merge Request: 修改参数说明

Created By: @龚启豪
Accepted By: @龚启豪
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/127
 2023-02-02 17:24:53 +08:00
gqh
cbe45d3d7b 修改参数说明 2023-02-02 17:21:51 +08:00
龚启豪
91de63a6a4 Accept Merge Request #126: (feature/sf优化界面 -> develop) 
Merge Request: 优化工单展示

Created By: @龚启豪
Accepted By: @龚启豪
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/126
 2023-02-02 15:09:53 +08:00
gqh
59cb6e5def 优化工单界面，新增物料page，修复工单按钮bug，隐藏权限字段 2023-02-02 14:59:39 +08:00
马广威
904aad74ce Accept Merge Request #119: (feature/优化代码结构 -> develop) 
Merge Request: 扫码字段更新完成

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/119
 2023-02-02 10:06:46 +08:00
jinling.yang
b323abddac Merge branch 'feature/bom组件数量修复' into develop 2023-02-02 10:01:20 +08:00
杨金灵
71f2c187dc Accept Merge Request #118: (feature/bom组件数量修复 -> develop) 
Merge Request: bom组件数量修复

Created By: @杨金灵
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/118
 2023-02-02 10:01:00 +08:00
jinling.yang
a06e7cdb83 去掉不要的代码 2023-02-02 09:58:47 +08:00
jinling.yang
d3e30a4c87 去掉权限代码 2023-02-02 09:57:01 +08:00
jinling.yang
e8d923df03 bfm分配工厂: 
1.销售页面：客户的值为业务平台，
2.没有原材料，事务回滚
3.去掉注释和没用到的代码
 2023-02-01 18:27:29 +08:00
龚启豪
a796795d05 Accept Merge Request #114: (feature/sf优化界面 -> develop) 
Merge Request: 优化工单form视图，增加制造翻译模块

Created By: @龚启豪
Accepted By: @龚启豪
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/114
 2023-02-01 17:55:06 +08:00
gqh
d032f89272 sf优化绑定托盘，工单form显示开始按钮 加工时间 2023-02-01 17:53:32 +08:00
mgw
6a51b8cc4c 更新字段名称至中文 2023-02-01 14:42:23 +08:00
龚启豪
e2561bee34 Accept Merge Request #113: (feature/sf优化界面 -> develop) 
Merge Request: sf合并工单优化项

Created By: @龚启豪
Accepted By: @龚启豪
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/113
 2023-02-01 14:09:52 +08:00
gqh
5495f2436a 优化工单，英文改为中文展示，解除托盘展示托盘 2023-02-01 14:07:33 +08:00
mgw
643ce6ac7a 增加外层group标签 2023-01-31 21:02:48 +08:00
马广威
5f45416d80 Accept Merge Request #110: (feature/整理代码，更新下发代码 -> develop) 
Merge Request: 整理代码，更新下发代码

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/110
 2023-01-31 17:25:44 +08:00
mgw
946bf32c4e 整理代码，更新下发代码 2023-01-31 17:21:37 +08:00
杨金灵
afcea7f715 Accept Merge Request #109: (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/109
 2023-01-31 12:03:20 +08:00
jinling.yang
7b78e2451a 工单的cnc工单加工面显示bug修复 2023-01-31 12:02:56 +08:00
gqh
8957fec332 修复密码错误bug 2023-01-31 11:30:13 +08:00
jinling.yang
e0193b81c9 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop 2023-01-31 11:09:13 +08:00
龚启豪
8312b5fc6b Accept Merge Request #108: (feature/sf优化界面 -> develop) 
Merge Request: 修改登录背景，工作中心显示bug

Created By: @龚启豪
Accepted By: @龚启豪
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/108
 2023-01-31 11:08:04 +08:00
gqh
169bf4a59a 修改登录背景 2023-01-31 11:02:53 +08:00
jinling.yang
f763da5947 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop 2023-01-31 10:53:30 +08:00
马广威
af91aca75f Accept Merge Request #106: (feature/优化代码：工单显示机床信息等 -> develop) 
Merge Request: 数采节点字段配置完毕

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/106
 2023-01-31 10:42:56 +08:00
马广威
8c424f5aa6 Merge branch develop into feature/优化代码：工单显示机床信息等 2023-01-31 10:42:32 +08:00
jinling.yang
07709af26a Merge branch 'feature/修复sf的bug' into develop 2023-01-31 10:38:37 +08:00
杨金灵
210ee9d38d Accept Merge Request #107: (feature/修复sf的bug -> develop) 
Merge Request: 页面优化及部分bug修复

Created By: @杨金灵
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/107
 2023-01-31 10:37:58 +08:00
jinling.yang
e2ae08c33f 制造和销售里的产品的筛选器，胚料的生成新增是否为业务平台新建字段，匹配bom修改为只能匹配手动建的bom 2023-01-31 10:32:14 +08:00
mgw
51c89f5c6b 修改字段名称，为一键下发增加异常捕获 2023-01-31 10:27:57 +08:00
jinling.yang
733e33adfd 新增胚料的模型类型 2023-01-30 18:11:29 +08:00
gqh
fec18188fa 工作中心看板查看工单取消全屏 2023-01-30 17:56:41 +08:00
mgw
4e57c76c63 机床对象上增加数据采集节点配置 2023-01-30 17:38:53 +08:00
gqh
f5c8623c72 sf优化 2023-01-30 17:33:38 +08:00
mgw
60e044ec9b 新增机床ftp路径配置 2023-01-30 15:14:36 +08:00
jinling.yang
271a5d4224 1.模型类型增加跟修改各字段 
2.智能工厂成品名称优化
3.智能工厂产品根据产品类型增加默认筛选条件的优化（在筛选器内根据产品类型增加筛选条件）
4.智能工厂胚料名称的优化
5.自加工产品的制造订单优化
 2023-01-29 17:48:45 +08:00
mgw
f6f782fe33 配置工单显示机床信息 2023-01-29 17:47:36 +08:00
gqh
e93906a5f0 工作中心看板默认展示列表 2023-01-29 17:04:50 +08:00
gqh
16cffc3ba5 单个制造显示问题 2023-01-29 16:33:56 +08:00