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

zzr99

2022-06-13 f19044df4868173b951e81b377869666d16806dd

 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();
                //主表
@@ -389,7 +392,11 @@
                //////
                oCn.RunProc("exec h_p_Mes_ProcessExchangeRelationQty_In " + omodel.HInterID.ToString() + ",1");

                 
                
                //==================进站单启用配件清单绑定， è¿›è¡Œ ä¿å­˜å¼ºåˆ¶æŽ§åˆ¶

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

                //判断是否是 é¦–道工序
                DataSet ds1;
                ds1 = oCn.RunProcReturn(" select HLastProc,HFstProc from Sc_ProcessExchangeBillMain a  " +