Skip to content

S
supplier
Commit db7e0f69 by jason
Options

入库倍率

parent 47347ba3
Showing with 9 additions and 2 deletions
component-supply-chain/src/main/java/com/gingersoft/supply_chain/mvp/presenter/OrderDetailsPresenter.java
...@@ -8,6 +8,7 @@ import com.gingersoft.gsa.cloud.common.utils.CollectionUtils; ...@@ -8,6 +8,7 @@ import com.gingersoft.gsa.cloud.common.utils.CollectionUtils;
import com.gingersoft.gsa.cloud.common.utils.JsonUtils; import com.gingersoft.gsa.cloud.common.utils.JsonUtils;
import com.gingersoft.gsa.cloud.common.utils.MoneyUtil; import com.gingersoft.gsa.cloud.common.utils.MoneyUtil;
import com.gingersoft.gsa.cloud.common.utils.gson.GsonUtils; import com.gingersoft.gsa.cloud.common.utils.gson.GsonUtils;
import com.gingersoft.gsa.cloud.common.utils.log.LogUtil;
import com.gingersoft.gsa.cloud.common.utils.other.TextUtil; import com.gingersoft.gsa.cloud.common.utils.other.TextUtil;
import com.gingersoft.gsa.cloud.common.utils.view.BitmapUtil; import com.gingersoft.gsa.cloud.common.utils.view.BitmapUtil;
import com.gingersoft.supply_chain.R; import com.gingersoft.supply_chain.R;
...@@ -169,6 +170,8 @@ public class OrderDetailsPresenter extends BasePresenter<OrderDetailsContract.Mo ...@@ -169,6 +170,8 @@ public class OrderDetailsPresenter extends BasePresenter<OrderDetailsContract.Mo
} }
//添加主單位到副單位列表，用戶可手動切換 //添加主單位到副單位列表，用戶可手動切換
DeputyUnitBean deputyUnitBean = new DeputyUnitBean(purchaseOrderDetailsInfoVO.getBasicUnitName(), purchaseOrderDetailsInfoVO.getFoodQuantity()); DeputyUnitBean deputyUnitBean = new DeputyUnitBean(purchaseOrderDetailsInfoVO.getBasicUnitName(), purchaseOrderDetailsInfoVO.getFoodQuantity());
//add by zjs 主单位的倍率是1.0
deputyUnitBean.setConversionMultiple(1.0);
deputyUnitBeans.add(0, deputyUnitBean); deputyUnitBeans.add(0, deputyUnitBean);
//设置显示的单位，如果大於1，則顯示第一個，因為第一個是副單位，默認顯示副單位 //设置显示的单位，如果大於1，則顯示第一個，因為第一個是副單位，默認顯示副單位
if (deputyUnitBeans.size() > 1) { if (deputyUnitBeans.size() > 1) {
...@@ -252,7 +255,10 @@ public class OrderDetailsPresenter extends BasePresenter<OrderDetailsContract.Mo ...@@ -252,7 +255,10 @@ public class OrderDetailsPresenter extends BasePresenter<OrderDetailsContract.Mo
public void addWarehouse(int state, String remark, double totalAmount, List<PurchaseOrderDetailsBean.PurchaseOrderDetailsInfoVosBean> purchaseOrderDetailsInfoVosBeans) { public void addWarehouse(int state, String remark, double totalAmount, List<PurchaseOrderDetailsBean.PurchaseOrderDetailsInfoVosBean> purchaseOrderDetailsInfoVosBeans) {
OrderWareHouseBean wareHouseBean = new OrderWareHouseBean(); OrderWareHouseBean wareHouseBean = new OrderWareHouseBean();
List<OrderWareHouseBean.PurchaseWarehousingOrderDetail> purchaseWarehousingOrderDetails = transformWareHoses(wareHouseBean, purchaseOrderDetailsInfoVosBeans); List<OrderWareHouseBean.PurchaseWarehousingOrderDetail> purchaseWarehousingOrderDetails = transformWareHoses(wareHouseBean, purchaseOrderDetailsInfoVosBeans);
LogUtil.e("zjs"," addWarehouse 入库原始数据"+GsonUtils.GsonString(purchaseOrderDetailsInfoVosBeans));
LogUtil.e("zjs"," addWarehouse 入库原始数据 transformWareHoses 之后"+GsonUtils.GsonString(purchaseWarehousingOrderDetails));
wareHouseBean = getWareHouseBean(state, remark, totalAmount, wareHouseBean, purchaseWarehousingOrderDetails); wareHouseBean = getWareHouseBean(state, remark, totalAmount, wareHouseBean, purchaseWarehousingOrderDetails);
LogUtil.e("zjs"," addWarehouse 入库原始数据 getWareHouseBean 之后"+GsonUtils.GsonString(wareHouseBean));
if (wareHouseBean == null) { if (wareHouseBean == null) {
mRootView.killMyself(); mRootView.killMyself();
return; return;
......
component-supply-chain/src/main/java/com/gingersoft/supply_chain/mvp/ui/fragment/order/OrderDetailsFragment.java
...@@ -32,7 +32,6 @@ import com.chad.library.adapter.base.BaseQuickAdapter; ...@@ -32,7 +32,6 @@ import com.chad.library.adapter.base.BaseQuickAdapter;
import com.gingersoft.gsa.cloud.common.utils.CollectionUtils; import com.gingersoft.gsa.cloud.common.utils.CollectionUtils;
import com.gingersoft.gsa.cloud.common.utils.FileUtils; import com.gingersoft.gsa.cloud.common.utils.FileUtils;
import com.gingersoft.gsa.cloud.common.utils.MoneyUtil; import com.gingersoft.gsa.cloud.common.utils.MoneyUtil;
import com.gingersoft.gsa.cloud.common.utils.glide.GlideUtils;
import com.gingersoft.gsa.cloud.common.utils.inputFilter.InputFilterUtils; import com.gingersoft.gsa.cloud.common.utils.inputFilter.InputFilterUtils;
import com.gingersoft.gsa.cloud.common.utils.other.TextUtil; import com.gingersoft.gsa.cloud.common.utils.other.TextUtil;
import com.gingersoft.gsa.cloud.common.utils.time.TimeUtils; import com.gingersoft.gsa.cloud.common.utils.time.TimeUtils;
...@@ -71,7 +70,6 @@ import com.yalantis.ucrop.UCrop; ...@@ -71,7 +70,6 @@ import com.yalantis.ucrop.UCrop;
import java.io.File; import java.io.File;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections;
import java.util.Iterator; import java.util.Iterator;
import java.util.List; import java.util.List;
...@@ -511,7 +509,10 @@ public class OrderDetailsFragment extends BaseSupplyChainFragment<OrderDetailsPr ...@@ -511,7 +509,10 @@ public class OrderDetailsFragment extends BaseSupplyChainFragment<OrderDetailsPr
DeputyUnitBean deputyUnitBean = foodUnits.get(position1); DeputyUnitBean deputyUnitBean = foodUnits.get(position1);
deputyUnitBean.setDeputyValue(showUnit.getDeputyValue()); deputyUnitBean.setDeputyValue(showUnit.getDeputyValue());
deputyUnitBean.setUnitPrice(showUnit.getUnitPrice()); deputyUnitBean.setUnitPrice(showUnit.getUnitPrice());
// deputyUnitBean.setConversionMultiple(showUnit.getConversionMultiple());
purchaseOrderDetailsInfoVosBean.setShowUnit(deputyUnitBean); purchaseOrderDetailsInfoVosBean.setShowUnit(deputyUnitBean);
// WareHousingUnitBean wareHousingUnitBean= purchaseOrderDetailsInfoVosBean.getPurchaseWarehousingUnit();
// wareHousingUnitBean.setConversionMultiple(showUnit.getConversionMultiple());
orderDetailsFoodAdapter.notifyItemChanged(position1); orderDetailsFoodAdapter.notifyItemChanged(position1);
} }
}); });
......
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