I3_YF_SEAT
/
i3plus-pojo
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
7,299 Commits
1 Branch
0 Tags
20 MiB
Commit Graph

482 Commits (e7196c3f7fc4ed5dc1c9d2ce6fffb1c3c54b1153)

Author SHA1 Message Date
王杰 ef3be61f66 Merge branch 'dev' into test
jokelone ffdb547dc7 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
jokelone 203b53d3b3 解决冲突
jokelone da97adcbc7 更改db地址清单名称
王杰 611b25abfd Merge branch 'dev' into test
王杰 9a6b1c4bf1 mes设备作业周期计划
许心洁 7863325afd 本地误拉了测试的代码，还原后提交，在测试分支拉开发分支的代码也得还原
许心洁 b7b78b85ac 误拉了test分支的代码：还原
许心洁 8deff73454 Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
jokelone 72bdd253fa 解决冲突
许心洁 a961da57ef Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
jokelone 104d308d30 PLC DB 设备故障 过程质量检测
陆卫豪 a791430fec Merge branch 'dev' of i3-IMPP/i3plus-pojo into test
WYnneaoapc df6f432534 1012 修改绑定关键件 和 工序bom添加isBindKey
许心洁 f778b15ea5 Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
crish 40321ed7ec Merge branch 'test'
crish 4e2373bdae Merge branch 'dev' into test
WYnneaoapc 4654fad2bd 1011 生成条码工步
crish 0924810e64 Merge branch 'test'
WYnneaoapc 60f441e685 Merge branch 'dev' into test
WYnneaoapc 76149da904 提交
WYnneaoapc 18ec7d091a Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
WYnneaoapc c9a572469c 同步限制解除
刘辉 60d1798b9c Merge branch 'dev' of i3-IMPP/i3plus-pojo into test
王杰 ddfb47e6ac mes设备台账功能开发
许心洁 1e41ab2e39 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo
许心洁 1d17198daf Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
WYnneaoapc 9b6887dd40 工位监控
王杰 72c9a5892d 修改注释
许心洁 e35cf183da Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
WYnneaoapc 82fe491bd3 工位监控
许心洁 7a403a37da Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo
jenkins 30eee05b1c Merge branch 'dev' into test
WYnneaoapc 766d195088 开线合并代码
WYnneaoapc 183fd78eac 冲突解决
王杰 80f50fe800 Merge branch 'dev' into test
王杰 804574090f pcn生产工单
crish 9ae6ee5016 Merge branch 'test'
jenkins f07764acda Merge branch 'dev' into test
王杰 80bad03881 mes-pcn生产工单
WYnneaoapc f96cbd1be3 Merge branch 'dev' into test
WYnneaoapc 7c472b386a 提交
crish f3f77e63b3 Merge branch 'test'
crish c47c617aab Merge branch 'dev' into test
王杰 8570b88761 mes生产工单
crish c17039ce4a Merge branch 'dev' into test
WYnneaoapc 4e1635fe7e Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
WYnneaoapc 9b0c5de954 提交
曾贞一 6c8cfd8678 Merge remote-tracking branch 'remotes/origin/test'
曾贞一 a4262c5e1e pom文件修改 dev改成test
crish b473fd1b46 pojo开发环境 pom文件修改为dev
crish 87f8dc38a6 测试环境
crish d82e025eb9 dev环境pom文件修改为dev
crish 52a770ad45 Merge branch 'dev' into test
王杰 24a31c0bdf 生产工单实体
于学杰 f6bb2ee21f Merge branch 'dev' into test
王杰 2460fbc3b4 生产计划
crish 23c59d4326 Merge branch 'dev' into test
WYnneaoapc 271a26d2b8 提交
crish bbfc9b320f Merge branch 'test'
crish 4a1ad40dfa Merge branch 'dev' into test
王杰 c950019077 pcn定时任务
jimmy.zeng ccffe9b7bd Merge remote-tracking branch 'remotes/origin/dev' into test
WYnneaoapc c44a99eb40 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
crish 89b0a4a68a 条码打印调试 
Signed-off-by: crish <570360737@qq.com>
王杰 fe455a7147 pcn离线登陆
WYnneaoapc 546d9dc7a5 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
jimmy.zeng fd76f08af4 Merge remote-tracking branch 'remotes/origin/dev' into test
王杰 d2995520d4 mes-pcn定时任务增加字段
WYnneaoapc 4b982fc4fe Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
WYnneaoapc 1332f11a23 提交
jimmy.zeng 8f1ac3fdae Merge remote-tracking branch 'remotes/origin/dev' into test
crish 65cb39d7ba 工作中心代码修改 
Signed-off-by: crish <570360737@qq.com>
jimmy.zeng 2e8a70d8b4 pom版本还原--pojo
王杰 46d220f3ec mes条码规则校验
crish 5e06022e51 Merge remote-tracking branch 'remotes/origin/dev'
王杰 8034e104c8 mes工作单元参数
王杰 5388c4405b mes-pcn-task表修改
王杰 d7ddf4d5a0 mes-pcn定时任务数据同步日志表修改类型
王杰 6929e88570 mes-pcn定时任务
曾贞一 ceac2db551 Merge remote-tracking branch 'remotes/origin/test'
jimmy.zeng 399a51b044 Merge remote-tracking branch 'remotes/origin/dev' into test
crish 71e7362216 PCN数据同步， 逻辑修改 
Signed-off-by: crish <570360737@qq.com>
曾贞一 ae12af551b Merge remote-tracking branch 'remotes/origin/test'
jimmy.zeng 1b06c1d07f Merge remote-tracking branch 'remotes/origin/dev' into test
王杰 5947f88da1 mes-pcn定时任务工作清单数据同步
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
WYnneaoapc 953f593207 提交
crish f820c449bb 工步条码打印 
Signed-off-by: crish <570360737@qq.com>
曾贞一 25e7ca08d3 Merge remote-tracking branch 'remotes/origin/test'
jimmy.zeng 59047b5b4c Merge remote-tracking branch 'remotes/origin/dev' into test
王杰 12f6e2c14b mes-pcn定时任务表维护
crish f7b366fe29 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
crish 12a2a27b18 mes， pcn条码打印 
Signed-off-by: crish <570360737@qq.com>
曾贞一 18aff86ea0 Merge remote-tracking branch 'remotes/origin/test'
jimmy.zeng c901f18f89 pom版本还原
WYnneaoapc 2deb384cca 提交
曾贞一 b10b967b73 Merge remote-tracking branch 'remotes/origin/test'
WYnneaoapc 5e72d98ad8 提交
jimmy.zeng 4359f347c6 Merge remote-tracking branch 'remotes/origin/dev' into test
WYnneaoapc 4ff3677fba Merge branch 'test' into dev
WYnneaoapc 0aef9adac9 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
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.
曾贞一 e1cb06da5c Merge remote-tracking branch 'remotes/origin/test'
jimmy.zeng 483ea59142 Merge remote-tracking branch 'remotes/origin/dev' into test
crish 3711873c29 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
WYnneaoapc ef1450e912 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.
crish 6c37a60ff4 MES-PCN获取平台打印数据 
Signed-off-by: crish <570360737@qq.com>
曾贞一 7a62200736 Merge remote-tracking branch 'remotes/origin/test' 
# Conflicts:
#	modules/i3plus-pojo-andon/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-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
曾贞一 7ca6e46e4b Merge branch 'dev' into test
crish 6b442cda1c PCN接口开发， 数据同步配置 
Signed-off-by: crish <570360737@qq.com>
crish 76684b82c0 PCN接口开发， 数据同步配置 
Signed-off-by: crish <570360737@qq.com>
crish 0e444aa993 PCN接口开发， 数据同步配置 
Signed-off-by: crish <570360737@qq.com>
曾贞一 8b457c0618 DEV 合并 TEST pom.xml文件修改
于学杰 e7913cfb26 1. 从 TEST 合并代码后 POM 文件中引用的版本不正确，修改为 DEV
peter.pan 363d521c36 Merge branch 'test'
peter.pan d45b7b77f3 Merge branch 'dev' into test
WYnneaoapc 33a59fdb0f 0730 add esop pojo and respository
wei.peng bec3a7098d Merge remote-tracking branch 'remotes/origin/test'
jenkins 25fc477991 Merge remote-tracking branch 'origin/dev' into test
许心洁 e9b1d7e595 添加条码校验逻辑+工步跳转代码优化+数据同步BUG修改
汪云昊 c07858d5ba Merge remote-tracking branch 'remotes/origin/dev' into test
许心洁 d7ba3d445a MES数据同步-POJO调整
jenkins 28ae6cf85d Merge remote-tracking branch 'origin/dev' into test
crish e874862455 socket动态配置 
Signed-off-by: crish <570360737@qq.com>
汪云昊 a37b9b60aa Merge remote-tracking branch 'remotes/origin/dev' into test
许心洁 bdd2d05388 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
crish 6bb8d15ceb 扭矩model 
Signed-off-by: crish <570360737@qq.com>
许心洁 5e46ecfe13 MES流程配置第一次完整测试JIT队列修改
Silliter 9170083b17 Merge branch 'dev' into test
许心洁 c8008c8063 超大的一个BUG（好惨一女的）
allen.zhang 67e3851a86 Merge branch 'dev' into test
许心洁 5a044130ea MES和MES-PCN产品条码PRODUCT_SN对象属性统一+WMS流程组件去工厂
许心洁 ae4b32251a WMS【添加“重新推送未处理的移动单到队列”接口+BUG修复：定时处理错误移动单查询移动单没有加上工厂代码+QC推送队列直接放了一整个对象导致交易处理主程序无法解析】MES【JIT队列execute方法+条码校验工步】
wei.peng 5ba134126a Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
yiming.gu a558020d32 pcn新增封装查询条件sqlpack
yiming.gu ef09b0f41b model取消对mes、andon的引用
jenkins fef940bcda Merge remote-tracking branch 'origin/dev' into test
jiajack c8a9edab64 质量判定业务修改
allen.zhang 9eb207145c Merge branch 'dev' into test
jiajack ebfee3d774 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
jiajack d3d25f0baa Pcn节点向Mes主服务注册机制代码编写
allen.zhang a152d8d565 Merge branch 'dev' into test
crish dac82b1977 修改报错 
Signed-off-by: crish <570360737@qq.com>
allen.zhang d714733a27 Merge branch 'dev' into test
许心洁 37aa342f46 MES-JIT队列组件前端调试BUG
许心洁 9200080178 MES-POJO添加产品配置名称，产品类型名称作为冗余字段
许心洁 bb14454170 MES—POJO实体复制+Dao层少了@Service注释+任务生成详细日志+交易处理组件：出入库：目的库位的数量累加依据改为目的质量状态
汪云昊 68c8c62542 Merge remote-tracking branch 'remotes/origin/dev' into test
crish d0840978de PLC数据采集优化 
Signed-off-by: crish <570360737@qq.com>
allen.zhang 44abb90fe4 Merge branch 'dev' into test
jiajack 21f6d4eaf8 PLC配置
Silliter ac42a9eb37 Merge remote-tracking branch 'remotes/origin/dev' into test
crish 5841ae2ed2 错误文件修改 
Signed-off-by: crish <570360737@qq.com>
crish 7caec34dad PLC设备配置实体 
Signed-off-by: crish <570360737@qq.com>
allen.zhang 440083b5f2 Merge branch 'dev' into test
crish 018d4a0404 PLC数据采集实体 
Signed-off-by: crish <570360737@qq.com>
crish e22ecf30ef 添加字段 
Signed-off-by: crish <570360737@qq.com>
crish 52d27b663b 扭矩采集 
Signed-off-by: crish <570360737@qq.com>
yihang.lv 11d42b3221 Merge branch 'dev' into test
jiajack 9be4b8a7d0 工位程序业务编写
jenkins a7833ea9dd Merge remote-tracking branch 'origin/dev' into test
jiajack 2617793d0f Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
jiajack 83fb4ab8c0 工位程序业务编写
allen.zhang 5f5b3b84bd Merge branch 'dev' into test
crish 28caf8bf4c Merge remote-tracking branch 'origin/dev' into dev
crish 275a991593 实体属性不正确 
Signed-off-by: crish <570360737@qq.com>
yiming.gu 486dda639f pcn队列pojo vin字段改为string型
yunhao.wang 6ebc22e6cc master分支配置调整
wei.peng 521f474753 Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-block into test 
# Conflicts:
#	modules/i3plus-block-form/src/main/resources/application-test.properties
#	modules/i3plus-block-report/src/main/resources/application-test.properties
合并代码 发版修改配置 - Pw
2019-5-8 20:53:28
jiajack 9137fe9c4f 工位程序业务编写
jiajack 038484e7ac 工步调度业务完善
yiming.gu a1a63c2247 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
yiming.gu feace14920 PCN同步MES主数据
jiajack 78c3ff3a47 工步调度业务完善
jiajack 6da4a6f33c 新增获取组织相关的业务
jiajack 8227353cbd 工位程序编写
jiajack 44241bb51b 添加实体Repository类
jiajack a64323fb0d 添加对象
jiajack 3a5f43f97b 删除iml文件
alwaysfrin ea2eb6103d 优化调整
alwaysfrin 1dcdf36537 添加mes、mes-pcn、sweb三个微服