From c87cf9a415a98d71b83f6a00a9c6e9cd8bc18b8d Mon Sep 17 00:00:00 2001
From: 杨乐 <yang.le.192@qq.com>
Date: 星期二, 28 十二月 2021 20:16:44 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

---
 WorkM/流转卡管理/Sc_ProcessExchangeBill.cs |   12 +++++++-----
 1 files changed, 7 insertions(+), 5 deletions(-)

diff --git "a/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/Sc_ProcessExchangeBill.cs" "b/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/Sc_ProcessExchangeBill.cs"
index e427d62..93167f5 100644
--- "a/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/Sc_ProcessExchangeBill.cs"
+++ "b/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/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;
             //

--
Gitblit v1.9.1