出库添加【已采总数】

app/src/main/java/com/uas/keg_storage/bean/JLTMaterialBean.java

@@ -38,6 +38,7 @@ public class JLTMaterialBean implements Serializable {
     private String PR_SPEC;//物料规格
     private String title;//客户
     private String DC;//入库日期
+    private double HAVEREADY_ALL;//已采总数
 
     public JLTMaterialBean() {
     }
@@ -240,4 +241,12 @@ public class JLTMaterialBean implements Serializable {
     public void setDC(String DC) {
         this.DC = DC;
     }
+
+    public double getHAVEREADY_ALL() {
+        return HAVEREADY_ALL;
+    }
+
+    public void setHAVEREADY_ALL(double HAVEREADY_ALL) {
+        this.HAVEREADY_ALL = HAVEREADY_ALL;
+    }
 }

app/src/main/java/com/uas/keg_storage/fragment/JLTPickMaterialOutScanFragment.java

@@ -70,7 +70,7 @@ public class JLTPickMaterialOutScanFragment extends BaseFragment implements View
     private static final int SCAN_LOT_CODE = 104;
     private ClearableEditText mLotEditText, mQuantityEditText, mCycleEditText,
             mMultipleEditText, mBrandEditText, mModelEditText, mSupplierEditText;
-    private TextView mInoutnoTextView, mModelTextView, mDoneTextView,
+    private TextView mInoutnoTextView, mModelTextView, mDoneTextView, mDoneAllTextView,
             mTodoTextView, mTsTextView, mFdbsTextView, mFyTextView, mQtyHintTextView, mProdTextView, mSpecTextView, mCustomerTextView;
     private ImageView mScanImageView, mEnclosureImageView, mModelScanIv, mLotScanIv;
     private ClearableEditText mBarcodeEditText;
@@ -133,6 +133,7 @@ public class JLTPickMaterialOutScanFragment extends BaseFragment implements View
         mInoutnoTextView = root.findViewById(R.id.jlt_pick_material_out_scan_inoutno_tv);
         mModelTextView = root.findViewById(R.id.jlt_pick_material_out_scan_model_tv);
         mDoneTextView = root.findViewById(R.id.jlt_pick_material_out_scan_done_tv);
+        mDoneAllTextView = root.findViewById(R.id.jlt_pick_material_out_scan_doneall_tv);
         mTodoTextView = root.findViewById(R.id.jlt_pick_material_out_scan_todo_tv);
         mScanImageView = root.findViewById(R.id.jlt_pick_material_out_scan_barcode_iv);
         mBarcodeEditText = root.findViewById(R.id.jlt_pick_material_out_scan_barcode_et);
@@ -432,6 +433,7 @@ public class JLTPickMaterialOutScanFragment extends BaseFragment implements View
         mMaterialBean.setBAR_MPN(FastjsonUtil.getText(listObject, "PN"));
         mMaterialBean.setRESTQTY(FastjsonUtil.getDouble(listObject, "NEEDREADY"));
         mMaterialBean.setBAR_REMAIN(FastjsonUtil.getDouble(listObject, "HAVEREADY"));
+        mMaterialBean.setHAVEREADY_ALL(FastjsonUtil.getDouble(listObject, "HAVEREADY_ALL"));
         mMaterialBean.setBAR_BRAND(FastjsonUtil.getText(listObject, "PD_BRAND"));
         mMaterialBean.setPR_DETAIL(FastjsonUtil.getText(listObject, "PR_DETAIL"));
         mMaterialBean.setPR_SPEC(FastjsonUtil.getText(listObject, "PR_SPEC"));
@@ -455,6 +457,7 @@ public class JLTPickMaterialOutScanFragment extends BaseFragment implements View
             mModelTextView.setText(mMaterialBean.getBAR_MPN());
             mTodoTextView.setText(CommonUtil.doubleFormat(restqty));
             mDoneTextView.setText(CommonUtil.doubleFormat(mMaterialBean.getBAR_REMAIN()));
+            mDoneAllTextView.setText(CommonUtil.doubleFormat(mMaterialBean.getHAVEREADY_ALL()));
 //            mTsTextView.setText(mMaterialBean.getTS());
 //            mFdbsTextView.setText(mMaterialBean.getFDBS());
 //            mFyTextView.setText(mMaterialBean.getFY());
@@ -861,12 +864,16 @@ public class JLTPickMaterialOutScanFragment extends BaseFragment implements View
                     JSONObject dataObject = resultObject.getJSONObject("data");
                     if (dataObject != null) {
                         CommonUtil.toastNoRepeat(mActivity, "拣货成功");
-                        double restqty = FastjsonUtil.getDouble(dataObject, "RESTQTY");
-                        double pickqty = FastjsonUtil.getDouble(dataObject, "PICKQTY");
+                        double restqty = FastjsonUtil.getDouble(dataObject, "NEEDREADY");
+                        double pickqty = FastjsonUtil.getDouble(dataObject, "HAVEREADY");
+                        double pickAll = FastjsonUtil.getDouble(dataObject, "HAVEREADY_ALL");
                         mMaterialBean.setRESTQTY(restqty);
                         mMaterialBean.setBAR_REMAIN(pickqty);
+                        mMaterialBean.setHAVEREADY_ALL(pickAll);
+
                         mTodoTextView.setText(CommonUtil.doubleFormat(restqty));
                         mDoneTextView.setText(CommonUtil.doubleFormat(pickqty));
+                        mDoneAllTextView.setText(CommonUtil.doubleFormat(pickAll));
 
 //                        SharedPreUtil.saveFloat(mActivity, Constants.FLAG.JLT_PICK_MATERIAL_QUANTITY, (float) restqty);
                         resetState(true);

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

@@ -13,24 +13,55 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
 
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:text="单号"
-            android:textColor="#333333"
-            android:textSize="13sp" />
+        <LinearLayout
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1">
 
-        <TextView
-            android:id="@+id/jlt_pick_material_out_scan_inoutno_tv"
-            android:layout_width="match_parent"
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:text="单号"
+                android:textColor="#333333"
+                android:textSize="13sp" />
+
+            <TextView
+                android:id="@+id/jlt_pick_material_out_scan_inoutno_tv"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:focusable="true"
+                android:longClickable="true"
+                android:paddingLeft="6dp"
+                android:textColor="#333333"
+                android:textIsSelectable="true"
+                android:textSize="13sp"
+                tools:text="2342353543" />
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:focusable="true"
-            android:longClickable="true"
-            android:paddingLeft="6dp"
-            android:textColor="#333333"
-            android:textIsSelectable="true"
-            android:textSize="13sp"
-            tools:text="2342353543" />
+            android:layout_weight="1">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:text="已采总数"
+                android:textColor="#333333"
+                android:textSize="13sp" />
+
+            <TextView
+                android:id="@+id/jlt_pick_material_out_scan_doneall_tv"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:focusable="true"
+                android:longClickable="true"
+                android:paddingLeft="6dp"
+                android:textColor="@color/text_blue"
+                android:textIsSelectable="true"
+                android:textSize="13sp"
+                tools:text="2342353543" />
+        </LinearLayout>
     </LinearLayout>
 
     <LinearLayout
@@ -57,6 +88,18 @@
             android:textIsSelectable="true"
             android:textSize="13sp"
             tools:text="100" />
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:text="型号"
+            android:textColor="#333333"
+            android:textSize="13sp" />
 
         <TextView
             android:id="@+id/jlt_pick_material_out_scan_model_tv"

pda_libs/pulltoreflashlibrary/build/generated/source/buildConfig/debug/com/handmark/pulltorefresh/library/BuildConfig.java

@@ -8,6 +8,6 @@ public final class BuildConfig {
   public static final String APPLICATION_ID = "com.handmark.pulltorefresh.library";
   public static final String BUILD_TYPE = "debug";
   public static final String FLAVOR = "";
-  public static final int VERSION_CODE = 3;
-  public static final String VERSION_NAME = "v2.1";
+  public static final int VERSION_CODE = 4;
+  public static final String VERSION_NAME = "v2.2";
 }

pda_libs/pulltoreflashlibrary/build/intermediates/manifests/aapt/debug/AndroidManifest.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.handmark.pulltorefresh.library"
-    android:versionCode="3"
-    android:versionName="v2.1" >
+    android:versionCode="4"
+    android:versionName="v2.2" >
 
     <uses-sdk
         android:minSdkVersion="16"

pda_libs/pulltoreflashlibrary/build/intermediates/manifests/aapt/debug/output.json

@@ -1 +1 @@
-[{"outputType":{"type":"AAPT_FRIENDLY_MERGED_MANIFESTS"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":3,"versionName":"v2.1","enabled":true,"outputFile":"pulltoreflashlibrary-debug.aar","fullName":"debug","baseName":"debug"},"path":"AndroidManifest.xml","properties":{"packageId":"com.handmark.pulltorefresh.library","split":""}}]
+[{"outputType":{"type":"AAPT_FRIENDLY_MERGED_MANIFESTS"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":4,"versionName":"v2.2","enabled":true,"outputFile":"pulltoreflashlibrary-debug.aar","fullName":"debug","baseName":"debug"},"path":"AndroidManifest.xml","properties":{"packageId":"com.handmark.pulltorefresh.library","split":""}}]

pda_libs/pulltoreflashlibrary/build/intermediates/manifests/full/debug/AndroidManifest.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.handmark.pulltorefresh.library"
-    android:versionCode="3"
-    android:versionName="v2.1" >
+    android:versionCode="4"
+    android:versionName="v2.2" >
 
     <uses-sdk
         android:minSdkVersion="16"

pda_libs/pulltoreflashlibrary/build/intermediates/manifests/full/debug/output.json

@@ -1 +1 @@
-[{"outputType":{"type":"MERGED_MANIFESTS"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":3,"versionName":"v2.1","enabled":true,"outputFile":"pulltoreflashlibrary-debug.aar","fullName":"debug","baseName":"debug"},"path":"AndroidManifest.xml","properties":{"packageId":"com.handmark.pulltorefresh.library","split":""}}]
+[{"outputType":{"type":"MERGED_MANIFESTS"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":4,"versionName":"v2.2","enabled":true,"outputFile":"pulltoreflashlibrary-debug.aar","fullName":"debug","baseName":"debug"},"path":"AndroidManifest.xml","properties":{"packageId":"com.handmark.pulltorefresh.library","split":""}}]