From 82f41ba53073e1e8ce0c21489b7d4f34178ebf8d Mon Sep 17 00:00:00 2001
From: 杨乐 <yang.le.192@qq.com>
Date: 星期二, 08 二月 2022 16:55:58 +0800
Subject: [PATCH] 采购管理 销售管理 仓存管理-验收入库-领料发货 页面页数调整,数据排序

---
 WorkM/流转卡管理/Sc_ProcessExchangeBill.cs |   22 ++++++++++++++++------
 1 files changed, 16 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 5676212..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"
@@ -1318,6 +1318,8 @@
             }
             return true;
         }
+
+
         //淇濆瓨鍗曟嵁
         private bool Sub_SaveBill()
         {
@@ -1345,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;
@@ -2475,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("鎵撳嵃澶辫触锛孾椤圭洰鍙穄,[娴佽浆鍗$紪鍙穄,[娴佽浆鍗℃暟閲廬,[浜у搧浠g爜],[浜у搧鍚嶇О],[璁″垝寮�宸ユ棩鏈焆,[璁″垝瀹屽伐鏃ユ湡],[璁㈠崟璺熻釜鍙穄,[鍘熸枡鎵规],[妯″叿璁惧]." + e.Message);
+                MessageBox.Show("鎵撳嵃澶辫触锛孾椤圭洰鍙穄,[娴佽浆鍗$紪鍙穄,[娴佽浆鍗℃暟閲廬,[浜у搧浠g爜],[浜у搧鍚嶇О],[璁″垝寮�宸ユ棩鏈焆,[璁″垝瀹屽伐鏃ユ湡],[璁㈠崟璺熻釜鍙穄,[鍘熸枡鎵规],[妯″叿璁惧],[鍥惧彿鐗堟湰],[鎬昏鍥惧彿],[鏉愯川],[鎴愬搧缂栧彿],[鐗堟湰]." + e.Message);
             }
 
         }

--
Gitblit v1.9.1