陈思洁
|
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 |
|
钮海涛
|
5c104e036f
|
合并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 |
|
陈思洁
|
23d8afd0ae
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
陈思洁
|
09c95d3542
|
【库存排程配置增加禁用启用接口】
|
5 years ago |
|
joke.wang
|
3815c1c730
|
扭矩采集plc优化
|
5 years ago |
|
陈思洁
|
381ff0c974
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
陈思洁
|
de248a944f
|
【2701 08 1.2.3.3.8 涂装检测工位，显示合格数、不良数】
|
5 years ago |
|
钮海涛
|
51746154ba
|
合并dev到test
|
5 years ago |
|
钮海涛
|
e6b472bcfd
|
合并test代码到dev
|
5 years ago |
|
钮海涛
|
4144e12b5d
|
合并test代码到master
|
5 years ago |
|
钮海涛
|
92f0158dab
|
合并master代码
|
5 years ago |
|
wynne1005
|
f06f51cc7e
|
master merge test
|
5 years ago |
|
joke.wang
|
b09aa27e0f
|
排程job
|
5 years ago |
|
joke.wang
|
a2eab983d9
|
缓存池订单池增加jit_seq字段
|
5 years ago |
|
songss
|
a2f257e414
|
Merge remote-tracking branch 'origin/test' into test
|
5 years ago |
|
songss
|
df6f0bb4f2
|
删除没用代码
|
5 years ago |
|
songss
|
f4d7e55f05
|
喷涂过程条码批量打印报错bug修复
|
5 years ago |
|
陈思洁
|
98afecf57b
|
【10877 19048-预组装看板及操作工位变更调整-20200828】
|
5 years ago |
|
wynne1005
|
a580c70c04
|
添加正态分布数据总数
|
5 years ago |
|
wynne1005
|
9563ebeb66
|
normalDistribution
|
5 years ago |
|
宋军超
|
940510ea5b
|
北京海纳川、北京麦格纳问题修复
|
5 years ago |
|
陈思洁
|
d7f8796d36
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
陈思洁
|
ee1b0b5b67
|
【2674 预装区基础页面开发】
|
5 years ago |
|
joke.wang
|
ac55ae1df1
|
库存排程配置增加物料名称
|
5 years ago |
|
王杰
|
7a502c45c9
|
注塑上料 展示组件增加字段
|
5 years ago |
|
陈思洁
|
baa7d144b7
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
陈思洁
|
daf0b94314
|
【10828 19048-10827-预装作业界面优化！-2020-08-25】
|
5 years ago |
|
宋军超
|
53d392ebe1
|
海纳川问题修复枪头更换添加弹框校验
|
5 years ago |
|
wynne1005
|
ebd12f7c65
|
去除ProductBiModel重复字段
|
5 years ago |
|
wynne1005
|
f9fa5814f6
|
冲突解决
|
5 years ago |
|
钮海涛
|
310da99743
|
合并master代码
|
5 years ago |
|
宋军超
|
f3cb06ba5a
|
Merge remote-tracking branch 'origin/test' into test
|
5 years ago |
|
宋军超
|
030343f2ce
|
海纳川问题修复
|
5 years ago |
|
王杰
|
43ad04818c
|
pom
|
5 years ago |
|
王杰
|
0d256b3afd
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
钮海涛
|
b4a4c42fe0
|
合并master代码
|
5 years ago |
|
wynne1005
|
b3aa6eef70
|
中航 均值极差
|
5 years ago |
|
钮海涛
|
ea43d63d7e
|
Merge remote-tracking branch 'remotes/origin/master' into test
|
5 years ago |
|
王杰
|
3b31f9fcc8
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
王杰
|
d0bfa965f7
|
类型信息 seq
|
5 years ago |
|
陈思洁
|
b0c3b85378
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
陈思洁
|
68fef2b051
|
【2634 19048--涂装Unpack流程！-2020-08-05】
|
5 years ago |
|
joke.wang
|
e3146c9fb4
|
Fix Bug #0776
|
5 years ago |
|
王杰
|
4c9b5d087c
|
涂装 二箱 客户 查询工作逻辑变更
|
5 years ago |
|
王杰
|
a2084204f0
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
王杰
|
41422d895e
|
涂装 客户 二箱 查询工单逻辑变更
|
5 years ago |
|
joke.wang
|
fd771bccf8
|
报功接口增加工单类型字段
|
5 years ago |
|
joke.wang
|
f6460749db
|
jsp解析优化
|
5 years ago |
|
joke.wang
|
84dcf36c86
|
Fix Bug #10708
|
5 years ago |
|
joke.wang
|
f275d70136
|
Fix Bug #10674
|
5 years ago |
|
陈思洁
|
358d582209
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
陈思洁
|
b56cf991be
|
【2607 08 ext PCR-200623001需求变更-预组装】
|
5 years ago |
|
王杰
|
5f495a1b98
|
产品工作中心配置
|
5 years ago |
|
joke.wang
|
9207f20b37
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
joke.wang
|
09b8ccd1e3
|
Fix Bug #10520
|
5 years ago |
|
王杰
|
1d86ce6429
|
总装打包 展示组件 列表显示封箱状态名称
|
5 years ago |
|
陈思洁
|
406c625974
|
【2634 19048--涂装Unpack流程！】
|
5 years ago |
|
陈思洁
|
c937e2aa64
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
陈思洁
|
ee927b7056
|
【2607 08 ext PCR-200623001需求变更-预组装】
|
5 years ago |
|
宋军超
|
6db85d596b
|
修改海纳川问题
|
5 years ago |
|
王杰
|
72afe6891b
|
料箱显示工作中心名称
|
5 years ago |
|
宋军超
|
5e81b1f448
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
宋军超
|
4d816de5da
|
修改海纳川问题,添加PTL新逻辑关联bug:10538
|
5 years ago |
|
王杰
|
a7c3167eef
|
注塑上料
|
5 years ago |
|
宋军超
|
163c385842
|
修改海纳川问题
|
5 years ago |
|
joke.wang
|
85b6067133
|
BI优化1
|
5 years ago |
|
宋军超
|
ba7cdc84e5
|
修改海纳川问题
|
5 years ago |
|
wynne1005
|
ef83a7aa08
|
是否重选更换名称 大小枪与绑定支持并发
|
5 years ago |
|
wynne1005
|
032a7e8126
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
wynne1005
|
d699e88984
|
StationRequestBean
|
5 years ago |
|
joke.wang
|
1cf11c4500
|
Fix Bug #10477
|
5 years ago |
|
joke.wang
|
3f03b5fab5
|
产线表增加序号字段
|
5 years ago |
|
wynne1005
|
a751d5a8a7
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
wynne1005
|
8d7b0fae6a
|
添加小枪日志 与不需要打枪绑定 自动跳过
|
5 years ago |
|
宋军超
|
44b90bf639
|
修改海纳川问题
|
5 years ago |
|
钮海涛
|
b437a78e31
|
Merge remote-tracking branch 'origin/test' into test
|
5 years ago |
|
王杰
|
f45137db94
|
注塑上料
|
5 years ago |
|
钮海涛
|
438dcacdce
|
Merge remote-tracking branch 'origin/test' into test
|
5 years ago |
|
钮海涛
|
53151424b9
|
Merge remote-tracking branch 'remotes/origin/master' into test
|
5 years ago |
|
陈思洁
|
a5ea72f593
|
【新增库位实体】
|
5 years ago |
|
陈思洁
|
a093f06edc
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
陈思洁
|
38f9adc2dd
|
【10554 19048--喷涂条码打印功能不应该查询出其他车间的生产计划！-2020-08-13】
|
5 years ago |
|
wynne1005
|
59aadc94ce
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
wynne1005
|
763b88b420
|
工位扫描添加工步触发条件
|
5 years ago |
|
宋军超
|
19b1bfb9b6
|
修改海纳川打印
|
5 years ago |
|
joke.wang
|
2d52fe0a40
|
Fix Bug #10535
|
5 years ago |
|
joke.wang
|
89bd4f189a
|
项目表增加字段
|
5 years ago |
|
joke.wang
|
74cc0c757d
|
成品标签打印
|
5 years ago |
|
wynne1005
|
ba558d640e
|
tmp
|
5 years ago |
|
joke.wang
|
bf902b8366
|
Fix Bug #10294
|
5 years ago |
|
王杰
|
175052ebcc
|
报工表加质量状态 默认合格
|
5 years ago |
|
王杰
|
1707f6b228
|
MesProdWorkCenter
|
5 years ago |
|
汪云昊
|
bda160ccec
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
5 years ago |
|
joke.wang
|
a522db04a9
|
过程条码增加字段vinCode
|
5 years ago |
|
宋军超
|
84f61e65fc
|
修改海纳川问题
|
5 years ago |
|
王杰
|
18dd2cbcb2
|
zs
|
5 years ago |
|
王杰
|
772229b983
|
andon
|
5 years ago |
|
王杰
|
9e8cb0b844
|
注塑
|
5 years ago |
|
陈思洁
|
056d4390ca
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
陈思洁
|
4a99857248
|
【10414 19048 - 注塑产品消耗BOM报表！-2020-08-05】
|
5 years ago |
|
joke.wang
|
8c2fd8a587
|
Fix Bug #10476
|
5 years ago |
|
joke.wang
|
f495ffed54
|
Fix Bug #10477
|
5 years ago |
|
joke.wang
|
4bdd2b770b
|
Fix Bug #10486
|
5 years ago |
|
joke.wang
|
51f9d92d36
|
北京麦格纳esop展示组件修改
|
5 years ago |
|
joke.wang
|
7c3594a870
|
Fix Bug #9589
|
5 years ago |
|
陈思洁
|
e4c8431a22
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
陈思洁
|
653b413623
|
【10334 19048-MES、WMS接口JIT02中增加内部工单号！-2020-08-03】
|
5 years ago |
|
宋军超
|
e70192d3c2
|
添加日志查询问题
|
5 years ago |
|
宋军超
|
625b780aaf
|
添加海纳川数据复核工步和产线状态看板变更
|
5 years ago |
|
wynne1005
|
3af4d32a97
|
mes工位运行状态
|
5 years ago |
|
joke.wang
|
edb85b5ea6
|
桌面BI
|
5 years ago |
|
wynne1005
|
3c004324b1
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
wynne1005
|
6e455f5d72
|
reqBean 添加productSn
|
5 years ago |
|
王杰
|
5413fc259c
|
pcn 缺陷
|
5 years ago |
|
宋军超
|
162e2d33d7
|
修改海纳川问题
|
5 years ago |