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

zzr99

2021-12-25 9385f2a2e4e2b6578f4b9e1cc139db977c2467ee

 WorkM/流转卡管理/Sc_ProcessExchangeBill.cs

@@ -1347,11 +1347,13 @@
            string s = "";
            int sYear = 0;
            int sPeriod = 0;
            if (DBUtility.Xt_BaseBillFun.Fun_AllowYearPeriod(dtpHDate.Value, ref sYear, ref sPeriod, ref s) == false)
            {
                MessageBox.Show(s, "鎻愮ず");
                return false;
            }
            //if (DBUtility.Xt_BaseBillFun.Fun_AllowYearPeriod(dtpHDate.Value, ref sYear, ref sPeriod, ref s) == false)
            //{
            //    MessageBox.Show(s, "鎻愮ず");
            //    return false;
            //}
            sYear = ClsPub.isDate(dtpHDate.Value).Year;
            sPeriod = ClsPub.isDate(dtpHDate.Value).Month;
            //婧愬崟淇℃伅
            //BillNew.omodel.HMainSourceBillType = cmbSourceBillType.Text;
            //