 钮海涛
|
ceebe541f2
|
Merge remote-tracking branch 'remotes/origin/master' into test
|
5 years ago |
陈思洁
|
88376bb350
|
【2958 11 2.5.3 热处理上件】
|
5 years ago |
joke.wang
|
22411fa928
|
备件导入增加列
|
5 years ago |
汪云昊
|
f2180f18f3
|
revert(pojo):还原pom版本
|
5 years ago |
|
汪云昊
|
378205ef61
|
Merge remote-tracking branch 'origin/dev' into test
|
5 years ago |
|
汪云昊
|
cc947c08f5
|
revert(pojo):还原pom版本
|
5 years ago |
|
汪云昊
|
8f899f2f46
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
钮海涛
|
4dd875a691
|
Merge remote-tracking branch 'origin/test' into test
|
5 years ago |
|
钮海涛
|
156b515497
|
修复SWEB问题
|
5 years ago |
simon
|
7d451dc136
|
Merge remote-tracking branch 'origin/test' into test
|
5 years ago |
|
simon
|
4c1add6ba4
|
修改中文描述
|
5 years ago |
|
joke.wang
|
058bd05b4a
|
mgn-bj esop展示组件优化
|
5 years ago |
|
汪云昊
|
3af9790a9e
|
refactor(impp):调整描述注解
|
5 years ago |
puxiao.liao
|
89bf22521a
|
Fix bug#12380
19048-支持批量下发BOM的功能
|
5 years ago |
|
puxiao.liao
|
b124db3383
|
天津麦格纳看板BUG修复
|
5 years ago |
|
joke.wang
|
e18b6c727e
|
mgn-bj强制封箱完成后重置数据
|
5 years ago |
|
simon
|
1ba56bc59a
|
调整过程检验返回结果
|
5 years ago |
|
汪云昊
|
f2a6ddd55a
|
Merge remote-tracking branch 'origin/dev' into test
|
5 years ago |
|
汪云昊
|
426a6f2026
|
feat(ftp):ftp重试功能
|
5 years ago |
|
汪云昊
|
7a6137a667
|
Merge remote-tracking branch 'origin/dev' into test
|
5 years ago |
|
puxiao.liao
|
679ef67457
|
天津麦格纳看板BUG修复
|
5 years ago |
rock.yu
|
bc3e94923f
|
增加数据源的类型
|
5 years ago |
Aisiyu
|
a2a4a85312
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
Aisiyu
|
1680314d49
|
[1211 天津麦格纳货运看板和asn看板修改 ]
|
5 years ago |
|
rock.yu
|
3a5e446e90
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
rock.yu
|
77d8aa4bdd
|
修改天津工单拉动逻辑
|
5 years ago |
|
汪云昊
|
8d66424bf6
|
fix(form):分页错误
|
5 years ago |
|
汪云昊
|
2121124f4b
|
Merge remote-tracking branch 'origin/dev' into test
|
5 years ago |
|
汪云昊
|
faf9bd4b14
|
fix(form):分页失效
|
5 years ago |
|
汪云昊
|
3b1c068290
|
Merge remote-tracking branch 'origin/dev' into test
|
5 years ago |
|
汪云昊
|
eb9e520d76
|
fix(form):分页失效
|
5 years ago |
|
puxiao.liao
|
85d2f03b55
|
修复麦格纳BUG
|
5 years ago |
wynne1005
|
48c1d2c1c8
|
feat(tj) 文件上传
|
5 years ago |
|
wynne1005
|
8a648eab74
|
新增mysql连接时区
|
5 years ago |
|
simon
|
ece1ca4c01
|
调整中航看板返回，修复中航pcn原材料上线bug
|
5 years ago |
|
wynne1005
|
c118aac425
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
wynne1005
|
a2cf356516
|
修改mysql驱动版本 兼容mysql8
|
5 years ago |
 王杰
|
46c22020bd
|
总装 质量判定缺陷增加类型代码
|
5 years ago |
|
汪云昊
|
1825cfbdf3
|
revert(pojo):还原pom版本
|
5 years ago |
|
wynne1005
|
88c942f509
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
wynne1005
|
fb5df5aedf
|
照片采集完成
|
5 years ago |
|
joke.wang
|
f38e41f1ec
|
增加看板类型
|
5 years ago |
|
汪云昊
|
e87740e723
|
Merge remote-tracking branch 'origin/dev' into test
|
5 years ago |
|
汪云昊
|
f47b699146
|
feat(form):支持存储过程参数
|
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 |
|
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 |
|
汪云昊
|
ce054916b4
|
Merge remote-tracking branch 'origin/dev' into test
|
5 years ago |
|
汪云昊
|
401fccd4dc
|
fix(impp):DdlPreparedPack类处理大于小于错误
|
5 years ago |
|
宋军超
|
d372256a68
|
添加喷涂不良类型枚举
|
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 |