From 7c9837e90ff7ae572de650cabab8a71262247c24 Mon Sep 17 00:00:00 2001
From: zzr99 <1940172413@qq.com>
Date: 星期三, 15 十二月 2021 17:59:43 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WorkM/流转卡管理/Sc_ProcessExchangeBill.cs | 20 ++++++++++++++------
1 files changed, 14 insertions(+), 6 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 5b15b03..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,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;
@@ -2477,10 +2480,15 @@
Report.FieldByName("鍘熸枡鎵规").AsString = txtHMateOutBatchNo.Text;
Report.FieldByName("妯″叿璁惧").AsString = txtHEquipMentID.Text;
Report.FieldByName("椤圭洰鍙�").AsString = txtHProjectNum.Text;
+ Report.FieldByName("鍥惧彿鐗堟湰").AsString = textHPicNumVer.Text;
+ Report.FieldByName("鎬昏鍥惧彿").AsString = textHPicNumAssemble.Text;
+ Report.FieldByName("鏉愯川").AsString = textHMaterTexture.Text;
+ Report.FieldByName("鎴愬搧缂栧彿").AsString = textHProductNum.Text;
+ Report.FieldByName("鐗堟湰").AsString = textHVerNum.Text;
}
catch (Exception e)
{
- MessageBox.Show("鎵撳嵃澶辫触锛孾椤圭洰鍙穄,[娴佽浆鍗＄紪鍙穄,[娴佽浆鍗℃暟閲廬,[浜у搧浠ｇ爜],[浜у搧鍚嶇О],[璁″垝寮�宸ユ棩鏈焆,[璁″垝瀹屽伐鏃ユ湡],[璁㈠崟璺熻釜鍙穄,[鍘熸枡鎵规],[妯″叿璁惧]." + e.Message);
+ MessageBox.Show("鎵撳嵃澶辫触锛孾椤圭洰鍙穄,[娴佽浆鍗＄紪鍙穄,[娴佽浆鍗℃暟閲廬,[浜у搧浠ｇ爜],[浜у搧鍚嶇О],[璁″垝寮�宸ユ棩鏈焆,[璁″垝瀹屽伐鏃ユ湡],[璁㈠崟璺熻釜鍙穄,[鍘熸枡鎵规],[妯″叿璁惧],[鍥惧彿鐗堟湰],[鎬昏鍥惧彿],[鏉愯川],[鎴愬搧缂栧彿],[鐗堟湰]." + e.Message);
}
}
--
Gitblit v1.9.1