jikimo/test
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Commit Graph

  • 425b926948 品牌Tree列表图片放在备注前面 jinling.yang 2023-08-25 15:49:32 +08:00
  • 71ca6d27ce Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/产品模板优化 jinling.yang 2023-08-25 15:47:16 +08:00
  • 7174de3de6 产品模板的型号手动输入时型号对象的编码，联装类型，夹具物料字段的值显示 jinling.yang 2023-08-25 15:46:41 +08:00
  • 194faf5a55 Accept Merge Request #346: (feature/修改机床参数bug -> develop) Merge Request: 维保项目可以上传多张图片的功能 龚启豪 2023-08-25 11:12:46 +08:00
  • caeff1e17a Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改机床参数bug qihao.gong@jikimo.com 2023-08-25 11:10:46 +08:00
  • a9954c1231 维保计划中维保项目可以上传多张图片 qihao.gong@jikimo.com 2023-08-25 11:10:28 +08:00
  • e3f58ccee8 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/生产排程 mgw 2023-08-25 10:43:39 +08:00
  • 7e071151a8 删除制造订单处排程相关的部分，排程模块架构改造完成 mgw 2023-08-25 10:43:22 +08:00
  • e4af4ca0b6 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2023-08-25 10:42:09 +08:00
  • 3ef20d64ac Merge branch 'feature/新增上传模型功能' into develop jinling.yang 2023-08-25 10:41:49 +08:00
  • c6a6eec5b7 Accept Merge Request #345: (feature/新增上传模型功能 -> develop) Merge Request: 新增上传模型（快速订单）功能 杨金灵 2023-08-25 10:41:20 +08:00
  • 5de04449e4 对模型进行上色和特征识别及自动报价 jinling.yang 2023-08-25 10:39:31 +08:00
  • eda57036bd Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/生产排程 mgw 2023-08-25 09:14:34 +08:00
  • e33a25e47a 更改排程结构前备份 mgw 2023-08-25 09:14:15 +08:00
  • e7d32e5041 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/新增上传模型功能 jinling.yang 2023-08-24 17:32:59 +08:00
  • 55504c2725 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/新增上传模型功能 jinling.yang 2023-08-24 17:32:25 +08:00
  • 9318be0f09 Accept Merge Request #344: (feature/修改机床参数bug -> develop) Merge Request: 修改工作中心看板，设备清单看板 龚启豪 2023-08-24 15:01:56 +08:00
  • f31a6d0d43 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改机床参数bug qihao.gong@jikimo.com 2023-08-24 15:00:41 +08:00
  • 3b3847990d 工作重心看板展示设备状态以及图片，设备看板增加负责人 qihao.gong@jikimo.com 2023-08-24 14:51:03 +08:00
  • c699cdff0a Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/生产排程 mgw 2023-08-24 11:36:30 +08:00
  • bbfb29f60b Accept Merge Request #343: (feature/必填字段label添加星号 -> develop) Merge Request: 修改文字颜色 许何哲 2023-08-24 11:35:01 +08:00
  • 28a50a1d94 Merge branch 'develop' into feature/必填字段label添加星号 WEB许何哲\xuhez 2023-08-24 11:33:48 +08:00
  • 623d89bf31 修改文字颜色 WEB许何哲\xuhez 2023-08-24 11:33:24 +08:00
  • 7a4dd55fa4 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/生产排程 mgw 2023-08-24 11:24:48 +08:00
  • bf7ef78b20 搭建排程基础架构 mgw 2023-08-24 11:24:27 +08:00
  • bcb05cb2e2 Accept Merge Request #342: (feature/必填字段label添加星号 -> develop) Merge Request: 3d模型无法展示的时候用文字替换 许何哲 2023-08-24 11:10:06 +08:00
  • 9c52e23e44 Merge branch 'develop' into feature/必填字段label添加星号 WEB许何哲\xuhez 2023-08-24 11:09:07 +08:00
  • 1c50e11a43 3d模型无法展示的时候用文字替换 WEB许何哲\xuhez 2023-08-24 11:07:54 +08:00
  • a2f5dbd70d Accept Merge Request #341: (feature/必填字段label添加星号 -> develop) Merge Request: 修改看板样式 许何哲 2023-08-24 09:04:02 +08:00
  • 0f283c1eda Merge branch 'develop' into feature/必填字段label添加星号 WEB许何哲\xuhez 2023-08-24 09:03:20 +08:00
  • f67c8169bf 修改看板样式 WEB许何哲\xuhez 2023-08-24 09:02:15 +08:00
  • f9e4b73fb0 新增上传模型功能 jinling.yang 2023-08-23 17:34:06 +08:00
  • e31858c9d7 Accept Merge Request #340: (feature/刀具管理加粗字段调整及界面布局优化 -> develop) Merge Request: 刀具管理模块中的所有模型界面的加粗字段都改为name字段；优化了刀具物料查询界面布局。 禹翔辉 2023-08-23 17:33:34 +08:00
  • 4f70f7ef70 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/刀具管理加粗字段调整及界面布局优化 yuxianghui 2023-08-23 17:32:58 +08:00
  • 11a06df0a4 刀具管理模块中的所有模型界面的加粗字段都改为name字段；优化了刀具物料查询界面布局。 yuxianghui 2023-08-23 17:32:22 +08:00
  • da8caf42f5 Accept Merge Request #339: (feature/生产排程 -> develop) Merge Request: 更新3D模型展示代码 马广威 2023-08-23 15:48:04 +08:00
  • 0b30408aae 更新3D模型展示代码 mgw 2023-08-23 15:47:17 +08:00
  • e2f5ce42e6 Accept Merge Request #338: (feature/修改机床参数bug -> develop) Merge Request: 刀把类型新增bt50 处理品牌图片同步报错问题 龚启豪 2023-08-23 14:40:10 +08:00
  • 90868d4a09 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改机床参数bug qihao.gong@jikimo.com 2023-08-23 14:37:20 +08:00
  • b01a5a4216 刀把类型新增bt50 修改同步品牌图片报错问题 qihao.gong@jikimo.com 2023-08-23 14:37:02 +08:00
  • c27bfb5990 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2023-08-23 10:31:21 +08:00
  • 589f99db1a Merge branch 'feature/同步夹具型号Bug修复' into develop jinling.yang 2023-08-23 10:31:01 +08:00
  • 7d0e35a9f4 Accept Merge Request #337: (feature/同步夹具型号Bug修复 -> develop) Merge Request: 夹具型号同步修复和页面名称加大醒目 杨金灵 2023-08-23 10:30:43 +08:00
  • a64d24d8ff Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/同步夹具型号Bug修复 jinling.yang 2023-08-23 10:29:09 +08:00
  • 2ae7b2c8ec 页面名称加大醒目 jinling.yang 2023-08-23 10:28:54 +08:00
  • cd33fb9fb9 夹具型号同步修复 jinling.yang 2023-08-23 10:09:47 +08:00
  • 1176aee38b Accept Merge Request #336: (feature/产线设备资源设置模块优化 -> develop) Merge Request: 计划管理-基础设置内模型的界面布局和字段优化 禹翔辉 2023-08-22 11:43:15 +08:00
  • e781bce27e 1、优化了产线设备资源设置和工作日历设置界面布局；删除工作日历、班次、休息日模型的form视图，新增tree视图修改功能；2、修复产线设备资源设置的设备信息显示问题，修改了机台号字段名称；3、新增工作日历设置班次字段必填；4、调整产线设备资源设置和工作日历设置菜单位置 yuxianghui 2023-08-22 11:40:35 +08:00
  • 10292df48d Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改机床参数bug qihao.gong@jikimo.com 2023-08-21 17:23:26 +08:00
  • 76293f5cca 修改维保table qihao.gong@jikimo.com 2023-08-21 17:22:53 +08:00
  • 16de3e40df Accept Merge Request #335: (feature/cnc工单处增加下载按钮 -> develop) Merge Request: cnc工单处增加NC文件下载的功能已完成 马广威 2023-08-21 17:22:10 +08:00
  • 642007d29b cnc工单处增加NC文件下载的功能已完成 mgw 2023-08-21 17:20:52 +08:00
  • 3c281230cc Accept Merge Request #334: (feature/修改机床参数bug -> develop) Merge Request: 修改设备看板 龚启豪 2023-08-21 15:42:12 +08:00
  • a5a9ae150f 修改设备看板 qihao.gong@jikimo.com 2023-08-21 15:41:40 +08:00
  • c2e2de4ab5 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2023-08-21 15:37:34 +08:00
  • e49e3b6981 Merge branch 'feature/页面布局' into develop jinling.yang 2023-08-21 15:37:20 +08:00
  • 1b3c929fa7 Accept Merge Request #333: (feature/页面布局 -> develop) Merge Request: 去掉厂家型号字段 杨金灵 2023-08-21 15:37:03 +08:00
  • fb8ca5f145 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/页面布局 jinling.yang 2023-08-21 15:35:50 +08:00
  • dfc5c206fd Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2023-08-21 11:51:32 +08:00
  • 3ab0fcb337 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/页面布局 jinling.yang 2023-08-21 11:50:36 +08:00
  • f6841e5e9f 同步材料型号及优化材料型号页面及新增拉伸强度，硬度，粗加工，精加工 jinling.yang 2023-08-21 11:49:24 +08:00
  • 2cb84c5f55 Accept Merge Request #332: (feature/修改机床参数bug -> develop) Merge Request: 设备改成维保 龚启豪 2023-08-21 10:28:46 +08:00
  • ff60824291 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改机床参数bug qihao.gong@jikimo.com 2023-08-21 10:28:12 +08:00
  • 82322b5024 修改设备table和跳转到维保 设备改为维保 qihao.gong@jikimo.com 2023-08-21 10:27:50 +08:00
  • bfa51d378c Merge branch 'feature/制造基础数据删除按钮放开' into develop jinling.yang 2023-08-21 10:25:13 +08:00
  • 78ddf4e52f Accept Merge Request #331: (feature/功能刀具优化 -> develop) Merge Request: 功能刀具优化 禹翔辉 2023-08-21 10:21:25 +08:00
  • 8a50a10b23 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/功能刀具优化 yuxianghui 2023-08-21 10:19:09 +08:00
  • 80f7da7979 Accept Merge Request #330: (feature/制造基础数据删除按钮放开 -> develop) Merge Request: 制造基础数据删除按钮放开 杨金灵 2023-08-21 10:18:17 +08:00
  • eec6dce4fc Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造基础数据删除按钮放开 jinling.yang 2023-08-21 10:16:47 +08:00
  • cd671bdc88 1.删除按钮放开 2.刀具类型同步代码还原 jinling.yang 2023-08-21 10:16:30 +08:00
  • 0fa2656aad 优化功能刀具的刀具物料字段 yuxianghui 2023-08-21 10:11:54 +08:00
  • 109da940ba Accept Merge Request #329: (feature/必填字段label添加星号 -> develop) Merge Request: 修改制造订单页面样式bug 许何哲 2023-08-21 10:10:45 +08:00
  • 64143798e0 Merge branch 'develop' into feature/必填字段label添加星号 WEB许何哲\xuhez 2023-08-21 10:09:42 +08:00
  • d8489a5f07 制造订单页面样式bug修改 WEB许何哲\xuhez 2023-08-21 10:08:55 +08:00
  • 8ae4d0dce8 Accept Merge Request #328: (feature/生产线优化 -> develop) Merge Request: 生产线新增关联工作中心字段，优化看板和form视图布局 禹翔辉 2023-08-18 15:14:41 +08:00
  • f88dd790a0 生产线新增关联工作中心字段，优化看板和form视图布局 yuxianghui 2023-08-18 15:11:36 +08:00
  • baea2d2a3e Accept Merge Request #327: (feature/修改机床参数bug -> develop) Merge Request: 品牌备注增加 龚启豪 2023-08-18 14:39:39 +08:00
  • 43d6794151 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改机床参数bug qihao.gong@jikimo.com 2023-08-18 14:34:37 +08:00
  • c924426725 品牌备注 qihao.gong@jikimo.com 2023-08-18 14:31:28 +08:00
  • 607eac90c6 Accept Merge Request #326: (feature/刀具物料与夹具物料的反注册 -> develop) Merge Request: 刀具及夹具物料反注册 杨金灵 2023-08-18 11:41:23 +08:00
  • 06b1e30670 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/刀具物料与夹具物料的反注册 jinling.yang 2023-08-18 11:38:02 +08:00
  • 5644ee2670 刀具页面优化 jinling.yang 2023-08-18 11:37:30 +08:00
  • 6fccd63916 Accept Merge Request #325: (feature/必填字段label添加星号 -> develop) Merge Request: 修改样式bug 许何哲 2023-08-18 11:04:40 +08:00
  • bed385d025 Merge branch 'develop' into feature/必填字段label添加星号 WEB许何哲\xuhez 2023-08-18 11:02:46 +08:00
  • 77b1ef2d91 消息发送界面的样式bug修改 WEB许何哲\xuhez 2023-08-18 11:01:30 +08:00
  • 3cef87ea46 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/刀具物料与夹具物料的反注册 jinling.yang 2023-08-17 18:09:19 +08:00
  • 97fcf6d91f Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/刀具物料与夹具物料的反注册 jinling.yang 2023-08-17 18:03:12 +08:00
  • ae07a515b7 Accept Merge Request #324: (feature/修改机床参数bug -> develop) Merge Request: 移除托盘对象，并清除关联方法,关联关系等 龚启豪 2023-08-17 16:35:07 +08:00
  • 422698ce34 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改机床参数bug qihao.gong@jikimo.com 2023-08-17 16:34:09 +08:00
  • 08ac2978a1 移除托盘对象 并清除所有关联关系 qihao.gong@jikimo.com 2023-08-17 16:33:40 +08:00
  • 92a9894757 Accept Merge Request #323: (feature/品牌增加按类别显示的搜索面板 -> develop) Merge Request: 品牌增加按类别显示的搜索面板 禹翔辉 2023-08-17 15:28:25 +08:00
  • 093b0e63ce Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/品牌增加按类别显示的搜索面板 yuxianghui 2023-08-17 15:26:28 +08:00
  • 07564248d2 品牌增加按类别显示的搜索面板 yuxianghui 2023-08-17 15:25:53 +08:00
  • 908d247f98 Accept Merge Request #322: (feature/修改机床参数bug -> develop) Merge Request: 设备看板优化以及表单视图修改 龚启豪 2023-08-17 11:58:38 +08:00
  • 6193fa3c09 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改机床参数bug qihao.gong@jikimo.com 2023-08-17 11:48:54 +08:00
  • 5c1ba207b6 Accept Merge Request #321: (feature/刀具管理界面布局优化 -> develop) Merge Request: 刀具管理下除刀具物料外的界面布局及字段的优化 禹翔辉 2023-08-17 11:22:24 +08:00
  • 21bfad2f95 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/刀具管理界面布局优化 yuxianghui 2023-08-17 11:20:31 +08:00
  • 8b88f31672 刀具管理下除刀具物料外的界面布局及字段的优化 yuxianghui 2023-08-17 11:19:59 +08:00
  • 28fcf5c4fa 优化机场看板以及机床表单 qihao.gong@jikimo.com 2023-08-17 11:11:47 +08:00
  • f5653ce1dd Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改机床参数bug qihao.gong@jikimo.com 2023-08-17 10:13:19 +08:00