 贾文涛
|
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 |
|
puxiao.liao
|
5006e0a938
|
Finish Task #2520 Cost:8h
2520 07 1.2.3.3.4北京麦格纳WMS-JIS生产报工与内部移库
|
5 years ago |
陈思洁
|
2636e43b9b
|
【9914 天津】
|
5 years ago |
|
joke.wang
|
c90a009e66
|
Fix Bug #9874
|
5 years ago |
|
wynne1005
|
d0e1900a84
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
wynne1005
|
c1fd1f6eee
|
bypass redo release
|
5 years ago |
 王杰
|
03dbb18bb8
|
8832 PO-HJMGN-19073--TJX5没有设备信息，但是显示了新松线的设备信息。--20200609
|
5 years ago |
|
王杰
|
41ff729f99
|
workorderlog
|
5 years ago |
|
宋军超
|
13142b4ce1
|
修改电检逻辑
|
5 years ago |
 曾贞一
|
374e73128d
|
【坤泰流程测试】
|
5 years ago |
汪云昊
|
1aa63db4d3
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
5 years ago |
|
汪云昊
|
4b3470b1fd
|
定时任务日志优化
邮件发送失败记录
|
5 years ago |
|
宋军超
|
933e9efb3d
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
宋军超
|
3a31ccae70
|
队列明细添加临时字段
|
5 years ago |
|
贾文涛
|
a577eac60a
|
修复缓存redis时，忽略ModuleServer对象。
|
5 years ago |
|
wynne1005
|
f3a13522a1
|
解决冲突
|
5 years ago |
|
wynne1005
|
3ba1c8ee62
|
新增组件类型枚举
|
5 years ago |
|
joke.wang
|
a1af94fe70
|
Fix Bug #9760
|
5 years ago |
|
宋军超
|
ae285a6dc6
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
王杰
|
4df8a743a7
|
9735 19048-物料信息导入模板增加喷涂必需信息的维护-2020-07-21
|
5 years ago |
|
宋军超
|
076c6c1b4f
|
扭矩二合一查询关键件清单逻辑优化--目前根据 队列主表，队列明细表，车型散件配置清单，物料信息表。加上条件【一百位条码】,年度型相同，车型相同 内联查出所有的关键件零件——>查询车型散件配置清单中的零件信息
工位监控逻辑修改:产线添加工位监控模式字段，为空或10执行之前逻辑，为20时不需要查询工单信息，后面逻辑不变
|
5 years ago |
|
puxiao.liao
|
31c3fcd868
|
泰国需求
|
5 years ago |
|
wynne1005
|
194f49ca11
|
agv停车信号 工位重做 倒计时 1
|
5 years ago |
|
wynne1005
|
d5ee3d3b29
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
wynne1005
|
2116fdafc7
|
agv枚举
|
5 years ago |
|
宋军超
|
63163e1140
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
宋军超
|
1ac8fae269
|
修改枪头更换逻辑
|
5 years ago |
|
曾贞一
|
b6a0d43bd0
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
曾贞一
|
a379c97461
|
【2444 坤泰流程配置测试】
|
5 years ago |
|
钮海涛
|
3e95dd4029
|
修复北京麦格纳生产报工问题
|
5 years ago |
|
宋军超
|
a77bf1a98a
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
宋军超
|
a25df616e3
|
修改展示组件，添加查询队列刷新时间；修改PLC标签地址查询条件
|
5 years ago |
|
puxiao.liao
|
88b85b03d2
|
Finish Task #2436 Cost:8h
拣货、客户发运流程简化配置
|
5 years ago |
qianhs
|
c9e4c72901
|
Finish Task #2080 Cost:8h
|
5 years ago |
|
钮海涛
|
e140910db7
|
Merge remote-tracking branch 'origin/test' into test
|
5 years ago |
|
qianhs
|
e17318dbcb
|
Finish Task #2080 Cost:8h
|
5 years ago |
|
汪云昊
|
94c21581dc
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
汪云昊
|
50999e49f2
|
软适配添加原始报文查询
|
5 years ago |
|
汪云昊
|
c230c57c97
|
定时任务 导入导出
定时任务 重载功能
|
5 years ago |
|
王杰
|
b3999ad481
|
dev merge test
|
5 years ago |
|
王杰
|
767c1bffbc
|
test merge dev
|
5 years ago |
|
钮海涛
|
81266fbfb6
|
解决合并冲突
|
5 years ago |
|
王杰
|
9a74188e55
|
master merge test
|
5 years ago |
|
qianhs
|
9461057a07
|
Finish Task #2080 Cost:8h
|
5 years ago |
|
陈思洁
|
1d799ed294
|
2447 中航 扣减错误信息保存
|
5 years ago |
|
王杰
|
204da853c3
|
[任务：2442]
|
5 years ago |
|
joke.wang
|
8f7d6d46af
|
Fix Bug #9457
|
5 years ago |
|
joke.wang
|
54a51a4c69
|
Fix Bug #916
|
5 years ago |
|
王杰
|
9b6be3167d
|
dev merge test
|
5 years ago |
|
王杰
|
d2ff83e22b
|
test merge dev
|
5 years ago |
|
王杰
|
411fdbaa7d
|
Merge branch 'test' into dev
|
5 years ago |
|
王杰
|
7533a3ef44
|
[任务2408]
|
5 years ago |
|
陈思洁
|
ffbf18944c
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
陈思洁
|
f5b4c666bf
|
【天津bug修改 9627,9615,9614,9610,9585,9445,9439,9428,9421,9401】
|
5 years ago |
|
曾贞一
|
fd958c1c5f
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
曾贞一
|
6dd0614533
|
【欧洲-定时悬挂链汇总更新库存数据JOB-优化】
|
5 years ago |
|
wynne1005
|
bd3e32d39e
|
小枪调试完毕
|
5 years ago |
|
宋军超
|
34a9cbe0ac
|
修改PTL数据同步逻辑
|
5 years ago |
|
宋军超
|
e4384bd569
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
宋军超
|
2e5ab2cdcd
|
条码外上线添加赋值字段
|
5 years ago |
|
钮海涛
|
9a516f893f
|
合并dev代码到test
|
5 years ago |
|
钮海涛
|
37a12c0cdf
|
Merge remote-tracking branch 'remotes/origin/test' into dev
|
5 years ago |
|
puxiao.liao
|
5d62ebf26f
|
Finish Task #2424 Cost:8h
2424 07 1.2.3.7.1新增检查容器包装关系
|
5 years ago |
|
wynne1005
|
3f8789332f
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
wynne1005
|
1252027685
|
dl小枪
|
5 years ago |
|
曾贞一
|
9bf2d5206c
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
曾贞一
|
6750f11459
|
【2388 07 1.2.3.6.2欧洲WMS-PCR-悬挂链库存同步】
|
5 years ago |
|
曾贞一
|
791acf7ae8
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
曾贞一
|
dffdf88471
|
【9556 欧洲-RFID条码操作记录-操作类型显示问题】
|
5 years ago |
|
joke.wang
|
b69fcdc0c6
|
Finish Task #2399 Cost:6h
|
5 years ago |
|
宋军超
|
885d2c16a1
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
宋军超
|
300e308394
|
新增盲检规则导入功能
|
5 years ago |
|
王杰
|
e1b3b14a36
|
test merge dev
|
5 years ago |
|
王杰
|
6de2bc5472
|
Merge branch 'test' into dev
|
5 years ago |
|
puxiao.liao
|
df125e71b9
|
泰国翻包
|
5 years ago |
|
qianhs
|
860f6d11f0
|
Finish Task #2080 Cost:8h
|
5 years ago |