Ver código fonte

修改单据过账弹窗逻辑

songw 1 ano atrás
pai
commit
ba3ac2ba92

+ 27 - 8
app/src/main/java/com/uas/hy_electronic/fragment/IOCOutMakeMaterialOper.java

@@ -107,7 +107,8 @@ import okhttp3.OkHttpClient;
  * Created by RaoMeng on 2016/7/27.
  * 材料出库采集页面
  */
-public class IOCOutMakeMaterialOper extends BaseFragment implements View.OnClickListener, RadioGroup.OnCheckedChangeListener, HttpCallback , DataSourceManager.NotifyData,
+public class IOCOutMakeMaterialOper extends BaseFragment implements View.OnClickListener, RadioGroup.OnCheckedChangeListener,
+        HttpCallback , DataSourceManager.NotifyData,
         VolleyUtil.VolleyFinishListener{
     private static final int SCAN_BARCODE_CODE = 103;
     private static final int SPLIT_BARCODE_SUCCESS = 104;
@@ -584,7 +585,6 @@ public class IOCOutMakeMaterialOper extends BaseFragment implements View.OnClick
 
         requestType = VolleyUtil.FRAGMETN_WHCHECK_PRODUCT_CHECK;
 
-
         btnActionbarRight.setOnClickListener(this);
         etBarCode.addTextChangedListener(watcher);
         mCollectTypeRadioGroup.setOnCheckedChangeListener(this);
@@ -761,7 +761,6 @@ public class IOCOutMakeMaterialOper extends BaseFragment implements View.OnClick
                             tv_pr_detail.setText("" + materialInformationBean.getData().getPR_DETAIL());
                             tv_pr_spec.setText("" + materialInformationBean.getData().getPR_SPEC());
 
-
                             VolleyUtil.getVolleyUtil().requestMakeMaterialCheck(mActivity, GloableParams.ADDRESS_WH_PRODUCT, VolleyUtil.METHOD_GET,
                                     requestType, materialInformationBean.getData().getPD_PRODCODE(), pd_datawhcode);
 
@@ -1427,12 +1426,32 @@ public class IOCOutMakeMaterialOper extends BaseFragment implements View.OnClick
                                                         }
                                                     }).create().show();
                                         }else {
-                                            new AlertDialog.Builder(mActivity)
-                                                    .setMessage("不允许过账!" + FastjsonUtil.getText(resultObject, "data"))
-                                                    .setNegativeButton(R.string.text_btn_close, null)
-                                                    .create().show();
+                                            if (!TextUtils.isEmpty(FastjsonUtil.getText(resultObject, "data"))) {
+                                                new AlertDialog.Builder(mActivity)
+                                                        .setMessage("不允许过账!" + FastjsonUtil.getText(resultObject, "data"))
+                                                        .setNegativeButton(R.string.text_btn_close, null)
+                                                        .create().show();
+                                            }else {
+                                                new AlertDialog.Builder(mActivity)
+                                                .setMessage("确认将单据过账?")
+                                                .setNegativeButton(R.string.cancel, null)
+                                                .setPositiveButton(R.string.confirm, new DialogInterface.OnClickListener() {
+                                                    @Override
+                                                    public void onClick(DialogInterface dialogInterface, int i) {
+                                                        dialogInterface.dismiss();
+                                                        progressDialog.show();
+                                                        VolleyRequest.getInstance().stringRequest(mStringRequest,
+                                                                new HttpParams.Builder()
+                                                                        .url(GloableParams.ADDRESS_INMATERIAL_CONFIRMPOST)
+                                                                        .method(Request.Method.POST)
+                                                                        .addParam("piid", pi_id)
+                                                                        .tag(TAG + "confirmpost")
+                                                                        .flag(FLAG_CONFIRM_POST).build(),
+                                                                30 * 1000, IOCOutMakeMaterialOper.this);
+                                                    }
+                                                }).create().show();
+                                            }
                                         }
-
                                     }else {
                                         new AlertDialog.Builder(mActivity)
                                                 .setMessage("确认将单据过账?")

+ 1 - 0
app/src/main/res/layout/fragment_iocout_make_material_oper.xml

@@ -503,6 +503,7 @@
                     android:background="@color/transparent"/>
             </LinearLayout>
         </LinearLayout>
+
     </LinearLayout>
 
 </RelativeLayout>

+ 2 - 2
build.gradle

@@ -54,8 +54,8 @@ ext {
             targetSdkVersion : 28,
             compileSdkVersion: 28,
             buildToolsVersion: "28.0.3",
-            versionCode      : 30,
-            versionName      : "v1.2.0"
+            versionCode      : 31,
+            versionName      : "v1.2.1"
     ]
 
     depsVersion = [