6fd7e6be5f
【需求：1092 维修类型】
6 years ago
王杰
1846c6f4f8
Merge branch 'dev' into test
6 years ago
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
6c847cf305
【需求：1091 返厂返修添加字段和枚举】
6 years ago
王杰
9446a76159
Merge branch 'dev' into test
6 years ago
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
0011a4bc56
【需求：1089 过程检测数据 增加字段】
6 years ago
王杰
dcaf007f4d
【需求：1107，生产工单首检件】
6 years ago
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
bc13a8a3ac
【需求：1090 返厂返修增加分页查询】
6 years ago
c79786a677
合并开发分支的代码POM文件被改成DEV修改回TEST
6 years ago
04c99167c8
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
6de6d36e80
数据库抽取反写 1105-1
6 years ago
a5609d97fb
【1092 返厂返修增加枚举】
6 years ago
18161e8191
Merge branch 'test'
6 years ago
67461457fc
Merge branch 'dev' into test
6 years ago
848f6b2f23
工位监控优化 1050-6
6 years ago
c71d667d0f
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
d7f55250ef
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
8d10a46953
(1092 MesProdBindRecordModel增加有参构造方法)
6 years ago
30007cee47
Merge branch 'dev' into test
6 years ago
c56822dc40
工位监控优化 1050-5
6 years ago
3dbbee3c60
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
f6b06e6b52
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
aef7f7a948
增加班次顺序字段
6 years ago
73aef5326c
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
6 years ago
00e849a62e
(1089 过程质量检测基础数据；1090 返厂返修基础数据)
6 years ago
b47f97fa05
1050-2 工位监控
6 years ago
0526da8ee3
Merge branch 'test'
6 years ago
e89df89f9a
Merge branch 'dev' of i3-IMPP/i3plus-pojo into test
6 years ago
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
2da78c3237
idea 异常 文件格式化 + 包装扫描工步
6 years ago
9e4930968f
解决冲突
6 years ago
8a517bc0b9
返厂返修增加字段
6 years ago
1de89d732b
本地误拉了test代码，解决pom
6 years ago
9f9874902d
冲突解决
6 years ago
7fc439319e
返厂返修
6 years ago
413266293e
Merge branch 'dev' of i3-IMPP/i3plus-pojo into test
6 years ago
56d7457826
工位监控提交
6 years ago
王杰
ef3be61f66
Merge branch 'dev' into test
6 years ago
ffdb547dc7
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
203b53d3b3
解决冲突
6 years ago
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
72bdd253fa
解决冲突
6 years ago
a961da57ef
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
6 years ago
104d308d30
PLC DB 设备故障 过程质量检测
6 years ago
a791430fec
Merge branch 'dev' of i3-IMPP/i3plus-pojo into test
6 years ago
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
40321ed7ec
Merge branch 'test'
6 years ago
4e2373bdae
Merge branch 'dev' into test
6 years ago
4654fad2bd
1011 生成条码工步
6 years ago
0924810e64
Merge branch 'test'
6 years ago
60f441e685
Merge branch 'dev' into test
6 years ago
76149da904
提交
6 years ago
18ec7d091a
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
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
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
82fe491bd3
#1050 工位监控
6 years ago
7a403a37da
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo
6 years ago
30eee05b1c
Merge branch 'dev' into test
6 years ago
766d195088
开线合并代码
6 years ago
183fd78eac
冲突解决
6 years ago
王杰
80f50fe800
Merge branch 'dev' into test
6 years ago
王杰
804574090f
pcn生产工单
6 years ago
9ae6ee5016
Merge branch 'test'
6 years ago
f07764acda
Merge branch 'dev' into test
6 years ago
王杰
80bad03881
mes-pcn生产工单
6 years ago
f96cbd1be3
Merge branch 'dev' into test
6 years ago
7c472b386a
提交
6 years ago
f3f77e63b3
Merge branch 'test'
6 years ago
c47c617aab
Merge branch 'dev' into test
6 years ago
王杰
8570b88761
mes生产工单
6 years ago
c17039ce4a
Merge branch 'dev' into test
6 years ago
4e1635fe7e
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
9b0c5de954
提交
6 years ago
曾贞一
6c8cfd8678
Merge remote-tracking branch 'remotes/origin/test'
6 years ago
曾贞一
a4262c5e1e
pom文件修改 dev改成test
6 years ago
b473fd1b46
pojo开发环境 pom文件修改为dev
6 years ago
87f8dc38a6
测试环境
6 years ago
d82e025eb9
dev环境pom文件修改为dev
6 years ago
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
23c59d4326
Merge branch 'dev' into test
6 years ago
271a26d2b8
提交
6 years ago
bbfc9b320f
Merge branch 'test'
6 years ago
4a1ad40dfa
Merge branch 'dev' into test
6 years ago
王杰
c950019077
pcn定时任务
6 years ago
ccffe9b7bd
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
c44a99eb40
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
89b0a4a68a
条码打印调试
...
Signed-off-by: crish <570360737@qq.com>
6 years ago
王杰
fe455a7147
pcn离线登陆
6 years ago
546d9dc7a5
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
fd76f08af4
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
王杰
d2995520d4
mes-pcn定时任务增加字段
6 years ago
4b982fc4fe
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
1332f11a23
提交
6 years ago
8f1ac3fdae
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
65cb39d7ba
工作中心代码修改
...
Signed-off-by: crish <570360737@qq.com>
6 years ago
2e8a70d8b4
pom版本还原--pojo
6 years ago
王杰
46d220f3ec
mes条码规则校验
6 years ago
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
399a51b044
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
71e7362216
PCN数据同步， 逻辑修改
...
Signed-off-by: crish <570360737@qq.com>
6 years ago
曾贞一
ae12af551b
Merge remote-tracking branch 'remotes/origin/test'
6 years ago
1b06c1d07f
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
王杰
5947f88da1
mes-pcn定时任务工作清单数据同步
6 years ago
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
953f593207
提交
6 years ago
f820c449bb
工步条码打印
...
Signed-off-by: crish <570360737@qq.com>
6 years ago
曾贞一
25e7ca08d3
Merge remote-tracking branch 'remotes/origin/test'
6 years ago
59047b5b4c
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
王杰
12f6e2c14b
mes-pcn定时任务表维护
6 years ago
f7b366fe29
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
6 years ago
12a2a27b18
mes， pcn条码打印
...
Signed-off-by: crish <570360737@qq.com>
6 years ago
曾贞一
18aff86ea0
Merge remote-tracking branch 'remotes/origin/test'
6 years ago
c901f18f89
pom版本还原
6 years ago
2deb384cca
提交
6 years ago
曾贞一
b10b967b73
Merge remote-tracking branch 'remotes/origin/test'
6 years ago
5e72d98ad8
提交
6 years ago
4359f347c6
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
4ff3677fba
Merge branch 'test' into dev
6 years ago
0aef9adac9
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
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
曾贞一
e1cb06da5c
Merge remote-tracking branch 'remotes/origin/test'
6 years ago
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
曾贞一
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
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
363d521c36
Merge branch 'test'
6 years ago
d45b7b77f3
Merge branch 'dev' into test
6 years ago
33a59fdb0f
0730 add esop pojo and respository
6 years ago
bec3a7098d
Merge remote-tracking branch 'remotes/origin/test'
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方法+条码校验工步】
7 years ago
5ba134126a
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
7 years ago
a558020d32
pcn新增封装查询条件sqlpack
7 years ago
ef09b0f41b
model取消对mes、andon的引用
7 years ago
fef940bcda
Merge remote-tracking branch 'origin/dev' into test
7 years ago
c8a9edab64
质量判定业务修改
7 years ago
9eb207145c
Merge branch 'dev' into test
7 years ago
ebfee3d774
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
7 years ago
d3d25f0baa
Pcn节点向Mes主服务注册机制代码编写
7 years ago
a152d8d565
Merge branch 'dev' into test
7 years ago
dac82b1977
修改报错
...
Signed-off-by: crish <570360737@qq.com>
7 years ago
d714733a27
Merge branch 'dev' into test
7 years ago
37aa342f46
MES-JIT队列组件前端调试BUG
7 years ago
9200080178
MES-POJO添加产品配置名称，产品类型名称作为冗余字段
7 years ago
bb14454170
MES—POJO实体复制+Dao层少了@Service注释+任务生成详细日志+交易处理组件：出入库：目的库位的数量累加依据改为目的质量状态
7 years ago
68c8c62542
Merge remote-tracking branch 'remotes/origin/dev' into test
7 years ago
d0840978de
PLC数据采集优化
...
Signed-off-by: crish <570360737@qq.com>
7 years ago
44abb90fe4
Merge branch 'dev' into test
7 years ago
21f6d4eaf8
PLC配置
7 years ago
ac42a9eb37
Merge remote-tracking branch 'remotes/origin/dev' into test
7 years ago
5841ae2ed2
错误文件修改
...
Signed-off-by: crish <570360737@qq.com>
7 years ago
7caec34dad
PLC设备配置实体
...
Signed-off-by: crish <570360737@qq.com>
7 years ago
440083b5f2
Merge branch 'dev' into test
7 years ago
018d4a0404
PLC数据采集实体
...
Signed-off-by: crish <570360737@qq.com>
7 years ago
e22ecf30ef
添加字段
...
Signed-off-by: crish <570360737@qq.com>
7 years ago
52d27b663b
扭矩采集
...
Signed-off-by: crish <570360737@qq.com>
7 years ago
11d42b3221
Merge branch 'dev' into test
7 years ago
9be4b8a7d0
工位程序业务编写
7 years ago
a7833ea9dd
Merge remote-tracking branch 'origin/dev' into test
7 years ago
2617793d0f
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
7 years ago
83fb4ab8c0
工位程序业务编写
7 years ago
5f5b3b84bd
Merge branch 'dev' into test
7 years ago
28caf8bf4c
Merge remote-tracking branch 'origin/dev' into dev
7 years ago
275a991593
实体属性不正确
...
Signed-off-by: crish <570360737@qq.com>
7 years ago
486dda639f
pcn队列pojo vin字段改为string型
7 years ago
6ebc22e6cc
master分支配置调整
7 years ago
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
7 years ago
9137fe9c4f
工位程序业务编写
7 years ago
038484e7ac
工步调度业务完善
7 years ago
a1a63c2247
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
7 years ago
feace14920
PCN同步MES主数据
7 years ago
78c3ff3a47
工步调度业务完善
7 years ago
6da4a6f33c
新增获取组织相关的业务
7 years ago
8227353cbd
工位程序编写
7 years ago
44241bb51b
添加实体Repository类
7 years ago
a64323fb0d
添加对象
7 years ago
3a5f43f97b
删除iml文件
7 years ago
ea2eb6103d
优化调整
7 years ago
1dcdf36537
添加mes、mes-pcn、sweb三个微服
7 years ago
jokelone
王杰
WYnneaoapc
许心洁
crish
changjiang.gao
jiajack
刘辉
陆卫豪
jenkins
曾贞一
于学杰
jimmy.zeng
peter.pan
wei.peng
jenkins
汪云昊
Silliter
allen.zhang
wei.peng
yiming.gu
yihang.lv
alwaysfrin