庫存盤點 出庫流水bug

component-supply-chain/src/main/java/com/gingersoft/supply_chain/mvp/presenter/WarehousingInventoryPresenter.java

@@ -74,20 +74,21 @@ public class WarehousingInventoryPresenter extends BasePresenter<WarehousingInve
     }
 
 
-    public void consumeWareHousing(String foodNo, int consumeQuantity) {
-        consumeWareHousing(getPurchaseConsumeSnBean(foodNo, consumeQuantity, null));
+    public void consumeWareHousing(String foodNo, int purchaseFoodId,int consumeQuantity) {
+        consumeWareHousing(getPurchaseConsumeSnBean(foodNo, consumeQuantity, purchaseFoodId,null));
     }
 
-    public void consumeWareHousing(String foodNo, int consumeQuantity, List<PurchaseFoodEncodeSn> snCodes) {
-        consumeWareHousing(getPurchaseConsumeSnBean(foodNo, consumeQuantity, snCodes));
+    public void consumeWareHousing(String foodNo, int consumeQuantity,int purchaseFoodId, List<PurchaseFoodEncodeSn> snCodes) {
+        consumeWareHousing(getPurchaseConsumeSnBean(foodNo, consumeQuantity,purchaseFoodId, snCodes));
     }
 
-    public PurchaseConsumeSnBean getPurchaseConsumeSnBean(String foodNo, int consumeQuantity, List<PurchaseFoodEncodeSn> snCodes) {
+    public PurchaseConsumeSnBean getPurchaseConsumeSnBean(String foodNo, int consumeQuantity,int purchaseFoodId, List<PurchaseFoodEncodeSn> snCodes) {
         PurchaseConsumeSnBean purchaseConsumeSnBean = new PurchaseConsumeSnBean();
         purchaseConsumeSnBean.brandId = AppConstant.getBrandId();
         purchaseConsumeSnBean.restaurantId = AppConstant.getRestaurantId();
         purchaseConsumeSnBean.foodNo = foodNo;
         purchaseConsumeSnBean.consumeQuantity = consumeQuantity;
+        purchaseConsumeSnBean.purchaseFoodId = String.valueOf(purchaseFoodId);
         purchaseConsumeSnBean.purchaseConsumeReasonId = PurchaseConstant.INVENTORY_CONSUME_ID;
         if (CollectionUtils.isNotNullOrEmpty(snCodes)) {
             purchaseConsumeSnBean.encodeFoodNos = new ArrayList<>();

component-supply-chain/src/main/java/com/gingersoft/supply_chain/mvp/ui/fragment/warehouse/SnCodeListFragment.java

@@ -90,9 +90,9 @@ public class SnCodeListFragment extends BaseSupplyChainFragment<SnCodeListPresen
                 //查出庫
                 mPresenter.querySnCodeList(infoType, warehouseDetailsBean.getPurchaseConsumeNoId());
                 if (warehouseDetailsBean.getFoodQuantity() < 0) {
-                    tvHousingNum.setText(String.format(getString(R.string.str_format_positive), Math.abs(warehouseDetailsBean.getFoodQuantity()) + ""));
+                    tvHousingNum.setText(String.format(getString(R.string.str_format_positive), Math.abs(warehouseDetailsBean.getConsumeQuantity()) + ""));
                 } else {
-                    tvHousingNum.setText(String.format(getString(R.string.str_format_less), warehouseDetailsBean.getFoodQuantity() + ""));
+                    tvHousingNum.setText(String.format(getString(R.string.str_format_less), warehouseDetailsBean.getConsumeQuantity() + ""));
                 }
             } else {
                 //查剩餘

component-supply-chain/src/main/java/com/gingersoft/supply_chain/mvp/ui/fragment/warehouse/WarehousingInventoryFragment.java

@@ -263,7 +263,7 @@ public class WarehousingInventoryFragment extends BaseSupplyChainFragment<Wareho
                     edWarehouseLoss.requestFocus();
                 } else {
                     int remainingAmount = purchaseWarehousingOrderDetailsVo.getFoodNum() - inventoryNum;
-                    mPresenter.consumeWareHousing(purchaseWarehousingOrderDetailsVo.getFoodNo(), remainingAmount);
+                    mPresenter.consumeWareHousing(purchaseWarehousingOrderDetailsVo.getFoodNo(),purchaseWarehousingOrderDetailsVo.getId(), remainingAmount);
                 }
             }
         } else if (v.getId() == R.id.id_inventory) {
@@ -277,7 +277,7 @@ public class WarehousingInventoryFragment extends BaseSupplyChainFragment<Wareho
                         showMessage("請掃碼盤點Sn碼");
                         return;
                     }
-                    mPresenter.consumeWareHousing(purchaseWarehousingOrderDetailsVo.getFoodNo(), purchaseWarehousingOrderDetailsVo.getFoodNum() - scanResult.size(), scanResult);
+                    mPresenter.consumeWareHousing(purchaseWarehousingOrderDetailsVo.getFoodNo(),purchaseWarehousingOrderDetailsVo.getId(), purchaseWarehousingOrderDetailsVo.getFoodNum() - scanResult.size(), scanResult);
                 }).setOnSingerResultListener((isAdd, snCode, currentSnCodeNumber) -> {
                     //單個掃碼回調
                     edWarehouseLoss.setText(String.valueOf(currentSnCodeNumber));