joke.wang
|
52b2ea43da
|
14859 19081-JISA收序时间超时和队列时间预警信息-邮件提示内容加上预警值
|
5 years ago |
陈思洁
|
2b2761ade2
|
【14827 19108+ MES->【生成工单】模块,释放功能应根据零件号进行流水号累加+2021-04-01】
|
5 years ago |
|
joke.wang
|
ca8bfd3f53
|
泰国扭矩采集
|
5 years ago |
Dominic_Xiao
|
f12c568119
|
天津:物料校验客户标签关系和物料绑定客户标签明细同步标识赋默认值
|
5 years ago |
|
Dominic_Xiao
|
cc86a60ba7
|
Merge remote-tracking branch 'origin/test' into test
|
5 years ago |
|
Dominic_Xiao
|
9eba8f1683
|
天津-PCN:物料校验客户标签关系与物料绑定客户标签明细新增同步标识字段
|
5 years ago |
|
joke.wang
|
072bc431fb
|
扭矩采集
|
5 years ago |
simon.song
|
3c6a7b410d
|
Merge remote-tracking branch 'origin/test' into test
|
5 years ago |
|
simon.song
|
5554bfd14c
|
14520 20027--管理端--控制计划--增加审核状态、是否生效筛选条件-2021-03-17
|
5 years ago |
 王杰
|
38d03b1060
|
状态机优化
|
5 years ago |
|
陈思洁
|
9e0d03629c
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
陈思洁
|
281957a6f5
|
【3324 泰国-扭矩采集 --PC端后端】
|
5 years ago |
|
joke.wang
|
3d0d39ac1d
|
Tha扭矩采集
|
5 years ago |
|
陈思洁
|
ccf221f80b
|
【pojo改名字】
|
5 years ago |
|
陈思洁
|
39ced0a83d
|
【14681 19108+ PCN->容器绑定单件条码工位,当前容器号无显示+2021-03-25】
|
5 years ago |
汪云昊
|
1ef29d1fce
|
revert(pojo):还原pom版本
|
5 years ago |
|
joke.wang
|
7f8dd50412
|
物料关系表
|
5 years ago |
wynne1005
|
a44a4a8be3
|
Merge branch 'dev' into test
|
5 years ago |
|
Dominic_Xiao
|
e58ffc9d69
|
天津-PCN新增功能:物料校验客户标签明细表新增客户标签字段
|
5 years ago |
|
Dominic_Xiao
|
ce91ea879f
|
天津-PCN新增功能:物料校验客户标签
|
5 years ago |
|
simon.song
|
f73570b28e
|
漏提交代码
|
5 years ago |
|
Dominic_Xiao
|
d129a3863b
|
天津-新注塑区域集中下件
|
5 years ago |
|
joke.wang
|
cd5773fb2e
|
绑定关键件增加显示列
|
5 years ago |
|
王杰
|
f8e0146b19
|
pom
|
5 years ago |
|
王杰
|
af11605d46
|
工步
|
5 years ago |
|
wynne1005
|
8b1e28c893
|
删除mongo依赖 merge test
|
5 years ago |
|
joke.wang
|
19872ba443
|
隔离报废
|
5 years ago |
|
陈思洁
|
c2dbff5d5a
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
陈思洁
|
6b4ae7eb71
|
【3254 泰国-上装总成套膜标签打印】
|
5 years ago |
|
joke.wang
|
0c4e6359fc
|
JISA导入优化
|
5 years ago |
|
joke.wang
|
fbab36aad2
|
报废隔离
|
5 years ago |
|
joke.wang
|
24aa100dfe
|
追溯总览报表
|
5 years ago |
|
陈思洁
|
efebc6f605
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
陈思洁
|
154307b2f0
|
【泰国工位传参修改】
|
5 years ago |
许心洁
|
2127e3d260
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo
|
5 years ago |
|
joke.wang
|
339cbf0634
|
bug:14146 一张报表中查询产品所有追溯信息
|
5 years ago |
|
Dominic_Xiao
|
44af0f4e80
|
删除重复实体类
|
5 years ago |
|
joke.wang
|
d7da6437b3
|
获取状态机dao bug修复
|
5 years ago |
|
王杰
|
4d81424794
|
numberrule
|
5 years ago |
|
王杰
|
5e290e81b8
|
number rule
|
5 years ago |
|
simon.song
|
dbeb6baac7
|
14185 20027--管理端-数据对象，根据数据源代码查询无效- 2021-02-28
|
5 years ago |
|
joke.wang
|
f01ae5106b
|
14165 返修队列增加校验
|
5 years ago |
|
许心洁
|
38e6870f04
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
|
5 years ago |
|
王杰
|
431ee97d64
|
同步工单表
|
5 years ago |
|
王杰
|
fe6940b0dc
|
编码规则扩展
|
5 years ago |
|
joke.wang
|
b505fe8456
|
13858 20027--接口表同步情况报表
|
5 years ago |
|
joke.wang
|
e2a9222b47
|
pcn登陆限制
|
5 years ago |
|
Dominic_Xiao
|
0c9dff6dd8
|
不良品处理根据物料类型查询位置
|
5 years ago |
|
Dominic_Xiao
|
c1eb51dec5
|
缺陷位置新增产品类型字段
|
5 years ago |
|
王杰
|
03d95e2591
|
Merge branch 'dev' into test
|
5 years ago |
|
王杰
|
e66a560661
|
冲突
|
5 years ago |
|
王杰
|
ec3d2f8557
|
pom
|
5 years ago |
|
王杰
|
4644639c2e
|
pom
|
5 years ago |
|
王杰
|
f0c09ca0e6
|
Merge branch 'test' into dev
|
5 years ago |
|
王杰
|
2b89e35c69
|
pom
|
5 years ago |
|
王杰
|
78b5bb0c08
|
Merge branch 'test'
|
5 years ago |
|
simon.song
|
ca8ca18f34
|
数据同步接口修改查询条件
|
5 years ago |
|
许心洁
|
cf83ab060d
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo
|
5 years ago |
|
simon.song
|
24bd5ab668
|
Merge remote-tracking branch 'origin/test' into test
# Conflicts:
# modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java
|
5 years ago |
|
simon.song
|
ff5348bf99
|
中航看板取值修改
|
5 years ago |
|
simon.song
|
9c51146117
|
数据迁移接口修改
|
5 years ago |
|
王杰
|
5a0927299b
|
新建表报错 bug
|
5 years ago |
|
simon.song
|
78a96c6583
|
mes管理端增加数据迁移功能相关接口
|
5 years ago |
|
许心洁
|
22c55fc8c6
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo
|
5 years ago |
|
joke.wang
|
e967dde7a3
|
总屏幕看板优化
|
5 years ago |
|
Dominic_Xiao
|
553fb09bc0
|
修改hql去除多余工厂代码条件
|
5 years ago |
|
许心洁
|
410b95aefd
|
Merge branches 'master' and 'test' of http://git.estsh.com/i3-WMS/i3plus-wms
# Conflicts:
# modules/i3plus-wms-apiservice/pom.xml
|
5 years ago |
|
simon.song
|
db0d184aa3
|
数据迁移功能完成。
|
5 years ago |
肖奕扬
|
9f0dfdb1fd
|
Merge branch 'test' of frank.yu/i3plus-pojo into test
|
5 years ago |
|
Dominic_Xiao
|
cf908f2d04
|
卡斯马基础界面--客户条码规则、产品容器容量配置
|
5 years ago |
|
王杰
|
25303ffc55
|
Merge remote-tracking branch 'i3plus-pojo/dev' into dev
|
5 years ago |
|
王杰
|
5a5874b137
|
test
|
5 years ago |
|
王杰
|
45a1b63a23
|
Merge branch 'test'
|
5 years ago |
|
王杰
|
84d9ec15f2
|
pom
|
5 years ago |
|
王杰
|
f1db936f42
|
pom
|
5 years ago |
|
王杰
|
d2f03a966e
|
Merge branch 'dev' into test
|
5 years ago |
|
joke.wang
|
5e1fac42fe
|
12112 设备周期作业计划需要与作业要求进行关联
|
5 years ago |
yumingxing
|
86a6fb1390
|
报表2021026
|
5 years ago |
|
yumingxing
|
ca50493d20
|
报表20210125
|
5 years ago |
|
joke.wang
|
378993b225
|
包装条码补打优化
|
5 years ago |
|
陈思洁
|
85ebb5ce78
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
陈思洁
|
01877b80d5
|
【13614 19048 喷涂看板实际生产和计划数量都不正确 20210107】
|
5 years ago |
|
Dominic_Xiao
|
81e63fe7d2
|
Merge remote-tracking branch 'origin/test' into test
|
5 years ago |
|
Dominic_Xiao
|
c5d56b2c32
|
炉内位置信息新增方向字段
|
5 years ago |
|
joke.wang
|
5d25ecc9b5
|
13829 mgn-bj 补打页面优化
|
5 years ago |
|
王杰
|
fba7f636d9
|
状态机
|
5 years ago |
|
王杰
|
1e6691c8b5
|
Merge branch 'test' into dev
|
5 years ago |
|
joke.wang
|
e779b5e482
|
成品标签打印修改
|
5 years ago |
|
王杰
|
c8b21c0b69
|
pom
|
5 years ago |
|
陈思洁
|
d8aac51ef5
|
【排序序号--滑道】
|
5 years ago |
|
陈思洁
|
3997ae3e93
|
【排序序号--滑道】
|
5 years ago |
|
yumingxing
|
70b4bc75e8
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
yumingxing
|
428f98955d
|
报表20210118
|
5 years ago |
|
许心洁
|
8246a28c05
|
Merge branches 'master' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo
|
5 years ago |
|
Dominic_Xiao
|
db204080a8
|
滑道工厂新增"客户代号"与"客户抬头"字段
|
5 years ago |
|
yumingxing
|
0871833d26
|
报表20210115
|
5 years ago |
|
yumingxing
|
479b81cb08
|
报表20210114
|
5 years ago |
|
yumingxing
|
b1df64bff5
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
yumingxing
|
53b72a8f8d
|
报表202101141821
|
5 years ago |
|
王杰
|
fb4b10e689
|
涂装质检 待定 重构
|
5 years ago |
|
许心洁
|
d107c7a3fe
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo
|
5 years ago |
|
陈思洁
|
74947bfaf8
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
陈思洁
|
abe5ae9f9b
|
【13524 20027--首、巡、末检的检验项内容需要增加排序字段，现首巡末检的检验项是没排序的，需要按照新增的排序字段进行排序】
|
5 years ago |
|
yumingxing
|
fcbf1467b2
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
yumingxing
|
deedd2f2ef
|
报表20210114
|
5 years ago |
|
joke.wang
|
0a389480f3
|
13696 新增不良维修记录报表
|
5 years ago |
|
肖奕扬
|
0d7c71d5db
|
Merge branch 'test' of frank.yu/i3plus-pojo into test
|
5 years ago |
|
Dominic_Xiao
|
bfd5b0ab9d
|
新增滑道工厂基础模块
|
5 years ago |
|
yumingxing
|
9202937516
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
yumingxing
|
2cd3547637
|
报表优化
|
5 years ago |
|
joke.wang
|
d93c9fe6a6
|
物料表增加冗余字段
|
5 years ago |
 廖湘明
|
af3eeec75b
|
限制最大查询条数，零件号改成客户零件号
|
5 years ago |
|
廖湘明
|
d6ed0a40a1
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
廖湘明
|
d721b2845f
|
限制最大查询条数，零件号改成客户零件号
|
5 years ago |
|
廖湘明
|
abca1558da
|
零件号属性换成客户零件号
|
5 years ago |
|
陈思洁
|
c475abc39d
|
【13608 20027-BI-首页点击产线-物流运行情况-新增实际出库与BP业务表对比-2021-01-15】
|
5 years ago |
|
陈思洁
|
32fe7ffac7
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
陈思洁
|
193c4a254c
|
【13608 20027-BI-首页点击产线-物流运行情况-新增实际出库与BP业务表对比-2021-01-15】
|
5 years ago |
|
joke.wang
|
1ed47f1526
|
工单条码补打查询优化
|
5 years ago |
|
yumingxing
|
ca708c3f2d
|
需求变更报表修改
|
5 years ago |
|
陈思洁
|
90bfcd6d46
|
【Bi 界面bug修复】
|
5 years ago |
|
陈思洁
|
72cb3a0cd5
|
【Bi 界面bug修复】
|
5 years ago |
|
王杰
|
7f6281f63e
|
报工数据查询报表
|
5 years ago |
|
陈思洁
|
a7882ffdb9
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
陈思洁
|
10ae503952
|
【泰国需求变更】
|
5 years ago |
|
王杰
|
45a7ff6132
|
天津组装看板
|
5 years ago |
|
肖奕扬
|
4565693c67
|
Merge branch 'test' of frank.yu/i3plus-pojo into test
|
5 years ago |
|
yumingxing
|
1871c738e3
|
报表BUG
|
5 years ago |
|
肖奕扬
|
90d12235cf
|
Merge branch 'dev' of i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
廖湘明
|
08c9f486c4
|
日期条件验证
|
5 years ago |
|
simon.song
|
33f0e4b381
|
Merge remote-tracking branch 'origin/test' into test
|
5 years ago |
|
simon.song
|
6532ac13b6
|
中航新增读取第三方DB工步
|
5 years ago |
|
肖奕扬
|
6fc51c20f2
|
Merge branch 'dev' of i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
廖湘明
|
87c2c3b156
|
翻译枚举
|
5 years ago |
 钮海涛
|
2740830e8f
|
合并test代码
|
5 years ago |
|
simon.song
|
d824e42085
|
Merge remote-tracking branch 'origin/test' into test
|
5 years ago |
|
simon.song
|
6f0a831d20
|
中航看板优化
|
5 years ago |
|
simon.song
|
9c1bd71675
|
中航产线看板：过程检验优化
|
5 years ago |
|
陈思洁
|
5d79dd413a
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
陈思洁
|
6f5204d536
|
【13526 20027--产线管控中增加一个开线检测按钮用于临时开线-2020-12-30】
|
5 years ago |
|
Dominic_Xiao
|
c72a294a6f
|
回滚POM
|
5 years ago |
|
肖奕扬
|
9f25d80eac
|
Merge branch 'dev' of i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
Dominic_Xiao
|
6d3fa2aa50
|
物料上炉模式新增方向字段
|
5 years ago |
|
廖湘明
|
860a995022
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
廖湘明
|
411c497eef
|
代码优化，包装查询修改hql
|
5 years ago |
|
joke.wang
|
1c8c945f8e
|
Tha 工单打印
|
5 years ago |
|
joke.wang
|
b702c92c42
|
半成品报表
|
5 years ago |
|
陈思洁
|
76f8675ac1
|
【13525 20027-QMES首页“产线一次合格率”没有根据“日月年”筛选条件查询数据-20201230】
|
5 years ago |
|
simon.song
|
f51ad83cc0
|
返修记录报表查询条件去掉模糊查询，增加【产品条码】查询条件
|
5 years ago |
|
王杰
|
58c7b6854b
|
pom
|
5 years ago |
|
Dominic_Xiao
|
5e8e563a81
|
修改基础模块:炉子图片由与位置绑定改为与模式绑定
|
5 years ago |
|
陈思洁
|
f4ffa95c4b
|
【13470 20027--BI详情----生产质量情况--工位合格率浮窗显示内容优化----2020-12-28】
|
5 years ago |
|
Dominic_Xiao
|
11e2d8e9f9
|
卡斯马报废率趋势报表
|
5 years ago |
|
王杰
|
b25641e02b
|
数据复核
|
5 years ago |
|
王杰
|
0906539b82
|
总装 数据复核
|
5 years ago |
|
陈思洁
|
d1532067b7
|
【3063 不良品处理模块-添加基础配置界面 --后端】
|
5 years ago |
|
王杰
|
605d620565
|
工位跳过记录
|
5 years ago |
|
陈思洁
|
8edd1cc336
|
【3057 包装履历报表 - 后端开发】
|
5 years ago |
|
钮海涛
|
d301332162
|
合并dev代码
|
5 years ago |
|
yumingxing
|
1081b3a972
|
报表
|
5 years ago |
|
王林
|
03aefdfd9b
|
Merge branch 'dev' of frank.yu/i3plus-pojo into dev
|
5 years ago |
|
yumingxing
|
04df1faa4f
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
廖湘明
|
7f76e2ac02
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
廖湘明
|
747312eaa3
|
1.包装查询报表
2.一次性通过率报表
|
5 years ago |
|
yumingxing
|
e178bb8c67
|
生产统计报表+报废占比柏拉图报表
|
5 years ago |
|
廖湘明
|
5e43c32131
|
1.包装查询报表
2.一次性通过率报表
|
5 years ago |
|
廖湘明
|
29500d8762
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
廖湘明
|
61364e2170
|
包装查询报表
|
5 years ago |
|
yumingxing
|
1bebe59cc2
|
产品履历报表+全工序报废率报表
|
5 years ago |
|
yumingxing
|
6b443a7d04
|
产品履历报表+全工序报废率报表
|
5 years ago |
|
yumingxing
|
404cab525a
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
yumingxing
|
13ca332c4b
|
产品履历报表+全工序报废率报表
|
5 years ago |
|
钮海涛
|
48b4e45850
|
Merge remote-tracking branch 'remotes/origin/test' into dev
|
5 years ago |
|
钮海涛
|
6e5ea4462f
|
合并master代码
|
5 years ago |
|
钮海涛
|
977b8ac23c
|
Merge remote-tracking branch 'remotes/origin/test'
|
5 years ago |
|
yumingxing
|
4ec01b61f7
|
产品履历报表+全工序报废率报表
|
5 years ago |
|
simon.song
|
cbf86c2f7e
|
Merge remote-tracking branch 'origin/test' into test
|
5 years ago |
|
Dominic_Xiao
|
cb51636bd2
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
simon.song
|
c016cb734b
|
去掉模糊查询
|
5 years ago |
|
陈思洁
|
cf109c6773
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
陈思洁
|
419fe3a62e
|
【13330 20027--BI详情----产线运行情况--计划完成率浮窗显示内容优化--2020-12-18】
|
5 years ago |
|
simon.song
|
3c6b869821
|
13325 20027--过程追溯报表--筛选条件物料编码输入GTB2A268000P1点击查询表单显示GTB2A268000P1A物料编号的数据-2020-12-18
|
5 years ago |
|
simon.song
|
fa9a989cbd
|
Merge remote-tracking branch 'origin/test' into test
|
5 years ago |
|
simon.song
|
23bbde2057
|
13315 20027-返修记录报表增加显示产品二维码-202012-26
|
5 years ago |
|
simon.song
|
ade9053502
|
13325 20027--过程追溯报表--筛选条件物料编码输入GTB2A268000P1点击查询表单显示GTB2A268000P1A物料编号的数据-2020-12-18
|
5 years ago |
|
Dominic_Xiao
|
97e919552a
|
修改基础模块的描述名
|
5 years ago |
|
王杰
|
d089d0fba8
|
Merge branch 'test' into dev
|
5 years ago |
|
陈思洁
|
107f3828f9
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
陈思洁
|
cc99971690
|
【13140 20027-管理端增加包装箱条码与产品二维码的数据信息界面--20201221】
|
5 years ago |
|
王杰
|
7e8970f3e2
|
数据复核
|
5 years ago |
|
王杰
|
cd5b882e1f
|
dev merge test pom 冲突解决
|
5 years ago |
|
simon.song
|
0b1ef2290d
|
Merge remote-tracking branch 'origin/test' into test
|
5 years ago |
|
simon.song
|
d648228b18
|
13300 20027-控制计划--点击生效没有响应--2020-12-16
|
5 years ago |
|
joke.wang
|
95e92168d9
|
物料追溯批次model
|
5 years ago |
|
joke.wang
|
c0d3eb807f
|
物料批次追溯报表
|
5 years ago |
|
许心洁
|
3d1d05ef1c
|
1.天津委外发运库存移动单打印
|
5 years ago |
|
许心洁
|
1474be7486
|
Merge branch 'ext-dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
王杰
|
08a458cee2
|
unpack
|
5 years ago |
|
wynne1005
|
b7c4e76163
|
增加joined注解
|
5 years ago |
|
joke.wang
|
ef971201e3
|
泰国新条码生成
|
5 years ago |