合并冲突

chenhaozhe

2025-06-04 47b45a4ac3284936515a2edd3e50265de30993a0

 WebAPI/Controllers/XSGL/Xs_OutDoorBillController.cs

@@ -1220,7 +1220,7 @@
        #region  出门确认单报表
        [Route("Xs_OutDoorBill/Xs_OutDoorBillReport")]
        [HttpGet]
        public object Xs_OutDoorBillReport(string HBeginDate, string HEndDate, string sWhere, string user)
        public object Xs_OutDoorBillReport(string HBeginDate, string HEndDate, string sWhere, string user,int HOperationType)
        {
            try
            {
@@ -1233,7 +1233,7 @@
                    return objJsonResult;
                }

                string sql = "exec h_p_Xs_OutDoorBillReport '" + HBeginDate + "','" + HEndDate + "','" + sWhere + "'";
                string sql = "exec h_p_Xs_OutDoorBillReport '" + HBeginDate + "','" + HEndDate + "','" + sWhere + "'," + HOperationType;

                ds = oCN.RunProcReturn(sql, "h_p_Xs_OutDoorBillReport");