汪云昊
|
6d71c01178
|
Merge remote-tracking branch 'origin/dev' into test
|
5 years ago |
陈思洁
|
9e9bb2fd03
|
【合并冲突】
|
5 years ago |
|
陈思洁
|
f90371f632
|
【2144 06 1.2.4.6.1.3 装配计划排产】
|
5 years ago |
 王杰
|
8cf6e99cf6
|
mes
|
5 years ago |
宋军超
|
2ef42fdadd
|
Finish Task:2160,2175.北京麦格纳基础数据开发。 Finish Task #2160,2175 Cost:10h
|
5 years ago |
 钮海涛
|
9d64793a5f
|
Merge branch 'master' into test
|
5 years ago |
joke.wang
|
3dda15e00a
|
Finish Task #2153 Cost:24h
|
5 years ago |
袁津哲
|
edae2b00f6
|
Fix Bug #8996,#9033
1.PCN同步配置界面同步方式及同步类型显示为空-0617
2.原材料上线扫描显示数量不正确
|
5 years ago |
wynne1005
|
64b00d6717
|
接口表添加产品条码
|
5 years ago |
|
陈思洁
|
b65d9e0f3d
|
2171 首检生成逻辑调整
|
5 years ago |
|
wynne1005
|
b0df686091
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
|
5 years ago |
|
wynne1005
|
878acb869f
|
提交zh修改问题
|
5 years ago |
|
袁津哲
|
c066820b18
|
Fix Bug #9001
关键件绑定异常问题
|
5 years ago |
|
袁津哲
|
cb69f62c63
|
Fix Bug #8886
原材料上线扫描，无法看到原材料已扣减数量和剩余数量
|
5 years ago |
wei.peng
|
b0e752c65e
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
王杰
|
0388c36c41
|
mes
|
5 years ago |
|
袁津哲
|
212dccad6c
|
同前端联调倒计时组件逻辑
|
5 years ago |
|
wei.peng
|
ec3febfaa9
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
5 years ago |
|
陈思洁
|
67a7904024
|
【泰国演示问题修复】
|
5 years ago |
|
袁津哲
|
2546395b8d
|
优化定时倒计时组件逻辑和前后端调用逻辑
|
5 years ago |
|
袁津哲
|
089f655cfe
|
优化工位定时组件调用逻辑
|
5 years ago |
|
wynne1005
|
8ff96a0c3f
|
merge master 防止冲突更多
|
5 years ago |
|
joke.wang
|
ab8ee21c66
|
Finish Task #2139 Cost:8h
|
5 years ago |
|
wynne1005
|
b0b07437d6
|
还原pom
|
5 years ago |
|
袁津哲
|
b114daed3f
|
优化代码
|
5 years ago |
|
wynne1005
|
9571604351
|
Merge branch 'dev' into test
|
5 years ago |
|
joke.wang
|
26d7701a49
|
包装扫描需求变更
|
5 years ago |
|
陈思洁
|
3924be2504
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
陈思洁
|
e7e13e53f4
|
【工艺流程设计-更新前端组件】
|
5 years ago |
|
joke.wang
|
f5452667f6
|
Start Task #2139 Cost:16h Left:8h
|
5 years ago |
|
joke.wang
|
672483245c
|
Fix #Bug 8904
|
5 years ago |
|
袁津哲
|
764060bf20
|
Start Task #2118 Cost:8h Left:0h
Finish Task #2118 Cost:8h
|
5 years ago |
|
袁津哲
|
5ee4fd6441
|
开发MES产线AGV停机记录报表功能
|
5 years ago |
|
wynne1005
|
de08f2005e
|
还原hqlpack
|
5 years ago |
|
joke.wang
|
cb4fd979e1
|
包装字段修改
|
5 years ago |
|
wynne1005
|
60c1f6ecab
|
还原pom
|
5 years ago |
|
wynne1005
|
47ae0b46ef
|
还原pom
|
5 years ago |
|
wynne1005
|
ba1ba8bc0f
|
Merge branch 'dev' into test
|
5 years ago |
|
wynne1005
|
8623a5a13d
|
还原pom
|
5 years ago |
|
wynne1005
|
b75347ffc1
|
还原pom
|
5 years ago |
|
wynne1005
|
d969c07317
|
解决冲突
|
5 years ago |
|
wynne1005
|
4eef0f8c45
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
宋军超
|
c9114c9dae
|
Fix Bug #8688
|
5 years ago |
|
王杰
|
a495d0b4ce
|
物料校验项]
|
5 years ago |
|
宋军超
|
247589fc0d
|
Fix Bug #8884
|
5 years ago |
|
wynne1005
|
40d921ddd6
|
优化 新增状态点类型，发运自测1
|
5 years ago |
|
袁津哲
|
42f43c58f5
|
Fix Bug #8778
|
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 |
|
宋军超
|
d18beff50c
|
Finish Task #2094 Cost:16h
|
5 years ago |