I3_YF_SEAT
/
i3plus-pojo
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Commit Graph

  • 00c656fe88 Merge remote-tracking branch 'origin/ext-dev' into ext-dev 钮海涛 2022-02-11 13:20:42 +0800
  • 0183e4b27b 功能测试完成 钮海涛 2022-02-11 13:20:11 +0800
  • 31cd2f5991 Merge branch 'test' into ext-dev nies 2022-02-10 10:24:20 +0800
  • 7361dfca50 Merge pull request 'BUG #19800 松下页面优化' (#330) from qi.yuan/i3plus-pojo-ban:test into test 聂帅 2022-02-10 10:22:48 +0800
  • 8b80c4f16f BUG #19800 松下页面优化 ban.yuan 2022-02-10 10:02:02 +0800
  • a212e8591a Merge branch 'ext-dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev andly.pan 2022-02-09 13:32:36 +0800
  • 674ac90f37 Merge branch 'test' into ext-dev nies 2022-02-09 09:33:17 +0800
  • 6c52328750 (update)修改QMS枚举常量 nies 2022-02-09 09:32:13 +0800
  • 08fd6f26ba Merge branch 'test' into ext-dev nies 2022-01-27 14:26:53 +0800
  • a4edb8a731 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test link 2022-01-27 13:48:56 +0800
  • 9d065ffac2 健康指标SQL取值计算BUG修复 link 2022-01-27 13:48:44 +0800
  • b4088b888f BSP 脚本调整 castle.zang 2022-01-27 13:17:15 +0800
  • fa91cf6804 BSP 脚本 castle.zang 2022-01-26 18:00:52 +0800
  • 0107aab563 BSP联调pojo castle.zang 2022-01-25 10:33:47 +0800
  • c6520e78d7 Merge branch 'ext-dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev andly.pan 2022-01-24 17:33:25 +0800
  • fd2cc2da51 功能测试完成 钮海涛 2022-01-24 17:25:14 +0800
  • 0b324d955c 功能测试完成 钮海涛 2022-01-22 09:43:04 +0800
  • 485b9f2bd0 二次重排不考虑交期 钮海涛 2022-01-21 15:32:19 +0800
  • 910a99dbd7 Merge branch 'ext-dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev andly.pan 2022-01-20 19:47:07 +0800
  • aa80fff7fa BSP联调pojo castle.zang 2022-01-20 10:08:31 +0800
  • 741193be82 健康度指标DP修改 link 2022-01-19 10:13:00 +0800
  • 0bde327c6a Merge remote-tracking branch 'origin/ext-dev' into ext-dev 钮海涛 2022-01-18 10:37:56 +0800
  • ec1d0a3540 报工拆分合并的工作不同颜色显示 钮海涛 2022-01-18 10:37:33 +0800
  • e7d4015f10 Merge branch 'test' into ext-dev nies 2022-01-17 16:11:54 +0800
  • 924339025e Merge pull request '北京pda显示新增分组' (#328) from junsheng.li/i3plus-pojo-junsheng:test into test 聂帅 2022-01-17 16:08:08 +0800
  • 14678a5bad 北京pda显示新增分组 jun 2022-01-17 16:04:34 +0800
  • 9aafab3d5a 增加中航新的mes-history的menuRootCode castle.zang 2022-01-17 15:35:32 +0800
  • 8fc894b413 Merge remote-tracking branch 'upstream/test' into test castle.zang 2022-01-17 13:50:26 +0800
  • db2941fd31 调试bsp方法管理，执行器管理，日志管理接口 castle.zang 2022-01-17 13:50:13 +0800
  • 99c6752b63 add healthindex module Entity and DP link 2022-01-17 11:27:10 +0800
  • a2efd76c7d Merge branch 'test' into ext-dev nies 2022-01-14 14:40:38 +0800
  • 261fd456d5 Merge pull request '中航物料对象修复' (#327) from baoyu.wang/i3plus-pojo:test into test 聂帅 2022-01-14 14:36:06 +0800
  • c92b401fe4 中航物料对象修复 王宝玉 2022-01-14 14:32:42 +0800
  • 7c80841f6d Merge branch 'test' into ext-dev nies 2022-01-13 18:15:45 +0800
  • 7d06827898 clientModel新增requestId nies 2022-01-13 18:15:25 +0800
  • b7adcb40c0 Merge remote-tracking branch 'origin/ext-dev' into ext-dev 钮海涛 2022-01-13 16:43:29 +0800
  • aaf5d1c00c 订单合并功能开发完成。 钮海涛 2022-01-13 16:42:30 +0800
  • d58b6715be Merge branch 'test' into ext-dev nies 2022-01-13 11:38:11 +0800
  • c9535bf555 新增产品类型EAM 设备信息管理服务 nies 2022-01-13 11:37:58 +0800
  • dc36c90a87 Merge remote-tracking branch 'origin/ext-dev' into ext-dev 钮海涛 2022-01-13 11:15:01 +0800
  • 303fa009c6 订单合并功能开发完成。 钮海涛 2022-01-13 11:14:42 +0800
  • a0079ae73f Merge remote-tracking branch 'upstream/test' into test castle.zang 2022-01-13 09:58:50 +0800
  • b81b9c569d 冷热数据分离--重构--测试完成 castle.zang 2022-01-13 09:58:16 +0800
  • b534c07bdb Merge branch 'test' into ext-dev nies 2022-01-11 14:50:52 +0800
  • ba78a4b0f7 Merge pull request '【19625 21062+质检报表导出失败，需修复】' (#326) from jimmy.zeng/i3plus-pojo:test into test 聂帅 2022-01-11 14:50:08 +0800
  • fbc5415086 【19625 21062+质检报表导出失败，需修复】 曾贞一 2022-01-11 14:43:37 +0800
  • b5fb208027 【19625 21062+质检报表导出失败，需修复】 曾贞一 2022-01-11 14:42:09 +0800
  • 5c9e6ad4cf 【19625 21062+质检报表导出失败，需修复】 曾贞一 2022-01-11 14:37:16 +0800
  • cb5db7101a 【19625 21062+质检报表导出失败，需修复】 曾贞一 2022-01-11 14:28:59 +0800
  • 0c38056604 导出逻辑修改 andly.pan 2022-01-10 18:53:49 +0800
  • 23dfbdb6ea Merge branch 'ext-dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev nies 2022-01-10 11:44:26 +0800
  • 53a7709bc8 Merge branch 'test' into ext-dev nies 2022-01-10 11:44:16 +0800
  • 1ee62d1689 Merge pull request '仓库健康统计变量，周期和计算频次换成corn表达式' (#324) from junsheng.li/i3plus-pojo-junsheng:test into test 聂帅 2022-01-10 11:43:40 +0800
  • d21cc02739 仓库健康统计变量，周期和计算频次换成corn表达式 jun 2022-01-10 11:37:36 +0800
  • c1eac0e4be Merge remote-tracking branch 'origin/ext-dev' into ext-dev 钮海涛 2022-01-08 16:04:03 +0800
  • ad887c76b5 订单合并功能开发完成。 钮海涛 2022-01-08 16:03:41 +0800
  • 94c61f77f4 冷热数据分离--重构 castle.zang 2022-01-07 15:28:36 +0800
  • c2437fd00f 接口映射bean castle.zang 2022-01-07 10:03:23 +0800
  • 1ec1192200 Merge branch 'test' into ext-dev nies 2022-01-07 09:37:47 +0800
  • edc4a74001 Merge pull request '中航物料对象导入修改' (#323) from baoyu.wang/i3plus-pojo:test into test 聂帅 2022-01-07 09:35:40 +0800
  • 2e2487ebc0 中航物料对象导入修改 王宝玉 2022-01-07 09:31:21 +0800
  • ab699b98b8 Merge branch 'test' into ext-dev nies 2022-01-05 16:38:56 +0800
  • 8c65aa1294 fix miss field link 2022-01-05 15:22:54 +0800
  • c3b145f8dc Merge branch 'test' into ext-dev nies 2022-01-05 15:03:22 +0800
  • ac152cf3f2 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test link 2022-01-05 14:35:21 +0800
  • b04cedf70b 添加dao的数据接口 link 2022-01-05 14:33:49 +0800
  • 584a8c8ee6 Merge remote-tracking branch 'origin/ext-dev' into ext-dev 钮海涛 2022-01-04 19:14:57 +0800
  • c31742fa73 订单合并功能开发，临时提交 钮海涛 2022-01-04 19:14:21 +0800
  • 4ee40a7c85 订单合并功能开发，临时提交 钮海涛 2022-01-04 10:32:43 +0800
  • 9b8d5bee8d Merge branch 'test' into ext-dev nies 2021-12-31 22:14:27 +0800
  • f44a69a46c UserDeatilModel增加登录次数字段 nies 2021-12-31 22:13:32 +0800
  • ec814a2f9d Merge branch 'test' into ext-dev nies 2021-12-31 15:29:16 +0800
  • b7ba3b1f6e Merge pull request '中航条码补偿字段' (#322) from baoyu.wang/i3plus-pojo:test into test 聂帅 2021-12-31 15:27:55 +0800
  • 74f9e00f56 中航条码补偿字段 王宝玉 2021-12-31 15:24:32 +0800
  • 94dc53adde Merge branch 'test' into ext-dev nies 2021-12-31 10:26:22 +0800
  • d5f6d501b5 WmsStockSn新增构造函数 nies 2021-12-31 10:26:09 +0800
  • 81990edfb7 Merge branch 'test' into ext-dev nies 2021-12-30 19:30:34 +0800
  • 6a07e7ff30 供应商新增字段是否首次登录 nies 2021-12-30 19:29:49 +0800
  • 0a10cd8283 Merge branch 'test' into ext-dev nies 2021-12-29 17:46:27 +0800
  • f0ddb6ca60 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test nies 2021-12-29 17:45:47 +0800
  • 2f79cf7d2b Merge pull request '条码表新增补偿字段' (#321) from baoyu.wang/i3plus-pojo:test into test 聂帅 2021-12-29 17:45:28 +0800
  • da44d62f8f 条码表新增补偿字段 王宝玉 2021-12-29 17:41:37 +0800
  • d25c206d19 Merge remote-tracking branch 'origin/ext-dev' into ext-dev 钮海涛 2021-12-27 15:13:31 +0800
  • 90ccea73ec 四车间问题修复。 钮海涛 2021-12-27 15:13:05 +0800
  • c03cb8e14b Merge branch 'test' into ext-dev nies 2021-12-24 14:17:12 +0800
  • db04d60fbc Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test nies 2021-12-24 14:16:58 +0800
  • ba5ddc09e1 delete table index link 2021-12-24 14:14:57 +0800
  • 0c0cfa6f6a Merge branch 'test' into ext-dev nies 2021-12-24 11:47:55 +0800
  • 1086f11875 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test nies 2021-12-24 11:47:36 +0800
  • a43b17841f 软适配新增SuitRetryModel nies 2021-12-24 11:47:32 +0800
  • 846f75b0b5 Merge pull request '实盘表增加托盘字段' (#320) from puxiao.liao/i3plus-pojo-lpx:test into test 聂帅 2021-12-24 11:45:55 +0800
  • 403fef80f4 实盘表增加托盘字段 puxiao.liao 2021-12-24 10:11:07 +0800
  • 73191c1961 三方指标查询POJO link 2021-12-22 16:47:52 +0800
  • 7e73f33b5c 新增下发MES的工作块颜色 钮海涛 2021-12-17 18:53:48 +0800
  • 2418d6d655 修改ext-dev pojo版本为1.0.0.1 nies 2021-12-15 13:53:01 +0800
  • c6367b0795 解决screen的冲突 nies 2021-12-15 11:33:35 +0800
  • 976369fa10 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test nies 2021-12-15 10:52:55 +0800
  • 2255d1dfcf (update)软适配新增适配类型表 nies 2021-12-15 10:52:50 +0800
  • a70c9cf5ec Merge pull request 'MesProdCfgType 新增 项目代码与报文vehicleCode关系字段' (#319) from honghui.jiang/i3plus-pojo:test into test 聂帅 2021-12-15 10:51:52 +0800
  • b7bf7edfa5 MesProdCfgType 新增 项目代码与报文vehicleCode关系字段 蒋鸿辉 2021-12-15 10:44:51 +0800