jenkins
|
41f03a13d8
|
Merge remote-tracking branch 'origin/dev' into test
|
7 years ago |
crish
|
571ad144b7
|
解决冲突
Signed-off-by: crish <570360737@qq.com>
|
7 years ago |
yunhao.wang
|
6ebc22e6cc
|
master分支配置调整
|
7 years ago |
|
crish
|
c771fa925b
|
更改model位置
Signed-off-by: crish <570360737@qq.com>
|
7 years ago |
|
yunhao.wang
|
58247fe3f1
|
清除iml
|
7 years ago |
Silliter
|
29b605c749
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
7 years ago |
jiajack
|
9137fe9c4f
|
工位程序业务编写
|
7 years ago |
|
jenkins
|
0c7b87bf24
|
Merge remote-tracking branch 'origin/dev' into test
|
7 years ago |
|
crish
|
5daf6d960f
|
hqpPack优化
Signed-off-by: crish <570360737@qq.com>
|
7 years ago |
|
Silliter
|
f8b89c930b
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
7 years ago |
yiming.gu
|
a1a63c2247
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
7 years ago |
|
yiming.gu
|
feace14920
|
PCN同步MES主数据
|
7 years ago |
|
jenkins
|
2f57ee75d5
|
Merge remote-tracking branch 'origin/dev' into test
|
7 years ago |
|
crish
|
7fc2fe8914
|
生产计划，生产工单，生产队列
Signed-off-by: crish <570360737@qq.com>
|
7 years ago |
|
Silliter
|
c8c8dc6750
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
7 years ago |
|
crish
|
e4c1f3ae72
|
生产队列
Signed-off-by: crish <570360737@qq.com>
|
7 years ago |
|
jenkins
|
ff991142ae
|
Merge remote-tracking branch 'origin/dev' into test
|
7 years ago |
|
Silliter
|
3d56e2539d
|
合并dev代码
|
7 years ago |
|
crish
|
85ae1e2455
|
生产工单接口开发
|
7 years ago |
|
crish
|
34e6d97b27
|
生产工单
|
7 years ago |
|
jenkins
|
fb4be4580d
|
Merge remote-tracking branch 'origin/dev' into test
|
7 years ago |
|
yiming.gu
|
3112e5e72c
|
生产工单实体添加注解
|
7 years ago |
|
Silliter
|
83ce4f0efb
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
7 years ago |
|
crish
|
a62ead1c25
|
Mes生产计划，生产工单
|
7 years ago |
|
Silliter
|
0c12793473
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
7 years ago |
|
crish
|
82a798083b
|
MES 生产队列，生产工单模块
|
7 years ago |
gragon.xu
|
311eaf979a
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
7 years ago |
|
crish
|
21ef38428c
|
Merge remote-tracking branch 'origin/dev' into dev
|
7 years ago |
|
crish
|
e5e0c05b9f
|
Mes生产计划开发
|
7 years ago |
|
jiajack
|
2737ea90fd
|
修改排序字段命名
|
7 years ago |
|
Silliter
|
6cb456fcc4
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
7 years ago |
|
crish
|
f7b85978cc
|
MES Repository构建
|
7 years ago |
|
crish
|
71607407ac
|
MES 班次信息实体构建
|
7 years ago |
|
Silliter
|
1896472e63
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
7 years ago |
|
crish
|
6916ae20de
|
客户产线代码实体和Repository
|
7 years ago |
|
crish
|
5f13bf7f1d
|
实体属性修改
|
7 years ago |
|
Silliter
|
65b388d048
|
合并dev分支代码
|
7 years ago |
|
jiajack
|
3cf0c42569
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
7 years ago |
|
jiajack
|
7e14a06a8d
|
添加方法类型备注
|
7 years ago |
|
yunhao.wang
|
9c54bc6f9d
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
7 years ago |
|
crish
|
b422165082
|
MES Repository构建
|
7 years ago |
|
crish
|
49dcd8b009
|
MES Repository构建
|
7 years ago |
|
Silliter
|
b198b38b43
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
7 years ago |
|
crish
|
d08b12e1d7
|
Mes业务表实体，增加数据类型返回为空的get方法
|
7 years ago |
|
Silliter
|
df714efc3b
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
7 years ago |
|
crish
|
3675175bf1
|
MES项目pojo构建
|
7 years ago |
|
Silliter
|
d885d6b877
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
7 years ago |
|
crish
|
8543318e32
|
Merge remote-tracking branch 'origin/dev' into dev
|
7 years ago |
|
crish
|
ab124f2c29
|
MES业务Bean
|
7 years ago |
|
jiajack
|
3980e05d2b
|
mes新增通用功能可配置的业务-完善
|
7 years ago |
|
crish
|
f981047fb4
|
MES实体
|
7 years ago |
|
jiajack
|
3a5f43f97b
|
删除iml文件
|
7 years ago |
|
Silliter
|
dcd044beeb
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
7 years ago |
|
jiajack
|
a819af268c
|
实体新增
|
7 years ago |
|
Silliter
|
92c5457521
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
7 years ago |
|
jiajack
|
9c468e70d1
|
实体新增
|
7 years ago |
|
Silliter
|
b9d013280f
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
7 years ago |
|
jiajack
|
c4e0f42416
|
实体新增
|
7 years ago |
|
yunhao.wang
|
19a57e8c3e
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
7 years ago |
|
jiajack
|
4093330dc3
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
7 years ago |
|
jiajack
|
6f823a5ed9
|
删除多余实体
|
7 years ago |
|
jiajack
|
b04895c67c
|
实体新增
|
7 years ago |
wei.peng
|
60ca989dfc
|
无法创建表问题修复
不懂请看提交日志
|
7 years ago |
|
Silliter
|
111c6177c9
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
7 years ago |
alwaysfrin
|
ea2eb6103d
|
优化调整
|
7 years ago |
|
wei.peng
|
47105866be
|
合并代码 解决冲突
|
7 years ago |
|
wei.peng
|
47dd4c68b5
|
配置文件修改 Test to dev
|
7 years ago |
|
wei.peng
|
9eb7122e99
|
发布 正式版本 1.0
|
7 years ago |
|
yunhao.wang
|
cb95d0a713
|
项目pom版本更新为test
|
7 years ago |
|
wei.peng
|
5584ec7ce5
|
定时任务
定时任务表达式 功能完成
定时任务 功能完成
权限
用户管理 功能完成
用户登录 功能完成
|
7 years ago |
|
wei.peng
|
c2b3d3b5ba
|
删除target 文件夹 或者删除.iml 文件
|
7 years ago |
|
alwaysfrin
|
00f95dda13
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# modules/i3plus-pojo-platform/target/classes/cn/estsh/i3plus/pojo/platform/bean/SessionUser.class
# modules/i3plus-pojo-platform/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
# modules/i3plus-pojo-platform/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
# modules/i3plus-pojo-wms/target/classes/cn/estsh/i3plus/pojo/wms/repository/FactoryStoreRepository.class
|
7 years ago |
|
alwaysfrin
|
883c31288b
|
ignore整理
|
7 years ago |
|
wei.peng
|
cdb48374ac
|
移除iml文件的版本控制
|
7 years ago |
|
wei.peng
|
9121cafcff
|
移除iml文件的版本控制
|
7 years ago |
|
alwaysfrin
|
231efdcf13
|
ignore整理
|
7 years ago |
|
alwaysfrin
|
daf65deb32
|
国家化封装
|
7 years ago |
|
wei.peng
|
aaa0a1b21b
|
初始化系统配置
|
7 years ago |
|
alwaysfrin
|
a208e592bd
|
基础对象初始化
|
7 years ago |