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

8226 Commits (6c79b95bf281669e493c3b1b9fef2e1875b55958)

Author SHA1 Message Date
陈思洁 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
汪云昊 9241c60f07 feat(mdm):通用导入导出及外部应用扩展 4 years ago
joke.wang fd18ec063f 产品关键数据 4 years ago
puxiao.liao 87f3031a3d 修复软适配枚举 4 years ago
joke.wang c0ff7ce986 订单池增加索引 4 years ago
许心洁 e1f366f654 喜德任务#3349 4 years ago
许心洁 091a5b3678 流程管家重置提示+喜德任务3349 4 years ago
许心洁 2684b52775 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 4 years ago
许心洁 a24b40d8ec 喜德任务#3349 4 years ago
puxiao.liao 39b716d2a1 修复打印异常 4 years ago
钮海涛 95dffb65e0 新增成品检验报工 4 years ago
钮海涛 736087852e 新增成品检验报工 4 years ago
陈思洁 77f66de188 【14930 20027-管理端生产包装报表中增加产品二维码查询条件，可以根据产品二维查询出包装条码-20210409】 
【14884 20027--控制计划--编辑中选择一行数据点击删除后，不做版本更新。-2021-04-06】
【14848 20027--控制计划--编辑中输入版本号，条件没有生效，点击查询，数据没有按照筛选条件显示查询结果-2021-04-02】
 4 years ago
钮海涛 33be7da477 新增成品检验报工 4 years ago
钮海涛 4590133c27 新增成品检验报工 4 years ago
github33 4854673754 14850 20027-mes查询 wms的熔深batch的接口-20210409 4 years ago
wynne1005 9c4b233975 refactor(core): 支持用户密码过期 
Finish 21.4.8
 4 years ago
wynne1005 afc0138e83 refactor(core): 支持用户密码过期 
commit1 21.4.7
 4 years ago
github33 be26c0920f 14850 20027-mes查询 wms的熔深batch的接口-20210409 4 years ago
puxiao.liao 6030c67021 打印数据查询修改 4 years ago
github33 63dc4a2f9f 14850 20027-mes查询 wms的熔深batch的接口-20210409 4 years ago
钮海涛 984f772788 Merge remote-tracking branch 'origin/ext-dev' into ext-dev 4 years ago
钮海涛 8b75ed1cfc 新增报工功能 4 years ago
曾贞一 f15f85b56d Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 4 years ago
陈思洁 6ffd586274 【14903 19108+ PCN【上装工位】逻辑优化 +2021-04-03】 4 years ago
曾贞一 b688f4aff5 【14905 20027-调角器BH-录入检测值- 熔深结果刷新有误 -20210404】 4 years ago
wynne1005 5b003a613b screen修改关系表名 增加历史表 4 years ago
puxiao.liao 93226dd915 Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev 4 years ago
Dominic_Xiao eacbdbaa7d 20027--MES看板-班组数来源班组信息，需要班组信息中增加一个字段来维护班组人数-2021-04-02 4 years ago
钮海涛 543433bfff Merge remote-tracking branch 'origin/ext-dev' into ext-dev 4 years ago
钮海涛 9ee464f67e 新增报工功能 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
wynne1005 64c2ed920f 修改通用界面端口 还原第三方数据库连接字符串中的时区 4 years ago
wynne1005 0ba5c62931 Merge branch 'screen' into dev 4 years ago
wynne1005 714a32a994 first commit 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
shun 1fbccdcf40 查询移库单增加供应商名称 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
puxiao.liao 2adc935bb0 Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev 
 Conflicts:
	modules/i3plus-pojo-mes-pcn/pom.xml
	sonar-project.properties
 4 years ago
钮海涛 23f6f9285b 增加4车间补满模逻辑 4 years ago
许心洁 4f919011dc Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 4 years ago
github33 9a4aae9f68 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 4 years ago
github33 a61f2c1778 CYCLE_RULE--新增枚举 4 years ago
王杰 38d03b1060 状态机优化 4 years ago
wynne1005 7767630fbb tmp 4 years ago
wynne1005 15633bc28e tmp 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
汪云昊 1eae64bafe Merge remote-tracking branch 'origin/dev' into test 4 years ago
汪云昊 95052a4e78 Merge remote-tracking branch 'origin/dev' into dev 4 years ago
汪云昊 46e068ccdb feat(softswitch):REST按状态码重试 4 years ago
joke.wang 7f8dd50412 物料关系表 4 years ago
wynne1005 a44a4a8be3 Merge branch 'dev' into test 4 years ago
wynne1005 d97a855e83 移除screen 4 years ago
Dominic_Xiao 9fc68bc443 14382 19081-安灯广播速度调整未生效-20210312:修改播放速度类型为浮点型 4 years ago
汪云昊 4272aad4ac Merge remote-tracking branch 'origin/dev' into dev 4 years ago
汪云昊 d45d5175dc feat(softswitch):REST按状态码重试 4 years ago
wynne1005 44f61e1525 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 4 years ago
wynne1005 385156cd18 refactor(core): SSO 支持方式变更 4 years ago
Dominic_Xiao e58ffc9d69 天津-PCN新增功能:物料校验客户标签明细表新增客户标签字段 4 years ago
汪云昊 fc28ea2346 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 4 years ago
钮海涛 ffa0aa94f8 Merge remote-tracking branch 'origin/ext-dev' into ext-dev 4 years ago
钮海涛 caafb9c317 修改排程计划逻辑 4 years ago
汪云昊 2443d1d8e6 feat(softswitch):REST按状态码重试 4 years ago
Dominic_Xiao ce91ea879f 天津-PCN新增功能:物料校验客户标签 4 years ago
许心洁 f363979f24 任务#3328 4 years ago
wynne1005 f21c618f70 feat(Screen): pojo建立 
pojo建立
 4 years ago
puxiao.liao cc8d2a5441 Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev 4 years ago
simon.song f73570b28e 漏提交代码 4 years ago
puxiao.liao f9c3fc705b Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev 4 years ago
Dominic_Xiao 4ceb2b70c7 Merge remote-tracking branch 'origin/test' into test 4 years ago
Dominic_Xiao d129a3863b 天津-新注塑区域集中下件 4 years ago
simon.song 2dc6a886fe 14492 19048-产品追溯报表OP10-OP70工位，日期字段显示的信息不对-20210316（时区问题） 4 years ago
joke.wang cd5773fb2e 绑定关键件增加显示列 4 years ago
王杰 e40744e65a Merge branch 'test' into ext-dev 4 years ago
王杰 f8e0146b19 pom 4 years ago
王杰 af11605d46 工步 4 years ago
钮海涛 257647de0a Merge remote-tracking branch 'origin/ext-dev' into ext-dev 4 years ago
钮海涛 0af24e4704 新增生产计划下发，生产计划打印功能。 4 years ago
曾贞一 f05c9bfaa4 Merge remote-tracking branch 'remotes/origin/test' into ext-dev 4 years ago
曾贞一 05ce6976e4 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 4 years ago
曾贞一 18b9a8c6c9 【14212 20162--库存调整盘点需要增加卡控逻辑--20210310】 4 years ago
joke.wang 6a00f4f7f9 14539 19081-工艺管理-BYPASS映射关系需按照BYPASS项需要升序排序 4 years ago
汪云昊 46d94c051a Merge remote-tracking branch 'remotes/origin/dev' into test 4 years ago
汪云昊 af4ce0fa32 feat(impp):组织结构添加事业部节点 4 years ago
钮海涛 1072a62f79 PDA首页增加目标存储区显示 4 years ago
钮海涛 ec35afa34e Merge remote-tracking branch 'origin/ext-dev' into ext-dev 4 years ago
钮海涛 9f12a44fb6 完成插单功能 4 years ago
puxiao.liao aec66afa83 修复泰国翻包 4 years ago
andly.pan 5859716998 Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into pext-dev 4 years ago
andly.pan 5e98df411e 更改重置参数 
Signed-off-by: andly.pan <andly.pan@estsh.com>
 4 years ago
wynne1005 8b1e28c893 删除mongo依赖 merge test 4 years ago
wynne1005 bbb4d57abc 删除mongo依赖 4 years ago