Эх сурвалжийг харах

给自由上架功能做准备,但取消这个了功能

songw 11 сар өмнө
parent
commit
e69652a2ab

+ 1 - 3
app/src/main/java/com/uas/keg_wms/fragment/IOCOutMakeMaterial.java

@@ -80,8 +80,6 @@ public class IOCOutMakeMaterial extends BaseFragment {
 
     private static String TAG = "IOCOutMakeMaterial";
 
-
-
     private IOCOutMakeMaterialFuzzySearch fuzzySearchData;
     private MyArrayAdapter<String> autoStringAdapter;
     private StringRequest stringRequest, stringRequestPost;
@@ -123,7 +121,7 @@ public class IOCOutMakeMaterial extends BaseFragment {
         RadioButton agvfgm = root.findViewById(R.id.agvfgm);
 
         mDbManager = new DBManager(getActivity());
-        ((TextView) (getActivity().findViewById(R.id.tv_actionbar_withback))).setText("出库单");
+        ((TextView) (getActivity().findViewById(R.id.tv_actionbar_withback))).setText(R.string.outbound_order);
 
         //弹出软键盘
         mInputMethodManager = (InputMethodManager) root.getContext().getSystemService(Context.INPUT_METHOD_SERVICE);

+ 2 - 2
app/src/main/java/com/uas/keg_wms/fragment/IndexWareHouseContentFragment.java

@@ -150,8 +150,8 @@ public class IndexWareHouseContentFragment extends BaseFragment implements Adapt
                     getFragmentManager().beginTransaction().addToBackStack(null)
                             .replace(R.id.container_function_fragment, fragment).commit();
                     break;
-                case GloableParams.GRIDNAME_SMART_SHELVES:
-                    fragment = new SmartShelvestFragment();
+                case GloableParams.GRIDNAME_SMART_SHELVES:      //AGV上架
+                    fragment = new SmartShelvestFragment();    //AGV上架
                     getFragmentManager().beginTransaction().addToBackStack(null)
                             .replace(R.id.container_function_fragment, fragment).commit();
                     break;

+ 2 - 0
app/src/main/java/com/uas/keg_wms/global/GloableParams.java

@@ -1248,5 +1248,7 @@ public class GloableParams {
         GloableParams.ADDRESS_END_PROD_OUTAGV = uriHead + GloableParams.ADDRESSTAIL_END_PROD_OUTAGV;
         GloableParams.ADDRESS_ORBITAL_MOTION = uriHead + GloableParams.ADDRESSTAIL_ORBITAL_MOTION;
         GloableParams.ADDRESS_GETAGV_CODE = uriHead + GloableParams.ADDRESSTAIL_GETAGV_CODE;
+
+
     }
 }

+ 11 - 0
app/src/main/res/values/strings.xml

@@ -435,5 +435,16 @@
     </string-array>
 
     <string name="agv_shelving">AGV上架</string>
+    <string name="outbound_order">出库单</string>
+    <string name="free_listing">自由上架</string>
+    <string name="continuously_listed">连续上架</string>
+    <string name="material_rack">料架</string>
+    <string name="Please_enter_the_material_rack">请输入料架</string>
+    <string name="Please_enter_the_barcode_number">请输入条码号</string>
+    <string name="Shelf_validation_successful">料架效验成功</string>
+    <string name="Default_warehouse_for_materials">物料默认仓库</string>
+    <string name="Current_position">目前仓位</string>
+    <string name="aready_stored_in_storage_space">已经存放仓位</string>
+
 
 </resources>