界面优化

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

@@ -19,11 +19,11 @@ import com.uas.rd_equipment.fragment.BreakdownRepairFragment;
 import com.uas.rd_equipment.fragment.DeliveryForRepairFragment;
 import com.uas.rd_equipment.fragment.DeviceStatusChangeFragment;
 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;
+import com.uas.rd_equipment.fragment.RequisitionTransferFragment;
 import com.uas.rd_equipment.fragment.StorageInFragment;
 import com.uas.rd_equipment.fragment.StorageRechargeListFragment;
 import com.uas.rd_equipment.global.GloableParams;
@@ -101,7 +101,8 @@ public class FunctionActivity extends BaseActivity implements View.OnClickListen
                     mFragment = new DeliveryForRepairFragment();
                     break;
                 case GloableParams.TEXT_REQUISITION_TRANSFER://领用转移
-                    mFragment = new MaintenanceManagementListFragment();
+//                    mFragment = new MaintenanceManagementListFragment();
+                    mFragment = new RequisitionTransferFragment();
                     break;
                 case GloableParams.PRODUCTION_INFORMATION_UNIT://生产信息绑定
                     mFragment = new ProduceMassageBindingFragment();

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

@@ -248,11 +248,11 @@ public class AddEquipmentGrantFragment extends BaseFragment implements OnColumnI
 
 
 
-        va_vendnameColumn = new Column<String>("设备编号", "MBR_BARCODE");
+        va_vendnameColumn = new Column<String>("编号", "MBR_BARCODE");
         va_vendnameColumn.setFixed(true);
         va_vendcodeColumn = new Column<String>("名称", "PR_DETAIL");
         va_codeColumn = new Column<String>("日期", "MBR_INDATE");
-        va_inmancolumn = new Column<String>("操作员", "MBR_INMAN");
+        va_inmancolumn = new Column<String>("人员", "MBR_INMAN");
 //        va_classColumn = new Column<String>("单据编号", "MBR_MAKECODE");
         va_classColumn = new Column<String>("数量", "MBR_OUTQTY");
         va_DELETEColumn = new Column<String>("操作", "MBR_DELETE");
@@ -624,8 +624,11 @@ 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());
+                if (stop.isEmpty()){
+                    tv_dc_emcode.requestFocus();
+                    tv_dc_emcode.setSelection(tv_dc_emcode.getText().toString().length());
+                }
+
             }
 
             @Override
@@ -852,6 +855,7 @@ public class AddEquipmentGrantFragment extends BaseFragment implements OnColumnI
                 getDatalistCodes("",work_code_code.getText().toString().trim());
                 CommonUtil.toastYESRepeat(mActivity, "保存成功");
                 storage_recharge_collect_et.setText("");
+                storage_recharge_collect_et.requestFocus();
             }
 
             @Override
@@ -864,6 +868,7 @@ public class AddEquipmentGrantFragment extends BaseFragment implements OnColumnI
                 }else {
                     CommonUtil.toastNoRepeat(mActivity, failStr);
                     storage_recharge_collect_et.setText("");
+                    storage_recharge_collect_et.requestFocus();
                 }
 
 
@@ -1199,6 +1204,7 @@ public class AddEquipmentGrantFragment extends BaseFragment implements OnColumnI
             if (data.getExtras() != null) {
                 String result = data.getExtras().getString(CodeUtils.RESULT_STRING);
                 if (mFocusId == R.id.storage_recharge_collect_et) {
+                    storage_recharge_collect_et.requestFocus();
                     storage_recharge_collect_et.setText(result);
                     storage_recharge_collect_et.setSelection(result.length());
                     getsaVeData("");

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

@@ -96,7 +96,7 @@ public class ProduceMassageBindingFragment extends BaseFragment implements OnCol
     private PopupWindow mMenuPopupWindow;
     private Fragment mFragment;
     private SmartTable mSmartTable;
-    private Column<String> va_sourcecode,va_codeColumn,va_vendnameColumn,va_vendcodeColumn,va_inmancolumn,va_DELETEColumn;
+    private Column<String> va_sourcecode,va_codeColumn,va_vendnameColumn,va_vendcodeColumn,va_vendqtyColumn,va_inmancolumn,va_DELETEColumn;
     private TableData<MakerecordBean> mTableData;
     private List<MakerecordBean> mFilterStorageInBeans;
     private ImageView mScanImageView;
@@ -146,6 +146,7 @@ public class ProduceMassageBindingFragment extends BaseFragment implements OnCol
     private List<User> list;
     private TextView tv_changeresources;
     private User user;
+    private TextView ce_gone;
 
     @Override
     protected int getLayout() {
@@ -186,6 +187,7 @@ public class ProduceMassageBindingFragment extends BaseFragment implements OnCol
         shaopwork_id = root.findViewById(R.id.shaopwork_id);
         tv_dc_emcode_delete = root.findViewById(R.id.tv_dc_emcode_delete);
         tv_changeresources = root.findViewById(R.id.tv_changeresources);
+        ce_gone = root.findViewById(R.id.ce_gone);
 
 
     }
@@ -224,11 +226,12 @@ public class ProduceMassageBindingFragment extends BaseFragment implements OnCol
 
 
         va_sourcecode = new Column<String>("岗位资源", "MBR_SOURCECODE");
-        va_inmancolumn = new Column<String>("操作员", "MBR_INMAN");
+        va_inmancolumn = new Column<String>("人员", "MBR_INMAN");
         va_codeColumn = new Column<String>("日期", "MBR_INDATE");
 //        va_classColumn = new Column<String>("单据编号", "MBR_MAKECODE");
-        va_vendnameColumn = new Column<String>("设备编号", "MBR_BARCODE");
+        va_vendnameColumn = new Column<String>("编号", "MBR_BARCODE");
         va_vendcodeColumn = new Column<String>("名称", "PR_DETAIL");
+        va_vendqtyColumn = new Column<String>("数量", "MBR_OUTQTY");
         va_DELETEColumn = new Column<String>("操作", "MBR_DELETE");
         va_DELETEColumn.setOnColumnItemClickListener(this);
         mScanImageView.setOnClickListener(this);
@@ -363,21 +366,24 @@ public class ProduceMassageBindingFragment extends BaseFragment implements OnCol
                         storage_recharge_collect_et.setFocusable(false);
                         tv_dc_emcode.setFocusableInTouchMode(true);
                         tv_dc_emcode.requestFocus();
+                        tv_dc_emcode.setHint("请输入岗位/人员");
                         getDatalistCodes(ce_resources.getText().toString().trim(),work_code_code.getText().toString().trim());
 
                         break;
                     case R.id.rb_equipment:
                         rb_changetext = "设备";
                         storage_recharge_collect_et.setFocusableInTouchMode(true);
-                        storage_recharge_collect_et.requestFocus();
-                        tv_dc_emcode.setFocusable(false);
+                        tv_dc_emcode.setFocusableInTouchMode(true);
+                        tv_dc_emcode.requestFocus();
+                        tv_dc_emcode.setHint("请输入人员");
                         getDatalistCodes(ce_resources.getText().toString().trim(),work_code_code.getText().toString().trim());
                         break;
                     case R.id.rb_fixture:
                         rb_changetext = "夹具";
                         storage_recharge_collect_et.setFocusableInTouchMode(true);
-                        storage_recharge_collect_et.requestFocus();
-                        tv_dc_emcode.setFocusable(false);
+                        tv_dc_emcode.setFocusableInTouchMode(true);
+                        tv_dc_emcode.requestFocus();
+                        tv_dc_emcode.setHint("请输入人员");
                         getDatalistCodes(ce_resources.getText().toString().trim(),work_code_code.getText().toString().trim());
                         break;
                     case R.id.rb_ingredients:
@@ -424,6 +430,7 @@ public class ProduceMassageBindingFragment extends BaseFragment implements OnCol
             public void onClick(View v) {
                 getsaVeData("切换岗位");
                 ce_resources.setText("");
+                ce_gone.setText("");
                 tv_dc_emname.setText("");
                 list.clear();
 
@@ -492,33 +499,6 @@ public class ProduceMassageBindingFragment extends BaseFragment implements OnCol
             return;
         }
 
-
-//        String[] split = input.split(",");
-//
-//        for (String value : split) {
-//            User user=new User();
-//            if (!value.isEmpty()) {
-//                user.setName(value + ",");
-//                list.add(user);
-//            }
-//
-//        }
-//
-//        for (int i = 0; i < list.size(); i++)  //外循环是循环的次数
-//        {
-//            for (int j = list.size() - 1; j > i; j--)  //内循环是 外循环一次比较的次数
-//            {
-//                if (list.get(i).getName().equals(list.get(j).getName()))
-//                {
-//                    list.remove(j);
-//                }
-//
-//            }
-//        }
-//
-//        for (int s = 0; s < list.size(); s++) {
-//            inputString+= list.get(s).getName();
-//        }
         progressDialog.show();
         VollyRequest.getInstance().stringRequest(new HttpParams.Builder()
                 .url(GloableParams.ASTATIONTHE_SELECT_MAKEMANSOURCEINF)
@@ -533,10 +513,9 @@ public class ProduceMassageBindingFragment extends BaseFragment implements OnCol
                 JSONObject dataObject = resultObject.getJSONObject("InfoPush");
                 String de_name = FastjsonUtil.getText(dataObject, "name");
                 String type = FastjsonUtil.getText(dataObject, "type");
+
                 if (type.equals("Employee")){
-                    if (ce_resources.getText().toString().trim().isEmpty()){
-                        CommonUtil.toastNoRepeat(mActivity, "请先扫描岗位条码");
-                    }else {
+                    if (rb_changetext.equals("设备")||rb_changetext.equals("夹具")){
                         user=new User();
                         user.setName(de_name+",");
                         list.add(user);
@@ -556,12 +535,42 @@ public class ProduceMassageBindingFragment extends BaseFragment implements OnCol
                             inputString+= list.get(s).getName();
                         }
                         tv_dc_emname.setText(inputString);
+                        storage_recharge_collect_et.requestFocus();
+
+                    }else {
+                        if (ce_resources.getText().toString().trim().isEmpty()){
+                            CommonUtil.toastNoRepeat(mActivity, "请先扫描岗位条码");
+                        }else {
+                            user=new User();
+                            user.setName(de_name+",");
+                            list.add(user);
+                            for (int i = 0; i < list.size(); i++)  //外循环是循环的次数
+                            {
+                                for (int j = list.size() - 1; j > i; j--)  //内循环是 外循环一次比较的次数
+                                {
+                                    if (list.get(i).getName().equals(list.get(j).getName()))
+                                    {
+                                        list.remove(j);
+                                    }
+
+                                }
+                            }
+
+                            for (int s = 0; s < list.size(); s++) {
+                                inputString+= list.get(s).getName();
+                            }
+                            tv_dc_emname.setText(inputString);
+                        }
+                        tv_dc_emcode.requestFocus();
+                        getsaVeData("切换岗位");
                     }
+
                 }else if (type.equals("Source")){
                     ce_resources.setText(de_name);
+                    ce_gone.setText(tv_dc_emcode.getText().toString().trim());
+                    tv_dc_emcode.requestFocus();
                 }
                 tv_dc_emcode.setText("");
-                tv_dc_emcode.requestFocus();
                 inputString="";
             }
 
@@ -816,6 +825,7 @@ public class ProduceMassageBindingFragment extends BaseFragment implements OnCol
                                 jltStorageInBean.setMBR_PRODCODE(FastjsonUtil.getText(dataObject, "MBR_PRODCODE"));
                                 jltStorageInBean.setMBR_MAKECODE(FastjsonUtil.getText(dataObject, "MBR_MAKECODE"));
                                 jltStorageInBean.setMBR_SOURCECODE(FastjsonUtil.getText(dataObject, "MBR_SOURCECODE"));
+                                jltStorageInBean.setMBR_OUTQTY(FastjsonUtil.getText(dataObject, "MBR_OUTQTY"));
                                 jltStorageInBean.setMBR_TYPE(FastjsonUtil.getText(dataObject, "MBR_TYPE"));
                                 if (!StringUtil.isEmpty(FastjsonUtil.getText(dataObject, "MBR_INDATE"))){
                                     String mbr_indate = timetodate(FastjsonUtil.getText(dataObject, "MBR_INDATE"));
@@ -905,10 +915,15 @@ public class ProduceMassageBindingFragment extends BaseFragment implements OnCol
 
         JSONArray jsonArray = new JSONArray();
         JSONObject object_1 = new JSONObject();
+        if (rb_changetext.equals("夹具")){
+            object_1.put("MBR_PRODCODE", tv_pr_code.getText());//产品编号
+        }else {
+            object_1.put("MBR_PRODCODE", at_stationtrim);//资源名称
+
+        }
         object_1.put("MBR_MAKECODE", ce_work_codetrim);//工单号
-        object_1.put("MBR_SOURCECODE", at_stationtrim);//资源
+        object_1.put("MBR_SOURCECODE", ce_gone.getText().toString().trim());//资源代码
         object_1.put("MBR_TYPE", rb_changetext);//设备\夹具\辅料
-        object_1.put("MBR_PRODCODE", tv_pr_code.getText());//产品编号
         object_1.put("MBR_INMAN", tv_dc_emname.getText());//人员名称
         object_1.put("MBR_BARCODE", storage_recharge_collect_et.getText().toString().trim());
         object_1.put("MBR_WCCODE", maFunName);
@@ -943,7 +958,7 @@ public class ProduceMassageBindingFragment extends BaseFragment implements OnCol
     }
     private void setFilterTableData(List<MakerecordBean> filterTableData) {
         mTableData = new TableData<MakerecordBean>("收料单列表", filterTableData,
-                va_sourcecode,va_inmancolumn,va_codeColumn,va_vendnameColumn,va_vendcodeColumn,va_DELETEColumn);
+                va_sourcecode,va_inmancolumn,va_codeColumn,va_vendnameColumn,va_vendcodeColumn,va_vendqtyColumn,va_DELETEColumn);
         mSmartTable.setTableData(mTableData);
 //        mSmartTable.requestLayout();
         mSmartTable.postDelayed(new Runnable() {

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

@@ -84,6 +84,8 @@ public class RemouIdRepairFragment extends BaseFragment{
     private String mEnclusureId = "";
     private List<String> selectedImagePaths = new ArrayList<>();
     private List<String> stringArrayList=new ArrayList<>();
+    private ClearableEditText index_fault_besause;
+
     @Override
     protected int getLayout() {
         return R.layout.fragment_remouidrepair;
@@ -101,6 +103,11 @@ public class RemouIdRepairFragment extends BaseFragment{
         ce_de_code = root.findViewById(R.id.ce_de_code);
         storage_recharge_scan_iv = root.findViewById(R.id.storage_recharge_scan_iv);
         up_image = root.findViewById(R.id.up_image);
+        index_fault_besause = root.findViewById(R.id.index_fault_besause);
+
+
+
+
     }
 
     @Override
@@ -186,6 +193,10 @@ public class RemouIdRepairFragment extends BaseFragment{
 
 
     public void getNewCommitData(){
+        if (index_fault_besause.getText().toString().trim().isEmpty()){
+            CommonUtil.toastNoRepeat(mActivity, "请填写改造原因!");
+            return;
+        }
         if (index_fault_phenomenon.getText().toString().trim().isEmpty()){
             CommonUtil.toastNoRepeat(mActivity, "请填写改造内容!");
             return;
@@ -200,6 +211,7 @@ public class RemouIdRepairFragment extends BaseFragment{
         JSONObject jsonObject = new JSONObject();
         JSONArray jsonArray = new JSONArray();
         JSONObject object_1 = new JSONObject();
+        object_1.put("dc_repauditor", index_fault_besause.getText().toString().trim());
         object_1.put("dc_reason", index_fault_phenomenon.getText().toString().trim());//备注
         object_1.put("dc_remark", index_position_resource.getText().toString().trim());
         jsonArray.add(object_1);
@@ -215,7 +227,6 @@ public class RemouIdRepairFragment extends BaseFragment{
             @Override
             public void onSuccess(int flag, Object o) throws Exception {
                 progressDialog.dismiss();
-                tv_prompt.setVisibility(View.VISIBLE);
                 tv_prompt.setTextColor(Color.GREEN);
                 tv_prompt.setText("提交成功");
                 stringArrayList.clear();
@@ -224,7 +235,6 @@ public class RemouIdRepairFragment extends BaseFragment{
             @Override
             public void onFail(int flag, String failStr) throws Exception {
                 progressDialog.dismiss();
-                tv_prompt.setVisibility(View.VISIBLE);
                 tv_prompt.setTextColor(Color.RED);
                 tv_prompt.setText(failStr);
 //                CommonUtil.toastNoRepeat(mActivity, failStr);
@@ -274,6 +284,8 @@ public class RemouIdRepairFragment extends BaseFragment{
                 de_name=de_name1;
                 tv_de_code.setText("编号："+de_code1);
                 tv_de_name.setText("名称:"+de_name1);
+                index_fault_besause.requestFocus();
+
             }
 
             @Override
@@ -325,7 +337,9 @@ public class RemouIdRepairFragment extends BaseFragment{
                         mActivity.runOnUiThread(new Runnable() {
                             @Override
                             public void run() {
-                                CommonUtil.toastNoRepeat(mActivity, "附件上传失败");
+//                                CommonUtil.toastNoRepeat(mActivity, "附件上传失败");
+                                tv_prompt.setTextColor(Color.RED);
+                                tv_prompt.setText("附件上传失败"+" ("+stringArrayList.size()+")");
                             }
                         });
                     }
@@ -349,14 +363,9 @@ public class RemouIdRepairFragment extends BaseFragment{
                             mActivity.runOnUiThread(new Runnable() {
                                 @Override
                                 public void run() {
-                                    CommonUtil.toastYESRepeat(mActivity, "附件上传成功");
-                                }
-                            });
-                        } else {
-                            mActivity.runOnUiThread(new Runnable() {
-                                @Override
-                                public void run() {
-                                    CommonUtil.toastNoRepeat(mActivity, "附件上传失败");
+//                                    CommonUtil.toastYESRepeat(mActivity, "附件上传成功");
+                                    tv_prompt.setTextColor(Color.GREEN);
+                                    tv_prompt.setText("附件上传成功"+" ("+stringArrayList.size()+")");
                                 }
                             });
                         }
@@ -366,7 +375,9 @@ public class RemouIdRepairFragment extends BaseFragment{
                 if (mProgressPopup != null) {
                     mProgressPopup.dismiss();
                 }
-                CommonUtil.toastNoRepeat(mActivity, "附件上传失败");
+//                CommonUtil.toastNoRepeat(mActivity, "附件上传失败");
+                tv_prompt.setTextColor(Color.RED);
+                tv_prompt.setText("附件上传失败"+" ("+stringArrayList.size()+")");
             }
         }
     }

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

@@ -787,6 +787,7 @@ public class RequisitionTransferFragment extends BaseFragment{
                     @Override
                     public void onSuccess(int flag, Object o) throws Exception {
                         progressDialog.dismiss();
+                        delists.clear();
                         Boolean isSuccess = FastjsonUtil.getBoolean(o.toString(),"success");
                         if (isSuccess){
                             JSONArray dataArray = FastjsonUtil.getJSONArray(o.toString(),"items");

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

@@ -1000,8 +1000,8 @@ public class GloableParams {
     public static final String PRODUCTION_REMOULD_UNIT = "设备改造";
     public static final String PRODUCTION_REMOULD_CHANGE = "设备状态变更";
     public static final String TEXT_REQUISITION_TRANSFER = "领用转移";
-    public static final String PRODUCTION_REMOULD_GRAN = "物料工装发放";
-    public static final String PRODUCTION_REMOULD_RETURN = "物料工装归还";
+    public static final String PRODUCTION_REMOULD_GRAN = "发放";
+    public static final String PRODUCTION_REMOULD_RETURN = "归还";
     public static final String PRODUCTION_INFORMATION_UNIT = "生产信息绑定";
 
 

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

@@ -370,6 +370,7 @@
             android:layout_height="wrap_content"
             android:layout_margin="@dimen/dp_10"
             android:layout_weight="1"
+            android:checked="true"
             android:text="夹具">
         </RadioButton>
         <RadioButton

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

@@ -40,20 +40,67 @@
             android:orientation="vertical"
             android:layout_width="match_parent"
             android:layout_height="wrap_content">
-            <TextView
-                android:id="@+id/tv_de_code"
-                android:text="编号："
+            <LinearLayout
+                android:orientation="horizontal"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content">
+                <TextView
+                    android:text="编号："
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:textColor="@color/black">
+                </TextView>
+                <TextView
+                    android:id="@+id/tv_de_code"
+                    android:text=""
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:textColor="@color/blueq">
+                </TextView>
+
+            </LinearLayout>
+            <LinearLayout
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:textColor="@color/blueq">
-            </TextView>
+                android:orientation="horizontal">
+                <TextView
+                    android:text="名称："
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:textColor="@color/black">
+                </TextView>
+                <TextView
+                    android:id="@+id/tv_de_name"
+                    android:text=""
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:textColor="@color/blueq">
+                </TextView>
+            </LinearLayout>
+
+
+        </LinearLayout>
+        <LinearLayout
+            android:layout_marginLeft="15dp"
+            android:layout_marginTop="@dimen/dp_10"
+            android:orientation="horizontal"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
             <TextView
-                android:id="@+id/tv_de_name"
-                android:text="名称："
-                android:layout_width="wrap_content"
+                android:layout_width="90dp"
                 android:layout_height="wrap_content"
-                android:textColor="@color/blueq">
+                android:layout_gravity="center"
+                android:text="改造原因："
+                android:textColor="@color/black">
             </TextView>
+            <com.uas.rd_equipment.view.ClearableEditText
+                android:id="@+id/index_fault_besause"
+                style="@style/EditTextLineStyle"
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/dp_40"
+                android:layout_marginRight="50dp"
+                />
+
         </LinearLayout>
 
         <LinearLayout
@@ -67,13 +114,13 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
                 android:text="改造内容："
-                android:textColor="@color/blueq">
+                android:textColor="@color/black">
             </TextView>
             <com.uas.rd_equipment.view.ClearableEditText
                 android:id="@+id/index_fault_phenomenon"
                 style="@style/EditTextLineStyle"
                 android:layout_width="match_parent"
-                android:layout_height="80dp"
+                android:layout_height="@dimen/dp_40"
                 android:layout_marginRight="50dp"
                 />
 
@@ -90,8 +137,8 @@
                 android:layout_width="90dp"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
-                android:text="备注："
-                android:textColor="@color/blueq">
+                android:text="备注说明："
+                android:textColor="@color/black">
             </TextView>
             <com.uas.rd_equipment.view.ClearableEditText
                 android:id="@+id/index_position_resource"
@@ -104,11 +151,10 @@
         <TextView
             android:layout_marginTop="15dp"
             android:id="@+id/tv_prompt"
-            android:text="提交成功"
+            android:text=""
             android:layout_marginLeft="@dimen/dp_10"
             android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:visibility="gone">
+            android:layout_height="wrap_content">
         </TextView>
 
         <TextView

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

@@ -315,29 +315,22 @@
                 android:textColor="@color/black">
             </TextView>
             <LinearLayout
+                android:orientation="horizontal"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginRight="16dp"
                 android:layout_marginLeft="16dp">
-                <FrameLayout
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1">
+
                     <TextView
                         android:id="@+id/ce_resources"
-                        android:layout_marginLeft="@dimen/dp_10"
-                        android:layout_width="wrap_content"
+                        android:layout_width="match_parent"
                         android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:layout_gravity="center"
+                        android:gravity="left"
                         android:text=""
-                        android:layout_gravity="left"
                         android:textColor="@color/black">
                     </TextView>
-                    <!--                    <AutoCompleteTextView-->
-                    <!--                        android:id="@+id/ce_resources"-->
-                    <!--                        style="@style/EditTextLineStyle"-->
-                    <!--                        android:layout_height="30dp"-->
-                    <!--                        android:hint="请输入岗位资源" />-->
-
                     <TextView
                         android:id="@+id/tv_changeresources"
                         android:layout_marginLeft="@dimen/dp_10"
@@ -347,7 +340,8 @@
                         android:padding="@dimen/space_left_5"
                         android:layout_gravity="right"
                         android:background="@drawable/bg_button"
-                        android:textColor="@color/black">
+                        android:textColor="@color/black"
+                        android:visibility="gone">
                     </TextView>
                     <ImageView
                         android:id="@+id/iv_resources_delete"
@@ -357,7 +351,17 @@
                         android:layout_marginRight="13dp"
                         android:src="@drawable/wrong"
                         android:visibility="gone" />
-                </FrameLayout>
+                <TextView
+                    android:id="@+id/ce_gone"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:layout_gravity="center"
+                    android:gravity="left"
+                    android:text=""
+                    android:visibility="gone"
+                    android:textColor="@color/black">
+                </TextView>
 
                 <ImageView
                     android:id="@+id/iv_resources"

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

@@ -384,10 +384,10 @@
     <string name="whcode_flag">仓库：</string>
     <string name="main_list">领用转移列表</string>
     <string name="problem_list">问题缉查列表</string>
-    <string name="mt_return">物料工装归还</string>
+    <string name="mt_return">设备夹具辅料归还</string>
     <string name="grant_list">物料工装发放</string>
     <string name="producemassagebinding">生产信息绑定</string>
-    <string name="addequipmentgrant">物料工装发放</string>
+    <string name="addequipmentgrant">设备夹具辅料发放</string>
     <string name="str_collect_already">已采集</string>
     <string name="str_collect_not">未采集</string>
     <string name="str_collect_ing">采集中</string>

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

@@ -1,4 +1,4 @@
-#Fri Aug 25 09:26:00 CST 2023
+#Thu Sep 14 11:16:57 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