盘点

9abc1890 · 张建升 · f17ebe78 · 9abc1890 · 9abc1890 · 9abc1890
Commit 9abc1890 authored Jun 24, 2021 by 张建升
10 changed files
--- a/component-supply-chain/src/main/java/com/gingersoft/supply_chain/mvp/bean/PurchaseConsumeSnBean.java
+++ b/component-supply-chain/src/main/java/com/gingersoft/supply_chain/mvp/bean/PurchaseConsumeSnBean.java
@@ -11,7 +11,7 @@ import java.util.List;
 */
 public class PurchaseConsumeSnBean {
-    public String purchaseFoodId;
+    public int purchaseFoodId;
    public int brandId;
    public int restaurantId;
    //食材編號

--- a/component-supply-chain/src/main/java/com/gingersoft/supply_chain/mvp/presenter/WarehouseDetailsPresenter.java
+++ b/component-supply-chain/src/main/java/com/gingersoft/supply_chain/mvp/presenter/WarehouseDetailsPresenter.java
@@ -178,8 +178,8 @@ public class WarehouseDetailsPresenter extends BasePresenter<WarehouseDetailsCon
        purchaseConsumeSnBean.brandId = AppConstant.getBrandId();
        purchaseConsumeSnBean.restaurantId = AppConstant.getRestaurantId();
        purchaseConsumeSnBean.foodNo = purchaseWarehousingOrderDetailsVO.getFoodNo();
+        purchaseConsumeSnBean.purchaseFoodId = purchaseWarehousingOrderDetailsVO.getId();
        purchaseConsumeSnBean.purchaseConsumeReasonId = consumeReasonBean.getId();
-        purchaseConsumeSnBean.purchaseFoodId = String.valueOf(purchaseWarehousingOrderDetailsVO.getId());
        purchaseConsumeSnBean.remarks = remarks;
        if (CollectionUtils.isNotNullOrEmpty(snCodes)) {
            purchaseConsumeSnBean.encodeFoodNos = snCodes;
@@ -248,7 +248,7 @@ public class WarehouseDetailsPresenter extends BasePresenter<WarehouseDetailsCon
                    public void onNext(BaseResult baseResult) {
                        if (baseResult != null && baseResult.isSuccess()) {
                            try {
-                                LogUtil.i(" zjs 重新获取的库存数量=="+GsonUtils.GsonString(baseResult.getData()));
                                mRootView.setWarehousingNum((int) Double.parseDouble(GsonUtils.GsonString(baseResult.getData())));
                            } catch (NumberFormatException e) {
                                mRootView.killMyself();

--- a/component-supply-chain/src/main/java/com/gingersoft/supply_chain/mvp/presenter/WarehousingInventoryPresenter.java
+++ b/component-supply-chain/src/main/java/com/gingersoft/supply_chain/mvp/presenter/WarehousingInventoryPresenter.java
@@ -88,7 +88,7 @@ public class WarehousingInventoryPresenter extends BasePresenter<WarehousingInve
        purchaseConsumeSnBean.restaurantId = AppConstant.getRestaurantId();
        purchaseConsumeSnBean.foodNo = foodNo;
        purchaseConsumeSnBean.consumeQuantity = consumeQuantity;
-        purchaseConsumeSnBean.purchaseFoodId = String.valueOf(purchaseFoodId);
+        purchaseConsumeSnBean.purchaseFoodId = purchaseFoodId;
        purchaseConsumeSnBean.purchaseConsumeReasonId = PurchaseConstant.INVENTORY_CONSUME_ID;
        if (CollectionUtils.isNotNullOrEmpty(snCodes)) {
            purchaseConsumeSnBean.encodeFoodNos = new ArrayList<>();
@@ -131,8 +131,10 @@ public class WarehousingInventoryPresenter extends BasePresenter<WarehousingInve
     * 查詢庫存盤點記錄
     */
    public void getWarehousingRecord(String foodNo, int pageIndex) {
-        Map<String, Object> map = new HashMap<>(3);
+        Map<String, Object> map = new HashMap<>(5);
        map.put("foodNo", foodNo);
+        map.put("brandId", AppConstant.getBrandId());
+        map.put("restaurantId", AppConstant.getRestaurantId());
        AppConstant.addPageSize(map);
        map.put("pageIndex", pageIndex * AppConstant.PAGE_SIZE);
        mModel.getWarehousingRecord(map)

--- a/component-supply-chain/src/main/java/com/gingersoft/supply_chain/mvp/ui/fragment/warehouse/WareHouseListFragment.java
+++ b/component-supply-chain/src/main/java/com/gingersoft/supply_chain/mvp/ui/fragment/warehouse/WareHouseListFragment.java
@@ -125,11 +125,11 @@ public class WareHouseListFragment extends BaseSupplyChainFragment<WareHouseList
    }
    //R2.id.tv_warehouse_item_unit_price, R2.id.tv_warehouse_item_inventory_quantity, R2.id.tv_warehouse_item_total_amount
-    @OnClick({R2.id.iv_warehouse_list_search})
+    @OnClick({R2.id.iv_warehouse_list_search, R.id.bt_warehouse_list_search})
    @Override
    public void onClick(View view) {
        int id = view.getId();
-        if (id == R.id.iv_warehouse_list_search) {
+        if (id == R.id.iv_warehouse_list_search || id == R.id.bt_warehouse_list_search) {
            pageIndex = 0;
            getWarehousing();
        } else if (id == R.id.layout_unit_price) {

--- a/component-supply-chain/src/main/java/com/gingersoft/supply_chain/mvp/ui/fragment/warehouse/WarehouseDetailsFragment.java
+++ b/component-supply-chain/src/main/java/com/gingersoft/supply_chain/mvp/ui/fragment/warehouse/WarehouseDetailsFragment.java
@@ -46,6 +46,7 @@ import com.gingersoft.supply_chain.mvp.ui.fragment.BaseSupplyChainFragment;
 import com.gingersoft.supply_chain.mvp.ui.widget.InventoryConsumptionView;
 import com.gingersoft.supply_chain.mvp.ui.widget.ScanSnView;
 import com.jess.arms.di.component.AppComponent;
+import com.jess.arms.utils.DeviceUtils;
 import com.qmuiteam.qmui.widget.QMUITopBar;
 import com.scwang.smartrefresh.layout.SmartRefreshLayout;
@@ -400,7 +401,10 @@ public class WarehouseDetailsFragment extends BaseSupplyChainFragment<WarehouseD
            showMessage(getString(R.string.str_device_not_print));
        }
    }
+    private int dip2px(float dp) {
+        float scale = requireContext().getResources().getDisplayMetrics().density;
+        return (int) (dp * scale + 0.5f);
+    }
    private Bitmap generatePrintBitmap(List<String> snCodes, String consumptionReason, String remarks, int foodNum) {
        View view = LayoutInflater.from(requireContext()).inflate(R.layout.layout_print_consume, null);
        TextView restaurantName = view.findViewById(R.id.tv_print_consume_restaurant_name);
@@ -410,7 +414,7 @@ public class WarehouseDetailsFragment extends BaseSupplyChainFragment<WarehouseD
        TextView tvUserName = view.findViewById(R.id.tv_print_consume_user_name);
        TextView tvSnCodes = view.findViewById(R.id.tv_print_sn);
        LinearLayout layoutSn = view.findViewById(R.id.layout_sn_list);
+        view.setPadding(dip2px(12),0,dip2px(12),0);
        restaurantName.setText(String.format(getString(R.string.str_restaurant_outbound_order), RestaurantInfoManager.newInstance().getRestaurantName()));
        tvDate.setText(TimeUtils.getCurrentDate(TimeUtils.DEFAULT_DATE_FORMAT_YMDHM));
        tvFoodNo.setText(String.format(getString(R.string.str_goods_no), purchaseWarehousingOrderDetailsVO.getFoodNo()));

--- a/component-supply-chain/src/main/res/layout/fragment_food_ingredients.xml
+++ b/component-supply-chain/src/main/res/layout/fragment_food_ingredients.xml
@@ -24,7 +24,7 @@
            android:layout_margin="@dimen/dp_10"
            android:background="@drawable/shape_white_eight_corners_bg"
            android:orientation="horizontal"
-            android:visibility="gone">
+            android:visibility="visible">
            <ImageView
                android:layout_width="@dimen/dp_20"

--- a/component-supply-chain/src/main/res/layout/fragment_inout_bound_records_list.xml
+++ b/component-supply-chain/src/main/res/layout/fragment_inout_bound_records_list.xml
@@ -56,7 +56,7 @@
                    android:id="@+id/btn_inout_bound_record_search"
                    android:layout_width="wrap_content"
                    android:layout_height="match_parent"
-                    android:background="@null"
+                    android:background="@drawable/shape_app_btn"
                    android:text="搜索"
                    android:textColor="@color/theme_333_color"
                    android:textSize="@dimen/dp_14" />

--- a/component-supply-chain/src/main/res/layout/fragment_purchase_list.xml
+++ b/component-supply-chain/src/main/res/layout/fragment_purchase_list.xml
@@ -19,7 +19,7 @@
        android:layout_height="@dimen/dp_48"
        android:layout_margin="@dimen/dp_10"
        android:orientation="horizontal"
-        android:visibility="gone">
+        android:visibility="visible">
        <LinearLayout
            android:layout_width="0dp"

--- a/component-supply-chain/src/main/res/layout/fragment_ware_house_list.xml
+++ b/component-supply-chain/src/main/res/layout/fragment_ware_house_list.xml
@@ -41,6 +41,17 @@
            android:inputType="text"
            android:maxLength="20"
            android:maxLines="1" />
+        <com.qmuiteam.qmui.alpha.QMUIAlphaButton
+            android:id="@+id/bt_warehouse_list_search"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:layout_marginTop="@dimen/dp_1"
+            android:layout_marginBottom="@dimen/dp_1"
+            android:background="@drawable/shape_app_btn"
+            android:text="搜索"
+            android:textColor="@color/white"
+            android:textSize="@dimen/dp_14" />
    </LinearLayout>
    <LinearLayout

--- a/component-supply-chain/src/main/res/values/styles.xml
+++ b/component-supply-chain/src/main/res/values/styles.xml
@@ -88,7 +88,6 @@
        <item name="android:textSize">@dimen/dp_14</item>
        <item name="android:textColor">@color/white</item>
        <item name="android:ellipsize">end</item>
-        <item name="android:maxLines">1</item>
        <item name="android:gravity">center</item>
    </style>
 </resources>
\ No newline at end of file