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

zrg

2024-12-13 b61367ed247eed2947f05d448e89271e688b66f8

 WebAPI/Controllers/XSGL/Xs_SeOrderBillController.cs

@@ -1451,7 +1451,7 @@
            try
            {

                ds = oCN.RunProcReturn("select * from h_v_IF_SeOrderBillList where hmainid =" + HInterID + " order by hsubid asc", "h_v_IF_SeOrderBillList");
                ds = oCN.RunProcReturn("select * from h_v_IF_SeOrderBillEdit where hmainid =" + HInterID + " order by hsubid asc", "h_v_IF_SeOrderBillList");
                if (ds == null || ds.Tables[0].Rows.Count == 0)
                {
                    objJsonResult.code = "0";