From bf3ccf84ff0ed2576052cb0b34659aea363626b5 Mon Sep 17 00:00:00 2001
From: zzr99 <1940172413@qq.com>
Date: 星期五, 12 十一月 2021 18:03:51 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

---
 WorkM/流转卡管理/MES_StationEntrustInBillList.cs |   11 +++++++++++
 1 files changed, 11 insertions(+), 0 deletions(-)

diff --git "a/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/MES_StationEntrustInBillList.cs" "b/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/MES_StationEntrustInBillList.cs"
index a7aa0b1..b105873 100644
--- "a/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/MES_StationEntrustInBillList.cs"
+++ "b/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/MES_StationEntrustInBillList.cs"
@@ -269,6 +269,17 @@
                     //    MessageBox.Show(c, "鎻愮ず");
                     //    return;
                     //}
+                    //鍒ゆ柇浼氳鏈熸槸鍚﹀悎鐞�
+                    string s = "";
+                    int sYear = 0;
+                    int sPeriod = 0;
+                    if (DBUtility.Xt_BaseBillFun.Fun_AllowYearPeriod(DBUtility.ClsPub.isDate(oBill.omodel.HDate), ref sYear, ref sPeriod, ref s) == false)
+                    {
+                        MessageBox.Show(s, "鎻愮ず");
+                        return;
+                    }
+
+
                     if (oBill.omodel.HChecker != "")
                     {
                         MessageBox.Show("鍗曟嵁宸茬粡瀹℃牳,涓嶈兘鍒犻櫎锛�", "鎻愮ず");

--
Gitblit v1.9.1