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

574 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
yuxianghui
4f7489f471 优化了功能刀具实时分布和出入库记录的视图显示效果 2023-06-15 17:04:40 +08:00
jinling.yang
ff904c2c02 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop 2023-06-15 16:19:05 +08:00
WEB许何哲\xuhez
c81730d7ba 0615t提交 2023-06-15 16:18:34 +08:00
jinling.yang
f455f1e7b4 Merge branch 'feature/刀具基础信息生成产品模板' into develop 2023-06-15 16:18:27 +08:00
杨金灵
0259270ece Accept Merge Request #200: (feature/刀具基础信息生成产品模板 -> develop) 
Merge Request: 刀具基础信息生成产品模板

Created By: @杨金灵
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/200?initial=true
 2023-06-15 16:18:04 +08:00
jinling.yang
8a0d89161b Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/刀具基础信息生成产品模板 2023-06-15 16:15:28 +08:00
jinling.yang
c7ec8be141 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/刀具基础信息生成产品模板 2023-06-15 16:14:50 +08:00
马广威
95870699d5 Accept Merge Request #199: (feature/sf刀具基础信息管理 -> develop) 
Merge Request: 修复同步bug

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/199?initial=true
 2023-06-15 15:41:41 +08:00
mgw
ba93adfb7b 修复同步bug（刀片类型字段无值） 2023-06-15 15:40:23 +08:00
马广威
a219a17165 Accept Merge Request #198: (feature/sf刀具基础信息管理 -> develop) 
Merge Request: 型号对象增加搜索视图

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/198?initial=true
 2023-06-15 12:21:00 +08:00
mgw
b1da7a8fda 型号对象增加搜索视图 2023-06-15 12:20:26 +08:00
禹翔辉
8b549a19a8 Accept Merge Request #197: (feature/sf刀具功能分支 -> develop) 
Merge Request: 关联了功能刀具和功能刀具管理俩个对象

Created By: @禹翔辉
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/197
 2023-06-15 10:00:20 +08:00
yuxianghui
fc6b756aaf 关联了功能刀具和功能刀具管理俩个对象 2023-06-15 09:57:14 +08:00
禹翔辉
1eeafeddb9 Accept Merge Request #196: (feature/sf刀具功能分支 -> develop) 
Merge Request: 增加了功能刀具实时分布和出入库记录功能模型

Created By: @禹翔辉
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/196?initial=true
 2023-06-15 09:08:56 +08:00
jinling.yang
34cc5bf125 新增刀具及刀具型号联动展示相关字段并显示对应信息，不同刀具的页面布局 2023-06-14 19:22:52 +08:00
马广威
a205220acd Accept Merge Request #195: (feature/sf刀具基础信息管理 -> develop) 
Merge Request: 删除测试模型及其界面

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/195
 2023-06-14 17:38:14 +08:00
mgw
f6651ffffb 删除测试模型 2023-06-14 17:36:39 +08:00
qihao.gong@jikimo.com
b8dc06a7c7 sf功能刀具管理页面 2023-06-14 17:18:03 +08:00
马广威
08f8d7f03a Accept Merge Request #194: (feature/sf刀具基础信息管理 -> develop) 
Merge Request: 增加物料刀具同步功能，修复一些问题

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/194?initial=true
 2023-06-14 16:35:54 +08:00
mgw
93c5bcebe1 增加刀具物料同步功能 2023-06-14 16:33:53 +08:00
yuxianghui
24fd92fa3b 对功能刀具预警、实时分布和出入库记录的代码进行了合并优化 2023-06-14 16:27:16 +08:00
qihao.gong@jikimo.com
c919dac8cb 刀具管理 2023-06-13 17:33:38 +08:00
WEB许何哲\xuhez
414f485c17 0613修改侧边栏 2023-06-13 17:32:21 +08:00
jinling.yang
6068a55b79 新增sf的刀具模板的相关刀具物料字段 2023-06-13 17:30:35 +08:00
yuxianghui
3236d477c0 sf的功能刀具实时分布和功能刀具出入库记录视图界面已建立 2023-06-13 17:13:15 +08:00
mgw
3d1d5e6ef3 智能工厂刀具物料模型、关联关系及其界面已建立 2023-06-13 14:13:15 +08:00
禹翔辉
6886354fc5 Accept Merge Request #191: (feature/sf刀具功能分支 -> develop) 
Merge Request: 夹具基础数据模块和redis夹具数据同步到sf夹具基础数据

Created By: @禹翔辉
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/191?initial=true
 2023-06-13 11:22:02 +08:00
yuxianghui
3a8c65c8d1 解决sf代码冲突问题 2023-06-13 11:19:06 +08:00
qihao.gong@jikimo.com
2eadcbe31a 新建刀具管理模块 及菜单 2023-06-13 10:40:58 +08:00
龚启豪
c76c01d78f Accept Merge Request #189: (feature/sf机床同步 -> develop) 
Merge Request: 同步接口新增每日定时器

Created By: @龚启豪
Accepted By: @龚启豪
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/189
 2023-06-12 16:19:42 +08:00
qihao.gong@jikimo.com
3baa438c2b 每日同步刀具定时器 2023-06-12 16:17:42 +08:00
马广威
f457890b73 Accept Merge Request #188: (feature/sf刀具基础信息管理 -> develop) 
Merge Request: 修正图片同步bug

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/188?initial=true
 2023-06-12 15:10:22 +08:00
mgw
06f907ba00 更正图片无法同步的bug 2023-06-12 15:09:30 +08:00
mgw
56580fa22a 同步方法已完成，合并 2023-06-12 14:48:06 +08:00
mgw
3d04200ca7 解决冲突 2023-06-12 14:35:14 +08:00
马广威
e9ccdd958d Accept Merge Request #187: (feature/sf刀具基础信息管理 -> develop) 
Merge Request: sf刀具基础信息同步基本完成

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/187?initial=true
 2023-06-12 14:24:41 +08:00
mgw
e0983d0530 解决权限冲突 2023-06-12 14:12:16 +08:00
mgw
a1678f76c2 同步方法基本完成，优化图片展示 2023-06-12 13:17:52 +08:00
jinling.yang
b53a115489 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop 2023-06-12 10:41:26 +08:00
jinling.yang
41cc8f1d73 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop 2023-06-12 10:39:34 +08:00
mgw
f95e04afc9 刀具同步方法（cloud >>> sf）基本完成，待测试 2023-06-12 09:24:33 +08:00
mgw
ac66e15d7a 部分cloud>sf同步接口已完成并测试 2023-06-09 18:15:12 +08:00
WEB许何哲\xuhez
8a4320c031 前端修改样式 2023-06-09 17:28:36 +08:00
龚启豪
8c23acceaf Accept Merge Request #184: (feature/sf机床同步 -> develop) 
Merge Request: 修改机床类型，机床型号对象，并从redis同步到工厂

Created By: @龚启豪
Accepted By: @龚启豪
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/184
 2023-06-08 15:02:44 +08:00
龚启豪
c481f5776e Merge branch refs/heads/develop into refs/heads/feature/sf机床同步 2023-06-08 15:02:03 +08:00
马广威
bc8f66c4e5 Accept Merge Request #185: (feature/sf刀具基础信息管理 -> develop) 
Merge Request: sf刀具基础信息初步建立

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/185?initial=true
 2023-06-08 15:00:26 +08:00
mgw
bf3c7e2b4d sf刀具基础信息已初步建立 2023-06-08 14:58:40 +08:00
qihao.gong@jikimo.com
99b89f2e15 修改同步所有数据的按钮 2023-06-08 09:36:42 +08:00
qihao.gong@jikimo.com
9d1597089b 修改机床型号同步接口以及基础数据 2023-06-07 15:26:44 +08:00
qihao.gong@jikimo.com
46c57162d7 同步机床类型对象 2023-06-07 10:49:55 +08:00