castle.zang
|
8a369c31fa
|
通用数据冷热分离代码,并规范化test分支开发时的依赖，全部依赖1.0-TEST-SNAPSHOT
|
3 years ago |
puxiao.liao
|
d7b34facf0
|
Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev
Conflicts:
modules/i3plus-pojo-andon/pom.xml
modules/i3plus-pojo-aps/pom.xml
modules/i3plus-pojo-base/pom.xml
modules/i3plus-pojo-bsp/pom.xml
modules/i3plus-pojo-form/pom.xml
modules/i3plus-pojo-hardswitch/pom.xml
modules/i3plus-pojo-ics/pom.xml
modules/i3plus-pojo-jobflow/pom.xml
modules/i3plus-pojo-lac/pom.xml
modules/i3plus-pojo-mdm/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-screen/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
sonar-project.properties
|
4 years ago |
Dominic_Xiao
|
30eb4e2194
|
回滚POM版本
|
4 years ago |
wynne1005
|
bb88851f17
|
还原pom
|
4 years ago |
|
wynne1005
|
e7df36d3e9
|
还原merge pom
|
4 years ago |
 王杰
|
5d33795cff
|
test merge dev
|
4 years ago |
李俊生
|
206b522af5
|
pom冲突
|
4 years ago |
|
王杰
|
844349d583
|
冲突
|
4 years ago |
|
王杰
|
21a3d716f4
|
pom
|
4 years ago |
|
王杰
|
84d9ec15f2
|
pom
|
4 years ago |
|
王杰
|
f1db936f42
|
pom
|
4 years ago |
|
王杰
|
cd5b882e1f
|
dev merge test pom 冲突解决
|
4 years ago |
许心洁
|
3d1d05ef1c
|
1.天津委外发运库存移动单打印
|
4 years ago |
simon.song
|
effc34f74d
|
Merge remote-tracking branch 'remotes/origin/test' into ext-dev
# Conflicts:
# modules/i3plus-pojo-mes-pcn/pom.xml
|
4 years ago |
|
simon.song
|
4676a84b07
|
删除mes-pcn包，后续引入类以mes包为主
|
4 years ago |
|
许心洁
|
de9578d439
|
墨西哥WMS报工业务新增功能：通用脚本导入接口+生产版本DAO层+生产计划主表计划状态FINISH(25, "FINISH", "已完成")
|
4 years ago |
|
simon.song
|
9b57f47af6
|
修改pom文件
|
4 years ago |
|
王杰
|
e1783e5e46
|
pom
|
5 years ago |
|
Dominic_Xiao
|
7b17ecbb29
|
补全代码
|
5 years ago |
|
simon
|
e0ee86ab73
|
删除mes-pcn包，后续引入类以mes包为准
|
5 years ago |
 钮海涛
|
af732b7a4f
|
合并test代码
|
5 years ago |
|
wynne1005
|
db87c0c32f
|
pom版本
|
5 years ago |
|
钮海涛
|
b9283ec075
|
合并dev代码
|
5 years ago |
|
钮海涛
|
b57ae573ed
|
合并test代码
|
5 years ago |
汪云昊
|
f2180f18f3
|
revert(pojo):还原pom版本
|
5 years ago |
|
汪云昊
|
378205ef61
|
Merge remote-tracking branch 'origin/dev' into test
|
5 years ago |
|
汪云昊
|
cc947c08f5
|
revert(pojo):还原pom版本
|
5 years ago |
|
Dominic_Xiao
|
13bd15d997
|
回滚PCN实体类
|
5 years ago |
|
Dominic_Xiao
|
d8c52a0534
|
新增导包
|
5 years ago |
|
Dominic_Xiao
|
f551ede492
|
Merge remote-tracking branch 'origin/test' into test
# Conflicts:
# modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesContainerLocation.java
# modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageDetail.java
# modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageTravel.java
# modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartContainerCapacity.java
# modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesContainerLocationRepository.java
# modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesCustomerSnRuleRepository.java
# modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPartContainerCapacityRepository.java
# modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java
|
5 years ago |
|
Dominic_Xiao
|
785e8dbfe8
|
包装详情表新增容器位置字段
|
5 years ago |
|
Dominic_Xiao
|
8d0e2b942b
|
增加卡斯马业务pojo
|
5 years ago |
|
Dominic_Xiao
|
395039e901
|
新增三个字段
|
5 years ago |
|
钮海涛
|
a8cdba48c3
|
合并Master代码
|
5 years ago |
|
钮海涛
|
7afd60073a
|
Merge remote-tracking branch 'remotes/origin/test'
|
5 years ago |
 贾文涛
|
834e3d211d
|
更新查询大于0的业务时，基础类错误问题。
|
5 years ago |
|
汪云昊
|
171f39cf01
|
revert:还原pojo pom.xml报表
|
5 years ago |
|
汪云昊
|
56bd07dbf3
|
Merge remote-tracking branch 'origin/dev' into test
|
5 years ago |
|
钮海涛
|
543058b3a5
|
合并sweb代码
|
5 years ago |
|
wynne1005
|
708985be2a
|
中航 设备自动报警 #1
|
5 years ago |
|
钮海涛
|
5c104e036f
|
合并test代码
|
5 years ago |
|
汪云昊
|
163d0773a9
|
修改pom文件版本
|
5 years ago |
|
wynne1005
|
1e9f1a5c47
|
质量检测 1
|
5 years ago |
|
钮海涛
|
729a7b6990
|
合并冲突
|
5 years ago |
|
钮海涛
|
5c9da87650
|
合并冲突
|
5 years ago |
|
钮海涛
|
e6b472bcfd
|
合并test代码到dev
|
5 years ago |
|
钮海涛
|
4144e12b5d
|
合并test代码到master
|
5 years ago |
|
钮海涛
|
92f0158dab
|
合并master代码
|
5 years ago |
|
钮海涛
|
310da99743
|
合并master代码
|
5 years ago |
|
wynne1005
|
3af4d32a97
|
mes工位运行状态
|
5 years ago |