 钮海涛
|
a8cdba48c3
|
合并Master代码
|
5 years ago |
|
钮海涛
|
7afd60073a
|
Merge remote-tracking branch 'remotes/origin/test'
|
5 years ago |
 王杰
|
f6ad2824b2
|
11984 19048-组装生产计划报表增加字段-20201020
|
5 years ago |
|
王杰
|
97be3f186a
|
工单生产时间变更定时任务实体
|
5 years ago |
songss
|
ef316af0c1
|
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 |
wynne1005
|
78a3943a3d
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
wynne1005
|
4c86b836ca
|
OP20b逻辑变更 esop展示变更
|
5 years ago |
宋军超
|
6826f04b97
|
天津看板添加设备状态逻辑
|
5 years ago |
joke.wang
|
9002bdc936
|
预装队列显示列优化
|
5 years ago |
|
王杰
|
bb3039d1f2
|
包装关系查询宝贝
|
5 years ago |
|
songss
|
17d47fdc55
|
新增看板图片增删改查接口
新增看板切换配置增删改查接口
新增中航-产线概况接口
|
5 years ago |
陈思洁
|
92a9f5faba
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
陈思洁
|
b70a58ba7d
|
【2867 10 2.3.9 返工返修批量作业】
|
5 years ago |
 贾文涛
|
525cda2768
|
增加数量处理方法
|
5 years ago |
|
宋军超
|
627e8ac215
|
添加麦格纳看板相关基础数据
|
5 years ago |
|
陈思洁
|
061f48dc79
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
陈思洁
|
e268ed86a9
|
【11934 19081-工位BOM中需要增加产线和工位的查询条件-20201020】
|
5 years ago |
|
wynne1005
|
5d73afd17f
|
jisa小时接收报表完成
|
5 years ago |
|
wynne1005
|
05152538b2
|
合并冲突
|
5 years ago |
|
wynne1005
|
fc36e55a38
|
新增mes 报表查询周期枚举
|
5 years ago |
|
宋军超
|
9c1a9be165
|
优化天津麦格纳报表
|
5 years ago |
|
wynne1005
|
e24bb4c39b
|
同步新增忽略字段
|
5 years ago |
|
wynne1005
|
63c1cc479b
|
字段长度 model添加planCfgCode
|
5 years ago |
|
wynne1005
|
7bca216063
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
wynne1005
|
8b53722b0f
|
设备plan更新
|
5 years ago |
|
joke.wang
|
cd32eee8ea
|
排程配置表增加冗余字段
|
5 years ago |
|
宋军超
|
fcc66835b8
|
开发天津看板功能
|
5 years ago |
|
wynne1005
|
ddaedf49ee
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
wynne1005
|
52bdc6c664
|
设备作业周期 新增planCfgCode
|
5 years ago |
|
宋军超
|
bd9547b825
|
优化天津麦格纳报表
|
5 years ago |
|
joke.wang
|
cc2961d4b8
|
库存排产表增加字段
|
5 years ago |
|
宋军超
|
3d8d84ee77
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
Conflicts:
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java
|
5 years ago |
|
宋军超
|
dc38d2db6f
|
优化天津麦格纳报表
|
5 years ago |
|
wynne1005
|
1e6ca2e0bb
|
添加设备作业任务 周期类型
|
5 years ago |
|
贾文涛
|
1ffebd418f
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
贾文涛
|
834e3d211d
|
更新查询大于0的业务时，基础类错误问题。
|
5 years ago |
|
wynne1005
|
a86a58fa6d
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
joke.wang
|
233853e1e6
|
库存排程
|
5 years ago |
|
王杰
|
f58d97fb83
|
11777 19048-绑定关键件 绑定多个关键件数据出现回滚-20201012
|
5 years ago |
|
wynne1005
|
248c8229ff
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
wynne1005
|
a49ddc004c
|
添加lob
|
5 years ago |
|
贾文涛
|
0c34bce623
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
贾文涛
|
7e24f4ed4a
|
修复队列乱跳问题。
|
5 years ago |
|
贾文涛
|
d2f9c3502a
|
修复队列乱跳问题。
|
5 years ago |
|
wynne1005
|
18275c8fb2
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
wynne1005
|
226c31878a
|
添加缺陷代码
|
5 years ago |
|
陈思洁
|
30f8e332fa
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
陈思洁
|
8f060d4aa4
|
【2856 10 2.3.8 20027-PCN端工位监控如果报错数据没有采集怎么报警提示】
|
5 years ago |
|
joke.wang
|
c442845f94
|
跳序变更
|
5 years ago |
|
wynne1005
|
7fb7db3cb5
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
wynne1005
|
629e6af9a9
|
设备指导操作文件
|
5 years ago |
|
宋军超
|
4b65842d6f
|
修改天津麦格纳项目问题
|
5 years ago |
|
wynne1005
|
ebf0392057
|
去除多余optionType枚举
|
5 years ago |
|
wynne1005
|
470775b527
|
备件生成冲突解决
|
5 years ago |
|
wynne1005
|
f52f07fe77
|
备件导入
|
5 years ago |
|
王杰
|
6f3f06a8f6
|
19048-条码补打-补打包装需要可以用过程条码反查包装条码-20201012
|
5 years ago |
|
wynne1005
|
d36a7527a6
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
wynne1005
|
c117515b69
|
设备自动报警
|
5 years ago |
|
songss
|
966ed3536b
|
Merge remote-tracking branch 'origin/test' into test
# Conflicts:
# modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java
|
5 years ago |
|
songss
|
5816f275bf
|
新增控制计划相关接口
|
5 years ago |
|
钮海涛
|
1695d75ff2
|
合并dev代码
|
5 years ago |
|
钮海涛
|
94568777fb
|
合并test代码
|
5 years ago |
|
陈思洁
|
3d8d27d780
|
【11374 20027-管理端质量检测标准维护基础数据报错（附件是数据模板）-20200915】
|
5 years ago |
|
wynne1005
|
814d22fe09
|
设备报警 mes端完成
|
5 years ago |
|
songss
|
e585dce910
|
Merge remote-tracking branch 'origin/test' into test
|
5 years ago |
|
songss
|
037e898cd2
|
新增控制计划相关接口
|
5 years ago |
|
宋军超
|
aa01153c4b
|
天津麦格纳更新看板子菜单pojo
|
5 years ago |
|
宋军超
|
ebb965f46d
|
天津麦格纳添加看板维护接口
|
5 years ago |
Liquor
|
83bfaaceab
|
对SPC-KEY-TATA表的相关接口进行了相关优化。
|
5 years ago |
|
贾文涛
|
72faca1092
|
添加索引
|
5 years ago |
|
宋军超
|
2bd7650d48
|
天津麦格纳pojo中所有Double类型字段添加注解
|
5 years ago |
|
Liquor
|
3d8842602d
|
增加了SPC-KEY-TATA表的相关接口。
|
5 years ago |
|
wynne1005
|
8129ca5bee
|
设备报警 mes端完成
|
5 years ago |
汪云昊
|
171f39cf01
|
revert:还原pojo pom.xml报表
|
5 years ago |
|
汪云昊
|
56bd07dbf3
|
Merge remote-tracking branch 'origin/dev' into test
|
5 years ago |
|
joke.wang
|
f2177fdc1e
|
bypass数据采集bug修复
|
5 years ago |
|
王杰
|
d548660354
|
连续扫描
|
5 years ago |
|
joke.wang
|
d9d7e47ca7
|
生产队列明细唯一索引修改
|
5 years ago |
|
songss
|
36df78c9b4
|
Merge remote-tracking branch 'origin/test' into test
|
5 years ago |
|
songss
|
8c633f0bc3
|
优化字段命名规范
|
5 years ago |
|
wynne1005
|
ea6fc313c3
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
songss
|
d7edc3a309
|
增加产品数据校验记录报表接口
|
5 years ago |
|
陈思洁
|
0f1f437a9e
|
【2794 09 ext 19081-返工返修标签打印变更-20200813】
|
5 years ago |
|
钮海涛
|
543058b3a5
|
合并sweb代码
|
5 years ago |
|
陈思洁
|
373e5026c5
|
【2794 09 ext 19081-返工返修标签打印变更-20200813】
|
5 years ago |
|
songss
|
b376450d4b
|
修改获取复核异常的数据接口返回数据
|
5 years ago |
|
wynne1005
|
12f1c4a809
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
joke.wang
|
9fb8962e4e
|
客退件bug修复
|
5 years ago |
|
宋军超
|
979e18c4a7
|
天津麦格纳修改涂装质检看板
|
5 years ago |
|
宋军超
|
ba6470baad
|
天津麦格纳修改组托获取托包规数量
|
5 years ago |
|
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 |