jhh2579
|
f4e6c63956
|
中航工序外协检
|
4 years ago |
nies
|
5da810fb20
|
Merge branch 'test' into dev
|
4 years ago |
puxiao.liao
|
1a403dfefd
|
Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev
|
4 years ago |
Dominic_Xiao
|
efbb51711e
|
16826 19081-备件计划导入功能增加数量选项，便于快速导入-20210723
|
4 years ago |
|
puxiao.liao
|
4250f215f2
|
Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev
|
4 years ago |
joke.wang
|
a086d24203
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
4 years ago |
|
joke.wang
|
d2ec6e27a5
|
条码注释掉版本字段
|
4 years ago |
|
puxiao.liao
|
e48341f47b
|
Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev
|
4 years ago |
wynne1005
|
d8ad92fe24
|
merge test 还原pom
|
4 years ago |
|
wynne1005
|
08a0ca7937
|
merge dev 还原pom
|
4 years ago |
|
Dominic_Xiao
|
4297c59ef4
|
去除无效索引
|
4 years ago |
|
Dominic_Xiao
|
5c62f1b0d5
|
产线班次时段新增顺序字段
|
4 years ago |
|
Dominic_Xiao
|
adfec8957d
|
看板班次时段增加序号
|
4 years ago |
|
puxiao.liao
|
48fb24f3d7
|
Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev
|
4 years ago |
|
joke.wang
|
2521606f5b
|
删掉无效索引
|
4 years ago |
|
puxiao.liao
|
ac535feab8
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev
|
4 years ago |
|
joke.wang
|
370f4e9a02
|
强过报工定时任务
|
4 years ago |
|
puxiao.liao
|
59677dc00a
|
Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev
|
4 years ago |
|
Dominic_Xiao
|
c3a018dc1f
|
零件消耗数量模型
|
4 years ago |
 王杰
|
a1fcd53e1f
|
Merge branch 'test' into ext-dev
|
4 years ago |
|
王杰
|
c22117f395
|
Merge branch 'test' into dev
|
4 years ago |
|
王杰
|
257bd43a8f
|
对象结构增加plc代码
|
4 years ago |
|
puxiao.liao
|
11296ad9f1
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev
|
4 years ago |
|
joke.wang
|
cfcb4bda03
|
设备故障现象增加上传图片
|
4 years ago |
|
puxiao.liao
|
9a952c4f3d
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev
|
4 years ago |
|
Dominic_Xiao
|
c8b994a596
|
作业任务查询新增设备代码
|
4 years ago |
|
puxiao.liao
|
c842d3e5e5
|
Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev
|
4 years ago |
|
nies
|
0cda9012f2
|
Merge branch 'test' into dev
|
4 years ago |
|
joke.wang
|
d325e01e0f
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
4 years ago |
|
joke.wang
|
7c67e954c7
|
设备任务上传文件
|
4 years ago |
|
Dominic_Xiao
|
9c94d857d7
|
泰国电检条码打印
|
4 years ago |
|
joke.wang
|
52f4ea0331
|
设备任务上传文件
|
4 years ago |
|
joke.wang
|
fd32eb6bf8
|
工装使用次数预警job
|
4 years ago |
|
joke.wang
|
d96f4b5d74
|
16496 19081-设备管理调整-
|
4 years ago |
|
wynne1005
|
bb88851f17
|
还原pom
|
4 years ago |
|
puxiao.liao
|
7e8b0fdb42
|
Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev
|
4 years ago |
|
joke.wang
|
3c42131f2b
|
16436 19081-PCN-返工返修-隔离-基于条码查询零件时-散件清单和物料bom，和增加物料名称查询条件
|
4 years ago |
陈思洁
|
e3a558913b
|
【3566 20063-鉴定报工-20210618】
|
4 years ago |
|
陈思洁
|
28474c8aba
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
4 years ago |
|
王杰
|
fc8619208a
|
pom
|
4 years ago |
|
王杰
|
a71774ba24
|
pom
|
4 years ago |
|
王杰
|
21ca70f863
|
pom
|
4 years ago |
jun
|
bda7b30475
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
4 years ago |
|
Dominic_Xiao
|
7a92162ca6
|
卡斯马锁定记录表增加工位名称字段
|
4 years ago |
|
王杰
|
005d3ef8f9
|
物料
|
4 years ago |
|
Dominic_Xiao
|
5a354229f7
|
泰国电检
|
4 years ago |
|
Dominic_Xiao
|
66c627a698
|
新增泰国扭矩产线专用条码生成规则
|
4 years ago |
|
陈思洁
|
9ea5b11f20
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
4 years ago |
|
陈思洁
|
02cf004828
|
【3566 20063-鉴定报工-20210618】
|
4 years ago |
|
Dominic_Xiao
|
1b01f74f42
|
Merge remote-tracking branch 'origin/test' into test
|
4 years ago |
|
Dominic_Xiao
|
33b4b60c38
|
报废率趋势优化
|
4 years ago |
|
joke.wang
|
8b5447f5ca
|
停机统计报表
|
4 years ago |
|
Dominic_Xiao
|
6947405f44
|
16328 20135--锁定记录增加零件码这个字段--2021-06-23
|
4 years ago |
|
jun
|
0a8ad27fbb
|
Merge branch 'ext-dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
4 years ago |
宋双双
|
bef8415707
|
更新 'modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackageDetail.java'
泰国需求：接口表增加PACKAGE_NO字段索引
|
4 years ago |
|
陈思洁
|
5cda292bc2
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
4 years ago |
|
陈思洁
|
29d62c4334
|
【3484 20063-待处理报工基础数据-20210610】
|
4 years ago |
|
Dominic_Xiao
|
35e41f94e1
|
卡斯马锁定记录表锁定状态赋默认值
|
4 years ago |
|
Dominic_Xiao
|
dbdcbec032
|
产品工序过程报表新增料架号字段
|
4 years ago |
|
Dominic_Xiao
|
aa78fd8bd5
|
卡斯马异常锁定
|
4 years ago |
|
puxiao.liao
|
9333bfc996
|
Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev
|
4 years ago |
|
Dominic_Xiao
|
27ceea4113
|
16147 20135-不良品处理扫条码点击报废去掉报废原因这个选择框--2021-06-18
|
4 years ago |
|
puxiao.liao
|
93906742a6
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev
|
4 years ago |
|
陈思洁
|
ee42edc94c
|
【3484 20063-待处理报工基础数据-20210610】
|
4 years ago |
|
wynne1005
|
e7df36d3e9
|
还原merge pom
|
4 years ago |
|
wynne1005
|
69d872be7e
|
Merge branch 'dev' into test
|
4 years ago |
|
puxiao.liao
|
2acc57e72d
|
Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev
|
4 years ago |
|
Dominic_Xiao
|
778df56d2e
|
16217 20135--增加料架需要跟生产线绑定关系--2021-06-08
16162 20135--自动操作增加工号扫码（在每一个工位第一步扫码工号，每操作一次需要扫描一次工号）--2021-06-28
16152 20135--异常锁定，解锁和解锁记录--2021-06-25
|
4 years ago |
|
王杰
|
4fe445e4c3
|
test merge dev
|
4 years ago |
|
puxiao.liao
|
590c433b89
|
Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev
|
4 years ago |
|
Dominic_Xiao
|
c67f263e5d
|
卡斯马不良品处理格式化代码
|
4 years ago |
|
joke.wang
|
cda0f670eb
|
16198 19081-工位工时统计
|
4 years ago |
|
joke.wang
|
a271672ff5
|
产品追溯报表优化
|
4 years ago |
|
puxiao.liao
|
c42a4b250d
|
Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev
|
4 years ago |
|
joke.wang
|
5eae801feb
|
16073 19081-看板管理-产量看板-产量看板调整
|
4 years ago |
|
puxiao.liao
|
52bb4fe82f
|
Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev
|
4 years ago |
simon.song
|
aa3d3ff674
|
Merge remote-tracking branch 'origin/test' into test
|
4 years ago |
|
simon.song
|
dd7657d7e1
|
数据迁移功能优化
|
4 years ago |
|
陈思洁
|
3fa05bc816
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
4 years ago |
|
陈思洁
|
1f84c2f8aa
|
【15872 20027--PCN端工位扫描增加数据复核工步，校验采集的数据完整性和数据质量是否合格--2021-05-22】
|
4 years ago |
|
simon.song
|
83e33e2403
|
代码还原
|
4 years ago |
|
王杰
|
c7a62d52b5
|
Merge branch 'test' into ext-dev
|
4 years ago |
|
simon.song
|
e8fdaa58be
|
15872 20027--PCN端工位扫描增加数据复核工步，校验采集的数据完整性和数据质量是否合格--2021-05-22 simon.song 2021/5/24 下午6:14
|
4 years ago |
|
simon.song
|
17a61b2c2b
|
15607 20027-PCN端 - 巡检检验- 生成巡检任务时增加一个计数 -20210429
|
4 years ago |
|
simon.song
|
792d4263c5
|
接口表增加同步标识，kettle同步工具使用
|
4 years ago |
|
simon.song
|
95029f6abd
|
Merge remote-tracking branch 'origin/test' into test
|
4 years ago |
|
simon.song
|
32e4bb4ba7
|
15872 20027--PCN端工位扫描增加数据复核工步，校验采集的数据完整性和数据质量是否合格--2021-05-22
|
4 years ago |
|
王杰
|
4fdab21958
|
Merge branch 'test' into ext-dev
|
4 years ago |
|
王杰
|
15dc951bf1
|
dev merge test
|
4 years ago |
|
王杰
|
56ed9e73f2
|
ctno 增加 同步标志 松下wms接口映射需要此字段
|
4 years ago |
|
王杰
|
5d33795cff
|
test merge dev
|
4 years ago |
|
王杰
|
ae71f6a008
|
状态机 - 增加逻辑
|
4 years ago |
|
Dominic_Xiao
|
40d7dbff22
|
15957 20027-PCN端-来料检验&发货检验-影藏过程条码列&判定结果要展示出来-20210521
|
4 years ago |
|
Dominic_Xiao
|
524a766dd5
|
中航SPC表新增零件号字段
|
4 years ago |
|
puxiao.liao
|
a001dae575
|
代码回滚
|
4 years ago |
castle.zang
|
4fa41f2f90
|
还原pom version
|
4 years ago |
|
castle.zang
|
9a4d2060b6
|
修复version版本号
|
4 years ago |
 曾贞一
|
93c64328db
|
【修改-pom.xml】
|
4 years ago |
 臧学普
|
7aa68616bc
|
Merge branch 'master' into test
|
4 years ago |
 廖湘明
|
e001bbecfe
|
Merge remote-tracking branch 'origin/test' into test
|
4 years ago |
|
廖湘明
|
c19d2aebd5
|
一次性通过率BUG修改
|
4 years ago |
|
陈思洁
|
23e5b87ceb
|
【15607 20027-PCN端 - 巡检检验- 生成巡检任务时增加一个计数 -20210429】
|
4 years ago |
|
Dominic_Xiao
|
a0f6fa5a7e
|
15609 20135--产品工序过程查询报表--》缺陷信息--》缺陷位置--2021-04-29
|
4 years ago |
|
joke.wang
|
eef6f8e18b
|
节假日 泰国
|
4 years ago |
|
joke.wang
|
0ec0bc2592
|
15690 19108+PCN 监听工步 记录plc值
|
4 years ago |
|
joke.wang
|
db23233a8f
|
增加容器条码记录表
|
4 years ago |
|
joke.wang
|
b06b49866f
|
容器清空接口逻辑优化
|
4 years ago |
|
Dominic_Xiao
|
cd351e443f
|
15627 19048-喷涂条码在不同工位重复报工-20210430 ->报工表增加唯一索引:工厂代码+包装编号+原材料物料号
|
4 years ago |
|
joke.wang
|
f20e000957
|
15608 19081-返工返修-报废单据需要增加字段和数据
|
4 years ago |
|
陈思洁
|
dd000b33a3
|
【15573 20027-PCN端 - 来料检验- WMS已经将数据传输到了中间接口表，但MES还未生成来料检验任务 -20210429】
【15546 20027-管理端-报表中心-首检检验结果报表-班组和班长显示错误-20210421】
|
4 years ago |
|
joke.wang
|
5193012b69
|
15527 19081-追溯汇总报表-Operator Data区域数据需要按照Time Built正序排序
|
4 years ago |
|
joke.wang
|
92e0acee58
|
包装明细接口增加索引
|
4 years ago |
|
Dominic_Xiao
|
e18b726369
|
MesPackageTravelRepository 增加 Repository注解
|
4 years ago |
|
Dominic_Xiao
|
28d512021e
|
增加数据源类型字段
|
4 years ago |
|
simon.song
|
64d9eef5fc
|
Merge remote-tracking branch 'origin/test' into test
|
4 years ago |
|
simon.song
|
05f805f227
|
数据迁移功能优化，支持多数据源
|
4 years ago |
|
joke.wang
|
ebd3f85255
|
泰国扭矩展示优化
|
4 years ago |
肖奕扬
|
4025c81a8d
|
Merge pull request '产品工序报表' (#266) from frank.yu/i3plus-pojo:test into test
Reviewed-on: http://git.estsh.com/i3-IMPP/i3plus-pojo/pulls/266
|
4 years ago |
yumingxing
|
c5cd0d8a1d
|
产品工序报表
|
4 years ago |
|
陈思洁
|
a735bfc40c
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
4 years ago |
|
陈思洁
|
e7e0580c9a
|
【15381 20027--MES看板需要查询BH订单的首、中、末件的数据实时状态，故需要跨数据库实现其查询数据效果-2021-04-23】
【15197 20027-管理端-报表中心-首检检验结果报表-需要按照工单汇总展示首检-20210421
】
|
4 years ago |
|
Dominic_Xiao
|
10bc144c85
|
Merge remote-tracking branch 'origin/test' into test
|
4 years ago |
|
Dominic_Xiao
|
62ae1d9a13
|
包装履历新增qrCode字段，实现卡斯马报表根据工序查询历史CMS标签的功能
|
4 years ago |
|
陈思洁
|
a691cded53
|
【15381 20027--MES看板需要查询BH订单的首、中、末件的数据实时状态，故需要跨数据库实现其查询数据效果-2021-04-23】
【15197 20027-管理端-报表中心-首检检验结果报表-需要按照工单汇总展示首检-20210421
】
|
4 years ago |
|
陈思洁
|
4a3f379a28
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
4 years ago |
|
陈思洁
|
10ad3e54bb
|
【15332 20027-PCN端 - 来料检验- 选择检验单报错 -20210421】
|
4 years ago |
|
joke.wang
|
8a4698bfe7
|
15284 19108+ MES无下线汇总报表
|
4 years ago |
|
joke.wang
|
fd18ec063f
|
产品关键数据
|
4 years ago |
|
joke.wang
|
c0ff7ce986
|
订单池增加索引
|
4 years ago |
|
陈思洁
|
77f66de188
|
【14930 20027-管理端生产包装报表中增加产品二维码查询条件，可以根据产品二维查询出包装条码-20210409】
【14884 20027--控制计划--编辑中选择一行数据点击删除后，不做版本更新。-2021-04-06】
【14848 20027--控制计划--编辑中输入版本号，条件没有生效，点击查询，数据没有按照筛选条件显示查询结果-2021-04-02】
|
4 years ago |
|
Dominic_Xiao
|
eacbdbaa7d
|
20027--MES看板-班组数来源班组信息，需要班组信息中增加一个字段来维护班组人数-2021-04-02
|
4 years ago |
|
joke.wang
|
bddd4b37a2
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
4 years ago |
|
joke.wang
|
52b2ea43da
|
14859 19081-JISA收序时间超时和队列时间预警信息-邮件提示内容加上预警值
|
4 years ago |
|
陈思洁
|
2b2761ade2
|
【14827 19108+ MES->【生成工单】模块,释放功能应根据零件号进行流水号累加+2021-04-01】
|
4 years ago |
|
joke.wang
|
ca8bfd3f53
|
泰国扭矩采集
|
4 years ago |
|
Dominic_Xiao
|
f12c568119
|
天津:物料校验客户标签关系和物料绑定客户标签明细同步标识赋默认值
|
4 years ago |
|
Dominic_Xiao
|
cc86a60ba7
|
Merge remote-tracking branch 'origin/test' into test
|
4 years ago |
|
Dominic_Xiao
|
9eba8f1683
|
天津-PCN:物料校验客户标签关系与物料绑定客户标签明细新增同步标识字段
|
4 years ago |
|
joke.wang
|
072bc431fb
|
扭矩采集
|
4 years ago |
|
simon.song
|
3c6a7b410d
|
Merge remote-tracking branch 'origin/test' into test
|
4 years ago |
|
simon.song
|
5554bfd14c
|
14520 20027--管理端--控制计划--增加审核状态、是否生效筛选条件-2021-03-17
|
4 years ago |
|
王杰
|
38d03b1060
|
状态机优化
|
4 years ago |
|
陈思洁
|
9e0d03629c
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
4 years ago |
|
陈思洁
|
281957a6f5
|
【3324 泰国-扭矩采集 --PC端后端】
|
4 years ago |
|
joke.wang
|
3d0d39ac1d
|
Tha扭矩采集
|
4 years ago |
|
陈思洁
|
ccf221f80b
|
【pojo改名字】
|
4 years ago |
|
陈思洁
|
39ced0a83d
|
【14681 19108+ PCN->容器绑定单件条码工位,当前容器号无显示+2021-03-25】
|
4 years ago |
汪云昊
|
1ef29d1fce
|
revert(pojo):还原pom版本
|
4 years ago |
|
joke.wang
|
7f8dd50412
|
物料关系表
|
4 years ago |
|
wynne1005
|
a44a4a8be3
|
Merge branch 'dev' into test
|
4 years ago |