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

Commit Graph

  • 628a74c3f7 Accept Merge Request #260: (feature/去掉不用的代码 -> develop) Merge Request: 去掉不要的引用 杨金灵 2023-07-17 17:36:50 +08:00
  • 9a392eebad 去掉不要的引用 jinling.yang 2023-07-17 17:35:55 +08:00
  • f67850461f Accept Merge Request #259: (feature/一级菜单点击收起 -> develop) Merge Request: 一级菜单点击收起 许何哲 2023-07-17 17:32:35 +08:00
  • ad60e1a624 一级菜单点击收起 WEB许何哲\xuhez 2023-07-17 17:32:11 +08:00
  • 21a594a81e Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2023-07-17 16:51:10 +08:00
  • 253736221e Merge branch 'feature/页面展示优化' into develop jinling.yang 2023-07-17 16:50:41 +08:00
  • 1252d11bba Accept Merge Request #258: (feature/页面展示优化 -> develop) Merge Request: 修复产品模板Bug 杨金灵 2023-07-17 16:50:17 +08:00
  • b1da9ff18b Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/页面展示优化 jinling.yang 2023-07-17 16:48:44 +08:00
  • c6d6937f21 Accept Merge Request #257: (feature/优化生成工作日历记录功能 -> develop) Merge Request: 优化产线设备资源设置新建bug 禹翔辉 2023-07-17 16:48:00 +08:00
  • f40655b1af Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化生成工作日历记录功能 yuxianghui 2023-07-17 16:47:57 +08:00
  • f68dce9ee2 修复产品模板中产品类别为刀具和夹具时，根据产品类别为刀具和夹具时，新增的page页面里的字段显示及回显Bug jinling.yang 2023-07-17 16:46:01 +08:00
  • ebda457684 优化产线设备资源设置新建bug yuxianghui 2023-07-17 16:45:52 +08:00
  • d9a6d1a803 Accept Merge Request #256: (feature/优化生成工作日历记录功能 -> develop) Merge Request: 优化工作日历设置开始时间和结束时间为根据所选班次自动生成 禹翔辉 2023-07-17 16:40:30 +08:00
  • fc5a3dcab4 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化生成工作日历记录功能 yuxianghui 2023-07-17 16:40:03 +08:00
  • 5b0df0befd 优化工作日历设置开始时间和结束时间为根据所选班次自动生成 yuxianghui 2023-07-17 16:39:30 +08:00
  • 0dd5e5086d Accept Merge Request #255: (feature/修改设备基础参数 -> develop) Merge Request: 修改设备参数布局 龚启豪 2023-07-17 15:45:38 +08:00
  • bb464a2351 修改设备参数布局 qihao.gong@jikimo.com 2023-07-17 15:44:04 +08:00
  • c03d683dcb Accept Merge Request #254: (feature/修改缺陷 -> develop) Merge Request: 修复工作中心计划报错的问题，修改制造模块目录结构 马广威 2023-07-17 15:38:49 +08:00
  • 344fe1b58b Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改缺陷 mgw 2023-07-17 15:37:47 +08:00
  • c0d14daf44 修复工作中心计划报错的问题，修改制造模块目录结构 mgw 2023-07-17 15:37:23 +08:00
  • cf22c6f6fc Accept Merge Request #253: (feature/表头固定 -> develop) Merge Request: 修改表头固定 许何哲 2023-07-17 11:10:43 +08:00
  • f579875b35 修改表头固定 WEB许何哲\xuhez 2023-07-17 11:09:26 +08:00
  • b49677d5ba Accept Merge Request #252: (feature/优化生成工作日历记录功能 -> develop) Merge Request: 对工作日历设置的name字段进行限制，优化工作日历form视图的显示 禹翔辉 2023-07-17 11:04:21 +08:00
  • 6389186851 Accept Merge Request #251: (feature/修改制造目录结构 -> develop) Merge Request: 修改制造菜单结构 马广威 2023-07-17 10:58:02 +08:00
  • d27fedcd0b 修改原生“作业”为“计划管理” mgw 2023-07-17 10:56:43 +08:00
  • c1350f04b7 修改制造目录结构，更改原生“作业”为“计划管理” mgw 2023-07-17 10:56:19 +08:00
  • b48c231dcc Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化生成工作日历记录功能 yuxianghui 2023-07-17 10:43:47 +08:00
  • 9752b2e49f Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化生成工作日历记录功能 yuxianghui 2023-07-17 10:40:49 +08:00
  • 00795ca3e9 Accept Merge Request #249: (feature/订单计划 -> develop) Merge Request: 修改设备模块菜单名称 龚启豪 2023-07-17 10:40:14 +08:00
  • a557a42cf5 对工作日历设置的name字段进行限制，优化工作日历form视图的显示 yuxianghui 2023-07-17 10:40:07 +08:00
  • 1743801c78 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/订单计划 qihao.gong@jikimo.com 2023-07-17 10:39:15 +08:00
  • ad84eedda3 修改设备菜单名称 qihao.gong@jikimo.com 2023-07-17 10:38:54 +08:00
  • 6055921556 Accept Merge Request #248: (feature/tree视图表头固定 -> develop) Merge Request: tree视图表头固定 许何哲 2023-07-17 10:17:56 +08:00
  • b74a029166 tree视图表头固定 WEB许何哲\xuhez 2023-07-17 10:15:50 +08:00
  • 4bb3ab3e16 维保计划视图优化 qihao.gong@jikimo.com 2023-07-14 17:27:11 +08:00
  • 095b707f0c Accept Merge Request #247: (feature/工作日历设置-工作日历表 -> develop) Merge Request: 优化刀具管理form视图的name显示 禹翔辉 2023-07-14 17:27:01 +08:00
  • 992435b1f8 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/工作日历设置-工作日历表 yuxianghui 2023-07-14 17:26:01 +08:00
  • a4339d1d67 优化刀具管理的form视图表名显示问题 yuxianghui 2023-07-14 17:25:35 +08:00
  • 9c4f51d5f6 优化刀具管理form视图表名显示问题 yuxianghui 2023-07-14 17:24:59 +08:00
  • 90a71326a9 Accept Merge Request #246: (feature/工作日历设置-工作日历表 -> develop) Merge Request: 工作日历设置模型新增查看日历按键，隐藏工作日历菜单 禹翔辉 2023-07-14 16:07:02 +08:00
  • a8e30a5228 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/工作日历设置-工作日历表 yuxianghui 2023-07-14 15:02:15 +08:00
  • 808f57adfb 工作日历设置模型新增查看日历按键，隐藏工作日历菜单 yuxianghui 2023-07-14 15:01:56 +08:00
  • a71497d3a8 Accept Merge Request #245: (feature/解决工作日历无法创建的bug -> develop) Merge Request: 解决冲突与优化结构 马广威 2023-07-14 14:45:03 +08:00
  • 5b6a563a87 更改库存模块库区相关字段 mgw 2023-07-14 14:43:06 +08:00
  • 3de5a95a98 解决工作日历无法创建的bug mgw 2023-07-14 14:35:22 +08:00
  • 14283ab5e4 Accept Merge Request #244: (feature/测试皮肤模块 -> develop) Merge Request: 修改.gitignore文件，注释忽略lib文件夹部分;修改制造模块依赖 马广威 2023-07-14 12:29:44 +08:00
  • 3b789d040a 修改制造模块依赖 mgw 2023-07-14 12:28:23 +08:00
  • f0e7d41ad6 修改.gitignore文件，注释忽略lib文件夹部分 mgw 2023-07-14 12:26:21 +08:00
  • debcca8b07 Accept Merge Request #242: (feature/修改字段 -> develop) Merge Request: 修改关联关系的字段 feature/主题logo添加中文 马广威 2023-07-14 12:00:13 +08:00
  • 741c2b34bf 修改关联关系的字段 mgw 2023-07-14 11:58:56 +08:00
  • 3b8ea6874b Accept Merge Request #241: (feature/订单计划 -> develop) Merge Request: 更换数据库 龚启豪 2023-07-14 10:45:39 +08:00
  • 381505bd9d 更换数据库 qihao.gong@jikimo.com 2023-07-14 10:45:02 +08:00
  • 28b6f854cb Accept Merge Request #240: (feature/主题logo添加中文 -> develop) Merge Request: 添加中文logo 许何哲 2023-07-14 10:38:18 +08:00
  • cb4dc2a057 Merge branch 'develop' into feature/主题logo添加中文 WEB许何哲\xuhez 2023-07-14 10:35:07 +08:00
  • 412083e2aa 主题logo添加中文 WEB许何哲\xuhez 2023-07-14 10:33:11 +08:00
  • ad565d0096 Accept Merge Request #239: (feature/设备模块文件解决冲突 -> develop) Merge Request: 设备模块文件解决冲突 杨金灵 2023-07-14 10:16:51 +08:00
  • 31d335af48 设备模块文件解决冲突 jinling.yang 2023-07-14 10:16:22 +08:00
  • 48cb394b3f Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2023-07-14 10:07:46 +08:00
  • c709c046c7 Merge branch 'feature/优化夹具产品模板' into develop jinling.yang 2023-07-14 10:06:37 +08:00
  • a0744e6713 Accept Merge Request #238: (feature/优化夹具产品模板 -> develop) Merge Request: 优化夹具产品模板 杨金灵 2023-07-14 10:06:20 +08:00
  • 98d3e61d66 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化夹具产品模板 jinling.yang 2023-07-14 10:05:01 +08:00
  • 7b4d4a0d9a Accept Merge Request #237: (feature/修改看板样式 -> develop) Merge Request: 主题 许何哲 2023-07-14 09:23:51 +08:00
  • a48c8b2baa 上传修改后的主题 WEB许何哲\xuhez 2023-07-14 09:21:21 +08:00
  • 1c022711a1 注释测试字段 WEB许何哲\xuhez 2023-07-14 09:11:57 +08:00
  • 0291ed9a56 Merge branch 'develop' into feature/修改看板样式 WEB许何哲\xuhez 2023-07-14 09:10:37 +08:00
  • 08e0eeee3d Accept Merge Request #236: (feature/订单计划 -> develop) Merge Request: 密码约束模块 龚启豪 2023-07-14 09:05:59 +08:00
  • 8f795096c3 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/订单计划 qihao.gong@jikimo.com 2023-07-14 09:02:48 +08:00
  • 2161f4c140 Accept Merge Request #235: (feature/工作日历及其设置 -> develop) Merge Request: 工作日历及其设置的bug已解决，优化已完成 马广威 2023-07-13 19:21:13 +08:00
  • b544e10b0d Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/工作日历及其设置 mgw 2023-07-13 19:20:05 +08:00
  • 9073880aac 工作日历及其设置bug已解决，优化已完成 mgw 2023-07-13 19:19:40 +08:00
  • b48a835808 修改看板樣式 WEB许何哲\xuhez 2023-07-13 17:31:54 +08:00
  • 5e8e380a8e 密码模块修改 qihao.gong@jikimo.com 2023-07-13 17:31:16 +08:00
  • d7732fe2ff Accept Merge Request #234: (feature/新增工件装夹 -> develop) Merge Request: 装夹工单优化 杨金灵 2023-07-13 17:21:26 +08:00
  • 36bb77ccb0 工单的完成按钮代码还原 jinling.yang 2023-07-13 17:17:48 +08:00
  • 7a690abe1a Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/新增工件装夹 jinling.yang 2023-07-13 16:58:49 +08:00
  • 5beb7b3417 优化装夹工单，新增工件装夹page，名字为组件的page名称改为物料，去掉单独的工件装夹功能 jinling.yang 2023-07-13 16:57:48 +08:00
  • d9adfc30d5 Accept Merge Request #233: (feature/修改库存模块的部分逻辑 -> develop) Merge Request: 库存模块部分逻辑已修改完成 马广威 2023-07-13 16:11:36 +08:00
  • 3643c5ecb7 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改库存模块的部分逻辑 mgw 2023-07-13 16:10:11 +08:00
  • f9c63b69a1 库存模块逻辑修改已完成 mgw 2023-07-13 16:09:28 +08:00
  • 701ae26eb4 Accept Merge Request #232: (feature/工作日历设置-工作日历表 -> develop) Merge Request: 生产线模型搬移至制造模块，新增工作日历模块，新增工作日历设置相关功能 禹翔辉 2023-07-13 16:07:20 +08:00
  • 81842dc5ec 将生产线模型从设备模块搬移到了制造模块，新增工作日历设置修改休息日字段则工作日历创建新记录 yuxianghui 2023-07-13 16:05:38 +08:00
  • 571e32925e Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/工作日历设置-工作日历表 yuxianghui 2023-07-11 17:40:46 +08:00
  • ef7d9c22d4 新增根据工作日历设置的工作日字段创建工作日历的记录 yuxianghui 2023-07-11 17:40:14 +08:00
  • b6de9d5e64 Merge branch 'develop' into feature/修改看板样式 WEB许何哲\xuhez 2023-07-11 16:05:53 +08:00
  • a3760a7d9d 0711提交 WEB许何哲\xuhez 2023-07-11 16:00:21 +08:00
  • 58b9ea404b Accept Merge Request #231: (feature/增加js_class类对看板视图布局进行修改 -> develop) Merge Request: 增加js_class类对看板视图进行布局修改 马广威 2023-07-11 15:49:53 +08:00
  • feb15e4db2 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/增加js_class类对看板视图布局进行修改 mgw 2023-07-11 15:48:44 +08:00
  • acd37b6c8c 修改sf_warehouse模块目录结构 mgw 2023-07-11 15:48:11 +08:00
  • 94ffec20db 增加js_class类对看板视图进行布局修改 mgw 2023-07-11 15:43:03 +08:00
  • 7743c9658c 工单菜单优化 jinling.yang 2023-07-10 17:33:17 +08:00
  • 3544c6a957 密码策略模块测试 qihao.gong@jikimo.com 2023-07-10 17:33:06 +08:00
  • 6dfced8541 新增班次对象，新增工作日对象，修改了工作日历设置的班次、工作日字段类型；新增工作日历表对象 yuxianghui 2023-07-10 17:26:43 +08:00
  • 1502336286 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/订单计划 qihao.gong@jikimo.com 2023-07-10 10:04:18 +08:00
  • 78fd5a7ac3 修改工作中心与设备关联关系 qihao.gong@jikimo.com 2023-07-10 10:03:02 +08:00
  • 94856b0c55 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/新增工件装夹 jinling.yang 2023-07-07 17:39:44 +08:00
  • a0570cb999 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/新增工件装夹 jinling.yang 2023-07-07 17:38:04 +08:00
  • 1d970712e3 Accept Merge Request #230: (feature/计划管理-基础设置 -> develop) Merge Request: 优化了产线设备资源设置模型 禹翔辉 2023-07-07 17:37:19 +08:00
  • 9a03235cfa Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/计划管理-基础设置 yuxianghui 2023-07-07 17:36:59 +08:00
  • e711ff0ab3 优化了产线设备资源设置，新增根据选取的工作中心自动带出设备的数据，新增根据选择的工作日历自动带出班次的数据，新增搜索视图 yuxianghui 2023-07-07 17:36:42 +08:00
  • 3fdf9130e8 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/新增工件装夹 jinling.yang 2023-07-07 14:39:05 +08:00