修改工单绑定列表数据, 修复车间输入框会记录工序.

app/src/main/java/com/uas/kesai_workshop/adapter/WorkOrderTabletAdapter.java

@@ -6,7 +6,6 @@ import android.content.Intent;
 import android.support.annotation.NonNull;
 import android.support.v7.widget.RecyclerView;
 import android.text.Editable;
-import android.text.TextUtils;
 import android.text.TextWatcher;
 import android.util.Log;
 import android.view.LayoutInflater;
@@ -53,7 +52,7 @@ public class WorkOrderTabletAdapter extends RecyclerView.Adapter<WorkOrderTablet
     @Override
     public void onBindViewHolder(@NonNull @NotNull WorkOrderTabletAdapter.viewHolder viewHolder, @SuppressLint("RecyclerView") int position) {
         viewHolder.tv_dingdnahao_value.setText(mList.get(position).getMPD_ORDERCODE());
-//        viewHolder.tv_gongdan_value.setText(mList.get(position).getMA_CODE());
+        viewHolder.tv_gongdan_value.setText(mList.get(position).getMA_CODE());
         viewHolder.tv_order_numbers_value.setText(String.valueOf(mList.get(position).getMA_QTY()));
         viewHolder.tv_chanping_value.setText(mList.get(position).getPR_CODE());
         viewHolder.tv_name_value.setText(mList.get(position).getPR_DETAIL());
@@ -66,18 +65,18 @@ public class WorkOrderTabletAdapter extends RecyclerView.Adapter<WorkOrderTablet
         viewHolder.tv_planned_quantity.setText(mList.get(position).getMPD_OUTQTY());
         viewHolder.tv_begintime.setText(mList.get(position).getMP_BEGINTIME());
         viewHolder.tv_dangribaogong_value.setText(mList.get(position).getNOWQTY());
-//        viewHolder.tv_leijibaogong_value.setText(mList.get(position).getSUMQTY());
+        viewHolder.tv_leijibaogong_value.setText(mList.get(position).getSUMQTY());
 //        viewHolder.tv_leijipaichan_value.setText(mList.get(position).getSUMOUTPUT());
 
-        String workState = mList.get(position).getFINISH();
-        if (!TextUtils.isEmpty(workState)) {
-            if ("已完工".equals(workState)){
-                viewHolder.tv_work_state.setTextColor(mContext.getResources().getColor(R.color.red));
-            }else if ("未完工".equals(workState)) {
-                viewHolder.tv_work_state.setTextColor(mContext.getResources().getColor(R.color.black));
-            }
-            viewHolder.tv_work_state.setText(mList.get(position).getFINISH());
-        }
+//        String workState = mList.get(position).getFINISH();
+//        if (!TextUtils.isEmpty(workState)) {
+//            if ("已完工".equals(workState)){
+//                viewHolder.tv_work_state.setTextColor(mContext.getResources().getColor(R.color.red));
+//            }else if ("未完工".equals(workState)) {
+//                viewHolder.tv_work_state.setTextColor(mContext.getResources().getColor(R.color.black));
+//            }
+//            viewHolder.tv_work_state.setText(mList.get(position).getFINISH());
+//        }
 
         viewHolder.cb_isSelet.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
             @Override
@@ -186,7 +185,7 @@ public class WorkOrderTabletAdapter extends RecyclerView.Adapter<WorkOrderTablet
         private TextView tv_mujianguige;
         private TextView tv_beizhu;
         private TextView tv_work_center;
-        private TextView tv_work_state;
+//        private TextView tv_work_state;
         private TextView tv_planned_quantity;
         private CheckBox cb_isSelet;
         private LinearLayout ll_content;
@@ -201,7 +200,7 @@ public class WorkOrderTabletAdapter extends RecyclerView.Adapter<WorkOrderTablet
         private EditText et_first_article_number;
 
         private TextView tv_shoujian_zhuangtai;     //首件状态
-        private TextView tv_dingdanjiaoqi;          //订单交期
+//        private TextView tv_dingdanjiaoqi;          //订单交期
         private LinearLayout ll_chejianluxian;      //车间路线
         private RelativeLayout rl_item;
 
@@ -209,7 +208,7 @@ public class WorkOrderTabletAdapter extends RecyclerView.Adapter<WorkOrderTablet
             super(view);
             cb_isSelet = view.findViewById(R.id.cb_isSelet);
             tv_dingdnahao_value = view.findViewById(R.id.tv_dingdnahao_value);
-            tv_work_state = view.findViewById(R.id.tv_work_state);
+//            tv_work_state = view.findViewById(R.id.tv_work_state);
             tv_order_numbers_value = view.findViewById(R.id.tv_order_numbers_value);
             tv_planned_quantity = view.findViewById(R.id.tv_planned_quantity);
             tv_shoujian_zhuangtai = view.findViewById(R.id.tv_shoujian_zhuangtai);
@@ -218,7 +217,7 @@ public class WorkOrderTabletAdapter extends RecyclerView.Adapter<WorkOrderTablet
             tv_begintime = view.findViewById(R.id.tv_begintime);
             et_first_article_number = view.findViewById(R.id.et_first_article_number);
             tv_spec_value = view.findViewById(R.id.tv_spec_value);
-            tv_dingdanjiaoqi = view.findViewById(R.id.tv_dingdanjiaoqi);
+//            tv_dingdanjiaoqi = view.findViewById(R.id.tv_dingdanjiaoqi);
             tv_beizhu = view.findViewById(R.id.tv_beizhu);
             ll_baogongmingxi = view.findViewById(R.id.ll_baogongmingxi);
             iv_esop = view.findViewById(R.id.iv_esop);
@@ -227,14 +226,14 @@ public class WorkOrderTabletAdapter extends RecyclerView.Adapter<WorkOrderTablet
             iv_data_gather = view.findViewById(R.id.iv_data_gather);
             rl_item = view.findViewById(R.id.rl_item);
 
-//            tv_gongdan_value = view.findViewById(R.id.tv_gongdan_value);
+            tv_gongdan_value = view.findViewById(R.id.tv_gongdan_value);
             tv_chanping_value = view.findViewById(R.id.tv_chanping_value);
 //            ll_content = view.findViewById(R.id.ll_content);
 //            tv_workmanship = view.findViewById(R.id.tv_workmanship);
 //            tv_work_center = view.findViewById(R.id.tv_work_center);
 //            tv_mujianguige = view.findViewById(R.id.tv_mujianguige);
 //
-//            tv_leijibaogong_value = view.findViewById(R.id.tv_leijibaogong_value);
+            tv_leijibaogong_value = view.findViewById(R.id.tv_leijibaogong_value);
 //            tv_leijipaichan_value = view.findViewById(R.id.tv_leijipaichan_value);
         }
 

app/src/main/java/com/uas/kesai_workshop/fragment/WorkOrderAllocationTabletFra.java

@@ -398,7 +398,6 @@ public class WorkOrderAllocationTabletFra extends BaseFragment {
                                 } else {
                                     cr_stepcode = "";
                                     ll_group.removeAllViews();
-                                    et_chejian.setText("");
                                     LinearLayout linearLayoutHO = getLinearLayoutHO();
                                     ll_group.addView(linearLayoutHO);
                                     for (int i = 0; i < dataArray.size(); i++) {
@@ -430,7 +429,6 @@ public class WorkOrderAllocationTabletFra extends BaseFragment {
                                                     }
                                                     Log.e("aaa","取消选中的是: " + cr_stepcode);
                                                 }
-                                                et_chejian.setText(TextUtils.isEmpty(cr_stepcode)?"":cr_stepcode.substring(0,cr_stepcode.length()-1));
                                             }
                                         });
                                         linearLayoutHO.addView(checkBox);

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

@@ -75,11 +75,11 @@
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:text="工单状态: "
+                        android:text="工单号: "
                         android:textSize="14sp" />
 
                     <TextView
-                        android:id="@+id/tv_work_state"
+                        android:id="@+id/tv_gongdan_value"
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         android:layout_marginStart="8dp"
@@ -345,11 +345,11 @@
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:text="订单交期: "
+                        android:text="累计报工数量: "
                         android:textSize="14sp" />
 
                     <TextView
-                        android:id="@+id/tv_dingdanjiaoqi"
+                        android:id="@+id/tv_leijibaogong_value"
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         android:layout_marginStart="3dp"

build.gradle

@@ -64,8 +64,8 @@ ext {
             targetSdkVersion : 28,
             compileSdkVersion: 28,
             buildToolsVersion: "28.0.3",
-            versionCode      : 77,
-            versionName      : "v1.7.7"
+            versionCode      : 78,
+            versionName      : "v1.7.8"
     ]
 
     depsVersion = [