 钮海涛
|
81266fbfb6
|
解决合并冲突
|
5 years ago |
|
钮海涛
|
02d46cfb69
|
解决合并冲突
|
5 years ago |
 王杰
|
9a74188e55
|
master merge test
|
5 years ago |
qianhs
|
9461057a07
|
Finish Task #2080 Cost:8h
|
5 years ago |
陈思洁
|
930472492f
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
|
5 years ago |
|
陈思洁
|
1d799ed294
|
2447 中航 扣减错误信息保存
|
5 years ago |
|
王杰
|
204da853c3
|
[任务：2442]
|
5 years ago |
|
qianhs
|
747cfeb125
|
Finish Task #2080 Cost:8h
|
5 years ago |
|
qianhs
|
61603e2aa5
|
Merge remote-tracking branch 'origin/test' into test
|
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 |
|
王杰
|
699b444223
|
Merge branch 'dev' of jhforever.wang/wangjie-i3plus-pojo 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 |
|
qianhs
|
2139c83bf3
|
Merge remote-tracking branch 'origin/test' into test
|
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 |
|
qianhs
|
c96a195b15
|
Merge remote-tracking branch 'origin/dev' into test
|
5 years ago |
|
钮海涛
|
19e16c623e
|
修复合并版本问题
|
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 |
|
钮海涛
|
acda4c2541
|
修复合并版本问题
|
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 |
|
王杰
|
ec87065eb5
|
if pick data
|
5 years ago |
|
宋军超
|
448bd77b81
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
宋军超
|
538b224f67
|
新增计划外条码识别上线-PCR功能
|
5 years ago |
|
wynne1005
|
cc4d17a81f
|
大枪ok bug 9492
|
5 years ago |
|
曾贞一
|
354d1290f7
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
曾贞一
|
f99c5232be
|
【2388 07 1.2.3.6.2欧洲WMS-PCR-悬挂链库存同步】
|
5 years ago |