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

zrg

2024-03-04 c07bb60b39a9fbf5c41a724c7060f45c821f93ff

 WebAPI/Controllers/SCGL/Sc_ICMOChangeBillController.cs

@@ -488,8 +488,10 @@
                    }

                    //检查源单是否存在
                    string sql = "select * from Sc_ICMOBillSub where HInterID = " + oBill.omodel.HMainSourceInterID + " and HEntryID =" + oBill.omodel.HMainSourceEntryID;
                    ds = oCN.RunProcReturn(sql, "Sc_ICMOBillSub");
                    string sql = "select * from Sc_ICMOBillMain as a " +
                        " inner join Sc_ICMOBillSub as b on a.HInterID = b.HInterID " +
                        " where b.HInterID = " + oBill.omodel.HMainSourceInterID + " and b.HEntryID =" + oBill.omodel.HMainSourceEntryID;
                    ds = oCN.RunProcReturn(sql, "Sc_ICMOBill");
                    if(ds==null || ds.Tables[0].Rows.Count == 0)
                    {
                        objJsonResult.code = "0";