 钮海涛
|
471208d051
|
SWEB添加条码状态枚举
|
5 years ago |
 王杰
|
c39c9b6f70
|
ptl
|
5 years ago |
joke.wang
|
1afa60623c
|
Finish Task #2090 Cost:16h
|
5 years ago |
汪云昊
|
2f71b79ed8
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
汪云昊
|
79429024cf
|
MDM基础功能
|
5 years ago |
|
汪云昊
|
08c52dc09f
|
文件服务器优化扩展
添加go-fastdfs支持
|
5 years ago |
宋军超
|
3c53d8a2f2
|
Finish Task #2064 Cost:24h
|
5 years ago |
陈思洁
|
9f6ecf72a0
|
【2002 泰国内饰生产作业-按生产工单，单件生产】
|
5 years ago |
|
joke.wang
|
f357293ca5
|
plc数据类型修改
|
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 |
|
王杰
|
6232d14e61
|
[任务：2066，状态机异常处理]
|
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 |
|
袁津哲
|
b0f3873aea
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
袁津哲
|
a8dd9831e0
|
Start Task #2021,2022 Cost:8h Left:8h
|
5 years ago |
 曾贞一
|
4c3571182c
|
【冲突】
|
5 years ago |
|
曾贞一
|
523e4b7b3b
|
【2016 BH-回传检测结果至MES系统】
|
5 years ago |
wei.peng
|
d753bdc5b6
|
fix(数据层): 数据库操作根据AOP对DAO的方法进行分切数据源
|
5 years ago |
|
钮海涛
|
7414b76d85
|
修复合并版本问题
|
5 years ago |
|
钮海涛
|
32a566be93
|
Merge branch 'test' into dev
|
5 years ago |
|
钮海涛
|
6061f89d43
|
修复合并版本问题
|
5 years ago |
|
宋军超
|
570be85b8d
|
Fix Bug #8744
|
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 |
|
陈思洁
|
dda5a4c7e9
|
【合并冲突】
|
5 years ago |
|
陈思洁
|
55de940f7c
|
【1926 盲检工步】
|
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 |
|
wynne1005
|
aa5c13dde1
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
王杰
|
5ccc6c4408
|
andon
|
5 years ago |
|
puxiao.liao
|
47a7a0a9a3
|
BH 需求报表的修改
|
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 |
|
宋军超
|
f5074fba08
|
Finish Task #1898 Cost:16h
|
5 years ago |
qianhs
|
86f6fefd5b
|
BH-CODE 出库，绑定
|
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 |
|
宋军超
|
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 |
|
袁津哲
|
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 |
|
钮海涛
|
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 |
|
陈思洁
|
a6ba3b6a5c
|
【8671 客户JIT队列，自动定时JOB-生成数据错误】
|
5 years ago |
|
joke.wang
|
d4f0ef157a
|
Finish Task #1915 Cost:8h
|
5 years ago |
|
qianhs
|
b474ef1266
|
Finish Task #1813 Cost:32h
Finish Task #1814 Cost:32h
Finish Task #1815 Cost:16h
|
5 years ago |
|
钮海涛
|
47131ff13f
|
修复版本问题
|
5 years ago |
|
钮海涛
|
da21795f7f
|
Merge branch 'test' into dev
|
5 years ago |
|
钮海涛
|
f392a13832
|
Merge remote-tracking branch 'remotes/origin/master' into test
|
5 years ago |
|
puxiao.liao
|
91688ddab5
|
BH 需求变更
|
5 years ago |
|
qianhs
|
5d32b43e51
|
BH-CODE 出库，绑定
|
5 years ago |
|
袁津哲
|
d65a5a3784
|
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 |
|
袁津哲
|
44f313abc4
|
Task1917、1916:开发关键件绑定、扭矩二合一(PF)、关键件绑定、扭矩二合一(DL)功能
|
5 years ago |
|
宋军超
|
9eda1f67b7
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
宋军超
|
40672559e4
|
修改sonar--BUG类型问题
|
5 years ago |
|
钮海涛
|
c344f017a9
|
修复sonar上的问题
|
5 years ago |
|
wynne1005
|
8955fd2f4d
|
mes提测 还原pom
|
5 years ago |
|
wynne1005
|
23754d3f18
|
mes提测 还原pom
|
5 years ago |
|
wynne1005
|
81753d3260
|
Merge branch 'dev' into test
|
5 years ago |
|
wynne1005
|
81b554fc8b
|
Merge branch 'test'
|
5 years ago |
|
陈思洁
|
677cc85360
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
陈思洁
|
b2384619d4
|
【1891 队列条码打印-管理端】
|
5 years ago |
|
puxiao.liao
|
583c750055
|
BH 需求变更
|
5 years ago |
|
宋军超
|
fd9a2e6d15
|
Start Task #1887 Cost:8h Left:8h
|
5 years ago |
|
puxiao.liao
|
1dc9276e9a
|
BH 需求变更
|
5 years ago |
|
puxiao.liao
|
c06fee639d
|
BH 需求变更
|
5 years ago |
|
qianhs
|
17b27da539
|
BH-CODE 出库，绑定
|
5 years ago |
|
王杰
|
074093a46d
|
[任务：1850 ，安灯流程设计]
|
5 years ago |
|
钮海涛
|
ad79c9fd7b
|
修改BH基础数据
|
5 years ago |
|
qianhs
|
f4c4b4a1f6
|
1,产品条码事务实体类提交
|
5 years ago |
|
joke.wang
|
1a72c16f14
|
Finish Task #1890 Cost:8h
|
5 years ago |
|
陈思洁
|
4d63f9817e
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
陈思洁
|
9b8342b7f5
|
【1865 客户JIT生产队列，自动下达定时JOB】
|
5 years ago |
|
钮海涛
|
999a415d27
|
修复版本问题
|
5 years ago |
|
钮海涛
|
b9cbf9684b
|
Merge branch 'test' into dev
|
5 years ago |
|
钮海涛
|
4921d55bda
|
修复版本问题
|
5 years ago |
|
钮海涛
|
b303cf9a14
|
修复合并问题
|
5 years ago |
|
钮海涛
|
96fdbe0e07
|
Merge branch 'master' into test
|
5 years ago |
|
puxiao.liao
|
491bc32325
|
Fix Bug#8345
|
5 years ago |
 贾文涛
|
a68475d3d0
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
贾文涛
|
a8efa90089
|
bug 7461,count时去掉distinct。Fix Bug #7461
|
5 years ago |
|
袁津哲
|
cad6b7ad89
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
袁津哲
|
f50b76cd1f
|
Task1858:电枪枪头更换计数
|
5 years ago |