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

5641 Commits (30fcf4f23f10cbf2388a1446f1cc1c2c52e0e8d6)

Author SHA1 Message Date
wynne1005 4ed1770189 Merge branch 'dev' into test 5 years ago
陈思洁 32f6215be7 【8309 产品配方导入-导入报错】 5 years ago
王杰 de200de372 mes 5 years ago
曾贞一 0a51c0e10c Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
曾贞一 97d7fdbf24 【8181 20011-- 条码打印界面增加一个打印组号按钮，用于现场母条码丢失或者损坏的场景来补打母条码】 5 years ago
钮海涛 a575b4eed4 bug:8287;8288;8290 5 years ago
王杰 da1c10dc4c mes生产计划批量编制 5 years ago
曾贞一 fb15536a34 【8254 中航-出库单-客户发运-新增销售订单字段】 5 years ago
曾贞一 e6f8811f72 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
曾贞一 cf12f354ae [8206 生产工单-导入失败] 5 years ago
钮海涛 7aaed8fb79 task:1735 5 years ago
joke.wang de7d007ef1 [获取工步sql server分组函数问题修复] 5 years ago
钮海涛 ac9ffb1ac1 Merge remote-tracking branch 'origin/dev' into dev 5 years ago
陈思洁 ad8255949a Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
陈思洁 be925fded9 【1693-设备状态监控看板】 5 years ago
袁津哲 000c2ad16c Merge remote-tracking branch 'origin/dev' into dev 5 years ago
袁津哲 745455c5bd 修改波次规则bug和对接导入模板接口 5 years ago
钮海涛 bf2cc9843f Merge remote-tracking branch 'origin/dev' into dev 
# Conflicts:
#	modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java
 5 years ago
puxiao.liao b9af2c52f8 1713 BH-挑选，返修 5 years ago
钮海涛 81f380aec4 产品入库表新增 5 years ago
joke.wang 60428b5bad [任务：1690 界面窗口] 5 years ago
钮海涛 b7dceccd71 Merge remote-tracking branch 'origin/test' into test 5 years ago
钮海涛 f414274aeb 供货追踪 5 years ago
陈思洁 22b42d710b Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
陈思洁 ff6e5ac926 【8239 生产作业-单产品扫描（数据写入有误）】 5 years ago
汪云昊 2ab9045d17 Merge remote-tracking branch 'remotes/origin/dev' into test 5 years ago
陈思洁 a8ae48b132 【7937 半成品箱条码绑定工步-数据写入缺少】 5 years ago
汪云昊 30c0b2e46a Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
汪云昊 d4a91b6d69 缺失资源接口优化 5 years ago
许心洁 1a7d9edd40 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
许心洁 3cd2fb02f4 宁德BUG-JIS发运汇总JOB:BUG#8246 5 years ago
汪云昊 241ea78cda 检测环境枚举数据调整 5 years ago
汪云昊 71d30c3232 表单-自定义按钮-添加是否需要选中数据校验及实现Http方式扩展 
表单-拦截器-实现Http方式扩展
表单-元素-工厂数据隔离功能
表单-动态表单-查询数据默认条件优先级优化
sonar代码优化
 5 years ago
王杰 2b01efb15b mes生产计划批量编制 5 years ago
wynne1005 d5f69eeefd task 1565 发运修改 5 years ago
曾贞一 d29a26c73f Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
曾贞一 8e529f46d7 【1722 BH-Bacth条码查询】 5 years ago
宋军超 92c13e5bcd 添加人员技能功能 5 years ago
袁津哲 64daf36410 动态搜索修改人修改时间开窗处理,BUG:8097 5 years ago
袁津哲 633aef2d6e 动态搜索修改人修改时间开窗处理 5 years ago
wei.peng 37922cab29 POM 文件修改 
Merge remote-tracking branch 'remotes/origin/test'

# Conflicts:
#	modules/i3plus-icloud-report/pom.xml
 5 years ago
wei.peng fe94ad9bf3 Merge remote-tracking branch 'remotes/origin/test' 5 years ago
wei.peng 8aab106aa9 合并代码 pom 冲突 
Merge remote-tracking branch 'remotes/origin/dev' into test

# Conflicts:
#	modules/i3plus-ics-gateway/src/main/resources/application-docker.properties
 5 years ago
wei.peng 279ec2d1fe 授权加密问题修复 5 years ago
宋军超 b96eb1b669 添加人员技能功能 5 years ago
陈思洁 2c50fceec9 【1693-设备状态监控看板】 5 years ago
陈思洁 87664b96cb 【合并冲突】 5 years ago
陈思洁 abd974f54f 【1693-设备状态监控看板】 5 years ago
钮海涛 724ba402bf 前端联调 5 years ago
曾贞一 bc82c85790 【1721 BH-BH检测结果管理】 5 years ago
袁津哲 5ba022c21a Merge remote-tracking branch 'origin/dev' into dev 5 years ago
袁津哲 b23915236b 开发根据实体动态生成数据库文档页面功能 5 years ago
钮海涛 60580e5ad9 Merge remote-tracking branch 'origin/dev' into dev 5 years ago
钮海涛 cb8688105c task:1727;1728;1729 5 years ago
王杰 cace95fbed ptl 5 years ago
钮海涛 3fbf532c84 修复pom版本问题 5 years ago
钮海涛 a1eb3c3bc2 修复pom版本问题 5 years ago
钮海涛 2e2ee2cc6c Merge branch 'test' into dev 5 years ago
钮海涛 2cc43af431 修复pom版本问题 5 years ago
钮海涛 c6d36af4c9 Merge branch 'master' into test 5 years ago
joke.wang ce1dd45842 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
joke.wang 755fccb45e [任务：1690 产能监控看板] 5 years ago
曾贞一 c3b6376934 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
曾贞一 f3e53ff1eb 【8150 20011-- 出库单明细界面，打印客户标签按钮，增加打印字段】 
【8151 20011-- 出库单明细界面，打印客户标签按钮，重打按钮，补打客户标签按钮，三个按钮牛均无法打出客户零件号。关联bug7501---0429】
 5 years ago
钮海涛 7b2a4fdea7 合并dev代码 5 years ago
钮海涛 475bb9370f Merge remote-tracking branch 'origin/dev' into dev 5 years ago
qianhs 2303186fc4 【657】【中航WMS看板－成品发运率看板】 
【658】【中航WMS看板－发运窗口时间看板】
【656】【 中航WMS看板－收货完成率看板】
【655】【 中航WMS看板－仓库预警看板】
【654】【中航WMS看板－３０天供应商延期到货跟踪动态看板】
 5 years ago
joke.wang ee1c2131ff [任务：1716 写入产品下线记录] 5 years ago
钮海涛 398207b875 Merge remote-tracking branch 'origin/dev' into dev 5 years ago
曾贞一 6190a4f66d Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
曾贞一 156f0feedc 【1603 委外扣减查询】 5 years ago
joke.wang aa9ee803b8 [任务：1683-看板管理 展示] 5 years ago
puxiao.liao 7c7691f583 bug8190【8190 中航-成品条码维护-批量修改客户代码-】 5 years ago
钮海涛 4d383dda1b 新增事务报工查询 5 years ago
joke.wang 795312637c [任务：1683-看板管理 计划产能] 5 years ago
puxiao.liao 0a973c5dd1 Merge remote-tracking branch 'origin/dev' into dev 5 years ago
puxiao.liao f6988f36c8 1655 生产领料单增加替代料 5 years ago
wei.peng 3aa1afb0ce 对象历史记录 Pojo 创建 5 years ago
wei.peng c8197f3290 1. 授权封装位置调整 
2. 日志控制台查询封装
3. 添加软适配 同步接口调用
4. pom.xml 引用错误修复
 5 years ago
wei.peng 9d3a4db040 日志查询Bug 修复 5 years ago
wei.peng fee90baf64 1. 关闭register , gateway , console 日志持久化技术 
2. Sonar Bug 修复
3. 自定义日志持久化
 5 years ago
joke.wang e6f3dd5c32 [任务：1683-看板管理] 5 years ago
袁津哲 7789883f9b 开发导入功能模块 5 years ago
曾贞一 509240126a 【1604 待入库数据查询】 5 years ago
钮海涛 a597d78100 Merge remote-tracking branch 'origin/test' into test 5 years ago
钮海涛 c57ca73a4a bug:8169;8176;8177 5 years ago
王杰 9da9a568f5 mes 5 years ago
wei.peng effae233bf 对象历史记录 Pojo 创建 5 years ago
wei.peng fe46d8da29 1. 授权封装位置调整 
2. 日志控制台查询封装
3. 添加软适配 同步接口调用
4. pom.xml 引用错误修复
 5 years ago
wei.peng 69346da06d 日志查询Bug 修复 5 years ago
wei.peng dac1358009 1. 关闭register , gateway , console 日志持久化技术 
2. Sonar Bug 修复
3. 自定义日志持久化
 5 years ago
曾贞一 312cf59f49 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
曾贞一 88ce1e59cf 【1604 待入库数据查询】 5 years ago
joke.wang 4e02acb9e3 [任务：1683-看板管理] 5 years ago
袁津哲 7696925c9f Merge remote-tracking branch 'origin/dev' into dev 5 years ago
袁津哲 8a6c9aadef 开发导入功能模块 5 years ago
wynne1005 fb60d75eea 还原test pom 5 years ago
wynne1005 d6fe718e4c Merge branch 'dev' into test 5 years ago
wynne1005 109c4429ce 还原dev pom 5 years ago
qianhs 0a2d9a3d6d 【1432 工位扫描-ESOP展示组件开发，队列组件调整】【工位扫描-ESOP展示组件开发，队列组件调整】 5 years ago
joke.wang fa8e4c1b55 [任务：1683 看板管理] 5 years ago
wynne1005 64f3dcf276 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
wynne1005 cfb5aab8ea 新增工步集合 repository 5 years ago
qianhs 62883c5cc0 【1432 工位扫描-ESOP展示组件开发，队列组件调整】【工位扫描-ESOP展示组件开发，队列组件调整】 5 years ago
puxiao.liao e417e761c7 bug8124【8124 物料拆分-输入数量-系统异常】 5 years ago
joke.wang 43bc24340c [料架条码打印优化] 5 years ago
袁津哲 9518628c12 Merge remote-tracking branch 'origin/dev' into dev 5 years ago
袁津哲 533d8e55e8 开发导入模块功能 5 years ago
钮海涛 1a5f3e7325 Merge remote-tracking branch 'origin/dev' into dev 5 years ago
钮海涛 eb85cc232f task:1623 5 years ago
王杰 2bb2b2c828 Merge branch 'dev' of jhforever.wang/wangjie-i3plus-pojo into dev 5 years ago
王杰 d4bde19861 mes 5 years ago
wynne1005 430adb8d97 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
wynne1005 1c4050b71f 工步返回内容修改 5 years ago
王杰 74a4a1381c mes 5 years ago
joke.wang 4c637b4e83 [写入JIT发运接口表] 5 years ago
joke.wang 48ee207a8a [删除多余项] 5 years ago
joke.wang d22bd22012 [任务：客户JIT自动下达] 5 years ago
汪云昊 ccf2f42840 Merge remote-tracking branch 'origin/dev' into dev 5 years ago
汪云昊 edf0b66115 Sonar代码缺陷修复 
查询条件优化
拦截器，自定义按钮对外接口实现
表单-功能目录优化
软适配日志优化
 5 years ago
袁津哲 df480bf11d Merge remote-tracking branch 'origin/dev' into dev 5 years ago
袁津哲 36b4e67020 导入模板功能建模 5 years ago
宋军超 8fe5574c67 part实体中@Column(name = "产品生产类型")改为@Column(name = "PPT_CODE") 5 years ago
汪云昊 baaf16ad56 国际化工具类异常处理优化 5 years ago
陈思洁 5d8fec4938 合并冲突 5 years ago
陈思洁 7505087392 【mes 产品配方导入功能和基础数据维护】 5 years ago
王杰 0a14b533d7 任务1659 返工返修 5 years ago
袁津哲 ec1d8a2ff3 开发导入模板功能 5 years ago
钮海涛 b25ff3cbba bug:8137 5 years ago
曾贞一 9102a3691b Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
曾贞一 10fc6ded8d 【1558 生产工单管理-泰国需求】 5 years ago
joke.wang 280385eb20 [bug: 8092 SOP信息需求变更] 5 years ago
joke.wang 54ff0deb87 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
钮海涛 efe083a9da 修复版本号 5 years ago
宋军超 e464b4d699 删除设备备件管理相关实体 5 years ago
宋军超 38fa894817 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
宋军超 89a9946432 添加设备管理相关功能 5 years ago
钮海涛 100d8b0019 Merge branch 'test' into dev 5 years ago
钮海涛 c75a25b854 Merge remote-tracking branch 'origin/dev' into dev 5 years ago
钮海涛 bd810c1c8c task:1591 5 years ago
joke.wang b17cf60ac6 [任务：1571 生成报功数据 需求变更] 5 years ago
王杰 cba7ee3d0d [任务：1522，ptl流程设计] 5 years ago
qianhs 88279f9b8b sonar bug修改 5 years ago
曾贞一 e5c275499c 【冲突解决】 5 years ago
曾贞一 255aefbcef 【1585 销售订单管理-销售订单维护】 5 years ago
钮海涛 e64134a821 修复合并问题 5 years ago
钮海涛 e9ec4cecfe Merge remote-tracking branch 'origin/dev' into dev 5 years ago
钮海涛 00fce0bded 新增客户物料发往地 5 years ago
wynne1005 0e934f9af6 task `1565` 发运enum 5 years ago
wynne1005 81f05c233a Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
wynne1005 93622f5dc7 中航 开线管控 提交 5 years ago
汪云昊 f09159dffa Merge remote-tracking branch 'origin/dev' into dev 5 years ago
汪云昊 34c77d6944 ICS 注册中心监控接口，Actuator对外端口调整 5 years ago
puxiao.liao a2f7c3426e bug7994【7994 麦格纳收货需求差异】 5 years ago
钮海涛 01d3eeea51 新增客户物料发往地 5 years ago
钮海涛 16f6861ecd 新增窗口时间 5 years ago
宋军超 aac4e24113 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
宋军超 b02d7372f6 添加散件bom批量导入功能 5 years ago
joke.wang 9e0fbef169 [按钮组件代码优化] 5 years ago
钮海涛 dd9ae231c8 与界面联调物料扩展属性 5 years ago
wynne1005 48f94c0369 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
wynne1005 cc739eac24 task `1565` 发运pojo 5 years ago
钮海涛 331fb73d28 新增供应商维护基础数据 5 years ago
joke.wang 99e055da3c [现场问题：111 检测项报表] 5 years ago
袁津哲 30610476b9 Merge remote-tracking branch 'origin/dev' into dev 5 years ago
袁津哲 1caea6bf36 修改实体数字字段 5 years ago
qianhs 214fbb8da2 【1613 装车单新增中航打印格式】 5 years ago
袁津哲 d289a58439 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
袁津哲 db7d86acc1 修改实体数字字段默认值0，不允许为空 5 years ago
wynne1005 035e77c0ab Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
wynne1005 5d6588b5af task `1565` 增加发运字段 5 years ago
陈思洁 03d2ee9246 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
陈思洁 244270684d 【泰国项目】 5 years ago
袁津哲 a5a8130388 修改不兼容sqlserver数据库查询语句 5 years ago
wynne1005 86713a01f2 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
汪云昊 1051b22575 ICS 注册中心监控对象 5 years ago
joke.wang 4469d92344 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
joke.wang f1baf4fdbe [麦格纳问题：111 检测项报表] 5 years ago
宋军超 8109275630 添加散件BOM导入 5 years ago
宋军超 69b620336f 散件BOM导入 5 years ago
wynne1005 15c9e7111b Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
qianhs ca85c59cdb Merge remote-tracking branch 'origin/dev' into dev 
# Conflicts:
#	modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java
 5 years ago
qianhs 20f5bfc9eb wms数据同步迁移至mes 5 years ago
陈思洁 72563a4eb5 【1597 条码打印功能新增-管理端 / 条码打印功能新增-管理端】 5 years ago
王杰 c6aefc89e7 test合并dev解决ct 5 years ago
王杰 94fed3b9b2 Merge branch 'test' into dev 5 years ago
陈思洁 59cbfbf293 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
陈思洁 08ec98305b 【1581 工位扫描-记录换模时间 -校验逻辑调整】 5 years ago
joke.wang 3e33a7ac3a [客户jit增加JIT排序号字段] 5 years ago
王杰 b1018dbd39 [平台；] 5 years ago
袁津哲 1a74363541 优化实体字段 5 years ago
puxiao.liao 4b3923a64d bug8056【8056 car_no,driver_no这两个字段没有写在事务表中，导致wms_move_to_erp中没有】 5 years ago
wynne1005 b5ecb91399 中航四月十号 内容提交 5 years ago
joke.wang 4e8c4ae46f Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
joke.wang caf8feb374 [采集工步存入生产数据格式修改] 5 years ago
joke.wang 11adb5ff09 [麦格纳问题：111 检测项数据报表] 5 years ago
钮海涛 05c1575e8f Merge remote-tracking branch 'origin/dev' into dev 5 years ago
钮海涛 01ae9caa8c task:1496 5 years ago
alwaysfrin f4e9a80d79 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
alwaysfrin 14660641ba hibernate优化 5 years ago