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

1534 Commits (a285532d22bd862a50487b3c0bccd3dee73ab243)

Author SHA1 Message Date
陈思洁 38f9adc2dd 【10554 19048--喷涂条码打印功能不应该查询出其他车间的生产计划！-2020-08-13】 5 years ago
wynne1005 59aadc94ce Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
wynne1005 763b88b420 工位扫描添加工步触发条件 5 years ago
宋军超 19b1bfb9b6 修改海纳川打印 5 years ago
joke.wang 2d52fe0a40 Fix Bug #10535 5 years ago
joke.wang 89bd4f189a 项目表增加字段 5 years ago
joke.wang 74cc0c757d 成品标签打印 5 years ago
wynne1005 ba558d640e tmp 5 years ago
joke.wang bf902b8366 Fix Bug #10294 5 years ago
王杰 175052ebcc 报工表加质量状态 默认合格 5 years ago
王杰 1707f6b228 MesProdWorkCenter 5 years ago
汪云昊 bda160ccec Merge remote-tracking branch 'remotes/origin/dev' into test 5 years ago
joke.wang a522db04a9 过程条码增加字段vinCode 5 years ago
宋军超 84f61e65fc 修改海纳川问题 5 years ago
王杰 18dd2cbcb2 zs 5 years ago
王杰 772229b983 andon 5 years ago
王杰 9e8cb0b844 注塑 5 years ago
陈思洁 056d4390ca Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
陈思洁 4a99857248 【10414 19048 - 注塑产品消耗BOM报表！-2020-08-05】 5 years ago
joke.wang 8c2fd8a587 Fix Bug #10476 5 years ago
joke.wang f495ffed54 Fix Bug #10477 5 years ago
joke.wang 4bdd2b770b Fix Bug #10486 5 years ago
joke.wang 51f9d92d36 北京麦格纳esop展示组件修改 5 years ago
joke.wang 7c3594a870 Fix Bug #9589 5 years ago
陈思洁 e4c8431a22 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
陈思洁 653b413623 【10334 19048-MES、WMS接口JIT02中增加内部工单号！-2020-08-03】 5 years ago
宋军超 e70192d3c2 添加日志查询问题 5 years ago
宋军超 625b780aaf 添加海纳川数据复核工步和产线状态看板变更 5 years ago
wynne1005 3af4d32a97 mes工位运行状态 5 years ago
joke.wang edb85b5ea6 桌面BI 5 years ago
wynne1005 3c004324b1 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
wynne1005 6e455f5d72 reqBean 添加productSn 5 years ago
王杰 5413fc259c pcn 缺陷 5 years ago
宋军超 162e2d33d7 修改海纳川问题 5 years ago
宋军超 99787412cd Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
宋军超 8eade912c7 添加返工返修数据复核逻辑 5 years ago
陈思洁 ba3f5fde4d 【总装、涂装、注塑计划报表】 5 years ago
钮海涛 39f6819e9b 修复合并版本问题 5 years ago
钮海涛 f760b72094 Merge remote-tracking branch 'remotes/origin/test' 5 years ago
宋军超 fe79944778 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
王杰 5739ac27bb 缺陷 5 years ago
陈思洁 39ea32e37e Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
陈思洁 a01cd4d34b 【注塑计划导入功能数据优化】 5 years ago
宋军超 8bc0da924c 修改海纳川问题 5 years ago
joke.wang 33cace48ab 半成品打印增加字段 5 years ago
宋军超 0b3c53b4ca 修改海纳川问题 5 years ago
wynne1005 e35fdcbc2a Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
wynne1005 4c9cdcb6a0 tmp 5 years ago
陈思洁 26fe63eb8a 【10278 19048-总装标记不良功能通过外部输入条码标记不良-2020-08-03】 5 years ago
陈思洁 41cbe4f380 【10284 19048-注塑生产计划导入变更-20200803】 5 years ago
陈思洁 ce7ca48c4b Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
宋军超 394a332de2 修改展示组件逻辑 5 years ago
陈思洁 72c8e22433 【接口映射代码调试】 5 years ago
王杰 6c5e646d49 test merge master 5 years ago
joke.wang c060377822 中航BI 5 years ago
wynne1005 5fad38392e 添加索引 脚本表更新 5 years ago
joke.wang 05fa7dba04 Fix Bug #10227 5 years ago
joke.wang af539c85a7 mgn bug 5 years ago
宋军超 31f289e1be 修改展示组件和电检逻辑 5 years ago
贾文涛 5d19c8876b Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
陈思洁 bc2d29c006 【2547 07 1.2.4.6.1.10 PCR-200617001需求变更-生产过程不良紧急拉料】 5 years ago
贾文涛 fd42a3292a Fix Bug #10090,修复涂装二次箱条码作业完成后，一次箱条码工位数据会乱掉问题。 5 years ago
joke.wang 13f7121610 海纳川看板 5 years ago
贾文涛 70693d5b63 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
joke.wang 01ac2e85da Fix Bug #10087 5 years ago
贾文涛 8180795cd7 功能优化-打包时将工位代码存入包装表 5 years ago
王杰 7f5c1735ea 数据复核 5 years ago
joke.wang ea922affba Start Task #2522 Cost:8h Left:8h 5 years ago
王杰 306b05b4d7 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
joke.wang 3223158529 Fix Bug #10108 5 years ago
王杰 47a155e1d1 git push 5 years ago
joke.wang 2a93bb2ca4 Finish Task #2521 5 years ago
宋军超 23f33a79d1 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
宋军超 c18c22a799 修改海纳川电检测问题 5 years ago
rock.yu 35cdb1f257 完善脚本管理功能 5 years ago
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