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

429 Commits (f1baf4fdbe60482cb501b2728819c2e2a0b6ba4b)

Author SHA1 Message Date
jokelone 4cec8e8ac8 【任务：1193接口物料拆解增加工位字段】 6 years ago
王杰 1a7164c474 Merge branch 'dev' into test 6 years ago
jokelone 9ca2760866 【任务：1193接口repository】/s 6 years ago
jokelone 9842ed2181 【任务：1193接口pojo】 6 years ago
王杰 e60256e291 【需求：1167，包装特殊批次工步】 6 years ago
crish 410558d43c Merge branch 'test' 6 years ago
陆卫豪 95d8dbb908 Merge branch 'dev' of i3-IMPP/i3plus-pojo into test 6 years ago
WYnneaoapc 7ba63dc9a8 6283 打包扫描 6 years ago
陆卫豪 3fa5437c5a Merge branch 'dev' of i3-IMPP/i3plus-pojo into test 6 years ago
WYnneaoapc 37e288ff77 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 
 Conflicts:
	modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackage.java
	modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java
 6 years ago
WYnneaoapc 360f908ae4 获取生产数据 6283 6 years ago
王杰 da0478ec7e Merge branch 'dev' into test 6 years ago
王杰 ebb59cbb64 【需求:1167,批量打包】 6 years ago
jenkins c1b50db526 Merge branch 'dev' of i3-IMPP/i3plus-pojo into test 6 years ago
王杰 49637cb23f 【需求:1167,批量打包】 6 years ago
WYnneaoapc c1c00213e1 工位监控修改 6283 6 years ago
许心洁 60c25d7a71 Merge branches 'master' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo 6 years ago
许心洁 738aa2d08c Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 6 years ago
王杰 e2249ea8dd 【需求：1189，产品条码工步】 6 years ago
许心洁 ccb29c5903 Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 6 years ago
王杰 f5c8e36ac9 【需求：1189，产品条码工步】 6 years ago
王杰 649ffb548d Merge branch 'dev' into test 6 years ago
王杰 e30ba280e0 解决冲突 6 years ago
王杰 bcf3866ca6 Merge branch 'dev' into test 6 years ago
王杰 5142191f55 解决冲突 6 years ago
许心洁 208410340e Merge branches 'master' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo 6 years ago
王杰 75e7aa30c2 Merge branch 'dev' into test 6 years ago
王杰 84bf5ba64a 【需求：1162，pcn登陆】 6 years ago
王杰 acaacf63a3 Merge branch 'dev' into test 6 years ago
WYnneaoapc b4cea27a5b 代码审核 修改2 6 years ago
WYnneaoapc 56e6cf7918 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 
 Conflicts:
	modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java
 6 years ago
王杰 bc14fcf027 Merge branch 'dev' into test 6 years ago
王杰 e26dadca01 【需求：1162，pcn登陆】 6 years ago
crish c4d7a2380c Merge branch 'test' 6 years ago
jokelone 755e920513 【bug：6250 返工返修拆解优化】 6 years ago
王杰 aa2f514f6c Merge branch 'dev' into test 6 years ago
WYnneaoapc 029c9b6bc8 代码审核 修改1 6 years ago
王杰 980ae89cdf 【需求id：1162，pcn登陆】 6 years ago
许心洁 970105ac19 Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 6 years ago
王杰 b2886012a5 【需求id：1162，pcn登陆】 6 years ago
陆卫豪 46fc5f5750 Merge branch 'dev' of i3-IMPP/i3plus-pojo into test 6 years ago
WYnneaoapc 4308084ca3 数据抽取修改 1130 6 years ago
许心洁 04453aa706 Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 6 years ago
WYnneaoapc 7f9f9cb242 返工返修pojo字段更改 1092 6 years ago
陆卫豪 576f02f75d Merge branch 'dev' of i3-IMPP/i3plus-pojo into test 6 years ago
WYnneaoapc 9ad66157a8 数据同步优化 1078-4 6 years ago
jokelone 93438e1bdb Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
jokelone 21087d5d4d 【需求：1092 工序BOM和物料绑定记录模板增加构造方法】 6 years ago
王杰 2417b40635 Merge branch 'dev' into test 6 years ago
WYnneaoapc 35f625ac21 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
WYnneaoapc 563955570d 数据同步优化 1078 6 years ago
王杰 a95b6baae1 Merge branch 'dev' into test 6 years ago
jokelone 828cf66784 【需求：1090 工序BOM，物料绑定记录删除多余字段】 6 years ago
王杰 dfec2532cb Merge branch 'dev' into test 6 years ago
jokelone 4dcbcf068a 【需求：1090 产品类型图片增加字段】 6 years ago
许心洁 c9f26c22c1 Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 6 years ago
jokelone 6fd7e6be5f 【需求：1092 维修类型】 6 years ago
王杰 1846c6f4f8 Merge branch 'dev' into test 6 years ago
jokelone 438517be44 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 
# Conflicts:
#	modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java
 6 years ago
jokelone 6c847cf305 【需求：1091 返厂返修添加字段和枚举】 6 years ago
王杰 9446a76159 Merge branch 'dev' into test 6 years ago
WYnneaoapc b668879f9d Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
王杰 42ec1b3693 Merge branch 'dev' into test 6 years ago
jokelone 0011a4bc56 【需求：1089 过程检测数据 增加字段】 6 years ago
王杰 dcaf007f4d 【需求：1107，生产工单首检件】 6 years ago
WYnneaoapc 29ac92566d Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
王杰 35cf3cf162 Merge branch 'dev' into test 6 years ago
jokelone bc13a8a3ac 【需求：1090 返厂返修增加分页查询】 6 years ago
许心洁 c79786a677 合并开发分支的代码POM文件被改成DEV修改回TEST 6 years ago
WYnneaoapc 04c99167c8 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
WYnneaoapc 6de6d36e80 数据库抽取反写 1105-1 6 years ago
jokelone a5609d97fb 【1092 返厂返修增加枚举】 6 years ago
crish 18161e8191 Merge branch 'test' 6 years ago
crish 67461457fc Merge branch 'dev' into test 6 years ago
WYnneaoapc 848f6b2f23 工位监控优化 1050-6 6 years ago
WYnneaoapc c71d667d0f Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
jokelone d7f55250ef Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
jokelone 8d10a46953 (1092 MesProdBindRecordModel增加有参构造方法) 6 years ago
changjiang.gao 30007cee47 Merge branch 'dev' into test 6 years ago
WYnneaoapc c56822dc40 工位监控优化 1050-5 6 years ago
WYnneaoapc 3dbbee3c60 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
jiajack f6b06e6b52 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
jiajack aef7f7a948 增加班次顺序字段 6 years ago
许心洁 73aef5326c Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 6 years ago
jokelone 00e849a62e (1089 过程质量检测基础数据；1090 返厂返修基础数据) 6 years ago
WYnneaoapc b47f97fa05 1050-2 工位监控 6 years ago
crish 0526da8ee3 Merge branch 'test' 6 years ago
刘辉 e89df89f9a Merge branch 'dev' of i3-IMPP/i3plus-pojo into test 6 years ago
WYnneaoapc 1eca1a963a Merge remote-tracking branch 'origin/dev' into dev 
# Conflicts:
#	modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefectRecord.java
 6 years ago
WYnneaoapc 2da78c3237 idea 异常 文件格式化 + 包装扫描工步 6 years ago
jokelone 9e4930968f 解决冲突 6 years ago
jokelone 8a517bc0b9 返厂返修增加字段 6 years ago
crish 1de89d732b 本地误拉了test代码，解决pom 6 years ago
crish 9f9874902d 冲突解决 6 years ago
jokelone 7fc439319e 返厂返修 6 years ago
陆卫豪 413266293e Merge branch 'dev' of i3-IMPP/i3plus-pojo into test 6 years ago
WYnneaoapc 56d7457826 工位监控提交 6 years ago
王杰 ef3be61f66 Merge branch 'dev' into test 6 years ago
jokelone ffdb547dc7 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
jokelone 203b53d3b3 解决冲突 6 years ago
jokelone da97adcbc7 更改db地址清单名称 6 years ago
王杰 611b25abfd Merge branch 'dev' into test 6 years ago
王杰 9a6b1c4bf1 mes设备作业周期计划 6 years ago
许心洁 7863325afd 本地误拉了测试的代码，还原后提交，在测试分支拉开发分支的代码也得还原 6 years ago
许心洁 b7b78b85ac 误拉了test分支的代码：还原 6 years ago
许心洁 8deff73454 Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 6 years ago
jokelone 72bdd253fa 解决冲突 6 years ago
许心洁 a961da57ef Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 6 years ago
jokelone 104d308d30 PLC DB 设备故障 过程质量检测 6 years ago
陆卫豪 a791430fec Merge branch 'dev' of i3-IMPP/i3plus-pojo into test 6 years ago
WYnneaoapc df6f432534 1012 修改绑定关键件 和 工序bom添加isBindKey 6 years ago
许心洁 f778b15ea5 Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 6 years ago
crish 40321ed7ec Merge branch 'test' 6 years ago
crish 4e2373bdae Merge branch 'dev' into test 6 years ago
WYnneaoapc 4654fad2bd 1011 生成条码工步 6 years ago
crish 0924810e64 Merge branch 'test' 6 years ago
WYnneaoapc 60f441e685 Merge branch 'dev' into test 6 years ago
WYnneaoapc 76149da904 提交 6 years ago
WYnneaoapc 18ec7d091a Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
WYnneaoapc c9a572469c 同步限制解除 6 years ago
刘辉 60d1798b9c Merge branch 'dev' of i3-IMPP/i3plus-pojo into test 6 years ago
王杰 ddfb47e6ac mes设备台账功能开发 6 years ago
许心洁 1e41ab2e39 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo 6 years ago
许心洁 1d17198daf Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 6 years ago
WYnneaoapc 9b6887dd40 #1050 工位监控 6 years ago
王杰 72c9a5892d 修改注释 6 years ago
许心洁 e35cf183da Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 6 years ago
WYnneaoapc 82fe491bd3 #1050 工位监控 6 years ago
许心洁 7a403a37da Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo 6 years ago
jenkins 30eee05b1c Merge branch 'dev' into test 6 years ago
WYnneaoapc 766d195088 开线合并代码 6 years ago
WYnneaoapc 183fd78eac 冲突解决 6 years ago
王杰 80f50fe800 Merge branch 'dev' into test 6 years ago
王杰 804574090f pcn生产工单 6 years ago
crish 9ae6ee5016 Merge branch 'test' 6 years ago
jenkins f07764acda Merge branch 'dev' into test 6 years ago
王杰 80bad03881 mes-pcn生产工单 6 years ago
WYnneaoapc f96cbd1be3 Merge branch 'dev' into test 6 years ago
WYnneaoapc 7c472b386a 提交 6 years ago
crish f3f77e63b3 Merge branch 'test' 6 years ago
crish c47c617aab Merge branch 'dev' into test 6 years ago
王杰 8570b88761 mes生产工单 6 years ago
crish c17039ce4a Merge branch 'dev' into test 6 years ago
WYnneaoapc 4e1635fe7e Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
WYnneaoapc 9b0c5de954 提交 6 years ago
曾贞一 6c8cfd8678 Merge remote-tracking branch 'remotes/origin/test' 6 years ago
曾贞一 a4262c5e1e pom文件修改 dev改成test 6 years ago
crish b473fd1b46 pojo开发环境 pom文件修改为dev 6 years ago
crish 87f8dc38a6 测试环境 6 years ago
crish d82e025eb9 dev环境pom文件修改为dev 6 years ago
crish 52a770ad45 Merge branch 'dev' into test 6 years ago
王杰 24a31c0bdf 生产工单实体 6 years ago
于学杰 f6bb2ee21f Merge branch 'dev' into test 6 years ago
王杰 2460fbc3b4 生产计划 6 years ago
crish 23c59d4326 Merge branch 'dev' into test 6 years ago
WYnneaoapc 271a26d2b8 提交 6 years ago
crish bbfc9b320f Merge branch 'test' 6 years ago
crish 4a1ad40dfa Merge branch 'dev' into test 6 years ago
王杰 c950019077 pcn定时任务 6 years ago
jimmy.zeng ccffe9b7bd Merge remote-tracking branch 'remotes/origin/dev' into test 6 years ago
WYnneaoapc c44a99eb40 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
crish 89b0a4a68a 条码打印调试 
Signed-off-by: crish <570360737@qq.com>
 6 years ago
王杰 fe455a7147 pcn离线登陆 6 years ago
WYnneaoapc 546d9dc7a5 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
jimmy.zeng fd76f08af4 Merge remote-tracking branch 'remotes/origin/dev' into test 6 years ago
王杰 d2995520d4 mes-pcn定时任务增加字段 6 years ago
WYnneaoapc 4b982fc4fe Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
WYnneaoapc 1332f11a23 提交 6 years ago
jimmy.zeng 8f1ac3fdae Merge remote-tracking branch 'remotes/origin/dev' into test 6 years ago
crish 65cb39d7ba 工作中心代码修改 
Signed-off-by: crish <570360737@qq.com>
 6 years ago
jimmy.zeng 2e8a70d8b4 pom版本还原--pojo 6 years ago
王杰 46d220f3ec mes条码规则校验 6 years ago
crish 5e06022e51 Merge remote-tracking branch 'remotes/origin/dev' 6 years ago
王杰 8034e104c8 mes工作单元参数 6 years ago
王杰 5388c4405b mes-pcn-task表修改 6 years ago
王杰 d7ddf4d5a0 mes-pcn定时任务数据同步日志表修改类型 6 years ago
王杰 6929e88570 mes-pcn定时任务 6 years ago
曾贞一 ceac2db551 Merge remote-tracking branch 'remotes/origin/test' 6 years ago
jimmy.zeng 399a51b044 Merge remote-tracking branch 'remotes/origin/dev' into test 6 years ago
crish 71e7362216 PCN数据同步， 逻辑修改 
Signed-off-by: crish <570360737@qq.com>
 6 years ago
曾贞一 ae12af551b Merge remote-tracking branch 'remotes/origin/test' 6 years ago
jimmy.zeng 1b06c1d07f Merge remote-tracking branch 'remotes/origin/dev' into test 6 years ago
王杰 5947f88da1 mes-pcn定时任务工作清单数据同步 6 years ago
WYnneaoapc 3bedf8fb8d Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 
# Conflicts:
#	modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesNumberRuleRepository.java
 6 years ago
WYnneaoapc 953f593207 提交 6 years ago
crish f820c449bb 工步条码打印 
Signed-off-by: crish <570360737@qq.com>
 6 years ago
曾贞一 25e7ca08d3 Merge remote-tracking branch 'remotes/origin/test' 6 years ago
jimmy.zeng 59047b5b4c Merge remote-tracking branch 'remotes/origin/dev' into test 6 years ago
王杰 12f6e2c14b mes-pcn定时任务表维护 6 years ago
crish f7b366fe29 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 6 years ago
crish 12a2a27b18 mes， pcn条码打印 
Signed-off-by: crish <570360737@qq.com>
 6 years ago
曾贞一 18aff86ea0 Merge remote-tracking branch 'remotes/origin/test' 6 years ago
jimmy.zeng c901f18f89 pom版本还原 6 years ago
WYnneaoapc 2deb384cca 提交 6 years ago
曾贞一 b10b967b73 Merge remote-tracking branch 'remotes/origin/test' 6 years ago
WYnneaoapc 5e72d98ad8 提交 6 years ago
jimmy.zeng 4359f347c6 Merge remote-tracking branch 'remotes/origin/dev' into test 6 years ago
WYnneaoapc 4ff3677fba Merge branch 'test' into dev 6 years ago
WYnneaoapc 0aef9adac9 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
WYnneaoapc 1328dc7ddd #Merge branch 'dev' of http://git.estsh.com/i3-MES/i3plus-mes-pcn into dev 
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
 6 years ago