simon.song
|
fa9a989cbd
|
Merge remote-tracking branch 'origin/test' into test
|
4 years ago |
simon.song
|
23bbde2057
|
13315 20027-返修记录报表增加显示产品二维码-202012-26
|
4 years ago |
simon.song
|
ade9053502
|
13325 20027--过程追溯报表--筛选条件物料编码输入GTB2A268000P1点击查询表单显示GTB2A268000P1A物料编号的数据-2020-12-18
|
4 years ago |
Dominic_Xiao
|
97e919552a
|
修改基础模块的描述名
|
4 years ago |
王杰
|
d089d0fba8
|
Merge branch 'test' into dev
|
4 years ago |
陈思洁
|
107f3828f9
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
4 years ago |
陈思洁
|
cc99971690
|
【13140 20027-管理端增加包装箱条码与产品二维码的数据信息界面--20201221】
|
4 years ago |
王杰
|
7e8970f3e2
|
数据复核
|
4 years ago |
王杰
|
cd5b882e1f
|
dev merge test pom 冲突解决
|
4 years ago |
simon.song
|
0b1ef2290d
|
Merge remote-tracking branch 'origin/test' into test
|
4 years ago |
simon.song
|
d648228b18
|
13300 20027-控制计划--点击生效没有响应--2020-12-16
|
4 years ago |
joke.wang
|
95e92168d9
|
物料追溯批次model
|
4 years ago |
joke.wang
|
c0d3eb807f
|
物料批次追溯报表
|
4 years ago |
许心洁
|
3d1d05ef1c
|
1.天津委外发运库存移动单打印
|
4 years ago |
许心洁
|
1474be7486
|
Merge branch 'ext-dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
4 years ago |
王杰
|
08a458cee2
|
unpack
|
4 years ago |
wynne1005
|
b7c4e76163
|
增加joined注解
|
4 years ago |
joke.wang
|
ef971201e3
|
泰国新条码生成
|
4 years ago |
wynne1005
|
b438735172
|
Merge branch 'test' into ext-dev
|
4 years ago |
wynne1005
|
78d86be2f5
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
4 years ago |
wynne1005
|
8741facd02
|
中航BI修改 数据同步打印错误日志
|
4 years ago |
joke.wang
|
b37456b227
|
删除错误提交
|
4 years ago |
joke.wang
|
85c22ea8bd
|
电泳上线
|
4 years ago |
陈思洁
|
1643d57b99
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
4 years ago |
陈思洁
|
a014d8ceaa
|
【13137 19048 安灯类型没有在看板中展示 20201209】
|
4 years ago |
simon.song
|
4a120ca375
|
12736 20027-管理端-控制计划--按照导入模板导入控制计划数据时提示成功,但是无法看到导入的数据-20201124
|
4 years ago |
wynne1005
|
9242285b4c
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
4 years ago |
wynne1005
|
b09a09f70b
|
修改mes工位监控 异常停止不能复位问题 bi相关问题
|
4 years ago |
陈思洁
|
981438c2a2
|
【12997 19048-条码补打查询不到二检箱标签-20201204】
|
4 years ago |
simon.song
|
effc34f74d
|
Merge remote-tracking branch 'remotes/origin/test' into ext-dev
# Conflicts:
# modules/i3plus-pojo-mes-pcn/pom.xml
|
4 years ago |
陈思洁
|
9478267dd8
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
4 years ago |
陈思洁
|
4cfee2dc9c
|
【12591 20027-BI-生产经理BI报表-调角器工厂生产线产出情况-浮窗解释不清晰-2020-12-04】
|
4 years ago |
Dominic_Xiao
|
ae9978a3bb
|
新增serialNumber字段
|
4 years ago |
王杰
|
f9ce9641de
|
增加索引
|
4 years ago |
joke.wang
|
da293141cd
|
oee bug修复
|
4 years ago |
许心洁
|
de9578d439
|
墨西哥WMS报工业务新增功能:通用脚本导入接口+生产版本DAO层+生产计划主表计划状态FINISH(25, "FINISH", "已完成")
|
4 years ago |
simon.song
|
8dcb1703c9
|
首检返回值字段调整
|
5 years ago |
simon.song
|
d0e1fcd440
|
Merge remote-tracking branch 'origin/test' into test
|
5 years ago |
simon.song
|
56989acba2
|
12362 20027-管理端-首检检验结果报表状态已完成的对应的数量和已检数量显示有问题-20201115
|
5 years ago |
joke.wang
|
14c47545e7
|
查询备件库存修改
|
5 years ago |
王杰
|
2b522ca15d
|
工步参数 增加字段
|
5 years ago |
王杰
|
183111cf65
|
Merge remote-tracking branch 'i3plus-pojo/test' into test
|
5 years ago |
王杰
|
d64a8fd31c
|
工步参数 增加字段
|
5 years ago |
陈思洁
|
7e37a6e22d
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
陈思洁
|
28da49aa29
|
【12422 19048 增加喷涂抛光条码查询报表 20201112】
|
5 years ago |
王杰
|
13868d5cd1
|
producesn 增加索引
|
5 years ago |
王杰
|
02d002b958
|
package detail 增加 联合索引
|
5 years ago |
simon.song
|
9b57f47af6
|
修改pom文件
|
5 years ago |
simon.song
|
3917408421
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
5 years ago |
陈思洁
|
d8d2dea922
|
Merge remote-tracking branch 'origin/test' into test
|
5 years ago |
陈思洁
|
a4093d18d1
|
【12420 19048 喷涂二检增加UNPACK功能 20201112】
|
5 years ago |
王杰
|
a94b5dd0b0
|
看板产线配置
|
5 years ago |
陈思洁
|
fd166bc0ff
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
陈思洁
|
47e6a86ecd
|
【天津bug修改】
|
5 years ago |
Dominic_Xiao
|
0deb9b4733
|
中航襄阳滑道工厂需求:新增容器编号字段
|
5 years ago |
joke.wang
|
d5b2f4a4cd
|
生产队列增加分组号字段
|
5 years ago |
Dominic_Xiao
|
86f9faa01d
|
Merge remote-tracking branch 'remotes/origin/test' into dev
|
5 years ago |
陈思洁
|
b0df747d22
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
陈思洁
|
19636e308e
|
【12645 19048-喷涂质检报表用开始和结束工单查询无反应-20201123】
|
5 years ago |
wynne1005
|
d9b4a8eb4d
|
修改包扫描路径
|
5 years ago |
王杰
|
7be62a939b
|
TJ看板
|
5 years ago |
joke.wang
|
970f75f8cf
|
队列表增加分组号字段
|
5 years ago |
Dominic_Xiao
|
2a94ce3e0e
|
包装条码绑定解绑
|
5 years ago |
wynne1005
|
d893e76ab4
|
merge
|
5 years ago |
wynne1005
|
aa450c10e4
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
wynne1005
|
bdf8e0d782
|
错误pojo修改
|
5 years ago |
simon
|
55188db083
|
Merge remote-tracking branch 'remotes/origin/test' into dev
|
5 years ago |
钮海涛
|
af732b7a4f
|
合并test代码
|
5 years ago |
宋双双
|
b188123ab4
|
Merge branch 'dev' of i3-IMPP/i3plus-pojo into test
|
5 years ago |
Dominic_Xiao
|
fd7799b943
|
Merge remote-tracking branch 'remotes/origin/test' into dev
|
5 years ago |
陈思洁
|
0bcb009383
|
【2977 11 2.5.5 整形业务,单件翻包与整箱过站】
|
5 years ago |
joke.wang
|
2f56f8949e
|
eol看板优化
|
5 years ago |
Dominic_Xiao
|
20999fd63a
|
新增不良品处理查询位置列表
|
5 years ago |
陈思洁
|
95c63fb30b
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
陈思洁
|
6ffec48185
|
【2977 11 2.5.5 整形业务,单件翻包与整箱过站】
|
5 years ago |
王杰
|
fa3bb1f53a
|
涂装 看板
|
5 years ago |
joke.wang
|
c679e7f19b
|
半成品看板优化
|
5 years ago |
王杰
|
cf9d3d9f2d
|
tz 看板
|
5 years ago |
wynne1005
|
db87c0c32f
|
pom版本
|
5 years ago |
joke.wang
|
f6260cec39
|
看板产线基础页面
|
5 years ago |
陈思洁
|
22ec710d78
|
【12420 19048 喷涂二检增加UNPACK功能 20201112】
|
5 years ago |
陈思洁
|
4311fef1a3
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
陈思洁
|
be8d655eb9
|
【12420 19048 喷涂二检增加UNPACK功能 20201112】
|
5 years ago |
王杰
|
59f916ddab
|
produceSn
|
5 years ago |
陈思洁
|
0fee0dbe67
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
陈思洁
|
6c04caf728
|
【天津看板问题修复】
|
5 years ago |
simon
|
5b2bbf7b1e
|
Merge remote-tracking branch 'origin/test' into test
|
5 years ago |
simon
|
c03446866a
|
中航-首检单历史记录显示与修改
|
5 years ago |
钮海涛
|
b9283ec075
|
合并dev代码
|
5 years ago |
钮海涛
|
b57ae573ed
|
合并test代码
|
5 years ago |
钮海涛
|
4ec6267b4e
|
Merge remote-tracking branch 'remotes/origin/test' into dev
|
5 years ago |
钮海涛
|
89a45d326b
|
合并test代码
|
5 years ago |
钮海涛
|
f63813d66d
|
合并master代码
|
5 years ago |
钮海涛
|
ceebe541f2
|
Merge remote-tracking branch 'remotes/origin/master' into test
|
5 years ago |
joke.wang
|
0009db6b33
|
工位技能查询bug修复
|
5 years ago |
joke.wang
|
7a33df666b
|
JSA JSP表增加索引
|
5 years ago |
joke.wang
|
148ef03e78
|
看板产线员工能力矩阵
|
5 years ago |
王杰
|
e2d6b573f0
|
不良记录报表 报工报表
|
5 years ago |
王杰
|
3636b75780
|
Merge remote-tracking branch 'i3plus-pojo/test' into test
|
5 years ago |
joke.wang
|
e21e49ae93
|
不良处理增加展示字段
|
5 years ago |