 王杰
|
be9f9e843d
|
Merge remote-tracking branch 'i3plus-pojo/dev' into dev
|
5 years ago |
|
王杰
|
9675274a0d
|
ptl
|
5 years ago |
袁津哲
|
32ddc567a0
|
Start Task #2021 Cost:24h Left:0h
Finish Task #2021 Cost:24h
|
5 years ago |
|
袁津哲
|
0067e31420
|
合并test分支代码到dev分支
|
5 years ago |
|
袁津哲
|
a871d65e1f
|
Merge remote-tracking branch 'origin/test' into test
# Conflicts:
# modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java
|
5 years ago |
|
袁津哲
|
0a5f45840a
|
Fix Bug #8778
|
5 years ago |
宋军超
|
d18beff50c
|
Finish Task #2094 Cost:16h
|
5 years ago |
 钮海涛
|
7982cefc1e
|
Merge branch 'test' into dev
|
5 years ago |
|
钮海涛
|
2f8b0ba5db
|
修复版本问题
|
5 years ago |
qianhs
|
057439d050
|
Finish Task #2080 Cost:8h
Finish Task #2081 Cost:12h
Finish Task #2083 Cost:8h
|
5 years ago |
puxiao.liao
|
3173e43245
|
Fix bug#8742
|
5 years ago |
|
钮海涛
|
a71d7a31ce
|
Merge branch 'master' into test
|
5 years ago |
|
钮海涛
|
8ec9f1b137
|
Merge remote-tracking branch 'origin/test' into test
|
5 years ago |
|
钮海涛
|
471208d051
|
SWEB添加条码状态枚举
|
5 years ago |
|
王杰
|
c39c9b6f70
|
ptl
|
5 years ago |
|
袁津哲
|
12457efe93
|
Merge remote-tracking branch 'origin/test' into test
|
5 years ago |
|
袁津哲
|
fb4bf4cbe2
|
Fix Bug #8778
|
5 years ago |
|
钮海涛
|
97fb0bfd29
|
Fix Bug #8823
|
5 years ago |
joke.wang
|
1afa60623c
|
Finish Task #2090 Cost:16h
|
5 years ago |
陈思洁
|
1cedf2b75b
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
|
5 years ago |
|
陈思洁
|
47904278c5
|
2092 MES202006-首检、巡检检验单据生成逻辑变更-20200615
|
5 years ago |
汪云昊
|
2f71b79ed8
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
汪云昊
|
b9a619f4fe
|
REST调整添加requestBody支持
|
5 years ago |
|
汪云昊
|
fb603db58e
|
表单拾取功能
|
5 years ago |
|
汪云昊
|
2f01b41c1e
|
定时任务控制台日志
|
5 years ago |
|
汪云昊
|
79429024cf
|
MDM基础功能
|
5 years ago |
|
汪云昊
|
08c52dc09f
|
文件服务器优化扩展
添加go-fastdfs支持
|
5 years ago |
|
puxiao.liao
|
5c40073169
|
喜德BUG 修改
|
5 years ago |
wynne1005
|
86363b2012
|
Finish Task #2098 Cost:8h
|
5 years ago |
|
puxiao.liao
|
47a318f238
|
喜德BUG 修改
|
5 years ago |
|
宋军超
|
1ce748eecb
|
Fix Bug #8771
|
5 years ago |
|
puxiao.liao
|
bcb70400eb
|
Finish Task #2027 Cost:10h
|
5 years ago |
|
puxiao.liao
|
2133908ff5
|
Finish Task #2024 Cost:8h
|
5 years ago |
|
袁津哲
|
de48c90800
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
袁津哲
|
7f0b99297f
|
Start Task #2019 Cost:16h Left:0h
Finish Task #2019 Cost:16h
|
5 years ago |
|
宋军超
|
3c53d8a2f2
|
Finish Task #2064 Cost:24h
|
5 years ago |
|
钮海涛
|
f301abbd04
|
Merge remote-tracking branch 'origin/test' into test
|
5 years ago |
|
钮海涛
|
fd45d66968
|
解决合并冲突
|
5 years ago |
|
陈思洁
|
01363fde23
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
陈思洁
|
9f6ecf72a0
|
【2002 泰国内饰生产作业-按生产工单，单件生产】
|
5 years ago |
|
joke.wang
|
f357293ca5
|
plc数据类型修改
|
5 years ago |
|
钮海涛
|
52e0d840af
|
Merge remote-tracking branch 'origin/test' into test
|
5 years ago |
|
钮海涛
|
5a0fea01ca
|
修复版本问题
|
5 years ago |
|
汪云昊
|
e416b032c2
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
汪云昊
|
4fc8c2a80d
|
软适配添加适配发送报文
|
5 years ago |
 曾贞一
|
8476ae75c9
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
曾贞一
|
a2ef35082e
|
【1794 天津麦格纳WMS-报表-库位利用率看板】
|
5 years ago |
|
王杰
|
b946ca7fa1
|
[任务：2066，状态机异常处理]
|
5 years ago |
|
puxiao.liao
|
e57acfacee
|
BH BUG 修改
|
5 years ago |
|
钮海涛
|
414b811871
|
修复启动问题
|
5 years ago |