工单物料核查功能移植到首页,取消权限控制,取消PDA扫码触发Enter事件

app/src/main/java/com/uas/jc_wms/activity/FunctionActivity.java

@@ -22,6 +22,7 @@ import com.uas.jc_wms.fragment.MSDManageFragment;
 import com.uas.jc_wms.fragment.SCSMTFragment;
 import com.uas.jc_wms.fragment.SolderPasteManageFragment;
 import com.uas.jc_wms.fragment.StorageInFragment;
+import com.uas.jc_wms.fragment.WorkOrderMaterialCheckFragment;
 import com.uas.jc_wms.global.GloableParams;
 import com.uas.jc_wms.interfaces.BackHandlerInterface;
 import com.uas.jc_wms.tools.DataSourceManager;
@@ -105,6 +106,10 @@ public class FunctionActivity extends BaseActivity implements View.OnClickListen
                     fragment = new IndexSettingFragment();
 //                    fragment = new BlueToothPrintFragment();
                     break;
+                //工单物料核对
+                case GloableParams.GRIDNAME_WORK_ORDER_MATERIAL_VERIFICATION:
+                    fragment = new WorkOrderMaterialCheckFragment();
+                    break;
             }
             //添加Fragment
             getSupportFragmentManager().beginTransaction()

app/src/main/java/com/uas/jc_wms/activity/IndexActivity.java

@@ -195,7 +195,8 @@ public class IndexActivity extends BaseActivity implements AdapterView.OnItemCli
 //        if (!itemName.equals(GloableParams.GRIDNAME_SHOPCONTENT)) {
 
         List<String> powerList = (List<String>) PdaApplication.getDataCacheFromMap(Constants.FLAG.POWER_CALLER_CACHE);
-        boolean isPower = false;
+//        boolean isPower = false;
+        boolean isPower = true;
         if (itemName.equals(GloableParams.GRIDNAME_SETTING)) {
             isPower = true;
         } else if (GloableParams.GRIDNAME_SOLDER_MANAGER.equals(itemName)) {

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

@@ -127,12 +127,12 @@ public class IndexWareHouseContentFragment extends BaseFragment implements Adapt
                     getFragmentManager().beginTransaction().addToBackStack(null)
                             .replace(R.id.container_function_fragment, fragment).commit();
                     break;
-                //工单物料核对
-                case GloableParams.WORK_ORDER_MATERIAL_CHECK:
-                    fragment = new WorkOrderMaterialCheckFragment();
-                    getFragmentManager().beginTransaction().addToBackStack(null)
-                            .replace(R.id.container_function_fragment, fragment).commit();
-                    break;
+//                //工单物料核对
+//                case GloableParams.WORK_ORDER_MATERIAL_CHECK:
+//                    fragment = new WorkOrderMaterialCheckFragment();
+//                    getFragmentManager().beginTransaction().addToBackStack(null)
+//                            .replace(R.id.container_function_fragment, fragment).commit();
+//                    break;
                     //条码数量修改
                 case GloableParams.GRIDNAME_MODIFY_QUANTITY:
                     fragment = new ModifyBarcodeQuantityFragment();

app/src/main/java/com/uas/jc_wms/fragment/WorkOrderMaterialCheckFragment.java

@@ -135,7 +135,7 @@ public class WorkOrderMaterialCheckFragment extends BaseFragment {
                         || actionId == EditorInfo.IME_ACTION_SEARCH
                         || actionId == EditorInfo.IME_ACTION_DONE
                         || (event != null && event.getAction() == KeyEvent.ACTION_DOWN && event.getKeyCode() == KeyEvent.KEYCODE_ENTER)) {
-                    getStockChecks();
+                    //getStockChecks();
                     return true;
                 }
                 return false;

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

@@ -766,11 +766,12 @@ public class GloableParams {
     public static final String GRIDNAME_OUT_STORAGE = "出库";
     public static final String GRIDNAME_STORAGE_MANAGER = "仓库管理";
     public static final String GRIDNAME_SETTING = "设置";
+    public static final String GRIDNAME_WORK_ORDER_MATERIAL_VERIFICATION = "工单物料核对";
     public static String[] indexMainGridNames = {GRIDNAME_IN_STORAGE, GRIDNAME_OUT_STORAGE,
-            GRIDNAME_STORAGE_MANAGER, GRIDNAME_SETTING};
+            GRIDNAME_STORAGE_MANAGER, GRIDNAME_SETTING,GRIDNAME_WORK_ORDER_MATERIAL_VERIFICATION};
     public static int[] indexMainGridImgs = {R.drawable.ic_storage_in,
             R.drawable.ic_storage_out, R.drawable.mainmenu_storehousemanager,
-            R.drawable.mainmenu_usersetting};
+            R.drawable.mainmenu_usersetting,R.drawable.iv_hed};
     //INDEX:出入库管理Index
     public static final String GRIDNAME_CODEBAR_COLLECT = "入库";
     public static final String GRIDNAME_CODEBAR_VERIFY = "出库";
@@ -805,7 +806,7 @@ public class GloableParams {
     public static final String GRIDNAME_FINISHED_PRODUCT_STORAGE = "成品入库";
     public static final String GRIDNAME_FINISHED_PRODUCT_OUTBOUND = "成品出库";
 //    public static final String GRIDNAME_EQUIPMENT_CYCLECOUNT_OUTBOUND = "设备周期盘点";
-    public static final String WORK_ORDER_MATERIAL_CHECK= "工单物料核对";
+//    public static final String WORK_ORDER_MATERIAL_CHECK= "工单物料核对";
     public static final String[] storageGridNames = {GRIDNAME_GOOD_SEARCH, GRIDNAME_BATCH_OPRATION,
             GRIDNAME_STORAGE_TRANSFER, GRIDNAME_MODIFY_QUANTITY, GRIDNAME_WORK_INVENTORY,
 //            GRIDNAME_BOM_CHECK,
@@ -813,7 +814,8 @@ public class GloableParams {
             GRIDNAME_FINISHED_PRODUCT_STORAGE,
             GRIDNAME_FINISHED_PRODUCT_OUTBOUND,
 //            GRIDNAME_EQUIPMENT_CYCLECOUNT_OUTBOUND,
-            WORK_ORDER_MATERIAL_CHECK};
+//            WORK_ORDER_MATERIAL_CHECK
+    };
     public static final int[] storageGridImgs = {R.drawable.storage_good_search,
             R.drawable.storage_bach_operation, R.drawable.storage_transfer,
             R.drawable.storage_work_inventory,
@@ -823,7 +825,7 @@ public class GloableParams {
             R.drawable.ic_finished_product_storage,
             R.drawable.ic_finished_product_outbound,
 //            R.drawable.equipment,
-            R.drawable.iv_hed
+//            R.drawable.iv_hed
     };
     //DETAIL:搜索备料单号，下拉列表
     public static final String SPINNER_PREPARE_SEARCH = "搜索备料单号";

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

@@ -3,11 +3,12 @@
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:background="@color/background_color_first"
-                tools:context="com.uas.jc_wms.MenuActivity">
+                >
 
     <include
         android:id="@+id/include_menuactionbar"
         layout="@layout/actionbar"/>
+
     <RelativeLayout
         android:id="@+id/ll_content"
         android:layout_width="match_parent"

build.gradle

@@ -55,8 +55,8 @@ ext {
             targetSdkVersion : 28,
             compileSdkVersion: 28,
             buildToolsVersion: "28.0.3",
-            versionCode      : 44,
-            versionName      : "v2.5.8"
+            versionCode      : 45,
+            versionName      : "v2.5.9"
     ]
 
     depsVersion = [