I3_YF_SEAT
/
i3plus-pojo
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
9,617 Commits
1 Branch
0 Tags
20 MiB
yun-zuoyi
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from '046ddeedb0'
${ noResults }
Commit Graph

3160 Commits (046ddeedb078f6ff446db0cda64fc106e62bf844)

Author SHA1 Message Date
joke.wang 63b7162932 mgn-bj 半成品看板 5 years ago
汪云昊 dceb9b17a5 revert(pojo):还原pom版本 5 years ago
汪云昊 91f68d50d4 Merge remote-tracking branch 'origin/dev' into test 5 years ago
汪云昊 91b1a67f30 Merge remote-tracking branch 'origin/dev' into dev 5 years ago
汪云昊 eb03280b2d doc(sql):getStringLikePack方法标记不推荐 5 years ago
汪云昊 f1ab018d85 feat(softswitch):重试功能 5 years ago
Aisiyu 8b94991408 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
Aisiyu 2db034a7f8 [1211 天津麦格纳WMS-ASN到货看板 ] 5 years ago
曾贞一 d8e5aa44bc pom.xml 5 years ago
陈思洁 8dfcb7f429 【合并冲突】 5 years ago
陈思洁 3dc951c34f 【11964 19048-喷涂抛光报表变更-20201021】 5 years ago
曾贞一 9a350912ea Merge remote-tracking branch 'remotes/origin/dev' into test 
# Conflicts:
#	modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java
 5 years ago
曾贞一 5487c165ff 【11883 20021--北美领料需求变更--1023】 5 years ago
joke.wang f57f4e25be mgn-bj 总屏看板 5 years ago
汪云昊 a9520cecf7 Merge remote-tracking branch 'origin/dev' into dev 5 years ago
汪云昊 31cdda5b33 feat(softswitch):适配记录,FTP文件支持SID 5 years ago
曾贞一 c9378a7d8c 【11959 19125+PDA物料拆分数量超过100部分，条码流水不增加。+1020】 5 years ago
Dominic_Xiao df35a22aac 解决BUG#12121 生产工单- 新建完毕后页面查询不到:修改查询总数的SQL语句 5 years ago
Dominic_Xiao 5e1d0a75c9 解决BUG:19048-班次时间显示异常->修改查询总数的SQL语句 5 years ago
Dominic_Xiao 4684466e7e 解决BUG:19048-班次时间显示异常:修改查询的SQL语句 5 years ago
Dominic_Xiao f57be38c2b 解决BUG:生产工单-新建完毕后页面查询不到->修改查询的SQL语句 5 years ago
许心洁 586365dc69 任务#2893,#2894,#2901 5 years ago
陈思洁 6fcf32aa80 【2890 10 2.3.8安灯作业优化】 5 years ago
puxiao.liao 62d5d62cef 北京MGN系列BUG修复 5 years ago
钮海涛 a8cdba48c3 合并Master代码 5 years ago
钮海涛 7afd60073a Merge remote-tracking branch 'remotes/origin/test' 5 years ago
陈思洁 a6acf3d616 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
陈思洁 82a769cae1 【12040 19073-安灯BI界面中事件物料时长，解决时长为-3290，解决在横坐标的下方有问题-20201026】 
2887 10 2.3.7安灯通知优化
 5 years ago
songss ef316af0c1 Merge remote-tracking branch 'origin/test' into test 
# Conflicts:
#	modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java
 5 years ago
wynne1005 78a3943a3d Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
wynne1005 4c86b836ca OP20b逻辑变更 esop展示变更 5 years ago
汪云昊 15dc4b00c7 Merge remote-tracking branch 'origin/dev' into test 5 years ago
汪云昊 ed22bd6f64 feat(form):存储过程调用适配mysql,mssql 5 years ago
puxiao.liao ba81af744b 北京麦格纳看板 5 years ago
王杰 bb3039d1f2 包装关系查询宝贝 5 years ago
贾文涛 2301e03c85 增加呼叫不需要弹窗的枚举。 5 years ago
songss 3e629e63c5 控制计划-过程检验逻辑调整 5 years ago
wynne1005 9629823a79 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
wynne1005 b00bcf66b2 图片展示类型 5 years ago
汪云昊 72e25305bf Merge remote-tracking branch 'origin/dev' into test 5 years ago
汪云昊 a4bc17b0a6 feat(form):sap_hana数据库支持 5 years ago
wynne1005 05152538b2 合并冲突 5 years ago
wynne1005 fc36e55a38 新增mes 报表查询周期枚举 5 years ago
joke.wang df063af038 物料类型1增加枚举 5 years ago
joke.wang 6930fdfbe7 mgn-bj 产线枚举优化 5 years ago
钮海涛 61d123cfc8 Merge remote-tracking branch 'origin/test' into test 5 years ago
钮海涛 93626dad0f 新增质检完成状态报表 5 years ago
songss 578e2c5155 Merge remote-tracking branch 'origin/test' into test 
# Conflicts:
#	modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java
 5 years ago
songss bfe4b4f069 社保故障自动获取任务完善，根据不同等级调用不同的安灯接口 5 years ago
宋军超 fcc66835b8 开发天津看板功能 5 years ago
汪云昊 ce054916b4 Merge remote-tracking branch 'origin/dev' into test 5 years ago
汪云昊 401fccd4dc fix(impp):DdlPreparedPack类处理大于小于错误 5 years ago
宋军超 d372256a68 添加喷涂不良类型枚举 5 years ago
宋军超 bd9547b825 优化天津麦格纳报表 5 years ago
陈思洁 11b461f1d6 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
陈思洁 1706b7a684 【2856 10 2.3.8 20027-PCN端工位监控如果报错数据没有采集怎么报警提示】 5 years ago
joke.wang 233853e1e6 库存排程 5 years ago
陈思洁 30f8e332fa Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
陈思洁 8f060d4aa4 【2856 10 2.3.8 20027-PCN端工位监控如果报错数据没有采集怎么报警提示】 5 years ago
joke.wang c442845f94 跳序变更 5 years ago
汪云昊 2b6ff6498c Merge remote-tracking branch 'origin/dev' into test 5 years ago
汪云昊 05f493b80e feat(softswitch):添加重试功能 5 years ago
wynne1005 ebf0392057 去除多余optionType枚举 5 years ago
wynne1005 470775b527 备件生成冲突解决 5 years ago
wynne1005 f52f07fe77 备件导入 5 years ago
汪云昊 e97a1193e1 Merge remote-tracking branch 'origin/dev' into test 5 years ago
汪云昊 27088d2db5 Merge remote-tracking branch 'origin/dev' into dev 5 years ago
汪云昊 e97369585d fix(core):在用户未登录时国际化无效 5 years ago
王杰 1dbb826235 19048-喷涂工单下发后未给打印状态赋值-20201012 5 years ago
陈思洁 33c59cf39e 【11654 MES管理端基础数据模块缺少导入功能 0928】 5 years ago
wynne1005 d36a7527a6 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
wynne1005 c117515b69 设备自动报警 5 years ago
songss a5b81cb676 解决代码冲突 5 years ago
songss 966ed3536b Merge remote-tracking branch 'origin/test' into test 
# Conflicts:
#	modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java
 5 years ago
songss 5816f275bf 新增控制计划相关接口 5 years ago
钮海涛 af4bb83f85 sweb合并test代码 5 years ago
钮海涛 1695d75ff2 合并dev代码 5 years ago
钮海涛 94568777fb 合并test代码 5 years ago
陈思洁 3d8d27d780 【11374 20027-管理端质量检测标准维护基础数据报错（附件是数据模板）-20200915】 5 years ago
宋军超 461780e0d0 天津麦格纳修改看板类型枚举 5 years ago
宋军超 ebb965f46d 天津麦格纳添加看板维护接口 5 years ago
Liquor 83bfaaceab 对SPC-KEY-TATA表的相关接口进行了相关优化。 5 years ago
Liquor 3d8842602d 增加了SPC-KEY-TATA表的相关接口。 5 years ago
puxiao.liao 65ea61fd70 增加昆泰其它出库业务类型 5 years ago
汪云昊 171f39cf01 revert:还原pojo pom.xml报表 5 years ago
汪云昊 56bd07dbf3 Merge remote-tracking branch 'origin/dev' into test 5 years ago
puxiao.liao 85feb7927a 修复TJ MGN BUG 5 years ago
puxiao.liao 0f46a23c7a Fix bug#11611 
19081-计划外入库-扫描条码后撤销
 5 years ago
钮海涛 543058b3a5 合并sweb代码 5 years ago
wynne1005 12f1c4a809 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
wynne1005 708985be2a 中航 设备自动报警 #1 5 years ago
汪云昊 ffdfd866e0 Merge remote-tracking branch 'origin/dev' into test 5 years ago
汪云昊 b2bc93abfe Merge remote-tracking branch 'origin/dev' into dev 5 years ago
汪云昊 816557085f fix(base):修改当前页取值方法 5 years ago
wynne1005 2ae471febd Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
joke.wang 612c919e5f bypass优化 5 years ago
wynne1005 114654dd99 冲突解决 5 years ago
wynne1005 696695ef0e 海纳川变更 10923 10894 5 years ago
陈思洁 5fcdc2d4ea Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
陈思洁 053b609d88 【11559 19081-MESOP30料箱二次校验没有触发20200922】 5 years ago
汪云昊 25c195ba98 Merge remote-tracking branch 'remotes/origin/dev' into test 5 years ago
钮海涛 0ce944ec5f Merge remote-tracking branch 'remotes/origin/test' into dev 5 years ago
joke.wang bc383d573b 生产工单增加特殊标示字段 5 years ago
songss 90a96444e7 Merge remote-tracking branch 'origin/test' into test 5 years ago
songss c5de9c9841 Merge remote-tracking branch 'origin/test' into test 
# Conflicts:
#	modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java
 5 years ago
曾贞一 0f4a8c130c 【冲突解决】 5 years ago
曾贞一 41efdd4de8 【2798 武汉PRD-AMP-WMS2AMP同步拉动零件库存接口】 5 years ago
汪云昊 6ab0f17ac7 Merge remote-tracking branch 'origin/dev' into dev 5 years ago
汪云昊 d6f4fa7f92 feat(softswitch):添加报文处理状态及处理结果 5 years ago
puxiao.liao 4ffe517015 修复TJ MGN BUG 5 years ago
joke.wang 72502a863b Fix Bug #11490 5 years ago
王杰 895eb461ab 数据复核 5 years ago
钮海涛 fa467a2e0d sweb合并dev代码 5 years ago
钮海涛 5f144781c9 SWEB合并test代码 5 years ago
钮海涛 6749bda558 合并dev代码 5 years ago
钮海涛 572e749bdb Merge remote-tracking branch 'origin/dev' into dev 5 years ago
钮海涛 b253a020b9 合并test代码 5 years ago
钮海涛 5c104e036f 合并test代码 5 years ago
钮海涛 ea875c1a3b SWEB功能开发 5 years ago
宋军超 998e87b61d 天津麦格纳修改过程条码补打 5 years ago
songss f2d6552f6b Merge remote-tracking branch 'origin/test' into test 
# Conflicts:
#	modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java
 5 years ago
songss 20b40ce294 添加 中航-DB复核项 枚举 5 years ago
wynne1005 8c0ea0d52f 冲突解决 5 years ago
wynne1005 10d5276fbb 过程检测 演示修改 5 years ago
joke.wang cce1d91650 客退备件返修 5 years ago
puxiao.liao ae6ffa27f4 修复TJ MGN BUG 5 years ago
陈思洁 50c2258f58 【增加查询参数条件】 5 years ago
汪云昊 163d0773a9 修改pom文件版本 5 years ago
wynne1005 3858b2e3d9 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
wynne1005 dd1ece9be8 新增过程检测 检测结果枚举 5 years ago
钮海涛 485c66aaf7 合并test代码 5 years ago
wynne1005 531fe743c2 过程检测 完成首检判断 5 years ago
宋军超 6fa35ad939 天津麦格纳取消条码补打校验逻辑 5 years ago
wynne1005 d00dcd80eb 冲突解决 5 years ago
陈思洁 802c801013 【11310 19081-下达至下线时间预警-20200913】 5 years ago
wynne1005 1e9f1a5c47 质量检测 1 5 years ago
puxiao.liao 8ac53abe9e 麦格纳ASN新增异常 5 years ago
宋军超 0d5ade92a9 天津麦格纳添加工位缺陷导入功能 5 years ago
puxiao.liao 9954b1e83a 麦格纳ASN新增异常 5 years ago
rock.yu 9a2a596094 增加条码操作类型-发运校验 5 years ago
陈思洁 8a1f0c608e 【基础页面增加替代料功能】 5 years ago
王杰 5e229b7176 message pool 5 years ago
汪云昊 1ce2793faa Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
宋军超 799967bde5 修改天津麦格纳问题 5 years ago
汪云昊 7a4be36111 Merge remote-tracking branch 'remotes/origin/dev' into test 5 years ago
汪云昊 156dd53402 Merge remote-tracking branch 'origin/dev' into dev 5 years ago
汪云昊 130d3a9792 feat:字典规则调整允许值为空 5 years ago
汪云昊 ab608c0919 feat:用户导出 5 years ago
wynne1005 9bfd9ef279 Merge branch 'master' into test 5 years ago
wynne1005 beaeccf1ed 冲突合并 5 years ago
wynne1005 48b6634032 新增枚举 样本类型 5 years ago
宋军超 c5ebcaf2b5 天津麦格纳添加出入库事务表枚举 5 years ago
joke.wang d33dae14dc jsp计算bug优化 5 years ago
钮海涛 729a7b6990 合并冲突 5 years ago
钮海涛 5c9da87650 合并冲突 5 years ago
钮海涛 d47607880e 合并冲突 5 years ago
钮海涛 56b1ae99a9 Merge remote-tracking branch 'origin/test' into test 5 years ago
钮海涛 1b6bbed47c Fix Bug #10974 5 years ago
曾贞一 5dc142ba34 【2719 06 1.1.10 数据库文档管理-导入模板生成功能新增】 5 years ago
汪云昊 0a0727e2fa fix:代码错误 5 years ago
汪云昊 f878e6b283 Merge remote-tracking branch 'remotes/origin/dev' into test 5 years ago
汪云昊 2e102f4189 Merge remote-tracking branch 'origin/dev' into dev 5 years ago
汪云昊 1ccd4f3b65 feat:添加区间查询 5 years ago
陈思洁 01eda59dd5 【11069 19048- 抛光质量待定扫描条码后，提示信息不明确！-2020-09-05】 5 years ago
曾贞一 332e37ea94 【2719 06 1.1.10 数据库文档管理-导入模板生成功能新增】 5 years ago
汪云昊 6457cac828 feat:去除非空校验 5 years ago
汪云昊 1243607e0e Merge remote-tracking branch 'remotes/origin/dev' into test 5 years ago
汪云昊 cf2bf8d291 企业微信适配 5 years ago
陈思洁 decd0ae558 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
陈思洁 6c351c09b5 【11016 19048- 总装生产计划显示多条！-2020-09-03】 5 years ago
曾贞一 8ca16d7c68 【枚举状态】 5 years ago
许心洁 7f11e5b1d7 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
许心洁 1fe5b807c6 BUG#10826,11025,11024 5 years ago
puxiao.liao df4e794a48 修复MGN系列BUG 5 years ago
songss 7243e20cc8 Merge remote-tracking branch 'origin/test' into test 5 years ago
songss d5d6f2cfee 修改枚举值 5 years ago
joke.wang 18ca368f3c 照片采集 5 years ago
汪云昊 b2517a11b8 feat(用户登录日志):用户登录日志查询及导出功能 5 years ago
陈思洁 564fdb261b Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
陈思洁 03730fe13c 【[#2702::07 ext 虚拟工单关闭按钮（注塑、涂装、组装） ] 】 5 years ago
wynne1005 191220442f websocket错误提示音 5 years ago
wynne1005 89ec0cbd71 解决冲突 5 years ago
wynne1005 d86c84a39e 添加工步返回表格背景色 5 years ago
alwaysfrin 8b6271cebc 1，数据源参数配置优化 
2，读写分离数据源切换优化
3，日志切面优化调整
4，登陆线程优化
5，对象新增、修改监听优化
 5 years ago
陈思洁 09c95d3542 【库存排程配置增加禁用启用接口】 5 years ago
钮海涛 51746154ba 合并dev到test 5 years ago
钮海涛 e6b472bcfd 合并test代码到dev 5 years ago
钮海涛 4144e12b5d 合并test代码到master 5 years ago
钮海涛 92f0158dab 合并master代码 5 years ago
wynne1005 f06f51cc7e master merge test 5 years ago
joke.wang b09aa27e0f 排程job 5 years ago
汪云昊 feace77fc3 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
puxiao.liao 7f91f1269c 修复MGN系列BUG 5 years ago
汪云昊 731a92fa2c Merge remote-tracking branch 'remotes/origin/dev' into test 5 years ago
汪云昊 4dc40c79dd fix:pager.startRow重复计算 5 years ago
汪云昊 7e678e747d feat:移除mongo日志持久化方法 5 years ago
钮海涛 f0023a2232 三力士演示demo 5 years ago
wynne1005 762b73dddf 添加StepResult的返回cmd CLEAR_CACHE 5 years ago
wynne1005 9563ebeb66 normalDistribution 5 years ago
wynne1005 b4b1c2f3f8 erge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
wynne1005 0fd5989864 新增帮助类型的busiType 5 years ago
钮海涛 85395e84fd 合并dev代码 5 years ago
钮海涛 2013d47353 合并dev代码 5 years ago
宋军超 940510ea5b 北京海纳川、北京麦格纳问题修复 5 years ago
陈思洁 d7f8796d36 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
陈思洁 ee1b0b5b67 【2674 预装区基础页面开发】 5 years ago
puxiao.liao d63d07ad7e 麦格纳收货BUG 5 years ago
陈思洁 baa7d144b7 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
陈思洁 daf0b94314 【10828 19048-10827-预装作业界面优化！-2020-08-25】 5 years ago
wynne1005 f9fa5814f6 冲突解决 5 years ago
wynne1005 40ec96a390 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
wynne1005 bbcd0c8f69 去除多余枚举 5 years ago
钮海涛 9a41c2e2e0 合并test到dev 5 years ago
钮海涛 025cc19f68 合并dev到test 5 years ago
钮海涛 347f6671f2 合并dev到test 5 years ago
钮海涛 99b8cb146c Merge remote-tracking branch 'remotes/origin/master' into test 5 years ago
钮海涛 310da99743 合并master代码 5 years ago
wynne1005 3769a630fe Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
wynne1005 42a340d0c0 timeModuleInit 5 years ago
宋军超 f3cb06ba5a Merge remote-tracking branch 'origin/test' into test 5 years ago
宋军超 030343f2ce 海纳川问题修复 5 years ago
王杰 43ad04818c pom 5 years ago
钮海涛 b4a4c42fe0 合并master代码 5 years ago
wynne1005 b3aa6eef70 中航 均值极差 5 years ago
汪云昊 a52646a65d Merge remote-tracking branch 'remotes/origin/dev' into test 
# Conflicts:
#	modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java
 5 years ago
汪云昊 26cf4c5e92 feat:mongo模块化 5 years ago
汪云昊 103137e2fc feat:添加条码解析校验模式 5 years ago
wynne1005 c3f30530a8 erge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
wynne1005 086c78f828 新增pcn页面的辅助展示组件 5 years ago
joke.wang e3146c9fb4 Fix Bug #0776 5 years ago
puxiao.liao ba5befe291 Finish Task #2645 Cost:8h 
【PCR-20200525-003_委外出库条码变更】中的零件号转化
 5 years ago
joke.wang 84dcf36c86 Fix Bug #10708 5 years ago
rock.yu 5bfd542402 增加工单拉动 5 years ago
曾贞一 fe2017fbe4 【622 08 1.2.2.2.6 BOM增加虚阶零件】 5 years ago
wynne1005 a400bf5aa7 还原orderBy 5 years ago
wynne1005 887e1d04f7 baseBean sortParamMap 先注释 5 years ago
钮海涛 9878547daa 合并dev分支代码 5 years ago
钮海涛 272c92dcb6 Merge remote-tracking branch 'origin/test' into test 5 years ago
钮海涛 f42ece4f6c 优化流程管家执行性能 5 years ago
wynne1005 a751d5a8a7 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
wynne1005 8d7b0fae6a 添加小枪日志 与不需要打枪绑定 自动跳过 5 years ago
钮海涛 ad4b59a700 Merge remote-tracking branch 'origin/test' into test 5 years ago
汪云昊 2013ca569a Merge remote-tracking branch 'origin/dev' into dev 5 years ago
汪云昊 a45d1ed104 fix:分页结束行计算错误的问题 5 years ago
wynne1005 0d3a8a3af7 添加放行记录 5 years ago
许心洁 c0629d52d1 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
许心洁 1c02cd6562 任务#2612，2613 5 years ago
wynne1005 ba558d640e tmp 5 years ago
陈思洁 3baf748329 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
陈思洁 9b9871534a 【10493 19048-产品颜色无导入功能】 5 years ago
汪云昊 bda160ccec Merge remote-tracking branch 'remotes/origin/dev' into test 5 years ago
汪云昊 8d17cfcec0 feat:用户定制化配置功能 5 years ago
钮海涛 54b0af00cc Sweb功能开发 5 years ago
宋军超 625b780aaf 添加海纳川数据复核工步和产线状态看板变更 5 years ago
wynne1005 3af4d32a97 mes工位运行状态 5 years ago
汪云昊 a3e8caf085 fix:detachObject为空时报错 5 years ago
汪云昊 55b047448b fix:会话模式为默认时出现不能正常覆盖的问题 5 years ago
宋军超 6e60bee0dd 修改海纳川问题 5 years ago
宋军超 731b1c60ee 修改海纳川问题 5 years ago
王杰 5413fc259c pcn 缺陷 5 years ago
汪云昊 410f469450 Merge remote-tracking branch 'remotes/origin/dev' into test 5 years ago
汪云昊 7f291a26cd 会话模式配置-调整默认模式 5 years ago
qianhs 86c9bce2aa Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
钮海涛 39f6819e9b 修复合并版本问题 5 years ago
钮海涛 f760b72094 Merge remote-tracking branch 'remotes/origin/test' 5 years ago
qianhs c872663847 Finish Task #2080 Cost:8h 5 years ago
汪云昊 e6ecd4f86f Merge remote-tracking branch 'remotes/origin/dev' into test 5 years ago
汪云昊 0d40470059 Merge remote-tracking branch 'origin/dev' into dev 5 years ago
汪云昊 101a71970c 虚拟属性数据校验及参数赋值问题 5 years ago
汪云昊 5a6a7a77fc 平台功能优化，移除通用缓存服务 5 years ago
王杰 9a959a5184 pcn enum 5 years ago
wynne1005 88233f080a Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
wynne1005 3ec8109e82 枪优化 5 years ago
王杰 e8611616db IPC 5 years ago
王杰 6c5e646d49 test merge master 5 years ago
wynne1005 5fad38392e 添加索引 脚本表更新 5 years ago
joke.wang af539c85a7 mgn bug 5 years ago
王杰 bc9adf8ac0 ptl 5 years ago
钮海涛 e239c89e63 Merge remote-tracking branch 'origin/test' into test 
# Conflicts:
#	modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java
 5 years ago
钮海涛 7f55af4477 Finish Task #2560 Cost:8h 5 years ago
joke.wang 13f7121610 海纳川看板 5 years ago
joke.wang 01ac2e85da Fix Bug #10087 5 years ago
宋军超 e007a52732 修改海纳川问题 5 years ago
王杰 4a59b5c913 bug: 10003 19073-安灯作业安灯类型自处理名称修改工装-20200728 5 years ago
joke.wang ea922affba Start Task #2522 Cost:8h Left:8h 5 years ago
puxiao.liao 937eac5e87 Finish Task #2549 Cost:4h 
自动生成领料单增加默认来源存储区、自动获取默认目标库位
 5 years ago
joke.wang 3223158529 Fix Bug #10108 5 years ago
wynne1005 7593b63cfc 重做枚举 5 years ago
joke.wang 47f7e24f57 Fix Bug #10060 5 years ago
puxiao.liao 2e3f5bb2af Fix bug#9994 
库存明细--显示重复
 5 years ago
joke.wang 768e31e636 Fix Bug #9995 5 years ago
钮海涛 7ca3b43bfe 合并DEV分支代码 5 years ago
钮海涛 9b3bb48231 Merge remote-tracking branch 'remotes/origin/test' into dev 5 years ago
wynne1005 4d608dd4c3 扩展dispatcher model 5 years ago
钮海涛 b04ef3caa4 合并TEST分支代码 5 years ago
钮海涛 ef40f20e1d 解决合并冲突 5 years ago
钮海涛 3c22c8e3f4 test版本合并到master 5 years ago
wynne1005 d0e1900a84 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
wynne1005 c1fd1f6eee bypass redo release 5 years ago
曾贞一 374e73128d 【坤泰流程测试】 5 years ago
汪云昊 1aa63db4d3 Merge remote-tracking branch 'remotes/origin/dev' into test 5 years ago
汪云昊 4b3470b1fd 定时任务日志优化 
邮件发送失败记录
 5 years ago
wynne1005 f3a13522a1 解决冲突 5 years ago
wynne1005 3ba1c8ee62 新增组件类型枚举 5 years ago
宋军超 ae285a6dc6 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
王杰 4df8a743a7 9735 19048-物料信息导入模板增加喷涂必需信息的维护-2020-07-21 5 years ago
宋军超 076c6c1b4f 扭矩二合一查询关键件清单逻辑优化--目前根据 队列主表，队列明细表，车型散件配置清单，物料信息表。加上条件【一百位条码】,年度型相同，车型相同 内联查出所有的关键件零件——>查询车型散件配置清单中的零件信息 
工位监控逻辑修改:产线添加工位监控模式字段，为空或10执行之前逻辑，为20时不需要查询工单信息，后面逻辑不变
 5 years ago
wynne1005 d5ee3d3b29 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
wynne1005 2116fdafc7 agv枚举 5 years ago
曾贞一 b6a0d43bd0 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
曾贞一 a379c97461 【2444 坤泰流程配置测试】 5 years ago
钮海涛 e140910db7 Merge remote-tracking branch 'origin/test' into test 5 years ago
汪云昊 94c21581dc Merge remote-tracking branch 'origin/dev' into dev 5 years ago
汪云昊 c230c57c97 定时任务 导入导出 
定时任务 重载功能
 5 years ago
王杰 b3999ad481 dev merge test 5 years ago
王杰 767c1bffbc test merge dev 5 years ago
钮海涛 81266fbfb6 解决合并冲突 5 years ago
王杰 9a74188e55 master merge test 5 years ago
qianhs 9461057a07 Finish Task #2080 Cost:8h 5 years ago
陈思洁 1d799ed294 2447 中航 扣减错误信息保存 5 years ago
王杰 204da853c3 [任务：2442] 5 years ago
joke.wang 54a51a4c69 Fix Bug #916 5 years ago
王杰 9b6be3167d dev merge test 5 years ago
王杰 d2ff83e22b test merge dev 5 years ago
曾贞一 6dd0614533 【欧洲-定时悬挂链汇总更新库存数据JOB-优化】 5 years ago
宋军超 e4384bd569 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
宋军超 2e5ab2cdcd 条码外上线添加赋值字段 5 years ago
钮海涛 9a516f893f 合并dev代码到test 5 years ago
钮海涛 37a12c0cdf Merge remote-tracking branch 'remotes/origin/test' into dev 5 years ago
joke.wang b69fcdc0c6 Finish Task #2399 Cost:6h 5 years ago
宋军超 300e308394 新增盲检规则导入功能 5 years ago
王杰 e1b3b14a36 test merge dev 5 years ago
王杰 6de2bc5472 Merge branch 'test' into dev 5 years ago
qianhs 860f6d11f0 Finish Task #2080 Cost:8h 5 years ago
曾贞一 354d1290f7 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
曾贞一 f99c5232be 【2388 07 1.2.3.6.2欧洲WMS-PCR-悬挂链库存同步】 5 years ago
宋军超 1c93d21815 修改字段BIN_NO 5 years ago
王杰 7e48674d9e dev merge test 5 years ago
王杰 4260316f62 test merge dev 5 years ago
joke.wang e5cd6692d4 Finish Task #2359 5 years ago
钮海涛 8d29e72322 Merge remote-tracking branch 'origin/test' into test 5 years ago
钮海涛 dcc23e56cd 三力士演示demo 5 years ago
joke.wang 52ad38fa9d Finish Task #2238 5 years ago
王杰 a2f047553f pom 5 years ago
王杰 c20f630402 Merge branch 'test' into dev 5 years ago
王杰 dc91809bb7 test merge dev 5 years ago
钮海涛 1581e8b86c 三力士演示demo 5 years ago
曾贞一 e9492a86b0 【2315 07 1.2.3.6.3欧洲WMS-RFID查询】 5 years ago
钮海涛 f061ff7b73 Merge remote-tracking branch 'origin/test' into test 5 years ago
钮海涛 c980c6c87c 三力士演示demo 5 years ago
曾贞一 5dfad71e39 【2292 子 07 1.2.3.6.3欧洲WMS-PCR-RFID入库 】 
【2310 07 1.2.3.6.3欧洲WMS-RFID发运】
【2312 07 1.2.3.6.3欧洲WMS-RFID空车回库】
 5 years ago
许心洁 9a62fe0e06 BUG#9302 5 years ago
qianhs e321ca3790 Merge remote-tracking branch 'origin/test' into test 5 years ago
宋军超 8e99ae38e6 修改测试天津bug 5 years ago
qianhs f0b8cee974 Merge remote-tracking branch 'origin/test' into test 5 years ago
qianhs ba6be25390 Finish Task #2080 Cost:8h 5 years ago
陈思洁 47ef0fa503 【2286 07 1.1.2.2 强制放行ByPass】 5 years ago
wynne1005 a84186e023 中航审核发布 5 years ago
宋军超 716f0ac1f9 对象结构添加是否显示和显示顺序字段 5 years ago
宋军超 93d7b4dac8 首检、巡检查询添加产品条码、工单号、物料号、产线 搜索条件 5 years ago
钮海涛 6033695b99 修复合并版本问题 5 years ago
wynne1005 085f15427d 还原pom 5 years ago
wynne1005 dfa993b9e9 还原pom 5 years ago
wynne1005 15f0a37508 还原pom 5 years ago
汪云昊 a2f7642d53 Merge remote-tracking branch 'origin/dev' into dev 5 years ago
汪云昊 cbf1c97c06 彭伟代码恢复 
定时任务日志过滤器
 5 years ago
joke.wang 4bb5dbfac5 Finish Task #2236 Cost:8h 5 years ago
joke.wang 44e3d667b3 订单池枚举 5 years ago
joke.wang 76e3fb0811 Finish Task #Finish Task #2236 5 years ago
wynne1005 bcb4e5ad13 merge test 5 years ago
wynne1005 31b5f3e234 merge dev 还原pom 5 years ago
wynne1005 7b795c12fb merge master 5 years ago
qianhs b48d38ee62 Finish Task #2080 Cost:8h 5 years ago
陈思洁 27ef6dc7f3 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
陈思洁 7f4c173105 【2250 总装条码打印,2228 06 1.2.4.6.1.7 总装上线工位】 5 years ago
joke.wang ad6249f412 Finish Task #2235 Cost:8h 5 years ago
wynne1005 b18408b3bb merge test 5 years ago
puxiao.liao 1f6c613488 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
曾贞一 f4edb471c3 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
曾贞一 3d826c5edc 【智能化开发-日志记录优化】 5 years ago
puxiao.liao 1d2c2b7be2 海纳川智能化 5 years ago
joke.wang ab0ae20d40 Finish Task #2234 客户JIT预装队列 5 years ago
袁津哲 bdde5bbb9a Merge remote-tracking branch 'origin/dev' into dev 5 years ago
袁津哲 c73ef2b93b 开发涂装检查工位和一次、二次箱条码Un-Pack-后端开发业务逻辑 5 years ago
wynne1005 b8239f6455 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
钮海涛 32eb9dc797 修复合并版本问题 5 years ago
钮海涛 9dca27259e Merge branch 'test' into dev 5 years ago
puxiao.liao 37fb285aa9 海纳川智能化 5 years ago
王杰 5ccf659c94 [bug:9149] 5 years ago
王杰 31d7b71872 mes enum order type 5 years ago
joke.wang d44312c470 Fix Bug #9151 5 years ago
袁津哲 56a4edc4c0 Merge remote-tracking branch 'origin/dev' into dev 5 years ago
袁津哲 295860683a 开发涂装检查工位和一次、二次箱条码Un-Pack-后端开发业务逻辑 5 years ago
王杰 472b2f1ee6 bug 9149 5 years ago
钮海涛 0626d6f969 修复版本问题 5 years ago
钮海涛 e42ea19f37 修复版本问题 5 years ago
钮海涛 8d4c5f3cd4 Merge branch 'test' into dev 5 years ago
王杰 272d647073 【任务2219】 5 years ago
钮海涛 0f2f56163e Merge branch 'master' into test 5 years ago
wynne1005 d9f619e1a0 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
王杰 08fe2de018 mes 5 years ago
wynne1005 8ae7ce53b7 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
曾贞一 b68f55b062 【2193 06 1.2.3.7.4任务自动生成任务JOB】 5 years ago
wynne1005 cf1edee02e edi 5 years ago
王杰 15e7f2a0b5 pom 5 years ago
王杰 ea5a069eeb pom 5 years ago
钮海涛 f464fd09c5 Merge branch 'test' into dev 5 years ago
puxiao.liao fa383f6417 自动化策略主表 5 years ago
王杰 f3ffdc7d4c dev merge test 5 years ago
puxiao.liao 84dbbcd9a8 自动化策略主表 5 years ago
puxiao.liao 2673b9164a Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
王杰 2c16efcb72 Merge branch 'test' into dev 5 years ago
王杰 7d5d36d084 test merge master 5 years ago
puxiao.liao aea28cf6bb Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
puxiao.liao e3513bddaa 自动化策略主表 5 years ago
王杰 70d58be136 pom 5 years ago
王杰 91d0ec1671 Merge branch 'master' into test 5 years ago
曾贞一 913991d30d 【2193 06 1.2.3.7.4任务自动生成任务JOB】 5 years ago
陈思洁 3f88a390e4 【8983 需求调整-泰国MES，工单下达逻辑调整】 5 years ago
钮海涛 d08465dd38 修复版本问题 5 years ago
钮海涛 800a954b7f Merge branch 'test' into dev 5 years ago
joke.wang 1f05cfca4c Finish Task #2152 Cost:16h 5 years ago
puxiao.liao 9cd0823c34 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 
 Conflicts:
	modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java
 5 years ago
曾贞一 9567d62195 【自动化策略】 5 years ago
puxiao.liao 17d3642fff 自动化策略主表 5 years ago
曾贞一 a8b2a0a618 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
曾贞一 e94e4ad189 【2180 06 1.2.3.8泰国WMS－生产报工接口】 
【2181 06 1.2.3.8 泰国WMS-容器包装关系接口】
【2180 06 1.2.3.8泰国WMS－生产报工接口】
 5 years ago
汪云昊 6d71c01178 Merge remote-tracking branch 'origin/dev' into test 5 years ago
陈思洁 9e9bb2fd03 【合并冲突】 5 years ago
陈思洁 f90371f632 【2144 06 1.2.4.6.1.3 装配计划排产】 5 years ago
钮海涛 ac7e69e51e 修复版本问题 5 years ago
钮海涛 34e63db56c Merge remote-tracking branch 'origin/dev' into dev 5 years ago
钮海涛 e340749f87 Finish Task #2196 Cost:4h 5 years ago
宋军超 87dc9ab966 与前端联调修改 5 years ago
曾贞一 16271ea338 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
曾贞一 77e6ee3b98 【2180 06 1.2.3.8泰国WMS－生产报工接口】 5 years ago
宋军超 2ef42fdadd Finish Task:2160,2175.北京麦格纳基础数据开发。 Finish Task #2160,2175 Cost:10h 5 years ago
钮海涛 9d64793a5f Merge branch 'master' into test 5 years ago
joke.wang 3dda15e00a Finish Task #2153 Cost:24h 5 years ago
puxiao.liao 0c0d43cd96 北京海纳川：采购入库组件 5 years ago
汪云昊 3c2462c1af Merge remote-tracking branch 'origin/dev' into dev 5 years ago
汪云昊 fdd5516a0f FTP适配器优化 
表单功能优化
UA 适配 LONG类型
 5 years ago
wynne1005 878acb869f 提交zh修改问题 5 years ago
wei.peng b0e752c65e Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
wei.peng 91f4edc83f 数据库读写分离 功能完善 5 years ago
wei.peng d5051cabdb 数据库读写分离 功能完善 5 years ago
wei.peng 25b2109144 getByProperty 查询优化 5 years ago
王杰 0388c36c41 mes 5 years ago
wei.peng fb65b042f0 getByProperty 查询优化 5 years ago
wei.peng ec3febfaa9 Merge remote-tracking branch 'remotes/origin/dev' into test 5 years ago
wei.peng bdb5e6e27c 密码策略完成 5 years ago
袁津哲 638c032d95 优化工位定时组件调用逻辑 5 years ago
wynne1005 8ff96a0c3f merge master 防止冲突更多 5 years ago
wynne1005 b0b07437d6 还原pom 5 years ago
汪云昊 4ec71681de Merge remote-tracking branch 'origin/dev' into dev 5 years ago
汪云昊 4de301bf79 MDM 系统结构优化 
单元测试开关
 5 years ago
wynne1005 9571604351 Merge branch 'dev' into test 5 years ago
王杰 6c47817bfe mes enuk 5 years ago
joke.wang 6f375edf9a 类型信息枚举增加样本类型 5 years ago
陈思洁 3924be2504 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
陈思洁 e7e13e53f4 【工艺流程设计-更新前端组件】 5 years ago
qianhs 53298f6b88 Finish Task #2080 Cost:8h 5 years ago
曾贞一 5c2dcf8e10 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
曾贞一 f3857116d1 【2074 06 1.2.3.8上架策略-计算COI值】 5 years ago
袁津哲 764060bf20 Start Task #2118 Cost:8h Left:0h 
Finish Task #2118 Cost:8h
 5 years ago
qianhs 7a60d37ddc Finish Task #2080 Cost:8h 5 years ago
钮海涛 aeb347b1fb Merge remote-tracking branch 'origin/dev' into dev 5 years ago
钮海涛 ce020cc1ab Start Task #2134 Cost: 8h 5 years ago
wynne1005 60c1f6ecab 还原pom 5 years ago
wynne1005 47ae0b46ef 还原pom 5 years ago
wynne1005 ba1ba8bc0f Merge branch 'dev' into test 5 years ago
wynne1005 8623a5a13d 还原pom 5 years ago
wynne1005 b75347ffc1 还原pom 5 years ago
wynne1005 4eef0f8c45 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
钮海涛 9f349cd42c Merge remote-tracking branch 'origin/test' into test 5 years ago
钮海涛 9dd7c54678 修复启动问题 5 years ago
袁津哲 adb974d874 合并test分支代码到dev分支 5 years ago
wynne1005 40d921ddd6 优化 新增状态点类型，发运自测1 5 years ago
袁津哲 0504e58f95 Fix Bug #8778 5 years ago
王杰 1d775acd69 ptl IF_拣货数据 5 years ago
joke.wang 28fe4a03f8 Finish Task#2108 Cost:12h 5 years ago
钮海涛 93dd90363e Merge remote-tracking branch 'origin/test' into test 5 years ago
钮海涛 ae805a6596 修复Bug 5 years ago
袁津哲 0067e31420 合并test分支代码到dev分支 5 years ago
袁津哲 a871d65e1f Merge remote-tracking branch 'origin/test' into test 
# Conflicts:
#	modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java
 5 years ago
袁津哲 0a5f45840a Fix Bug #8778 5 years ago
宋军超 d18beff50c Finish Task #2094 Cost:16h 5 years ago
钮海涛 7982cefc1e Merge branch 'test' into dev 5 years ago
钮海涛 2f8b0ba5db 修复版本问题 5 years ago
qianhs 057439d050 Finish Task #2080 Cost:8h 
Finish Task #2081 Cost:12h
Finish Task #2083 Cost:8h
 5 years ago
钮海涛 a71d7a31ce Merge branch 'master' into test 5 years ago
钮海涛 471208d051 SWEB添加条码状态枚举 5 years ago
王杰 c39c9b6f70 ptl 5 years ago
joke.wang 1afa60623c Finish Task #2090 Cost:16h 5 years ago
汪云昊 2f71b79ed8 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
汪云昊 79429024cf MDM基础功能 5 years ago
汪云昊 08c52dc09f 文件服务器优化扩展 
添加go-fastdfs支持
 5 years ago
宋军超 3c53d8a2f2 Finish Task #2064 Cost:24h 5 years ago
陈思洁 9f6ecf72a0 【2002 泰国内饰生产作业-按生产工单，单件生产】 5 years ago
joke.wang f357293ca5 plc数据类型修改 5 years ago