增加物料工装归还界面

修改生产信息绑定保存逻辑
养护管理增加弹窗逻辑

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

@@ -19,6 +19,7 @@ import com.uas.rd_equipment.fragment.DeliveryForRepairFragment;
 import com.uas.rd_equipment.fragment.DeviceProvisioningListFragment;
 import com.uas.rd_equipment.fragment.IndexSettingFragment;
 import com.uas.rd_equipment.fragment.MaintenanceManagementListFragment;
+import com.uas.rd_equipment.fragment.MaterialAndToolingReturnFragment;
 import com.uas.rd_equipment.fragment.ProblemDetectionListFragment;
 import com.uas.rd_equipment.fragment.ProduceMassageBindingFragment;
 import com.uas.rd_equipment.fragment.RemouIdRepairFragment;
@@ -101,12 +102,15 @@ public class FunctionActivity extends BaseActivity implements View.OnClickListen
                 case GloableParams.PRODUCTION_REMOULD_UNIT://设备改造
                     mFragment = new RemouIdRepairFragment();
                     break;
-                case GloableParams.PRODUCTION_REMOULD_GRAN://物料发放
+                case GloableParams.PRODUCTION_REMOULD_GRAN://物料工装发放
                     mFragment = new DeviceProvisioningListFragment();
                     break;
                 case GloableParams.PRODUCTION_REMOULD_PROGRAMSELECT://问题缉查列表
                     mFragment = new ProblemDetectionListFragment();
                     break;
+                case GloableParams.PRODUCTION_REMOULD_RETURN://物料工装归还
+                    mFragment = new MaterialAndToolingReturnFragment();
+                    break;
                 case GloableParams.GRIDNAME_SETTING://设置
                     mFragment = new IndexSettingFragment();
 //                    mFragment = new CwShiFragment();

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

@@ -342,6 +342,10 @@ public class HomeActivity extends BaseActivity implements AdapterView.OnItemClic
                 intent.putExtra(DataSourceManager.KEY_GRID_ITEMNAME, itemName);
                 startActivity(intent);
                 break;
+            case GloableParams.PRODUCTION_REMOULD_RETURN://物料工装归还
+                intent.putExtra(DataSourceManager.KEY_GRID_ITEMNAME, itemName);
+                startActivity(intent);
+                break;
             case GloableParams.GRIDNAME_SETTING://设置
                 intent.putExtra(DataSourceManager.KEY_GRID_ITEMNAME, itemName);
                 startActivity(intent);

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

@@ -184,7 +184,7 @@ public class LoginFragment extends BaseFragment implements AdapterView.OnItemSel
 
         //绑定Master下拉框数据
         masterFuncList = DataSourceManager.getDataSourceManager().getMasterFuncList();
-        adapter = new ArrayAdapter(mActivity, R.layout.item_spinner, R.id.text_spinner, masterFuncList);
+        adapter = new ArrayAdapter(mActivity, R.layout.item_login_spinner, R.id.text_spinner, masterFuncList);
         masterSpinner.setAdapter(adapter);
 
         maName = SharedPreUtil.getString(mActivity.getApplicationContext(), Constants.FLAG.ACCOUNT_NAME_CACHE, null);

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

@@ -0,0 +1,180 @@
+package com.uas.rd_equipment.fragment;
+
+import android.app.Activity;
+import android.content.Intent;
+import android.view.KeyEvent;
+import android.view.View;
+import android.view.inputmethod.EditorInfo;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.android.volley.Request;
+import com.uas.rd_equipment.R;
+import com.uas.rd_equipment.activity.FunctionActivity;
+import com.uas.rd_equipment.camera.CaptureActivity;
+import com.uas.rd_equipment.global.GloableParams;
+import com.uas.rd_equipment.tools.SharedPreUtil;
+import com.uas.rd_equipment.util.CameraUtil;
+import com.uas.rd_equipment.util.CommonUtil;
+import com.uas.rd_equipment.util.Constants;
+import com.uas.rd_equipment.util.FastjsonUtil;
+import com.uas.rd_equipment.util.HttpCallback;
+import com.uas.rd_equipment.util.HttpParams;
+import com.uas.rd_equipment.util.VolleyRequest;
+import com.uas.rd_equipment.view.ClearableEditText;
+
+/**
+ * Created by cjh-sail on 2023-07-14
+ */
+public class MaterialAndToolingReturnFragment extends BaseFragment{
+
+
+    private ClearableEditText storage_recharge_collect_et;
+    private ImageView storage_recharge_scan_iv;
+    private int mFocusId;
+    private static final int SCAN_BARCODE_CODE = 888;
+    private TextView tv_mbr_barcode;
+    private TextView tv_mbr_makecode;
+    private TextView tv_de_name;
+    private TextView tv_de_spec;
+    private TextView tv_mbr_indate;
+    private TextView tv_mbr_type;
+    private TextView tv_tosi;
+
+    @Override
+    protected int getLayout() {
+        return R.layout.maeriaandtooling_fragment;
+    }
+
+    @Override
+    protected void initViews() {
+        FunctionActivity.setTitle(getString(R.string.mt_return));
+        storage_recharge_collect_et = root.findViewById(R.id.storage_recharge_collect_et);
+        storage_recharge_scan_iv = root.findViewById(R.id.storage_recharge_scan_iv);
+
+        tv_mbr_barcode = root.findViewById(R.id.tv_mbr_barcode);
+        tv_mbr_makecode = root.findViewById(R.id.tv_mbr_makecode);
+        tv_de_name = root.findViewById(R.id.tv_de_name);
+        tv_de_spec = root.findViewById(R.id.tv_de_spec);
+        tv_mbr_indate = root.findViewById(R.id.tv_mbr_indate);
+        tv_mbr_type = root.findViewById(R.id.tv_mbr_type);
+        tv_tosi = root.findViewById(R.id.tv_tosi);
+
+    }
+
+    @Override
+    protected void initEvents() {
+        storage_recharge_collect_et.requestFocus();
+        storage_recharge_collect_et.setOnEditorActionListener(new TextView.OnEditorActionListener() {
+            @Override
+            public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
+                if (actionId == EditorInfo.IME_ACTION_DONE
+                        || actionId == EditorInfo.IME_ACTION_SEND
+                        || (event != null && event.getAction() == KeyEvent.ACTION_DOWN && event.getKeyCode() == KeyEvent.KEYCODE_ENTER)) {
+                    String va_code = storage_recharge_collect_et.getText().toString().trim();
+                    getDatalistCodes(va_code);
+                    return true;
+                }
+                return false;
+            }
+        });
+        storage_recharge_scan_iv.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                storage_recharge_collect_et.requestFocus();
+                if (CameraUtil.hasCamera()) {
+                    if (root.findFocus() != null) {
+                        mFocusId = root.findFocus().getId();
+                        Intent intent = new Intent();
+                        intent.setClass(mActivity, CaptureActivity.class);
+                        startActivityForResult(intent, SCAN_BARCODE_CODE);
+                        SharedPreUtil.saveString(mActivity, Constants.STORAGEERECHADD, "NO");
+                    } else {
+                        CommonUtil.toastNoRepeat(mActivity, "请选择您要操作的输入框");
+                    }
+                } else {
+                    CommonUtil.toastNoRepeat(mActivity, getString(R.string.no_camera_detected));
+                }
+            }
+        });
+    }
+
+    @Override
+    protected void initDatas() {
+
+    }
+    private void getDatalistCodes(String code){
+        VolleyRequest.getInstance().stringRequest(new HttpParams.Builder()
+                .url(GloableParams.ASTATIONTHE_SELECT_RETURNMAKEBOM)
+                .method(Request.Method.GET)
+                .tag(TAG + "getindatalist")
+                .flag(0)
+                .addParam("code",code)
+                .build(), new HttpCallback() {
+            @Override
+            public void onSuccess(int flag, Object o) throws Exception {
+                progressDialog.dismiss();
+                try {
+                    String result = o.toString();
+                    JSONObject resultObject = JSON.parseObject(result);
+                    JSONObject dataObject = resultObject.getJSONObject("items");
+                    tv_mbr_barcode.setText(FastjsonUtil.getText(dataObject, "mbr_barcode"));
+                    tv_mbr_makecode.setText(FastjsonUtil.getText(dataObject, "mbr_makecode"));
+                    tv_de_name.setText(FastjsonUtil.getText(dataObject, "de_name"));
+                    tv_de_spec.setText(FastjsonUtil.getText(dataObject, "de_spec"));
+                    tv_mbr_indate.setText(FastjsonUtil.getText(dataObject, "mbr_indate"));
+                    tv_mbr_type.setText(FastjsonUtil.getText(dataObject, "mbr_type"));
+                    tv_tosi.setTextColor(getResources().getColor(R.color.green));
+                    tv_tosi.setText("归还成功");
+                    
+                    storage_recharge_collect_et.setText("");
+
+                } catch (Exception e) {
+                    e.printStackTrace();
+                    progressDialog.dismiss();
+                }
+
+            }
+
+            @Override
+            public void onFail(int flag, String failStr) throws Exception {
+                progressDialog.dismiss();
+//                CommonUtil.toastNoRepeat(mActivity, failStr);
+                storage_recharge_collect_et.setText("");
+                progressDialog.dismiss();
+                tv_tosi.setTextColor(getResources().getColor(R.color.red));
+                tv_tosi.setText(failStr);
+            }
+        });
+    }
+    @Override
+    public boolean onKeyDown(int keyCode, KeyEvent event) {
+        return false;
+    }
+
+    @Override
+    public boolean onFragmentBackPressed() {
+        return false;
+    }
+    @Override
+    public void onHiddenChanged(boolean hidden) {
+        super.onHiddenChanged(hidden);
+        if (hidden) {
+            ((FunctionActivity) getActivity()).setMoreBtnVisible(false);
+            ((FunctionActivity) getActivity()).setListIconIvVisible(false);
+        } else {
+            FunctionActivity.setTitle(getString(R.string.mt_return));
+            ((FunctionActivity) getActivity()).setMoreBtnVisible(true);
+            ((FunctionActivity) getActivity()).setListIconIvVisible(false);
+        }
+    }
+    @Override
+    public void onActivityResult(int requestCode, int resultCode, Intent data) {
+        if (requestCode == SCAN_BARCODE_CODE && resultCode == Activity.RESULT_OK) {
+            String scanResult = CommonUtil.getScanResult(data);
+            getDatalistCodes(scanResult);
+        }
+    }
+}

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

@@ -241,7 +241,7 @@ public class ProduceMassageBindingFragment extends BaseFragment implements OnCol
                 if (actionId == EditorInfo.IME_ACTION_DONE
                         || actionId == EditorInfo.IME_ACTION_SEND
                         || (event != null && event.getAction() == KeyEvent.ACTION_DOWN && event.getKeyCode() == KeyEvent.KEYCODE_ENTER)) {
-                    getsaVeData();
+                    getsaVeData("扫码框");
                     return true;
                 }
                 return false;
@@ -386,7 +386,7 @@ public class ProduceMassageBindingFragment extends BaseFragment implements OnCol
 
 
 //                getDatalistCodes(ce_resources.getText().toString().trim(),work_code_code.getText().toString().trim());
-                getsaVeData();
+                getsaVeData("");
 
             }
         });
@@ -409,7 +409,7 @@ public class ProduceMassageBindingFragment extends BaseFragment implements OnCol
         tv_changeresources.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                getsaVeData();
+                getsaVeData("切换岗位");
                 ce_resources.setText("");
                 tv_dc_emname.setText("");
                 list.clear();
@@ -871,21 +871,24 @@ public class ProduceMassageBindingFragment extends BaseFragment implements OnCol
         });
     }
 
-    public void getsaVeData(){
+    public void getsaVeData(String stringsao){
         if (rb_pepole.isChecked()){
             rb_changetext="人员岗位";
         }
 
         String ce_work_codetrim = work_code_code.getText().toString().trim();
         String at_stationtrim = ce_resources.getText().toString().trim();
+        if (stringsao.equals("切换岗位")){
+            if (at_stationtrim.isEmpty()){
+                CommonUtil.toastNoRepeat(mActivity, "请选择岗位资源");
+                return;
+            }
+        }
         if (ce_work_codetrim.isEmpty()){
             CommonUtil.toastNoRepeat(mActivity, "请选择工单号");
             return;
         }
-        if (at_stationtrim.isEmpty()){
-            CommonUtil.toastNoRepeat(mActivity, "请选择岗位资源");
-            return;
-        }
+
         JSONArray jsonArray = new JSONArray();
         JSONObject object_1 = new JSONObject();
         object_1.put("MBR_MAKECODE", ce_work_codetrim);//工单号
@@ -1381,7 +1384,7 @@ public class ProduceMassageBindingFragment extends BaseFragment implements OnCol
                 if (mFocusId == R.id.storage_recharge_collect_et) {
                     storage_recharge_collect_et.setText(result);
                     storage_recharge_collect_et.setSelection(result.length());
-                    getsaVeData();
+                    getsaVeData("");
                 }
             }
         }

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

@@ -2,10 +2,13 @@ package com.uas.rd_equipment.fragment;
 
 import android.annotation.SuppressLint;
 import android.app.Activity;
+import android.app.AlertDialog;
+import android.content.DialogInterface;
 import android.content.Intent;
 import android.graphics.Color;
 import android.graphics.drawable.BitmapDrawable;
 import android.os.Bundle;
+import android.os.Handler;
 import android.support.annotation.Nullable;
 import android.support.v4.content.ContextCompat;
 import android.support.v7.widget.DefaultItemAnimator;
@@ -114,6 +117,8 @@ public class StorageRechargeListFragment extends BaseFragment implements OnColum
     private List<PrintListBean> mFilterStorageInBeans;
     private TextView tv_add;
     private List<String> linecodeBeanList;
+    private AlertDialog downloadDialog;
+    private TextView mProgress;
 
     @Override
     protected int getLayout() {
@@ -529,6 +534,7 @@ public class StorageRechargeListFragment extends BaseFragment implements OnColum
                 tv_prompt.setText("提交成功");
                 ce_de_code.setText("");
                 ce_de_code.requestFocus();
+                showDownloadDialogture();
             }
 
             @Override
@@ -539,11 +545,80 @@ public class StorageRechargeListFragment extends BaseFragment implements OnColum
                 tv_prompt.setText(failStr);
                 ce_de_code.setText("");
                 ce_de_code.requestFocus();
+                showDownloadDialog(failStr);
 //                CommonUtil.toastNoRepeat(mActivity, failStr);
 
             }
         });
+        mFeededList.clear();
+        setAdapter(mFeededList);
+        mFilterStorageInBeans.clear();
+        setFilterTableData(mFilterStorageInBeans);
     }
+    private void showDownloadDialog(String failStr){
+        AlertDialog.Builder builder = new AlertDialog.Builder(mActivity);
+        builder.setTitle("提示");
+        final LayoutInflater inflater = LayoutInflater.from(mActivity);
+        View v = inflater.inflate(R.layout.progress, null);
+        mProgress = (TextView) v.findViewById(R.id.progress);
+
+        builder.setView(v);
+        mProgress.setTextColor(Color.RED);
+        mProgress.setText(failStr+"");
+        builder.setNegativeButton("取消", new DialogInterface.OnClickListener() {
+
+            @Override
+
+            public void onClick(DialogInterface dialog, int which) {
+                dialog.dismiss();
+
+            }
+
+        });
+
+        downloadDialog = builder.create();
+
+        builder.setCancelable(false);
+
+        downloadDialog.setCanceledOnTouchOutside(false);
+
+        downloadDialog.show();
+
+    }
+    Handler handler=new Handler();
+    Runnable runnable=new Runnable() {
+        @Override
+        public void run() {
+            handler.postDelayed(this, 1000);
+            downloadDialog.dismiss();
+            handler.removeCallbacks(runnable);
+        }
+
+    };
+
+    private void showDownloadDialogture(){
+        AlertDialog.Builder builder = new AlertDialog.Builder(mActivity);
+        builder.setTitle("提示");
+        final LayoutInflater inflater = LayoutInflater.from(mActivity);
+        View v = inflater.inflate(R.layout.progress, null);
+        mProgress = (TextView) v.findViewById(R.id.progress);
+
+        builder.setView(v);
+        mProgress.setTextColor(Color.GREEN);
+        mProgress.setText("提交成功");
+
+        downloadDialog = builder.create();
+
+//        builder.setCancelable(false);
+
+//        downloadDialog.setCanceledOnTouchOutside(false);
+
+        downloadDialog.show();
+        handler.postDelayed(runnable, 1000);
+
+    }
+
+
 
     @Override
     public void onHiddenChanged(boolean hidden) {

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

@@ -341,6 +341,7 @@ public class GloableParams {
     public static String ASTATIONTHE_SELECT_CONFIRMUSE;
     public static String ASTATIONTHE_SELECT_MAKEMANSOURCEINF;
     public static String ASTATIONTHE_SELECT_INSPECTCHECKLIST;
+    public static String ASTATIONTHE_SELECT_RETURNMAKEBOM;
 
     /**
      * 新版设备管理
@@ -367,6 +368,7 @@ public class GloableParams {
 
     public static String ADDRESSTAIL_GET_CONFIRM_REPAIR="/oa/device/confirmStatus.action";
     public static String ADDRESSTAIL_GET_INSPECTCHECKLIST="/oa/device/getInspectCheckList.action";
+    public static String ADDRESSTAIL_GET_RETURNMAKEBOM="/oa/device/returnMakeBom.action";
 
     //扫描人员编号
     public static String ADDRESSTAIL_GET_GETEMNAME="/oa/device/getEmname.action";
@@ -989,8 +991,9 @@ public class GloableParams {
     public static final String TEXT_REQUISITION_TRANSFER = "领用转移";
     public static final String PRODUCTION_INFORMATION_UNIT = "生产信息绑定";
     public static final String PRODUCTION_REMOULD_UNIT = "设备改造";
-    public static final String PRODUCTION_REMOULD_GRAN = "物料发放";
+    public static final String PRODUCTION_REMOULD_GRAN = "物料工装发放";
     public static final String PRODUCTION_REMOULD_PROGRAMSELECT = "问题缉查";
+    public static final String PRODUCTION_REMOULD_RETURN = "物料工装归还";
     public static final String GRIDNAME_SETTING = "设置";
 //    public static final String QUERYSTATIONINFORMATION = "过站信息";
     public static String[] homeMenuNames = {
@@ -1003,6 +1006,7 @@ public class GloableParams {
             PRODUCTION_REMOULD_UNIT,
             PRODUCTION_REMOULD_GRAN,
 //        PRODUCTION_REMOULD_PROGRAMSELECT,
+        PRODUCTION_REMOULD_RETURN,
             GRIDNAME_SETTING
     };
     public static int[] homeMenuIcons = {
@@ -1015,6 +1019,7 @@ public class GloableParams {
             R.drawable.remould,
             R.drawable.iv_grant,
 //            R.drawable.iv_problem,
+            R.drawable.iv_return,
             R.drawable.mainmenu_usersetting
     };
 
@@ -1532,5 +1537,6 @@ public class GloableParams {
         GloableParams.ASTATIONTHE_SELECT_CONFIRMUSE = uriHead + GloableParams.ADDRESSTAIL_GET_CONFIRMUSE;
         GloableParams.ASTATIONTHE_SELECT_MAKEMANSOURCEINF = uriHead + GloableParams.ADDRESSTAIL_GET_MAKEMANSOURCEINF;
         GloableParams.ASTATIONTHE_SELECT_INSPECTCHECKLIST = uriHead + GloableParams.ADDRESSTAIL_GET_INSPECTCHECKLIST;
+        GloableParams.ASTATIONTHE_SELECT_RETURNMAKEBOM = uriHead + GloableParams.ADDRESSTAIL_GET_RETURNMAKEBOM;
     }
 }

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

@@ -194,8 +194,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

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

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Login页面Spanner下拉的每一个item-->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="horizontal" android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <TextView
+        android:id="@+id/text_spinner"
+        style="@style/SpinnerItemStyle"
+        android:layout_marginLeft="5dp"
+        android:layout_marginRight="5dp"
+        android:layout_marginBottom="5dp"/>
+</LinearLayout>

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

@@ -10,6 +10,7 @@
         android:layout_marginLeft="5dp"
         android:layout_marginRight="5dp"
         android:layout_marginBottom="5dp"
-        android:gravity="center"
+        android:layout_marginTop="5dp"
+        android:gravity="left"
         android:textColor="@color/black"/>
 </LinearLayout>

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

@@ -0,0 +1,137 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/white"
+    android:orientation="vertical">
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_margin="@dimen/textsize_16"
+        android:background="@drawable/bg_line_edittext">
+
+        <com.uas.rd_equipment.view.ClearableEditText
+            android:id="@+id/storage_recharge_collect_et"
+            style="@style/EditTextStyle"
+            android:layout_weight="1"
+            android:background="@null"
+            android:focusable="true"
+            android:focusableInTouchMode="true"
+            android:hint="请采集工装编号"
+            android:imeOptions="actionSend"
+            android:textColor="@color/black" />
+
+        <ImageView
+            android:id="@+id/storage_recharge_scan_iv"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:layout_marginRight="10dp"
+            android:clickable="false"
+            android:src="@drawable/ic_edittext_scan" />
+    </LinearLayout>
+    <TableLayout
+        android:background="@color/white"
+        android:orientation="vertical"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+        <TableRow
+            android:layout_marginLeft="@dimen/dp_10"
+            android:layout_marginTop="7dp">
+            <TextView
+                android:text="工装编号："
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:gravity="right"
+                android:textColor="@color/black"/>
+            <TextView
+                android:id="@+id/tv_mbr_barcode"
+                android:text=""
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"/>
+        </TableRow>
+        <TableRow
+            android:layout_marginLeft="@dimen/dp_10">
+            <TextView
+                android:text="工单号："
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:gravity="right"
+                android:textColor="@color/black"/>
+            <TextView
+                android:id="@+id/tv_mbr_makecode"
+                android:text=""
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"/>
+        </TableRow>
+        <TableRow
+            android:layout_marginLeft="@dimen/dp_10">
+            <TextView
+                android:text="工装名称："
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:gravity="right"
+                android:textColor="@color/black"/>
+            <TextView
+                android:id="@+id/tv_de_name"
+                android:text=""
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"/>
+        </TableRow>
+        <TableRow
+            android:layout_marginLeft="@dimen/dp_10">
+            <TextView
+                android:text="工装型号："
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:gravity="right"
+                android:textColor="@color/black"/>
+            <TextView
+                android:id="@+id/tv_de_spec"
+                android:text=""
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"/>
+        </TableRow>
+        <TableRow
+            android:layout_marginLeft="@dimen/dp_10">
+            <TextView
+                android:text="领用日期："
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:gravity="right"
+                android:textColor="@color/black"/>
+            <TextView
+                android:id="@+id/tv_mbr_indate"
+                android:text=""
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"/>
+        </TableRow>
+        <TableRow
+            android:layout_marginLeft="@dimen/dp_10">
+            <TextView
+                android:text="工装类型："
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:gravity="right"
+                android:textColor="@color/black"/>
+            <TextView
+                android:id="@+id/tv_mbr_type"
+                android:text=""
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"/>
+        </TableRow>
+
+    </TableLayout>
+    <TextView
+
+        android:id="@+id/tv_tosi"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/dp_10"
+        android:layout_marginLeft="@dimen/dp_10"
+        android:text="">
+    </TextView>
+
+
+
+</LinearLayout>

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

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+    <TextView
+        android:id="@+id/progress"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center"
+        android:layout_gravity="center"
+        android:textColor="@color/black">
+    </TextView>
+</LinearLayout>

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

@@ -383,7 +383,8 @@
     <string name="whcode_flag">仓库：</string>
     <string name="main_list">领用转移列表</string>
     <string name="problem_list">问题缉查列表</string>
-    <string name="grant_list">物料发放列表</string>
+    <string name="mt_return">物料工装归还</string>
+    <string name="grant_list">物料工装发放</string>
     <string name="producemassagebinding">生产信息绑定</string>
     <string name="addequipmentgrant">物料发放</string>
     <string name="str_collect_already">已采集</string>

pda_libs/pulltoreflashlibrary/build/generated/source/buildConfig/debug/com/handmark/pulltorefresh/library/BuildConfig.java

@@ -13,6 +13,6 @@ public final class BuildConfig {
   public static final String APPLICATION_ID = "com.handmark.pulltorefresh.library";
   public static final String BUILD_TYPE = "debug";
   public static final String FLAVOR = "";
-  public static final int VERSION_CODE = 10;
-  public static final String VERSION_NAME = "v1.0";
+  public static final int VERSION_CODE = 12;
+  public static final String VERSION_NAME = "v1.0.2";
 }

pda_libs/pulltoreflashlibrary/build/intermediates/aapt_friendly_merged_manifests/debug/aapt/AndroidManifest.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.handmark.pulltorefresh.library"
-    android:versionCode="10"
-    android:versionName="v1.0" >
+    android:versionCode="12"
+    android:versionName="v1.0.2" >
 
     <uses-sdk
         android:minSdkVersion="16"

pda_libs/pulltoreflashlibrary/build/intermediates/aapt_friendly_merged_manifests/debug/aapt/output.json

@@ -1 +1 @@
-[{"outputType":{"type":"AAPT_FRIENDLY_MERGED_MANIFESTS"},"apkData":{"type":"MAIN","splits":[],"versionCode":10,"versionName":"v1.0","enabled":true,"outputFile":"pulltoreflashlibrary-debug.aar","fullName":"debug","baseName":"debug","dirName":""},"path":"AndroidManifest.xml","properties":{"packageId":"com.handmark.pulltorefresh.library","split":""}}]
+[{"outputType":{"type":"AAPT_FRIENDLY_MERGED_MANIFESTS"},"apkData":{"type":"MAIN","splits":[],"versionCode":12,"versionName":"v1.0.2","enabled":true,"outputFile":"pulltoreflashlibrary-debug.aar","fullName":"debug","baseName":"debug","dirName":""},"path":"AndroidManifest.xml","properties":{"packageId":"com.handmark.pulltorefresh.library","split":""}}]

pda_libs/pulltoreflashlibrary/build/intermediates/incremental/packageDebugResources/compile-file-map.properties

@@ -1,4 +1,4 @@
-#Wed Jul 12 21:08:29 CST 2023
+#Mon Jul 24 10:57:22 CST 2023
 D\:\\AndroidData\\RD-NewEquipmentManagement\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\anim\\slide_out_to_top.xml=D\:\\AndroidData\\RD-NewEquipmentManagement\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\anim\\slide_out_to_top.xml
 D\:\\AndroidData\\RD-NewEquipmentManagement\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\anim\\slide_in_from_top.xml=D\:\\AndroidData\\RD-NewEquipmentManagement\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\anim\\slide_in_from_top.xml
 D\:\\AndroidData\\RD-NewEquipmentManagement\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-xhdpi\\default_ptr_rotate.png=D\:\\AndroidData\\RD-NewEquipmentManagement\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\drawable-xhdpi-v4\\default_ptr_rotate.png

pda_libs/pulltoreflashlibrary/build/intermediates/library_manifest/debug/AndroidManifest.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.handmark.pulltorefresh.library"
-    android:versionCode="10"
-    android:versionName="v1.0" >
+    android:versionCode="12"
+    android:versionName="v1.0.2" >
 
     <uses-sdk
         android:minSdkVersion="16"

pda_libs/pulltoreflashlibrary/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt

@@ -1,8 +1,8 @@
 1<?xml version="1.0" encoding="utf-8"?>
 2<manifest xmlns:android="http://schemas.android.com/apk/res/android"
 3    package="com.handmark.pulltorefresh.library"
-4    android:versionCode="10"
-5    android:versionName="v1.0" >
+4    android:versionCode="12"
+5    android:versionName="v1.0.2" >
 6
 7    <uses-sdk
 8        android:minSdkVersion="16"

pda_libs/pulltoreflashlibrary/build/intermediates/merged_manifests/debug/output.json

@@ -1 +1 @@
-[{"outputType":{"type":"MERGED_MANIFESTS"},"apkData":{"type":"MAIN","splits":[],"versionCode":10,"versionName":"v1.0","enabled":true,"outputFile":"pulltoreflashlibrary-debug.aar","fullName":"debug","baseName":"debug","dirName":""},"path":"../../library_manifest/debug/AndroidManifest.xml","properties":{"packageId":"com.handmark.pulltorefresh.library","split":""}}]
+[{"outputType":{"type":"MERGED_MANIFESTS"},"apkData":{"type":"MAIN","splits":[],"versionCode":12,"versionName":"v1.0.2","enabled":true,"outputFile":"pulltoreflashlibrary-debug.aar","fullName":"debug","baseName":"debug","dirName":""},"path":"../../library_manifest/debug/AndroidManifest.xml","properties":{"packageId":"com.handmark.pulltorefresh.library","split":""}}]