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

Commit Graph

  • 6ffcbcc863 Merge remote-tracking branch 'origin/ext-dev' into ext-dev 钮海涛 2021-12-14 15:07:25 +0800
  • 29ae808f7c 四车间压缩硫化增加到排程逻辑中。 钮海涛 2021-12-14 15:06:45 +0800
  • 1ad2e71b5c log4j2升级版本 castle.zang 2021-12-13 20:18:45 +0800
  • a499178031 add lost tag rock.yu 2021-12-13 10:24:08 +0800
  • 35abd70bae Merge remote-tracking branch 'upstream/test' into test castle.zang 2021-12-10 13:53:33 +0800
  • 8a369c31fa 通用数据冷热分离代码,并规范化test分支开发时的依赖，全部依赖1.0-TEST-SNAPSHOT castle.zang 2021-12-10 13:51:32 +0800
  • 2dad4448aa Merge remote-tracking branch 'origin/ext-dev' into ext-dev 钮海涛 2021-12-09 16:36:31 +0800
  • 50346624a7 新增按班次压缩硫化功能 钮海涛 2021-12-09 16:32:02 +0800
  • 1f0fb96c94 Merge branch 'test' into ext-dev nies 2021-12-09 16:03:05 +0800
  • e51e82994a Merge pull request 'MesKpsnRule(关键件条码校验规则),MesBypassMapping(MES_BYPASS项映射关系)增加项目代(prodCfgTypeCode)' (#318) from honghui.jiang/i3plus-pojo:test into test 聂帅 2021-12-09 16:01:53 +0800
  • 4d61109541 MesKpsnRule(关键件条码校验规则),MesBypassMapping(MES_BYPASS项映射关系)增加项目代(prodCfgTypeCode) 蒋鸿辉 2021-12-09 15:56:03 +0800
  • 7069b6533a Merge branch 'test' into ext-dev nies 2021-12-06 13:15:36 +0800
  • 39e0235ad9 Merge pull request '物料项目关系表新增客户零件号(custPartNo)字段' (#317) from honghui.jiang/i3plus-pojo:test into test 聂帅 2021-12-06 13:14:03 +0800
  • f1811b42de 物料项目关系表新增客户零件号(custPartNo)字段 蒋鸿辉 2021-12-06 10:33:39 +0800
  • bcaa55e348 Merge branch 'test' into ext-dev nies 2021-12-05 17:16:44 +0800
  • 585e2aefe1 (update)WmsInterfaceDataMapper增加busiIdList字段 nies 2021-12-05 17:16:28 +0800
  • f28f449d4a Merge branch 'test' into ext-dev nies 2021-12-05 16:21:44 +0800
  • 058a761500 (update)增加适配重复记录 nies 2021-12-05 16:21:13 +0800
  • 174ef833df Merge branch 'test' into ext-dev nies 2021-12-04 15:50:06 +0800
  • ccab3f0c04 (update)BsSuitCase增加requestId nies 2021-12-04 15:49:48 +0800
  • 2619f42700 Merge branch 'test' into ext-dev nies 2021-12-04 14:02:00 +0800
  • a3d2749161 (update)SuitModel 增加requestId nies 2021-12-04 14:01:44 +0800
  • dd699216ac Merge branch 'test' into ext-dev nies 2021-12-01 17:18:17 +0800
  • 65c22dec22 Merge pull request '18934 原材料扣减job替换' (#316) from junsheng.li/i3plus-pojo-junsheng:test into test 聂帅 2021-12-01 17:17:40 +0800
  • 0ef89f2a6d 18934 原材料扣减job替换 jun 2021-12-01 13:25:34 +0800
  • d2bbca3491 新增同班次物料相同评估规则 钮海涛 2021-11-30 20:12:43 +0800
  • 4b3449863f Merge branch 'test' into ext-dev nies 2021-11-26 11:36:14 +0800
  • f1e158737b Merge pull request '【18835 19081-盘点策略-循环规则-选项可配置】' (#314) from jimmy.zeng/i3plus-pojo:test into test 聂帅 2021-11-26 11:32:34 +0800
  • 55f88edd0f Merge pull request '资源甘特图提示' (#315) from andly.pan/i3plus-pojo:ext-dev into ext-dev 钮海涛 2021-11-26 10:35:19 +0800
  • f74038f88c 强插生产计划前提交 钮海涛 2021-11-24 15:48:54 +0800
  • 64e48bf350 资源甘特图提示 andly.pan 2021-11-23 14:35:31 +0800
  • 7f7baa1ea4 【18835 19081-盘点策略-循环规则-选项可配置】 曾贞一 2021-11-23 14:18:51 +0800
  • 80851b5a06 Merge remote-tracking branch 'origin/ext-dev' into ext-dev 钮海涛 2021-11-20 16:59:35 +0800
  • 0cf4d5742d 四车间问题修复 钮海涛 2021-11-20 16:59:12 +0800
  • 204bbad81c Merge branch 'test' into ext-dev nies 2021-11-19 16:22:45 +0800
  • 38b1ce6643 (update)更新aps-4的端口为8400 nies 2021-11-19 16:22:31 +0800
  • 7343b4901d Merge branch 'test' into ext-dev nies 2021-11-19 09:21:28 +0800
  • d06fe76744 增加aps_3和aps_4的枚举配置 nies 2021-11-18 17:44:44 +0800
  • 3d4a0e0bb9 Merge branch 'test' into ext-dev nies 2021-11-18 10:08:22 +0800
  • 3552c56d74 Merge pull request 'test' (#313) from junsheng.li/i3plus-pojo-junsheng:test into test 聂帅 2021-11-18 10:07:02 +0800
  • 93d84b66f5 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into Mytest jun 2021-11-18 09:52:00 +0800
  • 67ed074d35 18681 交易类型需要导出功能 jun 2021-11-18 09:38:25 +0800
  • 9080a6b468 Merge branch 'test' into ext-dev nies 2021-11-16 17:29:08 +0800
  • 71ad8a1e28 Merge remote-tracking branch 'origin/ext-dev' into ext-dev Dominic_Xiao 2021-11-16 16:45:27 +0800
  • 6ba8a2f3bb MES_客户JIT队列下达配置增加项目代码字段 Dominic_Xiao 2021-11-16 16:44:36 +0800
  • b4775eabdf Merge branch 'ext-dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev castle.zang 2021-11-16 09:51:10 +0800
  • cf0e1825a3 合并jimmy代码 castle.zang 2021-11-16 09:50:57 +0800
  • 0c6803eb86 合并王宝玉合并请求 castle.zang 2021-11-16 09:49:26 +0800
  • 0e5cafae91 Merge pull request 'WmsBH物料子检测项新增录入方式字段' (#312) from baoyu.wang/i3plus-pojo:test into test 臧学普 2021-11-16 09:38:25 +0800
  • cdd7f7bed2 WmsBH物料子检测项新增录入方式字段 王宝玉 2021-11-16 09:25:03 +0800
  • 2cff78cba2 Merge branch 'test' into ext-dev nies 2021-11-15 17:40:55 +0800
  • 443a8a200d Merge pull request 'test' (#311) from baoyu.wang/i3plus-pojo:test into test 聂帅 2021-11-15 17:40:01 +0800
  • 4625987eef Mes散件BOM增加项目代码字段 王宝玉 2021-11-15 17:35:31 +0800
  • 5056f30f45 核心包mes散件产品配置BOM新增项目代码 王宝玉 2021-11-15 10:32:59 +0800
  • 7ab206edbd Merge branch 'test' into ext-dev nies 2021-11-11 14:04:50 +0800
  • fc9ef265f9 修改aps-2的menurootid nies 2021-11-11 14:04:35 +0800
  • b2da2bd935 Merge branch 'test' into ext-dev nies 2021-11-11 13:32:53 +0800
  • 0400305d91 增加aps-2的枚举配置 nies 2021-11-11 13:32:20 +0800
  • b623bde133 Merge remote-tracking branch 'origin/ext-dev' into ext-dev 钮海涛 2021-11-10 20:45:00 +0800
  • c8ce17363b 四车间问题修复 钮海涛 2021-11-10 20:44:42 +0800
  • 39fb0508fc Merge branch 'test' into ext-dev nies 2021-11-10 16:47:03 +0800
  • 9190b765ab Merge pull request '【18541 21062+盘点 盘点单冻结页面缺一个托条码的字段，需添加+1110】' (#310) from jimmy.zeng/i3plus-pojo:test into test 聂帅 2021-11-10 16:33:17 +0800
  • 7b9a91fd0f 【18541 21062+盘点 盘点单冻结页面缺一个托条码的字段，需添加+1110】 曾贞一 2021-11-10 11:04:43 +0800
  • 3f8fb8f20f Merge pull request 'ext-dev' (#309) from shuangzhan.guo/i3plus-pojo-guo:ext-dev into ext-dev 钮海涛 2021-11-06 09:36:34 +0800
  • 365c9e927e 17789 20065-排程失败的错误需要在页面上进行提示-20211009 gsz 2021-11-05 13:58:53 +0800
  • 3c9bb9fff0 Merge branch 'ext-dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev-guo gsz 2021-11-05 10:12:45 +0800
  • b0fe76ab6a Merge remote-tracking branch 'origin/ext-dev' into ext-dev 钮海涛 2021-11-05 09:35:06 +0800
  • 5a73e89e97 四车间问题修复 钮海涛 2021-11-05 09:34:40 +0800
  • 38add62a60 Merge branch 'test' into ext-dev nies 2021-11-04 10:52:03 +0800
  • 5b5e00eee7 model core 增加SysRoleModel nies 2021-11-04 10:50:33 +0800
  • 72673bfa12 平台新增用户角色关联model nies 2021-11-03 17:33:59 +0800
  • 28770cf619 Merge branch 'test' into ext-dev nies 2021-11-03 10:01:13 +0800
  • b388ea9926 Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev castle.zang 2021-11-01 13:54:56 +0800
  • 307b4f7cf6 Merge pull request '安灯' (#308) from jhforever.wang/wangjie-i3plus-pojo:test into test 臧学普 2021-11-01 13:53:12 +0800
  • da300c7ccb 增加一键下发功能。 钮海涛 2021-10-29 14:31:25 +0800
  • 6effb386a3 增加一键下发功能。 钮海涛 2021-10-29 14:15:52 +0800
  • 8de712ad1d Merge remote-tracking branch 'origin/ext-dev' into ext-dev 钮海涛 2021-10-29 13:10:32 +0800
  • 462f5c9d58 增加一键下发功能。 钮海涛 2021-10-29 13:10:10 +0800
  • 85782e1036 Merge branch 'test' into ext-dev nies 2021-10-28 13:11:18 +0800
  • 3270395d94 安灯 王杰 2021-10-27 19:41:07 +0800
  • 9d8371bdac Merge pull request '工单表增加系统同步标志字段' (#306) from honghui.jiang/i3plus-pojo:test into test 臧学普 2021-10-27 14:34:24 +0800
  • 5666b5d120 软适配增加华域相关的配置 nies 2021-10-26 13:44:48 +0800
  • 3af6e02e52 大逻辑调整前提交：部分下发的订单重新排程不影响交期早的订单。 钮海涛 2021-10-26 13:35:34 +0800
  • 2ec1229e75 Merge remote-tracking branch 'origin/ext-dev' into ext-dev 钮海涛 2021-10-26 09:31:21 +0800
  • e97f49d8ee 修复四车间问题 钮海涛 2021-10-26 09:30:47 +0800
  • 7bf443a463 WmsActionResponseBean 删除多余的taskNO nies 2021-10-25 15:55:38 +0800
  • 0f92e2bbf9 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test nies 2021-10-25 15:52:26 +0800
  • 74dab6e6d0 Merge pull request '成都麦格纳，wmsCqMaster新增构造方法' (#304) from junsheng.li/i3plus-pojo-junsheng:test into test 聂帅 2021-10-25 15:47:16 +0800
  • d771304733 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test castle.zang 2021-10-25 10:24:54 +0800
  • 308e0b6bc3 Merge pull request 'StationRequestBean 增加 缓存数据来源class' (#307) from jhforever.wang/wangjie-i3plus-pojo:test into test 臧学普 2021-10-25 10:18:27 +0800
  • 77795be8df StationRequestBean 增加 缓存数据来源class 王杰 2021-10-23 17:52:13 +0800
  • 0cfac0aaaf 工单表增加系统同步标志字段 蒋鸿辉 2021-10-22 17:49:11 +0800
  • b15164d8a6 Merge branch 'ext-dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev-guo gsz 2021-10-22 14:39:32 +0800
  • 29acf31f74 修复四车间问题 钮海涛 2021-10-22 14:37:06 +0800
  • 351e542fd9 18062 20065-新增报表显示顶层订单的输入和输出情况-20211019 gsz 2021-10-22 11:09:00 +0800
  • b8662be266 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test nies 2021-10-21 09:29:36 +0800
  • 211d20e840 修改打印模板复杂查询 nies 2021-10-21 09:29:31 +0800
  • a7b6cd22d3 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into Mytest jun 2021-10-19 19:55:25 +0800
  • 10bd8f2f9e Merge remote-tracking branch 'origin/ext-dev' into ext-dev 钮海涛 2021-10-19 15:45:19 +0800
  • b1af42c78b 修复四车间问题 钮海涛 2021-10-19 15:44:53 +0800