保存用户编号给到工序展示

app/src/main/java/com/uas/baigang_workshop_workstation/activity/ProcessManagementActivity.java

@@ -1115,8 +1115,6 @@ public class ProcessManagementActivity extends BaseActivity implements AdapterVi
 //            }
 //
 //        });
-
-
     }
 
     private void setlineAdapter(ArrayList<ComDataBean> mList) {
@@ -1133,7 +1131,6 @@ public class ProcessManagementActivity extends BaseActivity implements AdapterVi
             editPW = null;
             CommonUtil.setBackgroundAlpha(this, 1f);
         }
-
     }
 
     @Override
@@ -1171,6 +1168,7 @@ public class ProcessManagementActivity extends BaseActivity implements AdapterVi
             index_detail_doc.setText("");
             index_prce_doc.setText("");
             mUnfinish.setText("");
+            index_pc_doc.setText("");
         } else {
             return;
         }

app/src/main/java/com/uas/baigang_workshop_workstation/application/PdaApplication.java

@@ -71,7 +71,6 @@ public class PdaApplication extends Application {
             mSoundPool = new SoundPool(4, AudioAttributes.CONTENT_TYPE_MUSIC, 0);
         }
 
-
         mSoundMap = new HashMap<>();
         mSoundMap.put(SoundUtil.SOUND_ARIEL, mSoundPool.load(this, R.raw.ariel, 1));
         mSoundMap.put(SoundUtil.SOUND_CARME, mSoundPool.load(this, R.raw.carme, 1));

app/src/main/java/com/uas/baigang_workshop_workstation/fragment/IndexSettingFragment.java

@@ -233,6 +233,7 @@ public class IndexSettingFragment extends BaseFragment implements View.OnClickLi
         mAccountBookTv = root.findViewById(R.id.setting_account_name_tv);
         mVersionTextView = root.findViewById(R.id.setting_current_version);
 
+        settingCheckUpdateLl.setOnClickListener(this);
         settingExitCurrentAccountLl.setOnClickListener(this);
         mRequestQueue = Volley.newRequestQueue(getActivity());
     }
@@ -459,6 +460,10 @@ public class IndexSettingFragment extends BaseFragment implements View.OnClickLi
                 mFragment = new SoundSettingFragment();
                 getFragmentManager().beginTransaction().addToBackStack(null).replace(R.id.container_function_fragment, mFragment).commit();
                 break;
+            case R.id.setting_check_update_ll:
+                mFragment = new VersionUpgradeFragment();
+                getFragmentManager().beginTransaction().addToBackStack(null).replace(R.id.container_function_fragment, mFragment).commit();
+                break;
         }
     }
 

app/src/main/java/com/uas/baigang_workshop_workstation/fragment/LoginFragment.java

@@ -80,6 +80,13 @@ public class LoginFragment extends BaseFragment implements AdapterView.OnItemSel
                     SharedPreUtil.saveString(mActivity, Constants.FLAG.ACCOUNT_NAME_CACHE, maName);
                     SharedPreUtil.saveString(mActivity, Constants.FLAG.ACCOUNT_FUNNAME_CACHE, maFunName);
 
+//                    String em_name = jsonObject.optString("em_name");
+//                    String em_code = jsonObject.optString("em_code");
+
+
+                    SharedPreUtil.saveString(mActivity, Constants.FLAG.CACHE_USER_EMNAME, userName);
+                    SharedPreUtil.saveString(mActivity,Constants.FLAG.CACHE_USER_EMCODE,maName);
+
                     //保存登录数据，用于应用内切换登录
                     if (mCyCheckBox.isChecked()) {
                         saveLoginCache();

app/src/main/java/com/uas/baigang_workshop_workstation/fragment/WorkOrderSearchFragment.java

@@ -29,7 +29,7 @@ import com.scwang.smartrefresh.layout.api.RefreshLayout;
 import com.scwang.smartrefresh.layout.listener.OnRefreshListener;
 import com.uas.baigang_workshop_workstation.R;
 import com.uas.baigang_workshop_workstation.activity.FunctionActivity;
-import com.uas.baigang_workshop_workstation.activity.IndexActivity;
+import com.uas.baigang_workshop_workstation.activity.ProcessManagementActivity;
 import com.uas.baigang_workshop_workstation.adapter.MyaddAdapter;
 import com.uas.baigang_workshop_workstation.bean.AddworkorderBean;
 import com.uas.baigang_workshop_workstation.global.GloableParams;
@@ -249,16 +249,6 @@ public class WorkOrderSearchFragment extends BaseFragment {
 
             }
         });
-
-
-
-
-
-
-
-
-
-
     }
     //多工单绑定
     public void downbangding(){
@@ -304,7 +294,7 @@ public class WorkOrderSearchFragment extends BaseFragment {
                         if (isSuccess){
                             CommonUtil.toastNoRepeat(mActivity,"启动成功");
                             mFilterStorageInBeans.clear();
-                            Intent intent =  new Intent(mActivity, IndexActivity.class);
+                            Intent intent =  new Intent(mActivity, ProcessManagementActivity.class);
                             intent.putExtra(Constants.FLAG.SC_CODE,sc_code);
                             startActivity(intent);
                         }else {
@@ -357,7 +347,7 @@ public class WorkOrderSearchFragment extends BaseFragment {
                             CommonUtil.toastNoRepeat(mActivity,"启动成功");
                             mFilterStorageInBeans.clear();
 //                            SharedPreUtil.saveString(mActivity,"mojucode",ce_moju.getText().toString().trim());
-                            Intent intent =  new Intent(mActivity, IndexActivity.class);
+                            Intent intent =  new Intent(mActivity, ProcessManagementActivity.class);
                             intent.putExtra(Constants.FLAG.SC_CODE,sc_code);
                             startActivity(intent);
                         }else {

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

@@ -712,8 +712,8 @@ public class GloableParams {
     //下载附件
     private static final String ADDRESSTAIL_COMMON_DOWNLOADBYID = "/common/downloadbyId.action";
     //获取应用版本信息
-    //    private static final String ADDRESSTAIL_OUTMATERIAL_GETPDAVERSION = "/api/pda/outMaterial/getPdaVersion.action";
-    private static final String ADDRESSTAIL_OUTMATERIAL_GETPDAVERSION = "/api/pda/getPdaVersion.action";
+        private static final String ADDRESSTAIL_OUTMATERIAL_GETPDAVERSION = "/api/pda/outMaterial/getPdaVersion.action";
+//    private static final String ADDRESSTAIL_OUTMATERIAL_GETPDAVERSION = "/api/pda/getPdaVersion.action";
 
     //工单流水
     private static final String ADDRESSTAIL_GET_MAKEMAN = "/api/pdashop/source/getMakeMan.action";

app/src/main/java/com/uas/baigang_workshop_workstation/util/Constants.java

@@ -76,7 +76,7 @@ public interface Constants {
         String VERIFICATION_PASSWORD = "verification_password";
         //账套缓存
         String ACCOUNT_NAME_CACHE = "account_name";
-        String ACCOUNT_FUNNAME_CACHE = "account_funname";
+        String ACCOUNT_FUNNAME_CACHE = "account_funname";       //账套信息
         //默认仓库编号缓存
         String DEFAULT_WAREHOUSE_CACHE = "default_warehouse";