crish
|
6c37a60ff4
|
MES-PCN获取平台打印数据
Signed-off-by: crish <570360737@qq.com>
|
6 years ago |
 曾贞一
|
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
|
6 years ago |
|
曾贞一
|
7ca6e46e4b
|
Merge branch 'dev' into test
|
6 years ago |
|
crish
|
6b442cda1c
|
PCN接口开发， 数据同步配置
Signed-off-by: crish <570360737@qq.com>
|
6 years ago |
|
crish
|
76684b82c0
|
PCN接口开发， 数据同步配置
Signed-off-by: crish <570360737@qq.com>
|
6 years ago |
|
crish
|
0e444aa993
|
PCN接口开发， 数据同步配置
Signed-off-by: crish <570360737@qq.com>
|
6 years ago |
|
曾贞一
|
8b457c0618
|
DEV 合并 TEST pom.xml文件修改
|
6 years ago |
于学杰
|
e7913cfb26
|
1. 从 TEST 合并代码后 POM 文件中引用的版本不正确，修改为 DEV
|
6 years ago |
peter.pan
|
363d521c36
|
Merge branch 'test'
|
6 years ago |
|
peter.pan
|
d45b7b77f3
|
Merge branch 'dev' into test
|
6 years ago |
WYnneaoapc
|
33a59fdb0f
|
0730 add esop pojo and respository
|
6 years ago |
wei.peng
|
bec3a7098d
|
Merge remote-tracking branch 'remotes/origin/test'
|
6 years ago |
jenkins
|
25fc477991
|
Merge remote-tracking branch 'origin/dev' into test
|
6 years ago |
许心洁
|
e9b1d7e595
|
添加条码校验逻辑+工步跳转代码优化+数据同步BUG修改
|
6 years ago |
汪云昊
|
c07858d5ba
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
许心洁
|
d7ba3d445a
|
MES数据同步-POJO调整
|
6 years ago |
|
jenkins
|
28ae6cf85d
|
Merge remote-tracking branch 'origin/dev' into test
|
6 years ago |
|
crish
|
e874862455
|
socket动态配置
Signed-off-by: crish <570360737@qq.com>
|
6 years ago |
|
汪云昊
|
a37b9b60aa
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
许心洁
|
bdd2d05388
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
crish
|
6bb8d15ceb
|
扭矩model
Signed-off-by: crish <570360737@qq.com>
|
6 years ago |
|
许心洁
|
5e46ecfe13
|
MES流程配置第一次完整测试JIT队列修改
|
6 years ago |
Silliter
|
9170083b17
|
Merge branch 'dev' into test
|
6 years ago |
|
许心洁
|
c8008c8063
|
超大的一个BUG（好惨一女的）
|
6 years ago |
allen.zhang
|
67e3851a86
|
Merge branch 'dev' into test
|
6 years ago |
|
许心洁
|
5a044130ea
|
MES和MES-PCN产品条码PRODUCT_SN对象属性统一+WMS流程组件去工厂
|
6 years ago |
|
许心洁
|
ae4b32251a
|
WMS【添加“重新推送未处理的移动单到队列”接口+BUG修复：定时处理错误移动单查询移动单没有加上工厂代码+QC推送队列直接放了一整个对象导致交易处理主程序无法解析】MES【JIT队列execute方法+条码校验工步】
|
6 years ago |
wei.peng
|
5ba134126a
|
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
yiming.gu
|
a558020d32
|
pcn新增封装查询条件sqlpack
|
6 years ago |
|
yiming.gu
|
ef09b0f41b
|
model取消对mes、andon的引用
|
6 years ago |
|
jenkins
|
fef940bcda
|
Merge remote-tracking branch 'origin/dev' into test
|
6 years ago |
jiajack
|
c8a9edab64
|
质量判定业务修改
|
6 years ago |
|
allen.zhang
|
9eb207145c
|
Merge branch 'dev' into test
|
6 years ago |
|
jiajack
|
ebfee3d774
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
jiajack
|
d3d25f0baa
|
Pcn节点向Mes主服务注册机制代码编写
|
6 years ago |
|
allen.zhang
|
a152d8d565
|
Merge branch 'dev' into test
|
6 years ago |
|
crish
|
dac82b1977
|
修改报错
Signed-off-by: crish <570360737@qq.com>
|
6 years ago |
|
allen.zhang
|
d714733a27
|
Merge branch 'dev' into test
|
6 years ago |
|
许心洁
|
37aa342f46
|
MES-JIT队列组件前端调试BUG
|
6 years ago |
|
许心洁
|
9200080178
|
MES-POJO添加产品配置名称，产品类型名称作为冗余字段
|
6 years ago |
|
许心洁
|
bb14454170
|
MES—POJO实体复制+Dao层少了@Service注释+任务生成详细日志+交易处理组件：出入库：目的库位的数量累加依据改为目的质量状态
|
6 years ago |
|
汪云昊
|
68c8c62542
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
crish
|
d0840978de
|
PLC数据采集优化
Signed-off-by: crish <570360737@qq.com>
|
6 years ago |
|
allen.zhang
|
44abb90fe4
|
Merge branch 'dev' into test
|
6 years ago |
|
jiajack
|
21f6d4eaf8
|
PLC配置
|
6 years ago |
|
Silliter
|
ac42a9eb37
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
crish
|
5841ae2ed2
|
错误文件修改
Signed-off-by: crish <570360737@qq.com>
|
6 years ago |
|
crish
|
7caec34dad
|
PLC设备配置实体
Signed-off-by: crish <570360737@qq.com>
|
6 years ago |
|
allen.zhang
|
440083b5f2
|
Merge branch 'dev' into test
|
6 years ago |
|
crish
|
018d4a0404
|
PLC数据采集实体
Signed-off-by: crish <570360737@qq.com>
|
6 years ago |
|
crish
|
e22ecf30ef
|
添加字段
Signed-off-by: crish <570360737@qq.com>
|
6 years ago |
|
crish
|
52d27b663b
|
扭矩采集
Signed-off-by: crish <570360737@qq.com>
|
6 years ago |
yihang.lv
|
11d42b3221
|
Merge branch 'dev' into test
|
6 years ago |
|
jiajack
|
9be4b8a7d0
|
工位程序业务编写
|
6 years ago |
|
jenkins
|
a7833ea9dd
|
Merge remote-tracking branch 'origin/dev' into test
|
6 years ago |
|
jiajack
|
2617793d0f
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
jiajack
|
83fb4ab8c0
|
工位程序业务编写
|
6 years ago |
|
allen.zhang
|
5f5b3b84bd
|
Merge branch 'dev' into test
|
6 years ago |
|
crish
|
28caf8bf4c
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
crish
|
275a991593
|
实体属性不正确
Signed-off-by: crish <570360737@qq.com>
|
6 years ago |
|
yiming.gu
|
486dda639f
|
pcn队列pojo vin字段改为string型
|
6 years ago |
|
yunhao.wang
|
6ebc22e6cc
|
master分支配置调整
|
6 years ago |
|
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
|
6 years ago |
|
jiajack
|
9137fe9c4f
|
工位程序业务编写
|
6 years ago |
|
jiajack
|
038484e7ac
|
工步调度业务完善
|
6 years ago |
|
yiming.gu
|
a1a63c2247
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
yiming.gu
|
feace14920
|
PCN同步MES主数据
|
6 years ago |
|
jiajack
|
78c3ff3a47
|
工步调度业务完善
|
6 years ago |
|
jiajack
|
6da4a6f33c
|
新增获取组织相关的业务
|
6 years ago |
|
jiajack
|
8227353cbd
|
工位程序编写
|
6 years ago |
|
jiajack
|
44241bb51b
|
添加实体Repository类
|
6 years ago |
|
jiajack
|
a64323fb0d
|
添加对象
|
6 years ago |
|
jiajack
|
3a5f43f97b
|
删除iml文件
|
6 years ago |
alwaysfrin
|
ea2eb6103d
|
优化调整
|
6 years ago |
|
alwaysfrin
|
1dcdf36537
|
添加mes、mes-pcn、sweb三个微服
|
6 years ago |