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

1509 Commits (f19ee854beba622c3d610c6a4ad94c5cf4c8f82e)

Author SHA1 Message Date
rock.yu eef7ed9c32 调整 pojo 引用关系， mes-pcn-pojo 已废弃 5 years ago
宋军超 f0fd8da49c 修改海纳川问题 5 years ago
joke.wang e5d54d8c0a 工位BOM增加预警字段 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
宋军超 5fa18e05f1 修改中航问题 5 years ago
钮海涛 b04ef3caa4 合并TEST分支代码 5 years ago
钮海涛 ef40f20e1d 解决合并冲突 5 years ago
钮海涛 3c22c8e3f4 test版本合并到master 5 years ago
宋军超 457cb894db 添加工位队列信息功能 5 years ago
陈思洁 2636e43b9b 【9914 天津】 5 years ago
joke.wang c90a009e66 Fix Bug #9874 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
王杰 41ff729f99 workorderlog 5 years ago
宋军超 933e9efb3d Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
宋军超 3a31ccae70 队列明细添加临时字段 5 years ago
贾文涛 a577eac60a 修复缓存redis时，忽略ModuleServer对象。 5 years ago
wynne1005 f3a13522a1 解决冲突 5 years ago
wynne1005 3ba1c8ee62 新增组件类型枚举 5 years ago
joke.wang a1af94fe70 Fix Bug #9760 5 years ago
宋军超 076c6c1b4f 扭矩二合一查询关键件清单逻辑优化--目前根据 队列主表，队列明细表，车型散件配置清单，物料信息表。加上条件【一百位条码】,年度型相同，车型相同 内联查出所有的关键件零件——>查询车型散件配置清单中的零件信息 
工位监控逻辑修改:产线添加工位监控模式字段，为空或10执行之前逻辑，为20时不需要查询工单信息，后面逻辑不变
 5 years ago
wynne1005 194f49ca11 agv停车信号 工位重做 倒计时 1 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
宋军超 1ac8fae269 修改枪头更换逻辑 5 years ago
宋军超 a25df616e3 修改展示组件，添加查询队列刷新时间；修改PLC标签地址查询条件 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
陈思洁 1d799ed294 2447 中航 扣减错误信息保存 5 years ago
joke.wang 8f7d6d46af Fix Bug #9457 5 years ago
王杰 9b6be3167d dev merge test 5 years ago
王杰 d2ff83e22b test merge dev 5 years ago
王杰 411fdbaa7d Merge branch 'test' into dev 5 years ago
王杰 7533a3ef44 [任务2408] 5 years ago
陈思洁 ffbf18944c Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
陈思洁 f5b4c666bf 【天津bug修改 9627,9615,9614,9610,9585,9445,9439,9428,9421,9401】 5 years ago
钮海涛 37a12c0cdf Merge remote-tracking branch 'remotes/origin/test' into dev 5 years ago
wynne1005 3f8789332f Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
wynne1005 1252027685 dl小枪 5 years ago
joke.wang b69fcdc0c6 Finish Task #2399 Cost:6h 5 years ago
王杰 e1b3b14a36 test merge dev 5 years ago
宋军超 448bd77b81 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
宋军超 538b224f67 新增计划外条码识别上线-PCR功能 5 years ago
wynne1005 cc4d17a81f 大枪ok bug 9492 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
wynne1005 25382f0265 Fix Bug #2357,2358 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
王杰 cff90316a5 ptl 5 years ago
宋军超 3d7b43a7de 修改测试天津问题bug 5 years ago
陈思洁 4137fe1a80 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
陈思洁 ba35d0a24b 【新增客户标签模板字段】 5 years ago
王杰 82158d8283 [bug 9238 9096] 5 years ago
joke.wang cdf8c79cce Fix Bug #9408 5 years ago
wynne1005 79fb42e149 MES_PROD_BIND_RECORD添加mdt索引 5 years ago
宋军超 bd251113a7 涂装展示组件添加显示实际包装数量 5 years ago
宋军超 6440fd2dfe 首检、巡检报表新增工单号、产线和产品条码查询条件 5 years ago
wynne1005 a84186e023 中航审核发布 5 years ago
宋军超 716f0ac1f9 对象结构添加是否显示和显示顺序字段 5 years ago
宋军超 93d7b4dac8 首检、巡检查询添加产品条码、工单号、物料号、产线 搜索条件 5 years ago
宋军超 f032b6ddcd 首检、巡检查询添加产品条码、工单号、物料号、产线 搜索条件 5 years ago
钮海涛 6033695b99 修复合并版本问题 5 years ago
wynne1005 085f15427d 还原pom 5 years ago
wynne1005 cb4bf9f453 merge andon pom 5 years ago
wynne1005 dfa993b9e9 还原pom 5 years ago
宋军超 e5f3c553ec bug 9122, 展示组件，配置产品位置参数，如果需要显示多个位置，使用逗号间隔。Fix Bug #9122 
bug 9268, 工位BOM查询报错。Fix Bug #9268
bug 9270, 工位BOM查询报错。Fix Bug #9270
bug 9271, 工位BOM查询报错。Fix Bug #9271
所有展示组件添加工步区域缩进功能
 5 years ago
wynne1005 15f0a37508 还原pom 5 years ago
陈思洁 6bc9aa1f70 2092 MES202006-首检、巡检检验单据生成逻辑变更-20200615 5 years ago
王杰 9b56c6d9bf 【任务2223】 5 years ago
陈思洁 556f112ef8 Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo 5 years ago
陈思洁 49f0c0c33a 2092 MES202006-首检、巡检检验单据生成逻辑变更-20200615 5 years ago
王杰 46261119d9 mes 5 years ago
joke.wang 4bb5dbfac5 Finish Task #2236 Cost:8h 5 years ago
joke.wang f8c6247137 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
joke.wang 44e3d667b3 订单池枚举 5 years ago
袁津哲 257fb6c515 Merge remote-tracking branch 'origin/dev' into dev 5 years ago
袁津哲 315e3a266f 优化涂装上线功能 5 years ago
joke.wang 7457e27180 解决冲突 5 years ago
joke.wang 12478a6251 解决冲突 5 years ago
joke.wang 76e3fb0811 Finish Task #Finish Task #2236 5 years ago
wynne1005 445668a9b2 调整jitseq字段类型 5 years ago
wynne1005 1bc846454e Merge branch 'test' into dev 5 years ago
wynne1005 98849d3131 调整jitseq类型 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
宋军超 2d39282521 修改涂装逻辑 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
王杰 7517a11a90 [任务：2223] 5 years ago
joke.wang ab0ae20d40 Finish Task #2234 客户JIT预装队列 5 years ago
宋军超 59c79b5134 TASK 2205, 开发对接涂装二次箱条码打印。Finish Task #2205 Cost:24h 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
wynne1005 6956259496 EDI Finish Task #2215 Cost:48h Left:0h 5 years ago
钮海涛 32eb9dc797 修复合并版本问题 5 years ago
钮海涛 9dca27259e Merge branch 'test' into dev 5 years ago
joke.wang fff94902f7 Fix Bug #9203 5 years ago
wynne1005 614582ce36 条码表增加乐观锁 5 years ago
wynne1005 aaf9f8a21b 添加乐观锁 日志 5 years ago
wynne1005 1fb2f07ca3 edi 添加队列字段 5 years ago
袁津哲 9361512fb8 Merge remote-tracking branch 'origin/dev' into dev 5 years ago
袁津哲 b1dddb62d3 开发涂装检查工位和一次、二次箱条码Un-Pack-后端开发业务逻辑 5 years ago
王杰 473ebd5ec8 [任务：2219] 5 years ago
wynne1005 d2869dc31a tmp 5 years ago
joke.wang aabd7b5d1d Fix Bug #9112 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
钮海涛 0626d6f969 修复版本问题 5 years ago
钮海涛 e42ea19f37 修复版本问题 5 years ago
钮海涛 8d4c5f3cd4 Merge branch 'test' into dev 5 years ago
王杰 272d647073 【任务2219】 5 years ago
钮海涛 2478fc3b14 修复版本问题 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
wynne1005 3b5142a1f8 edi 5 years ago
宋军超 6f454c95a4 Start Task #2212,2205 Cost:8h Left:16h 5 years ago
宋军超 c44e6ac965 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
袁津哲 e3a86fdbab 涂装条码打印、涂装上线功能联调 5 years ago
joke.wang cf1020d82f 删除@Lob 5 years ago
joke.wang 2829bb5afb pcn同步对象映射 5 years ago
wynne1005 8ae7ce53b7 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
宋军超 a757d2c339 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
joke.wang 2ce2e20c0b 包装扫描数量计算有误修复 5 years ago
袁津哲 f607860c57 Fix Bug #8845 
修改关键零部件绑定的数据列中增加带绑定条码的长度、特征码内容bug
 5 years ago
袁津哲 aaaa591be4 优化关键条码绑定逻辑 5 years ago
wynne1005 cf1edee02e edi 5 years ago
王杰 15e7f2a0b5 pom 5 years ago
王杰 ea5a069eeb pom 5 years ago
王杰 ed64d12875 pojo 5 years ago
宋军超 712f1e8d3d Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
宋军超 9218ca44a7 产品条码表添加生产批次lotNo 5 years ago
joke.wang b32136f75d Fix Bug #9078 5 years ago
王杰 f3ffdc7d4c dev merge test 5 years ago
王杰 2c16efcb72 Merge branch 'test' into dev 5 years ago
王杰 7d5d36d084 test merge master 5 years ago
王杰 70d58be136 pom 5 years ago
王杰 91d0ec1671 Merge branch 'master' into test 5 years ago
袁津哲 3247ef5ed7 优化涂装上线工位展示组件逻辑 5 years ago
宋军超 fe05a76f6f 添加涂装功能实体字段与model 5 years ago
袁津哲 66b98dd6d5 1.开发涂装上线功能逻辑 
2.开发涂装工单条码打印逻辑
 5 years ago
宋军超 68fa329701 添加涂装打印实体 5 years ago
陈思洁 5431d09073 【8983 需求调整-泰国MES，工单下达逻辑调整】 5 years ago
wynne1005 c8178975af StationRequestBean添加状态机代码 5 years ago
钮海涛 44ba68bb04 Merge remote-tracking branch 'origin/dev' into dev 5 years ago
钮海涛 d08465dd38 修复版本问题 5 years ago
陈思洁 80e0ec63bb Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
陈思洁 498d6821a1 【2145 06 1.2.4.6.1.1 注塑计划排产】 5 years ago
钮海涛 800a954b7f Merge branch 'test' into dev 5 years ago
王杰 c2a6fb1684 [任务2186 涂装导入] 5 years ago
陈思洁 1f6af14316 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
陈思洁 0d81228ce7 【2145 06 1.2.4.6.1.1 注塑计划排产】 5 years ago
joke.wang 1f05cfca4c Finish Task #2152 Cost:16h 5 years ago
袁津哲 a4820f236e Merge remote-tracking branch 'origin/dev' into dev 5 years ago
袁津哲 3d88913343 物料表中新增标准包规数量字段 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
王杰 8cf6e99cf6 mes 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
wynne1005 64b00d6717 接口表添加产品条码 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
袁津哲 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
王杰 0388c36c41 mes 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
袁津哲 2546395b8d 优化定时倒计时组件逻辑和前后端调用逻辑 5 years ago
袁津哲 089f655cfe 优化工位定时组件调用逻辑 5 years ago
wynne1005 8ff96a0c3f merge master 防止冲突更多 5 years ago
joke.wang ab8ee21c66 Finish Task #2139 Cost:8h 5 years ago
wynne1005 b0b07437d6 还原pom 5 years ago
袁津哲 b114daed3f 优化代码 5 years ago
wynne1005 9571604351 Merge branch 'dev' into test 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
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
袁津哲 5ee4fd6441 开发MES产线AGV停机记录报表功能 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
宋军超 247589fc0d Fix Bug #8884 5 years ago
wynne1005 40d921ddd6 优化 新增状态点类型，发运自测1 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
宋军超 d18beff50c Finish Task #2094 Cost:16h 5 years ago
钮海涛 7982cefc1e Merge branch 'test' into dev 5 years ago
钮海涛 2f8b0ba5db 修复版本问题 5 years ago
钮海涛 a71d7a31ce Merge branch 'master' into test 5 years ago
袁津哲 fb4bf4cbe2 Fix Bug #8778 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
wynne1005 86363b2012 Finish Task #2098 Cost:8h 5 years ago
宋军超 1ce748eecb Fix Bug #8771 5 years ago
宋军超 3c53d8a2f2 Finish Task #2064 Cost:24h 5 years ago
陈思洁 9f6ecf72a0 【2002 泰国内饰生产作业-按生产工单，单件生产】 5 years ago
袁津哲 7aaa8bca6d 合并dev分支代码到test分支 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
曾贞一 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
陈思洁 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
袁津哲 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
陈思洁 1102513fb7 【1926 盲检工步】 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