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

7843 Commits (3b8a5482ad4d11a2a7ebc54419cb044d783272a8)

Author SHA1 Message Date
Aisiyu fd08cfd883 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
陈思洁 28dd76f30b Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
陈思洁 11748bb19e 【12066 19048-喷涂展示组件颜色查询方式变更-20201024】 5 years ago
Aisiyu 219dd0ddd7 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
Aisiyu 47f464b01d [1211 天津麦格纳货运看板 ] 5 years ago
曾贞一 143e2f1947 【12057 #20011-----影响流程是二维码收货和po收货和po收货，收货流程走完但是还没有提交，需要能够删除历史记录，重新操作后提交，然后不允许收货待提交的条码入库。期望解决日期2020/10/31】 5 years ago
puxiao.liao 23537e76e5 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
puxiao.liao e68735be83 MOVE_SN 增加 left_code 属性 5 years ago
王杰 ade2d60849 总装 质量判定 5 years ago
王杰 d7092a7f52 总装标记不良 5 years ago
宋军超 5d41023df6 修改天津涂装看板 5 years ago
songss 532e99eb8b Merge remote-tracking branch 'origin/test' into test 5 years ago
songss 76a0703bac 调整中航看板接口地址 5 years ago
joke.wang 0d12d01ebf 生产报功表增加分组标识 5 years ago
wynne1005 ff45755577 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
wynne1005 2ff6eded6e 修改Oee 5 years ago
许心洁 08125e3b0f Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
汪云昊 c9b4b37c23 Merge remote-tracking branch 'origin/dev' into test 5 years ago
汪云昊 687de9d828 feat(form):支持存储过程参数 5 years ago
汪云昊 e87740e723 Merge remote-tracking branch 'origin/dev' into test 5 years ago
汪云昊 f47b699146 feat(form):支持存储过程参数 5 years ago
曾贞一 4ee1875097 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
曾贞一 8d91675109 【12155 20145+系统参数页面，参数编码也支持模糊查询】 5 years ago
puxiao.liao e6e5982d73 Fix bug#12020 
19058-KT根据销售订单创建销售出库单（客户发运）
 5 years ago
joke.wang 63b7162932 mgn-bj 半成品看板 5 years ago
汪云昊 dceb9b17a5 revert(pojo):还原pom版本 5 years ago
汪云昊 91f68d50d4 Merge remote-tracking branch 'origin/dev' into test 5 years ago
汪云昊 91b1a67f30 Merge remote-tracking branch 'origin/dev' into dev 5 years ago
汪云昊 eb03280b2d doc(sql):getStringLikePack方法标记不推荐 5 years ago
汪云昊 f1ab018d85 feat(softswitch):重试功能 5 years ago
曾贞一 b979a9471c 【11883 20021--北美领料需求变更--1023】 5 years ago
Aisiyu 3b5cd84e6e Merge remote-tracking branch 'origin/test' into test 5 years ago
曾贞一 e55e8b6f74 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
曾贞一 5e8b023fd5 【11883 20021--北美领料需求变更--1023】 5 years ago
puxiao.liao 762f9d4a9b Fix bug#12020 
19058-KT根据销售订单创建销售出库单（客户发运）
 5 years ago
Aisiyu 8b94991408 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
Aisiyu 2db034a7f8 [1211 天津麦格纳WMS-ASN到货看板 ] 5 years ago
宋军超 692cd283f7 添加天津涂装看板-设备实时监控 5 years ago
puxiao.liao 6269ee358c Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
许心洁 2bc15b56ea Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
曾贞一 d8e5aa44bc pom.xml 5 years ago
许心洁 92fec185b8 任务#28142909 5 years ago
陈思洁 8dfcb7f429 【合并冲突】 5 years ago
陈思洁 3dc951c34f 【11964 19048-喷涂抛光报表变更-20201021】 5 years ago
曾贞一 9a350912ea Merge remote-tracking branch 'remotes/origin/dev' into test 
# Conflicts:
#	modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java
 5 years ago
曾贞一 5487c165ff 【11883 20021--北美领料需求变更--1023】 5 years ago
puxiao.liao 87611856dd 天津麦格纳多级BOM 5 years ago
宋军超 37c95dc6b3 添加天津涂装看板 5 years ago
wynne1005 20ee1215d2 解决 包名细化 导致冲突 5 years ago
wynne1005 9d81ec30d1 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
wynne1005 6d4e8608c4 注塑 组装报表开发完毕 5 years ago
rock.yu 104fa0efa5 完成ERP库存差异报表 5 years ago
joke.wang f57f4e25be mgn-bj 总屏看板 5 years ago
汪云昊 a9520cecf7 Merge remote-tracking branch 'origin/dev' into dev 5 years ago
汪云昊 31cdda5b33 feat(softswitch):适配记录,FTP文件支持SID 5 years ago
曾贞一 c9378a7d8c 【11959 19125+PDA物料拆分数量超过100部分，条码流水不增加。+1020】 5 years ago
许心洁 38ddd82ef9 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
许心洁 d7bad41b29 天津麦格纳BUG#12111，12110，12108，12105 5 years ago
Dominic_Xiao df35a22aac 解决BUG#12121 生产工单- 新建完毕后页面查询不到:修改查询总数的SQL语句 5 years ago
Dominic_Xiao 5e1d0a75c9 解决BUG:19048-班次时间显示异常->修改查询总数的SQL语句 5 years ago
Dominic_Xiao 4684466e7e 解决BUG:19048-班次时间显示异常:修改查询的SQL语句 5 years ago
Dominic_Xiao f57be38c2b 解决BUG:生产工单-新建完毕后页面查询不到->修改查询的SQL语句 5 years ago
puxiao.liao 760307910a 天津MGN系列BUG修复 5 years ago
宋军超 1b6264e80d 添加天津涂装看板 5 years ago
rock.yu 0fb04b8370 Merge remote-tracking branch 'origin/test' into test 5 years ago
rock.yu 3ad59884a8 增加计算工单的提前时间属性 5 years ago
songss 2ed5108699 Merge remote-tracking branch 'origin/test' into test 5 years ago
songss 36928196c1 中航看板-调整返回接口参数 5 years ago
rock.yu 330cede03e Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
rock.yu b6a309bacf 增加 ERP 对账数据表 5 years ago
puxiao.liao 023811d0fa Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
puxiao.liao 6f239ee756 Fix bug#12019 
12019-KT根据销售订单创建销售出库单（客户发运）
 5 years ago
joke.wang 5227540ecc 队列表添加索引 5 years ago
许心洁 586365dc69 任务#2893,#2894,#2901 5 years ago
陈思洁 4e013a7ef0 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
陈思洁 6fcf32aa80 【2890 10 2.3.8安灯作业优化】 5 years ago
songss e0d315a1f8 Merge remote-tracking branch 'origin/test' into test 5 years ago
songss d9040143f9 新增中航产线看板-每小时产量接口 5 years ago
puxiao.liao 24acb86dff 实时库存查询&导出优化 5 years ago
钮海涛 2b4ff2300d Merge remote-tracking branch 'origin/test' into test 5 years ago
钮海涛 582ef23ca3 修复SWEB问题 5 years ago
wynne1005 1730dc27c3 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
wynne1005 4d4ad7ff84 天津注塑看板 5 years ago
puxiao.liao 62d5d62cef 北京MGN系列BUG修复 5 years ago
songss 95936d40fe Merge remote-tracking branch 'origin/test' into test 5 years ago
songss 783022646c 新增中航产线状态图接口 5 years ago
rock.yu a953523245 增加 ERP 快照相关表 5 years ago
钮海涛 a8cdba48c3 合并Master代码 5 years ago
钮海涛 7afd60073a Merge remote-tracking branch 'remotes/origin/test' 5 years ago
钮海涛 1037ad6e68 修复问题 5 years ago
puxiao.liao 3de97d5b98 北京MGN系列BUG修复 5 years ago
王杰 f6ad2824b2 11984 19048-组装生产计划报表增加字段-20201020 5 years ago
王杰 7fcbf3f4e2 :wq 
erge remote-tracking branch 'i3plus-pojo/test' into test
 5 years ago
puxiao.liao 6907ab6dc0 北京麦格纳看板需求 5 years ago
王杰 97be3f186a 工单生产时间变更定时任务实体 5 years ago
钮海涛 0e75cde494 Merge remote-tracking branch 'origin/test' into test 5 years ago
钮海涛 63a06fcc27 修改供应商端登录及供应商端代码重构 5 years ago
陈思洁 a6acf3d616 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
陈思洁 82a769cae1 【12040 19073-安灯BI界面中事件物料时长，解决时长为-3290，解决在横坐标的下方有问题-20201026】 
2887 10 2.3.7安灯通知优化
 5 years ago
许心洁 8c4ae6ff34 任务#2893,2894 5 years ago
puxiao.liao 0216cf59c4 Merge remote-tracking branch 'origin/test' into test 5 years ago
puxiao.liao 051417c10e 北京麦格纳看板 5 years ago
钮海涛 ef7a20a719 Merge remote-tracking branch 'origin/test' into test 5 years ago
钮海涛 505de36ca5 修改SWeb供应商登录接口 5 years ago
songss ef316af0c1 Merge remote-tracking branch 'origin/test' into test 
# Conflicts:
#	modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java
 5 years ago
wynne1005 78a3943a3d Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
wynne1005 4c86b836ca OP20b逻辑变更 esop展示变更 5 years ago
汪云昊 15dc4b00c7 Merge remote-tracking branch 'origin/dev' into test 5 years ago
汪云昊 ed22bd6f64 feat(form):存储过程调用适配mysql,mssql 5 years ago
puxiao.liao 56deedeaf3 北京麦格纳看板 5 years ago
puxiao.liao c965a34236 北京麦格纳看板 5 years ago
puxiao.liao ba81af744b 北京麦格纳看板 5 years ago
宋军超 6826f04b97 天津看板添加设备状态逻辑 5 years ago
joke.wang 9002bdc936 预装队列显示列优化 5 years ago
王杰 bb3039d1f2 包装关系查询宝贝 5 years ago
songss 17d47fdc55 新增看板图片增删改查接口 
新增看板切换配置增删改查接口
新增中航-产线概况接口
 5 years ago
贾文涛 9a4964222c Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
贾文涛 2301e03c85 增加呼叫不需要弹窗的枚举。 5 years ago
陈思洁 92a9f5faba Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
陈思洁 b70a58ba7d 【2867 10 2.3.9 返工返修批量作业】 5 years ago
songss 3e629e63c5 控制计划-过程检验逻辑调整 5 years ago
wynne1005 9629823a79 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
wynne1005 b00bcf66b2 图片展示类型 5 years ago
贾文涛 00e27023c1 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
贾文涛 525cda2768 增加数量处理方法 5 years ago
puxiao.liao ceb882cef4 天津MGN修复BUG 5 years ago
puxiao.liao 4ca43f81cc 北京麦格纳JIS发运看板 5 years ago
钮海涛 8346aa3fae Merge remote-tracking branch 'origin/test' into test 5 years ago
钮海涛 66c55386ee 修复sweb的bug 5 years ago
宋军超 627e8ac215 添加麦格纳看板相关基础数据 5 years ago
陈思洁 061f48dc79 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
陈思洁 e268ed86a9 【11934 19081-工位BOM中需要增加产线和工位的查询条件-20201020】 5 years ago
汪云昊 72e25305bf Merge remote-tracking branch 'origin/dev' into test 5 years ago
钮海涛 34a3c9553d Merge remote-tracking branch 'origin/test' into test 5 years ago
钮海涛 bf41628114 修改物料的标准质检时间类型为浮点数，精度为2 5 years ago
wynne1005 d13c46e740 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
wynne1005 5d73afd17f jisa小时接收报表完成 5 years ago
汪云昊 a4bc17b0a6 feat(form):sap_hana数据库支持 5 years ago
puxiao.liao 1aebc6761c Fix bug#11878 
19081-增加库存交易推算报表-1016
 5 years ago
wynne1005 05152538b2 合并冲突 5 years ago
wynne1005 fc36e55a38 新增mes 报表查询周期枚举 5 years ago
宋军超 9c1a9be165 优化天津麦格纳报表 5 years ago
joke.wang df063af038 物料类型1增加枚举 5 years ago
wynne1005 e24bb4c39b 同步新增忽略字段 5 years ago
wynne1005 25ebe6838c Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
wynne1005 63c1cc479b 字段长度 model添加planCfgCode 5 years ago
joke.wang 6930fdfbe7 mgn-bj 产线枚举优化 5 years ago
钮海涛 49bf12e392 Merge remote-tracking branch 'origin/test' into test 5 years ago
钮海涛 3e89aa9425 乐观锁增加默认值设置 5 years ago
wynne1005 7bca216063 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
wynne1005 8b53722b0f 设备plan更新 5 years ago
钮海涛 61d123cfc8 Merge remote-tracking branch 'origin/test' into test 5 years ago
钮海涛 93626dad0f 新增质检完成状态报表 5 years ago
songss 578e2c5155 Merge remote-tracking branch 'origin/test' into test 
# Conflicts:
#	modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java
 5 years ago
songss bfe4b4f069 社保故障自动获取任务完善，根据不同等级调用不同的安灯接口 5 years ago
joke.wang cd32eee8ea 排程配置表增加冗余字段 5 years ago
宋军超 fcc66835b8 开发天津看板功能 5 years ago
汪云昊 ce054916b4 Merge remote-tracking branch 'origin/dev' into test 5 years ago
汪云昊 401fccd4dc fix(impp):DdlPreparedPack类处理大于小于错误 5 years ago
宋军超 d372256a68 添加喷涂不良类型枚举 5 years ago
wynne1005 ddaedf49ee Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
wynne1005 52bdc6c664 设备作业周期 新增planCfgCode 5 years ago
宋军超 bd9547b825 优化天津麦格纳报表 5 years ago
陈思洁 11b461f1d6 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
陈思洁 1706b7a684 【2856 10 2.3.8 20027-PCN端工位监控如果报错数据没有采集怎么报警提示】 5 years ago
rock.yu 269f072fb8 Merge remote-tracking branch 'origin/test' into test 5 years ago
puxiao.liao 8ed135734d 天津麦格纳BUG 5 years ago
joke.wang cc2961d4b8 库存排产表增加字段 5 years ago
钮海涛 7bdecfe687 Merge remote-tracking branch 'origin/test' into test 5 years ago
钮海涛 07282396d2 ASN到货看板问题修复 5 years ago
宋军超 3d8d84ee77 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 
 Conflicts:
	modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java
 5 years ago
宋军超 dc38d2db6f 优化天津麦格纳报表 5 years ago
wynne1005 1e6ca2e0bb 添加设备作业任务 周期类型 5 years ago
rock.yu 9a2b6fe43a Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
rock.yu c3bdf4a162 解决10330库存扣减不准的问题 5 years ago
贾文涛 1ffebd418f Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
贾文涛 834e3d211d 更新查询大于0的业务时，基础类错误问题。 5 years ago
puxiao.liao ee700ab5b0 天津麦格纳多级BOM 5 years ago
wynne1005 a86a58fa6d Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
puxiao.liao 75520519de 修复天津麦格纳BUG 5 years ago
joke.wang 233853e1e6 库存排程 5 years ago
puxiao.liao 502427845e Merge remote-tracking branch 'origin/test' into test 5 years ago
puxiao.liao cfd0cb03ff 天津麦格纳BUG修复 5 years ago
王杰 f58d97fb83 11777 19048-绑定关键件 绑定多个关键件数据出现回滚-20201012 5 years ago
wynne1005 248c8229ff Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
wynne1005 a49ddc004c 添加lob 5 years ago
rock.yu 7b8038d516 Merge remote-tracking branch 'origin/test' into test 5 years ago
rock.yu 8932108cd3 暂时去掉乐观锁 5 years ago
puxiao.liao 2689495372 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
rock.yu 7027f515e4 Merge remote-tracking branch 'origin/test' into test 5 years ago
rock.yu df9474807c 库存条码表、库存表 增加版本号，用乐观锁控制并发问题 5 years ago
puxiao.liao 6d64c61848 修改FIFO推荐查询逻辑 5 years ago
贾文涛 0c34bce623 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
贾文涛 2cdb6af2f5 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
贾文涛 7e24f4ed4a 修复队列乱跳问题。 5 years ago
贾文涛 d2f9c3502a 修复队列乱跳问题。 5 years ago
wynne1005 18275c8fb2 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
wynne1005 226c31878a 添加缺陷代码 5 years ago
汪云昊 5d7397aa4e Merge remote-tracking branch 'origin/dev' into test 5 years ago
汪云昊 ee3f9415a7 fix(core):组织，部门代码无唯一校验 5 years ago
陈思洁 30f8e332fa Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
陈思洁 8f060d4aa4 【2856 10 2.3.8 20027-PCN端工位监控如果报错数据没有采集怎么报警提示】 5 years ago
钮海涛 bcf0d45000 Merge remote-tracking branch 'origin/test' into test 5 years ago
钮海涛 445821b803 sweb问题修复 5 years ago
puxiao.liao 08687a7e14 修复天津麦格纳BUG 5 years ago
joke.wang c442845f94 跳序变更 5 years ago
汪云昊 911f96b60d style(softswitch):调整代码样式 5 years ago
wynne1005 95646d6317 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
汪云昊 2b6ff6498c Merge remote-tracking branch 'origin/dev' into test 5 years ago
汪云昊 b186af893c feat(softswitch):ftp适配信息优化 5 years ago
汪云昊 05f493b80e feat(softswitch):添加重试功能 5 years ago
wynne1005 7fb7db3cb5 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
wynne1005 629e6af9a9 设备指导操作文件 5 years ago
songss 9c1965ea6c 11653 19073 安灯导入模板调整 5 years ago
puxiao.liao 7508796daa Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
puxiao.liao 44b5635e78 天津麦格纳PO生产任务增加关联行号 5 years ago
钮海涛 01d67fdd1f Merge remote-tracking branch 'origin/test' into test 5 years ago
钮海涛 7a29b85848 Fix Bug #11733 新增采购订货进度可以编辑原因 5 years ago
宋军超 4b65842d6f 修改天津麦格纳项目问题 5 years ago
wynne1005 6750da1d37 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
wynne1005 ebf0392057 去除多余optionType枚举 5 years ago
puxiao.liao 6a42b517fc Fix Task#2839 
武汉PRD-WMS&TMS装车明细接口
 5 years ago
wynne1005 470775b527 备件生成冲突解决 5 years ago
wynne1005 f52f07fe77 备件导入 5 years ago
puxiao.liao c7e5524a0a 修复无条码生产扣减增加扣减条码状态只能为入库，合格 5 years ago
汪云昊 e97a1193e1 Merge remote-tracking branch 'origin/dev' into test 5 years ago
汪云昊 27088d2db5 Merge remote-tracking branch 'origin/dev' into dev 5 years ago
汪云昊 e97369585d fix(core):在用户未登录时国际化无效 5 years ago
王杰 1dbb826235 19048-喷涂工单下发后未给打印状态赋值-20201012 5 years ago
陈思洁 e07829e4ea Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
陈思洁 33c59cf39e 【11654 MES管理端基础数据模块缺少导入功能 0928】 5 years ago
王杰 6f3f06a8f6 19048-条码补打-补打包装需要可以用过程条码反查包装条码-20201012 5 years ago
wynne1005 d36a7527a6 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
wynne1005 c117515b69 设备自动报警 5 years ago
陈思洁 82ae09d2a8 Merge remote-tracking branch 'origin/test' into test 5 years ago
陈思洁 a3100a71e5 【9666 19073-安灯报表：工位统计报表-删除班次、设备。添加故障时长-20200721】 5 years ago
钮海涛 3d5729e28b 自动打印队列增加供应商 5 years ago
puxiao.liao 90d94f35c8 Fix bug#11683 
质检单-已收货数量-显示优化
 5 years ago
钮海涛 e628fea5a6 Merge remote-tracking branch 'origin/test' into test 5 years ago
钮海涛 5a0178f5df 合并dev代码 5 years ago
songss a5b81cb676 解决代码冲突 5 years ago
songss 966ed3536b Merge remote-tracking branch 'origin/test' into test 
# Conflicts:
#	modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java
 5 years ago
songss 5816f275bf 新增控制计划相关接口 5 years ago
钮海涛 af4bb83f85 sweb合并test代码 5 years ago
钮海涛 401e38203a Merge remote-tracking branch 'remotes/origin/test' into dev 5 years ago
钮海涛 5515f25b79 Merge remote-tracking branch 'origin/dev' into dev 5 years ago
钮海涛 c202fa073b 修改sweb问题 5 years ago
钮海涛 1695d75ff2 合并dev代码 5 years ago
钮海涛 94568777fb 合并test代码 5 years ago
钮海涛 9c7d455998 Merge remote-tracking branch 'remotes/origin/test' into dev 5 years ago
钮海涛 55dfff206f Merge remote-tracking branch 'origin/dev' into dev 5 years ago
钮海涛 61ad20717b 合并sweb代码 5 years ago
曾贞一 944b853862 【代码优化】 5 years ago
曾贞一 84d5f84457 【11629 20021--北美看板需求变更--0930】 5 years ago
陈思洁 3d8d27d780 【11374 20027-管理端质量检测标准维护基础数据报错（附件是数据模板）-20200915】 5 years ago
puxiao.liao 79baaa4546 Fix bug#11661 
移库单界面增加来源存储区和目标库位的检索条件
 5 years ago
puxiao.liao 5033c8dde0 Fix bug#11661 
移库单界面增加来源存储区和目标库位的检索条件
 5 years ago
wynne1005 814d22fe09 设备报警 mes端完成 5 years ago
songss e585dce910 Merge remote-tracking branch 'origin/test' into test 5 years ago
songss 037e898cd2 新增控制计划相关接口 5 years ago
汪云昊 604b8821eb Merge remote-tracking branch 'origin/dev' into test 5 years ago
汪云昊 815daba16d feat(softswitch):ftp适配记录按文件名查询 5 years ago
汪云昊 21f77a0e7b fix(softswitch):ftp适配器并发读取文件重复 5 years ago
宋军超 aa01153c4b 天津麦格纳更新看板子菜单pojo 5 years ago
宋军超 461780e0d0 天津麦格纳修改看板类型枚举 5 years ago
宋军超 ebb965f46d 天津麦格纳添加看板维护接口 5 years ago
Liquor 83bfaaceab 对SPC-KEY-TATA表的相关接口进行了相关优化。 5 years ago
汪云昊 0d20685a55 fix(softswitch):ftp适配器并发读取文件重复 5 years ago
贾文涛 72faca1092 添加索引 5 years ago
宋军超 2bd7650d48 天津麦格纳pojo中所有Double类型字段添加注解 5 years ago
Liquor 3d8842602d 增加了SPC-KEY-TATA表的相关接口。 5 years ago
puxiao.liao 65ea61fd70 增加昆泰其它出库业务类型 5 years ago
wynne1005 8129ca5bee 设备报警 mes端完成 5 years ago
汪云昊 171f39cf01 revert:还原pojo pom.xml报表 5 years ago
汪云昊 56bd07dbf3 Merge remote-tracking branch 'origin/dev' into test 5 years ago
汪云昊 e11e833309 refactor(opcua):调整pojo位置 5 years ago
puxiao.liao 76725167f7 Merge remote-tracking branch 'origin/test' into test 5 years ago
puxiao.liao f591139bed 修复TJ MGN BUG 5 years ago
joke.wang f2177fdc1e bypass数据采集bug修复 5 years ago
puxiao.liao 85feb7927a 修复TJ MGN BUG 5 years ago
rock.yu 68a079fa69 Merge remote-tracking branch 'origin/test' into test 5 years ago
rock.yu 14d2af59d6 增加多级BOM生效功能 5 years ago
王杰 d548660354 连续扫描 5 years ago
许心洁 a939c689f3 任务#2814 5 years ago
joke.wang d9d7e47ca7 生产队列明细唯一索引修改 5 years ago
songss 36df78c9b4 Merge remote-tracking branch 'origin/test' into test 5 years ago
songss 8c633f0bc3 优化字段命名规范 5 years ago
puxiao.liao 0f46a23c7a Fix bug#11611 
19081-计划外入库-扫描条码后撤销
 5 years ago
rock.yu 605b7e846a 增加虚零件属性 5 years ago
陈思洁 d5d4942eb6 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
陈思洁 604c1443ca 【三色灯控制信息基础页面增删改查】 5 years ago
wynne1005 ea6fc313c3 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
曾贞一 1975906ee5 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
曾贞一 4bd47e64c3 【接口映射-添加字段接口名称】 5 years ago
songss d7edc3a309 增加产品数据校验记录报表接口 5 years ago
陈思洁 0f1f437a9e 【2794 09 ext 19081-返工返修标签打印变更-20200813】 5 years ago
钮海涛 543058b3a5 合并sweb代码 5 years ago
陈思洁 373e5026c5 【2794 09 ext 19081-返工返修标签打印变更-20200813】 5 years ago
陈思洁 ad2f084287 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
陈思洁 b8e34a34b5 【11561 19081-安灯pushPLC控制三色灯-目前未控制具体工位-20200924】 5 years ago
songss b376450d4b 修改获取复核异常的数据接口返回数据 5 years ago
wynne1005 12f1c4a809 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
wynne1005 708985be2a 中航 设备自动报警 #1 5 years ago
曾贞一 2f717fdd98 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
曾贞一 2d2ff0ddb1 【2801 武汉PRD-AMP-WMS2SAP回传TWD订单收货结果接口】 5 years ago
joke.wang 9fb8962e4e 客退件bug修复 5 years ago
宋军超 979e18c4a7 天津麦格纳修改涂装质检看板 5 years ago
puxiao.liao 4bfb903e54 修复麦格那发运提交事务重复&盘点提交sql异常 5 years ago
宋军超 ba6470baad 天津麦格纳修改组托获取托包规数量 5 years ago
rock.yu d227fcedd4 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
rock.yu 11750e9bf1 修改库存快照的pojo，确保快照功能可以正常执行 5 years ago
汪云昊 ffdfd866e0 Merge remote-tracking branch 'origin/dev' into test 5 years ago
汪云昊 b2bc93abfe Merge remote-tracking branch 'origin/dev' into dev 5 years ago
汪云昊 816557085f fix(base):修改当前页取值方法 5 years ago
wynne1005 2ae471febd Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
wynne1005 3c1c6c8c55 新增通用对象 password 5 years ago
陈思洁 e9ce24d6f9 【2794 09 ext 19081-返工返修标签打印变更-20200813】 5 years ago
joke.wang 612c919e5f bypass优化 5 years ago
puxiao.liao fc351f5599 修复TJ MGN BUG 5 years ago
wynne1005 7c9c0890fa Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
songss 28d7b79f82 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
wynne1005 114654dd99 冲突解决 5 years ago
wynne1005 696695ef0e 海纳川变更 10923 10894 5 years ago
songss d050274450 新增查询生产表数据接口 5 years ago
陈思洁 5fcdc2d4ea Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
陈思洁 053b609d88 【11559 19081-MESOP30料箱二次校验没有触发20200922】 5 years ago
汪云昊 25c195ba98 Merge remote-tracking branch 'remotes/origin/dev' into test 5 years ago
钮海涛 0ce944ec5f Merge remote-tracking branch 'remotes/origin/test' into dev 5 years ago
钮海涛 73809df827 合并swebtest代码 5 years ago
songss 2f953ac223 新增获取中航DB复核项接口。新增修改生产数据接口 5 years ago
joke.wang bc383d573b 生产工单增加特殊标示字段 5 years ago
钮海涛 ac4f217c9d Merge remote-tracking branch 'origin/dev' into dev 5 years ago
钮海涛 c4f161e958 Start Task #2795 5 years ago
puxiao.liao ffb45cf3dd 修复TJ MGN BUG 5 years ago
songss 90a96444e7 Merge remote-tracking branch 'origin/test' into test 5 years ago
songss c5de9c9841 Merge remote-tracking branch 'origin/test' into test 
# Conflicts:
#	modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java
 5 years ago
曾贞一 0f4a8c130c 【冲突解决】 5 years ago
曾贞一 41efdd4de8 【2798 武汉PRD-AMP-WMS2AMP同步拉动零件库存接口】 5 years ago
宋军超 61aabc957e Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
宋军超 735838e27f 天津麦格纳修改紧急问题 5 years ago
汪云昊 6ab0f17ac7 Merge remote-tracking branch 'origin/dev' into dev 5 years ago
汪云昊 d6f4fa7f92 feat(softswitch):添加报文处理状态及处理结果 5 years ago
汪云昊 673c6d0fe2 fix(softswitch):ftp-linux系统中文件读取失败 5 years ago
puxiao.liao 667d80c37d Merge remote-tracking branch 'origin/test' into test 5 years ago
puxiao.liao 0c044eed91 修复TJ MGN BUG 5 years ago
钮海涛 7b2c49f638 Merge remote-tracking branch 'origin/test' into test 5 years ago
钮海涛 0d0905c454 sweb合并dev代码 5 years ago
puxiao.liao 4ffe517015 修复TJ MGN BUG 5 years ago
宋军超 706d0fc43d 天津麦格纳问题修改 5 years ago
陈思洁 550713320f Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
陈思洁 d92c669f79 【11493 20042 标签条码模版需要显示客户名称 0921】 5 years ago
songss f222395015 襄阳中航新增复核生产数据表数据工步。新增复核生产数据表异常数据 5 years ago
puxiao.liao 07f6aabd72 修复TJ MGN BUG 5 years ago
wynne1005 456741c116 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
wynne1005 e7196c3f7f 海纳川 10923 10894 5 years ago
贾文涛 8fb9760f82 对象引用循环嵌套了，此字段不用就删掉。StationRequestBean->MesStateMachineStatus->StepResult->StationRequestBean 5 years ago
贾文涛 772f1b9d28 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
贾文涛 232abdafd3 10984 组装生产线箱条码批次扫描！-2020-09-01,需求开发 5 years ago
宋军超 d5e356938e 天津麦格纳修改组托打印功能 5 years ago
宋军超 cdd1f3eaba Merge remote-tracking branch 'origin/test' into test 5 years ago
rock.yu 16a2d75a17 结果生产报工job的sqlserver不兼容问题 5 years ago
宋军超 0c93ee5877 天津麦格纳修改看板和条码补打问题 5 years ago
rock.yu 409cd02a8d Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
rock.yu 352db6a7fa 工单拉动的日志保存到数据库 5 years ago
joke.wang 72502a863b Fix Bug #11490 5 years ago
puxiao.liao 10edb8ebae Finish Task #2184 Cost:8h 
2184 06 1.2.3.7.1物流路线检查
 5 years ago
王杰 895eb461ab 数据复核 5 years ago
宋军超 95f008a602 天津麦格纳添加组装打印托标签功能，修改物料颜色名称从物料表中取问题 5 years ago
钮海涛 fa467a2e0d sweb合并dev代码 5 years ago
钮海涛 5f144781c9 SWEB合并test代码 5 years ago
钮海涛 6749bda558 合并dev代码 5 years ago
钮海涛 572e749bdb Merge remote-tracking branch 'origin/dev' into dev 5 years ago
钮海涛 b253a020b9 合并test代码 5 years ago
钮海涛 5c104e036f 合并test代码 5 years ago
puxiao.liao cbc885748a Merge remote-tracking branch 'origin/test' into test 5 years ago
puxiao.liao 2c3571b014 修复TJ MGN BUG 5 years ago
钮海涛 ea875c1a3b SWEB功能开发 5 years ago
宋军超 998e87b61d 天津麦格纳修改过程条码补打 5 years ago
puxiao.liao f14cc48243 修复TJ MGN BUG 5 years ago
songss f2d6552f6b Merge remote-tracking branch 'origin/test' into test 
# Conflicts:
#	modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java
 5 years ago
songss 20b40ce294 添加 中航-DB复核项 枚举 5 years ago
宋军超 8a392814aa 天津麦格纳修改涂装展示组件添加字段展示 5 years ago
wynne1005 8c0ea0d52f 冲突解决 5 years ago
wynne1005 10d5276fbb 过程检测 演示修改 5 years ago
puxiao.liao e6b5caa61c 修复TJ MGN BUG 5 years ago
joke.wang cce1d91650 客退备件返修 5 years ago
宋军超 e18ad44c14 天津麦格纳修改返工返修 5 years ago
陈思洁 21ca0a9d0d 【11437 19081-半成品预装队列优化-20200917】 5 years ago
陈思洁 7029b75f27 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
陈思洁 a9b18733ec 【11218 19081-安灯系统增加PLC交互控制三色灯-20200910】 5 years ago
钮海涛 22e59a3800 Merge remote-tracking branch 'origin/dev' into dev 5 years ago
钮海涛 f9db132861 坤泰SWEBU9接口 5 years ago
rock.yu 17dae82081 增加麦格纳工单的滑动窗口计算逻辑 5 years ago
陈思洁 d6c9e9a061 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
陈思洁 1072b4fd04 【半成品预装队列】 5 years ago
puxiao.liao 5e0c0a4051 修复TJ MGN BUG 5 years ago
puxiao.liao ae6ffa27f4 修复TJ MGN BUG 5 years ago
joke.wang ba8022f9ca 生产队列明细增加条码字段 5 years ago
宋军超 f58e07fa33 天津麦格纳-添加总装质量检测弹框工步和返工返修接口 5 years ago
宋军超 ad5c122df8 天津麦格纳-添加总装质量检测弹框工步和返工返修接口 5 years ago
汪云昊 6156207369 Merge remote-tracking branch 'remotes/origin/dev' into test 5 years ago
汪云昊 d19fbe8cf1 fix(core):用户信息导出时，用户状态信息为空 5 years ago
陈思洁 50c2258f58 【增加查询参数条件】 5 years ago
joke.wang 817f4b2812 客户产线增加字段 5 years ago
wynne1005 7ab755c9f5 过程检测 16 后端接口完毕 5 years ago
汪云昊 163d0773a9 修改pom文件版本 5 years ago
汪云昊 b38e6ea1ad Merge remote-tracking branch 'remotes/origin/dev' into test 5 years ago
汪云昊 4e8716f173 Merge remote-tracking branch 'origin/dev' into dev 5 years ago
汪云昊 55a8bcad72 feat(core):系统更新记录功能 5 years ago
王杰 6dca5ccb09 异步任务 5 years ago
钮海涛 48443a57de 合并test代码 5 years ago
钮海涛 a3eb1e83f3 Fix Bug #11320,#11213 5 years ago
puxiao.liao 900fd5d5b7 MGN标准库存支持修改拆包 5 years ago
wynne1005 3858b2e3d9 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
wynne1005 dd1ece9be8 新增过程检测 检测结果枚举 5 years ago
钮海涛 6e803445d7 Fix Bug #11320,#11213 5 years ago
钮海涛 485c66aaf7 合并test代码 5 years ago
wynne1005 531fe743c2 过程检测 完成首检判断 5 years ago
宋军超 6fa35ad939 天津麦格纳取消条码补打校验逻辑 5 years ago
曾贞一 6e252705ab Merge branch 'test' of helin.huang/i3plus-pojo-liquor into test 5 years ago
puxiao.liao 6e22be2d37 麦格纳ASN收货看板修改 5 years ago
liquor e75745380e 【11324 20011--北美收货自动打印时批次字段为2020-09-11，需要后台在传给前端时将后三位字符去除，变为2020-09用于客户目视化-0914】 5 years ago
曾贞一 f7fcb1f530 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
曾贞一 3267a9b54f 【如东AGV接口】 5 years ago
puxiao.liao 92c2a49b90 麦格纳ASN新增异常 5 years ago
liquor ddf9936d74 在看板中增加了一列“来源库位”。 5 years ago
wynne1005 d00dcd80eb 冲突解决 5 years ago
wynne1005 7412eb3f16 质量检测 5 years ago
陈思洁 f19ee854be Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
陈思洁 802c801013 【11310 19081-下达至下线时间预警-20200913】 5 years ago
puxiao.liao 039fc9106b Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
puxiao.liao 6765c58de2 Fix bug#11212 
生产报废的条码在条码状态中查询是入库状态 --20200914
 5 years ago
王杰 cf26f7eadd mespcn异步任务 5 years ago
wynne1005 1e9f1a5c47 质量检测 1 5 years ago
陈思洁 d3f754c8a6 【客户JIT生产队列增加字段】 5 years ago
钮海涛 31791ea8cc Merge remote-tracking branch 'origin/test' into test 5 years ago
钮海涛 17c64fbf46 修改麦格纳最早批次问题 5 years ago
puxiao.liao 8ac53abe9e 麦格纳ASN新增异常 5 years ago
宋军超 0d5ade92a9 天津麦格纳添加工位缺陷导入功能 5 years ago
puxiao.liao 08f76c099e Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
陈思洁 65b18c6b91 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
陈思洁 d127413055 【11225 19081-客户JIT生产队列需要能够选择L7级零件，进行对应订单的筛选-20200910】 5 years ago
puxiao.liao 9954b1e83a 麦格纳ASN新增异常 5 years ago
rock.yu 36dd266065 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
rock.yu 9a2a596094 增加条码操作类型-发运校验 5 years ago
宋军超 0c855ba2af 天津麦格纳问题修复 5 years ago
钮海涛 cb39559a3d Merge remote-tracking branch 'origin/test' into test 5 years ago
曾贞一 6cc11a637d Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
曾贞一 c947df6c66 【坤泰接口优化】 5 years ago
puxiao.liao 15a259c8b2 修复MGN系列BUG 5 years ago
钮海涛 cfd507438e 天津麦格纳问题修复 5 years ago
宋军超 bd20bc1552 天津麦格纳修改涂装条码打印 5 years ago
joke.wang b389da7c2f Fix Bug #11260 5 years ago
puxiao.liao c91511185a Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
puxiao.liao 3cf5c70774 修复MGN系列BUG 5 years ago
陈思洁 40cef1961c Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
陈思洁 8a1f0c608e 【基础页面增加替代料功能】 5 years ago
宋军超 baafe4cd49 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
宋军超 b978fa390c 修改天津麦格纳涂装计划查询报表和涂装工单导入 5 years ago
puxiao.liao f1715db664 Finish Task #2184 Cost:8h 
2184 06 1.2.3.7.1物流路线检查
 5 years ago
陈思洁 644454294c Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
陈思洁 676e43fc33 【增加查询参数条件】 5 years ago
王杰 5e229b7176 message pool 5 years ago
汪云昊 1ce2793faa Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
宋军超 799967bde5 修改天津麦格纳问题 5 years ago
汪云昊 7a4be36111 Merge remote-tracking branch 'remotes/origin/dev' into test 5 years ago
汪云昊 156dd53402 Merge remote-tracking branch 'origin/dev' into dev 5 years ago
汪云昊 130d3a9792 feat:字典规则调整允许值为空 5 years ago
汪云昊 ab608c0919 feat:用户导出 5 years ago
宋军超 91aa6f61a0 删除预装区查询接口 5 years ago
陈思洁 2af946a4bf Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
陈思洁 9fde75101e 【11181 19048-组织模型新增数据和保存的数据不一致！-2020-09-09】 5 years ago
wynne1005 9bfd9ef279 Merge branch 'master' into test 5 years ago
wynne1005 beaeccf1ed 冲突合并 5 years ago
wynne1005 48b6634032 新增枚举 样本类型 5 years ago
宋军超 c5ebcaf2b5 天津麦格纳添加出入库事务表枚举 5 years ago
puxiao.liao 97a8a5a6ec 修复MGN系列BUG 5 years ago
puxiao.liao 698128aff5 MGN修复BUG 5 years ago
宋军超 7a6bda2994 天津麦格纳问题修复 5 years ago
陈思洁 2c91dfba60 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
陈思洁 e4dc2e1a46 【2637 08 ext 20042 PCN界面优化，log调整 0804】 5 years ago
joke.wang d33dae14dc jsp计算bug优化 5 years ago
曾贞一 99e63fea8c 【2741 北京麦格纳WMS-质检跳批】 5 years ago
宋军超 f73e826cd8 天津麦格纳问题修复 5 years ago
钮海涛 729a7b6990 合并冲突 5 years ago
钮海涛 5c9da87650 合并冲突 5 years ago
钮海涛 d47607880e 合并冲突 5 years ago
钮海涛 56b1ae99a9 Merge remote-tracking branch 'origin/test' into test 5 years ago
钮海涛 1b6bbed47c Fix Bug #10974 5 years ago
曾贞一 193cff013f 【2737 09 1.2.1.9.1库位新增库位别名】 5 years ago
joke.wang b8c743896d 拆解接口表优化 5 years ago
puxiao.liao 61b87d2d00 MGN修复BUG 5 years ago
puxiao.liao 15d915370e MGN修复BUG 5 years ago
曾贞一 fe9a19c534 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
曾贞一 6ca0948a5d 【11026 20011--有关北美收货产生的需求变更--0910】 5 years ago
宋军超 b0aba21859 中航导入问题修复 5 years ago
曾贞一 5dc142ba34 【2719 06 1.1.10 数据库文档管理-导入模板生成功能新增】 5 years ago
songss bdf708b73a 增加上传图片job 5 years ago
joke.wang 045babeee1 已生产队列查询修改 5 years ago
joke.wang ba940f9a39 BYPASS项映射关系表 5 years ago
汪云昊 0a0727e2fa fix:代码错误 5 years ago
汪云昊 f878e6b283 Merge remote-tracking branch 'remotes/origin/dev' into test 5 years ago
汪云昊 2e102f4189 Merge remote-tracking branch 'origin/dev' into dev 5 years ago
汪云昊 1ccd4f3b65 feat:添加区间查询 5 years ago
puxiao.liao 48a6dec057 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
puxiao.liao 9a7bef44ac MGN修复BUG 5 years ago
陈思洁 01fc8bb062 【条码履历增加字段】 5 years ago
陈思洁 75fe475b53 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
陈思洁 01eda59dd5 【11069 19048- 抛光质量待定扫描条码后，提示信息不明确！-2020-09-05】 5 years ago
王杰 396dcdf56c 涂装 一箱 优化 5 years ago
曾贞一 332e37ea94 【2719 06 1.1.10 数据库文档管理-导入模板生成功能新增】 5 years ago
宋军超 b7542f8db0 修改中航问题 5 years ago
wynne1005 38096fb04e mes表名过长不兼容oracle 5 years ago
汪云昊 6457cac828 feat:去除非空校验 5 years ago
曾贞一 54dc09ff76 【冲突解决】 5 years ago
曾贞一 9ebe3c17b7 【枚举状态】 5 years ago
joke.wang bd8cc364c1 jsp计算优化 5 years ago
汪云昊 1243607e0e Merge remote-tracking branch 'remotes/origin/dev' into test 5 years ago
汪云昊 5fbd0fdd80 fix:单号生成记录 5 years ago
puxiao.liao 26367ea28d Finish Task #2184 Cost:8h 
2184 06 1.2.3.7.1物流路线检查
 5 years ago
汪云昊 cf2bf8d291 企业微信适配 5 years ago
rock.yu 6e37cd934b Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
rock.yu d7133b24f5 增加缺失的字段 5 years ago
陈思洁 decd0ae558 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
陈思洁 6c351c09b5 【11016 19048- 总装生产计划显示多条！-2020-09-03】 5 years ago
曾贞一 8ca16d7c68 【枚举状态】 5 years ago
许心洁 7f11e5b1d7 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
许心洁 1fe5b807c6 BUG#10826,11025,11024 5 years ago
曾贞一 92e8364b58 【1140 09 1.2.1.1.1客户发运车辆推荐】 5 years ago
曾贞一 62733aa799 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
曾贞一 a53e7c5724 【2712 子 09 1.2.1.1.1客户发运车辆推荐 / 09 1.2.1.1.1客户发运车辆推荐 -后端】 5 years ago
puxiao.liao acbad1a637 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 
 Conflicts:
	modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java
 5 years ago
puxiao.liao df4e794a48 修复MGN系列BUG 5 years ago
rock.yu 1e5fe42702 完成了麦格纳质检录入不良数量的功能 5 years ago
曾贞一 a0b50da83e Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
曾贞一 c06c504805 【2712 子 09 1.2.1.1.1客户发运车辆推荐 / 09 1.2.1.1.1客户发运车辆推荐 -后端】 5 years ago
joke.wang 746a17bd75 bj-mgn辅助展示组件 5 years ago
songss 7243e20cc8 Merge remote-tracking branch 'origin/test' into test 5 years ago
songss d5d6f2cfee 修改枚举值 5 years ago
陈思洁 5dd7cc44b2 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
陈思洁 fad811c2bc 【增加索引】 5 years ago
joke.wang 18ca368f3c 照片采集 5 years ago
puxiao.liao 679ad59b86 Fix bug#10977 
19128+MES工单生成WMS领料任务无法生成+20200901
 5 years ago
wynne1005 4bdfebede1 中航打包PCR完成 5 years ago
puxiao.liao 0e89f89327 修复MGN系列BUG 5 years ago
puxiao.liao 137c45b5cc 修复MGN系列BUG 5 years ago
汪云昊 b2517a11b8 feat(用户登录日志):用户登录日志查询及导出功能 5 years ago
陈思洁 564fdb261b Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
陈思洁 03730fe13c 【[#2702::07 ext 虚拟工单关闭按钮（注塑、涂装、组装） ] 】 5 years ago
wynne1005 fa8beadc4f Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
wynne1005 191220442f websocket错误提示音 5 years ago
rock.yu 3935bde8f6 同步 SAP 数据同步 JOB（从仪征同步） 5 years ago
wynne1005 89ec0cbd71 解决冲突 5 years ago
wynne1005 d86c84a39e 添加工步返回表格背景色 5 years ago
许心洁 73c0ae5d42 优化合并仪征代码 5 years ago
陈思洁 df2342e097 【2703 07 ext 虚拟工单关闭按钮（注塑、涂装、组装）】 5 years ago
puxiao.liao 1eb3622d19 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
alwaysfrin 8b6271cebc 1，数据源参数配置优化 
2，读写分离数据源切换优化
3，日志切面优化调整
4，登陆线程优化
5，对象新增、修改监听优化
 5 years ago
songss 19f1cf85c4 Merge remote-tracking branch 'origin/test' into test 5 years ago
songss fad439a5a0 增加MES状态机Repository类 5 years ago
puxiao.liao b8a938df2e Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
陈思洁 23d8afd0ae Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
陈思洁 09c95d3542 【库存排程配置增加禁用启用接口】 5 years ago
joke.wang 3815c1c730 扭矩采集plc优化 5 years ago
puxiao.liao 2527fe0163 修复MGN系列BUG 5 years ago
陈思洁 381ff0c974 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
陈思洁 de248a944f 【2701 08 1.2.3.3.8 涂装检测工位，显示合格数、不良数】 5 years ago
钮海涛 51746154ba 合并dev到test 5 years ago
钮海涛 e6b472bcfd 合并test代码到dev 5 years ago
钮海涛 98b992408c Merge remote-tracking branch 'remotes/origin/test' into dev 5 years ago
钮海涛 4144e12b5d 合并test代码到master 5 years ago
钮海涛 92f0158dab 合并master代码 5 years ago
曾贞一 57aae56345 【2690 ext新增委外库存查询报表 -后端】 5 years ago
wynne1005 f06f51cc7e master merge test 5 years ago
rock.yu f6b812aaf8 PDA组件原生支持脚本组件 5 years ago
joke.wang b09aa27e0f 排程job 5 years ago
rock.yu 9be1dd70d5 盘点明细表 lotno 字段增加默认值 5 years ago
汪云昊 feace77fc3 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
puxiao.liao 7f91f1269c 修复MGN系列BUG 5 years ago
汪云昊 731a92fa2c Merge remote-tracking branch 'remotes/origin/dev' into test 5 years ago
汪云昊 6dc0d94085 feat:适配器添加空报文保存开关 5 years ago
汪云昊 4dc40c79dd fix:pager.startRow重复计算 5 years ago
钮海涛 3bca09c091 Merge remote-tracking branch 'origin/test' into test 5 years ago
钮海涛 8d38a297d2 三力士演示demo 5 years ago
汪云昊 7e678e747d feat:移除mongo日志持久化方法 5 years ago
puxiao.liao 36e9000710 麦格纳BUG 5 years ago
joke.wang a2eab983d9 缓存池订单池增加jit_seq字段 5 years ago
钮海涛 2133d0d7e4 Merge remote-tracking branch 'origin/test' into test 5 years ago
钮海涛 f0023a2232 三力士演示demo 5 years ago
曾贞一 c1cb461f36 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
曾贞一 a9e97d4e28 【2688 08 extPDA-查询查看零件对应库位】 
【2683 08 ext单据打印新增字段查询和显示】
【2682 08 ext单据打印新增模板选择】
 5 years ago
钮海涛 0b6764e8fe Merge remote-tracking branch 'origin/test' into test 5 years ago
钮海涛 6dd429d328 三力士演示demo 5 years ago
songss a2f257e414 Merge remote-tracking branch 'origin/test' into test 5 years ago
songss df6f0bb4f2 删除没用代码 5 years ago
songss f4d7e55f05 喷涂过程条码批量打印报错bug修复 5 years ago
陈思洁 0325e3dc95 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
陈思洁 98afecf57b 【10877 19048-预组装看板及操作工位变更调整-20200828】 5 years ago
wynne1005 a580c70c04 添加正态分布数据总数 5 years ago
wynne1005 762b73dddf 添加StepResult的返回cmd CLEAR_CACHE 5 years ago
wynne1005 9563ebeb66 normalDistribution 5 years ago
wynne1005 b4b1c2f3f8 erge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
wynne1005 0fd5989864 新增帮助类型的busiType 5 years ago
rock.yu 42187ebadc 完善流程管家日志信息 5 years ago
钮海涛 85395e84fd 合并dev代码 5 years ago
钮海涛 2013d47353 合并dev代码 5 years ago
宋军超 940510ea5b 北京海纳川、北京麦格纳问题修复 5 years ago
陈思洁 d7f8796d36 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
陈思洁 ee1b0b5b67 【2674 预装区基础页面开发】 5 years ago
puxiao.liao d63d07ad7e 麦格纳收货BUG 5 years ago
joke.wang ac55ae1df1 库存排程配置增加物料名称 5 years ago
王杰 7a502c45c9 注塑上料 展示组件增加字段 5 years ago
陈思洁 baa7d144b7 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
陈思洁 daf0b94314 【10828 19048-10827-预装作业界面优化！-2020-08-25】 5 years ago
曾贞一 3f2232d741 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
曾贞一 ec7aee68a7 【10744 20011--二维码收货时，如果该零件号设置了特殊批次，则扫描系统自己生成的二维码时永远报错“条码未维护供应商批次 执行成功请扫描二维码”，实际批次已经存在与条码最后一个字段中--0830】 5 years ago
宋军超 53d392ebe1 海纳川问题修复枪头更换添加弹框校验 5 years ago
wynne1005 ebd12f7c65 去除ProductBiModel重复字段 5 years ago
wynne1005 f9fa5814f6 冲突解决 5 years ago
wynne1005 40ec96a390 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
wynne1005 bbcd0c8f69 去除多余枚举 5 years ago
许心洁 2cc6abb902 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
许心洁 291c0b2a40 BUG#10584,BUG#10784,BUG#10785 5 years ago
钮海涛 9a41c2e2e0 合并test到dev 5 years ago
钮海涛 025cc19f68 合并dev到test 5 years ago
钮海涛 347f6671f2 合并dev到test 5 years ago
钮海涛 99b8cb146c Merge remote-tracking branch 'remotes/origin/master' into test 5 years ago
钮海涛 310da99743 合并master代码 5 years ago
wynne1005 3769a630fe Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
wynne1005 42a340d0c0 timeModuleInit 5 years ago
宋军超 f3cb06ba5a Merge remote-tracking branch 'origin/test' into test 5 years ago
宋军超 030343f2ce 海纳川问题修复 5 years ago
王杰 43ad04818c pom 5 years ago
王杰 0d256b3afd Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
钮海涛 b4a4c42fe0 合并master代码 5 years ago
wynne1005 b3aa6eef70 中航 均值极差 5 years ago
钮海涛 35d3a85b60 合并master代码 5 years ago
钮海涛 c7adb56b9c Merge remote-tracking branch 'origin/test' into test 5 years ago
汪云昊 8d6b01c06e Merge remote-tracking branch 'remotes/origin/dev' into test 5 years ago
钮海涛 3df3c89db9 Merge remote-tracking branch 'origin/test' into test 5 years ago
汪云昊 a52646a65d Merge remote-tracking branch 'remotes/origin/dev' into test 
# Conflicts:
#	modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java
 5 years ago
钮海涛 ea43d63d7e Merge remote-tracking branch 'remotes/origin/master' into test 5 years ago
汪云昊 dd75e3729b feat:添加条码解析校验模式 5 years ago
汪云昊 d02c73f431 Merge remote-tracking branch 'origin/dev' into dev 5 years ago
汪云昊 26cf4c5e92 feat:mongo模块化 5 years ago
汪云昊 103137e2fc feat:添加条码解析校验模式 5 years ago
汪云昊 a5d7ff1ef4 feat:添加条码解析校验模式 5 years ago
王杰 3b31f9fcc8 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
王杰 d0bfa965f7 类型信息 seq 5 years ago
陈思洁 b0c3b85378 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago