仓位改为储位

app/src/main/java/com/uas/uaspda/bean/MaterialInformationBean.java

@@ -7,7 +7,7 @@ public class MaterialInformationBean {
 
     /**
      * success : true
-     * data : {"PD_PRODCODE":"1001","PR_DETAIL":"物料名称","PR_SPEC":"物料规格","PD_OUTQTY":"需备料总数","PD_RESTQTY":"未备料数","PR_ZXBZS":123,"BAR_LOCATION":"仓位","PD_BATCHCODE":"批次号"}
+     * data : {"PD_PRODCODE":"1001","PR_DETAIL":"物料名称","PR_SPEC":"物料规格","PD_OUTQTY":"需备料总数","PD_RESTQTY":"未备料数","PR_ZXBZS":123,"BAR_LOCATION":"储位","PD_BATCHCODE":"批次号"}
      */
 
     private boolean success;
@@ -37,7 +37,7 @@ public class MaterialInformationBean {
          * PD_OUTQTY : 需备料总数
          * PD_RESTQTY : 未备料数
          * PR_ZXBZS : 123
-         * BAR_LOCATION : 仓位
+         * BAR_LOCATION : 储位
          * PD_BATCHCODE : 批次号
          * BA_REMAIN : 23
          */

app/src/main/java/com/uas/uaspda/bean/StockAlreadyItemBean.java

@@ -17,7 +17,7 @@ public class StockAlreadyItemBean {
      * BI_WHCODE : M00074
      * PR_ID : 44
      * PR_SPEC : null
-     * BI_LOCATION : 仓位
+     * BI_LOCATION : 储位
      * BI_BATCHCODE : null
      */
 

app/src/main/java/com/uas/uaspda/bean/StockTaskItemBean.java

@@ -12,7 +12,7 @@ public class StockTaskItemBean {
      * PD_OUTQTY : 需备料总数
      * PD_RESTQTY : 未备料数
      * PR_ZXBZS : 123
-     * BAR_LOCATION : 仓位
+     * BAR_LOCATION : 储位
      * PD_BATCHCODE : 批次号
      * HASBARCODE : 1
      * BA_REMAIN : 32

app/src/main/java/com/uas/uaspda/bean/StockTaskMultipleBean.java

@@ -14,7 +14,7 @@ public class StockTaskMultipleBean {
      * PD_OUTQTY : 需备料总数
      * PD_RESTQTY : 未备料数
      * PR_ZXBZS : 123
-     * BAR_LOCATION : 仓位
+     * BAR_LOCATION : 储位
      * PD_BATCHCODE : 批次号
      * BA_HASBARCODE : 0
      * BAR_REMAIN : 批数量

app/src/main/java/com/uas/uaspda/fragment/BarcodeInCollectFragment.java

@@ -96,7 +96,7 @@ public class BarcodeInCollectFragment extends BaseFragment {
                     return;
                 }
                 if (TextUtils.isEmpty(location)) {
-                    CommonUtil.toastNoRepeat(mActivity, "请输入仓位");
+                    CommonUtil.toastNoRepeat(mActivity, "请输入储位");
                     return;
                 }
                 progressDialog.show();
@@ -143,7 +143,7 @@ public class BarcodeInCollectFragment extends BaseFragment {
 
                                                 if (TextUtils.isEmpty(pResult)) {
                                                     String resultMsg = "条码号：" +
-                                                            barcode + "绑定仓位：" + location + "成功";
+                                                            barcode + "绑定储位：" + location + "成功";
                                                     CommonUtil.toastNoRepeat(mActivity, resultMsg);
 
                                                     mResultLayout.setVisibility(View.VISIBLE);
@@ -156,7 +156,7 @@ public class BarcodeInCollectFragment extends BaseFragment {
                                                     mPrdetailTextView.setText(pr_detail);
                                                 } else {
                                                     String resultMsg = "条码号：" +
-                                                            barcode + "绑定仓位：" + location + "成功\n" + pResult;
+                                                            barcode + "绑定储位：" + location + "成功\n" + pResult;
                                                     CommonUtil.toastNoRepeat(mActivity, resultMsg);
 
                                                     mResultLayout.setVisibility(View.VISIBLE);

app/src/main/java/com/uas/uaspda/fragment/IOCOutMakeMaterialOper.java

@@ -295,7 +295,7 @@ public class IOCOutMakeMaterialOper extends BaseFragment implements View.OnClick
                                         + "；料号：" + JsonUtils.optStringNotNull(messageObject, "BAR_PRODCODE")
                                         + "；名称规格：" + messageObject.optString("PR_DETAIL")
                                         + "  " + JsonUtils.optStringNotNull(messageObject, "PR_SPEC")
-                                        + "；仓位：" + JsonUtils.optStringNotNull(messageObject, "BAR_LOCATION");
+                                        + "；储位：" + JsonUtils.optStringNotNull(messageObject, "BAR_LOCATION");
 
                                 if (listArray != null && listArray.length() > 0) {
                                     for (int i = 0; i < listArray.length(); i++) {
@@ -391,7 +391,7 @@ public class IOCOutMakeMaterialOper extends BaseFragment implements View.OnClick
                                                     + "  " + (materialInformationBean.getPR_SPEC() == null ? "" : materialInformationBean.getPR_SPEC())
                                                     + "; 未备料数：" + (materialInformationBean.getPD_RESTQTY() == null ? "" : materialInformationBean.getPD_RESTQTY())
                                                     + "; 批数量：" + (CommonUtil.doubleFormat(materialInformationBean.getBAR_REMAIN()))
-                                                    + "; 仓位：" + (materialInformationBean.getBAR_LOCATION() == null ? "" : materialInformationBean.getBAR_LOCATION());
+                                                    + "; 储位：" + (materialInformationBean.getBAR_LOCATION() == null ? "" : materialInformationBean.getBAR_LOCATION());
                                     if (materialInformationBean.getPD_BATCHCODE() != null) {
                                         materialInfo = materialInfo + "; 批号：" + materialInformationBean.getPD_BATCHCODE();
                                     }
@@ -686,7 +686,7 @@ public class IOCOutMakeMaterialOper extends BaseFragment implements View.OnClick
                                             + "  " + (materialInformationBean.getData().getPR_SPEC() == null ? "" : materialInformationBean.getData().getPR_SPEC())
                                             + "; 未备料数：" + (materialInformationBean.getData().getPD_RESTQTY() == null ? "" : materialInformationBean.getData().getPD_RESTQTY())
                                             + "; 批数量：" + (CommonUtil.doubleFormat(materialInformationBean.getData().getBAR_REMAIN()))
-                                            + "; 仓位：" + (materialInformationBean.getData().getBAR_LOCATION() == null ? "" : materialInformationBean.getData().getBAR_LOCATION());
+                                            + "; 储位：" + (materialInformationBean.getData().getBAR_LOCATION() == null ? "" : materialInformationBean.getData().getBAR_LOCATION());
                             if (materialInformationBean.getData().getPD_BATCHCODE() != null) {
                                 materialInfo = materialInfo + "; 批号：" + materialInformationBean.getData().getPD_BATCHCODE();
                             }
@@ -824,7 +824,7 @@ public class IOCOutMakeMaterialOper extends BaseFragment implements View.OnClick
                                     + "；料号：" + JsonUtils.optStringNotNull(messageObject, "BAR_PRODCODE")
                                     + "；名称规格：" + messageObject.optString("PR_DETAIL")
                                     + "  " + JsonUtils.optStringNotNull(messageObject, "PR_SPEC")
-                                    + "；仓位：" + JsonUtils.optStringNotNull(messageObject, "BAR_LOCATION");
+                                    + "；储位：" + JsonUtils.optStringNotNull(messageObject, "BAR_LOCATION");
 
                             if (listArray != null && listArray.length() > 0) {
                                 for (int i = 0; i < listArray.length(); i++) {
@@ -917,7 +917,7 @@ public class IOCOutMakeMaterialOper extends BaseFragment implements View.OnClick
                                                 + "  " + (materialInformationBean.getPR_SPEC() == null ? "" : materialInformationBean.getPR_SPEC())
                                                 + "; 未备料数：" + (materialInformationBean.getPD_RESTQTY() == null ? "" : materialInformationBean.getPD_RESTQTY())
                                                 + "; 批数量：" + (CommonUtil.doubleFormat(materialInformationBean.getBAR_REMAIN()))
-                                                + "; 仓位：" + (materialInformationBean.getBAR_LOCATION() == null ? "" : materialInformationBean.getBAR_LOCATION());
+                                                + "; 储位：" + (materialInformationBean.getBAR_LOCATION() == null ? "" : materialInformationBean.getBAR_LOCATION());
                                 if (materialInformationBean.getPD_BATCHCODE() != null) {
                                     materialInfo = materialInfo + "; 批号：" + materialInformationBean.getPD_BATCHCODE();
                                 }
@@ -1614,7 +1614,7 @@ public class IOCOutMakeMaterialOper extends BaseFragment implements View.OnClick
                                             + "；料号：" + JsonUtils.optStringNotNull(messageObject, "BAR_PRODCODE")
                                             + "；名称规格：" + messageObject.optString("PR_DETAIL")
                                             + "  " + JsonUtils.optStringNotNull(messageObject, "PR_SPEC")
-                                            + "；仓位：" + JsonUtils.optStringNotNull(messageObject, "BAR_LOCATION");
+                                            + "；储位：" + JsonUtils.optStringNotNull(messageObject, "BAR_LOCATION");
 
                                     if (listArray != null && listArray.length() > 0) {
                                         for (int i = 0; i < listArray.length(); i++) {
@@ -1707,7 +1707,7 @@ public class IOCOutMakeMaterialOper extends BaseFragment implements View.OnClick
                                                         + "  " + (materialInformationBean.getPR_SPEC() == null ? "" : materialInformationBean.getPR_SPEC())
                                                         + "; 未备料数：" + (materialInformationBean.getPD_RESTQTY() == null ? "" : materialInformationBean.getPD_RESTQTY())
                                                         + "; 批数量：" + (CommonUtil.doubleFormat(materialInformationBean.getBAR_REMAIN()))
-                                                        + "; 仓位：" + (materialInformationBean.getBAR_LOCATION() == null ? "" : materialInformationBean.getBAR_LOCATION());
+                                                        + "; 储位：" + (materialInformationBean.getBAR_LOCATION() == null ? "" : materialInformationBean.getBAR_LOCATION());
                                         if (materialInformationBean.getPD_BATCHCODE() != null) {
                                             materialInfo = materialInfo + "; 批号：" + materialInformationBean.getPD_BATCHCODE();
                                         }

app/src/main/java/com/uas/uaspda/fragment/MaterialOutRevocationStockFragment.java

@@ -338,7 +338,7 @@ public class MaterialOutRevocationStockFragment extends BaseFragment {
                                                     + "；名称规格：" + JsonUtils.optStringNotNull(messageObject, "PR_DETAIL")
                                                     + "  " + JsonUtils.optStringNotNull(messageObject, "PR_SPEC")
                                                     + "；批号：" + JsonUtils.optStringNotNull(messageObject, "BAR_BATCHCODE")
-                                                    + "；仓位：" + JsonUtils.optStringNotNull(messageObject, "BAR_LOCATION");
+                                                    + "；储位：" + JsonUtils.optStringNotNull(messageObject, "BAR_LOCATION");
                                             if (mResultTextView != null)
                                                 mResultTextView.setText(barcodeResult);
 

app/src/main/java/com/uas/uaspda/table/TableLBARCODEIO.java

@@ -32,7 +32,7 @@ public class TableLBARCODEIO {
     private double LBI_INQTY;//入库数
 
     @Column(column = "LBI_LOCATION")
-    private String LBI_LOCATION;//仓位
+    private String LBI_LOCATION;//储位
 
     @Column(column = "LBI_PRDETAIL")
     private String LBI_PRDETAIL;//物料名称

app/src/main/java/com/uas/uaspda/table/TableLCHECKBARCODEIO.java

@@ -33,7 +33,7 @@ public class TableLCHECKBARCODEIO {
     private double LCB_INQTY;//入库数
 
     @Column(column = "LCB_LOCATION")
-    private String LCB_LOCATION;//仓位
+    private String LCB_LOCATION;//储位
 
     @Column(column = "LCB_PRDETAIL")
     private String LCB_PRDETAIL;//物料名称

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

@@ -83,7 +83,7 @@
                 android:background="@color/white"
                 android:gravity="center"
                 android:padding="10dp"
-                android:text="仓位"
+                android:text="储位"
                 android:textColor="@color/body_text_1"
                 android:textSize="16sp" />
 
@@ -94,7 +94,7 @@
                 android:layout_weight="1"
                 android:focusable="true"
                 android:focusableInTouchMode="true"
-                android:hint="请输入仓位"
+                android:hint="请输入储位"
                 android:textColor="@color/black" />
         </TableRow>
 
@@ -232,7 +232,7 @@
             <TextView
                 android:layout_width="90dp"
                 android:layout_height="wrap_content"
-                android:text="仓位：" />
+                android:text="储位：" />
 
             <TextView
                 android:id="@+id/barcode_in_collect_result_location_tv"

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

@@ -332,7 +332,7 @@
                     android:layout_marginTop="@dimen/spacing_big"
                     android:background="@drawable/shape_msg_block"
                     android:padding="10dp"
-                    tools:text="物料：PD_PRODCODE, 名称规格：PR_DETAIL || PR_SPEC未备料数: PD_RESTQTY,最小包装数：PR_ZXBZS,仓位：BAR_LOCATION,有PD_BATCHCODE 则显示批号：PD_BATCHCODE" />
+                    tools:text="物料：PD_PRODCODE, 名称规格：PR_DETAIL || PR_SPEC未备料数: PD_RESTQTY,最小包装数：PR_ZXBZS,储位：BAR_LOCATION,有PD_BATCHCODE 则显示批号：PD_BATCHCODE" />
             </LinearLayout>
 
         </ScrollView>

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

@@ -239,7 +239,7 @@
                     android:background="@color/gray_light"
                     android:gravity="center"
                     android:padding="10dp"
-                    android:text="仓位"
+                    android:text="储位"
                     android:textColor="@color/body_text_1"
                     android:textSize="16sp" />
 
@@ -251,7 +251,7 @@
                     android:enabled="false"
                     android:focusable="true"
                     android:focusableInTouchMode="true"
-                    android:hint="请输入仓位"
+                    android:hint="请输入储位"
                     android:textColor="@color/black" />
             </TableRow>
 

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

@@ -38,7 +38,7 @@
             android:layout_height="wrap_content"
             android:layout_margin="5dp"
             android:checked="true"
-            android:text="仓位采集"/>
+            android:text="储位采集"/>
 
         <LinearLayout
             android:layout_width="match_parent"

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

@@ -87,5 +87,5 @@
         android:background="@drawable/shape_msg_block"
         android:padding="10dp"
         android:visibility="gone"
-        tools:text="物料：PD_PRODCODE, 名称规格：PR_DETAIL || PR_SPEC未备料数: PD_RESTQTY,最小包装数：PR_ZXBZS,仓位：BAR_LOCATION,有PD_BATCHCODE 则显示批号：PD_BATCHCODE" />
+        tools:text="物料：PD_PRODCODE, 名称规格：PR_DETAIL || PR_SPEC未备料数: PD_RESTQTY,最小包装数：PR_ZXBZS,储位：BAR_LOCATION,有PD_BATCHCODE 则显示批号：PD_BATCHCODE" />
 </LinearLayout>

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

@@ -20,7 +20,7 @@
             android:layout_marginLeft="@dimen/space_left_8"
             android:layout_marginRight="@dimen/space_right_8"
             style="@style/PopWinEditTextStyle"
-            android:hint="仓位"
+            android:hint="储位"
             android:layout_weight="3"/>
         <TextView
             android:id="@+id/btn_search_whmm"

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

@@ -89,7 +89,7 @@
             android:id="@+id/stock_already_list_location_caption"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="仓位：" />
+            android:text="储位：" />
 
         <TextView
             android:id="@+id/stock_already_list_location"

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

@@ -82,7 +82,7 @@
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="仓位：" />
+            android:text="储位：" />
 
         <TextView
             android:id="@+id/stock_task_location"

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

@@ -89,7 +89,7 @@
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="仓位：" />
+                android:text="储位：" />
 
             <TextView
                 android:id="@+id/stock_task_multiple_location"

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

@@ -405,7 +405,7 @@
     <string name="please_select_datecode">请选择日期</string>
     <string name="please_input_material_num">请输入料号</string>
     <string name="please_collect_old_barcode">请采集旧条码</string>
-    <string name="please_input_storage_location">请输入仓位</string>
+    <string name="please_input_storage_location">请输入储位</string>
     <string name="date_format_error">日期格式错误</string>
     <string name="stock_barcode_list">条码补生成单列表</string>
     <string name="barcode_generation_quantity">补条码数</string>

build.gradle

@@ -60,7 +60,6 @@ ext {
             smartRefreshLayoutVersion           : '1.0.5',
             BaseRecyclerViewAdapterHelperVersion: '2.9.30',
             permissonVersion                    : '2.0.0-rc12',
-            basePopupVersion                    : '2.1.5',
             basePopupVersion                    : '2.1.5'
     ]
 
@@ -77,7 +76,6 @@ ext {
             BaseRecyclerViewAdapterHelper: 'com.github.CymChad:BaseRecyclerViewAdapterHelper:' + depsVersion.BaseRecyclerViewAdapterHelperVersion,
             recyclerview                 : 'com.android.support:recyclerview-v7:' + depsVersion.appcompatV7Version,
             permisson                    : 'com.yanzhenjie:permission:' + depsVersion.permissonVersion,
-            basePopup                    : 'com.github.razerdp:BasePopup:' + depsVersion.basePopupVersion,
             basePopup                    : 'com.github.razerdp:BasePopup:' + depsVersion.basePopupVersion
     ]
 }