483ea59142
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
3711873c29
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
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.
6 years ago
6c37a60ff4
MES-PCN获取平台打印数据
...
Signed-off-by: crish <570360737@qq.com>
6 years ago
曾贞一
7ca6e46e4b
Merge branch 'dev' into test
6 years ago
6b442cda1c
PCN接口开发， 数据同步配置
...
Signed-off-by: crish <570360737@qq.com>
6 years ago
76684b82c0
PCN接口开发， 数据同步配置
...
Signed-off-by: crish <570360737@qq.com>
6 years ago
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
d45b7b77f3
Merge branch 'dev' into test
6 years ago
33a59fdb0f
0730 add esop pojo and respository
6 years ago
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
28ae6cf85d
Merge remote-tracking branch 'origin/dev' into test
6 years ago
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
6bb8d15ceb
扭矩model
...
Signed-off-by: crish <570360737@qq.com>
6 years ago
5e46ecfe13
MES流程配置第一次完整测试JIT队列修改
6 years ago
9170083b17
Merge branch 'dev' into test
6 years ago
c8008c8063
超大的一个BUG（好惨一女的）
6 years ago
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
5ba134126a
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
6 years ago
a558020d32
pcn新增封装查询条件sqlpack
6 years ago
ef09b0f41b
model取消对mes、andon的引用
6 years ago
fef940bcda
Merge remote-tracking branch 'origin/dev' into test
6 years ago
c8a9edab64
质量判定业务修改
6 years ago
9eb207145c
Merge branch 'dev' into test
6 years ago
ebfee3d774
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
d3d25f0baa
Pcn节点向Mes主服务注册机制代码编写
6 years ago
a152d8d565
Merge branch 'dev' into test
6 years ago
dac82b1977
修改报错
...
Signed-off-by: crish <570360737@qq.com>
6 years ago
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
d0840978de
PLC数据采集优化
...
Signed-off-by: crish <570360737@qq.com>
6 years ago
44abb90fe4
Merge branch 'dev' into test
6 years ago
21f6d4eaf8
PLC配置
6 years ago
ac42a9eb37
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
5841ae2ed2
错误文件修改
...
Signed-off-by: crish <570360737@qq.com>
6 years ago
7caec34dad
PLC设备配置实体
...
Signed-off-by: crish <570360737@qq.com>
6 years ago
440083b5f2
Merge branch 'dev' into test
6 years ago
018d4a0404
PLC数据采集实体
...
Signed-off-by: crish <570360737@qq.com>
6 years ago
jimmy.zeng
crish
WYnneaoapc
曾贞一
于学杰
peter.pan
jenkins
许心洁
汪云昊
Silliter
allen.zhang
wei.peng
yiming.gu
jiajack