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

yusijie

7 天以前 80a908596cb1d1faac6b0f54f68182ad22303814

 WebAPI/Controllers/SCGL/日计划管理/Sc_WorkBillSortBillController.cs

@@ -327,7 +327,7 @@
                        }
                        else
                        {
                            ds = oCN.RunProcReturn("select * from h_v_JIT_Sc_WorkBillSortBillList where 1=1 and hmainid=" + NumData[i], "h_v_JIT_Sc_WorkBillSortBillList");
                            ds = oCN.RunProcReturn("select * from h_v_JIT_Sc_WorkBillSortBillList_Left where 1=1 and hmainid=" + NumData[i], "h_v_JIT_Sc_WorkBillSortBillList");

                            if (ds.Tables[0].Rows.Count > 0)
                            {