 钮海涛
|
c6d36af4c9
|
Merge branch 'master' into test
|
5 years ago |
 王杰
|
9da9a568f5
|
mes
|
5 years ago |
wynne1005
|
d6fe718e4c
|
Merge branch 'dev' into test
|
5 years ago |
|
王杰
|
0a14b533d7
|
任务1659 返工返修
|
5 years ago |
|
钮海涛
|
efe083a9da
|
修复版本号
|
5 years ago |
|
王杰
|
cba7ee3d0d
|
[任务：1522，ptl流程设计]
|
5 years ago |
|
王杰
|
c6aefc89e7
|
test合并dev解决ct
|
5 years ago |
|
王杰
|
94fed3b9b2
|
Merge branch 'test' into dev
|
5 years ago |
|
王杰
|
b1018dbd39
|
[平台；]
|
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 |
|
钮海涛
|
1d16e2d938
|
解决合并冲突
|
5 years ago |
 贾文涛
|
492dfbff82
|
pom通过变量方式存在只能引用jar不能引用到项目文件的问题，暂时先还原为最初方式
|
5 years ago |
|
钮海涛
|
82d5332861
|
修复POM文件问题
|
5 years ago |
|
汪云昊
|
ec1d52e7dd
|
MAVEN 版本控制调整
|
5 years ago |
|
贾文涛
|
7106c06221
|
统一修改pom文件的项目版本问题0331
|
5 years ago |
|
wynne1005
|
44696061ee
|
修改pom文件为最新
|
5 years ago |
|
wynne1005
|
d80b341620
|
还原test pom
|
5 years ago |
|
贾文涛
|
048419d823
|
修改打包时版本号的定义，后续可以通过mvn clean install Pdev 命令进行打包,最后dev还可以更换为test、prod、docker。
|
5 years ago |
|
王杰
|
0ca8502751
|
任务：1518
|
5 years ago |
|
王杰
|
f005489b61
|
ptl
|
5 years ago |
宋军超
|
1690c9567b
|
添加调用MES接口发送完成信号 和 根据主任务编号生成区域任务组件
|
5 years ago |
|
宋军超
|
6bdf815329
|
区域组件调用参数实体添加(状态代码statusCode)字段
|
5 years ago |
 曾贞一
|
779b9d209c
|
【修改 DEV-pom.xml】
|
5 years ago |
|
王杰
|
608a1d1e51
|
ptl
|
5 years ago |
|
王杰
|
7d743c2c7f
|
Merge branch 'dev' of jhforever.wang/wangjie-i3plus-pojo into test
|
5 years ago |
|
王杰
|
6cfc2c5501
|
ptl
|
5 years ago |
|
王杰
|
af4cb74392
|
Merge branch 'dev' of jhforever.wang/wangjie-i3plus-pojo into test
|
5 years ago |
|
王杰
|
8881bafecf
|
ptl pcn
|
5 years ago |
|
王杰
|
9d23ec7720
|
Merge branch 'dev' into test
|
5 years ago |
|
宋军超
|
8b9d8fd16d
|
添加界面、界面元素、界面元素属性、RFID、接口清单、区域观察者事件配置、区域流程组件调用参数实体
|
5 years ago |
luweihao
|
12579c7a14
|
还原pom
|
5 years ago |
|
王杰
|
999aae6fc0
|
解决冲突
|
5 years ago |
|
王杰
|
4b8cd0da38
|
ptlpcn enum
|
5 years ago |
|
曾贞一
|
2625c2cb0f
|
【修改 TSET-pom.xml】
|
5 years ago |
|
王杰
|
80ca438ce3
|
test合并到dev解决pom冲突
|
5 years ago |
|
王杰
|
d9e4ea8ea9
|
Merge branch 'test' into dev
|
5 years ago |
|
王杰
|
8ace0c363d
|
ptl enum
|
5 years ago |
|
宋军超
|
fd79008df6
|
ptl同步配置表添加是否区分工厂字段isIgnoreOrg
|
5 years ago |
|
曾贞一
|
5ebb5cbf20
|
【修改 TSET-pom.xml】
|
5 years ago |
|
王杰
|
068a0956db
|
解决冲突
|
5 years ago |
|
王杰
|
cd19bfb429
|
ptlpcn
|
5 years ago |
|
王杰
|
01c5bb59e1
|
Merge branch 'dev' into test
|
5 years ago |
|
宋军超
|
4d701aa9c4
|
添加ptl数据删除定时任务
|
5 years ago |
|
钮海涛
|
b323b2feae
|
Merge remote-tracking branch 'origin/dev' into test
|
5 years ago |
|
宋军超
|
380fded580
|
添加数据清理实体和死信数据定时任务
|
5 years ago |
qianhs
|
027470cb07
|
1,重试
2，流程优化
|
5 years ago |
陈思洁
|
fcb56e09e5
|
【PTL_控制器反馈信号逻辑修改】
|
5 years ago |
|
宋军超
|
d156ffb85a
|
修改数据同步，添加死信数据界面
|
5 years ago |
|
王杰
|
269d325549
|
ptl
|
5 years ago |
|
王杰
|
cd8dea1814
|
ptl
|
5 years ago |
|
王杰
|
3fe76d1713
|
Merge branch 'dev' of joke.wang/joke-i3plus-pojo into dev
|
5 years ago |
|
qianhs
|
0c85d7132b
|
1,回退代码
|
5 years ago |
joke
|
a7e8e1095d
|
Merge remote-tracking branch 'i3plus-pojo/dev' into dev
|
5 years ago |
|
joke
|
aa403e9691
|
[ptl-pcn:39 校验物料号]
|
5 years ago |
|
qianhs
|
d87f5653a9
|
1,任务呢管理
2，生成任务
|
5 years ago |
|
王杰
|
68299bf421
|
Merge branch 'dev' of adair.song/i3plus-pojo into dev
|
5 years ago |
|
宋军超
|
e15c2b6065
|
添加PTL数据同步功能
|
5 years ago |
|
陈思洁
|
21c9af2007
|
【PTL_区段亮灯任务新增实体】
|
5 years ago |
|
王杰
|
cde65d0e7a
|
Merge branch 'dev' of gragon.xu/i3plus-pojo into dev
|
5 years ago |
许心洁
|
a49b747c18
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
许心洁
|
cc98e84ba4
|
动态查询：增加开窗功能
|
5 years ago |
|
陈思洁
|
83464294bb
|
【PTL_枚举引用修改】
|
5 years ago |
|
宋军超
|
80d9852dd6
|
添加数据同步和定时任务功能
|
5 years ago |
|
钮海涛
|
85dff1fde9
|
Merge remote-tracking branch 'origin/dev' into test
|
5 years ago |
|
王杰
|
8c334d2ffd
|
平台；
|
5 years ago |
|
宋军超
|
96c5b35f83
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
王杰
|
0a0318d639
|
ptl
|
5 years ago |
|
宋军超
|
51d666b5bc
|
开发PTL--PCN节点维护,同步配置和对象映射功能
|
5 years ago |
|
luweihao
|
f67dd06cd4
|
Merge branch 'dev' into test
|
5 years ago |
|
王杰
|
34e76f59ce
|
ptl
|
5 years ago |
|
王杰
|
3a88bd7a78
|
ptl
|
5 years ago |
|
王杰
|
51ca581f29
|
ptl
|
5 years ago |
|
王杰
|
b64872fc53
|
ptl
|
5 years ago |
|
王杰
|
7d13140a33
|
ptltag
|
5 years ago |
|
joke
|
ada46c9626
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
陈思洁
|
1fd3cd3329
|
【PTL_增加主任务状态的枚举】
|
5 years ago |
|
joke
|
ccd62f8d31
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
joke
|
d212b5cd30
|
[ptl-pcn: 32 亮灯作业]
|
5 years ago |
|
luweihao
|
66f7121975
|
Merge branch 'dev' into test
|
5 years ago |
|
陈思洁
|
d0cda06343
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
陈思洁
|
f8d4e7f1fd
|
【PTL_标签打印pojo新增】
|
5 years ago |
|
宋军超
|
d056a04403
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
宋军超
|
85f157c6a6
|
设置PTL_BOM中父物料描述默认值为1
|
5 years ago |
|
陈思洁
|
720449cd09
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
陈思洁
|
faaf184e01
|
【PTL_增加主任务状态的枚举】
|
5 years ago |
|
宋军超
|
2c06163f88
|
添加PTL_主任务明细实体
|
5 years ago |
|
luweihao
|
51152656cc
|
Merge branch 'dev' into test
|
5 years ago |
|
joke
|
6964d4cf4e
|
[ptl-pcn: 32 亮灯作业]
|
5 years ago |
|
陈思洁
|
40094365ce
|
【PTL_区段亮灯任务明细状态】
|
5 years ago |
|
joke
|
c73cd26574
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
joke
|
f01b3664c2
|
[ptl: 32 亮灯作业程序]
|
5 years ago |
|
宋军超
|
cac0f91150
|
添加BOM中父物料描述默认值
|
5 years ago |
|
许心洁
|
2a09c009f3
|
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
宋军超
|
0fe0abff63
|
新增区域、区段、标签控制器、标签信息、BOM和物料 基础数据
|
5 years ago |
|
宋军超
|
896bd9b35b
|
添加基础数据枚举
|
5 years ago |
|
宋军超
|
60ad38649d
|
新增区域、区段、标签控制器、标签信息、BOM和物料 基础数据
|
5 years ago |
|
王杰
|
b516ca254c
|
解决冲突
|
5 years ago |
|
王杰
|
39a454f89b
|
ptl
|
5 years ago |
wei.peng
|
b199c5995f
|
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-ics into test
# Conflicts:
# modules/i3plus-ics-console/src/main/resources/application.properties
# modules/i3plus-ics-gateway/src/main/resources/application.properties
# modules/i3plus-ics-regist/src/main/resources/application.properties
|
5 years ago |
|
wei.peng
|
e1dd7c3cdd
|
PTL 项目初始化
|
5 years ago |