王杰
c950019077
pcn定时任务
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
王杰
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
crish
65cb39d7ba
工作中心代码修改
...
Signed-off-by: crish <570360737@qq.com>
6 years ago
王杰
46d220f3ec
mes条码规则校验
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
crish
71e7362216
PCN数据同步, 逻辑修改
...
Signed-off-by: crish <570360737@qq.com>
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
王杰
12f6e2c14b
mes-pcn定时任务表维护
6 years ago
crish
12a2a27b18
mes, pcn条码打印
...
Signed-off-by: crish <570360737@qq.com>
6 years ago
WYnneaoapc
2deb384cca
提交
6 years ago
WYnneaoapc
5e72d98ad8
提交
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
crish
3711873c29
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
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.
6 years ago
crish
6c37a60ff4
MES-PCN获取平台打印数据
...
Signed-off-by: crish <570360737@qq.com>
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
d45b7b77f3
Merge branch 'dev' into test
6 years ago
WYnneaoapc
33a59fdb0f
0730 add esop pojo and respository
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