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

zzr99

2022-05-27 9305340d0d22505ead926186eb5bc441c9cbf76b

 WebAPI/Controllers/OtherInStockController.cs

@@ -82,7 +82,7 @@
            }
            else
            {
                objJsonResult.code = "0";
                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = DBUtility.ClsPub.sErrInfo;
                objJsonResult.data = oBar;
@@ -398,6 +398,44 @@

        }


        [Route("MateBill/Delete_Json1")]
        [HttpGet]
        public object Delete_Json1(long HInterID, long HMaterID, long HAuxPropID, string HMTONo, long HSourceInterID, long HSourceEntryID, string sHBillType)
        {
            string sErrMsg = string.Empty;
            WebS.WebService1 oWebs = new WebS.WebService1();
            try
            {
                if (oWebs.set_DelPonderationBillMain_Temp_InterIDAndSource(HInterID, HMaterID, HAuxPropID, HMTONo, HSourceInterID, HSourceEntryID, sHBillType, ref sErrMsg))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "删除成功！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                else
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "删除失败！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
            }
            catch (Exception)
            {

                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "删除失败！";
                objJsonResult.data = null;
                return objJsonResult;
            }

        }

        [Route("OtherInBill/DisBillEntryList_Mate_Webs_Json")]
        [HttpGet]
        public object DisBillEntryList_Mate_Webs_Json(string HBillType, string sWhere)