joke.wang
|
f495ffed54
|
Fix Bug #10477
|
5 years ago |
|
joke.wang
|
4bdd2b770b
|
Fix Bug #10486
|
5 years ago |
|
joke.wang
|
51f9d92d36
|
北京麦格纳esop展示组件修改
|
5 years ago |
ypf
|
97a2bdd60e
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
ypf
|
523d2ffc80
|
关于欧洲领料看板逻辑实体的添加
|
5 years ago |
|
joke.wang
|
7c3594a870
|
Fix Bug #9589
|
5 years ago |
陈思洁
|
e4c8431a22
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
陈思洁
|
653b413623
|
【10334 19048-MES、WMS接口JIT02中增加内部工单号！-2020-08-03】
|
5 years ago |
宋军超
|
e70192d3c2
|
添加日志查询问题
|
5 years ago |
 钮海涛
|
54b0af00cc
|
Sweb功能开发
|
5 years ago |
|
宋军超
|
625b780aaf
|
添加海纳川数据复核工步和产线状态看板变更
|
5 years ago |
wynne1005
|
5d9e055fe1
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
wynne1005
|
3af4d32a97
|
mes工位运行状态
|
5 years ago |
汪云昊
|
a3e8caf085
|
fix:detachObject为空时报错
|
5 years ago |
|
宋军超
|
6aaa26b192
|
修改海纳川问题
|
5 years ago |
|
joke.wang
|
edb85b5ea6
|
桌面BI
|
5 years ago |
|
汪云昊
|
55b047448b
|
fix:会话模式为默认时出现不能正常覆盖的问题
|
5 years ago |
|
宋军超
|
6e60bee0dd
|
修改海纳川问题
|
5 years ago |
|
宋军超
|
731b1c60ee
|
修改海纳川问题
|
5 years ago |
|
wynne1005
|
3c004324b1
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
wynne1005
|
6e455f5d72
|
reqBean 添加productSn
|
5 years ago |
 王杰
|
5413fc259c
|
pcn 缺陷
|
5 years ago |
许心洁
|
4a9e5cbb59
|
Merge remote-tracking branch 'origin/test' into test
|
5 years ago |
|
钮海涛
|
3a4c143563
|
Merge remote-tracking branch 'origin/test' into test
|
5 years ago |
|
钮海涛
|
14e68803df
|
增加根据物料号取库存地信息的微服务接口
|
5 years ago |
|
许心洁
|
afeb22c8ec
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
许心洁
|
7dcd8a1627
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
许心洁
|
7482a6dd74
|
BUG#9928 和任务#2590
|
5 years ago |
|
汪云昊
|
410f469450
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
5 years ago |
|
汪云昊
|
7f291a26cd
|
会话模式配置-调整默认模式
|
5 years ago |
puxiao.liao
|
f9061f5d27
|
BUG修复
|
5 years ago |
|
宋军超
|
162e2d33d7
|
修改海纳川问题
|
5 years ago |
|
宋军超
|
99787412cd
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
宋军超
|
8eade912c7
|
添加返工返修数据复核逻辑
|
5 years ago |
|
陈思洁
|
ed343a8064
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
陈思洁
|
ba3f5fde4d
|
【总装、涂装、注塑计划报表】
|
5 years ago |
qianhs
|
86c9bce2aa
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
宋军超
|
c4f40d215b
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
宋军超
|
fa4b1e09aa
|
修改海纳川问题
|
5 years ago |
 曾贞一
|
067a859e83
|
【10229 19081-- 在已有的二维码生产报工逻辑上加上原材料扣减逻辑 --20200802】
|
5 years ago |
|
钮海涛
|
933f2014ad
|
Merge remote-tracking branch 'origin/test' into test
|
5 years ago |
|
钮海涛
|
39f6819e9b
|
修复合并版本问题
|
5 years ago |
|
钮海涛
|
59a1acdafc
|
修复合并版本问题
|
5 years ago |
|
puxiao.liao
|
d5d16569bb
|
Fix bug#10283
20089+库存移动统计报表查询增加项目代码查询项
|
5 years ago |
|
钮海涛
|
f760b72094
|
Merge remote-tracking branch 'remotes/origin/test'
|
5 years ago |
|
宋军超
|
fe79944778
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
王杰
|
5739ac27bb
|
缺陷
|
5 years ago |
|
陈思洁
|
39ea32e37e
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
陈思洁
|
a01cd4d34b
|
【注塑计划导入功能数据优化】
|
5 years ago |
|
宋军超
|
8bc0da924c
|
修改海纳川问题
|
5 years ago |
rock.yu
|
f368ec88cc
|
修改流程管家组件调用日志表
|
5 years ago |
|
joke.wang
|
33cace48ab
|
半成品打印增加字段
|
5 years ago |
|
qianhs
|
c872663847
|
Finish Task #2080 Cost:8h
|
5 years ago |
|
宋军超
|
0b3c53b4ca
|
修改海纳川问题
|
5 years ago |
|
wynne1005
|
e35fdcbc2a
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
wynne1005
|
4c9cdcb6a0
|
tmp
|
5 years ago |
|
rock.yu
|
71a2b68991
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
rock.yu
|
b928acae47
|
1. 流程管家增加记录组件执行耗时的功能
|
5 years ago |
|
陈思洁
|
b662a6ebe5
|
Merge remote-tracking branch 'origin/test' into test
|
5 years ago |
|
陈思洁
|
26fe63eb8a
|
【10278 19048-总装标记不良功能通过外部输入条码标记不良-2020-08-03】
|
5 years ago |
|
汪云昊
|
e6ecd4f86f
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
5 years ago |
|
汪云昊
|
0d40470059
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
汪云昊
|
18a09cc4b6
|
FTP多文件读取问题
脚本解析功能初版
|
5 years ago |
|
汪云昊
|
101a71970c
|
虚拟属性数据校验及参数赋值问题
|
5 years ago |
|
汪云昊
|
5a6a7a77fc
|
平台功能优化，移除通用缓存服务
|
5 years ago |
|
钮海涛
|
51bae8d1e6
|
Fix Bug #10312 修复动态搜索取不到列信息问题
|
5 years ago |
|
王杰
|
9a959a5184
|
pcn enum
|
5 years ago |
|
陈思洁
|
41cbe4f380
|
【10284 19048-注塑生产计划导入变更-20200803】
|
5 years ago |
|
陈思洁
|
ce7ca48c4b
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
宋军超
|
394a332de2
|
修改展示组件逻辑
|
5 years ago |
|
陈思洁
|
72c8e22433
|
【接口映射代码调试】
|
5 years ago |
|
wynne1005
|
88233f080a
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
wynne1005
|
3ec8109e82
|
枪优化
|
5 years ago |
|
王杰
|
e8611616db
|
IPC
|
5 years ago |
|
王杰
|
6c5e646d49
|
test merge master
|
5 years ago |
|
joke.wang
|
c060377822
|
中航BI
|
5 years ago |
|
wynne1005
|
5fad38392e
|
添加索引 脚本表更新
|
5 years ago |
|
joke.wang
|
05fa7dba04
|
Fix Bug #10227
|
5 years ago |
|
joke.wang
|
af539c85a7
|
mgn bug
|
5 years ago |
|
宋军超
|
31f289e1be
|
修改展示组件和电检逻辑
|
5 years ago |
|
曾贞一
|
f25a186d77
|
【2511 07 1.2.3.4.3坤泰ERP&WMS接口】
|
5 years ago |
|
曾贞一
|
4ff84de904
|
【2557 sap指令锁定回传信息增加业务类型，交易类型，erp单号内容】
|
5 years ago |
|
puxiao.liao
|
5990e56dfd
|
Finish Task #2540 Cost:8h
喜德WMS-新增“回传源材料扣减结果”的接口映射
|
5 years ago |
|
王杰
|
bc9adf8ac0
|
ptl
|
5 years ago |
|
王杰
|
784cd87c71
|
ptl
|
5 years ago |
|
钮海涛
|
e239c89e63
|
Merge remote-tracking branch 'origin/test' into test
# Conflicts:
# modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java
|
5 years ago |
|
钮海涛
|
7f55af4477
|
Finish Task #2560 Cost:8h
|
5 years ago |
 贾文涛
|
5d19c8876b
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
陈思洁
|
bc2d29c006
|
【2547 07 1.2.4.6.1.10 PCR-200617001需求变更-生产过程不良紧急拉料】
|
5 years ago |
|
贾文涛
|
fd42a3292a
|
Fix Bug #10090,修复涂装二次箱条码作业完成后，一次箱条码工位数据会乱掉问题。
|
5 years ago |
|
许心洁
|
f791b3f82f
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
许心洁
|
ffc70e158a
|
BUG#8696
|
5 years ago |
|
钮海涛
|
5a64ce6021
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
5 years ago |
|
joke.wang
|
13f7121610
|
海纳川看板
|
5 years ago |
|
贾文涛
|
70693d5b63
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
joke.wang
|
01ac2e85da
|
Fix Bug #10087
|
5 years ago |
|
宋军超
|
e007a52732
|
修改海纳川问题
|
5 years ago |
|
王杰
|
4a59b5c913
|
bug: 10003 19073-安灯作业安灯类型自处理名称修改工装-20200728
|
5 years ago |
|
贾文涛
|
8180795cd7
|
功能优化-打包时将工位代码存入包装表
|
5 years ago |
|
王杰
|
7f5c1735ea
|
数据复核
|
5 years ago |
|
joke.wang
|
ea922affba
|
Start Task #2522 Cost:8h Left:8h
|
5 years ago |
|
qianhs
|
163d610265
|
Finish Task #2080 Cost:8h
|
5 years ago |
|
puxiao.liao
|
937eac5e87
|
Finish Task #2549 Cost:4h
自动生成领料单增加默认来源存储区、自动获取默认目标库位
|
5 years ago |
|
钮海涛
|
72c1363517
|
Merge remote-tracking branch 'origin/test' into test
|
5 years ago |
|
钮海涛
|
f2cf6af1fe
|
Finish Task #2523 Cost:16h
Fix Bug #10065 已增加数据权限控制
|
5 years ago |
|
王杰
|
306b05b4d7
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
许心洁
|
46904c43d1
|
任务#2528，#2545
|
5 years ago |
|
puxiao.liao
|
9b622a27fc
|
Merge remote-tracking branch 'origin/test' into test
|
5 years ago |
|
puxiao.liao
|
3c3a5f6068
|
Fix bug#9902
20089+物料拆分条码异常+0724
|
5 years ago |
|
joke.wang
|
3223158529
|
Fix Bug #10108
|
5 years ago |
|
王杰
|
47a155e1d1
|
git push
|
5 years ago |
|
joke.wang
|
2a93bb2ca4
|
Finish Task #2521
|
5 years ago |
|
rock.yu
|
0f8326d5f8
|
1. 修改扭矩枪采集部分因主数据变动引起的逻辑变动
|
5 years ago |
|
wynne1005
|
7593b63cfc
|
重做枚举
|
5 years ago |
|
joke.wang
|
47f7e24f57
|
Fix Bug #10060
|
5 years ago |
|
puxiao.liao
|
47f466d1d6
|
Merge remote-tracking branch 'origin/test' into test
|
5 years ago |
|
puxiao.liao
|
e85acdcfff
|
Fix bug#9994
库存明细--显示重复
|
5 years ago |
|
qianhs
|
958a45d3dd
|
Finish Task #2080 Cost:8h
|
5 years ago |
|
钮海涛
|
fd0f079a6a
|
Merge remote-tracking branch 'origin/test' into test
|
5 years ago |
|
钮海涛
|
34be0bde26
|
增加物料组功能
|
5 years ago |
|
puxiao.liao
|
6cd46e07bc
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
宋军超
|
23f33a79d1
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
宋军超
|
c18c22a799
|
修改海纳川电检测问题
|
5 years ago |
|
贾文涛
|
c7bba92741
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
rock.yu
|
35cdb1f257
|
完善脚本管理功能
|
5 years ago |
|
贾文涛
|
aafb3d36fc
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
puxiao.liao
|
2e3f5bb2af
|
Fix bug#9994
库存明细--显示重复
|
5 years ago |
|
rock.yu
|
eef7ed9c32
|
调整 pojo 引用关系， mes-pcn-pojo 已废弃
|
5 years ago |
|
rock.yu
|
1d02d45e61
|
增加脚本引擎缺失的DAO
|
5 years ago |
|
rock.yu
|
9104f42d42
|
增加脚本引擎缺失的DAO
|
5 years ago |
|
rock.yu
|
6fbb76b395
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
rock.yu
|
7d76a3ecc7
|
增加脚本持久化类
|
5 years ago |
|
宋军超
|
3590ef4b68
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
宋军超
|
f0fd8da49c
|
修改海纳川问题
|
5 years ago |
|
钮海涛
|
7a93a935cc
|
Merge remote-tracking branch 'origin/test' into test
|
5 years ago |
|
puxiao.liao
|
5f90efe691
|
Fix bug#9982
19125+条码打印页面，erpSrcNo字段数据错误，导致打印出的条码数据有误+0727
|
5 years ago |
|
joke.wang
|
e5d54d8c0a
|
工位BOM增加预警字段
|
5 years ago |
|
joke.wang
|
768e31e636
|
Fix Bug #9995
|
5 years ago |
|
钮海涛
|
7ca3b43bfe
|
合并DEV分支代码
|
5 years ago |
|
钮海涛
|
9b3bb48231
|
Merge remote-tracking branch 'remotes/origin/test' into dev
|
5 years ago |
|
贾文涛
|
3e260a9b86
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
wynne1005
|
4d608dd4c3
|
扩展dispatcher model
|
5 years ago |
|
宋军超
|
5fa18e05f1
|
修改中航问题
|
5 years ago |
|
钮海涛
|
b04ef3caa4
|
合并TEST分支代码
|
5 years ago |
|
钮海涛
|
ef40f20e1d
|
解决合并冲突
|
5 years ago |
|
钮海涛
|
3c22c8e3f4
|
test版本合并到master
|
5 years ago |
|
贾文涛
|
c10a7bae7e
|
增加方法代码字段
|
5 years ago |
|
钮海涛
|
0eb571d717
|
Fix bug #9804
|
5 years ago |
|
钮海涛
|
9bde10f13c
|
修复收货回执界面打不开问题
|
5 years ago |
|
宋军超
|
457cb894db
|
添加工位队列信息功能
|
5 years ago |