Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

yusijie

2024-01-19 8996745458e337630e4a35e0b950edea4b1aa7bb

 WebAPI/Controllers/XSGL/Xs_ExceptiveCheckRequestBillController.cs

@@ -486,7 +486,7 @@
                            objJsonResult.data = null;
                            return objJsonResult;
                        }
                        else if (ds.Tables[0].Rows[0]["HBillStatus"].ToString() != "1")
                        else if (int.Parse(ds.Tables[0].Rows[0]["HBillStatus"].ToString()) > 1)
                        {
                            objJsonResult.code = "0";
                            objJsonResult.count = 0;
@@ -509,7 +509,7 @@
                            objJsonResult.data = null;
                            return objJsonResult;
                        }
                        else if (ds.Tables[0].Rows[0]["HBillStatus"].ToString() != "1")
                        else if (int.Parse(ds.Tables[0].Rows[0]["HBillStatus"].ToString()) > 1)
                        {
                            objJsonResult.code = "0";
                            objJsonResult.count = 0;
@@ -622,7 +622,7 @@
                    }


                    if (oBill.omodel.HBillStatus != 1)
                    if (oBill.omodel.HBillStatus > 1)
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;