 钮海涛
|
1d16e2d938
|
解决合并冲突
|
5 years ago |
 贾文涛
|
492dfbff82
|
pom通过变量方式存在只能引用jar不能引用到项目文件的问题，暂时先还原为最初方式
|
5 years ago |
|
钮海涛
|
3b987436d8
|
新增LES管理功能
|
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 |
 曾贞一
|
779b9d209c
|
【修改 DEV-pom.xml】
|
5 years ago |
luweihao
|
12579c7a14
|
还原pom
|
5 years ago |
|
钮海涛
|
377391abaf
|
修改导入导出进度明细。
|
5 years ago |
|
钮海涛
|
03de37cf7c
|
修改导入导出进度明细。
|
5 years ago |
|
钮海涛
|
4583b87bf5
|
添加导入导出进度明细。
|
5 years ago |
|
钮海涛
|
e1225bbccd
|
添加执行命令组进度明细。
|
5 years ago |
|
钮海涛
|
cf203390b8
|
修正时间段编辑类型
|
5 years ago |
|
钮海涛
|
9e0158e749
|
修改test分支POM配置
|
5 years ago |
|
钮海涛
|
9e34d99d9e
|
修复资源甘特图拖拽问题
|
5 years ago |
|
钮海涛
|
68fc275565
|
修复资源甘特图拖拽问题
|
5 years ago |
|
钮海涛
|
74be235a26
|
修复资源甘特图拖拽问题
|
5 years ago |
|
钮海涛
|
b0bbd132c6
|
修复资源甘特图拖拽问题
|
5 years ago |
|
钮海涛
|
4013ed776b
|
修复炉资源排程问题
|
5 years ago |
|
钮海涛
|
9627b6cf9e
|
修改资源甘特图侧边栏显示内容
|
5 years ago |
|
钮海涛
|
2eb244c41c
|
修改资源甘特图侧边栏显示内容
|
5 years ago |
|
钮海涛
|
14f47f1ab4
|
修改字段编辑弹出框
|
5 years ago |
|
钮海涛
|
6afa007224
|
新增拖拽接口
|
5 years ago |
|
钮海涛
|
8b1ae09885
|
修改订单甘特图
|
5 years ago |
|
钮海涛
|
629e2f8270
|
新增新增或保存字段信息接口
|
5 years ago |
|
钮海涛
|
04b02c084b
|
新增甘特图可拖拽资源提示功能
|
5 years ago |
|
钮海涛
|
335ab2ce51
|
新增KPI接口
|
5 years ago |
 王杰
|
c87b00756f
|
dev分支修改pom
|
5 years ago |
gcj
|
49134cc5b3
|
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
钮海涛
|
81b84d86e5
|
新增KPI接口
|
5 years ago |
jenkins
|
0e35bd1d6b
|
Jenkins自动合并
|
5 years ago |
|
钮海涛
|
e0f81a73d7
|
修改甘特图日历接口
|
5 years ago |
jokelone
|
0dfb948810
|
Merge branch 'dev' into test
|
5 years ago |
|
钮海涛
|
8385038290
|
修改甘特图日历接口
|
5 years ago |
|
钮海涛
|
68bba613e3
|
新增表达式录入界面接口
|
5 years ago |
|
钮海涛
|
222e1b020d
|
新增表达式录入界面接口
|
5 years ago |
|
jokelone
|
056dbaacf2
|
Merge branch 'dev' into test
|
6 years ago |
|
钮海涛
|
57b3b4242e
|
新增表达式录入界面接口
|
6 years ago |
|
钮海涛
|
5e8e05ddb4
|
新增表达式录入界面接口
|
6 years ago |
|
王杰
|
e43d593db6
|
更新 'modules/i3plus-pojo-aps/pom.xml'
|
6 years ago |
|
王杰
|
cfa54aa2b6
|
修改pom
|
6 years ago |
|
王杰
|
338367f3c3
|
Merge branch 'dev' into test
|
6 years ago |
|
钮海涛
|
64bfbb5013
|
新增甘特图工作块连线功能
|
6 years ago |
|
王杰
|
52f4854621
|
Merge branch 'dev' into test
|
6 years ago |
|
钮海涛
|
04009f02e0
|
新增数据校验功能
|
6 years ago |
|
jenkins
|
ad6d4f5034
|
Jenkins自动合并
|
6 years ago |
|
钮海涛
|
d819f7b6c7
|
修复报表分页问题
|
6 years ago |
|
jenkins
|
d44d5d79ab
|
Jenkins自动合并
|
6 years ago |
|
钮海涛
|
0dddbb936c
|
新增报表接口
|
6 years ago |
|
王杰
|
6da48220a5
|
Merge branch 'dev' into test
|
6 years ago |
|
钮海涛
|
d4f963ee70
|
新增报表接口
|
6 years ago |
|
王杰
|
1d920627ec
|
Merge branch 'dev' into test
|
6 years ago |
|
钮海涛
|
5f3f973c3e
|
新增报表接口
|
6 years ago |
crish
|
4d3adf5daf
|
Merge branch 'dev' into test
|
6 years ago |
|
钮海涛
|
f640f97116
|
修复副资源排程Bug
|
6 years ago |
|
钮海涛
|
f969ab4599
|
修复副资源排程Bug
|
6 years ago |
|
陆卫豪
|
62800f757e
|
Merge branch 'dev' of i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
钮海涛
|
bed955575d
|
修复规则组合关联问题
|
6 years ago |
|
王杰
|
ac5432bebb
|
解决冲突
|
6 years ago |
|
陆卫豪
|
d6ff7aa2b1
|
Merge branch 'dev' of i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
钮海涛
|
89943f6586
|
修复资源表多选枚举显示问题。
|
6 years ago |
|
钮海涛
|
7b47c7b942
|
修复关联对象字段显示问题
|
6 years ago |
许心洁
|
b88a879c58
|
Merge branches 'master' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo
|
6 years ago |
|
jenkins
|
603004c190
|
Merge branch 'dev' of i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
钮海涛
|
1720952d23
|
修复自定义字段表达式取值问题
|
6 years ago |
|
王杰
|
a595fed4fe
|
Merge branch 'test'
|
6 years ago |
|
王杰
|
7a023d0f4b
|
Merge branch 'dev' into test
|
6 years ago |
|
钮海涛
|
407fdbf217
|
修复对象关联删除出错问题
|
6 years ago |
|
王杰
|
7f08847c50
|
Merge branch 'test'
|
6 years ago |
wei.peng
|
02a9c64a42
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
钮海涛
|
e3ba4f6349
|
新增规则组合执行接口
|
6 years ago |
|
陆卫豪
|
4a76c480ac
|
Merge branch 'test' of i3-IMPP/i3plus-pojo into master
|
6 years ago |
|
许心洁
|
3559962ccb
|
Merge branches 'master' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo
|
6 years ago |
|
王杰
|
1a7164c474
|
Merge branch 'dev' into test
|
6 years ago |
|
钮海涛
|
9597cee596
|
修复删除对象Bug，关联没有删除问题
|
6 years ago |
|
crish
|
410558d43c
|
Merge branch 'test'
|
6 years ago |
|
王杰
|
9137555226
|
Merge branch 'dev' into test
|
6 years ago |
|
钮海涛
|
58b0f4a531
|
新增BOM树信息获取接口
|
6 years ago |
|
许心洁
|
208410340e
|
Merge branches 'master' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo
|
6 years ago |
张哲铭
|
8e19f4dde3
|
Merge branch 'dev' into test
|
6 years ago |
|
钮海涛
|
8e614bcb72
|
1:增加多选枚举的功能。
|
6 years ago |
|
钮海涛
|
6be9a55983
|
1:增加多选枚举的功能。
|
6 years ago |
|
crish
|
c4d7a2380c
|
Merge branch 'test'
|
6 years ago |
|
钮海涛
|
bd834a24cb
|
1:增加资源甘特图获取数据接口
|
6 years ago |
|
许心洁
|
017cd18950
|
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
钮海涛
|
64cda23c12
|
1:增加资源甘特图获取数据接口
|
6 years ago |
|
许心洁
|
9755e5f751
|
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
钮海涛
|
809e23aad7
|
1:修复启动时从数据库加载数据时的Bug。
|
6 years ago |
|
钮海涛
|
7aa078e7ce
|
1:修复未设置基准时间的Bug
|
6 years ago |
|
陆卫豪
|
576f02f75d
|
Merge branch 'dev' of i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
钮海涛
|
2c47556abf
|
1：新增工作计划资源位置插入逻辑
|
6 years ago |
|
王杰
|
2417b40635
|
Merge branch 'dev' into test
|
6 years ago |
|
钮海涛
|
921be6b0f2
|
1：新增工作计划资源位置插入逻辑
|
6 years ago |
|
许心洁
|
c9f26c22c1
|
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
钮海涛
|
6a1990a215
|
1：新增弹出框选择多个对象信息接口
|
6 years ago |
|
钮海涛
|
b05711dc6c
|
1：新增弹出框选择多个对象信息接口
|
6 years ago |
|
许心洁
|
6d59aeddad
|
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
钮海涛
|
794bbc4fba
|
1：新增弹出框选择多个对象信息接口
|
6 years ago |
|
王杰
|
35cf3cf162
|
Merge branch 'dev' into test
|
6 years ago |
|
钮海涛
|
5b712ce774
|
1：新增弹出框选择多个对象信息接口
|
6 years ago |
|
许心洁
|
c79786a677
|
合并开发分支的代码POM文件被改成DEV修改回TEST
|
6 years ago |
|
钮海涛
|
d99ad6c44a
|
1：新增弹出框选择对象信息接口。
|
6 years ago |
|
钮海涛
|
5183163abd
|
1：新增弹出框选择对象信息接口。
|
6 years ago |
|
crish
|
18161e8191
|
Merge branch 'test'
|
6 years ago |
|
许心洁
|
0c20a2b655
|
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
钮海涛
|
16162542ba
|
1：修改listByPage由GET方法为POST方法。
|
6 years ago |
|
许心洁
|
1d0a2351b9
|
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
钮海涛
|
1f9fc9f280
|
1：新增实现生产时间的计算逻辑
|
6 years ago |
|
许心洁
|
d5864ba490
|
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
钮海涛
|
6816c7b566
|
1：新增实现生产时间的计算逻辑
|
6 years ago |
|
crish
|
fa4f58ec6c
|
pom冲突
|
6 years ago |
刘辉
|
4ffc63ce83
|
Merge branch 'dev' of i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
钮海涛
|
5a682467d1
|
1：在字段信息表中新增枚举项数组，前端在选择枚举内容时不需要再从后端获取。
|
6 years ago |
|
许心洁
|
9fa2f376e4
|
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
钮海涛
|
2dc63a9a4e
|
1：修改部分字段默认在界面不显示
2：为字段新增默认值。
|
6 years ago |
|
crish
|
1de89d732b
|
本地误拉了test代码，解决pom
|
6 years ago |
|
crish
|
9f9874902d
|
冲突解决
|
6 years ago |
于学杰
|
68a6c85068
|
Merge branch 'dev' into test
|
6 years ago |
|
钮海涛
|
8a316ff2d5
|
add mrp function to aps
|
6 years ago |
|
许心洁
|
7863325afd
|
本地误拉了测试的代码，还原后提交，在测试分支拉开发分支的代码也得还原
|
6 years ago |
|
许心洁
|
b7b78b85ac
|
误拉了test分支的代码：还原
|
6 years ago |
|
王杰
|
18bc35f60d
|
Merge branch 'dev' into test
|
6 years ago |
|
钮海涛
|
5c68a15d0c
|
add mrp function to aps
|
6 years ago |
|
许心洁
|
61804a27b3
|
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
钮海涛
|
980cb2a56b
|
add product order spread to aps
|
6 years ago |
|
许心洁
|
e35cf183da
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
钮海涛
|
10ce1e165e
|
add order spread to aps
|
6 years ago |
|
王杰
|
80f50fe800
|
Merge branch 'dev' into test
|
6 years ago |
|
钮海涛
|
1d281da531
|
add order spread to aps
|
6 years ago |
|
jenkins
|
479caf432d
|
Merge branch 'dev' into test
|
6 years ago |
|
钮海涛
|
be30cecf13
|
add integration to aps
|
6 years ago |
|
jenkins
|
e56a5b037c
|
Merge branch 'dev' into test
|
6 years ago |
|
钮海涛
|
4a78dfa493
|
add integration to aps
|
6 years ago |
|
jenkins
|
790c0b4ec6
|
Merge branch 'dev' into test
|
6 years ago |
|
钮海涛
|
f8b385d274
|
add integration to aps
|
6 years ago |
|
jenkins
|
cbc5882bd5
|
Merge branch 'dev' into test
|
6 years ago |
|
钮海涛
|
153238d31a
|
add integration to aps
|
6 years ago |
|
jenkins
|
c29c350ef8
|
Merge branch 'dev' into test
|
6 years ago |
|
钮海涛
|
6b182cf4b5
|
add fix controller bugs
|
6 years ago |
|
曾贞一
|
a4262c5e1e
|
pom文件修改 dev改成test
|
6 years ago |
|
crish
|
b473fd1b46
|
pojo开发环境 pom文件修改为dev
|
6 years ago |
|
crish
|
87f8dc38a6
|
测试环境
|
6 years ago |
|
钮海涛
|
68da44de9e
|
add expression to aps
|
6 years ago |
|
钮海涛
|
d3194ac4bc
|
add expression to aps
|
6 years ago |
|
钮海涛
|
70868503d4
|
add beans services controllers to aps
|
6 years ago |
|
钮海涛
|
3c907fe88a
|
add material bean to aps
|
6 years ago |
|
钮海涛
|
6008478aec
|
add customer field function
|
6 years ago |