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

yangle

2022-06-12 9faee57fcc026298a78aa8b6639dcd829baf9862

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

@@ -323,9 +323,12 @@
        public override bool AddBill(ref string sReturn)
        {
            try
            { 
            {
                //得到mainid
                omodel.HInterID = DBUtility.ClsPub.CreateBillID(BillType, ref DBUtility.ClsPub.sExeReturnInfo);
                if (DBUtility.ClsPub.isLong(omodel.HInterID) == 0)
                {
                    omodel.HInterID = DBUtility.ClsPub.CreateBillID(BillType, ref DBUtility.ClsPub.sExeReturnInfo);
                }
                //若MAINDI重复则重新获取
                oCn.BeginTran();
                //主表
@@ -390,7 +393,7 @@
                oCn.RunProc("exec h_p_Mes_ProcessExchangeRelationQty_In " + omodel.HInterID.ToString() + ",1");

                
                //==================进站单启用配件清单绑定，则将 é…ä»¶æ¸…单写入  å®žé™…表. å¹¶è¿›è¡Œ ä¿å­˜å¼ºåˆ¶æŽ§åˆ¶
                //==================进站单启用配件清单绑定， è¿›è¡Œ ä¿å­˜å¼ºåˆ¶æŽ§åˆ¶

                //==============================