wynne1005
|
2ae471febd
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
wynne1005
|
3c1c6c8c55
|
新增通用对象 password
|
5 years ago |
陈思洁
|
e9ce24d6f9
|
【2794 09 ext 19081-返工返修标签打印变更-20200813】
|
5 years ago |
joke.wang
|
612c919e5f
|
bypass优化
|
5 years ago |
|
wynne1005
|
7c9c0890fa
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
songss
|
28d7b79f82
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
wynne1005
|
114654dd99
|
冲突解决
|
5 years ago |
|
wynne1005
|
696695ef0e
|
海纳川变更 10923 10894
|
5 years ago |
|
songss
|
d050274450
|
新增查询生产表数据接口
|
5 years ago |
|
songss
|
2f953ac223
|
新增获取中航DB复核项接口。新增修改生产数据接口
|
5 years ago |
|
joke.wang
|
bc383d573b
|
生产工单增加特殊标示字段
|
5 years ago |
|
songss
|
c5de9c9841
|
Merge remote-tracking branch 'origin/test' into test
# Conflicts:
# modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java
|
5 years ago |
宋军超
|
735838e27f
|
天津麦格纳修改紧急问题
|
5 years ago |
|
宋军超
|
706d0fc43d
|
天津麦格纳问题修改
|
5 years ago |
|
陈思洁
|
d92c669f79
|
【11493 20042 标签条码模版需要显示客户名称 0921】
|
5 years ago |
|
songss
|
f222395015
|
襄阳中航新增复核生产数据表数据工步。新增复核生产数据表异常数据
|
5 years ago |
|
wynne1005
|
456741c116
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
wynne1005
|
e7196c3f7f
|
海纳川 10923 10894
|
5 years ago |
 贾文涛
|
8fb9760f82
|
对象引用循环嵌套了，此字段不用就删掉。StationRequestBean->MesStateMachineStatus->StepResult->StationRequestBean
|
5 years ago |
|
贾文涛
|
772f1b9d28
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
贾文涛
|
232abdafd3
|
10984 组装生产线箱条码批次扫描！-2020-09-01,需求开发
|
5 years ago |
|
宋军超
|
d5e356938e
|
天津麦格纳修改组托打印功能
|
5 years ago |
|
宋军超
|
0c93ee5877
|
天津麦格纳修改看板和条码补打问题
|
5 years ago |
|
joke.wang
|
72502a863b
|
Fix Bug #11490
|
5 years ago |
 王杰
|
895eb461ab
|
数据复核
|
5 years ago |
|
宋军超
|
95f008a602
|
天津麦格纳添加组装打印托标签功能，修改物料颜色名称从物料表中取问题
|
5 years ago |
 钮海涛
|
fa467a2e0d
|
sweb合并dev代码
|
5 years ago |
|
钮海涛
|
5f144781c9
|
SWEB合并test代码
|
5 years ago |
|
钮海涛
|
6749bda558
|
合并dev代码
|
5 years ago |
|
钮海涛
|
b253a020b9
|
合并test代码
|
5 years ago |
|
宋军超
|
8a392814aa
|
天津麦格纳修改涂装展示组件添加字段展示
|
5 years ago |
|
wynne1005
|
8c0ea0d52f
|
冲突解决
|
5 years ago |
|
wynne1005
|
10d5276fbb
|
过程检测 演示修改
|
5 years ago |
|
joke.wang
|
cce1d91650
|
客退备件返修
|
5 years ago |
|
宋军超
|
e18ad44c14
|
天津麦格纳修改返工返修
|
5 years ago |
|
陈思洁
|
21ca0a9d0d
|
【11437 19081-半成品预装队列优化-20200917】
|
5 years ago |
|
陈思洁
|
d6c9e9a061
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
陈思洁
|
1072b4fd04
|
【半成品预装队列】
|
5 years ago |
|
joke.wang
|
ba8022f9ca
|
生产队列明细增加条码字段
|
5 years ago |
|
宋军超
|
f58e07fa33
|
天津麦格纳-添加总装质量检测弹框工步和返工返修接口
|
5 years ago |
|
宋军超
|
ad5c122df8
|
天津麦格纳-添加总装质量检测弹框工步和返工返修接口
|
5 years ago |
|
陈思洁
|
50c2258f58
|
【增加查询参数条件】
|
5 years ago |
|
joke.wang
|
817f4b2812
|
客户产线增加字段
|
5 years ago |
|
wynne1005
|
7ab755c9f5
|
过程检测 16 后端接口完毕
|
5 years ago |
汪云昊
|
163d0773a9
|
修改pom文件版本
|
5 years ago |
|
汪云昊
|
b38e6ea1ad
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
5 years ago |
|
王杰
|
6dca5ccb09
|
异步任务
|
5 years ago |
|
钮海涛
|
485c66aaf7
|
合并test代码
|
5 years ago |
|
wynne1005
|
531fe743c2
|
过程检测 完成首检判断
|
5 years ago |
|
wynne1005
|
d00dcd80eb
|
冲突解决
|
5 years ago |
|
wynne1005
|
7412eb3f16
|
质量检测
|
5 years ago |
|
陈思洁
|
f19ee854be
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
陈思洁
|
802c801013
|
【11310 19081-下达至下线时间预警-20200913】
|
5 years ago |
|
王杰
|
cf26f7eadd
|
mespcn异步任务
|
5 years ago |
|
wynne1005
|
1e9f1a5c47
|
质量检测 1
|
5 years ago |
|
陈思洁
|
d3f754c8a6
|
【客户JIT生产队列增加字段】
|
5 years ago |
|
陈思洁
|
65b18c6b91
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
陈思洁
|
d127413055
|
【11225 19081-客户JIT生产队列需要能够选择L7级零件，进行对应订单的筛选-20200910】
|
5 years ago |
|
宋军超
|
0c855ba2af
|
天津麦格纳问题修复
|
5 years ago |
|
宋军超
|
bd20bc1552
|
天津麦格纳修改涂装条码打印
|
5 years ago |
|
joke.wang
|
b389da7c2f
|
Fix Bug #11260
|
5 years ago |
|
陈思洁
|
40cef1961c
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
陈思洁
|
8a1f0c608e
|
【基础页面增加替代料功能】
|
5 years ago |
|
宋军超
|
baafe4cd49
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
宋军超
|
b978fa390c
|
修改天津麦格纳涂装计划查询报表和涂装工单导入
|
5 years ago |
|
陈思洁
|
644454294c
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
陈思洁
|
676e43fc33
|
【增加查询参数条件】
|
5 years ago |
|
宋军超
|
799967bde5
|
修改天津麦格纳问题
|
5 years ago |
|
宋军超
|
91aa6f61a0
|
删除预装区查询接口
|
5 years ago |
|
陈思洁
|
2af946a4bf
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
陈思洁
|
9fde75101e
|
【11181 19048-组织模型新增数据和保存的数据不一致！-2020-09-09】
|
5 years ago |
|
wynne1005
|
9bfd9ef279
|
Merge branch 'master' into test
|
5 years ago |
|
宋军超
|
c5ebcaf2b5
|
天津麦格纳添加出入库事务表枚举
|
5 years ago |
|
宋军超
|
7a6bda2994
|
天津麦格纳问题修复
|
5 years ago |
|
陈思洁
|
2c91dfba60
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
陈思洁
|
e4dc2e1a46
|
【2637 08 ext 20042 PCN界面优化，log调整 0804】
|
5 years ago |
|
joke.wang
|
d33dae14dc
|
jsp计算bug优化
|
5 years ago |
|
宋军超
|
f73e826cd8
|
天津麦格纳问题修复
|
5 years ago |
|
钮海涛
|
729a7b6990
|
合并冲突
|
5 years ago |
|
钮海涛
|
5c9da87650
|
合并冲突
|
5 years ago |
|
钮海涛
|
d47607880e
|
合并冲突
|
5 years ago |
|
joke.wang
|
b8c743896d
|
拆解接口表优化
|
5 years ago |
|
songss
|
bdf708b73a
|
增加上传图片job
|
5 years ago |
|
joke.wang
|
045babeee1
|
已生产队列查询修改
|
5 years ago |
|
joke.wang
|
ba940f9a39
|
BYPASS项映射关系表
|
5 years ago |
|
陈思洁
|
01fc8bb062
|
【条码履历增加字段】
|
5 years ago |
|
王杰
|
396dcdf56c
|
涂装 一箱 优化
|
5 years ago |
|
wynne1005
|
38096fb04e
|
mes表名过长不兼容oracle
|
5 years ago |
|
joke.wang
|
bd8cc364c1
|
jsp计算优化
|
5 years ago |
|
陈思洁
|
6c351c09b5
|
【11016 19048- 总装生产计划显示多条！-2020-09-03】
|
5 years ago |
|
joke.wang
|
746a17bd75
|
bj-mgn辅助展示组件
|
5 years ago |
|
陈思洁
|
5dd7cc44b2
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
陈思洁
|
fad811c2bc
|
【增加索引】
|
5 years ago |
|
joke.wang
|
18ca368f3c
|
照片采集
|
5 years ago |
|
wynne1005
|
4bdfebede1
|
中航打包PCR完成
|
5 years ago |
|
陈思洁
|
564fdb261b
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
wynne1005
|
191220442f
|
websocket错误提示音
|
5 years ago |
|
陈思洁
|
df2342e097
|
【2703 07 ext 虚拟工单关闭按钮（注塑、涂装、组装）】
|
5 years ago |
|
songss
|
19f1cf85c4
|
Merge remote-tracking branch 'origin/test' into test
|
5 years ago |
|
songss
|
fad439a5a0
|
增加MES状态机Repository类
|
5 years ago |