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

去除条码拆分功能,

songw 5 сар өмнө
parent
commit
46d3f47ca1

+ 0 - 2
app/src/main/java/com/uas/jc_workstation/activity/CommonSeclecActivity.java

@@ -277,7 +277,6 @@ public class CommonSeclecActivity extends BaseActivity implements View.OnClickLi
                             myAdapter.setmList(mList);
                             myAdapter.setmList(mList);
                             myAdapter.notifyDataSetChanged();
                             myAdapter.notifyDataSetChanged();
                         }else {
                         }else {
-
                         }
                         }
                     }
                     }
 
 
@@ -288,7 +287,6 @@ public class CommonSeclecActivity extends BaseActivity implements View.OnClickLi
                     }
                     }
 
 
                 });
                 });
-
     }
     }
 
 
     private void getSC_CODEData() {
     private void getSC_CODEData() {

+ 6 - 6
app/src/main/java/com/uas/jc_workstation/activity/IndexActivity.java

@@ -193,8 +193,8 @@ public class IndexActivity extends BaseActivity implements AdapterView.OnItemCli
             }
             }
         });
         });
         mFragment = new WorkOrderSearchFragment();
         mFragment = new WorkOrderSearchFragment();
-        sc_code= SharedPreUtil.getString(this, Constants.FLAG.GANG_WEI_SOURCE_CODE,"");
-        sc_name=SharedPreUtil.getString(this,Constants.FLAG.GANG_WEI_SOURCE_NAME,"");
+        sc_code = SharedPreUtil.getString(this,Constants.FLAG.GANG_WEI_SOURCE_CODE,"");
+        sc_name = SharedPreUtil.getString(this,Constants.FLAG.GANG_WEI_SOURCE_NAME,"");
         new Handler().postDelayed(new Runnable() {
         new Handler().postDelayed(new Runnable() {
             @Override
             @Override
             public void run() {
             public void run() {
@@ -1190,10 +1190,10 @@ public class IndexActivity extends BaseActivity implements AdapterView.OnItemCli
             return;
             return;
         } else {
         } else {
             //条码拆分
             //条码拆分
-            if (GloableParams.GRIDNAME_BARCODE_SPLITTING.equals(itemName)) {
-                goFragment(position);
-                return;
-            }
+//            if (GloableParams.GRIDNAME_BARCODE_SPLITTING.equals(itemName)) {
+//                goFragment(position);
+//                return;
+//            }
             //工单暂停,工单切换,实时报工
             //工单暂停,工单切换,实时报工
             if (TextUtils.isEmpty(mStaffCode) && (GloableParams.GRIDNAME_WORK_PAUSE.equals(itemName)
             if (TextUtils.isEmpty(mStaffCode) && (GloableParams.GRIDNAME_WORK_PAUSE.equals(itemName)
                     || GloableParams.GRIDNAME_WORK_SWITCH.equals(itemName)
                     || GloableParams.GRIDNAME_WORK_SWITCH.equals(itemName)

+ 10 - 6
app/src/main/java/com/uas/jc_workstation/global/GloableParams.java

@@ -1158,14 +1158,15 @@ public class GloableParams {
     public static final String GRIDNAME_PACKAGE= "包装采集";
     public static final String GRIDNAME_PACKAGE= "包装采集";
     public static final String GRIDNAME_BAD_EXCHANGE = "换票";
     public static final String GRIDNAME_BAD_EXCHANGE = "换票";
     public static final String GRIDNAME_BAD_PRE_PROCESSING_REPORT = "预加工报工";
     public static final String GRIDNAME_BAD_PRE_PROCESSING_REPORT = "预加工报工";
-    public static final String GRIDNAME_BARCODE_SPLITTING = "条码拆分";
+//    public static final String GRIDNAME_BARCODE_SPLITTING = "条码拆分";
     public static final String LABELREPRINTING = "标签补打";
     public static final String LABELREPRINTING = "标签补打";
    // public static final String GRIDNAME_STAFF_CHANGE = "人员换岗";
    // public static final String GRIDNAME_STAFF_CHANGE = "人员换岗";
     //public static final String GRIDNAME_STAFF_UP = "人员上线";
     //public static final String GRIDNAME_STAFF_UP = "人员上线";
   //  public static final String GRIDNAME_STAFF_DOWN = "人员下线";
   //  public static final String GRIDNAME_STAFF_DOWN = "人员下线";
    public static String[] indexMainGridNames = {
    public static String[] indexMainGridNames = {
            GRIDNAME_WORK_START,
            GRIDNAME_WORK_START,
-           GRIDNAME_WORK_PAUSE, GRIDNAME_WORK_SWITCH,
+           GRIDNAME_WORK_PAUSE,
+           GRIDNAME_WORK_SWITCH,
            GRIDNAME_IN_MATERIAL,
            GRIDNAME_IN_MATERIAL,
 
 
            GRIDNAME__PUTINTO,GRIDNAME_ROLLOUT,
            GRIDNAME__PUTINTO,GRIDNAME_ROLLOUT,
@@ -1178,23 +1179,26 @@ public class GloableParams {
            //           GRIDNAME_TIAO_ZHAN,
            //           GRIDNAME_TIAO_ZHAN,
            //           GRIDNAME_BAD_EXCHANGE,
            //           GRIDNAME_BAD_EXCHANGE,
            GRIDNAME_BAD_PRE_PROCESSING_REPORT,
            GRIDNAME_BAD_PRE_PROCESSING_REPORT,
-           GRIDNAME_BARCODE_SPLITTING,
+//           GRIDNAME_BARCODE_SPLITTING,
            LABELREPRINTING
            LABELREPRINTING
    };
    };
 
 
     public static int[] indexMainGridImgs = {
     public static int[] indexMainGridImgs = {
-            R.drawable.start, R.drawable.pause, R.drawable.swich,
+            R.drawable.start,
+            R.drawable.pause,
+            R.drawable.swich,
             R.drawable.feeded,
             R.drawable.feeded,
             R.drawable.ic_staff_down,
             R.drawable.ic_staff_down,
             R.drawable.ic_staff_up,
             R.drawable.ic_staff_up,
             //            R.drawable.acquisition,
             //            R.drawable.acquisition,
-            R.drawable.iv_rollout,R.drawable.report,
+            R.drawable.iv_rollout,
+            R.drawable.report,
             R.drawable.baogong,
             R.drawable.baogong,
             R.drawable.storage_bach_operation,
             R.drawable.storage_bach_operation,
             //            R.drawable.index_smt_up,
             //            R.drawable.index_smt_up,
             //            R.mipmap.badchange,
             //            R.mipmap.badchange,
             R.mipmap.iv_processing,
             R.mipmap.iv_processing,
-            R.drawable.ic_split_batch,
+//            R.drawable.ic_split_batch,
             R.drawable.pjbd
             R.drawable.pjbd
     };
     };