工序管理页面增加类型显示，抽检判定界面不良代码列表优化，目前隐藏功能

app/src/main/java/com/uas/hystorage/activity/IndexActivity.java

@@ -511,6 +511,8 @@ public class IndexActivity extends BaseActivity implements AdapterView.OnItemCli
                 sl_namelist.add(data.getString("SL_NAME"));
             }
             String ifboxortag = dataObject.getString("IFBOXORTAG");
+            String SC_NAME = dataObject.getString("SC_DEVCODE");
+            SharedPreUtil.saveString(this,"SC_DEVCODE",SC_NAME);
             SharedPreUtil.saveString(this,Constants.FLAG.GANG_WEI_SOURCE_ifboxortag,ifboxortag);
             iforigio = dataObject.getString("IFORIGIO");
             ifmultiin = dataObject.getString("IFMULTIIN");

app/src/main/java/com/uas/hystorage/adapter/MychouAdapter.java

@@ -17,6 +17,7 @@ import android.widget.ImageView;
 import com.google.gson.Gson;
 import com.uas.hystorage.R;
 import com.uas.hystorage.bean.DefectCodeitemBean;
+import com.uas.hystorage.view.ClearableEditText;
 import com.uas.hystorage.view.MySpinnerView;
 
 import org.jetbrains.annotations.NotNull;
@@ -124,16 +125,35 @@ public class MychouAdapter extends RecyclerView.Adapter<MychouAdapter.viewHolder
         holder.spinnerSel.setAdapter(adapterspr);
         holder.spinnerSel.setTag(position);
         holder.spinnerSel.setItemClick(new MySpinnerView.ItemClick() {
+            @SuppressLint("SetTextI18n")
             @Override
             public void onClick(View view, int i) {
                 int pos = (int) view.getTag();
                 resultList.get(pos).setSpinnerIndex(i);
+//                holder.cled_bu.setText(stringList.get(i));
 //                bean.setSpinnerIndex(i);
                 Log.e("MychouAdapter", "spinnerSel:onClick: " + i);
             }
         });
         //也就是这里
         holder.spinnerSel.setSelection(bean.getSpinnerIndex());
+//        holder.cled_bu.addTextChangedListener(new TextWatcher() {
+//            @Override
+//            public void beforeTextChanged(CharSequence s, int start, int count, int after) {
+//
+//            }
+//
+//            @Override
+//            public void onTextChanged(CharSequence s, int start, int before, int count) {
+//
+//            }
+//
+//            @Override
+//            public void afterTextChanged(Editable s) {
+//
+//                resultList.get(position).setInputce(s.toString());
+//            }
+//        });
         //看这里的操作。给组件设置了tag，在onclick 里面通过tag取到对应的position这样才是最准的
         holder.tv_remove.setTag(position);
         holder.tv_remove.setOnClickListener(new View.OnClickListener() {
@@ -194,12 +214,14 @@ public class MychouAdapter extends RecyclerView.Adapter<MychouAdapter.viewHolder
         private MySpinnerView spinnerSel;
         private ImageView tv_remove;
         private TextWatcher textWatcher;
+        private ClearableEditText cled_bu;
 
         public viewHolder(View view) {
             super(view);
             title = view.findViewById(R.id.textTitle);
             spinnerSel = view.findViewById(R.id.spinnerSel);
             tv_remove = view.findViewById(R.id.tv_remove);
+            cled_bu = view.findViewById(R.id.cled_bu);
             textWatcher = new TextWatcher() {
                 @Override
                 public void beforeTextChanged(CharSequence s, int start, int count, int after) {

app/src/main/java/com/uas/hystorage/bean/GrouponlineBean.java

@@ -6,10 +6,12 @@ package com.uas.hystorage.bean;
 public class GrouponlineBean {
     public String LOTNO;
     public String QTY;
+    public String DEVCOUNT;
     public GrouponlineBean(){}
-    public GrouponlineBean(String LOTNO, String QTY) {
+    public GrouponlineBean(String LOTNO, String QTY,String DEVCOUNT) {
         this.LOTNO = LOTNO;
         this.QTY = QTY;
+        this.DEVCOUNT=DEVCOUNT;
     }
     public GrouponlineBean(String LOTNO) {
         this.LOTNO = LOTNO;

app/src/main/java/com/uas/hystorage/fragment/RolloutFragment.java

@@ -121,6 +121,9 @@ public class RolloutFragment extends BaseFragment implements View.OnClickListene
     private TextView tv_ma_madeqty;
     private TextView tv_ma_unmadeqty;
     private TextView tv_sccode;
+    private ClearableEditText ct_jitqty;
+    private String sc_devcode;
+    private String ct_jitqtytrim;
 
     @Override
     protected int getLayout() {
@@ -134,6 +137,7 @@ public class RolloutFragment extends BaseFragment implements View.OnClickListene
         storage_recharge_collect_ets = mActivity.findViewById(R.id.storage_recharge_collect_ets);
         storage_recharge_scan_ivs = mActivity.findViewById(R.id.storage_recharge_scan_ivs);
         jlt_storage_in_barcode_save_btn = mActivity.findViewById(R.id.jlt_storage_in_barcode_save_btn);
+        ct_jitqty = mActivity.findViewById(R.id.ct_jitqty);
         ct_qty = mActivity.findViewById(R.id.ct_qty);
         tv_prodcode = mActivity.findViewById(R.id.tv_prodcode);
         rg_hui = mActivity.findViewById(R.id.rg_hui);
@@ -165,7 +169,12 @@ public class RolloutFragment extends BaseFragment implements View.OnClickListene
         rb_zhuanchu.setChecked(true);
         rb_changeinter="0";
         storage_recharge_collect_ets.requestFocus();
-
+        sc_devcode = SharedPreUtil.getString(mActivity, "SC_DEVCODE", null);
+        if (StringUtil.isEmpty(sc_devcode)){
+            ct_jitqty.setText("0");
+        }else {
+            ct_jitqty.setText("1");
+        }
 
     }
 
@@ -726,15 +735,22 @@ public class RolloutFragment extends BaseFragment implements View.OnClickListene
         }else {
             clear_tv="0";
         }
+        ct_jitqtytrim = ct_jitqty.getText().toString().trim();
+        if (ct_jitqtytrim.isEmpty()){
+            ct_jitqtytrim = sc_devcode;
+        }
+
         if (rb_changeinter.equals("0")){
             if (fededatalist == null || fededatalist.size()==0) {
-                GrouponlineBean grouponlineBeans= new GrouponlineBean(storage_recharge_collect_ets.getText().toString().trim(),ct_qty.getText().toString().trim());
+                GrouponlineBean grouponlineBeans= new GrouponlineBean(storage_recharge_collect_ets.getText().toString().trim()
+                        ,ct_qty.getText().toString().trim()
+                        ,ct_jitqtytrim);
                 mFeededList.add(grouponlineBeans);
             }else {
                 for (int i=0;i<fededatalist.size();i++){
-                    mFeededList.add(new GrouponlineBean(fededatalist.get(i).getLOTNO(),fededatalist.get(i).getQTY()));
+                    mFeededList.add(new GrouponlineBean(fededatalist.get(i).getLOTNO(),fededatalist.get(i).getQTY(),ct_jitqtytrim));
                 }
-                mFeededList.add(new GrouponlineBean(storage_recharge_collect_ets.getText().toString().trim(),ct_qty.getText().toString().trim()));
+                mFeededList.add(new GrouponlineBean(storage_recharge_collect_ets.getText().toString().trim(),ct_qty.getText().toString().trim(),ct_jitqtytrim));
             }
         }else {
             if (fededatalist == null || fededatalist.size()==0) {

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

@@ -14,7 +14,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:background="@drawable/bg_line_edittext"
-        android:inputType="number"
+        android:inputType="number|numberDecimal"
         android:padding="10dp"
         />
 </LinearLayout>

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

@@ -299,6 +299,31 @@
                 android:inputType="number"
                 />
 
+        </LinearLayout>
+        <LinearLayout
+            android:paddingLeft="@dimen/sp_16"
+            android:paddingRight="@dimen/sp_16"
+            android:orientation="horizontal"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+            <TextView
+                android:textColor="@color/red"
+                style="@style/inputItemCaption"
+                android:text="机台数">
+            </TextView>
+            <com.uas.hystorage.view.ClearableEditText
+                android:id="@+id/ct_jitqty"
+                style="@style/EditTextStyle"
+                android:layout_weight="1"
+                android:background="@drawable/bg_line_edittext"
+                android:focusable="true"
+                android:focusableInTouchMode="true"
+                android:hint="请输入机台数"
+                android:imeOptions="actionSend"
+                android:textColor="@color/black"
+                android:inputType="number"
+                />
+
         </LinearLayout>
         <RadioGroup
             android:id="@+id/rg_hui"

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

@@ -24,6 +24,19 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginLeft="@dimen/dp_10">
+            <com.uas.hystorage.view.ClearableEditText
+                android:visibility="gone"
+                android:id="@+id/cled_bu"
+                style="@style/EditTextStyle"
+                android:background="@null"
+                android:focusable="true"
+                android:focusableInTouchMode="true"
+                android:hint="请输入不良代码"
+                android:imeOptions="actionSend"
+                android:textColor="@color/black"
+                android:layout_weight="1">
+            </com.uas.hystorage.view.ClearableEditText>
+
             <com.uas.hystorage.view.MySpinnerView
                 android:id="@+id/spinnerSel"
                 android:layout_width="match_parent"

build.gradle

@@ -54,8 +54,8 @@ ext {
             targetSdkVersion : 28,
             compileSdkVersion: 28,
             buildToolsVersion: "28.0.3",
-            versionCode      : 30,
-            versionName      : "v1.2.0"
+            versionCode      : 32,
+            versionName      : "v1.2.2"
     ]
 
     depsVersion = [