I3_YF_SEAT
/
i3plus-pojo
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
9,727 Commits
1 Branch
0 Tags
20 MiB
yun-zuoyi
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from '3ba4dd1c7b'
${ noResults }
Commit Graph

2278 Commits (3ba4dd1c7b0d7a555ba8fc7b0eec0cbfae985a4c)

Author SHA1 Message Date
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
Dominic_Xiao e58ffc9d69 天津-PCN新增功能:物料校验客户标签明细表新增客户标签字段 4 years ago
Dominic_Xiao ce91ea879f 天津-PCN新增功能:物料校验客户标签 4 years ago
simon.song f73570b28e 漏提交代码 4 years ago
Dominic_Xiao d129a3863b 天津-新注塑区域集中下件 4 years ago
joke.wang cd5773fb2e 绑定关键件增加显示列 4 years ago
王杰 f8e0146b19 pom 4 years ago
王杰 af11605d46 工步 4 years ago
wynne1005 8b1e28c893 删除mongo依赖 merge test 4 years ago
joke.wang 19872ba443 隔离报废 4 years ago
陈思洁 c2dbff5d5a Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 4 years ago
陈思洁 6b4ae7eb71 【3254 泰国-上装总成套膜标签打印】 4 years ago
joke.wang 0c4e6359fc JISA导入优化 4 years ago
joke.wang fbab36aad2 报废隔离 4 years ago
joke.wang 24aa100dfe 追溯总览报表 4 years ago
陈思洁 efebc6f605 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 4 years ago
陈思洁 154307b2f0 【泰国工位传参修改】 4 years ago
许心洁 2127e3d260 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo 4 years ago
joke.wang 339cbf0634 bug:14146 一张报表中查询产品所有追溯信息 4 years ago
Dominic_Xiao 44af0f4e80 删除重复实体类 4 years ago
joke.wang d7da6437b3 获取状态机dao bug修复 4 years ago
王杰 4d81424794 numberrule 4 years ago
王杰 5e290e81b8 number rule 4 years ago
simon.song dbeb6baac7 14185 20027--管理端-数据对象，根据数据源代码查询无效- 2021-02-28 4 years ago
joke.wang f01ae5106b 14165 返修队列增加校验 4 years ago
许心洁 38e6870f04 Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo 4 years ago
王杰 431ee97d64 同步工单表 4 years ago
王杰 fe6940b0dc 编码规则扩展 4 years ago
joke.wang b505fe8456 13858 20027--接口表同步情况报表 4 years ago
joke.wang e2a9222b47 pcn登陆限制 4 years ago
Dominic_Xiao 0c9dff6dd8 不良品处理根据物料类型查询位置 4 years ago
Dominic_Xiao c1eb51dec5 缺陷位置新增产品类型字段 4 years ago
王杰 03d95e2591 Merge branch 'dev' into test 4 years ago
王杰 e66a560661 冲突 4 years ago
王杰 ec3d2f8557 pom 4 years ago
王杰 4644639c2e pom 4 years ago
王杰 f0c09ca0e6 Merge branch 'test' into dev 4 years ago
王杰 2b89e35c69 pom 4 years ago
王杰 78b5bb0c08 Merge branch 'test' 4 years ago
simon.song ca8ca18f34 数据同步接口修改查询条件 4 years ago
许心洁 cf83ab060d Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo 4 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
 4 years ago
simon.song ff5348bf99 中航看板取值修改 4 years ago
simon.song 9c51146117 数据迁移接口修改 4 years ago
王杰 5a0927299b 新建表报错 bug 4 years ago
simon.song 78a96c6583 mes管理端增加数据迁移功能相关接口 4 years ago
许心洁 22c55fc8c6 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo 4 years ago
joke.wang e967dde7a3 总屏幕看板优化 4 years ago
Dominic_Xiao 553fb09bc0 修改hql去除多余工厂代码条件 4 years ago
许心洁 410b95aefd Merge branches 'master' and 'test' of http://git.estsh.com/i3-WMS/i3plus-wms 
# Conflicts:
#	modules/i3plus-wms-apiservice/pom.xml
 4 years ago
simon.song db0d184aa3 数据迁移功能完成。 4 years ago
肖奕扬 9f0dfdb1fd Merge branch 'test' of frank.yu/i3plus-pojo into test 4 years ago
Dominic_Xiao cf908f2d04 卡斯马基础界面--客户条码规则、产品容器容量配置 4 years ago
王杰 25303ffc55 Merge remote-tracking branch 'i3plus-pojo/dev' into dev 4 years ago
王杰 5a5874b137 test 4 years ago
王杰 45a1b63a23 Merge branch 'test' 4 years ago
王杰 84d9ec15f2 pom 4 years ago
王杰 f1db936f42 pom 4 years ago
王杰 d2f03a966e Merge branch 'dev' into test 4 years ago
joke.wang 5e1fac42fe 12112 设备周期作业计划需要与作业要求进行关联 4 years ago
yumingxing 86a6fb1390 报表2021026 4 years ago
yumingxing ca50493d20 报表20210125 4 years ago
joke.wang 378993b225 包装条码补打优化 4 years ago
陈思洁 85ebb5ce78 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 4 years ago
陈思洁 01877b80d5 【13614 19048 喷涂看板实际生产和计划数量都不正确 20210107】 4 years ago
Dominic_Xiao 81e63fe7d2 Merge remote-tracking branch 'origin/test' into test 4 years ago
Dominic_Xiao c5d56b2c32 炉内位置信息新增方向字段 4 years ago
joke.wang 5d25ecc9b5 13829 mgn-bj 补打页面优化 4 years ago
王杰 fba7f636d9 状态机 4 years ago
王杰 1e6691c8b5 Merge branch 'test' into dev 4 years ago
joke.wang e779b5e482 成品标签打印修改 4 years ago
王杰 c8b21c0b69 pom 4 years ago
陈思洁 d8aac51ef5 【排序序号--滑道】 4 years ago
陈思洁 3997ae3e93 【排序序号--滑道】 4 years ago
yumingxing 70b4bc75e8 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 4 years ago
yumingxing 428f98955d 报表20210118 4 years ago
许心洁 8246a28c05 Merge branches 'master' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo 4 years ago
Dominic_Xiao db204080a8 滑道工厂新增"客户代号"与"客户抬头"字段 4 years ago
yumingxing 0871833d26 报表20210115 4 years ago
yumingxing 479b81cb08 报表20210114 4 years ago
yumingxing b1df64bff5 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 4 years ago
yumingxing 53b72a8f8d 报表202101141821 4 years ago
王杰 fb4b10e689 涂装质检 待定 重构 4 years ago
许心洁 d107c7a3fe Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo 4 years ago
陈思洁 74947bfaf8 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 4 years ago
陈思洁 abe5ae9f9b 【13524 20027--首、巡、末检的检验项内容需要增加排序字段，现首巡末检的检验项是没排序的，需要按照新增的排序字段进行排序】 4 years ago
yumingxing fcbf1467b2 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 4 years ago
yumingxing deedd2f2ef 报表20210114 4 years ago
joke.wang 0a389480f3 13696 新增不良维修记录报表 4 years ago
肖奕扬 0d7c71d5db Merge branch 'test' of frank.yu/i3plus-pojo into test 4 years ago
Dominic_Xiao bfd5b0ab9d 新增滑道工厂基础模块 4 years ago
yumingxing 9202937516 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 4 years ago
yumingxing 2cd3547637 报表优化 4 years ago
joke.wang d93c9fe6a6 物料表增加冗余字段 4 years ago
廖湘明 af3eeec75b 限制最大查询条数，零件号改成客户零件号 4 years ago
廖湘明 d6ed0a40a1 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 4 years ago
廖湘明 d721b2845f 限制最大查询条数，零件号改成客户零件号 4 years ago
廖湘明 abca1558da 零件号属性换成客户零件号 4 years ago
陈思洁 c475abc39d 【13608 20027-BI-首页点击产线-物流运行情况-新增实际出库与BP业务表对比-2021-01-15】 4 years ago
陈思洁 32fe7ffac7 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 4 years ago
陈思洁 193c4a254c 【13608 20027-BI-首页点击产线-物流运行情况-新增实际出库与BP业务表对比-2021-01-15】 4 years ago
joke.wang 1ed47f1526 工单条码补打查询优化 4 years ago
yumingxing ca708c3f2d 需求变更报表修改 4 years ago
陈思洁 90bfcd6d46 【Bi 界面bug修复】 4 years ago