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

yusijie

2023-08-31 838ed2eabcac0a0f5daa13bb4f0e46b745edca0a

 DAL/³µ¼ä¹ÜÀí/ClsSc_StationInBill.cs

@@ -329,7 +329,7 @@
                {
                    omodel.HInterID = DBUtility.ClsPub.CreateBillID(BillType, ref DBUtility.ClsPub.sExeReturnInfo);
                }
                //若MAINDI重复则重新获取
                //
                oCn.BeginTran();
                //主表
                oCn.RunProc("Insert Into Sc_StationInBillMain " +