调整Log日志功能,优化部分代码

app/src/main/java/uas/erp/jiaweisi_wms/application/PdaApplication.java

@@ -104,7 +104,6 @@ public class PdaApplication extends Application {
 
         //创建更新目录和日志目录
 
-
         //删除非当天的Log日志, Android8.0以下用不了
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
             MyLog.delNotDayFile();
@@ -122,7 +121,7 @@ public class PdaApplication extends Application {
             int secondsRemaining = (int) (millisUntilFinished / 1000);
             int minutesRemaining = secondsRemaining / 60;
             int seconds = secondsRemaining % 60;
-            Log.d("Countdown", "Time remaining: " + minutesRemaining + " minutes, " + seconds + " seconds.");
+            //Log.d("Countdown", "Time remaining: " + minutesRemaining + " minutes, " + seconds + " seconds.");
             // 更新UI
         }
 

app/src/main/java/uas/erp/jiaweisi_wms/fragment/IndexWareHouseContentFragment.java

@@ -139,22 +139,22 @@ public class IndexWareHouseContentFragment extends BaseFragment implements Adapt
 //                    getFragmentManager().beginTransaction().addToBackStack(null)
 //                            .replace(R.id.container_function_fragment, fragment).commit();
 //                    break;
-                case GloableParams.MENU_STORAGE_STOCK_INFO_COLLECT:
+                case GloableParams.MENU_STORAGE_STOCK_INFO_COLLECT:     //库存条码绑定
                     fragment = new InventoryBindingFragment();
                     getFragmentManager().beginTransaction().addToBackStack(null)
                             .replace(R.id.container_function_fragment, fragment).commit();
                     break;
-                case GloableParams.MENU_STORAGE_BARCODE_FREEZE:
+                case GloableParams.MENU_STORAGE_BARCODE_FREEZE:         //库存条码冻结
                     fragment = new InventoryBarcodeFreeze();
                     getFragmentManager().beginTransaction().addToBackStack(null)
                             .replace(R.id.container_function_fragment, fragment).commit();
                     break;
-                case GloableParams.GRIDNAME_FINISHED_PRODUCT_STORAGE://成品入库
+                case GloableParams.GRIDNAME_FINISHED_PRODUCT_STORAGE:   //成品入库
                     fragment = new NewJltStorageInFilterListFragment();
                     getFragmentManager().beginTransaction().addToBackStack(null)
                             .replace(R.id.container_function_fragment, fragment).commit();
                     break;
-                case GloableParams.GRIDNAME_FINISHED_PRODUCT_OUTBOUND://成品出库
+                case GloableParams.GRIDNAME_FINISHED_PRODUCT_OUTBOUND:  //成品出库
                     fragment = new OutboundLis_Two_fragment();
                     getFragmentManager().beginTransaction().addToBackStack(null)
                             .replace(R.id.container_function_fragment, fragment).commit();

app/src/main/java/uas/erp/jiaweisi_wms/fragment/InventoryBindingFragment.java

@@ -266,7 +266,7 @@ public class InventoryBindingFragment extends BaseFragment implements View.OnCli
             }
         });
 
-        //QTY回车
+        //数量 回车
         CommonUtil.setEditorActionListener(jlt_edit_qty, new MyEditorActionListener() {
             @Override
             public void MyEditorAction(String text, int actionId, KeyEvent event) {

app/src/main/java/uas/erp/jiaweisi_wms/fragment/ModifyBarcodeQuantityFragment.java

@@ -464,7 +464,7 @@ public class ModifyBarcodeQuantityFragment extends BaseFragment {
                 progressDialog.show();
                 String url = null;
                 try {
-                    if (isShop) {
+                    if (isShop) {    //旧代码,必定为false
                         url = GloableParams.ADDRESS_SMT_GET_BARCODE_DATA + "?barcode=" + URLEncoder.encode(barcode, "utf-8");
                     } else {
                         url = GloableParams.ADDRESS_OUT_MATERIAL_GET_BARCODE_DATA + "?barcode=" + URLEncoder.encode(barcode, "utf-8");

app/src/main/java/uas/erp/jiaweisi_wms/fragment/NewOutboundDeliveryorderDetailFragment.java

@@ -121,10 +121,6 @@ public class NewOutboundDeliveryorderDetailFragment extends BaseFragment{
                     }
                 });
 
-
-
-
-
         jlt_storage_in_barcode_barcode_et.setOnEditorActionListener(new TextView.OnEditorActionListener() {
             @Override
             public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
@@ -160,8 +156,6 @@ public class NewOutboundDeliveryorderDetailFragment extends BaseFragment{
                 FragmentUtils.switchFragment(NewOutboundDeliveryorderDetailFragment.this, productDetailsFragment);
             }
         });
-
-
     }
 
     @Override

app/src/main/java/uas/erp/jiaweisi_wms/fragment/OutboundLis_Two_fragment.java

@@ -91,12 +91,11 @@ public class OutboundLis_Two_fragment extends BaseFragment implements OnColumnIt
         mScanImageView = (ImageView) mActivity.findViewById(R.id.storage_recharge_scan_iv);
         mMenuButton = (Button) mActivity.findViewById(R.id.btn_actionbar_more);
 
-
+        storage_recharge_collect_et.requestFocus();
     }
 
     @Override
     protected void initEvents() {
-        storage_recharge_collect_et.requestFocus();
         storage_recharge_collect_et.setOnEditorActionListener(new TextView.OnEditorActionListener() {
             @Override
             public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
@@ -110,14 +109,31 @@ public class OutboundLis_Two_fragment extends BaseFragment implements OnColumnIt
                 return false;
             }
         });
-        mFilterStorageInBeans = Collections.synchronizedList(new ArrayList<>());
 
-        initPopupWindow();
-        getDatalistCodes(storage_recharge_collect_et.getText().toString().trim());
+        mRefreshLayout.setOnRefreshListener(new OnRefreshListener() {
+            @Override
+            public void onRefresh(RefreshLayout refreshLayout) {
+                mPageIndex = 1;
+                getDatalistCodes(storage_recharge_collect_et.getText().toString().trim());
+            }
+        });
+
+        mRefreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() {
+            @Override
+            public void onLoadMore(RefreshLayout refreshLayout) {
+                mPageIndex++;
+                getDatalistCodes(storage_recharge_collect_et.getText().toString().trim());
+            }
+        });
     }
 
     @Override
     protected void initDatas() {
+        mFilterStorageInBeans = Collections.synchronizedList(new ArrayList<>());
+
+        initPopupWindow();
+        getDatalistCodes(storage_recharge_collect_et.getText().toString().trim());
+
         WindowManager wm = mActivity.getWindowManager();
         int screenWith = wm.getDefaultDisplay().getWidth();
         mSmartTable.getConfig().setMinTableWidth(screenWith)
@@ -141,8 +157,6 @@ public class OutboundLis_Two_fragment extends BaseFragment implements OnColumnIt
                     }
                 });
 
-
-
         va_classColumn = new Column<String>("单号", "PI_INOUTNO");
         va_classColumn.setFixed(true);
         va_codeColumn = new Column<String>("单据类型", "PI_CLASS");
@@ -150,7 +164,6 @@ public class OutboundLis_Two_fragment extends BaseFragment implements OnColumnIt
         va_vendnameColumn = new Column<String>("过账状态", "PI_STATUS");
         va_vendcodeColumn = new Column<String>("仓库编号", "PI_WHCODE");
 
-
         va_classColumn.setOnColumnItemClickListener(this);
         va_codeColumn.setOnColumnItemClickListener(this);
         va_statusColumn.setOnColumnItemClickListener(this);
@@ -159,24 +172,8 @@ public class OutboundLis_Two_fragment extends BaseFragment implements OnColumnIt
         mScanImageView.setOnClickListener(this);
         mMenuButton.setOnClickListener(this);
 
-        mRefreshLayout.setOnRefreshListener(new OnRefreshListener() {
-            @Override
-            public void onRefresh(RefreshLayout refreshLayout) {
-                mPageIndex = 1;
-                getDatalistCodes(storage_recharge_collect_et.getText().toString().trim());
-            }
-        });
-
-        mRefreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() {
-            @Override
-            public void onLoadMore(RefreshLayout refreshLayout) {
-                mPageIndex++;
-                getDatalistCodes(storage_recharge_collect_et.getText().toString().trim());
-            }
-        });
-
-//        ceshiData();
     }
+
     private void getDatalistCodes(String pi_inoutno){
         VolleyRequest.getInstance().stringRequest(new HttpParams.Builder()
                 .url(GloableParams.ADDRESS_DOCUMENTLIBRARY_OUTBOUNDLIST)
@@ -263,7 +260,6 @@ public class OutboundLis_Two_fragment extends BaseFragment implements OnColumnIt
         });
     }
 
-
     private void setFilterTableData(List<OutboundListBean> filterTableData) {
         mTableData = new TableData<OutboundListBean>("收料单列表", filterTableData,
                 va_classColumn,va_codeColumn,va_statusColumn,va_vendnameColumn,va_vendcodeColumn);
@@ -296,8 +292,6 @@ public class OutboundLis_Two_fragment extends BaseFragment implements OnColumnIt
             }
         });
 
-
-
         stockTaskBtn.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
@@ -323,7 +317,6 @@ public class OutboundLis_Two_fragment extends BaseFragment implements OnColumnIt
             }
         });
 
-
         mMenuPopupWindow = new PopupWindow(view, LinearLayout.LayoutParams.WRAP_CONTENT, LinearLayout.LayoutParams.WRAP_CONTENT, true);
         mMenuPopupWindow.setBackgroundDrawable(new BitmapDrawable());
         mMenuPopupWindow.setOnDismissListener(new PopupWindow.OnDismissListener() {

app/src/main/java/uas/erp/jiaweisi_wms/fragment/ProductDetailsFragment.java

@@ -60,7 +60,6 @@ public class ProductDetailsFragment extends BaseFragment{
         mDetailColumn.setFixed(true);
         mFilterStorageInBeans = new ArrayList<>();
 
-
         WindowManager wm = mActivity.getWindowManager();
         int screenWith = wm.getDefaultDisplay().getWidth();
         mSmartTable.getConfig().setMinTableWidth(screenWith)

app/src/main/java/uas/erp/jiaweisi_wms/fragment/SpecialMaterialOutFragment.java

@@ -342,7 +342,7 @@ public class SpecialMaterialOutFragment extends BaseFragment {
 
                 PdaApplication.mRequestQueue.cancelAll(TAG + "specialout");
 
-                mStringRequest = new StringRequest(Request.Method.POST, true ? GloableParams.ADDRESS_OUT_MATERIAL_SPECIAL_OUT_DEAL : GloableParams.ADDRESS_OUT_MATERIAL_SPECIAL_OUT,
+                mStringRequest = new StringRequest(Request.Method.POST, GloableParams.ADDRESS_OUT_MATERIAL_SPECIAL_OUT_DEAL,
                         new Response.Listener<String>() {
                             @Override
                             public void onResponse(String s) {

app/src/main/java/uas/erp/jiaweisi_wms/fragment/StorageTwoIQCInFragment.java

@@ -61,7 +61,6 @@ import uas.erp.jiaweisi_wms.view.ClearableEditText;
  * @describe 入库管理-IQC检验页面
  * @date 2018/4/22 17:14
  */
-
 public class StorageTwoIQCInFragment extends BaseFragment implements View.OnClickListener, HttpCallback {
     private static final int SCAN_BARCODE_CODE = 113;
     private static final int FLAG_GET_BARCODE = 0x06;
@@ -114,7 +113,6 @@ public class StorageTwoIQCInFragment extends BaseFragment implements View.OnClic
     private ClearableEditText cet_barcode;
     private ImageView iv_bar_scan;
 
-
     @Override
     public void onDestroyView() {
         super.onDestroyView();
@@ -390,7 +388,7 @@ public class StorageTwoIQCInFragment extends BaseFragment implements View.OnClic
                 mWarehouseCacheAdapter.notifyDataSetChanged();
             }
         } catch (Exception e) {
-
+            e.printStackTrace();
         }
     }
 

app/src/main/java/uas/erp/jiaweisi_wms/global/GloableParams.java

@@ -262,19 +262,21 @@ public class GloableParams {
     public static String ADDRESS_DOCUMENTLIBRARY_CODETWO_COMMIT_LIST;
     public static String ADDRESS_DOCUMENTLIBRARY_CODETWO_COMMIT_DETAIL;
     public static String ADDRESS_DOCUMENTLIBRARY_CODETWO_COMMIT_AUDIT;
-    public static String ADDRESS_DOCUMENTLIBRARY_DELIVERYORDERDETAIL;
+    public static String ADDRESS_DOCUMENTLIBRARY_DELIVERYORDERDETAIL;   //出库详情 --> 产品明细
 
     public static String ADDRESS_DOCUMENTLIBRARY_MAKECOLLECTBOXLIST;
-    public static String ADDRESS_DOCUMENTLIBRARY_MAKEOUTWARHOUSE;
+    public static String ADDRESS_DOCUMENTLIBRARY_MAKEOUTWARHOUSE;   //出库详情-->条码Enter
 
     public static String ADDRESS_DOCUMENTLIBRARY_OUTBOUNDLIST;
+
+    //入库详情 --> 条码Enter
     public static String ADDRESS_DOCUMENTLIBRARY_MAKEINWARHOUSE;
 
 
     public static String ADDRESS_PDAIO_IN_GETWHCODE;
     public static String ADDRESS_OUTMATERIAL_NEWPRODINOUT;
     public static String ADDRESS_DOCUMENT_DETAILS;
-    public static String ADDRESS_INVENTORY_SUBMIT;      //入库详情提交
+    public static String ADDRESS_INVENTORY_SUBMIT;      //入库详情-->提交
 
 
     //连接服务器请求地址
@@ -294,7 +296,7 @@ public class GloableParams {
     private static final String ADDRESSTAIL_OUTMATERIAL_GETPDAVERSION = "/api/pda/outMaterial/getPdaVersion.action";
 
     /**
-     * 条码信息采集
+     * 条码信息采集--> 条码enter
      */
     private static final String ADDRESSTAIL_INMATERIAL_GETBARACCEPTCODE = "/api/pda/inMaterial/getBarAcceptCode.action";
     private static final String ADDRESSTAIL_INMATERIAL_SAVEBARACCEPTCODE = "/api/pda/inMaterial/saveBarAcceptCode.action";
@@ -478,9 +480,9 @@ public class GloableParams {
     private static final String ADDRESSTAIL_WHTRANSFER_DATA = "/api/pda/transfer/getCodeData.action";
     //储位转移：请求诸位转移
     private static final String ADDRESSTAIL_WHTRANSFER = "/api/pda/transfer/locaTransfer.action";
-    //仓库管理：获取原条码信息以及拆分的子条码数据
+    //仓库管理：获取原条码信息以及拆分的子条码数据 / 撤销拆分条码enter
     private static final String ADDRESSTAIL_BATCH_GET_SON_BARCODE = "/api/pda/batch/getSonBarcode.action";
-    //仓库管理：撤销拆分
+    //仓库管理：撤销拆分按钮
     private static final String ADDRESSTAIL_BATCH_BACK_BREAKING = "/api/pda/batch/backBreaking.action";
 
 
@@ -546,7 +548,7 @@ public class GloableParams {
     private static final String ADDRESSTAIL_INMATERIAL_GETCODEDATA = "/api/pda/inMaterial/getCodeData.action";
     //单据过账
     private static final String ADDRESSTAIL_INMATERIAL_CONFIRMPOST = "/api/pda/inMaterial/confirmPost.action";
-    //条码入库自动过账
+    //条码入库 -- > 条码enter
     private static final String ADDRESSTAIL_INBARCODE_CONFIRMBARLOCATION = "/api/pda/inBarCode/confirmBarLocation.action";
     //撤销入库删除条码
     private static final String ADDRESSTAIL_INMATERIAL_DELETEGETDETAIL = "/api/pda/inMaterial/deleteGetDetail.action";
@@ -676,10 +678,12 @@ public class GloableParams {
     private static String ADDRESSTAIL_RECHARGE_TURN_QC = "/api/pda/acceptNToVerify/turnQC.action";
     private static String ADDRESSTAIL_INSPECTION_GETLIST_NEEDGET = "/api/pda/verifyToQC/getNeedGetList.action";
     /**
-     * IQC入库
+     * IQC入库--->箱号/条码
      */
     private static String ADDRESSTAIL_IQC_GETDATA_BARCODE = "/api/pda/QCToPurcCheckin/getDataByBar.action";
+    //IQC入库-->入库
     private static String ADDRESSTAIL_IQC_TURN_PURC_STORAGE = "/api/pda/QCToPurcCheckin/turnPurcStorage.action";
+    //IQC入库--> 已转入库/未转入库 -->搜索
     private static String ADDRESSTAIL_IQC_GETLIST_NEEDGET = "/api/pda/QCToPurcCheckin/getNeedGetList.action";
 
     /**
@@ -717,12 +721,13 @@ public class GloableParams {
     //修改数量弹窗
     private static final String ADDRESSTAIL_GET_BARCODE_DATA = "/api/pda/outMaterial/getBarcodeData.action";
 
+    //盘点作业-->查询按钮
     private static final String ADDRESSTAIL_GET_PRE_MATERIAL_LIST = "/api/pda/outMaterial/getStockMaterialList.action";
 
     //条码库存打印
     private static final String ADDRESSTAIL_GET_INVENTORY_BARCODE_DATA = "/api/pda/batch/getBarcodeData.action";
 
-    //库存条码冻结
+    //库存条码冻结-->确定
     private static final String ADDRESSTAIL_GET_INVENTORY_BARCODE_FREEZE = "/scm/reserve/freezeBarcodeByPDA.action";
 
     //新收料单
@@ -733,23 +738,25 @@ public class GloableParams {
     private static String ADDRESSTAIL_RECHARGE_GETDATA_BARCODETWO_COMMIT_DETAIL = "/api/pda/inMaterial/getVerifyApplyDetail.action";
     private static String ADDRESSTAIL_RECHARGE_GETDATA_BARCODETWO_COMMIT_AUDIT = "/scm/purchase/auditVerifyApply.action";
 
-    //入库单列表
+    //出库详情--> 产品明细
     private static final String ADDRESSTAIL_DELIVERYORDERDETAIL = "/api/pda/receiving/makeCollectList.action";
 
     //单据入库详情列表
     private static final String ADDRESSTAIL_MAKECOLLECTBOXLIST = "/api/pda/receiving/makeCollectBoxList.action";
+    //入库详情 --> 条码Enter
     private static final String ADDRESSTAIL_MAKEINWARHOUSE = "/api/pda/receiving/makeInWarhouse.action";
-    //出库单列表
+    //出库详情 --> 条码Enter
     private static final String ADDRESSTAIL_MAKEOUTWARHOUSE = "/api/pda/receiving/makeOutWarhouse.action";
+    //成品出库单列表--> 表格数据
     private static String ADDRESSTAIL_OUTBOUNDLIST = "/api/pda/receiving/getOutDataList.action";
 
 
     //入库获取仓库列表
     private static final String ADDRESSTAIL_PDAIO_IN_GETWHCODE = "/api/pdaio/pdaioIn/getWhcode.action";
     private static final String ADDRESSTAIL_COUNTING_NEWPRODINOUT = "/api/pdaio/pdaioIn/newProdinout.action";
-    //生成单据明细
+    //入库详情---> 生成单据明细
     private static final String ADDRESSTAIL_DOCUMENT_DETAILS = "/api/pda/receiving/GenProdiodetail.action";
-    //提交
+    //入库详情---> 提交
     private static final String ADDRESSTAIL_INVENTORY_SUBMIT = "/scm/reserve/ProdInOutFinish.action";
 
 

app/src/main/java/uas/erp/jiaweisi_wms/util/MyLog.java

@@ -2,6 +2,7 @@ package uas.erp.jiaweisi_wms.util;
 
 import android.annotation.SuppressLint;
 import android.os.Build;
+import android.os.Environment;
 import android.util.Log;
 
 import java.io.BufferedWriter;
@@ -44,6 +45,36 @@ public class MyLog {
     private static boolean isDebug = true;        //普通log的开关
     private static String TAG = "英唐" + "-----------";
 
+    private static volatile MyLog myLog; // 使用 volatile 关键字确保多线程环境下的可见性
+
+    private MyLog() {
+    }
+
+    public static MyLog getInstance() {
+        if (myLog == null) { // 第一次检查，提高效率，避免每次都进行同步
+            synchronized (MyLog.class) { // 同步代码块，保证线程安全
+                if (myLog == null) { // 第二次检查，防止多个线程同时进入同步块时重复创建实例
+                    myLog = new MyLog();
+                    //兼容不同版本分区处理
+                    File downloadDir = null;
+                    if (Build.VERSION.SDK_INT >= 29) {
+                        // Android 10+ 使用私有目录
+                        downloadDir = PdaApplication.getmContext().getExternalFilesDir(Environment.DIRECTORY_DOWNLOADS);
+                    } else {
+                        downloadDir = Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS);
+                    }
+                    if (!downloadDir.exists()) {
+                        downloadDir.mkdirs();
+                    }
+                    MYLOG_PATH_SDCARD_DIR1 = downloadDir.getAbsolutePath() + File.separator + PdaApplication.getmContext().getPackageName();
+
+                    //Log.e("aaa", "MyLog被创建了: " + MYLOG_PATH_SDCARD_DIR1);
+                }
+            }
+        }
+        return myLog;
+    }
+
     public static void e(String msg) {
         if (isDebug) {
             Log.e(TAG, msg);
@@ -114,20 +145,57 @@ public class MyLog {
     private static void log(String tag, String msg, char level) {
         msg = "\r\n" + msg;
         if (MYLOG_SWITCH) {
-            if ('e' == level && ('e' == MYLOG_TYPE || 'v' == MYLOG_TYPE)) { // 输出错误信息
+            setInterceptlength(tag, msg, level);
+            if (MYLOG_WRITE_TO_FILE && 'd' == level) {
+                writeLogtoFile(String.valueOf(level), tag, msg);
+            }
+        }
+    }
+
+    public static void setInterceptlength(String tag, String msg,char level) {
+        if (msg.length() > 3000) {
+            // 因为Logcat一次最多能输出4000个字符左右，所以按3000字符分段比较好
+            int chunkCount = msg.length() / 3000; // 分割成多少段
+            for (int i = 0; i <= chunkCount; i++) {
+                int max = 3000 * (i + 1);
+                if (max >= msg.length()) {
+                    if ('e' == level) { // 输出错误信息
+                        Log.e(tag, msg.substring(3000 * i));
+                    } else if ('w' == level) {
+                        Log.w(tag, msg.substring(3000 * i));
+                    } else if ('d' == level) {
+                        Log.d(tag, msg.substring(3000 * i));
+                    } else if ('i' == level) {
+                        Log.i(tag, msg.substring(3000 * i));
+                    } else {
+                        Log.v(tag, msg.substring(3000 * i));
+                    }
+                } else {
+                    if ('e' == level) {
+                        Log.e(tag, msg.substring(3000 * i, max));
+                    } else if ('w' == level) {
+                        Log.w(tag, msg.substring(3000 * i, max));
+                    } else if ('d' == level) {
+                        Log.d(tag, msg.substring(3000 * i, max));
+                    } else if ('i' == level) {
+                        Log.i(tag, msg.substring(3000 * i, max));
+                    } else {
+                        Log.v(tag, msg.substring(3000 * i, max));
+                    }
+                }
+            }
+        } else {
+            if ('e' == level) {
                 Log.e(tag, msg);
-            } else if ('w' == level && ('w' == MYLOG_TYPE || 'v' == MYLOG_TYPE)) {
+            } else if ('w' == level) {
                 Log.w(tag, msg);
-            } else if ('d' == level && ('d' == MYLOG_TYPE || 'v' == MYLOG_TYPE)) {
+            } else if ('d' == level) {
                 Log.d(tag, msg);
-            } else if ('i' == level && ('d' == MYLOG_TYPE || 'v' == MYLOG_TYPE)) {
+            } else if ('i' == level) {
                 Log.i(tag, msg);
             } else {
                 Log.v(tag, msg);
             }
-            if (MYLOG_WRITE_TO_FILE && 'd' == MYLOG_TYPE) {
-                writeLogtoFile(String.valueOf(level), tag, msg);
-            }
         }
     }
 
@@ -227,4 +295,5 @@ public class MyLog {
     }
 
 
+
 }

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

@@ -7,8 +7,6 @@
             android:id="@+id/include_menuactionbar"
             layout="@layout/actionbar_withback" />-->
 
-
-
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent"

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

@@ -616,7 +616,6 @@
                     android:text="审核"
                     android:visibility="gone" />
 
-
                 <Button
                     android:id="@+id/storage_iqc_in_commit_btn"
                     style="@style/ButtonStyle"
@@ -630,7 +629,8 @@
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:background="@color/white"
-                android:visibility="gone">
+                android:visibility="gone"
+                >
 
                 <TextView
                     android:id="@+id/storage_iqc_in_error_tv"

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

@@ -72,6 +72,8 @@
         android:id="@+id/jlt_storage_in_filter_list_st"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
+        android:layout_marginStart="5dp"
+        android:layout_marginEnd="5dp"
         android:layout_marginBottom="@dimen/dp_10"
         android:layout_weight="1" />
     <TextView

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

@@ -2,11 +2,14 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
+
     <com.bin.david.form.core.SmartTable
-        android:layout_marginTop="@dimen/dp_10"
         android:id="@+id/jlt_storage_in_filter_list_st"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
+        android:layout_marginStart="5dp"
+        android:layout_marginTop="@dimen/dp_10"
+        android:layout_marginEnd="5dp"
         android:layout_marginBottom="@dimen/dp_10"
         android:layout_weight="1" />