From f9ef44a67fbf73f073efe65600bc25e204fde04f Mon Sep 17 00:00:00 2001
From: ch <37327@LLOOCCY>
Date: 星期一, 30 五月 2022 17:38:41 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WorkM/流转卡管理/Sc_ProcessExchangeBill.cs | 28 ++++++++++++++++++----------
1 files changed, 18 insertions(+), 10 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 60ca177..f7f6463 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"
@@ -1288,11 +1288,11 @@
return false;
}
//txtHMateOutBatchNo
- if (DBUtility.ClsPub.isStrNull(txtHMateOutBatchNo.Text) == "")
- {
- MessageBox.Show("鍘熸枡鎵规涓嶈兘涓虹┖锛�", "鎻愮ず");
- return false;
- }
+ //if (DBUtility.ClsPub.isStrNull(txtHMateOutBatchNo.Text) == "")
+ //{
+ // MessageBox.Show("鍘熸枡鎵规涓嶈兘涓虹┖锛�", "鎻愮ず");
+ // return false;
+ //}
}
//鍗曟嵁鍙锋槸鍚﹂噸澶�
@@ -1347,16 +1347,19 @@
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;
//
BillNew.omodel.HYear = sYear;
BillNew.omodel.HPeriod = sPeriod;
+ BillNew.omodel.HPRDORGID = DBUtility.ClsPub.HOrgID; //缁勭粐
//鍥哄畾璧嬪��=================================
BillNew.omodel.HBillNo = this.txtHBillNo.Text.Trim(); //鍦ㄨ祴鍊肩被鍓嶅氨澶勭悊濂藉瓧绗︿覆鍜屾暟瀛�
BillNew.omodel.HDate = this.dtpHDate.Value;
@@ -3719,5 +3722,10 @@
//
DBUtility.ClsPub.HideGridView(grdMain, Name, ClsPub.AppPath);//璁剧疆闅愯棌鍒�
}
+
+ private void grdMain_CellContentClick(object sender, DataGridViewCellEventArgs e)
+ {
+
+ }
}
}
\ No newline at end of file
--
Gitblit v1.9.1