8955fd2f4d
mes提测 还原pom
6 years ago
23754d3f18
mes提测 还原pom
6 years ago
99d3c9d721
提测合并 还原pom
6 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
6 years ago
王杰
786c442d55
解决冲突
6 years ago
钮海涛
c1241bd6c5
修复版本问题
6 years ago
钮海涛
53a421b3b9
修复版本问题
6 years ago
钮海涛
94e9b2ffec
Merge remote-tracking branch 'remotes/origin/master' into test
6 years ago
王杰
029763feb1
pom
6 years ago
王杰
fc99ee8914
pojo 序列化
6 years ago
王杰
30fcf4f23f
pom冲突
6 years ago
717f268c28
POJO版本号还原
6 years ago
王杰
a6e9b90026
pom
6 years ago
王杰
de9017ca5c
冲突
6 years ago
王杰
eaecf4b4b7
pom
6 years ago
王杰
7d192b36a6
pom冲突
6 years ago
钮海涛
005d0f7f86
修复合并问题
6 years ago
37922cab29
POM 文件修改
...
Merge remote-tracking branch 'remotes/origin/test'
# Conflicts:
# modules/i3plus-icloud-report/pom.xml
6 years ago
8aab106aa9
合并代码 pom 冲突
...
Merge remote-tracking branch 'remotes/origin/dev' into test
# Conflicts:
# modules/i3plus-ics-gateway/src/main/resources/application-docker.properties
6 years ago
王杰
cace95fbed
ptl
6 years ago
钮海涛
3fbf532c84
修复pom版本问题
6 years ago
钮海涛
a1eb3c3bc2
修复pom版本问题
6 years ago
钮海涛
2e2ee2cc6c
Merge branch 'test' into dev
6 years ago
钮海涛
c6d36af4c9
Merge branch 'master' into test
6 years ago
王杰
9da9a568f5
mes
6 years ago
d6fe718e4c
Merge branch 'dev' into test
6 years ago
王杰
0a14b533d7
任务1659 返工返修
6 years ago
钮海涛
efe083a9da
修复版本号
6 years ago
王杰
cba7ee3d0d
[任务：1522，ptl流程设计]
6 years ago
王杰
c6aefc89e7
test合并dev解决ct
6 years ago
王杰
94fed3b9b2
Merge branch 'test' into dev
6 years ago
王杰
b1018dbd39
[平台；]
6 years ago
钮海涛
288fb4a16b
修改POM版本号
6 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
6 years ago
8a8c3ee34d
pom版本调整
6 years ago
钮海涛
1d16e2d938
解决合并冲突
6 years ago
贾文涛
492dfbff82
pom通过变量方式存在只能引用jar不能引用到项目文件的问题，暂时先还原为最初方式
6 years ago
钮海涛
82d5332861
修复POM文件问题
6 years ago
ec1d52e7dd
MAVEN 版本控制调整
6 years ago
贾文涛
7106c06221
统一修改pom文件的项目版本问题0331
6 years ago
44696061ee
修改pom文件为最新
6 years ago
d80b341620
还原test pom
6 years ago
贾文涛
048419d823
修改打包时版本号的定义，后续可以通过mvn clean install Pdev 命令进行打包,最后dev还可以更换为test、prod、docker。
6 years ago
王杰
0ca8502751
任务：1518
6 years ago
王杰
f005489b61
ptl
6 years ago
1690c9567b
添加调用MES接口发送完成信号 和 根据主任务编号生成区域任务组件
6 years ago
6bdf815329
区域组件调用参数实体添加(状态代码statusCode)字段
6 years ago
曾贞一
779b9d209c
【修改 DEV-pom.xml】
6 years ago
王杰
608a1d1e51
ptl
6 years ago
王杰
7d743c2c7f
Merge branch 'dev' of jhforever.wang/wangjie-i3plus-pojo into test
6 years ago
王杰
6cfc2c5501
ptl
6 years ago
王杰
af4cb74392
Merge branch 'dev' of jhforever.wang/wangjie-i3plus-pojo into test
6 years ago
王杰
8881bafecf
ptl pcn
6 years ago
王杰
9d23ec7720
Merge branch 'dev' into test
6 years ago
8b9d8fd16d
添加界面、界面元素、界面元素属性、RFID、接口清单、区域观察者事件配置、区域流程组件调用参数实体
6 years ago
12579c7a14
还原pom
6 years ago
王杰
999aae6fc0
解决冲突
6 years ago
王杰
4b8cd0da38
ptlpcn enum
6 years ago
曾贞一
2625c2cb0f
【修改 TSET-pom.xml】
6 years ago
王杰
80ca438ce3
test合并到dev解决pom冲突
6 years ago
王杰
d9e4ea8ea9
Merge branch 'test' into dev
6 years ago
王杰
8ace0c363d
ptl enum
6 years ago
fd79008df6
ptl同步配置表添加是否区分工厂字段isIgnoreOrg
6 years ago
曾贞一
5ebb5cbf20
【修改 TSET-pom.xml】
6 years ago
王杰
068a0956db
解决冲突
6 years ago
王杰
cd19bfb429
ptlpcn
6 years ago
王杰
01c5bb59e1
Merge branch 'dev' into test
6 years ago
4d701aa9c4
添加ptl数据删除定时任务
6 years ago
钮海涛
b323b2feae
Merge remote-tracking branch 'origin/dev' into test
6 years ago
380fded580
添加数据清理实体和死信数据定时任务
6 years ago
027470cb07
1,重试
...
2，流程优化
6 years ago
fcb56e09e5
【PTL_控制器反馈信号逻辑修改】
6 years ago
d156ffb85a
修改数据同步，添加死信数据界面
6 years ago
王杰
269d325549
ptl
6 years ago
王杰
cd8dea1814
ptl
6 years ago
王杰
3fe76d1713
Merge branch 'dev' of joke.wang/joke-i3plus-pojo into dev
6 years ago
0c85d7132b
1,回退代码
6 years ago
a7e8e1095d
Merge remote-tracking branch 'i3plus-pojo/dev' into dev
6 years ago
aa403e9691
[ptl-pcn:39 校验物料号]
6 years ago
d87f5653a9
1,任务呢管理
...
2，生成任务
6 years ago
王杰
68299bf421
Merge branch 'dev' of adair.song/i3plus-pojo into dev
6 years ago
e15c2b6065
添加PTL数据同步功能
6 years ago
21c9af2007
【PTL_区段亮灯任务新增实体】
6 years ago
王杰
cde65d0e7a
Merge branch 'dev' of gragon.xu/i3plus-pojo into dev
6 years ago
a49b747c18
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
cc98e84ba4
动态查询：增加开窗功能
6 years ago
83464294bb
【PTL_枚举引用修改】
6 years ago
80d9852dd6
添加数据同步和定时任务功能
6 years ago
钮海涛
85dff1fde9
Merge remote-tracking branch 'origin/dev' into test
6 years ago
王杰
8c334d2ffd
平台；
6 years ago
96c5b35f83
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
王杰
0a0318d639
ptl
6 years ago
51d666b5bc
开发PTL--PCN节点维护,同步配置和对象映射功能
6 years ago
f67dd06cd4
Merge branch 'dev' into test
6 years ago
王杰
34e76f59ce
ptl
6 years ago
王杰
3a88bd7a78
ptl
6 years ago
王杰
51ca581f29
ptl
6 years ago
王杰
b64872fc53
ptl
6 years ago
王杰
7d13140a33
ptltag
6 years ago
ada46c9626
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
wynne1005
wei.peng
王杰
钮海涛
汪云昊
贾文涛
宋军超
曾贞一
luweihao
qianhs
陈思洁
joke
许心洁