2710 Commits (4ee1875097a00fc67cf05ae1d26707502016faa7)

Author SHA1 Message Date
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
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
曾贞一 d8e5aa44bc pom.xml 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
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
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
许心洁 586365dc69 任务#2893,#2894,#2901 5 years ago
陈思洁 6fcf32aa80 【2890 10 2.3.8安灯作业优化】 5 years ago
puxiao.liao 62d5d62cef 北京MGN系列BUG修复 5 years ago
钮海涛 a8cdba48c3 合并Master代码 5 years ago
钮海涛 7afd60073a Merge remote-tracking branch 'remotes/origin/test' 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
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 ba81af744b 北京麦格纳看板 5 years ago
王杰 bb3039d1f2 包装关系查询宝贝 5 years ago
贾文涛 2301e03c85 增加呼叫不需要弹窗的枚举。 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
汪云昊 72e25305bf Merge remote-tracking branch 'origin/dev' into test 5 years ago
汪云昊 a4bc17b0a6 feat(form):sap_hana数据库支持 5 years ago
wynne1005 05152538b2 合并冲突 5 years ago
wynne1005 fc36e55a38 新增mes 报表查询周期枚举 5 years ago
joke.wang df063af038 物料类型1增加枚举 5 years ago
joke.wang 6930fdfbe7 mgn-bj 产线枚举优化 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
宋军超 fcc66835b8 开发天津看板功能 5 years ago