修改生产新绑定选择设备名称逻辑

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

@@ -78,7 +78,7 @@ public class DeliveryForRepairFragment extends BaseFragment implements OnColumnI
     private TextView tv_dc_emname;
     private TextView tv_dc_devcode;
     private TextView tv_de_name;
-    private TextView tv_malfunction;
+    private TextView tv_remark;
     private TextView tv_dc_remark;
     private String dc_code;
     private String dc_emname;
@@ -126,7 +126,7 @@ public class DeliveryForRepairFragment extends BaseFragment implements OnColumnI
         tv_dc_emname = root.findViewById(R.id.tv_dc_emname);
         tv_dc_devcode = root.findViewById(R.id.tv_dc_devcode);
         tv_de_name = root.findViewById(R.id.tv_de_name);
-        tv_malfunction = root.findViewById(R.id.tv_malfunction);
+        tv_remark = root.findViewById(R.id.tv_remark);
         tv_dc_remark = root.findViewById(R.id.tv_dc_remark);
         btn_commit = root.findViewById(R.id.btn_commit);
         index_position_malfunction = root.findViewById(R.id.index_position_malfunction);
@@ -493,7 +493,7 @@ public class DeliveryForRepairFragment extends BaseFragment implements OnColumnI
 //                tv_fault_phenomenon.setText(""+ dc_reason);
                 tv_fault_phenomenon.setText(""+ dc_reason);
                 index_position_malfunction.setText(""+dc_reasonanalyse);
-                index_position_resource.setText(""+ dc_remark);
+                tv_remark.setText(""+ dc_remark);
 
                 index_position_malfunction.requestFocus();
 

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

@@ -360,18 +360,31 @@ public class ProduceMassageBindingFragment extends BaseFragment implements OnCol
                 switch (checkid){
                     case R.id.rb_pepole:
                         rb_changetext = "人员岗位";
+                        storage_recharge_collect_et.setFocusable(false);
+                        tv_dc_emcode.setFocusableInTouchMode(true);
+                        tv_dc_emcode.requestFocus();
                         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);
                         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);
                         getDatalistCodes(ce_resources.getText().toString().trim(),work_code_code.getText().toString().trim());
                         break;
                     case R.id.rb_ingredients:
                         rb_changetext = "辅料";
+                        storage_recharge_collect_et.setFocusableInTouchMode(true);
+                        storage_recharge_collect_et.requestFocus();
+                        tv_dc_emcode.setFocusable(false);
                         getDatalistCodes(ce_resources.getText().toString().trim(),work_code_code.getText().toString().trim());
                         break;
 
@@ -636,6 +649,7 @@ public class ProduceMassageBindingFragment extends BaseFragment implements OnCol
                 } catch (Exception e) {
                     e.printStackTrace();
                 }
+                et_linecode_smts.setFocusable(false);
                 getDatalistCodes(ce_resources.getText().toString().trim(),work_code_code.getText().toString().trim());
             }
 
@@ -893,7 +907,7 @@ public class ProduceMassageBindingFragment extends BaseFragment implements OnCol
         JSONObject object_1 = new JSONObject();
         object_1.put("MBR_MAKECODE", ce_work_codetrim);//工单号
         object_1.put("MBR_SOURCECODE", at_stationtrim);//资源
-//        object_1.put("MBR_TYPE", rb_changetext);//设备\夹具\辅料
+        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());

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

@@ -125,28 +125,31 @@
                         android:textColor="@color/blue">
                     </TextView>
                 </LinearLayout>
-
-            </LinearLayout>
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content">
-                <TextView
-                    android:text="设备名称:"
-                    android:layout_marginLeft="15dp"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:textSize="@dimen/space_top_line_15"
-                    android:textColor="@color/black">
-                </TextView>
-                <TextView
-                    android:id="@+id/tv_de_name"
-                    android:text=""
-                    android:layout_width="wrap_content"
+                <LinearLayout
+                    android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:textSize="@dimen/space_top_line_15"
-                    android:textColor="@color/blue">
-                </TextView>
+                    android:layout_weight="1">
+                    <TextView
+                        android:text="设备名称:"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:textSize="@dimen/space_top_line_15"
+                        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:textSize="@dimen/space_top_line_15"
+                        android:textColor="@color/blue">
+                    </TextView>
+                </LinearLayout>
+
+
+
             </LinearLayout>
+
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content">
@@ -169,19 +172,19 @@
             </LinearLayout>
 
             <LinearLayout
-                android:visibility="gone"
+
                 android:layout_marginLeft="15dp"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content">
                 <TextView
-                    android:text="故障现象:"
+                    android:text="备注说明:"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:textSize="@dimen/space_top_line_15"
                     android:textColor="@color/black">
                 </TextView>
                 <TextView
-                    android:id="@+id/tv_malfunction"
+                    android:id="@+id/tv_remark"
                     android:text=""
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"

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

@@ -387,7 +387,7 @@
     <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>