leo
/
LAPP_GAAS_GFrame_WEBFRONT
1
0
Fork 0
Code Issues 0 Pull Requests 0 Projects 0 Releases 0 Wiki Activity

Commit Graph

  • a6c12c0 (refs/pull/63/head) Merge branch 'develop' of http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_WEBFRONT into liwei by liwei 2021-06-03 18:13:28 +0800
  • 406ea6d Merge pull request '新增解析器页面，包装功能完善，新增项目定义字段' (#62) from feature_supplier into develop by Liwei 2021-06-03 18:11:45 +0800
  • 216fd93 (refs/pull/62/head) 开发包装功能 by wangxy 2021-06-03 18:07:47 +0800
  • 5400ac0 Merge branch 'develop' of http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_WEBFRONT into liwei by liwei 2021-06-03 14:27:15 +0800
  • 383a515 甘特图调整 by liwei 2021-06-03 14:26:58 +0800
  • 91b44d5 项目定义增加字段 by wangxy 2021-06-03 13:40:48 +0800
  • 332918d 物料主数据定义增加项目定义select框 by wangxy 2021-06-03 11:20:03 +0800
  • b067ddf 新增解析器页面 by wangxy 2021-06-02 18:17:04 +0800
  • f1319ec 包装页面功能开发 by wangxy 2021-06-02 14:18:12 +0800
  • 6faf92b Merge branch 'suzhou_blueVersion' of 101.201.121.115:leo/LAPP_GAAS_GFrame_WEBFRONT into suzhou_blueVersion by wangxy 2021-06-02 13:44:30 +0800
  • fb56aa7 Merge branch 'develop' of 101.201.121.115:leo/LAPP_GAAS_GFrame_WEBFRONT into suzhou_blueVersion by wangxy 2021-06-02 13:41:23 +0800
  • 96313bb Merge branch 'develop' of 101.201.121.115:leo/LAPP_GAAS_GFrame_WEBFRONT into feature_supplier by wangxy 2021-06-02 13:38:57 +0800
  • 7013fb1 Merge pull request '甘特图开放背景' (#61) from liwei into develop by wangxy 2021-06-02 13:38:07 +0800
  • ef6f373 梳理包装页面代码逻辑，添加注释 by wangxy 2021-06-02 13:37:05 +0800
  • 1031dd5 合并冲突 by liwei 2021-06-02 09:21:04 +0800
  • d00729a 合并代码 by liwei 2021-06-02 09:20:36 +0800
  • 6883238 (refs/pull/61/head) 开放代码 by liwei 2021-06-02 09:19:13 +0800
  • 30b339c 配置文件切回测试环境 by liwei 2021-06-02 09:14:13 +0800
  • 3fa5428 合并冲突 by liwei 2021-06-02 09:09:34 +0800
  • e215f58 合并分支 by liwei 2021-06-02 09:07:44 +0800
  • 58996e4 Merge branch 'develop' of 101.201.121.115:leo/LAPP_GAAS_GFrame_WEBFRONT into feature_supplier by wangxy 2021-06-02 09:04:13 +0800
  • 8565126 Merge pull request '添加供应商门户地址' (#60) from liwei into develop by wangxy 2021-06-02 09:03:35 +0800
  • 384d958 (refs/pull/60/head) 添加门户地址 by liwei 2021-06-02 08:54:07 +0800
  • 9aed8de 开放部分代码 by liwei 2021-06-01 17:45:32 +0800
  • 9a8a8f8 包装页面样式优化，左侧列表增加切换功能 by wangxy 2021-06-01 15:54:26 +0800
  • fa58e46 Merge pull request 'EODS登录功能调整' (#59) from feature_supplier into develop by Liwei 2021-05-31 16:49:14 +0800
  • 55c3213 (refs/pull/59/head) EODS登录功能调整 by wangxy 2021-05-31 16:42:11 +0800
  • b13b28a Merge pull request '资产维护历史、维护工单管理修改bug' (#58) from feature_supplier into develop by Liwei 2021-05-31 14:39:22 +0800
  • ab3b268 (refs/pull/58/head) Merge branch 'develop' of 101.201.121.115:leo/LAPP_GAAS_GFrame_WEBFRONT into feature_supplier by wangxy 2021-05-31 14:37:55 +0800
  • 417e1d2 资产维护历史、维护工单管理修改bug by wangxy 2021-05-31 14:36:58 +0800
  • 36710ac Merge pull request 'EODS状态色值对调' (#57) from liwei into develop by wangxy 2021-05-31 11:24:43 +0800
  • 9554129 (refs/pull/57/head) Merge branch 'develop' of http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_WEBFRONT into liwei by liwei 2021-05-31 11:21:02 +0800
  • 52b71bb 色值调整 by liwei 2021-05-31 11:20:38 +0800
  • 3b443cd Merge pull request 'EODS详情删除多余参数' (#56) from liwei into develop by wangxy 2021-05-31 11:02:16 +0800
  • ab4038a (refs/pull/56/head) EODS详情删除多余参数 by liwei 2021-05-31 10:59:35 +0800
  • 2aaa1cd Merge branch 'develop' of http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_WEBFRONT into liwei by liwei 2021-05-31 10:48:49 +0800
  • e22318e Eods基础数据维护开放 by liwei 2021-05-31 10:48:22 +0800
  • 581212f Merge pull request '交互调整' (#55) from liwei into develop by wangxy 2021-05-28 18:00:43 +0800
  • b45bb2e (refs/pull/55/head, refs/pull/54/head) 样式调整 by liwei 2021-05-28 17:58:52 +0800
  • bfed483 样式调整 by liwei 2021-05-28 17:36:28 +0800
  • 30cd020 Merge branch 'develop' of http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_WEBFRONT into liwei by liwei 2021-05-28 14:39:30 +0800
  • aff97ff EODS接口联调 by liwei 2021-05-28 14:38:46 +0800
  • a2f10a2 Merge pull request '增加默认值' (#53) from feature_supplier into develop by Liwei 2021-05-28 14:07:16 +0800
  • 5ab0ed5 (refs/pull/53/head) 增加默认值 by wangxy 2021-05-28 11:23:46 +0800
  • d135b7f Merge pull request '交互调整' (#52) from liwei into develop by wangxy 2021-05-27 18:05:19 +0800
  • d69631b (refs/pull/52/head) 交互调整 by liwei 2021-05-27 18:03:49 +0800
  • 2f57fd2 Merge pull request 'E-ODS页面新增需求' (#51) from feature_supplier into develop by Liwei 2021-05-27 17:33:04 +0800
  • 964b262 (refs/pull/51/head) Merge branch 'develop' of 101.201.121.115:leo/LAPP_GAAS_GFrame_WEBFRONT into feature_supplier by wangxy 2021-05-27 17:31:57 +0800
  • f3c0fd4 Merge pull request 'EODS基础数据维护界面' (#50) from liwei into develop by wangxy 2021-05-27 17:31:06 +0800
  • dd9ae7e (refs/pull/50/head) 添加EODS基础数据维护界面 by liwei 2021-05-27 17:27:52 +0800
  • d165b15 E-ODS页面新增需求 by wangxy 2021-05-27 17:27:17 +0800
  • de81f1b Merge branch 'develop' of http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_WEBFRONT into liwei by liwei 2021-05-27 11:24:50 +0800
  • dbb280d 甘特图添加悬浮展示详情 by liwei 2021-05-27 11:24:38 +0800
  • 11e4bea Merge pull request '物料主数据添加属性值' (#49) from feature_supplier into develop by Liwei 2021-05-26 18:01:23 +0800
  • 7f77bd8 (refs/pull/49/head) 物料主数据添加属性值 by wangxy 2021-05-26 18:00:18 +0800
  • 66d9223 Merge pull request '项目中列表页面优化' (#48) from feature_supplier into develop by Liwei 2021-05-26 10:03:28 +0800
  • 9ce6e2c (refs/pull/48/head) 项目中列表页面优化 by wangxy 2021-05-26 10:01:02 +0800
  • 2bdde64 Merge pull request '修改所有页面的分页功能' (#47) from feature_supplier into develop by Liwei 2021-05-25 18:06:01 +0800
  • 3fde9fb (refs/pull/47/head) 修改所有页面的分页功能 by wangxy 2021-05-25 18:03:54 +0800
  • 2fee8f9 Merge pull request '缺陷数据采集bug修复' (#46) from feature_supplier into develop by Liwei 2021-05-25 14:48:46 +0800
  • e678601 (refs/pull/46/head) 缺陷数据采集bug修复 by wangxy 2021-05-25 14:45:27 +0800
  • 2cec152 修改缺陷数据采集的问题 by wangxy 2021-05-25 09:51:07 +0800
  • b9333d6 Merge pull request '一键锁定调整' (#45) from liwei into develop by wangxy 2021-05-21 15:53:55 +0800
  • 681344f (refs/pull/45/head) Merge branch 'develop' of http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_WEBFRONT into liwei by liwei 2021-05-21 13:29:37 +0800
  • bb8bc5a 一键锁定添加时间过滤 by liwei 2021-05-21 13:28:59 +0800
  • 9d61ac1 Merge pull request '更换查询物料对应的E-ODS接口' (#44) from feature_supplier into develop by Liwei 2021-05-21 11:16:53 +0800
  • 3161f75 (refs/pull/44/head) 优化 by wangxy 2021-05-21 11:15:41 +0800
  • af22ee6 更换查询物料对应的E-ODS接口 by wangxy 2021-05-21 11:12:05 +0800
  • e841486 Merge pull request '生产计划中的订单解析和portal的订单解析，上传查询接口新增Source区分' (#43) from feature_supplier into develop by Liwei 2021-05-20 14:23:12 +0800
  • 84e50f6 (refs/pull/43/head) 生产计划中的订单解析和portal的订单解析，上传查询接口新增Source区分 by wangxy 2021-05-20 14:17:48 +0800
  • 3ad4b3e Merge pull request '产品视图优化' (#42) from feature_supplier into develop by Liwei 2021-05-20 11:00:34 +0800
  • 8a08544 (refs/pull/42/head) 产品视图优化 by wangxy 2021-05-20 10:58:55 +0800
  • 70eef02 Merge pull request '产线定义派工参数绑定完善' (#41) from feature_supplier into develop by Liwei 2021-05-19 20:28:01 +0800
  • 10ce8bf (refs/pull/41/head) 产线定义派工参数绑定完善 by wangxy 2021-05-19 20:26:21 +0800
  • a44ad12 Merge pull request '物料，产线新增字段功能' (#40) from feature_supplier into develop by Liwei 2021-05-19 19:18:47 +0800
  • b9a91fe (refs/pull/40/head) 物料，产线新增字段功能 by wangxy 2021-05-19 19:16:38 +0800
  • 1d7e4b8 Merge pull request '订单管理增加计划开始日期字段' (#39) from feature_supplier into develop by Liwei 2021-05-19 17:07:33 +0800
  • 49418d4 (refs/pull/39/head) 订单管理增加计划开始日期字段 by wangxy 2021-05-19 17:06:36 +0800
  • 3e1b13f Merge pull request '物料主数据新增参数位置调整' (#38) from feature_supplier into develop by Liwei 2021-05-19 16:06:28 +0800
  • 8403404 (refs/pull/38/head) 代码优化 by wangxy 2021-05-19 16:05:03 +0800
  • 7cc7711 物料主数据优化 by wangxy 2021-05-19 16:03:33 +0800
  • af06ba7 Merge pull request '工厂模型功能完善，返工、缺陷采集优化' (#37) from feature_supplier into develop by Liwei 2021-05-19 15:53:56 +0800
  • e4299a4 Merge pull request '关闭甘特图拖动' (#36) from liwei into develop by 王新尧 2021-05-19 15:53:27 +0800
  • 4cb7cf4 (refs/pull/37/head) 工厂模型功能完善，返工、缺陷采集优化 by wangxy 2021-05-19 15:34:19 +0800
  • 0f53ded (refs/pull/36/head, refs/pull/35/head) 接口参数调整 by liwei 2021-05-19 15:02:12 +0800
  • eea799f (refs/pull/34/head) 关闭拖动 by liwei 2021-05-19 14:44:52 +0800
  • 298fa59 (refs/pull/33/head, refs/pull/32/head) Merge branch 'develop' of http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_WEBFRONT into liwei by liwei 2021-05-19 14:31:23 +0800
  • 0f25ca2 一键排程调整 by liwei 2021-05-19 14:31:11 +0800
  • df34fa4 Merge branch 'develop' of 101.201.121.115:leo/LAPP_GAAS_GFrame_WEBFRONT into feature_supplier by wangxy 2021-05-19 14:15:16 +0800
  • daeac18 完善工厂模型功能 by wangxy 2021-05-19 14:14:50 +0800
  • b360c20 Merge pull request '甘特图样式调整' (#31) from liwei into develop by 王新尧 2021-05-19 14:13:58 +0800
  • d92a438 (refs/pull/31/head) 样式调整 by liwei 2021-05-19 14:11:46 +0800
  • 9dfb935 Merge branch 'develop' of http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_WEBFRONT into liwei by liwei 2021-05-19 13:59:29 +0800
  • 8b3a7af 取值调整 by liwei 2021-05-19 13:59:10 +0800
  • 798b51e Merge pull request '订单管理新增OM_WorkOrder-OrderInfo字段' (#30) from feature_supplier into develop by Liwei 2021-05-19 11:04:37 +0800
  • 8438e56 (refs/pull/30/head) Merge branch 'develop' of 101.201.121.115:leo/LAPP_GAAS_GFrame_WEBFRONT into feature_supplier by wangxy 2021-05-19 11:02:57 +0800
  • 9d0a3d8 订单管理新增OM_WorkOrder-OrderInfo字段 by wangxy 2021-05-19 11:02:31 +0800
  • 2218370 Merge pull request '甘特图添加任务描述' (#29) from liwei into develop by 王新尧 2021-05-19 11:00:37 +0800
  • 225fe50 (refs/pull/29/head) 甘特图添加描述 by liwei 2021-05-19 10:54:23 +0800
  • 152113d Merge branch 'develop' of http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_WEBFRONT into liwei by liwei 2021-05-19 10:49:24 +0800