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

2579 Commits (20b40ce29475e4b919299efe06011ce32c52f6c5)

Author SHA1 Message Date
钮海涛 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
汪云昊 e416b032c2 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
汪云昊 4fc8c2a80d 软适配添加适配发送报文 5 years ago
王杰 6232d14e61 [任务：2066，状态机异常处理] 5 years ago
袁津哲 7aaa8bca6d 合并dev分支代码到test分支 5 years ago
puxiao.liao 9a65fc95fa Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
puxiao.liao 9975335acb Finish Task #2033 Cost:8h 5 years ago
袁津哲 b0f3873aea Merge remote-tracking branch 'origin/dev' into dev 5 years ago
袁津哲 a8dd9831e0 Start Task #2021,2022 Cost:8h Left:8h 5 years ago
曾贞一 4c3571182c 【冲突】 5 years ago
曾贞一 523e4b7b3b 【2016 BH-回传检测结果至MES系统】 5 years ago
wei.peng d753bdc5b6 fix(数据层): 数据库操作根据AOP对DAO的方法进行分切数据源 5 years ago
钮海涛 7414b76d85 修复合并版本问题 5 years ago
钮海涛 32a566be93 Merge branch 'test' into dev 5 years ago
钮海涛 6061f89d43 修复合并版本问题 5 years ago
宋军超 570be85b8d Fix Bug #8744 5 years ago
曾贞一 faf8cced03 Merge remote-tracking branch 'origin/dev' into dev 5 years ago
曾贞一 4346eb647b Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
曾贞一 31c26017c1 【2009 天津麦格纳WMS-报表-库位利用率】 5 years ago
王杰 215ffc080b ptl 5 years ago
陈思洁 dda5a4c7e9 【合并冲突】 5 years ago
陈思洁 55de940f7c 【1926 盲检工步】 5 years ago
wynne1005 85f99fcdfa 提测 还原pom 5 years ago
wynne1005 b43317c11a 还原pom 5 years ago
wynne1005 5f80cc4322 Merge branch 'dev' into test 5 years ago
wynne1005 ca080002a1 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
钮海涛 dea25ce166 Merge remote-tracking branch 'origin/dev' into dev 5 years ago
钮海涛 3a40d278ac 修复平台登录问题 5 years ago
wynne1005 aa5c13dde1 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
王杰 5ccc6c4408 andon 5 years ago
puxiao.liao 47a7a0a9a3 BH 需求报表的修改 5 years ago
wynne1005 2d69c3ab18 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
wynne1005 6b9d56f9e0 自测修改 5 years ago
宋军超 f5074fba08 Finish Task #1898 Cost:16h 6 years ago
qianhs 86f6fefd5b BH-CODE 出库，绑定 6 years ago
joke.wang ca0b92aa6a Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
joke.wang a8241a1694 Start Task #1960 Cost:8h Left:8h 6 years ago
宋军超 4d2f200677 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
宋军超 a47eb08a8e Start Task #1934 Cost:8h Left:8h 6 years ago
袁津哲 271e7264a4 Merge remote-tracking branch 'origin/dev' into dev 
# Conflicts:
#	modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java
 6 years ago
袁津哲 31bd8754df Fix Bug #1916,1917 6 years ago
宋军超 6f1bba9997 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
宋军超 c2a5a17379 工步参数添加工步弹框参数字段 6 years ago
王杰 b0b276ba66 [任务：1938] 6 years ago
joke.wang 342e5f7ab2 Effort Task #1915 Cost:2h Left:0h 6 years ago
wynne1005 8ef3997038 还原pom 6 years ago
wynne1005 4150543cb4 Effort Task #1940 Cost:16h Left:8h 6 years ago
袁津哲 f4ff8205f6 Merge remote-tracking branch 'origin/dev' into dev 6 years ago
袁津哲 a4bedf2354 Fix Bug #1916,1917 6 years ago
钮海涛 bbde1ebc9c Merge branch 'dev' into test 6 years ago
钮海涛 4d26c95639 Merge branch 'test' into dev 6 years ago
陈思洁 3d0524ec1f Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 6 years ago
陈思洁 a6ba3b6a5c 【8671 客户JIT队列，自动定时JOB-生成数据错误】 6 years ago
joke.wang d4f0ef157a Finish Task #1915 Cost:8h 6 years ago
qianhs b474ef1266 Finish Task #1813 Cost:32h 
Finish Task #1814 Cost:32h
Finish Task #1815 Cost:16h
 6 years ago
钮海涛 47131ff13f 修复版本问题 6 years ago
钮海涛 da21795f7f Merge branch 'test' into dev 6 years ago
钮海涛 f392a13832 Merge remote-tracking branch 'remotes/origin/master' into test 6 years ago
puxiao.liao 91688ddab5 BH 需求变更 6 years ago
qianhs 5d32b43e51 BH-CODE 出库，绑定 6 years ago
袁津哲 d65a5a3784 Merge remote-tracking branch 'origin/dev' into dev 
# Conflicts:
#	modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java
 6 years ago
袁津哲 44f313abc4 Task1917、1916:开发关键件绑定、扭矩二合一(PF)、关键件绑定、扭矩二合一(DL)功能 6 years ago
宋军超 9eda1f67b7 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
宋军超 40672559e4 修改sonar--BUG类型问题 6 years ago
钮海涛 c344f017a9 修复sonar上的问题 6 years ago
wynne1005 8955fd2f4d mes提测 还原pom 6 years ago
wynne1005 23754d3f18 mes提测 还原pom 6 years ago
wynne1005 81753d3260 Merge branch 'dev' into test 6 years ago
wynne1005 81b554fc8b Merge branch 'test' 6 years ago
陈思洁 677cc85360 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
陈思洁 b2384619d4 【1891 队列条码打印-管理端】 6 years ago
puxiao.liao 583c750055 BH 需求变更 6 years ago
宋军超 fd9a2e6d15 Start Task #1887 Cost:8h Left:8h 6 years ago
puxiao.liao 1dc9276e9a BH 需求变更 6 years ago
puxiao.liao c06fee639d BH 需求变更 6 years ago
qianhs 17b27da539 BH-CODE 出库，绑定 6 years ago
王杰 074093a46d [任务：1850 ，安灯流程设计] 6 years ago
钮海涛 ad79c9fd7b 修改BH基础数据 6 years ago
qianhs f4c4b4a1f6 1,产品条码事务实体类提交 6 years ago
joke.wang 1a72c16f14 Finish Task #1890 Cost:8h 6 years ago
陈思洁 4d63f9817e Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
陈思洁 9b8342b7f5 【1865 客户JIT生产队列，自动下达定时JOB】 6 years ago
钮海涛 999a415d27 修复版本问题 6 years ago
钮海涛 b9cbf9684b Merge branch 'test' into dev 6 years ago
钮海涛 4921d55bda 修复版本问题 6 years ago
钮海涛 b303cf9a14 修复合并问题 6 years ago
钮海涛 96fdbe0e07 Merge branch 'master' into test 6 years ago
puxiao.liao 491bc32325 Fix Bug#8345 6 years ago
贾文涛 a68475d3d0 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
贾文涛 a8efa90089 bug 7461,count时去掉distinct。Fix Bug #7461 6 years ago
袁津哲 cad6b7ad89 Merge remote-tracking branch 'origin/dev' into dev 6 years ago
袁津哲 f50b76cd1f Task1858:电枪枪头更换计数 6 years ago
wynne1005 608aa6be90 还原pom 6 years ago
wynne1005 99d3c9d721 提测合并 还原pom 6 years ago
wynne1005 6dd2f12a2a Merge branch 'dev' into test 6 years ago
wynne1005 5ef88c80c0 提测合并 还原pom 6 years ago
王杰 56ae714283 【任务：1845，安灯】 6 years ago
wei.peng 6169542dbb 合并代码  有代码丢失或者文件丢失请排查此处 
Merge remote-tracking branch 'remotes/origin/dev' into test

# Conflicts:
#	modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java
 6 years ago
wei.peng 9ee8acae91 合并代码 有代码丢失或者文件丢失请排查此处 6 years ago
袁津哲 08b03c9eb8 Task1858:电枪枪头更换计数 6 years ago
joke.wang e2ce63a9cd bug: [8533] plc数据类型改为枚举 6 years ago
joke.wang 88a0d6d02f 任务:[1828] 半成品绑定工步增加逻辑 6 years ago
宋军超 1f55c06368 任务：【1842】-海纳川通用导入添加对应工具类、实体和model 6 years ago
袁津哲 6e3da00fda Task1812:仓库健康度指标视图及相关指标自定义(#476) 6 years ago
王杰 786c442d55 解决冲突 6 years ago
宋军超 af6b0ce0fd 任务：【1842】-添加海纳川5个基础数据模块的实体与枚举 6 years ago
钮海涛 c1241bd6c5 修复版本问题 6 years ago
钮海涛 53a421b3b9 修复版本问题 6 years ago
钮海涛 94e9b2ffec Merge remote-tracking branch 'remotes/origin/master' into test 6 years ago
王杰 029763feb1 pom 6 years ago
王杰 30fcf4f23f pom冲突 6 years ago
王杰 716e1f7df1 Merge branch 'test' into dev 6 years ago
宋军超 912ef81271 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
宋军超 373808e20d 任务：【1928】-添加检测单-检测类型枚举修改code描述 6 years ago
qianhs 8d61db5ed5 任务:1786,1787,1788,1789 6 years ago
汪云昊 717f268c28 POJO版本号还原 6 years ago
钮海涛 281ef662b1 merge test 6 years ago
汪云昊 c27ebee3f9 Merge remote-tracking branch 'origin/dev' into dev 6 years ago
汪云昊 9532489502 POJO添加序列化id 6 years ago
qianhs c38757de19 盘点 6 years ago
wynne1005 a4551a746a [优化] 修改DdlPackBean查询 -> 工厂代码可以是英文或中文 6 years ago
宋军超 dfce22d654 任务：【1928】-添加检测单-检测类型枚举 6 years ago
陈思洁 9865558af3 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
陈思洁 6fbfea417f 【1804 质检检测-来料检验功能】 6 years ago
汪云昊 e8ea5a3c90 Merge remote-tracking branch 'origin/dev' into dev 6 years ago
汪云昊 d86cdfe4ff OPC UA 优化 6 years ago
陈思洁 c0f5709bb2 【合并冲突】 6 years ago
陈思洁 aef8841223 【合并冲突】 6 years ago
陈思洁 60973a3ee0 【1804 质检检测-来料检验功能】 6 years ago
puxiao.liao e9873905ef Merge remote-tracking branch 'origin/test' into test 6 years ago
puxiao.liao 6b9b2e8dd2 BUG#8438【20011-- 六合一改数按钮逻辑错误，打开改数按钮时，输入数量后数量会累加在下方明细中并且让用户再次输入数量--0515】 6 years ago
贾文涛 c4510fb121 BUG #8485,修复数据权限-查询启用禁用无效 6 years ago
puxiao.liao 8e8744d3db Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 
 Conflicts:
	modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java
 6 years ago
puxiao.liao e8dd3ab12f 8481 基础数据-库位-导入。导出报错,提示cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil$LOCATE_TYPE.descriptionOfValue(java.lang.String) 6 years ago
wei.peng 3669fbb4a4 本地版本库雪崩,有问题请排查此版本 6 years ago
王杰 a6e9b90026 pom 6 years ago
钮海涛 34a3598508 bug:8385 6 years ago
宋军超 1f5052d679 添加检测过程类型枚举 6 years ago
宋军超 82af372fc0 添加检测过程类型枚举 6 years ago
qianhs 8d6ffbb012 bug:8268;8267;8266;8265 6 years ago
王杰 de9017ca5c 冲突 6 years ago
王杰 c68d49880c Merge branch 'dev' into test 6 years ago
王杰 7d192b36a6 pom冲突 6 years ago
qianhs eb7511c39e bug:8268;8267;8266;8265 6 years ago
puxiao.liao f765493696 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 
 Conflicts:
	modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java
 6 years ago
puxiao.liao 70aeae21d3 8426 中航-报表中心-采购计划更改查询-查询条件无效 6 years ago
钮海涛 8ae8383e79 Merge remote-tracking branch 'origin/test' into test 6 years ago
钮海涛 23b06a53af bug:8404 6 years ago
钮海涛 da8b4db890 修复pom版本问题 6 years ago
宋军超 32de58277a 添加MES_检验单和MES_检验单明细的实体和枚举 6 years ago
宋军超 7ef769268d 添加MES_检验单和检验单明细实体与枚举 6 years ago
许心洁 75be7d5078 任务#1744：全局替换自定义搜索功能 6 years ago
joke.wang 5fb7eecee0 [任务：1752 oee看板] 6 years ago
许心洁 ef6330675c 任务#1744：全局替换自定义搜索功能 6 years ago
贾文涛 e668ef4b28 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
贾文涛 eadf0d67f8 添加数据权限处理方法 6 years ago
钮海涛 f87eeeb491 修复合并版本问题 6 years ago
钮海涛 ac268c1cbc Merge branch 'test' into dev 6 years ago
puxiao.liao ba81a26700 1778 产品工装关系维护 6 years ago
joke.wang f6e2a509f0 [任务：1751工厂小时OEE] 6 years ago
曾贞一 1901cf6eb0 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
曾贞一 2dac15c248 【1709 BH-录入检测值】 6 years ago
钮海涛 40a87d83b3 修复合并问题 6 years ago
钮海涛 005d0f7f86 修复合并问题 6 years ago
钮海涛 bc269e1f71 Merge branch 'master' into test 6 years ago
wynne1005 1cda7e902b Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 6 years ago
宋军超 345b261118 设备添加枚举EQU_DEFECT_CAUSE故障原因,EQU_DEFECT_METHOD故障处理措施,EQU_DEFECT_PHENOMENON故障现象; 6 years ago
wynne1005 27e4fb164b Merge branch 'dev' into test 6 years ago
wynne1005 d925ec62bf Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
wynne1005 888d87f12e task edi 6 years ago
joke.wang f38a47cc68 [oee 定时任务] 6 years ago
qianhs fdaa4c1740 bug:8268;8267;8266;8265 6 years ago
贾文涛 a563537750 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
贾文涛 e63601716f 1736-MES数据权限模块开发 6 years ago
qianhs f03e119561 bug:8268;8267;8266;8265 6 years ago
钮海涛 8f884a58cf Merge remote-tracking branch 'origin/test' into test 6 years ago
钮海涛 90edd435e3 bug:8293;8297 6 years ago
joke.wang 3227cfa47e [oee] 6 years ago
wynne1005 4ed1770189 Merge branch 'dev' into test 6 years ago
王杰 de200de372 mes 6 years ago
钮海涛 a575b4eed4 bug:8287;8288;8290 6 years ago
王杰 da1c10dc4c mes生产计划批量编制 6 years ago
钮海涛 ac9ffb1ac1 Merge remote-tracking branch 'origin/dev' into dev 6 years ago
袁津哲 000c2ad16c Merge remote-tracking branch 'origin/dev' into dev 6 years ago
袁津哲 745455c5bd 修改波次规则bug和对接导入模板接口 6 years ago
钮海涛 bf2cc9843f Merge remote-tracking branch 'origin/dev' into dev 
# Conflicts:
#	modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java
 6 years ago
puxiao.liao b9af2c52f8 1713 BH-挑选，返修 6 years ago
钮海涛 81f380aec4 产品入库表新增 6 years ago
joke.wang 60428b5bad [任务：1690 界面窗口] 6 years ago
汪云昊 2ab9045d17 Merge remote-tracking branch 'remotes/origin/dev' into test 6 years ago
汪云昊 30c0b2e46a Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
汪云昊 241ea78cda 检测环境枚举数据调整 6 years ago
汪云昊 71d30c3232 表单-自定义按钮-添加是否需要选中数据校验及实现Http方式扩展 
表单-拦截器-实现Http方式扩展
表单-元素-工厂数据隔离功能
表单-动态表单-查询数据默认条件优先级优化
sonar代码优化
 6 years ago
王杰 2b01efb15b mes生产计划批量编制 6 years ago
wynne1005 d5f69eeefd task 1565 发运修改 6 years ago
袁津哲 64daf36410 动态搜索修改人修改时间开窗处理,BUG:8097 6 years ago
袁津哲 633aef2d6e 动态搜索修改人修改时间开窗处理 6 years ago
wei.peng 37922cab29 POM 文件修改 
Merge remote-tracking branch 'remotes/origin/test'

# Conflicts:
#	modules/i3plus-icloud-report/pom.xml
 6 years ago
wei.peng fe94ad9bf3 Merge remote-tracking branch 'remotes/origin/test' 6 years ago
wei.peng 8aab106aa9 合并代码 pom 冲突 
Merge remote-tracking branch 'remotes/origin/dev' into test

# Conflicts:
#	modules/i3plus-ics-gateway/src/main/resources/application-docker.properties
 6 years ago
宋军超 b96eb1b669 添加人员技能功能 6 years ago
曾贞一 bc82c85790 【1721 BH-BH检测结果管理】 6 years ago
钮海涛 cb8688105c task:1727;1728;1729 6 years ago
钮海涛 3fbf532c84 修复pom版本问题 6 years ago
钮海涛 a1eb3c3bc2 修复pom版本问题 6 years ago
钮海涛 2e2ee2cc6c Merge branch 'test' into dev 6 years ago
钮海涛 2cc43af431 修复pom版本问题 6 years ago
钮海涛 c6d36af4c9 Merge branch 'master' into test 6 years ago
joke.wang ce1dd45842 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
joke.wang 755fccb45e [任务：1690 产能监控看板] 6 years ago
qianhs 2303186fc4 【657】【中航WMS看板－成品发运率看板】 
【658】【中航WMS看板－发运窗口时间看板】
【656】【 中航WMS看板－收货完成率看板】
【655】【 中航WMS看板－仓库预警看板】
【654】【中航WMS看板－３０天供应商延期到货跟踪动态看板】
 6 years ago
puxiao.liao f6988f36c8 1655 生产领料单增加替代料 6 years ago
wei.peng 3aa1afb0ce 对象历史记录 Pojo 创建 6 years ago
wei.peng fee90baf64 1. 关闭register , gateway , console 日志持久化技术 
2. Sonar Bug 修复
3. 自定义日志持久化
 6 years ago
joke.wang e6f3dd5c32 [任务：1683-看板管理] 6 years ago
袁津哲 7789883f9b 开发导入功能模块 6 years ago
钮海涛 a597d78100 Merge remote-tracking branch 'origin/test' into test 6 years ago
钮海涛 c57ca73a4a bug:8169;8176;8177 6 years ago
wei.peng effae233bf 对象历史记录 Pojo 创建 6 years ago
wei.peng dac1358009 1. 关闭register , gateway , console 日志持久化技术 
2. Sonar Bug 修复
3. 自定义日志持久化
 6 years ago
joke.wang 4e02acb9e3 [任务：1683-看板管理] 6 years ago
袁津哲 8a6c9aadef 开发导入功能模块 6 years ago
wynne1005 d6fe718e4c Merge branch 'dev' into test 6 years ago
qianhs 0a2d9a3d6d 【1432 工位扫描-ESOP展示组件开发，队列组件调整】【工位扫描-ESOP展示组件开发，队列组件调整】 6 years ago
袁津哲 9518628c12 Merge remote-tracking branch 'origin/dev' into dev 6 years ago
袁津哲 533d8e55e8 开发导入模块功能 6 years ago
王杰 d4bde19861 mes 6 years ago
王杰 74a4a1381c mes 6 years ago
汪云昊 ccf2f42840 Merge remote-tracking branch 'origin/dev' into dev 6 years ago
汪云昊 edf0b66115 Sonar代码缺陷修复 
查询条件优化
拦截器，自定义按钮对外接口实现
表单-功能目录优化
软适配日志优化
 6 years ago
汪云昊 baaf16ad56 国际化工具类异常处理优化 6 years ago
陈思洁 5d8fec4938 合并冲突 6 years ago
陈思洁 7505087392 【mes 产品配方导入功能和基础数据维护】 6 years ago
钮海涛 efe083a9da 修复版本号 6 years ago
宋军超 e464b4d699 删除设备备件管理相关实体 6 years ago
宋军超 89a9946432 添加设备管理相关功能 6 years ago
王杰 cba7ee3d0d [任务：1522，ptl流程设计] 6 years ago
qianhs 88279f9b8b sonar bug修改 6 years ago
曾贞一 e5c275499c 【冲突解决】 6 years ago
曾贞一 255aefbcef 【1585 销售订单管理-销售订单维护】 6 years ago
钮海涛 e9ec4cecfe Merge remote-tracking branch 'origin/dev' into dev 6 years ago
钮海涛 00fce0bded 新增客户物料发往地 6 years ago
wynne1005 0e934f9af6 task `1565` 发运enum 6 years ago
汪云昊 f09159dffa Merge remote-tracking branch 'origin/dev' into dev 6 years ago
钮海涛 01d3eeea51 新增客户物料发往地 6 years ago
钮海涛 dd9ae231c8 与界面联调物料扩展属性 6 years ago
wynne1005 cc739eac24 task `1565` 发运pojo 6 years ago
汪云昊 1051b22575 ICS 注册中心监控对象 6 years ago
宋军超 69b620336f 散件BOM导入 6 years ago
qianhs ca85c59cdb Merge remote-tracking branch 'origin/dev' into dev 
# Conflicts:
#	modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java
 6 years ago
qianhs 20f5bfc9eb wms数据同步迁移至mes 6 years ago
王杰 c6aefc89e7 test合并dev解决ct 6 years ago
王杰 94fed3b9b2 Merge branch 'test' into dev 6 years ago
陈思洁 59cbfbf293 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
陈思洁 08ec98305b 【1581 工位扫描-记录换模时间 -校验逻辑调整】 6 years ago
王杰 b1018dbd39 [平台；] 6 years ago
钮海涛 05c1575e8f Merge remote-tracking branch 'origin/dev' into dev 6 years ago
alwaysfrin f4e9a80d79 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
alwaysfrin 14660641ba hibernate优化 6 years ago
wei.peng fa42a25b96 异常处理优化 6 years ago
wei.peng aa1f7a2845 Merge remote-tracking branch 'remotes/origin/test' 6 years ago
钮海涛 4dee474c73 修改POM版本号 6 years ago
钮海涛 417120358c Merge branch 'test' into dev 6 years ago
钮海涛 288fb4a16b 修改POM版本号 6 years ago
钮海涛 aff68cd087 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
王杰 e0a23b147e mes enum 6 years ago
王杰 3f3d0038e8 【任务：1608 数据监听预警配置，定时任务】 6 years ago
许心洁 4884f59072 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 6 years ago
许心洁 2bc62e2444 动态查询：#需求变更 创建用户和更新用户也需要做成可选的 6 years ago
wynne1005 2e177ba671 dev合并test test有修改 6 years ago
汪云昊 2772ea6a2f Merge remote-tracking branch 'remotes/origin/dev' into test 
# Conflicts:
#	modules/i3plus-pojo-andon/pom.xml
#	modules/i3plus-pojo-aps/pom.xml
#	modules/i3plus-pojo-base/pom.xml
#	modules/i3plus-pojo-form/pom.xml
#	modules/i3plus-pojo-hardswitch/pom.xml
#	modules/i3plus-pojo-jobflow/pom.xml
#	modules/i3plus-pojo-lac/pom.xml
#	modules/i3plus-pojo-mes-pcn/pom.xml
#	modules/i3plus-pojo-mes/pom.xml
#	modules/i3plus-pojo-model/pom.xml
#	modules/i3plus-pojo-platform/pom.xml
#	modules/i3plus-pojo-ptl/pom.xml
#	modules/i3plus-pojo-report/pom.xml
#	modules/i3plus-pojo-softswitch/pom.xml
#	modules/i3plus-pojo-sweb/pom.xml
#	modules/i3plus-pojo-wms/pom.xml
#	modules/i3plus-pojo-workflow/pom.xml
#	pom.xml
 6 years ago
汪云昊 8a8c3ee34d pom版本调整 6 years ago
wynne1005 581d900123 状态机model提交 6 years ago
曾贞一 35023af12c 【7988 20011--多级包装打印时母条码现在无法打印出来】 6 years ago
汪云昊 e7d176209e Merge branch 'dev' of yunhao.wang/i3plus-pojo into dev 6 years ago
汪云昊 64d83d238f Merge branch 'dev' of wei.peng/i3plus-pojo into dev 6 years ago
汪云昊 3fd17208e2 枚举更新 6 years ago
钮海涛 cfd3f8d58f 冲突解决 6 years ago
钮海涛 1d16e2d938 解决合并冲突 6 years ago
陈思洁 30608f886b 解决冲突 6 years ago
陈思洁 d9d2113f75 【MES_增加枚举】 6 years ago
贾文涛 492dfbff82 pom通过变量方式存在只能引用jar不能引用到项目文件的问题，暂时先还原为最初方式 6 years ago
钮海涛 53dc57a03e Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
钮海涛 df1cbc9449 新增供货追踪接口 6 years ago
袁津哲 bcec12cb38 Merge remote-tracking branch 'origin/dev' into dev 6 years ago
袁津哲 9f918b6664 修改波次规则和范围枚举类字段值名称 6 years ago
王杰 cd99a63233 mes 6 years ago
袁津哲 ae1c6ef8fd Merge remote-tracking branch 'origin/dev' into dev 6 years ago
袁津哲 8a836e340a 优化枚举查询报错问题 6 years ago
puxiao.liao d2fb33d888 bug1536【1536 PDA组件修改增加录入车牌信息功能】 6 years ago
曾贞一 c0e3f1cb4f 【找回文件】 6 years ago
王杰 5fc4c6c025 mes 6 years ago
曾贞一 c926992611 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
曾贞一 4dae2eea7d 【MES 导入】 6 years ago
钮海涛 52a5c1e2f8 Merge branch 'test' into dev 6 years ago
wynne1005 351ea8755e Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
wynne1005 6a36ad7601 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
wei.peng 1d00303306 自定义报表-折线图,饼图,柱状图,矩形图 完成 6 years ago
袁津哲 15035d2851 Merge remote-tracking branch 'origin/dev' into dev 6 years ago
袁津哲 3529d1b845 枚举类修改规则范围和规则值 6 years ago
zcg 9ab0d784dd Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
zcg 73f647e3b4 枚举修改 6 years ago
puxiao.liao f8405b87d9 bug7940【7940 推荐入库-未按最近距离推荐】 6 years ago
钮海涛 3b987436d8 新增LES管理功能 6 years ago
钮海涛 c3a5564652 任务【1483】：LES-新增拉动规则表 
任务【1484】：LES-物料表属性变更
任务【1485】：LES-库位物料属性变更
任务【1486】：LES-存储区属性变更
任务【1487】：LES-生产计划属性变更
任务【1488】：LES-拉动任务属性变更
任务【1489】：LES-入场管理新增窗口时间表
任务【1490】：LES-巡线拉动
任务【1491】：LES-计划拉动
任务【1492】：LES-过点拉动
任务【1493】：LES-手工拉动
任务【1494】：LES-预留外部拉动接口
 6 years ago
钮海涛 6925ce3b18 任务【1483】：LES-新增拉动规则表 
任务【1484】：LES-物料表属性变更
任务【1485】：LES-库位物料属性变更
任务【1486】：LES-存储区属性变更
任务【1487】：LES-生产计划属性变更
任务【1488】：LES-拉动任务属性变更
任务【1489】：LES-入场管理新增窗口时间表
任务【1490】：LES-巡线拉动
任务【1491】：LES-计划拉动
任务【1492】：LES-过点拉动
任务【1493】：LES-手工拉动
任务【1494】：LES-预留外部拉动接口
 6 years ago
汪云昊 ec1d52e7dd MAVEN 版本控制调整 6 years ago
贾文涛 7106c06221 统一修改pom文件的项目版本问题0331 6 years ago
袁津哲 ffbd512b89 Merge remote-tracking branch 'origin/dev' into dev 6 years ago
袁津哲 14cfa5fa47 创建波次计划规则实体类和规则明细实体类 6 years ago
wynne1005 44696061ee 修改pom文件为最新 6 years ago
wynne1005 3c08e7794f Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 6 years ago
贾文涛 eed24e0297 统一修改pom文件的项目版本问题 6 years ago
汪云昊 6ed34b9e5f FTP服务端工具 6 years ago
qianhs 3b763b45cd 【1432 工位扫描-ESOP展示组件开发，队列组件调整】【工位扫描-ESOP展示组件开发，队列组件调整】 6 years ago
陈思洁 6e1961c9d8 【mes_增加工位BOM表中的匹配类型枚举】 6 years ago
wei.peng c8c7c73336 自定义报表 布局,元素,报表 功能优化完成 6 years ago
钮海涛 d98e84759c Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
wynne1005 f345ed2b2f Merge branch 'dev' into test 6 years ago
wynne1005 d80b341620 还原test pom 6 years ago
陈思洁 f14f26a176 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
王杰 0502f6d736 【任务：1529，料架分组队列展示组件】 6 years ago
陈思洁 35351607f8 【MES_半成品箱条码绑定】 6 years ago
joke.wang 7a6e9b9e21 [任务：1479 料架打印] 6 years ago
钮海涛 d8779f42fb 从dev拉取最新代码 6 years ago
贾文涛 abf5d3eeb9 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
贾文涛 048419d823 修改打包时版本号的定义，后续可以通过mvn clean install Pdev 命令进行打包,最后dev还可以更换为test、prod、docker。 6 years ago
zcg 9ca3a819b4 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
wynne1005 4b4bf4e433 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
钮海涛 9d5567f4a6 Merge branch 'test' into dev 6 years ago
许心洁 a22d3d2333 动态查询：#任务1352(合并代码解决冲突) 6 years ago
许心洁 030f2948fb 动态查询：#任务1352 6 years ago
王杰 e3a9defdab 任务1528，生成并打印门锁标签 6 years ago
zcg 98787953ec 【MesPcnEnum 枚举修改】 6 years ago
puxiao.liao 8273a93520 Merge remote-tracking branch 'upstream/test' into test 6 years ago
puxiao.liao f2c41fc0a6 bug7800【7800 移库单导出时报错导出失败】 6 years ago
王杰 0ca8502751 任务：1518 6 years ago
袁津哲 0c3d14a3f9 wms插件枚举新增按钮增强插件类型 6 years ago
王杰 a9a7d78bd5 解决冲突 6 years ago
wei.peng 549f2ff797 授权拦截功能完成 . 6 years ago
袁津哲 35a4c9039a Merge remote-tracking branch 'origin/dev' into dev 
# Conflicts:
#	modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java
 6 years ago
袁津哲 2a0204ad99 开发WMS动态加载插件功能 6 years ago
qianhs 564ba1e116 【1472 工步-设备状态采集（原PLC采集【设备状态】）】 6 years ago
陈思洁 cc207240b4 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
陈思洁 bacab3fb88 【MES_新增设备工装关系和工装操作记录pojo】 6 years ago
王杰 9f8e51830e mes enum 6 years ago
joke lin 126440c976 [任务：1435 客户JIT导入] 6 years ago
陈思洁 736b292d83 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
陈思洁 310bf49af6 【MES_校验是否换膜并推送换模信号 】 6 years ago
陈思洁 22788f1c44 还原POM文件TEST-DEV 6 years ago
许心洁 8178e90abd Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 6 years ago
许心洁 5bf7133ff1 动态查询：BUG#7845；BUG#7676；BUG#7675 6 years ago
王杰 f5e4bba761 ptlpcnenum 6 years ago
曾贞一 5291d5d13d 【7838 修改分组管理中的按钮名称】 6 years ago
曾贞一 779b9d209c 【修改 DEV-pom.xml】 6 years ago
陈思洁 474bb995d6 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
汪云昊 41a39990f4 Merge remote-tracking branch 'origin/dev' into dev 6 years ago
陈思洁 b3e38170e6 【1440 PLC采集工步【生产数据】】 6 years ago
汪云昊 081db93d0d Merge remote-tracking branch 'origin/dev' into dev 6 years ago
王杰 b6a83fff5d Merge branch 'dev' into test 6 years ago
王杰 0b8c3317b8 ptlpcn enum 6 years ago
zcg 3d28840bae 【新增枚举，pojo】 6 years ago
zcg b28c092ade 【新增枚举】 6 years ago
luweihao d1d52ce389 Merge branch 'dev' into test 6 years ago
luweihao 8148b1654f 补上mes枚举 6 years ago
luweihao 16879a4f20 Merge branch 'dev' into test 6 years ago
陆卫豪 a65350bbf8 Merge branch 'dev' of chungui.zhou/i3plus-pojo into dev 6 years ago
luweihao 12579c7a14 还原pom 6 years ago
luweihao b52bb02d73 task `1430` 工位扫描，产品信号监听，队列监听 6 years ago
zcg 9388e3b4f2 【pojo 冲突提交】 6 years ago
luweihao 679319635a task `1430` 工位扫描，产品信号监听，队列监听 6 years ago
陆卫豪 60ab731ffd Merge branch 'dev' of huasheng.qian/i3plus-pojo into dev 6 years ago
陆卫豪 d8d48bd913 Merge branch 'dev' of gragon.xu/i3plus-pojo into dev 6 years ago
joke lin 5ec9c55784 Merge remote-tracking branch 'pojo/dev' into dev 6 years ago
qianhs 65572b34a0 【1432 工位扫描-ESOP展示组件开发，队列组件调整】【工位扫描-ESOP展示组件开发，队列组件调整】 6 years ago
王杰 999aae6fc0 解决冲突 6 years ago
王杰 78d7861b44 Merge branch 'test' of jhforever.wang/wangjie-i3plus-pojo into dev 6 years ago
王杰 4b8cd0da38 ptlpcn enum 6 years ago
许心洁 46273325d3 动态查询：新增isQuery字段用于控制是否可作为查询条件（BUG#7675） 6 years ago
许心洁 8a98efa9a6 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
许心洁 eaed7962ab 动态查询：工厂代码可以展示在表格中但是不能作为可选查询条件（BUG#7675）+ 
3D仓库：库位和存储区新增修改的长宽高校验都去掉（BUG#7723）
 6 years ago
zcg bd82a0fba7 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago