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

8329 Commits (c6bc2e682adfb18eb9f47d1e443f9b11737f47a9)

Author SHA1 Message Date
andly.pan 44bbc798c1 Merge remote-tracking branch 'pth-test/ext-dev' into ext-dev 4 years ago
andly.pan dfa897720e Mdm增加repo 4 years ago
andly.pan e66c99e509 Mdm修改 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
Xiao-yin0517 0f406c54b8 Merge branch 'ext-dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev 
 Conflicts:
	modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/MdmSyncData.java
 4 years ago
Xiao-yin0517 c4b82c4891 更改通过同步数据 4 years ago
潘天虎 8366905f58 Merge pull request 'ext-dev' (#274) from andly.pan/i3plus-pojo:ext-dev into ext-dev 
Reviewed-on: http://git.estsh.com/i3-IMPP/i3plus-pojo/pulls/274
 4 years ago
andly.pan 8abe9cb030 新增动态配置 4 years ago
钮海涛 c4660251cd 优化资源评估中间计算结果。 4 years ago
andly.pan 19767dfcc9 Merge branch 'ext-dev' of http://git.estsh.com/andly.pan/i3plus-pojo into pext-dev 4 years ago
andly.pan f2cca59ee5 Merge branch 'ext-dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into pext-dev 4 years ago
andly.pan 46debfb7fb Mdm增加字段 4 years ago
andly.pan 4890eb87a3 Mdm增加字段配置 4 years ago
simon.song aa3d3ff674 Merge remote-tracking branch 'origin/test' into test 4 years ago
simon.song dd7657d7e1 数据迁移功能优化 4 years ago
钮海涛 3d66e54cea 优化资源评估中间计算结果。 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
钮海涛 463f910b7a Merge remote-tracking branch 'origin/ext-dev' into ext-dev 4 years ago
钮海涛 3a3bdc664a 修复工作左边界计算问题 4 years ago
simon.song e4c94df17c Merge remote-tracking branch 'origin/test' into test 4 years ago
simon.song 83e33e2403 代码还原 4 years ago
Xiao-yin0517 2d2faaaa4c 更改实体类 4 years ago
andly.pan 3dca058857 Merge remote-tracking branch 'pth-test/ext-dev' into ext-dev 4 years ago
andly.pan 0453e33e8f 和外部系统同步数据 4 years ago
王杰 c7a62d52b5 Merge branch 'test' into ext-dev 4 years ago
王杰 a0f4fef78d Merge branch 'dev' into test 4 years ago
王杰 bddf876ee3 工位展示组件 增加 doFunction 方法 4 years ago
李俊生 804f9240cc 零星出库单需要增加出库原因、部门、领用人（前3个调用枚举）、项目号（调用项目信息） 
零星入库单  增加入库原因
 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
王杰 ab1bc23eb7 Merge branch 'test' into dev 4 years ago
王杰 ae71f6a008 状态机 - 增加逻辑 4 years ago
Dominic_Xiao 40d7dbff22 15957 20027-PCN端-来料检验&发货检验-影藏过程条码列&判定结果要展示出来-20210521 4 years ago
Xiao-yin0517 6f1b047725 Merge remote-tracking branch 'origin/ext-dev' into ext-dev 4 years ago
Xiao-yin0517 1696ba05e3 更改实体类 4 years ago
andly.pan 95d72cf4af 库存交易条码新增字段（同步仪征） 
Signed-off-by: andly.pan <andly.pan@estsh.com>
 4 years ago
Dominic_Xiao 524a766dd5 中航SPC表新增零件号字段 4 years ago
wynne1005 95ac5f0ee3 feat(screen): jdbc拼接初步完成 待整理代码 
jdbc拼接初步完成 待整理代码
 4 years ago
puxiao.liao c05cb37dff Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev 4 years ago
castle.zang 8ef28595ab bug 动态表单工厂隔离:增加组织隔离属性ID 4 years ago
puxiao.liao a001dae575 代码回滚 4 years ago
puxiao.liao eb8f03cf19 Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev 
 Conflicts:
	modules/i3plus-pojo-andon/pom.xml
	modules/i3plus-pojo-aps/pom.xml
	modules/i3plus-pojo-jobflow/pom.xml
 4 years ago
李俊生 5f52b1aa33 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 4 years ago
李俊生 206b522af5 pom冲突 4 years ago
李俊生 adb48ef07f 南非收货提交后，需送检的零件后需要有送检的提示 4 years ago
曾贞一 54329c67ec 【同步BH成品条码JOB-优化】 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
肖奕扬 62505fa7b7 Merge pull request '一次性通过率BUG修改' (#268) from xiangming.liao/i3plus-pojo:test into test 
Reviewed-on: http://git.estsh.com/i3-IMPP/i3plus-pojo/pulls/268
 4 years ago
钮海涛 7c60ce4cdc Merge remote-tracking branch 'origin/ext-dev' into ext-dev 4 years ago
钮海涛 b5bbf7aefb 增加等待时间评估规则 4 years ago
puxiao.liao 48d2f6680a Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev 
 Conflicts:
	modules/i3plus-pojo-screen/pom.xml
 4 years ago
李俊生 85dd71b1ca Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 
 Conflicts:
	modules/i3plus-pojo-screen/pom.xml
 4 years ago
wynne1005 83b4cb64df merge dev 4 years ago
钮海涛 f50d358cdd Merge remote-tracking branch 'origin/ext-dev' into ext-dev 4 years ago
钮海涛 7bd17131b5 牵纱拆到手工设备，包布也需要拆到手工设备。 4 years ago
wynne1005 b46bd3b354 feat(core): 平台添加用户名登录方式 支持钉钉授权 
平台添加用户名登录方式 支持钉钉授权
 4 years ago
廖湘明 e001bbecfe Merge remote-tracking branch 'origin/test' into test 4 years ago
廖湘明 c19d2aebd5 一次性通过率BUG修改 4 years ago
puxiao.liao 41d09fd259 Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev 4 years ago
puxiao.liao 177cdd0b6e 库存条码表增加容器字段 4 years ago
andly.pan 43d7195a37 Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into pext-dev 4 years ago
Xiao-yin0517 7a4ab20483 增加了是否禁用和启用 4 years ago
陈思洁 23e5b87ceb 【15607 20027-PCN端 - 巡检检验- 生成巡检任务时增加一个计数 -20210429】 4 years ago
钮海涛 4088a85a5c 更改左边界计算逻辑：后道工序满模即可开始。 4 years ago
Dominic_Xiao a0f6fa5a7e 15609 20135--产品工序过程查询报表--》缺陷信息--》缺陷位置--2021-04-29 4 years ago
wynne1005 ac791d518a fix(impp-framework): 更换redisson注入方式 
更换redisson注入方式
 4 years ago
joke.wang 49f709959d 15711 19081-邮件提醒内容每一条之间增加换行和序号 4 years ago
曾贞一 697f93a384 Merge remote-tracking branch 'origin/test' into test 4 years ago
曾贞一 3e0df20273 【15693 19108+单据管理-出库单-出库单明细-双击-出库单子表详情，新增wms_stock_sn.package_no字段显示+0506】 4 years ago
钮海涛 3dd67766b2 测试时间 4 years ago
joke.wang eef6f8e18b 节假日 泰国 4 years ago
puxiao.liao 294d34b6d3 Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev 4 years ago
puxiao.liao 5cf9c232b5 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 4 years ago
puxiao.liao dbd14c9d6e 导出模板字段排序维护 4 years ago
钮海涛 c09a078ce4 获取生产计划开始时间和结束时间去除service调用。 4 years ago
joke.wang 0ec0bc2592 15690 19108+PCN 监听工步 记录plc值 4 years ago
joke.wang db23233a8f 增加容器条码记录表 4 years ago
钮海涛 9ace046d1d 修改动态拆分字段为对象关联 4 years ago
Fightgoo 82b4c948f6 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 4 years ago
Fightgoo 021e05ebaf 15635 20027-调角器BH- BH检测结果管理-管理明细增加检测类型代码查询条件 - 20210430 4 years ago
钮海涛 99b43a6677 修改枚举 4 years ago
李俊生 efaafcdcc9 仓库物料统计预警 4 years ago
joke.wang b06b49866f 容器清空接口逻辑优化 4 years ago
钮海涛 b396d9cfd9 修改枚举 4 years ago
钮海涛 e918d85702 Merge remote-tracking branch 'origin/ext-dev' into ext-dev 4 years ago
钮海涛 30048f4ce1 修改枚举 4 years ago
曾贞一 60408db7b0 【15642 19108+wms_printing_queue 新增 part_no 字段+0429】 4 years ago
puxiao.liao 3cf1fd642e Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev 4 years ago
Dominic_Xiao cd351e443f 15627 19048-喷涂条码在不同工位重复报工-20210430 ->报工表增加唯一索引:工厂代码+包装编号+原材料物料号 4 years ago
曾贞一 c6e80ad9a7 【3391 添加报废记录报表和修改质检不良清单表-后端】 4 years ago
joke.wang f20e000957 15608 19081-返工返修-报废单据需要增加字段和数据 4 years ago
陈思洁 2c65486bc6 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 4 years ago
陈思洁 dd000b33a3 【15573 20027-PCN端 - 来料检验- WMS已经将数据传输到了中间接口表，但MES还未生成来料检验任务 -20210429】 
【15546 20027-管理端-报表中心-首检检验结果报表-班组和班长显示错误-20210421】
 4 years ago
andly.pan 6989180c2a Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into pext-dev 4 years ago
曾贞一 ac08dc110c Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 4 years ago
曾贞一 a92b87f6a0 【3391 添加报废记录报表-后端】 4 years ago
wynne1005 1323569c56 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 4 years ago
wynne1005 0c860de567 feat(SCREEN): 数据对象操作 1 
数据对象操作 1
 4 years ago
duan.yang a30e97336c 供应商关系添加物料字段，工厂代码查询条件Bug 
Signed-off-by: duan.yang <994300880@qq.com>
 4 years ago
王杰 844349d583 冲突 4 years ago
王杰 21a3d716f4 pom 4 years ago
王杰 5bf5504992 pom 4 years ago
李俊生 91d7b0157d 零件转换界面增加按钮功能 
15241 19081 ——北京麦格纳采购订货进度报表看板需排序，2021-04-17 按照计划时间倒序
15474 19081-报表中心，供应商到货异常到货次数查询主表添加显示字段，到货时间，单号--20210422
15471 19081-领料任务报表及明细没有拣货完成时间-20210425
 4 years ago
joke.wang 5193012b69 15527 19081-追溯汇总报表-Operator Data区域数据需要按照Time Built正序排序 4 years ago
钮海涛 f1159f8afb Merge remote-tracking branch 'origin/ext-dev' into ext-dev 4 years ago
钮海涛 ae88dda60d 新增MDM对象转换工具。 4 years ago
puxiao.liao a9881bc01f 修复泰国产品条码统计 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
puxiao.liao 54529730e7 Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev 4 years ago
puxiao.liao 3c4c271c64 增加产品条码字段信息 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
许心洁 ab8686ae2c 去掉mongo依赖 4 years ago
许心洁 b08ff69d37 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev 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
许心洁 c4b833a259 合并test分支代码 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
钮海涛 508fd77881 Merge remote-tracking branch 'origin/ext-dev' into ext-dev 4 years ago
钮海涛 4f697d51ec 演示问题修复 4 years ago
李俊生 4e87b3000d Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 4 years ago
李俊生 9ed1a5d36a 15241 19081 ——北京麦格纳采购订货进度报表看板需排序，2021-04-17 
15108 19048-- 库存移动统计可以查看到历史记录 --20210417
 4 years ago
puxiao.liao 505f80032c 导入模板下载增加是否必填字段下载 4 years ago
陈思洁 91ab318854 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 4 years ago
陈思洁 a691cded53 【15381 20027--MES看板需要查询BH订单的首、中、末件的数据实时状态，故需要跨数据库实现其查询数据效果-2021-04-23】 
【15197 20027-管理端-报表中心-首检检验结果报表-需要按照工单汇总展示首检-20210421
】
 4 years ago
曾贞一 ab0e8d559b Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 4 years ago
曾贞一 57a9a8b4fd 【15334 19108+wms_doc_fg_detail到库存执行按产线处理+0419】 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
钮海涛 63a8aef96d 演示问题修复 4 years ago
汪云昊 ec605315bb Merge remote-tracking branch 'remotes/origin/test' into ext-dev 4 years ago
汪云昊 862256e751 Merge remote-tracking branch 'remotes/origin/dev' into test 4 years ago