袁津哲
|
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 |
|
宋军超
|
612d768999
|
Start Task #1932 Cost:5h Left:3h
|
5 years ago |
|
joke.wang
|
a8241a1694
|
Start Task #1960 Cost:8h Left:8h
|
5 years ago |
|
袁津哲
|
399c9c828e
|
Fix Bug #1916,1917
|
5 years ago |
|
宋军超
|
c2a5a17379
|
工步参数添加工步弹框参数字段
|
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 |
|
钮海涛
|
4d26c95639
|
Merge branch 'test' into dev
|
5 years ago |
|
joke.wang
|
d4f0ef157a
|
Finish Task #1915 Cost:8h
|
5 years ago |
|
宋军超
|
659b893903
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
宋军超
|
b05113f63c
|
Finish Task #1887 Cost:16h
|
5 years ago |
|
钮海涛
|
47131ff13f
|
修复版本问题
|
5 years ago |
|
钮海涛
|
f392a13832
|
Merge remote-tracking branch 'remotes/origin/master' into test
|
5 years ago |
|
袁津哲
|
37092cf2c5
|
Task1917、1916:开发关键件绑定、扭矩二合一(PF)、关键件绑定、扭矩二合一(DL)功能
|
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 |
|
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 |
|
wynne1005
|
0636daed51
|
Finish Task:1896 Cost:8h
|
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 |
|
宋军超
|
fd9a2e6d15
|
Start Task #1887 Cost:8h Left:8h
|
5 years ago |
|
joke.wang
|
dd179a6d89
|
Fix Bug #8636
|
5 years ago |
|
joke.wang
|
1a72c16f14
|
Finish Task #1890 Cost:8h
|
5 years ago |
|
wynne1005
|
b48ba8c481
|
Finish Task #1876 Cost:32h
|
5 years ago |
|
wynne1005
|
8aef23e4ad
|
Finish Task #1876 edi webservice解析 Cost:32h
|
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 |
|
袁津哲
|
cad6b7ad89
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |