 王杰
|
473ebd5ec8
|
[任务：2219]
|
5 years ago |
wynne1005
|
d2869dc31a
|
tmp
|
5 years ago |
joke.wang
|
aabd7b5d1d
|
Fix Bug #9112
|
5 years ago |
|
joke.wang
|
d44312c470
|
Fix Bug #9151
|
5 years ago |
袁津哲
|
56a4edc4c0
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
袁津哲
|
295860683a
|
开发涂装检查工位和一次、二次箱条码Un-Pack-后端开发业务逻辑
|
5 years ago |
 钮海涛
|
0626d6f969
|
修复版本问题
|
5 years ago |
|
钮海涛
|
e42ea19f37
|
修复版本问题
|
5 years ago |
|
钮海涛
|
8d4c5f3cd4
|
Merge branch 'test' into dev
|
5 years ago |
|
王杰
|
272d647073
|
【任务2219】
|
5 years ago |
|
钮海涛
|
2478fc3b14
|
修复版本问题
|
5 years ago |
|
钮海涛
|
0f2f56163e
|
Merge branch 'master' into test
|
5 years ago |
|
wynne1005
|
d9f619e1a0
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
wynne1005
|
3b5142a1f8
|
edi
|
5 years ago |
宋军超
|
6f454c95a4
|
Start Task #2212,2205 Cost:8h Left:16h
|
5 years ago |
|
宋军超
|
c44e6ac965
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
袁津哲
|
e3a86fdbab
|
涂装条码打印、涂装上线功能联调
|
5 years ago |
|
joke.wang
|
cf1020d82f
|
删除@Lob
|
5 years ago |
|
joke.wang
|
2829bb5afb
|
pcn同步对象映射
|
5 years ago |
|
wynne1005
|
8ae7ce53b7
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
宋军超
|
a757d2c339
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
joke.wang
|
2ce2e20c0b
|
包装扫描数量计算有误修复
|
5 years ago |
|
袁津哲
|
f607860c57
|
Fix Bug #8845
修改关键零部件绑定的数据列中增加带绑定条码的长度、特征码内容bug
|
5 years ago |
|
袁津哲
|
aaaa591be4
|
优化关键条码绑定逻辑
|
5 years ago |
|
wynne1005
|
cf1edee02e
|
edi
|
5 years ago |
|
王杰
|
15e7f2a0b5
|
pom
|
5 years ago |
|
王杰
|
ea5a069eeb
|
pom
|
5 years ago |
|
王杰
|
ed64d12875
|
pojo
|
5 years ago |
|
宋军超
|
712f1e8d3d
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
宋军超
|
9218ca44a7
|
产品条码表添加生产批次lotNo
|
5 years ago |
|
joke.wang
|
b32136f75d
|
Fix Bug #9078
|
5 years ago |
|
王杰
|
f3ffdc7d4c
|
dev merge test
|
5 years ago |
|
王杰
|
2c16efcb72
|
Merge branch 'test' into dev
|
5 years ago |
|
王杰
|
7d5d36d084
|
test merge master
|
5 years ago |
|
王杰
|
70d58be136
|
pom
|
5 years ago |
|
王杰
|
91d0ec1671
|
Merge branch 'master' into test
|
5 years ago |
|
袁津哲
|
3247ef5ed7
|
优化涂装上线工位展示组件逻辑
|
5 years ago |
|
宋军超
|
fe05a76f6f
|
添加涂装功能实体字段与model
|
5 years ago |
|
袁津哲
|
66b98dd6d5
|
1.开发涂装上线功能逻辑
2.开发涂装工单条码打印逻辑
|
5 years ago |
|
宋军超
|
68fa329701
|
添加涂装打印实体
|
5 years ago |
陈思洁
|
5431d09073
|
【8983 需求调整-泰国MES，工单下达逻辑调整】
|
5 years ago |
|
wynne1005
|
c8178975af
|
StationRequestBean添加状态机代码
|
5 years ago |
|
钮海涛
|
44ba68bb04
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
钮海涛
|
d08465dd38
|
修复版本问题
|
5 years ago |
|
陈思洁
|
80e0ec63bb
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
陈思洁
|
498d6821a1
|
【2145 06 1.2.4.6.1.1 注塑计划排产】
|
5 years ago |
|
钮海涛
|
800a954b7f
|
Merge branch 'test' into dev
|
5 years ago |
|
王杰
|
c2a6fb1684
|
[任务2186 涂装导入]
|
5 years ago |
|
陈思洁
|
1f6af14316
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
陈思洁
|
0d81228ce7
|
【2145 06 1.2.4.6.1.1 注塑计划排产】
|
5 years ago |
|
joke.wang
|
1f05cfca4c
|
Finish Task #2152 Cost:16h
|
5 years ago |
|
袁津哲
|
a4820f236e
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
袁津哲
|
3d88913343
|
物料表中新增标准包规数量字段
|
5 years ago |
汪云昊
|
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 |
|
钮海涛
|
ac7e69e51e
|
修复版本问题
|
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 |
|
钮海涛
|
7982cefc1e
|
Merge branch 'test' into dev
|
5 years ago |
|
钮海涛
|
2f8b0ba5db
|
修复版本问题
|
5 years ago |
|
钮海涛
|
a71d7a31ce
|
Merge branch 'master' into test
|
5 years ago |
|
袁津哲
|
fb4bf4cbe2
|
Fix Bug #8778
|
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 |
|
wynne1005
|
86363b2012
|
Finish Task #2098 Cost:8h
|
5 years ago |
|
宋军超
|
1ce748eecb
|
Fix Bug #8771
|
5 years ago |
|
宋军超
|
3c53d8a2f2
|
Finish Task #2064 Cost:24h
|
5 years ago |
|
陈思洁
|
9f6ecf72a0
|
【2002 泰国内饰生产作业-按生产工单，单件生产】
|
5 years ago |
|
袁津哲
|
7aaa8bca6d
|
合并dev分支代码到test分支
|
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 |
 曾贞一
|
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 |
|
陈思洁
|
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 |
|
袁津哲
|
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 |
|
陈思洁
|
1102513fb7
|
【1926 盲检工步】
|
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 |
|
陈思洁
|
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
|
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 |
|
陈思洁
|
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 |