锡膏上料添加【工单号】输入框

app/src/main/java/com/uas/uaspda/fragment/SolderChargingFragment.java

@@ -42,7 +42,7 @@ import java.util.List;
  */
 public class SolderChargingFragment extends BaseFragment {
     private static final int SCAN_BARCODE_CODE = 204;
-    private ClearableEditText mBarcodeEditText, mLinecodeEditText;
+    private ClearableEditText mBarcodeEditText, mLinecodeEditText, mMacodeEditText;
     private RecyclerView mRecyclerView;
     private CheckBox mCheckBox;
     private Button mConfirmButton;
@@ -66,6 +66,7 @@ public class SolderChargingFragment extends BaseFragment {
 
         mBarcodeEditText = root.findViewById(R.id.solder_charging_barcode_et);
         mLinecodeEditText = root.findViewById(R.id.solder_charging_linecode_et);
+        mMacodeEditText = root.findViewById(R.id.solder_charging_macode_et);
         mCheckBox = root.findViewById(R.id.solder_charging_runout_cb);
         mConfirmButton = root.findViewById(R.id.solder_charging_confirm_btn);
         mLineSelectIv = root.findViewById(R.id.solder_charging_linecode_select_iv);
@@ -189,6 +190,7 @@ public class SolderChargingFragment extends BaseFragment {
     private void confirmCharging(String barcode) {
         progressDialog.show();
         String linecode = mLinecodeEditText.getText().toString().trim();
+        String macode = mMacodeEditText.getText().toString().trim();
         VolleyRequest.getInstance().stringRequest(new HttpParams.Builder()
                 .url(GloableParams.ADDRESS_SPM_LODING)
                 .method(Request.Method.POST)
@@ -196,6 +198,7 @@ public class SolderChargingFragment extends BaseFragment {
                 .flag(0)
                 .addParam("barcode", barcode)
                 .addParam("linecode", linecode)
+                .addParam("macode", macode)
                 .addParam("isEmpty", String.valueOf(mCheckBox.isChecked()))
                 .build(), new HttpCallback() {
             @Override

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

@@ -27,6 +27,30 @@
             android:hint="请采集条码" />
     </LinearLayout>
 
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="4dp"
+        android:orientation="horizontal">
+
+        <TextView
+            style="@style/inputItemCaption"
+            android:text="工单号" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:padding="4dp"
+            android:text="*"
+            android:textColor="@color/red"
+            android:visibility="invisible" />
+
+        <com.uas.uaspda.view.ClearableEditText
+            android:id="@+id/solder_charging_macode_et"
+            style="@style/inputItemValue"
+            android:hint="请采集工单号" />
+    </LinearLayout>
+
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"

build.gradle

@@ -45,8 +45,8 @@ ext {
             targetSdkVersion : 28,
             compileSdkVersion: 28,
             buildToolsVersion: "28.0.3",
-            versionCode      : 15,
-            versionName      : "v3.1"
+            versionCode      : 16,
+            versionName      : "v3.2"
     ]
 
     depsVersion = [