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

6874 Commits (6ab0f17ac7e6364d6901255578d1b5ea6eb3ab4a)

Author SHA1 Message Date
钮海涛 98b992408c Merge remote-tracking branch 'remotes/origin/test' into dev 5 years ago
钮海涛 4144e12b5d 合并test代码到master 5 years ago
钮海涛 92f0158dab 合并master代码 5 years ago
曾贞一 57aae56345 【2690 ext新增委外库存查询报表 -后端】 5 years ago
wynne1005 f06f51cc7e master merge test 5 years ago
rock.yu f6b812aaf8 PDA组件原生支持脚本组件 5 years ago
joke.wang b09aa27e0f 排程job 5 years ago
rock.yu 9be1dd70d5 盘点明细表 lotno 字段增加默认值 5 years ago
汪云昊 feace77fc3 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
puxiao.liao 7f91f1269c 修复MGN系列BUG 5 years ago
汪云昊 731a92fa2c Merge remote-tracking branch 'remotes/origin/dev' into test 5 years ago
汪云昊 6dc0d94085 feat:适配器添加空报文保存开关 5 years ago
汪云昊 4dc40c79dd fix:pager.startRow重复计算 5 years ago
钮海涛 3bca09c091 Merge remote-tracking branch 'origin/test' into test 5 years ago
钮海涛 8d38a297d2 三力士演示demo 5 years ago
汪云昊 7e678e747d feat:移除mongo日志持久化方法 5 years ago
puxiao.liao 36e9000710 麦格纳BUG 5 years ago
joke.wang a2eab983d9 缓存池订单池增加jit_seq字段 5 years ago
钮海涛 2133d0d7e4 Merge remote-tracking branch 'origin/test' into test 5 years ago
钮海涛 f0023a2232 三力士演示demo 5 years ago
曾贞一 c1cb461f36 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
曾贞一 a9e97d4e28 【2688 08 extPDA-查询查看零件对应库位】 
【2683 08 ext单据打印新增字段查询和显示】
【2682 08 ext单据打印新增模板选择】
 5 years ago
钮海涛 0b6764e8fe Merge remote-tracking branch 'origin/test' into test 5 years ago
钮海涛 6dd429d328 三力士演示demo 5 years ago
songss a2f257e414 Merge remote-tracking branch 'origin/test' into test 5 years ago
songss df6f0bb4f2 删除没用代码 5 years ago
songss f4d7e55f05 喷涂过程条码批量打印报错bug修复 5 years ago
陈思洁 0325e3dc95 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
陈思洁 98afecf57b 【10877 19048-预组装看板及操作工位变更调整-20200828】 5 years ago
wynne1005 a580c70c04 添加正态分布数据总数 5 years ago
wynne1005 762b73dddf 添加StepResult的返回cmd CLEAR_CACHE 5 years ago
wynne1005 9563ebeb66 normalDistribution 5 years ago
wynne1005 b4b1c2f3f8 erge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
wynne1005 0fd5989864 新增帮助类型的busiType 5 years ago
rock.yu 42187ebadc 完善流程管家日志信息 5 years ago
钮海涛 85395e84fd 合并dev代码 5 years ago
钮海涛 2013d47353 合并dev代码 5 years ago
宋军超 940510ea5b 北京海纳川、北京麦格纳问题修复 5 years ago
陈思洁 d7f8796d36 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
陈思洁 ee1b0b5b67 【2674 预装区基础页面开发】 5 years ago
puxiao.liao d63d07ad7e 麦格纳收货BUG 5 years ago
joke.wang ac55ae1df1 库存排程配置增加物料名称 5 years ago
王杰 7a502c45c9 注塑上料 展示组件增加字段 5 years ago
陈思洁 baa7d144b7 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
陈思洁 daf0b94314 【10828 19048-10827-预装作业界面优化！-2020-08-25】 5 years ago
曾贞一 3f2232d741 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
曾贞一 ec7aee68a7 【10744 20011--二维码收货时，如果该零件号设置了特殊批次，则扫描系统自己生成的二维码时永远报错“条码未维护供应商批次 执行成功请扫描二维码”，实际批次已经存在与条码最后一个字段中--0830】 5 years ago
宋军超 53d392ebe1 海纳川问题修复枪头更换添加弹框校验 5 years ago
wynne1005 ebd12f7c65 去除ProductBiModel重复字段 5 years ago
wynne1005 f9fa5814f6 冲突解决 5 years ago
wynne1005 40ec96a390 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
wynne1005 bbcd0c8f69 去除多余枚举 5 years ago
许心洁 2cc6abb902 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
许心洁 291c0b2a40 BUG#10584,BUG#10784,BUG#10785 5 years ago
钮海涛 9a41c2e2e0 合并test到dev 5 years ago
钮海涛 025cc19f68 合并dev到test 5 years ago
钮海涛 347f6671f2 合并dev到test 5 years ago
钮海涛 99b8cb146c Merge remote-tracking branch 'remotes/origin/master' into test 5 years ago
钮海涛 310da99743 合并master代码 5 years ago
wynne1005 3769a630fe Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
wynne1005 42a340d0c0 timeModuleInit 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
钮海涛 35d3a85b60 合并master代码 5 years ago
钮海涛 c7adb56b9c Merge remote-tracking branch 'origin/test' into test 5 years ago
汪云昊 8d6b01c06e Merge remote-tracking branch 'remotes/origin/dev' into test 5 years ago
钮海涛 3df3c89db9 Merge remote-tracking branch 'origin/test' into test 5 years ago
汪云昊 a52646a65d Merge remote-tracking branch 'remotes/origin/dev' into test 
# Conflicts:
#	modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java
 5 years ago
钮海涛 ea43d63d7e Merge remote-tracking branch 'remotes/origin/master' into test 5 years ago
汪云昊 dd75e3729b feat:添加条码解析校验模式 5 years ago
汪云昊 d02c73f431 Merge remote-tracking branch 'origin/dev' into dev 5 years ago
汪云昊 26cf4c5e92 feat:mongo模块化 5 years ago
汪云昊 103137e2fc feat:添加条码解析校验模式 5 years ago
汪云昊 a5d7ff1ef4 feat:添加条码解析校验模式 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
wynne1005 c3f30530a8 erge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
wynne1005 086c78f828 新增pcn页面的辅助展示组件 5 years ago
puxiao.liao 6d59e00fc5 Fix bug#10545 
10545 19081 -- 出入库界面更改 20200814
 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
puxiao.liao ba5befe291 Finish Task #2645 Cost:8h 
【PCR-20200525-003_委外出库条码变更】中的零件号转化
 5 years ago
joke.wang fd771bccf8 报功接口增加工单类型字段 5 years ago
joke.wang 6f2905de1a Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
joke.wang f6460749db jsp解析优化 5 years ago
曾贞一 d81a7bf22e 【接口映射优化】 5 years ago
joke.wang 84dcf36c86 Fix Bug #10708 5 years ago
陈思洁 d17161d359 【2658 LPS导入后端开发】 5 years ago
曾贞一 867ecc6d71 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
曾贞一 15314209ae 【2636 07 1.2.3.4.3坤泰ERP&WMS接口】 5 years ago
joke.wang f275d70136 Fix Bug #10674 5 years ago
puxiao.liao 9299f17c3b Fix bug#10671 
二维码收货扫描条码报错系统异常 --20200821
 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
曾贞一 d3ae797ba0 【坤泰接口开发】 
【质保周期检查组件--优化代码】
 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
rock.yu f1bbe0344b Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
rock.yu 5bfd542402 增加工单拉动 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
joke.wang 562ba3e339 增加按灯停机时长接口 5 years ago
曾贞一 0b09e410f5 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
曾贞一 fe2017fbe4 【622 08 1.2.2.2.6 BOM增加虚阶零件】 5 years ago
钮海涛 228d3dd2ab Merge remote-tracking branch 'origin/test' into test 5 years ago
钮海涛 841742e474 托标签收货合并到二维码收货 5 years ago
宋军超 163c385842 修改海纳川问题 5 years ago
puxiao.liao fde40074ce BUG修复 5 years ago
joke.wang 85b6067133 BI优化1 5 years ago
wynne1005 a400bf5aa7 还原orderBy 5 years ago
wynne1005 8ee28db80b Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
wynne1005 887e1d04f7 baseBean sortParamMap 先注释 5 years ago
宋军超 ba7cdc84e5 修改海纳川问题 5 years ago
wynne1005 953e243fe8 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
wynne1005 ef83a7aa08 是否重选更换名称 大小枪与绑定支持并发 5 years ago
钮海涛 9878547daa 合并dev分支代码 5 years ago
钮海涛 272c92dcb6 Merge remote-tracking branch 'origin/test' into test 5 years ago
钮海涛 f42ece4f6c 优化流程管家执行性能 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
钮海涛 2fb46609c3 sweb功能开发 5 years ago
钮海涛 ad4b59a700 Merge remote-tracking branch 'origin/test' into test 5 years ago
钮海涛 dd7347d352 Sweb功能开发 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
曾贞一 8f7a7fcc32 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
曾贞一 6ba2d2826a 【麦格纳问题】 5 years ago
汪云昊 2013ca569a Merge remote-tracking branch 'origin/dev' into dev 5 years ago
汪云昊 15aa885cf8 fix:定时任务空指针的问题 5 years ago
汪云昊 a45d1ed104 fix:分页结束行计算错误的问题 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
许心洁 9bbc387818 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
许心洁 4ec9858182 任务#2625 5 years ago
宋军超 19b1bfb9b6 修改海纳川打印 5 years ago
joke.wang 2d52fe0a40 Fix Bug #10535 5 years ago
wynne1005 3030a109b2 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
wynne1005 0d3a8a3af7 添加放行记录 5 years ago
joke.wang 89bd4f189a 项目表增加字段 5 years ago
joke.wang 74cc0c757d 成品标签打印 5 years ago
曾贞一 3c4239c66a Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
曾贞一 2bef33960c 【2617 08 1.2.2.2.4新增保质期检查组件】 5 years ago
许心洁 c0629d52d1 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
许心洁 1c02cd6562 任务#2612，2613 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
陈思洁 3baf748329 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
陈思洁 9b9871534a 【10493 19048-产品颜色无导入功能】 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
汪云昊 b4c90b01fa Merge remote-tracking branch 'origin/dev' into dev 5 years ago
汪云昊 8d17cfcec0 feat:用户定制化配置功能 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
ypf 97a2bdd60e Merge remote-tracking branch 'origin/dev' into dev 5 years ago
ypf 523d2ffc80 关于欧洲领料看板逻辑实体的添加 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
钮海涛 54b0af00cc Sweb功能开发 5 years ago
宋军超 625b780aaf 添加海纳川数据复核工步和产线状态看板变更 5 years ago
wynne1005 5d9e055fe1 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
wynne1005 3af4d32a97 mes工位运行状态 5 years ago
汪云昊 a3e8caf085 fix:detachObject为空时报错 5 years ago
宋军超 6aaa26b192 修改海纳川问题 5 years ago
joke.wang edb85b5ea6 桌面BI 5 years ago
汪云昊 55b047448b fix:会话模式为默认时出现不能正常覆盖的问题 5 years ago
宋军超 6e60bee0dd 修改海纳川问题 5 years ago
宋军超 731b1c60ee 修改海纳川问题 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
许心洁 4a9e5cbb59 Merge remote-tracking branch 'origin/test' into test 5 years ago
钮海涛 3a4c143563 Merge remote-tracking branch 'origin/test' into test 5 years ago
钮海涛 14e68803df 增加根据物料号取库存地信息的微服务接口 5 years ago
许心洁 afeb22c8ec Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
许心洁 7dcd8a1627 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
许心洁 7482a6dd74 BUG#9928 和任务#2590 5 years ago
汪云昊 410f469450 Merge remote-tracking branch 'remotes/origin/dev' into test 5 years ago
汪云昊 7f291a26cd 会话模式配置-调整默认模式 5 years ago
puxiao.liao f9061f5d27 BUG修复 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
陈思洁 ed343a8064 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
陈思洁 ba3f5fde4d 【总装、涂装、注塑计划报表】 5 years ago
qianhs 86c9bce2aa Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
宋军超 c4f40d215b Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
宋军超 fa4b1e09aa 修改海纳川问题 5 years ago
曾贞一 067a859e83 【10229 19081-- 在已有的二维码生产报工逻辑上加上原材料扣减逻辑 --20200802】 5 years ago
钮海涛 933f2014ad Merge remote-tracking branch 'origin/test' into test 5 years ago
钮海涛 39f6819e9b 修复合并版本问题 5 years ago
钮海涛 59a1acdafc 修复合并版本问题 5 years ago
puxiao.liao d5d16569bb Fix bug#10283 
20089+库存移动统计报表查询增加项目代码查询项
 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
rock.yu f368ec88cc 修改流程管家组件调用日志表 5 years ago
joke.wang 33cace48ab 半成品打印增加字段 5 years ago
qianhs c872663847 Finish Task #2080 Cost:8h 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
rock.yu 71a2b68991 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
rock.yu b928acae47 1. 流程管家增加记录组件执行耗时的功能 5 years ago
陈思洁 b662a6ebe5 Merge remote-tracking branch 'origin/test' into test 5 years ago
陈思洁 26fe63eb8a 【10278 19048-总装标记不良功能通过外部输入条码标记不良-2020-08-03】 5 years ago
汪云昊 e6ecd4f86f Merge remote-tracking branch 'remotes/origin/dev' into test 5 years ago
汪云昊 0d40470059 Merge remote-tracking branch 'origin/dev' into dev 5 years ago
汪云昊 18a09cc4b6 FTP多文件读取问题 
脚本解析功能初版
 5 years ago