0517吉利通反馈调整

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

@@ -59,6 +59,7 @@ public class JLTPickMaterialOutScanFragment extends BaseFragment implements View
     private double mQty;
     private OnCollectFinishListener mOnCollectFinishListener;
     private String mDatecodebyparse;
+    private boolean mNeedPkg;
     private List<WhcodeBean> mEnclosureList;
 
     public void setOnCollectFinishListener(OnCollectFinishListener onCollectFinishListener) {
@@ -252,6 +253,7 @@ public class JLTPickMaterialOutScanFragment extends BaseFragment implements View
                         mDatecode = FastjsonUtil.getText(dataObject, "DATECODE");
                         mQty = FastjsonUtil.getDouble(dataObject, "QTY");
                         mDatecodebyparse = FastjsonUtil.getText(dataObject, "DATECODEBYPARSE");
+                        mNeedPkg = FastjsonUtil.getBoolean(dataObject, "NEEDPKG");
 
                         mLotEditText.setText(mLotno);
                         mQuantityEditText.setText(CommonUtil.doubleFormat(mQty));
@@ -398,7 +400,7 @@ public class JLTPickMaterialOutScanFragment extends BaseFragment implements View
         }
 
         String enclosure = mEnclosureEditText.getText().toString().trim();
-        if (TextUtils.isEmpty(enclosure)) {
+        if (mNeedPkg && TextUtils.isEmpty(enclosure)) {
             CommonUtil.toastNoRepeat(mActivity, "请采集封装形式");
             mEnclosureEditText.requestFocus();
             return;

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

@@ -234,7 +234,7 @@
 
                 <com.uas.jlt_storage.view.ClearableEditText
                     android:id="@+id/jlt_pick_material_out_scan_lot_et"
-                    style="@style/EditTextUnableStyle"
+                    style="@style/EditTextStyle"
                     android:layout_width="0dp"
                     android:layout_weight="1" />
             </LinearLayout>
@@ -285,7 +285,7 @@
 
                     <com.uas.jlt_storage.view.ClearableEditText
                         android:id="@+id/jlt_pick_material_out_scan_cycle_et"
-                        style="@style/EditTextUnableStyle"
+                        style="@style/EditTextStyle"
                         android:layout_width="0dp"
                         android:layout_weight="1" />
                 </LinearLayout>
@@ -312,8 +312,7 @@
                     style="@style/EditTextStyle"
                     android:layout_width="0dp"
                     android:layout_weight="1"
-                    android:inputType="number"
-                    android:text="1" />
+                    android:inputType="number" />
             </LinearLayout>
 
             <LinearLayout

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

@@ -16,16 +16,11 @@
             android:textColor="#333333" />
         <TextView
             android:id="@+id/item_jlt_storage_in_todo_sub_model_tv"
-            android:layout_width="match_parent"
+            android:layout_width="0dp"
+            android:layout_weight="2"
             android:layout_height="wrap_content"
             android:textColor="#666666"
             tools:text="20342409808"/>
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="10dp">
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -33,9 +28,11 @@
             android:textColor="#333333" />
         <TextView
             android:id="@+id/item_jlt_storage_in_todo_sub_quantity_tv"
-            android:layout_width="match_parent"
+            android:layout_width="0dp"
+            android:layout_weight="1"
             android:layout_height="wrap_content"
             android:textColor="#666666"
             tools:text="10"/>
     </LinearLayout>
+
 </LinearLayout>