Commit 47b5d1f7 authored by 陈前's avatar 陈前

盘库现在可以对库存进行修改了

parent d8f7d32d
...@@ -539,6 +539,10 @@ public final class ApiFactory { ...@@ -539,6 +539,10 @@ public final class ApiFactory {
skuGrpId, keyword)); skuGrpId, keyword));
} }
public static Observable<Pager<com.xingdata.zzdpos.model.Sssku>> querySssku(String wd) {
return run(Api.getInstance().service.querySssku(wd));
}
public static Observable<Pager<com.xingdata.zzdpos.model.Sssku>> querySssku(int pageNum, public static Observable<Pager<com.xingdata.zzdpos.model.Sssku>> querySssku(int pageNum,
String keyword) { String keyword) {
return run(Api.getInstance().service.querySssku(pageNum, C.PRODUCT.PAGE_SIZE, keyword)); return run(Api.getInstance().service.querySssku(pageNum, C.PRODUCT.PAGE_SIZE, keyword));
......
...@@ -417,6 +417,9 @@ interface ApiService { ...@@ -417,6 +417,9 @@ interface ApiService {
@POST(C.URL.SSSKU.detail) @POST(C.URL.SSSKU.detail)
Observable<HttpMessage<Sssku>> detailSssku(@Query("id") Long id); Observable<HttpMessage<Sssku>> detailSssku(@Query("id") Long id);
@POST(C.URL.SSSKU.query)
Observable<HttpMessage<Pager<Sssku>>> querySssku(@Query("wd") String barcode);
@POST(C.URL.SSSKU.update) @POST(C.URL.SSSKU.update)
Observable<HttpMessage<Sssku>> updateSssku(@Body Sssku sssku); Observable<HttpMessage<Sssku>> updateSssku(@Body Sssku sssku);
......
...@@ -3,6 +3,7 @@ package com.xingdata.zzdpos.ui.manage.inventory; ...@@ -3,6 +3,7 @@ package com.xingdata.zzdpos.ui.manage.inventory;
import com.blankj.utilcode.util.TimeUtils; import com.blankj.utilcode.util.TimeUtils;
import com.blankj.utilcode.util.ToastUtils; import com.blankj.utilcode.util.ToastUtils;
import com.xingdata.zzdpos.C;
import com.xingdata.zzdpos.api.ApiFactory; import com.xingdata.zzdpos.api.ApiFactory;
import com.xingdata.zzdpos.db.DB; import com.xingdata.zzdpos.db.DB;
...@@ -11,6 +12,7 @@ import com.xingdata.zzdpos.model.Cs; ...@@ -11,6 +12,7 @@ import com.xingdata.zzdpos.model.Cs;
import com.xingdata.zzdpos.model.CsDetail; import com.xingdata.zzdpos.model.CsDetail;
import com.xingdata.zzdpos.model.Sssku; import com.xingdata.zzdpos.model.Sssku;
import com.xingdata.zzdpos.ui.main.MainPresenter; import com.xingdata.zzdpos.ui.main.MainPresenter;
import com.xingdata.zzdpos.util.ConvertUtil;
import com.xingdata.zzdpos.util.StringUtil; import com.xingdata.zzdpos.util.StringUtil;
...@@ -71,20 +73,9 @@ public class InventoryPresenter extends InventoryContract.Presenter { ...@@ -71,20 +73,9 @@ public class InventoryPresenter extends InventoryContract.Presenter {
* @param barcode 条形码 * @param barcode 条形码
*/ */
public void getProductByBarcode(String barcode) { public void getProductByBarcode(String barcode) {
mView.isShowLoading(true);
mCompositeDisposable.add(
queryProductsByScan(barcode).subscribe(ssskus -> { queryProductsByScan(barcode);
mView.isShowLoading(false);
mView.searchGoodsSuc();
if (ssskus.size() > 1) {
mView.addInventoryGoodsItem(ssskus);
} else if (ssskus.size() == 1) {
mView.addInventoryGoodsItem(ssskus.get(0));
} else {
ToastUtils.showShort("没有此商品");
}
})
);
} }
/** /**
...@@ -93,11 +84,22 @@ public class InventoryPresenter extends InventoryContract.Presenter { ...@@ -93,11 +84,22 @@ public class InventoryPresenter extends InventoryContract.Presenter {
* @param barcode 扫描出的条形码 * @param barcode 扫描出的条形码
* @return 商品信息 * @return 商品信息
*/ */
public static Observable<List<Sssku>> queryProductsByScan(String barcode) { public void queryProductsByScan(String barcode) {
RealmQuery<Sssku> query = DB.getInstance().get(MainPresenter.class).where(Sssku.class); mView.isShowLoading(true);
query.equalTo("spuBarcode", StringUtil.strToLong(barcode)).equalTo("skuStatus", 0); ApiFactory.Sssku.querySssku(barcode).doFinally(() -> mView.isShowLoading(false))
return Observable.just(query.findAll()) .subscribe(
.flatMap(ssskus -> Observable.just(getList(ssskus))); ssskuPager -> {
mView.searchGoodsSuc();
if (ssskuPager.getList().size() > 1) {
mView.addInventoryGoodsItem(ssskuPager.getList());
} else if (ssskuPager.getList().size() == 1) {
mView.addInventoryGoodsItem(ssskuPager.getList().get(0));
} else {
ToastUtils.showShort("没有此商品");
}
}, throwable -> {
ToastUtils.showShort("删除" + throwable.getMessage());
});
} }
@Override @Override
...@@ -130,7 +132,7 @@ public class InventoryPresenter extends InventoryContract.Presenter { ...@@ -130,7 +132,7 @@ public class InventoryPresenter extends InventoryContract.Presenter {
@Override @Override
public void changeTitle(String s, boolean b) { public void changeTitle(String s, boolean b) {
mView.changeTitle(s,b); mView.changeTitle(s, b);
} }
@Override @Override
...@@ -140,7 +142,7 @@ public class InventoryPresenter extends InventoryContract.Presenter { ...@@ -140,7 +142,7 @@ public class InventoryPresenter extends InventoryContract.Presenter {
.subscribe(object -> { .subscribe(object -> {
mView.disInventoryDetailFragment(false); mView.disInventoryDetailFragment(false);
}, throwable -> { }, throwable -> {
ToastUtils.showShort("删除"+throwable.getMessage()); ToastUtils.showShort("删除" + throwable.getMessage());
}); });
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment