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

zrg

2024-10-09 243e86af1a7c74c8bfda3bb41f29a11fef13c065

 WebAPI/DLL/ClsSc_MESBeginWorkBill.cs

@@ -330,13 +330,6 @@
                    return false;
                }

                //保存后控制
                if (!AfterSave(omodel.HInterID, omodel.HICMOInterID, omodel.HICMOEntryID, omodel.HICMOBillNo, 1, ref sReturn))
                {
                    oCn.RollBack();
                    return false;
                }

                //获取最近的上模单  把工单跟模具进行绑定
                ds = oCn.RunProcReturn(@"select  HICMOInterID,HICMOEntryID,HSourceInterID,HSourceEntryID,HSourceID from Sc_ICMOBillStatus_Tmp where HInterID=" + omodel.HMainSourceInterID.ToString(), "Sc_ICMOBillStatus_Tmp");

@@ -365,6 +358,13 @@
                    }
                }

                //保存后控制
                if (!AfterSave(omodel.HInterID, omodel.HICMOInterID, omodel.HICMOEntryID, omodel.HICMOBillNo, 1, ref sReturn))
                {
                    oCn.RollBack();
                    return false;
                }

                sReturn = omodel.HInterID.ToString();
                oCn.Commit();
                return true;