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

6178 Commits (46261119d950f370a1c467ad1c9cae6ea5b90c81)

Author SHA1 Message Date
钮海涛 e340749f87 Finish Task #2196 Cost:4h 5 years ago
puxiao.liao eeaaa74d1e Merge remote-tracking branch 'origin/dev' into dev 5 years ago
puxiao.liao 0818778346 自动化策略主表 5 years ago
宋军超 819bd7aba8 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
王杰 8cf6e99cf6 mes 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
曾贞一 68c3f087dc 【2180 06 1.2.3.8泰国WMS－生产报工接口】 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
袁津哲 edae2b00f6 Fix Bug #8996,#9033 
1.PCN同步配置界面同步方式及同步类型显示为空-0617
2.原材料上线扫描显示数量不正确
 5 years ago
puxiao.liao 0c0d43cd96 北京海纳川：采购入库组件 5 years ago
wynne1005 64b00d6717 接口表添加产品条码 5 years ago
汪云昊 3c2462c1af Merge remote-tracking branch 'origin/dev' into dev 5 years ago
汪云昊 fdd5516a0f FTP适配器优化 
表单功能优化
UA 适配 LONG类型
 5 years ago
陈思洁 b65d9e0f3d 2171 首检生成逻辑调整 5 years ago
wynne1005 b0df686091 Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo 5 years ago
wynne1005 878acb869f 提交zh修改问题 5 years ago
袁津哲 c066820b18 Fix Bug #9001 
关键件绑定异常问题
 5 years ago
曾贞一 a4fd88f237 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
曾贞一 a59fa1bf9b 【2078 06 1.2.3.9拣货策略-新增拣货推荐组价】 5 years ago
袁津哲 cb69f62c63 Fix Bug #8886 
原材料上线扫描，无法看到原材料已扣减数量和剩余数量
 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
袁津哲 212dccad6c 同前端联调倒计时组件逻辑 5 years ago
wei.peng ec3febfaa9 Merge remote-tracking branch 'remotes/origin/dev' into test 5 years ago
陈思洁 67a7904024 【泰国演示问题修复】 5 years ago
曾贞一 26e3053ecc Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
曾贞一 99f1ba98b6 【2077 06 1.2.3.8上架策略-4.5 新增上架推荐组件】 5 years ago
汪云昊 676ab32cd6 Merge remote-tracking branch 'origin/dev' into dev 5 years ago
汪云昊 0ea80a0f63 删除无用代码 
测试环境开关回滚
 5 years ago
袁津哲 2546395b8d 优化定时倒计时组件逻辑和前后端调用逻辑 5 years ago
wei.peng 4208d39e3f feat(密码规则验证完成): 用户登录,密码修改 5 years ago
wei.peng bdb5e6e27c 密码策略完成 5 years ago
袁津哲 089f655cfe 优化工位定时组件调用逻辑 5 years ago
袁津哲 638c032d95 优化工位定时组件调用逻辑 5 years ago
wynne1005 8ff96a0c3f merge master 防止冲突更多 5 years ago
puxiao.liao 3fe454da39 Fix bug#8909 5 years ago
joke.wang ab8ee21c66 Finish Task #2139 Cost:8h 5 years ago
钮海涛 e457b50145 中航需求变更 5 years ago
袁津哲 b114daed3f 优化代码 5 years ago
汪云昊 2888e5b510 错误注解 5 years ago
汪云昊 4ec71681de Merge remote-tracking branch 'origin/dev' into dev 5 years ago
汪云昊 4de301bf79 MDM 系统结构优化 
单元测试开关
 5 years ago
王杰 6c47817bfe mes enuk 5 years ago
joke.wang 6f375edf9a 类型信息枚举增加样本类型 5 years ago
joke.wang 26d7701a49 包装扫描需求变更 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
joke.wang f5452667f6 Start Task #2139 Cost:16h Left:8h 5 years ago
joke.wang 672483245c Fix #Bug 8904 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
曾贞一 27cb1dddfe 【1603 委外扣减查询-需求变更】 5 years ago
袁津哲 5ee4fd6441 开发MES产线AGV停机记录报表功能 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 de08f2005e 还原hqlpack 5 years ago
joke.wang cb4fd979e1 包装字段修改 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 d969c07317 解决冲突 5 years ago
wynne1005 4eef0f8c45 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
宋军超 c9114c9dae Fix Bug #8688 5 years ago
王杰 a495d0b4ce 物料校验项] 5 years ago
钮海涛 9f349cd42c Merge remote-tracking branch 'origin/test' into test 5 years ago
钮海涛 9dd7c54678 修复启动问题 5 years ago
宋军超 247589fc0d Fix Bug #8884 5 years ago
袁津哲 adb974d874 合并test分支代码到dev分支 5 years ago
wynne1005 40d921ddd6 优化 新增状态点类型，发运自测1 5 years ago
袁津哲 142033f1ac Merge remote-tracking branch 'origin/test' into test 5 years ago
袁津哲 0504e58f95 Fix Bug #8778 5 years ago
puxiao.liao 328967ff06 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
puxiao.liao 2194715705 Fix bug#8736 5 years ago
qianhs f4ca720ce4 Finish Task #2080 Cost:8h 5 years ago
王杰 1d775acd69 ptl IF_拣货数据 5 years ago
joke.wang 28fe4a03f8 Finish Task#2108 Cost:12h 5 years ago
puxiao.liao 2b791901d2 Fix bug#8876 5 years ago
王杰 e063608cb1 ptl IF_拣货数据 5 years ago
王杰 be9f9e843d Merge remote-tracking branch 'i3plus-pojo/dev' into dev 5 years ago
王杰 9675274a0d ptl 5 years ago
钮海涛 93dd90363e Merge remote-tracking branch 'origin/test' into test 5 years ago
钮海涛 ae805a6596 修复Bug 5 years ago
钮海涛 16574b6920 Merge remote-tracking branch 'origin/test' into test 5 years ago
钮海涛 da454b3921 领料单界面显示erp单号问题 5 years ago
袁津哲 42f43c58f5 Fix Bug #8778 5 years ago
袁津哲 32ddc567a0 Start Task #2021 Cost:24h Left:0h 
Finish Task #2021 Cost:24h
 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
puxiao.liao 3173e43245 Fix bug#8742 5 years ago
钮海涛 a71d7a31ce Merge branch 'master' into test 5 years ago
钮海涛 8ec9f1b137 Merge remote-tracking branch 'origin/test' into test 5 years ago
钮海涛 471208d051 SWEB添加条码状态枚举 5 years ago
王杰 c39c9b6f70 ptl 5 years ago
袁津哲 12457efe93 Merge remote-tracking branch 'origin/test' into test 5 years ago
袁津哲 fb4bf4cbe2 Fix Bug #8778 5 years ago
钮海涛 97fb0bfd29 Fix Bug #8823 5 years ago
joke.wang 1afa60623c Finish Task #2090 Cost:16h 5 years ago
陈思洁 1cedf2b75b Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo 5 years ago
陈思洁 47904278c5 2092 MES202006-首检、巡检检验单据生成逻辑变更-20200615 5 years ago
汪云昊 2f71b79ed8 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
汪云昊 b9a619f4fe REST调整添加requestBody支持 5 years ago
汪云昊 fb603db58e 表单拾取功能 5 years ago
汪云昊 2f01b41c1e 定时任务控制台日志 5 years ago
汪云昊 79429024cf MDM基础功能 5 years ago
汪云昊 08c52dc09f 文件服务器优化扩展 
添加go-fastdfs支持
 5 years ago
puxiao.liao 5c40073169 喜德BUG 修改 5 years ago
wynne1005 86363b2012 Finish Task #2098 Cost:8h 5 years ago
puxiao.liao 47a318f238 喜德BUG 修改 5 years ago
宋军超 1ce748eecb Fix Bug #8771 5 years ago
puxiao.liao bcb70400eb Finish Task #2027 Cost:10h 5 years ago
puxiao.liao 2133908ff5 Finish Task #2024 Cost:8h 5 years ago
袁津哲 de48c90800 Merge remote-tracking branch 'origin/dev' into dev 5 years ago
袁津哲 7f0b99297f Start Task #2019 Cost:16h Left:0h 
Finish Task #2019 Cost:16h
 5 years ago
宋军超 3c53d8a2f2 Finish Task #2064 Cost:24h 5 years ago
钮海涛 f301abbd04 Merge remote-tracking branch 'origin/test' into test 5 years ago
钮海涛 fd45d66968 解决合并冲突 5 years ago
陈思洁 01363fde23 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
陈思洁 9f6ecf72a0 【2002 泰国内饰生产作业-按生产工单，单件生产】 5 years ago
joke.wang f357293ca5 plc数据类型修改 5 years ago
钮海涛 52e0d840af Merge remote-tracking branch 'origin/test' into test 5 years ago
钮海涛 5a0fea01ca 修复版本问题 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
曾贞一 8476ae75c9 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
曾贞一 a2ef35082e 【1794 天津麦格纳WMS-报表-库位利用率看板】 5 years ago
王杰 b946ca7fa1 [任务：2066，状态机异常处理] 5 years ago
puxiao.liao e57acfacee BH BUG 修改 5 years ago
钮海涛 414b811871 修复启动问题 5 years ago
puxiao.liao 454de274c7 Fix bug#8780 5 years ago
puxiao.liao 71d729b7f5 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
puxiao.liao 16f1ed34a5 Fix bug#8780 5 years ago
王杰 6232d14e61 [任务：2066，状态机异常处理] 5 years ago
qianhs 5c31f6c54e Merge remote-tracking branch 'origin/test' into test 5 years ago
qianhs 6d4a1b6975 BH-CODE 出库，绑定 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
宋军超 3c1f8cf6b1 Finish Task #1889 Cost:24h 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
曾贞一 36f9068e4c 【冲突】 5 years ago
曾贞一 4c3571182c 【冲突】 5 years ago
曾贞一 523e4b7b3b 【2016 BH-回传检测结果至MES系统】 5 years ago
陈思洁 35fdc95250 Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo 5 years ago
陈思洁 0727370002 8660 MES-202005-PCN首检、巡检需要支持扫描产品条码录入检测值-20200527 5 years ago
wei.peng d753bdc5b6 fix(数据层): 数据库操作根据AOP对DAO的方法进行分切数据源 5 years ago
wei.peng adb95f100f Ics 日志收集功能完成 5 years ago
wei.peng 1a079a1b89 feat(自定义报表): 自定义样式功能开发 
1. Pojo 实体创建
2. Service 实现唯一校验
3. 使用CRUD Controller 实现API 接口
 5 years ago
陈思洁 2efab3b0cc Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
陈思洁 01e7224d1e 【合并冲突】 5 years ago
钮海涛 7414b76d85 修复合并版本问题 5 years ago
钮海涛 32a566be93 Merge branch 'test' into dev 5 years ago
钮海涛 6061f89d43 修复合并版本问题 5 years ago
宋军超 433a6cf744 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
宋军超 570be85b8d Fix Bug #8744 5 years ago
puxiao.liao d3f2434aa0 Fix bug#8752,8753 5 years ago
袁津哲 1e29445697 Merge remote-tracking branch 'origin/dev' into dev 5 years ago
袁津哲 868e82d83a Start Task #2019 Cost:16h Left:0h 
Finish Task #2019 Cost:16h
 5 years ago
陈思洁 4950cc1067 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
陈思洁 1102513fb7 【1926 盲检工步】 5 years ago
曾贞一 7134bad17f Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
曾贞一 b2d9741453 【2009 天津麦格纳WMS-报表-库位利用率】 5 years ago
钮海涛 75e744e07e Merge remote-tracking branch 'origin/dev' into dev 5 years ago
钮海涛 7b83f8fa50 新增aps序列化id 5 years ago
汪云昊 a4ba058ee3 表单查询条件 
Rest是适配器 requestBody
 5 years ago
曾贞一 6e70e3257b 【2009 天津麦格纳WMS-报表-库位利用率】 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
钮海涛 5643f1aab4 Merge remote-tracking branch 'origin/test' into test 5 years ago
陈思洁 76b96540ca 【1926 盲检工步】 5 years ago
陈思洁 dda5a4c7e9 【合并冲突】 5 years ago
陈思洁 55de940f7c 【1926 盲检工步】 5 years ago
陈思洁 bbef19ed71 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
陈思洁 f6cd0b6b0b 【8685 05 2.3.3.6 队列条码打印-管理端-查、打印】 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