出库详情增加审核功能, 修改Log日志功能

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

@@ -118,10 +118,10 @@ public class PdaApplication extends Application {
         @Override
         public void onTick(long millisUntilFinished) {
             // 这里每秒会被调用一次
-            int secondsRemaining = (int) (millisUntilFinished / 1000);
-            int minutesRemaining = secondsRemaining / 60;
-            int seconds = secondsRemaining % 60;
-            Log.d("Countdown", "Time remaining: " + minutesRemaining + " minutes, " + seconds + " seconds.");
+//            int secondsRemaining = (int) (millisUntilFinished / 1000);
+//            int minutesRemaining = secondsRemaining / 60;
+//            int seconds = secondsRemaining % 60;
+            //Log.d("Countdown", "Time remaining: " + minutesRemaining + " minutes, " + seconds + " seconds.");
             // 更新UI
         }
 

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

@@ -52,6 +52,7 @@ public class NewOutboundDeliveryorderDetailFragment extends BaseFragment{
     private TextView tv_pi_inoutno;
     private SmartTable mSmartTable;
     private String mPiInoutno;
+    private String pi_id;
     private Column<String> mTypeColumn, mcontentColumn, mCnColumn, mOrispeccodeColumn, mCodeColumn, mDetailColumn;
     private TableData<CollectListBean> mTableData;
     private List<CollectListBean> mFilterStorageInBeans;
@@ -73,7 +74,7 @@ public class NewOutboundDeliveryorderDetailFragment extends BaseFragment{
     private ClearableEditText cet_pallet_no_start;
     private ClearableEditText cet_pallet_no_end;
     private CheckBox cb_pallet_no_cancel;
-    private Button bt_submit;
+    private Button bt_submit,bt_auditing;
 
     @Override
     protected int getLayout() {
@@ -102,6 +103,7 @@ public class NewOutboundDeliveryorderDetailFragment extends BaseFragment{
         cet_pallet_no_end = root.findViewById(R.id.cet_pallet_no_end);
         cb_pallet_no_cancel = root.findViewById(R.id.cb_pallet_no_cancel);
         bt_submit = root.findViewById(R.id.bt_submit);
+        bt_auditing = root.findViewById(R.id.bt_auditing);
 
         radiobutton0.setChecked(true);
         ll_public_content.setVisibility(View.GONE);
@@ -139,45 +141,33 @@ public class NewOutboundDeliveryorderDetailFragment extends BaseFragment{
                         return TableConfig.INVALID_COLOR;
                     }
                 });
+    }
 
-        CommonUtil.setEditorActionListener(jlt_storage_in_barcode_barcode_et, new MyEditorActionListener() {
-            @Override
-            public void MyEditorAction(String text, int actionId, KeyEvent event) {
-                String input = jlt_storage_in_barcode_barcode_et.getText().toString().trim();
-                getmakeInWarhouse(input);
-            }
-        });
-
-        radiogroup1.setOnCheckedChangeListener(new RadioGroup.OnCheckedChangeListener() {
+    private void getConfirmAudit() {
+        progressDialog.show();
+        VolleyRequest.getInstance().stringRequest(new HttpParams.Builder()
+                .url(GloableParams.ADDRESS_CONFIRM_AUDIT)
+                .method(Request.Method.POST)
+                .tag(GloableParams.ADDRESS_CONFIRM_AUDIT)
+                .flag(0)
+                .addParam("piid", pi_id)
+                .build(), new HttpCallback() {
             @Override
-            public void onCheckedChanged(RadioGroup group, int checkedId) {
-                if (checkedId == R.id.radiobutton0) {   //栈板号
-                    ll_public_content.setVisibility(View.GONE);
-                    ll_pallet_no.setVisibility(View.VISIBLE);
-                }else {
-                    ll_public_content.setVisibility(View.VISIBLE);
-                    ll_pallet_no.setVisibility(View.GONE);
-                }
+            public void onSuccess(int flag, Object o) throws Exception {
+                progressDialog.dismiss();
+                CommonUtil.toastNoRepeat(mActivity, "审核成功");
+                //getActivity().getSupportFragmentManager().popBackStackImmediate();
             }
-        });
 
-        bt_submit.setOnClickListener(new View.OnClickListener() {
             @Override
-            public void onClick(View v) {
-                String startcode = cet_pallet_no_start.getText().toString().trim();
-                String endcode = cet_pallet_no_end.getText().toString().trim();
-                if (TextUtils.isEmpty(startcode)) {
-                    CommonUtil.toastNoRepeat(mActivity, "请输入初始栈板号");
-                    return;
-                }
-                boolean checked = cb_pallet_no_cancel.isChecked();
-                getDeliveryDetails(startcode,endcode,"" + checked);
+            public void onFail(int flag, String failStr) throws Exception {
+                progressDialog.dismiss();
+                CommonUtil.toastNoRepeat(mActivity, failStr);
             }
         });
     }
 
     private void getDeliveryDetails(String startcode,String endcode,String isCancel) {
-
         //MyLog.e("aaa","值是:startcode:" +startcode + ",endcode" + endcode + ",isCancel" + isCancel + "," + mPiInoutno + "PALLTE");
         progressDialog.show();
         VolleyRequest.getInstance().stringRequest(new HttpParams.Builder()
@@ -217,11 +207,47 @@ public class NewOutboundDeliveryorderDetailFragment extends BaseFragment{
 
     @Override
     protected void initEvents() {
-        Bundle bundle = getArguments();
-        if (bundle != null) {
-            mPiInoutno = bundle.getString("pi_inoutno");
-        }
-        tv_pi_inoutno.setText(mPiInoutno);
+        CommonUtil.setEditorActionListener(jlt_storage_in_barcode_barcode_et, new MyEditorActionListener() {
+            @Override
+            public void MyEditorAction(String text, int actionId, KeyEvent event) {
+                String input = jlt_storage_in_barcode_barcode_et.getText().toString().trim();
+                getmakeInWarhouse(input);
+            }
+        });
+
+        radiogroup1.setOnCheckedChangeListener(new RadioGroup.OnCheckedChangeListener() {
+            @Override
+            public void onCheckedChanged(RadioGroup group, int checkedId) {
+                if (checkedId == R.id.radiobutton0) {   //栈板号
+                    ll_public_content.setVisibility(View.GONE);
+                    ll_pallet_no.setVisibility(View.VISIBLE);
+                }else {
+                    ll_public_content.setVisibility(View.VISIBLE);
+                    ll_pallet_no.setVisibility(View.GONE);
+                }
+            }
+        });
+
+        bt_submit.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                String startcode = cet_pallet_no_start.getText().toString().trim();
+                String endcode = cet_pallet_no_end.getText().toString().trim();
+                if (TextUtils.isEmpty(startcode)) {
+                    CommonUtil.toastNoRepeat(mActivity, "请输入初始栈板号");
+                    return;
+                }
+                boolean checked = cb_pallet_no_cancel.isChecked();
+                getDeliveryDetails(startcode,endcode,"" + checked);
+            }
+        });
+
+        bt_auditing.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                getConfirmAudit();
+            }
+        });
 
         tv_productdetails.setOnClickListener(new View.OnClickListener() {
             @Override
@@ -239,6 +265,13 @@ public class NewOutboundDeliveryorderDetailFragment extends BaseFragment{
 
     @Override
     protected void initDatas() {
+        Bundle bundle = getArguments();
+        if (bundle != null) {
+            mPiInoutno = bundle.getString("pi_inoutno");
+            pi_id = bundle.getString("PI_ID");
+        }
+        tv_pi_inoutno.setText(mPiInoutno);
+
         getCollectList();
     }
 

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

@@ -63,7 +63,7 @@ public class OutboundLis_Two_fragment extends BaseFragment implements OnColumnIt
     private Fragment mFragment;
     private RefreshLayout mRefreshLayout;
     private SmartTable mSmartTable;
-    private Column<String> va_classColumn,va_codeColumn,va_statusColumn,va_vendnameColumn,va_vendcodeColumn;
+    private Column<String> va_classColumn, va_codeColumn, va_statusColumn, va_vendnameColumn, va_vendcodeColumn;
     private TableData<OutboundListBean> mTableData;
     private int mPageIndex = 1, mPageSize = 20;
     private List<OutboundListBean> mFilterStorageInBeans;
@@ -83,7 +83,7 @@ public class OutboundLis_Two_fragment extends BaseFragment implements OnColumnIt
     @Override
     protected void initViews() {
         FunctionActivity.setTitle(getString(R.string.outboundlist));
-//        ((FunctionActivity) getActivity()).setMoreBtnVisible(true);
+        //        ((FunctionActivity) getActivity()).setMoreBtnVisible(true);
         ((FunctionActivity) getActivity()).setListIconIvVisible(false);
         storage_recharge_collect_et = mActivity.findViewById(R.id.storage_recharge_collect_et);
         mRefreshLayout = mActivity.findViewById(R.id.pda_wms_in_filter_list_srl);
@@ -137,7 +137,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");
@@ -170,17 +169,18 @@ public class OutboundLis_Two_fragment extends BaseFragment implements OnColumnIt
             }
         });
 
-//        ceshiData();
+        //        ceshiData();
     }
-    private void getDatalistCodes(String pi_inoutno){
+
+    private void getDatalistCodes(String pi_inoutno) {
         VolleyRequest.getInstance().stringRequest(new HttpParams.Builder()
                 .url(GloableParams.ADDRESS_DOCUMENTLIBRARY_OUTBOUNDLIST)
                 .method(Request.Method.GET)
                 .tag(TAG + "getindatalist")
                 .flag(0)
-                .addParam("pi_inoutno",pi_inoutno)
-                .addParam("page",mPageIndex+"")
-                .addParam("pageSize",mPageSize+"")
+                .addParam("pi_inoutno", pi_inoutno)
+                .addParam("page", mPageIndex + "")
+                .addParam("pageSize", mPageSize + "")
                 .build(), new HttpCallback() {
             @Override
             public void onSuccess(int flag, Object o) throws Exception {
@@ -192,7 +192,7 @@ public class OutboundLis_Two_fragment extends BaseFragment implements OnColumnIt
                     String result = o.toString();
                     JSONObject resultObject = JSON.parseObject(result);
                     JSONArray dataArray = resultObject.getJSONArray("data");
-                    List<OutboundListBean> list=new ArrayList<>();
+                    List<OutboundListBean> list = new ArrayList<>();
                     if (dataArray != null && dataArray.size() > 0) {
                         for (int i = 0; i < dataArray.size(); i++) {
                             JSONObject dataObject = dataArray.getJSONObject(i);
@@ -214,7 +214,7 @@ public class OutboundLis_Two_fragment extends BaseFragment implements OnColumnIt
                     if (mPageIndex == 1) {
                         mFilterStorageInBeans = list;//PI_INOUTNO
                         setFilterTableData(mFilterStorageInBeans);
-                    }else if (list.size() > 0) {
+                    } else if (list.size() > 0) {
                         mFilterStorageInBeans.addAll(list);
                         mSmartTable.addData(list, true);
                         new Handler().postDelayed(new Runnable() {
@@ -223,7 +223,7 @@ public class OutboundLis_Two_fragment extends BaseFragment implements OnColumnIt
                                 mSmartTable.postInvalidate();
                             }
                         }, 100);
-//                        filterAllSelect();
+                        //                        filterAllSelect();
                     } else {
                         mPageIndex--;
                     }
@@ -237,7 +237,6 @@ public class OutboundLis_Two_fragment extends BaseFragment implements OnColumnIt
                     mRefreshLayout.finishRefresh(0);
                     mRefreshLayout.finishLoadMore(0);
                 }
-
             }
 
             @Override
@@ -258,20 +257,19 @@ 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);
+                va_classColumn, va_codeColumn, va_statusColumn, va_vendnameColumn, va_vendcodeColumn);
         mSmartTable.setTableData(mTableData);
-//        mSmartTable.requestLayout();
+        //        mSmartTable.requestLayout();
         mSmartTable.postDelayed(new Runnable() {
             @Override
             public void run() {
                 mSmartTable.postInvalidate();
             }
         }, 100);
-
     }
+
     private void initPopupWindow() {
         View view = View.inflate(getActivity(), R.layout.pop_outboundlist_out_menu, null);
         stockTaskBtn = (Button) view.findViewById(R.id.pop_material_out_menu_1);
@@ -291,15 +289,13 @@ public class OutboundLis_Two_fragment extends BaseFragment implements OnColumnIt
             }
         });
 
-
-
         stockTaskBtn.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
                 closeMenuPopupWindow();
                 mFragment = new IOCOutMakeMaterial();
-//                ((FunctionActivity) getActivity()).setMoreBtnVisible(false);
-//                ((FunctionActivity) getActivity()).setScanIvVisible(false);
+                //                ((FunctionActivity) getActivity()).setMoreBtnVisible(false);
+                //                ((FunctionActivity) getActivity()).setScanIvVisible(false);
                 FragmentUtils.switchFragment(OutboundLis_Two_fragment.this, mFragment);
             }
         });
@@ -328,6 +324,7 @@ public class OutboundLis_Two_fragment extends BaseFragment implements OnColumnIt
             }
         });
     }
+
     private void closeMenuPopupWindow() {
         if (mMenuPopupWindow != null) {
             mMenuPopupWindow.dismiss();
@@ -345,6 +342,7 @@ public class OutboundLis_Two_fragment extends BaseFragment implements OnColumnIt
     public boolean onFragmentBackPressed() {
         return false;
     }
+
     @Override
     public void onHiddenChanged(boolean hidden) {
         super.onHiddenChanged(hidden);
@@ -353,7 +351,7 @@ public class OutboundLis_Two_fragment extends BaseFragment implements OnColumnIt
             ((FunctionActivity) getActivity()).setListIconIvVisible(false);
         } else {
             FunctionActivity.setTitle(getString(R.string.outboundlist));
-//            ((FunctionActivity) getActivity()).setMoreBtnVisible(true);
+            //            ((FunctionActivity) getActivity()).setMoreBtnVisible(true);
             ((FunctionActivity) getActivity()).setListIconIvVisible(false);
             pop_material_out_resolution.setVisibility(View.GONE);
             stockTaskBtn.setVisibility(View.VISIBLE);
@@ -364,9 +362,11 @@ public class OutboundLis_Two_fragment extends BaseFragment implements OnColumnIt
     @Override
     public void onClick(Column<String> column, String value, String s, int position) {
         String pi_inoutno = mFilterStorageInBeans.get(position).getPI_INOUTNO();
+        String pi_id = mFilterStorageInBeans.get(position).getPI_ID();
         NewOutboundDeliveryorderDetailFragment outboundListAdd_fragment = new NewOutboundDeliveryorderDetailFragment();
         Bundle bundle = new Bundle();
         bundle.putString("pi_inoutno", pi_inoutno);
+        bundle.putString("PI_ID", pi_id);
         outboundListAdd_fragment.setArguments(bundle);
         FragmentUtils.switchFragment(OutboundLis_Two_fragment.this, outboundListAdd_fragment);
     }

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

@@ -282,6 +282,8 @@ public class GloableParams {
 
     public static String ADDRESS_MAKE_OUT_START_END;      //出库详情-->栈板开始和结束栈板
 
+    public static String ADDRESS_CONFIRM_AUDIT;      //出库详情-->审核
+
 
     //连接服务器请求地址
     private static final String ADDRESSTAIL_CONNECT_SERVER = "/api/pda/getAllMasters.action";
@@ -774,6 +776,9 @@ public class GloableParams {
     //出库采集--> 初始栈板号  和结束栈板号
     private static final String ADDRESSTAIL_MAKE_OUT_START_END = "/api/pda/receiving/makeOutStartEnd.action ";
 
+    //出库详情-->审核
+    private static final String ADDRESSTAIL__CONFIRM_AUDIT = "/api/pda/inMaterial/confirmAudit.action";
+
 
 
 
@@ -1256,6 +1261,7 @@ public class GloableParams {
         GloableParams.ADDRESS_TURN_VERIFY_DETAIL = uriHead + GloableParams.ADDRESSTAIL_TURN_VERIFY_DETAIL;
 
         GloableParams.ADDRESS_MAKE_OUT_START_END = uriHead + GloableParams.ADDRESSTAIL_MAKE_OUT_START_END;
+        GloableParams.ADDRESS_CONFIRM_AUDIT = uriHead + GloableParams.ADDRESSTAIL__CONFIRM_AUDIT;
 
 
     }

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

@@ -145,51 +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)) { // 输出错误信息
-                //Log.e(tag, msg);
-                if (msg.length() > 4000) {
-                    // 因为Logcat一次最多能输出4000个字符左右，所以我们按4000字符分段
-                    int chunkCount = msg.length() / 4000; // 分割成多少段
-                    for (int i = 0; i <= chunkCount; i++) {
-                        int max = 4000 * (i + 1);
-                        if (max >= msg.length()) {
-                            Log.e(tag, msg.substring(4000 * i));
-                        } else {
-                            Log.e(tag, msg.substring(4000 * i, max));
-                        }
-                    }
-                } else {
-                    Log.d(tag, msg);
-                }
-            } else if ('w' == level && ('w' == MYLOG_TYPE || 'v' == MYLOG_TYPE)) {
-                Log.w(tag, msg);
-            } else if ('d' == level && ('d' == MYLOG_TYPE || 'v' == MYLOG_TYPE)) {
-                Log.d(tag, msg);
-            } else if ('i' == level && ('d' == MYLOG_TYPE || 'v' == MYLOG_TYPE)) {
-                Log.i(tag, msg);
-            } else {
-                Log.v(tag, msg);
-            }
+            setInterceptlength(tag, msg, level);
             if (MYLOG_WRITE_TO_FILE && 'd' == level) {
                 writeLogtoFile(String.valueOf(level), tag, msg);
             }
         }
     }
 
-    public static void logLongMessage(String tag, String message) {
-        if (message.length() > 4000) {
-            // 因为Logcat一次最多能输出4000个字符左右，所以我们按4000字符分段
-            int chunkCount = message.length() / 4000; // 分割成多少段
+    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 = 4000 * (i + 1);
-                if (max >= message.length()) {
-                    Log.d(tag, message.substring(4000 * 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 {
-                    Log.d(tag, message.substring(4000 * i, max));
+                    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 {
-            Log.d(tag, message);
+            if ('e' == level) {
+                Log.e(tag, msg);
+            } else if ('w' == level) {
+                Log.w(tag, msg);
+            } else if ('d' == level) {
+                Log.d(tag, msg);
+            } else if ('i' == level) {
+                Log.i(tag, msg);
+            } else {
+                Log.v(tag, msg);
+            }
         }
     }
 

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

@@ -239,6 +239,17 @@
                 android:background="@color/blue1"
                 android:text="提交"
                 />
+
+            <Button
+                android:id="@+id/bt_auditing"
+                android:layout_gravity="center_horizontal"
+                android:layout_width="wrap_content"
+                android:layout_height="40dp"
+                android:layout_marginStart="20dp"
+                android:textSize="15sp"
+                android:background="@color/blue1"
+                android:text="审核"
+                />
         </LinearLayout>
 
 

build.gradle

@@ -53,8 +53,8 @@ ext {
             targetSdkVersion : 31,
             compileSdkVersion: 31,
             buildToolsVersion: "35.0.0",
-            versionCode      : 29,
-            versionName      : "1.2.8"
+            versionCode      : 30,
+            versionName      : "1.2.9"
     ]
 
     depsVersion = [