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

2086 Commits (4fa41f2f90c44b5f9112b95e649e72ab66c7f1b5)

Author SHA1 Message Date
wynne1005 f9fa5814f6 冲突解决 5 years ago
钮海涛 310da99743 合并master代码 5 years ago
宋军超 f3cb06ba5a Merge remote-tracking branch 'origin/test' into test 5 years ago
宋军超 030343f2ce 海纳川问题修复 5 years ago
王杰 43ad04818c pom 5 years ago
王杰 0d256b3afd Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
钮海涛 b4a4c42fe0 合并master代码 5 years ago
wynne1005 b3aa6eef70 中航 均值极差 5 years ago
钮海涛 ea43d63d7e Merge remote-tracking branch 'remotes/origin/master' into test 5 years ago
王杰 3b31f9fcc8 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
王杰 d0bfa965f7 类型信息 seq 5 years ago
陈思洁 b0c3b85378 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
陈思洁 68fef2b051 【2634 19048--涂装Unpack流程！-2020-08-05】 5 years ago
joke.wang e3146c9fb4 Fix Bug #0776 5 years ago
王杰 4c9b5d087c 涂装 二箱 客户 查询工作逻辑变更 5 years ago
王杰 a2084204f0 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
王杰 41422d895e 涂装 客户 二箱 查询工单逻辑变更 5 years ago
joke.wang fd771bccf8 报功接口增加工单类型字段 5 years ago
joke.wang f6460749db jsp解析优化 5 years ago
joke.wang 84dcf36c86 Fix Bug #10708 5 years ago
joke.wang f275d70136 Fix Bug #10674 5 years ago
陈思洁 358d582209 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
陈思洁 b56cf991be 【2607 08 ext PCR-200623001需求变更-预组装】 5 years ago
王杰 5f495a1b98 产品工作中心配置 5 years ago
joke.wang 9207f20b37 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
joke.wang 09b8ccd1e3 Fix Bug #10520 5 years ago
王杰 1d86ce6429 总装打包 展示组件 列表显示封箱状态名称 5 years ago
陈思洁 406c625974 【2634 19048--涂装Unpack流程！】 5 years ago
陈思洁 c937e2aa64 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
陈思洁 ee927b7056 【2607 08 ext PCR-200623001需求变更-预组装】 5 years ago
宋军超 6db85d596b 修改海纳川问题 5 years ago
王杰 72afe6891b 料箱显示工作中心名称 5 years ago
宋军超 5e81b1f448 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
宋军超 4d816de5da 修改海纳川问题,添加PTL新逻辑关联bug:10538 5 years ago
王杰 a7c3167eef 注塑上料 5 years ago
宋军超 163c385842 修改海纳川问题 5 years ago
joke.wang 85b6067133 BI优化1 5 years ago
宋军超 ba7cdc84e5 修改海纳川问题 5 years ago
wynne1005 ef83a7aa08 是否重选更换名称 大小枪与绑定支持并发 5 years ago
wynne1005 032a7e8126 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
wynne1005 d699e88984 StationRequestBean 5 years ago
joke.wang 1cf11c4500 Fix Bug #10477 5 years ago
joke.wang 3f03b5fab5 产线表增加序号字段 5 years ago
wynne1005 a751d5a8a7 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
wynne1005 8d7b0fae6a 添加小枪日志 与不需要打枪绑定 自动跳过 5 years ago
宋军超 44b90bf639 修改海纳川问题 5 years ago
钮海涛 b437a78e31 Merge remote-tracking branch 'origin/test' into test 5 years ago
王杰 f45137db94 注塑上料 5 years ago
钮海涛 438dcacdce Merge remote-tracking branch 'origin/test' into test 5 years ago
钮海涛 53151424b9 Merge remote-tracking branch 'remotes/origin/master' into test 5 years ago
陈思洁 a5ea72f593 【新增库位实体】 5 years ago
陈思洁 a093f06edc Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
陈思洁 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
钮海涛 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
陈思洁 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
陈思洁 759cb39827 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
陈思洁 260899368d 【8685 05 2.3.3.6 队列条码打印-管理端-查、打印】 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
joke.wang 00ca9bef40 Finish Task #1960 Cost:16h 5 years ago
宋军超 56dec41ad0 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
宋军超 f5074fba08 Finish Task #1898 Cost:16h 5 years ago
陈思洁 94c7526d65 【盲检工步】 5 years ago
陈思洁 4d4469ebc9 【合并冲突】 5 years ago
陈思洁 3848c6da14 【盲检工步】 5 years ago
宋军超 febbb549fc Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
宋军超 612d768999 Start Task #1932 Cost:5h Left:3h 5 years ago
joke.wang a8241a1694 Start Task #1960 Cost:8h Left:8h 5 years ago
袁津哲 399c9c828e Fix Bug #1916,1917 5 years ago
宋军超 c2a5a17379 工步参数添加工步弹框参数字段 5 years ago
joke.wang 342e5f7ab2 Effort Task #1915 Cost:2h Left:0h 5 years ago
wynne1005 8ef3997038 还原pom 5 years ago
wynne1005 4150543cb4 Effort Task #1940 Cost:16h Left:8h 5 years ago
钮海涛 4d26c95639 Merge branch 'test' into dev 5 years ago
joke.wang d4f0ef157a Finish Task #1915 Cost:8h 5 years ago
宋军超 659b893903 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
宋军超 b05113f63c Finish Task #1887 Cost:16h 5 years ago
钮海涛 47131ff13f 修复版本问题 5 years ago
钮海涛 f392a13832 Merge remote-tracking branch 'remotes/origin/master' into test 5 years ago
袁津哲 37092cf2c5 Task1917、1916:开发关键件绑定、扭矩二合一(PF)、关键件绑定、扭矩二合一(DL)功能 5 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
 5 years ago
袁津哲 44f313abc4 Task1917、1916:开发关键件绑定、扭矩二合一(PF)、关键件绑定、扭矩二合一(DL)功能 5 years ago
宋军超 9eda1f67b7 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
宋军超 40672559e4 修改sonar--BUG类型问题 5 years ago
wynne1005 8955fd2f4d mes提测 还原pom 5 years ago
wynne1005 23754d3f18 mes提测 还原pom 5 years ago
wynne1005 81753d3260 Merge branch 'dev' into test 5 years ago
wynne1005 81b554fc8b Merge branch 'test' 5 years ago
wynne1005 0636daed51 Finish Task:1896 Cost:8h 5 years ago
陈思洁 677cc85360 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
陈思洁 b2384619d4 【1891 队列条码打印-管理端】 5 years ago
宋军超 fd9a2e6d15 Start Task #1887 Cost:8h Left:8h 5 years ago
joke.wang dd179a6d89 Fix Bug #8636 5 years ago
joke.wang 1a72c16f14 Finish Task #1890 Cost:8h 5 years ago
wynne1005 b48ba8c481 Finish Task #1876 Cost:32h 5 years ago
wynne1005 8aef23e4ad Finish Task #1876 edi webservice解析 Cost:32h 5 years ago
陈思洁 4d63f9817e Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
陈思洁 9b8342b7f5 【1865 客户JIT生产队列，自动下达定时JOB】 5 years ago
钮海涛 999a415d27 修复版本问题 5 years ago
钮海涛 b9cbf9684b Merge branch 'test' into dev 5 years ago
钮海涛 4921d55bda 修复版本问题 5 years ago
钮海涛 b303cf9a14 修复合并问题 5 years ago
钮海涛 96fdbe0e07 Merge branch 'master' into test 5 years ago
袁津哲 cad6b7ad89 Merge remote-tracking branch 'origin/dev' into dev 5 years ago
袁津哲 f50b76cd1f Task1858:电枪枪头更换计数 5 years ago
陈思洁 5b167546e4 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
陈思洁 e42641855d 【8528 收货检验-图片上传】 5 years ago
wynne1005 608aa6be90 还原pom 5 years ago
wynne1005 99d3c9d721 提测合并 还原pom 5 years ago
wynne1005 5ef88c80c0 提测合并 还原pom 5 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
 5 years ago
王杰 8e94cbb8fa pojo 序列号 5 years ago
袁津哲 8b63dea809 Merge remote-tracking branch 'origin/dev' into dev 5 years ago
袁津哲 08b03c9eb8 Task1858:电枪枪头更换计数 5 years ago
宋军超 8d2f6fb8d1 任务：【1842】-海纳川基础数据修改字段类型 5 years ago
joke.wang 88a0d6d02f 任务:[1828] 半成品绑定工步增加逻辑 5 years ago
陈思洁 8ab6e77620 【8528 收货检验-图片上传未开发】 5 years ago
宋军超 1f55c06368 任务：【1842】-海纳川通用导入添加对应工具类、实体和model 5 years ago
陈思洁 7eb72ee5d1 【调试接口回传和同步】 5 years ago
宋军超 9778561725 任务：【1842】-添加海纳川基础数据维护模块 5 years ago
陈思洁 a1c0b6ff26 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
陈思洁 1ea5b54052 【生成质检单增加是否让步字段】 5 years ago
joke.wang b741b6950b bug: [8516] 重新计算bug 1 5 years ago
王杰 786c442d55 解决冲突 5 years ago
宋军超 18e037da7f 任务：【1842】-添加海纳川基础数据的Repository 5 years ago
宋军超 af6b0ce0fd 任务：【1842】-添加海纳川5个基础数据模块的实体与枚举 5 years ago
joke.wang 0352980cde bug: [8516] 重新计算bug修复 5 years ago
钮海涛 c1241bd6c5 修复版本问题 5 years ago
钮海涛 53a421b3b9 修复版本问题 5 years ago
钮海涛 94e9b2ffec Merge remote-tracking branch 'remotes/origin/master' into test 5 years ago
王杰 029763feb1 pom 5 years ago
王杰 30fcf4f23f pom冲突 5 years ago
王杰 716e1f7df1 Merge branch 'test' into dev 5 years ago
陈思洁 9cc193c12b Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
陈思洁 d2a31eac70 【1804 质检检测-来料检验功能】 5 years ago
joke.wang 25bd05348d [serialVersionUID重复问题] 5 years ago
汪云昊 717f268c28 POJO版本号还原 5 years ago
钮海涛 281ef662b1 merge test 5 years ago
陈思洁 6fbfea417f 【1804 质检检测-来料检验功能】 5 years ago
陈思洁 aef8841223 【合并冲突】 5 years ago
陈思洁 60973a3ee0 【1804 质检检测-来料检验功能】 5 years ago
贾文涛 c4510fb121 BUG #8485,修复数据权限-查询启用禁用无效 5 years ago
宋军超 00df3134b2 任务：【1829】-更新检测单和检测单明细实体 5 years ago
joke.wang de9c901a3b [任务：1826 库存排程配置] 5 years ago
joke.wang 222ba4f8a4 [任务：1825 plc增加默认属性字段] 5 years ago
王杰 a6e9b90026 pom 5 years ago
宋军超 1f97be3078 添加检测结果报表（5个界面） 5 years ago
宋军超 82af372fc0 添加检测过程类型枚举 5 years ago
王杰 de9017ca5c 冲突 5 years ago
王杰 c68d49880c Merge branch 'dev' into test 5 years ago
王杰 7d192b36a6 pom冲突 5 years ago
joke.wang 1fec97f0c1 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
joke.wang 24806b9e2e [oee优化] 5 years ago
宋军超 78ff224fe4 删除查询供应商 5 years ago
宋军超 79e90298ef 添加供应商查询 5 years ago
宋军超 98091426f2 修改实体 5 years ago
宋军超 f302b4d5f1 修改MES_检验单实体字段 5 years ago
宋军超 e7335bb632 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
宋军超 4f5f9777a2 修改实体与model字段 5 years ago
贾文涛 f7b3250d70 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
贾文涛 abbab6bda4 数据权限-工单模块检索添加数据权限功能 5 years ago
joke.wang 664bf80434 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
joke.wang 23d1762b5b [bug: 8422 半成品标签打印bug] 5 years ago
钮海涛 da8b4db890 修复pom版本问题 5 years ago
宋军超 a1579a2484 添加过程检测报表model 5 years ago
宋军超 6d7d8de7b3 添加MES_检验单和MES_检验单明细的实体和枚举 5 years ago
宋军超 32de58277a 添加MES_检验单和MES_检验单明细的实体和枚举 5 years ago
宋军超 7ef769268d 添加MES_检验单和检验单明细实体与枚举 5 years ago
joke.wang 5fb7eecee0 [任务：1752 oee看板] 5 years ago
贾文涛 e668ef4b28 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
贾文涛 eadf0d67f8 添加数据权限处理方法 5 years ago
钮海涛 f87eeeb491 修复合并版本问题 5 years ago
钮海涛 ac268c1cbc Merge branch 'test' into dev 5 years ago
陈思洁 543f0f5c4c 【代码合并还原】 5 years ago
joke.wang b450df5754 [任务：1752工厂oee] 5 years ago
joke.wang 142f8e79c6 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
joke.wang f41cd22258 [bug: 8353 拍照采集] 5 years ago
wynne1005 63bc0b5928 merge test 5 years ago
wynne1005 46a91a13bc jis 去除rule关键字 5 years ago
wynne1005 25b2fb8e21 jis pojo 去除rule 关键字 5 years ago
陈思洁 28de0251ea 【sonar bug修改】 5 years ago
钮海涛 bbe03cc6fd 解决合并冲突问题 5 years ago
钮海涛 1b88b20e13 Merge remote-tracking branch 'origin/dev' into dev 5 years ago
钮海涛 40a87d83b3 修复合并问题 5 years ago
贾文涛 6760ed79dd 数据权限-修改启用禁用问题 5 years ago
钮海涛 005d0f7f86 修复合并问题 5 years ago
钮海涛 d74d78353d Merge branch 'test' into dev 5 years ago
钮海涛 bc269e1f71 Merge branch 'master' into test 5 years ago
王杰 1dff3327d7 任务：1733 条码模板逻辑调整 5 years ago
joke.wang 363ac22ade [任务：1750 OEE运算JOB] 5 years ago
wynne1005 1cda7e902b Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
宋军超 f9dfc8e0e2 plc地址清单添加plc类型字段(枚举)，设备台账添加作业校验模式字段(枚举) 5 years ago
wynne1005 27e4fb164b Merge branch 'dev' into test 5 years ago
王杰 724e784fe3 Merge remote-tracking branch 'i3plus-pojo/dev' into dev 5 years ago
王杰 c5d4cd7dad 生产计划编制 5 years ago
wynne1005 d925ec62bf Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
wynne1005 888d87f12e task edi 5 years ago
joke.wang f38a47cc68 [oee 定时任务] 5 years ago
贾文涛 a563537750 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
贾文涛 e63601716f 1736-MES数据权限模块开发 5 years ago
宋军超 e5e41f09e7 新增散件产品配置功能 5 years ago
陈思洁 ae156ad82f 【动态按钮--完成按钮修改mes和mespcn】 5 years ago
joke.wang 3227cfa47e [oee] 5 years ago
wynne1005 4ed1770189 Merge branch 'dev' into test 5 years ago
陈思洁 32f6215be7 【8309 产品配方导入-导入报错】 5 years ago
王杰 da1c10dc4c mes生产计划批量编制 5 years ago
曾贞一 cf12f354ae [8206 生产工单-导入失败] 5 years ago
joke.wang de7d007ef1 [获取工步sql server分组函数问题修复] 5 years ago
陈思洁 ad8255949a Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
陈思洁 be925fded9 【1693-设备状态监控看板】 5 years ago
joke.wang 60428b5bad [任务：1690 界面窗口] 5 years ago
陈思洁 22b42d710b Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
陈思洁 ff6e5ac926 【8239 生产作业-单产品扫描（数据写入有误）】 5 years ago
汪云昊 2ab9045d17 Merge remote-tracking branch 'remotes/origin/dev' into test 5 years ago
王杰 2b01efb15b mes生产计划批量编制 5 years ago
wynne1005 d5f69eeefd task 1565 发运修改 5 years ago
宋军超 92c13e5bcd 添加人员技能功能 5 years ago
wei.peng 37922cab29 POM 文件修改 
Merge remote-tracking branch 'remotes/origin/test'

# Conflicts:
#	modules/i3plus-icloud-report/pom.xml
 5 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
 5 years ago
宋军超 b96eb1b669 添加人员技能功能 5 years ago
陈思洁 2c50fceec9 【1693-设备状态监控看板】 5 years ago
陈思洁 87664b96cb 【合并冲突】 5 years ago
陈思洁 abd974f54f 【1693-设备状态监控看板】 5 years ago
钮海涛 3fbf532c84 修复pom版本问题 5 years ago
钮海涛 a1eb3c3bc2 修复pom版本问题 5 years ago
钮海涛 2e2ee2cc6c Merge branch 'test' into dev 5 years ago
钮海涛 c6d36af4c9 Merge branch 'master' into test 5 years ago
joke.wang 755fccb45e [任务：1690 产能监控看板] 5 years ago
joke.wang ee1c2131ff [任务：1716 写入产品下线记录] 5 years ago
joke.wang aa9ee803b8 [任务：1683-看板管理 展示] 5 years ago
joke.wang 795312637c [任务：1683-看板管理 计划产能] 5 years ago
joke.wang e6f3dd5c32 [任务：1683-看板管理] 5 years ago
王杰 9da9a568f5 mes 5 years ago
joke.wang 4e02acb9e3 [任务：1683-看板管理] 5 years ago
wynne1005 fb60d75eea 还原test pom 5 years ago
wynne1005 d6fe718e4c Merge branch 'dev' into test 5 years ago
qianhs 0a2d9a3d6d 【1432 工位扫描-ESOP展示组件开发，队列组件调整】【工位扫描-ESOP展示组件开发，队列组件调整】 5 years ago
joke.wang fa8e4c1b55 [任务：1683 看板管理] 5 years ago
wynne1005 64f3dcf276 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
wynne1005 cfb5aab8ea 新增工步集合 repository 5 years ago
qianhs 62883c5cc0 【1432 工位扫描-ESOP展示组件开发，队列组件调整】【工位扫描-ESOP展示组件开发，队列组件调整】 5 years ago
joke.wang 43bc24340c [料架条码打印优化] 5 years ago
wynne1005 430adb8d97 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
wynne1005 1c4050b71f 工步返回内容修改 5 years ago
王杰 74a4a1381c mes 5 years ago
joke.wang 4c637b4e83 [写入JIT发运接口表] 5 years ago
joke.wang 48ee207a8a [删除多余项] 5 years ago
joke.wang d22bd22012 [任务：客户JIT自动下达] 5 years ago
宋军超 8fe5574c67 part实体中@Column(name = "产品生产类型")改为@Column(name = "PPT_CODE") 5 years ago
陈思洁 5d8fec4938 合并冲突 5 years ago
陈思洁 7505087392 【mes 产品配方导入功能和基础数据维护】 5 years ago
王杰 0a14b533d7 任务1659 返工返修 5 years ago
曾贞一 9102a3691b Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
曾贞一 10fc6ded8d 【1558 生产工单管理-泰国需求】 5 years ago
joke.wang 280385eb20 [bug: 8092 SOP信息需求变更] 5 years ago
joke.wang 54ff0deb87 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
钮海涛 efe083a9da 修复版本号 5 years ago
宋军超 e464b4d699 删除设备备件管理相关实体 5 years ago
宋军超 89a9946432 添加设备管理相关功能 5 years ago
joke.wang b17cf60ac6 [任务：1571 生成报功数据 需求变更] 5 years ago
曾贞一 e5c275499c 【冲突解决】 5 years ago
曾贞一 255aefbcef 【1585 销售订单管理-销售订单维护】 5 years ago
wynne1005 81f05c233a Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
wynne1005 93622f5dc7 中航 开线管控 提交 5 years ago
宋军超 aac4e24113 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
宋军超 b02d7372f6 添加散件bom批量导入功能 5 years ago
joke.wang 9e0fbef169 [按钮组件代码优化] 5 years ago
wynne1005 48f94c0369 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
wynne1005 cc739eac24 task `1565` 发运pojo 5 years ago
joke.wang 99e055da3c [现场问题：111 检测项报表] 5 years ago
wynne1005 035e77c0ab Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
wynne1005 5d6588b5af task `1565` 增加发运字段 5 years ago
陈思洁 03d2ee9246 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
陈思洁 244270684d 【泰国项目】 5 years ago
wynne1005 86713a01f2 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
joke.wang 4469d92344 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
joke.wang f1baf4fdbe [麦格纳问题：111 检测项报表] 5 years ago
宋军超 8109275630 添加散件BOM导入 5 years ago
宋军超 69b620336f 散件BOM导入 5 years ago
wynne1005 15c9e7111b Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 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
 5 years ago
qianhs 20f5bfc9eb wms数据同步迁移至mes 5 years ago
陈思洁 72563a4eb5 【1597 条码打印功能新增-管理端 / 条码打印功能新增-管理端】 5 years ago
王杰 c6aefc89e7 test合并dev解决ct 5 years ago
王杰 94fed3b9b2 Merge branch 'test' into dev 5 years ago
joke.wang 3e33a7ac3a [客户jit增加JIT排序号字段] 5 years ago
wynne1005 b5ecb91399 中航四月十号 内容提交 5 years ago
joke.wang 4e8c4ae46f Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
joke.wang caf8feb374 [采集工步存入生产数据格式修改] 5 years ago
joke.wang 11adb5ff09 [麦格纳问题：111 检测项数据报表] 5 years ago
joke.wang 1d50c135ac [麦格纳问题：87 增加工单管理页面] 5 years ago
wei.peng aa1f7a2845 Merge remote-tracking branch 'remotes/origin/test' 5 years ago
钮海涛 4dee474c73 修改POM版本号 5 years ago
钮海涛 417120358c Merge branch 'test' into dev 5 years ago
钮海涛 288fb4a16b 修改POM版本号 5 years ago
陈思洁 cd810ce1fc Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
陈思洁 5a6c525d1f 【MES_生成条码模型增加时分秒字段】 5 years ago
王杰 3f3d0038e8 【任务：1608 数据监听预警配置，定时任务】 5 years ago
qianhs 2e85d99380 联调测试 5 years ago
wynne1005 dbba31670d 增加条码生产 5 years ago
wynne1005 17f6ac6609 删除重复字段 5 years ago
wynne1005 07d8e12216 commit stationrequestbean 5 years ago
wynne1005 2e177ba671 dev合并test test有修改 5 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
 5 years ago
汪云昊 8a8c3ee34d pom版本调整 5 years ago
wynne1005 763d72b128 dev合并麦格纳的test 5 years ago
joke.wang 14bb71f9f2 [料架条码打印查询修改] 5 years ago
wynne1005 581d900123 状态机model提交 5 years ago
qianhs ba4b450437 联调测试 5 years ago
wynne1005 12e31f630b Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
wynne1005 ba90a50621 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
qianhs 8c635c3557 联调测试 5 years ago
qianhs 7244fb38b1 联调测试 5 years ago
wynne1005 e289414363 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
宋军超 b3032ca8e8 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
宋军超 45dda6ea57 添加散件配置报文关系和工装明细实体 5 years ago
陈思洁 30608f886b 解决冲突 5 years ago
陈思洁 d9d2113f75 【MES_增加枚举】 5 years ago
贾文涛 492dfbff82 pom通过变量方式存在只能引用jar不能引用到项目文件的问题，暂时先还原为最初方式 5 years ago
qianhs 836a4f710d 联调测试 5 years ago
宋军超 b3cecc9481 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
宋军超 f64a543a4a 添加产品流程批量配置功能 5 years ago
王杰 cd99a63233 mes 5 years ago
汪云昊 0d75c1eac7 Merge remote-tracking branch 'remotes/origin/dev' into test 
# Conflicts:
#	modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java
 5 years ago
wynne1005 032fb350c8 queueordermodel添加构造函数 5 years ago
王杰 5fc4c6c025 mes 5 years ago
钮海涛 52a5c1e2f8 Merge branch 'test' into dev 5 years ago
qianhs 851bd1feec 联调测试 5 years ago
wynne1005 4324457b61 merge 5 years ago
wynne1005 dce52df770 组件传参给工步 5 years ago
qianhs 241ec4974b 联调测试 5 years ago
wynne1005 351ea8755e Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
wynne1005 6a36ad7601 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
zcg 83d7a618bf 按钮组件model修改 5 years ago
qianhs 3654d60214 【bug7947】PLC监听工步装队列无法显示 5 years ago
zcg 078e1a77a4 【bug 7895 PLC信息-页面需修改】 5 years ago
钮海涛 82d5332861 修复POM文件问题 5 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-预留外部拉动接口
 5 years ago
汪云昊 ec1d52e7dd MAVEN 版本控制调整 5 years ago
贾文涛 7106c06221 统一修改pom文件的项目版本问题0331 5 years ago
joke.wang 1b0d0f8c6b [任务：1576 动态按钮加载] 5 years ago
wynne1005 d1ff70adc4 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
wynne1005 44696061ee 修改pom文件为最新 5 years ago
zcg 75832427e8 【task 1539 工位扫描-按钮组件结构搭建】 5 years ago
曾贞一 bcb8dee045 【1558 生产工单管理-泰国需求】 5 years ago
wynne1005 3c08e7794f Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
贾文涛 eed24e0297 统一修改pom文件的项目版本问题 5 years ago
qianhs 3b763b45cd 【1432 工位扫描-ESOP展示组件开发，队列组件调整】【工位扫描-ESOP展示组件开发，队列组件调整】 5 years ago
joke.wang 4cb3d89ad6 [bug: 7637 生产数据ees查询修改] 5 years ago
钮海涛 c37809d5b7 合并源仓库的修改 5 years ago
wynne1005 f345ed2b2f Merge branch 'dev' into test 5 years ago
wynne1005 d80b341620 还原test pom 5 years ago
王杰 0502f6d736 【任务：1529，料架分组队列展示组件】 5 years ago
joke.wang 7a6e9b9e21 [任务：1479 料架打印] 5 years ago
陈思洁 c4032b8ed5 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
陈思洁 320969f2f0 【1527 半成品标签自动打印】 5 years ago
贾文涛 048419d823 修改打包时版本号的定义，后续可以通过mvn clean install Pdev 命令进行打包,最后dev还可以更换为test、prod、docker。 5 years ago
wynne1005 4b4bf4e433 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
钮海涛 9d5567f4a6 Merge branch 'test' into dev 5 years ago
王杰 e3a9defdab 任务1528，生成并打印门锁标签 5 years ago
wynne1005 6336ebd8e9 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
wynne1005 8b750e6a76 修改生产数据类型 5 years ago
王杰 a9a7d78bd5 解决冲突 5 years ago
joke.wang 9d55a2a8b3 [解决冲突1] 5 years ago
joke.wang 8b681af622 [解决冲突] 5 years ago
joke.wang 045dc01479 [任务：1479 料架条码打印] 5 years ago
王杰 f578311f55 数据复核 5 years ago
qianhs 564ba1e116 【1472 工步-设备状态采集（原PLC采集【设备状态】）】 5 years ago
qianhs c53999b0d2 Merge remote-tracking branch 'origin/dev' into dev 5 years ago
joke.wang 79788daf8b pom 修改 5 years ago
zcg 74e4aa953b 【任务 1480 照片采集】 5 years ago
joke lin 62cee148cd [bug: 7875 客户JIT生产工单] 5 years ago
钮海涛 9da6628884 Merge branch 'master' into test 5 years ago
陈思洁 cc207240b4 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago