Merge remote-tracking branch 'origin/master'

app/src/main/java/com/xingdata/zzdpos/ui/manage/inventory/fragment/InventoryAddFragment.java

@@ -63,6 +63,9 @@ public class InventoryAddFragment extends BaseFragment<InventoryPresenter, Fragm
 
 
         mViewBinding.edTitle.setHint(R.string.inventory_add_et_hint);
+        if (mViewBinding.edTitle.getText().toString().length() != 0) {
+            mViewBinding.edTitle.setText("");
+        }
         mViewBinding.edTitle.setOnEditorActionListener(new TextView.OnEditorActionListener() {
             @Override
             public boolean onEditorAction(TextView textView, int i, KeyEvent keyEvent) {
@@ -211,7 +214,7 @@ public class InventoryAddFragment extends BaseFragment<InventoryPresenter, Fragm
     @Override
     public boolean onBackPressedSupport() {
 
-         popThis();
+        popThis();
         return true;
     }
 
@@ -226,7 +229,7 @@ public class InventoryAddFragment extends BaseFragment<InventoryPresenter, Fragm
 
             }, view1 -> {
                 promptDialog.dismiss();
-                mPresenter.changeTitle("盘库记录",false);
+                mPresenter.changeTitle("盘库记录", false);
                 pop();
 
 

app/src/main/java/com/xingdata/zzdpos/ui/manage/otherselect/adpter/OtherSelectAdapter.java

@@ -32,13 +32,12 @@ public class OtherSelectAdapter extends BaseAdapter<Ossku, ItemOtherSelectBindin
         mViewBinding.imgGoods.setImageURI(item.getSpuImg());
 //        mViewBinding.tvNum.setText(item.getSkuStock() + "个");
         mViewBinding.setShopName(item.getShopName());
-        mViewBinding.setStock("库存:" +item.getSkuStock()+item.getSpuUnitName());
-        mViewBinding.setAddress(item.getCityProvName()+item.getCityName()+item.getCityCountyName()+item.getCityAddress());
-        mViewBinding.setPhone(item.getContactTel());
+        mViewBinding.setStock("库存:" + item.getSkuStock() + item.getSpuUnitName());
+        mViewBinding.setAddress(item.getCityProvName() + item.getCityName() + item.getCityCountyName() + item.getCityAddress());
+        mViewBinding.setPhone(item.getContactMob() + "");
 //        mViewBinding.tvAddress.setText(item.getCityAddress());
 //        mViewBinding.tvTel.setText(item.getContactTel());
     }
 
 
-
 }

app/src/main/java/com/xingdata/zzdpos/ui/statistics/adapter/StatisticsTicketGroupAdapter.java

@@ -35,7 +35,7 @@ public class StatisticsTicketGroupAdapter extends BaseSectionQuickAdapter<Ticket
     protected void convert(BaseViewHolder helper, Ticket item) {
         helper.setText(R.id.tv_left_top, ConvertUtil.fenToYuanNoZero(item.getTicketValAmt()) + "元优惠券");
         helper.setText(R.id.tv_left_bottom, TimeUtils.date2String(item.getCreateTime(),new SimpleDateFormat(StringUtil.mmddhhmmmDatePattern)));
-        ((ImageView) helper.getView(R.id.img_left)).setImageResource(R.mipmap.icon_record);
+        ((ImageView) helper.getView(R.id.img_left)).setImageResource(R.mipmap.icon_voucher02);
 
 
     }

app/src/main/res/layout/dialog_inventory_cart.xml

@@ -19,6 +19,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:gravity="center"
+        android:paddingTop="@dimen/all_padding"
         android:orientation="vertical">
 
         <View
@@ -117,7 +118,7 @@
                 android:layout_marginTop="@dimen/all_spacing"
                 android:contentDescription="@string/store_cart"
                 android:foreground="?attr/actionBarItemBackground"
-                android:src="@mipmap/shopping_cart" />
+                android:src="@mipmap/inventory_cart" />
 
             <TextView
                 android:layout_width="@dimen/store_cart_count"

app/src/main/res/layout/item_other_select.xml

@@ -81,6 +81,7 @@
             android:background="@drawable/frame_frame_zhouyu_bg"
             android:padding="@dimen/dp_4"
             android:text="规格"
+            android:textColor="@color/black_baozheng"
             android:textSize="@dimen/all_text_size_small"
             app:layout_constraintStart_toStartOf="@id/tv_goods_code_hint"
             app:layout_constraintTop_toBottomOf="@id/tv_goods_code_hint" />

app/src/main/res/values/strings.xml

@@ -272,16 +272,16 @@
     <string name="other_selcet_shop">共%s个门店库存</string>
 
     <!--补货界面-->
-    <string name="replenishment_meun">补货订货</string>
+    <string name="replenishment_meun">补货定货</string>
     <string name="replenishment_add">一键补货</string>
     <string name="replenishment_order">共%s个订单</string>
     <string name="replenishment_search_hint">搜索供货商订单</string>
-    <string name="replenishment_empty_hint">还没有订货单哦~</string>
+    <string name="replenishment_empty_hint">还没有定货单哦~</string>
     <string name="replenishment_detail_cancel">关闭</string>
     <string name="replenishment_detail_submit">定货提交</string>
     <string name="replenishment_detail_print">打印</string>
     <string name="replenishment_detail_title">定货明细</string>
-    <string name="replenishment_detail_full">货物满满\n不需要订货哦~</string>
+    <string name="replenishment_detail_full">货物满满\n不需要定货哦~</string>
     <!--盘点界面-->
     <string name="inventory_meun">库存盘点</string>
     <string name="inventory_add">开始盘库</string>
@@ -421,7 +421,7 @@
     <string name="sssku_cost_hint">是否按此包装进货:</string>
     <string name="sssku_stock_low_limit">库存下限:</string>
     <string name="sssku_stock_upper_limit">库存上限:</string>
-    <string name="sssku_min_oder">最小订货:</string>
+    <string name="sssku_min_oder">最小定货:</string>
     <string name="sssku_pack_name">品名:</string>
     <string name="sssku_pack_price">售价:</string>
     <string name="sssku_pack_default_unit">件</string>
@@ -513,7 +513,7 @@
     <string name="menu_manager_oper">店员管理</string>
     <string name="menu_manager_goods">商品维护</string>
     <string name="menu_manager_bale">商品组合</string>
-    <string name="menu_manager_replenishment">补货订货</string>
+    <string name="menu_manager_replenishment">补货定货</string>
     <string name="menu_manager_other">邻库查询</string>
     <string name="menu_manager_inventory">库存盘点</string>
 
@@ -726,7 +726,7 @@
     <string name="sku_cost">进价:</string>
     <string name="sku_stock_low_limit">库存下限:</string>
     <string name="sku_stock_upper_limit">库存上限:</string>
-    <string name="sku_min_oder">最小订货:</string>
+    <string name="sku_min_oder">最小定货:</string>
 
     <string name="sku_update">编辑商品</string>
     <string name="sku_update_price">调整价格</string>