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

2615 Commits (604c1443cadf32d9a67589e07bd76ca9533c4930)

Author SHA1 Message Date
王杰 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
汪云昊 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