1.养护管理需要全部选择

2.有点检值的必须填写
3.物料发放进入后不默认勾选设备
4.物料工装发放工单扫码后切换人员编号 ，再切换扫码框
5.物料工装发放，按钮颜色区分

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

@@ -28,6 +28,7 @@ import com.uas.rd_equipment.fragment.StorageRechargeListFragment;
 import com.uas.rd_equipment.global.GloableParams;
 import com.uas.rd_equipment.interfaces.BackHandlerInterface;
 import com.uas.rd_equipment.tools.DataSourceManager;
+import com.uas.rd_equipment.tools.SharedPreUtil;
 import com.uas.rd_equipment.util.CameraUtil;
 import com.uas.rd_equipment.util.Constants;
 
@@ -36,6 +37,7 @@ public class FunctionActivity extends BaseActivity implements View.OnClickListen
     private TextView mSubmitBtn;
     private RelativeLayout mActionBarLayout;
     static TextView actionBarTextView;
+    static TextView tv_person;
     private ImageView mPrintImageView, mScanImageView, mSmtQueryImageView, mListImageView, mDeleteImageView;
     public BaseFragment mFragment;
     private StringRequest mStringRequest;
@@ -47,6 +49,7 @@ public class FunctionActivity extends BaseActivity implements View.OnClickListen
     public static final String TAG_SCMAKE_FEEDER = "pfmakeFragment";
     private String sc_code;
     private String ma_code;
+    private String em_name;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -65,11 +68,14 @@ public class FunctionActivity extends BaseActivity implements View.OnClickListen
         mDeleteImageView = (ImageView) findViewById(R.id.btn_actionbar_delete_icon_iv);
 
         actionBarTextView = (TextView) findViewById(R.id.tv_actionbar_withback);
+        tv_person = (TextView) findViewById(R.id.tv_person);
         mActionBarLayout = (RelativeLayout) findViewById(R.id.include_menuactionbar);
 
         //添加监听事件
         btnBack.setOnClickListener(this);
+        em_name = SharedPreUtil.getString(this, Constants.FLAG.CACHE_USER_EMNAME, null);
 
+        tv_person.setText(em_name);
         //获取用户选择的功能名称
         Intent intent = getIntent();
         String funName = intent.getStringExtra(DataSourceManager.KEY_GRID_ITEMNAME);

app/src/main/java/com/uas/rd_equipment/activity/HomeActivity.java

@@ -60,6 +60,7 @@ public class HomeActivity extends BaseActivity implements AdapterView.OnItemClic
     private TextView mCancelTextView, mMinimizeTextView, mExitTextView;
     public BaseFragment fragment;
     private String de_code;
+    private String em_name;
 
     @Override
     protected void onDestroy() {
@@ -213,7 +214,8 @@ public class HomeActivity extends BaseActivity implements AdapterView.OnItemClic
         setContentView(R.layout.activity_home);
         menuGridView = (GridView) findViewById(R.id.grid_menu);
         actionbarTextVeiw = (TextView) findViewById(R.id.actionbar);
-        actionbarTextVeiw.setText("设备管理系统");
+        em_name = SharedPreUtil.getString(this, Constants.FLAG.CACHE_USER_EMNAME, null);
+        actionbarTextVeiw.setText("设备管理系统"+"\n"+ em_name);
         menuGridView.setNumColumns(3);
         gridItemList = DataSourceManager.getDataSourceManager().getHomeGridItemList();
         SimpleAdapter adapter = new SimpleAdapter(this, gridItemList, R.layout.item_grid,

app/src/main/java/com/uas/rd_equipment/fragment/AddEquipmentGrantFragment.java

@@ -174,13 +174,17 @@ public class AddEquipmentGrantFragment extends BaseFragment implements OnColumnI
     protected void initEvents() {
         et_linecode_smts.requestFocus();
         mFilterStorageInBeans = Collections.synchronizedList(new ArrayList<>());
-
+        tv_confirm_receipt.setEnabled(false);
         Bundle arguments = getArguments();
         if (arguments != null){
             dc_code = arguments.getString("dc_code");
             dc_status = arguments.getString("dc_status");
             if (!StringUtil.isEmpty(dc_status)){
-                if (!dc_status.equals("在录入")){
+                if (dc_status.equals("在录入")){
+                    tv_save.setEnabled(false);
+                    tv_confirm_receipt.setEnabled(true);
+
+                }else {
                     tv_save.setEnabled(false);
                     tv_confirm_receipt.setEnabled(false);
                     //扫码框
@@ -195,7 +199,6 @@ public class AddEquipmentGrantFragment extends BaseFragment implements OnColumnI
                     tv_dc_emcode.setEnabled(false);
                     tv_dc_emcode.setFocusable(false);
                     tv_dc_emcode.setKeyListener(null);//重点
-
                 }
             }
         }
@@ -469,6 +472,8 @@ public class AddEquipmentGrantFragment extends BaseFragment implements OnColumnI
                 tv_dc_emcode.setText(inputString+"");
                 tv_dc_emcode.setSelection(tv_dc_emcode.getText().toString().length());
                 inputString="";
+                storage_recharge_collect_et.requestFocus();
+                storage_recharge_collect_et.setSelection(storage_recharge_collect_et.getText().toString().length());
             }
 
             @Override
@@ -561,6 +566,8 @@ public class AddEquipmentGrantFragment extends BaseFragment implements OnColumnI
                 } catch (JSONException e) {
                     e.printStackTrace();
                 }
+                tv_dc_emcode.requestFocus();
+                tv_dc_emcode.setSelection(tv_dc_emcode.getText().toString().length());
             }
 
             @Override
@@ -809,6 +816,8 @@ public class AddEquipmentGrantFragment extends BaseFragment implements OnColumnI
                 JSONObject dataObject = resultObject.getJSONObject("items");
                 String de_name = FastjsonUtil.getText(dataObject, "dc_code");
                 tv_grantcode.setText(de_name);
+                tv_save.setEnabled(false);
+                tv_confirm_receipt.setEnabled(true);
             }
 
             @Override

app/src/main/java/com/uas/rd_equipment/fragment/RequisitionTransferFragment.java

@@ -395,9 +395,13 @@ public class RequisitionTransferFragment extends BaseFragment{
 
     //领用
     public void getNewReceiveData(){
-        if (tv_dc_linecode.getText().toString().trim().isEmpty()){
-            CommonUtil.toastNoRepeat(mActivity, "线别不可为空");
-            return;
+
+
+        if (!maintenanceType.equals("退回")){
+            if (tv_dc_linecode.getText().toString().trim().isEmpty()){
+                CommonUtil.toastNoRepeat(mActivity, "线别不可为空");
+                return;
+            }
         }
         progressDialog.show();
         JSONObject jsonObject = new JSONObject();

app/src/main/java/com/uas/rd_equipment/fragment/StorageRechargeListFragment.java

@@ -75,9 +75,7 @@ import org.jetbrains.annotations.NotNull;
 
 import java.util.ArrayList;
 import java.util.Collections;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 
 import razerdp.basepopup.BasePopupWindow;
 
@@ -455,12 +453,15 @@ public class StorageRechargeListFragment extends BaseFragment implements OnColum
     //提交保存
     public void getNewCommitData(){//dc_remark dc_kind 主表formStore ----- DI_RESULT，DI_ITEM，DI_RESULT
         ArrayList<MaintainitemBean> selectedItem = myAdapter.getSelectedItem();
-        progressDialog.show();
+
 //        if (mi_item.isEmpty()||mi_detno.isEmpty()){
 //            CommonUtil.toastNoRepeat(mActivity, "请勾选项目名称");
 //            return;
 //        }
-
+        if (selectedItem.size()!=mFeededList.size()){
+            CommonUtil.toastNoRepeat(mActivity, "必须勾选全部检验项目");
+            return;
+        }
 
         JSONObject jsonObject = new JSONObject();
         JSONArray jsonArray = new JSONArray();
@@ -475,13 +476,20 @@ public class StorageRechargeListFragment extends BaseFragment implements OnColum
         JSONObject object_2 = new JSONObject();
         object_2.put("DI_DETNO", mi_detno);//序号
         ArrayList<JsonStorateBean> list=new ArrayList<>();
-        Map<String, String> map = new HashMap<String, String>();
+        list.clear();
         for (int i=0;i<selectedItem.size();i++){
             MaintainitemBean maintainitemBean = selectedItem.get(i);
-//            object_2.put("DI_ITEM", maintainitemBean.getMi_item());
-//            list.add(maintainitemBean.getMi_item());
+            if (!StringUtil.isEmpty(maintainitemBean.getMI_MAXVALUE()) && !StringUtil.isEmpty(maintainitemBean.getMI_MINVALUE())){
+                if (StringUtil.isEmpty(maintainitemBean.getDI_REMARK())){
+                    CommonUtil.toastNoRepeat(mActivity, "请填写点检值");
+                    return;
+                }
+            }
             JsonStorateBean jsonStorateBean=new JsonStorateBean("OK",maintainitemBean.getMi_item(),maintainitemBean.getMI_DESC(),maintainitemBean.getDI_REMARK());
             list.add(jsonStorateBean);
+//            object_2.put("DI_ITEM", maintainitemBean.getMi_item());
+//            list.add(maintainitemBean.getMi_item());
+
 //            map.put("DI_RESULT","OK");
 //            map.put("DI_ITEM",maintainitemBean.getMi_item());
         }
@@ -517,6 +525,7 @@ public class StorageRechargeListFragment extends BaseFragment implements OnColum
         String substring = jsonArray2.toString().substring(0, jsonArray2.toString().length() - 1);//去除尾部
         String substring1 = substring.substring(1, substring.length());//去除首部
         Log.i("params=======2",substring1);
+        progressDialog.show();
         VollyRequest.getInstance().stringRequest(new HttpParams.Builder()
                 .url(GloableParams.ASTATIONTHE_COMMIT_MAINITEM)
                 .method(Request.Method.GET)
@@ -534,6 +543,8 @@ public class StorageRechargeListFragment extends BaseFragment implements OnColum
                 tv_prompt.setText("提交成功");
                 ce_de_code.setText("");
                 ce_de_code.requestFocus();
+                list.clear();
+                ck_all.setChecked(false);
                 showDownloadDialogture();
             }
 

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

@@ -15,7 +15,19 @@
         <TextView
             android:id="@+id/tv_actionbar_withback"
             style="@style/ActionBarTextView"
-            android:layout_width="wrap_content" />
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerHorizontal="true"
+            android:text="" />
+        <TextView
+            android:id="@+id/tv_person"
+            style="@style/ActionBarTextView"
+            android:layout_height="wrap_content"
+            android:layout_width="wrap_content"
+            android:layout_below="@+id/tv_actionbar_withback"
+            android:gravity="center"
+            android:layout_centerHorizontal="true"
+            android:text=""/>
         <!--<com.uas.uaspda.customview.ClearableEditText
             android:id="@+id/et_actionbar_withback"
             style="@style/ActionBarEditText"/>-->

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

@@ -347,7 +347,6 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_margin="@dimen/dp_10"
-            android:checked="true"
             android:text="设备">
         </RadioButton>
         <RadioButton
@@ -397,7 +396,7 @@
             android:textSize="@dimen/textsize_20"
             android:layout_marginLeft="@dimen/dp_10"
             android:layout_marginRight="@dimen/dp_10"
-            android:background="@color/gray_light">
+            android:background="@drawable/bg_button">
         </TextView>
         <TextView
             android:id="@+id/tv_confirm_receipt"
@@ -410,7 +409,7 @@
             android:textSize="@dimen/textsize_20"
             android:layout_marginLeft="@dimen/dp_10"
             android:layout_marginRight="@dimen/dp_10"
-            android:background="@color/gray_light">
+            android:background="@drawable/bg_button">
         </TextView>
 
     </LinearLayout>

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

@@ -131,10 +131,11 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content">
             <LinearLayout
-                android:layout_gravity="bottom"
+                android:layout_gravity="center"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_weight="1.5"
+                android:layout_weight="1"
+                android:layout_marginTop="2dp"
                 android:layout_marginLeft="@dimen/textsize_20">
                 <TextView
                     android:layout_width="wrap_content"
@@ -169,8 +170,8 @@
                     android:text="工段"
                     android:textSize="16sp"
                     android:gravity="center"
-                    android:layout_gravity="bottom"
-                    android:paddingTop="@dimen/dp_10"
+                    android:layout_gravity="center"
+                    android:layout_marginTop="2dp"
                     android:textColor="@color/black">
                 </TextView>
                 <Spinner
@@ -204,6 +205,7 @@
                     android:layout_height="wrap_content"
                     android:text="产品编号  "
                     android:gravity="center"
+                    android:textSize="16sp"
                     android:layout_gravity="center"
                     android:textColor="@color/black">
                 </TextView>
@@ -213,6 +215,7 @@
                     android:layout_height="wrap_content"
                     android:text=""
                     android:gravity="center"
+                    android:textSize="16sp"
                     android:layout_gravity="center"
                     android:textColor="@color/black">
                 </TextView>
@@ -226,6 +229,7 @@
                 android:layout_weight="1"
                 android:text="产品名称"
                 android:gravity="left"
+                android:textSize="16sp"
                 android:layout_gravity="center"
                 android:textColor="@color/black">
             </TextView>
@@ -265,7 +269,7 @@
                         android:id="@+id/tv_dc_emcode"
                         style="@style/EditTextLineStyle"
                         android:layout_height="30dp"
-                        android:hint="请输入人员编号/岗位" />
+                        android:hint="请输入岗位/人员" />
 
                     <ImageView
                         android:id="@+id/tv_dc_emcode_delete"