puxiao.liao
|
454de274c7
|
Fix bug#8780
|
5 years ago |
|
puxiao.liao
|
71d729b7f5
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
puxiao.liao
|
16f1ed34a5
|
Fix bug#8780
|
5 years ago |
 王杰
|
6232d14e61
|
[任务：2066，状态机异常处理]
|
5 years ago |
qianhs
|
5c31f6c54e
|
Merge remote-tracking branch 'origin/test' into test
|
5 years ago |
|
qianhs
|
6d4a1b6975
|
BH-CODE 出库，绑定
|
5 years ago |
袁津哲
|
7aaa8bca6d
|
合并dev分支代码到test分支
|
5 years ago |
|
puxiao.liao
|
9a65fc95fa
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
puxiao.liao
|
9975335acb
|
Finish Task #2033 Cost:8h
|
5 years ago |
宋军超
|
3c1f8cf6b1
|
Finish Task #1889 Cost:24h
|
5 years ago |
|
袁津哲
|
b0f3873aea
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
袁津哲
|
a8dd9831e0
|
Start Task #2021,2022 Cost:8h Left:8h
|
5 years ago |
 曾贞一
|
36f9068e4c
|
【冲突】
|
5 years ago |
|
曾贞一
|
4c3571182c
|
【冲突】
|
5 years ago |
|
曾贞一
|
523e4b7b3b
|
【2016 BH-回传检测结果至MES系统】
|
5 years ago |
陈思洁
|
35fdc95250
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
|
5 years ago |
|
陈思洁
|
0727370002
|
8660 MES-202005-PCN首检、巡检需要支持扫描产品条码录入检测值-20200527
|
5 years ago |
wei.peng
|
d753bdc5b6
|
fix(数据层): 数据库操作根据AOP对DAO的方法进行分切数据源
|
5 years ago |
|
wei.peng
|
adb95f100f
|
Ics 日志收集功能完成
|
5 years ago |
|
wei.peng
|
1a079a1b89
|
feat(自定义报表): 自定义样式功能开发
1. Pojo 实体创建
2. Service 实现唯一校验
3. 使用CRUD Controller 实现API 接口
|
5 years ago |
|
陈思洁
|
2efab3b0cc
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
陈思洁
|
01e7224d1e
|
【合并冲突】
|
5 years ago |
 钮海涛
|
7414b76d85
|
修复合并版本问题
|
5 years ago |
|
钮海涛
|
32a566be93
|
Merge branch 'test' into dev
|
5 years ago |
|
钮海涛
|
6061f89d43
|
修复合并版本问题
|
5 years ago |
|
宋军超
|
433a6cf744
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
宋军超
|
570be85b8d
|
Fix Bug #8744
|
5 years ago |
|
puxiao.liao
|
d3f2434aa0
|
Fix bug#8752,8753
|
5 years ago |
|
袁津哲
|
1e29445697
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
袁津哲
|
868e82d83a
|
Start Task #2019 Cost:16h Left:0h
Finish Task #2019 Cost:16h
|
5 years ago |
|
陈思洁
|
4950cc1067
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
陈思洁
|
1102513fb7
|
【1926 盲检工步】
|
5 years ago |
|
曾贞一
|
7134bad17f
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
曾贞一
|
b2d9741453
|
【2009 天津麦格纳WMS-报表-库位利用率】
|
5 years ago |
|
钮海涛
|
75e744e07e
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
钮海涛
|
7b83f8fa50
|
新增aps序列化id
|
5 years ago |
汪云昊
|
a4ba058ee3
|
表单查询条件
Rest是适配器 requestBody
|
5 years ago |
|
曾贞一
|
6e70e3257b
|
【2009 天津麦格纳WMS-报表-库位利用率】
|
5 years ago |
|
曾贞一
|
faf8cced03
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
曾贞一
|
4346eb647b
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
曾贞一
|
31c26017c1
|
【2009 天津麦格纳WMS-报表-库位利用率】
|
5 years ago |
|
王杰
|
215ffc080b
|
ptl
|
5 years ago |
|
钮海涛
|
5643f1aab4
|
Merge remote-tracking branch 'origin/test' into test
|
5 years ago |
|
陈思洁
|
76b96540ca
|
【1926 盲检工步】
|
5 years ago |
|
陈思洁
|
dda5a4c7e9
|
【合并冲突】
|
5 years ago |
|
陈思洁
|
55de940f7c
|
【1926 盲检工步】
|
5 years ago |
|
陈思洁
|
bbef19ed71
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
陈思洁
|
f6cd0b6b0b
|
【8685 05 2.3.3.6 队列条码打印-管理端-查、打印】
|
5 years ago |
wynne1005
|
85f99fcdfa
|
提测 还原pom
|
5 years ago |
|
wynne1005
|
b43317c11a
|
还原pom
|
5 years ago |
|
wynne1005
|
5f80cc4322
|
Merge branch 'dev' into test
|
5 years ago |
|
wynne1005
|
ca080002a1
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
钮海涛
|
dea25ce166
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
钮海涛
|
3a40d278ac
|
修复平台登录问题
|
5 years ago |
|
陈思洁
|
759cb39827
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
陈思洁
|
260899368d
|
【8685 05 2.3.3.6 队列条码打印-管理端-查、打印】
|
5 years ago |
|
wynne1005
|
aa5c13dde1
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
钮海涛
|
2e434bc859
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
钮海涛
|
5610e5a455
|
完成SWEB任务
|
5 years ago |
|
王杰
|
5ccc6c4408
|
andon
|
5 years ago |
|
puxiao.liao
|
47a7a0a9a3
|
BH 需求报表的修改
|
5 years ago |
|
袁津哲
|
00f07acd45
|
Fix Bug #1916,1917
|
5 years ago |
|
wynne1005
|
2d69c3ab18
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
wynne1005
|
6b9d56f9e0
|
自测修改
|
5 years ago |
joke.wang
|
00ca9bef40
|
Finish Task #1960 Cost:16h
|
5 years ago |
|
宋军超
|
56dec41ad0
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
宋军超
|
f5074fba08
|
Finish Task #1898 Cost:16h
|
5 years ago |
|
陈思洁
|
94c7526d65
|
【盲检工步】
|
5 years ago |
|
puxiao.liao
|
7f76cf0ad3
|
BH 需求修改
|
5 years ago |
|
陈思洁
|
4d4469ebc9
|
【合并冲突】
|
5 years ago |
|
陈思洁
|
3848c6da14
|
【盲检工步】
|
5 years ago |
|
宋军超
|
febbb549fc
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
宋军超
|
612d768999
|
Start Task #1932 Cost:5h Left:3h
|
5 years ago |
|
qianhs
|
86f6fefd5b
|
BH-CODE 出库，绑定
|
5 years ago |
|
钮海涛
|
d0eea0eb9a
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
钮海涛
|
470bceac6a
|
Start Task #1973 Cost:2h
Start Task #1971 Cost:2h
Start Task #1970 Cost:2h
Effort Task #1968 Cost:4h
|
5 years ago |
|
钮海涛
|
7286ce7ebb
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
钮海涛
|
f7c42ee90d
|
Start Task #1973 Cost:2h
Start Task #1971 Cost:2h
Start Task #1970 Cost:2h
|
5 years ago |
|
joke.wang
|
ca0b92aa6a
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
joke.wang
|
a8241a1694
|
Start Task #1960 Cost:8h Left:8h
|
5 years ago |
|
puxiao.liao
|
1b84b3aeee
|
Fix bug#8637,8697
|
5 years ago |
|
宋军超
|
4d2f200677
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
宋军超
|
a47eb08a8e
|
Start Task #1934 Cost:8h Left:8h
|
5 years ago |
|
袁津哲
|
399c9c828e
|
Fix Bug #1916,1917
|
5 years ago |
|
袁津哲
|
271e7264a4
|
Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
# modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java
|
5 years ago |
|
袁津哲
|
31bd8754df
|
Fix Bug #1916,1917
|
5 years ago |
|
宋军超
|
6f1bba9997
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
宋军超
|
c2a5a17379
|
工步参数添加工步弹框参数字段
|
5 years ago |
|
王杰
|
b0b276ba66
|
[任务：1938]
|
5 years ago |
|
joke.wang
|
342e5f7ab2
|
Effort Task #1915 Cost:2h Left:0h
|
5 years ago |
|
wynne1005
|
8ef3997038
|
还原pom
|
5 years ago |
|
wynne1005
|
4150543cb4
|
Effort Task #1940 Cost:16h Left:8h
|
5 years ago |
|
袁津哲
|
f4ff8205f6
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
袁津哲
|
a4bedf2354
|
Fix Bug #1916,1917
|
5 years ago |
|
钮海涛
|
f1a6f66ccb
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
钮海涛
|
15a3d95c61
|
Start Task #1968 Cost:3h
|
5 years ago |
|
puxiao.liao
|
b5aa990ea7
|
Fix bug#8633
|
5 years ago |
|
钮海涛
|
bbde1ebc9c
|
Merge branch 'dev' into test
|
5 years ago |
|
钮海涛
|
4d26c95639
|
Merge branch 'test' into dev
|
5 years ago |
|
陈思洁
|
3d0524ec1f
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |