钮海涛
310da99743
合并master代码
5 years ago
3af4d32a97
mes工位运行状态
5 years ago
钮海涛
39f6819e9b
修复合并版本问题
5 years ago
王杰
6c5e646d49
test merge master
5 years ago
钮海涛
7ca3b43bfe
合并DEV分支代码
5 years ago
钮海涛
b04ef3caa4
合并TEST分支代码
5 years ago
钮海涛
ef40f20e1d
解决合并冲突
5 years ago
钮海涛
81266fbfb6
解决合并冲突
5 years ago
钮海涛
9a516f893f
合并dev代码到test
5 years ago
钮海涛
6033695b99
修复合并版本问题
5 years ago
085f15427d
还原pom
5 years ago
dfa993b9e9
还原pom
5 years ago
15f0a37508
还原pom
5 years ago
bcb4e5ad13
merge test
5 years ago
31b5f3e234
merge dev 还原pom
5 years ago
b18408b3bb
merge test
5 years ago
钮海涛
d08465dd38
修复版本问题
5 years ago
钮海涛
9d64793a5f
Merge branch 'master' into test
5 years ago
cb69f62c63
Fix Bug #8886
...
原材料上线扫描，无法看到原材料已扣减数量和剩余数量
5 years ago
b0b07437d6
还原pom
5 years ago
60c1f6ecab
还原pom
5 years ago
47ae0b46ef
还原pom
5 years ago
b75347ffc1
还原pom
5 years ago
0067e31420
合并test分支代码到dev分支
5 years ago
钮海涛
2f8b0ba5db
修复版本问题
5 years ago
钮海涛
4921d55bda
修复版本问题
5 years ago
钮海涛
b303cf9a14
修复合并问题
5 years ago
5ef88c80c0
提测合并 还原pom
5 years ago
6169542dbb
合并代码 有代码丢失或者文件丢失请排查此处
...
Merge remote-tracking branch 'remotes/origin/dev' into test
# Conflicts:
# modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java
5 years ago
钮海涛
53a421b3b9
修复版本问题
5 years ago
王杰
a6e9b90026
pom
5 years ago
王杰
de9017ca5c
冲突
5 years ago
王杰
7d192b36a6
pom冲突
5 years ago
钮海涛
005d0f7f86
修复合并问题
5 years ago
钮海涛
bc269e1f71
Merge branch 'master' into test
5 years ago
a8ae48b132
【7937 半成品箱条码绑定工步-数据写入缺少】
5 years ago
37922cab29
POM 文件修改
...
Merge remote-tracking branch 'remotes/origin/test'
# Conflicts:
# modules/i3plus-icloud-report/pom.xml
5 years ago
fe94ad9bf3
Merge remote-tracking branch 'remotes/origin/test'
5 years ago
钮海涛
a1eb3c3bc2
修复pom版本问题
5 years ago
钮海涛
2cc43af431
修复pom版本问题
5 years ago
钮海涛
c6d36af4c9
Merge branch 'master' into test
5 years ago
fb60d75eea
还原test pom
5 years ago
d6fe718e4c
Merge branch 'dev' into test
5 years ago
109c4429ce
还原dev pom
5 years ago
钮海涛
efe083a9da
修复版本号
5 years ago
钮海涛
288fb4a16b
修改POM版本号
5 years ago
2772ea6a2f
Merge remote-tracking branch 'remotes/origin/dev' into test
...
# Conflicts:
# modules/i3plus-pojo-andon/pom.xml
# modules/i3plus-pojo-aps/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-ptl/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
5 years ago
8a8c3ee34d
pom版本调整
5 years ago
贾文涛
492dfbff82
pom通过变量方式存在只能引用jar不能引用到项目文件的问题，暂时先还原为最初方式
5 years ago
钮海涛
52a5c1e2f8
Merge branch 'test' into dev
5 years ago
4324457b61
merge
5 years ago
241ec4974b
联调测试
5 years ago
钮海涛
82d5332861
修复POM文件问题
5 years ago
ec1d52e7dd
MAVEN 版本控制调整
5 years ago
贾文涛
7106c06221
统一修改pom文件的项目版本问题0331
5 years ago
44696061ee
修改pom文件为最新
5 years ago
贾文涛
eed24e0297
统一修改pom文件的项目版本问题
5 years ago
d80b341620
还原test pom
5 years ago
贾文涛
048419d823
修改打包时版本号的定义，后续可以通过mvn clean install Pdev 命令进行打包,最后dev还可以更换为test、prod、docker。
5 years ago
564ba1e116
【1472 工步-设备状态采集（原PLC采集【设备状态】）】
5 years ago
74e4aa953b
【任务 1480 照片采集】
5 years ago
22788f1c44
还原POM文件TEST-DEV
5 years ago
王杰
b6a83fff5d
Merge branch 'dev' into test
5 years ago
3d28840bae
【新增枚举，pojo】
5 years ago
16879a4f20
Merge branch 'dev' into test
5 years ago
12579c7a14
还原pom
5 years ago
7aecf9dcc0
【task 1436 工步-关键件绑定校验并转过程条码】
5 years ago
5892f87bdc
task `1425` pcn pojo 迁移
5 years ago
e2d63434db
bug `7570` `7561` 生产扣减代码去除测试代码
5 years ago
b556051295
task 修改监控类位置
5 years ago
1b727f1721
task 任务重试测试
5 years ago
68cbd54f37
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
5 years ago
5fd51f6b1d
task 任务重试测试
5 years ago
d42b7ebbb6
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
5 years ago
2b84f93950
任务: 1424 DT通信
5 years ago
5eb7cf03ed
task 数据同步添加错误信息字段
5 years ago
bbfcdfdd64
ptl pojo 提交
5 years ago
d750a88aad
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
5 years ago
1c144eca4d
移除mespcn乐观锁
5 years ago
54cd3cfc45
业务表增加唯一索引
5 years ago
acc907dd28
task `1295` mes添加索引
5 years ago
5f25e311bb
mes-pcn pojo添加serializable
5 years ago
王杰
3f77135a17
枚举
5 years ago
4ae13f8270
task `1408` 生产数据结构化
5 years ago
王杰
bf71cd07d0
JIS发运
5 years ago
88d1e39578
压测计时
5 years ago
01a694be70
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
5 years ago
6baeeee71e
task `1392` 调整工步 错误处理实现
5 years ago
fd1a0ebdb8
【任务：1404 过程质量 检查项类型分组展示】
5 years ago
325399127e
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
5 years ago
28587fbb98
task `1392` 调整工步 错误处理实现
5 years ago
2d8b55b61a
【现场优化：59 过程质量】
5 years ago
8ef70ed627
【现场优化：59 过程质量优化】
5 years ago
2396863bab
【任务:1383 数据监听定时数据抓取】
5 years ago
f1096e9ec5
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
5 years ago
51839d7be5
【任务：1381】
5 years ago
add40a27e3
【任务：1382，数据监听基础模块开发】
5 years ago
ded27853a8
task 修改生产数据
5 years ago
王杰
031d57e081
JIS
5 years ago
王杰
54bdf8f6a0
JIS
5 years ago
钮海涛
wynne1005
王杰
袁津哲
wei.peng
陈思洁
汪云昊
贾文涛
qianhs
zcg
luweihao
joke