合并

ch

2022-11-23 695d9c4cda618bae357d6f70a068b604dac4fdd3

 WebAPI/Controllers/»ù´¡×ÊÁÏ/»ù´¡×ÊÁÏ/Gy_SOPBillController.cs

@@ -40,7 +40,7 @@
                //    objJsonResult.data = null;
                //    return objJsonResult;
                //}
                string sql1 = string.Format(@"select * from h_v_Sc_WorkOrderList where HMainID='" + sWhere + "'");
                string sql1 = string.Format(@"select * from h_v_Sc_WorkOrderList where å¼€å·¥æ ‡è®° = 1 and HMainID='" + sWhere + "'");
               
                ds = oCN.RunProcReturn(sql1, "h_v_Sc_WorkOrderList");
               
@@ -68,7 +68,7 @@
        /// </summary>
        [Route("Sc_ICMOBillStatus_Tmp/Filelist")]
        [HttpGet]
        public object Filelist()
        public object Filelist(int sWhere)
        {
            try
            {
@@ -81,9 +81,9 @@
                //    objJsonResult.data = null;
                //    return objJsonResult;
                //}
                string sql1 = string.Format(@"select HSno åºå·,HFileName æ–‡ä»¶åç§° from Gy_SOPBillSub2");
                string sql1 = string.Format(@"select * from h_v_Sc_GetFileList where æ–‡ä»¶ID = " + sWhere);

                ds = oCN.RunProcReturn(sql1, "Gy_SOPBillSub2");
                ds = oCN.RunProcReturn(sql1, "h_v_Sc_GetFileList");


                objJsonResult.code = "1";