增加自由上架及相关功能

app/src/main/java/com/uas/keg_wms_new/fragment/IOCOutMakeMaterial.java

@@ -79,9 +79,6 @@ import butterknife.OnClick;
 public class IOCOutMakeMaterial extends BaseFragment {
 
     private static String TAG = "IOCOutMakeMaterial";
-
-
-
     private IOCOutMakeMaterialFuzzySearch fuzzySearchData;
     private MyArrayAdapter<String> autoStringAdapter;
     private StringRequest stringRequest, stringRequestPost;

app/src/main/java/com/uas/keg_wms_new/fragment/IndexWareHouseContentFragment.java

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

app/src/main/java/com/uas/keg_wms_new/global/GloableParams.java

@@ -279,6 +279,9 @@ public class GloableParams {
     public static String ADDRESS_END_PROD_OUTAGV;    //删除
     public static String ADDRESS_ORBITAL_MOTION;    //轨道动作
     public static String ADDRESS_GETAGV_CODE;    //AGV获取轨道编号
+    public static String ADDRESS_CHECK_SHELF;    //自由上架料号enter
+    public static String ADDRESS_FREE_SMART_START;    //自由上架 条码号enter/上架
+    public static String ADDRESS_FREE_SMART_END;    //自由上架 结束上架
 
     //连接服务器请求地址
     private static final String ADDRESSTAIL_CONNECT_SERVER = "/api/pda/getAllMasters.action";
@@ -780,6 +783,15 @@ public class GloableParams {
     //轨道编号
     private static final String ADDRESSTAIL_GETAGV_CODE = "/api/pda/transfer/getagvcode.action";
 
+
+    //料架ENTER事件
+    private static final String ADDRESSTAIL_CHECK_SHELF = "/api/pda/transfer/checkShelf.action";
+    //条码号enter/上架按钮
+    private static final String ADDRESSTAIL_FREE_SMART_START = "/api/pda/transfer/freeSmartStart.action";
+    //结束上架
+    private static final String ADDRESSTAIL_FREE_SMART_END = "/api/pda/transfer/freeSmartEnd.action";
+
+
     /**
      *智能上架(扫码)
      */
@@ -1248,5 +1260,10 @@ 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;
+
+        GloableParams.ADDRESS_CHECK_SHELF = uriHead + GloableParams.ADDRESSTAIL_CHECK_SHELF;
+        GloableParams.ADDRESS_FREE_SMART_START = uriHead + GloableParams.ADDRESSTAIL_FREE_SMART_START;
+        GloableParams.ADDRESS_FREE_SMART_END = uriHead + GloableParams.ADDRESSTAIL_FREE_SMART_END;
+
     }
 }

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

@@ -28,6 +28,7 @@
         android:orientation="vertical"
         android:padding="@dimen/padding_normal">
         <RadioGroup
+            android:visibility="gone"
             android:gravity="center"
             android:orientation="horizontal"
             android:layout_width="match_parent"

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

@@ -26,4 +26,5 @@
         android:background="@color/transparent"
         android:text="未转收料"
         android:textSize="@dimen/app_text_size_body_2" />
+
 </LinearLayout>

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

@@ -435,5 +435,15 @@
     </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>