From b3ef7eb53d17bd775a9a63f9023b87fda8387e2b Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期日, 12 六月 2022 16:09:15 +0800
Subject: [PATCH] 1

---
 WorkM/流转卡管理/MES_StationInBill.cs |   53 ++++++++++++++++++++++++++++++++++++++++++++++++++---
 1 files changed, 50 insertions(+), 3 deletions(-)

diff --git "a/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/MES_StationInBill.cs" "b/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/MES_StationInBill.cs"
index 845c5d3..cd5e636 100644
--- "a/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/MES_StationInBill.cs"
+++ "b/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/MES_StationInBill.cs"
@@ -42,7 +42,14 @@
         public void Sub_ClearBill()
         {
             DBUtility.Xt_BaseBillFun.Sub_ClearBill(gbUp);
+            DBUtility.Xt_BaseBillFun.Sub_ClearBill1(tabPage1);
+            DBUtility.Xt_BaseBillFun.Sub_ClearBill1(tabPage2);
             initGrid();
+            txtHBarCode.Text = "";
+            txtHProcExchBillNo.Enabled = true;
+            txtHProcNo.Enabled = true;
+            txtHBarCode.Enabled = true;
+            tabControl1.SelectedIndex = 0;
             txtHBarCode.Focus();
             //寰楀埌鎺ユ敹浜轰俊鎭紙杩涚珯鎺ユ敹浜洪粯璁や负鐧诲綍浜猴紝鏍规嵁鐧诲綍浜虹敤鎴峰悕锛屾壘鍒拌亴鍛樺悓鍚嶇殑璁板綍锛岄粯璁ゅ啓鍏� 鎺ユ敹浜� 鏂囨湰妗嗭紱濡傛灉娌℃壘鍒板垯涓虹┖锛涳級
             DataSet Ds;
@@ -67,6 +74,7 @@
             DBUtility.Xt_BaseBillFun.initGridMESList(grdCardList, this.Name + "grdCardList");
             DBUtility.Xt_BaseBillFun.initGridList(grdSub, this.Name);
             grdSub.SelectionMode = DataGridViewSelectionMode.CellSelect;
+            grdCardList.DataSource = null;
         }
 
         private void Display()
@@ -403,6 +411,12 @@
             //
             txtHProcExchBillNo.Enabled = false;
             txtHProcNo.Enabled = false;
+
+            //鍔犺浇 閰嶄欢缁戝畾娓呭崟
+
+
+
+
         }
 
         //鍗曟嵁瀹屾暣鎬у垽鏂�          鏈畬鎴�
@@ -549,8 +563,18 @@
             if (BillStatus == DBUtility.ClsPub.Enum_BillStatus.BillStatus_Modify)
                 BillNew.omodel.HInterID = BillOld.omodel.HInterID;
             //涓荤被璧嬪��
-            BillNew.omodel.HYear = 2011;
-            BillNew.omodel.HPeriod = 1;
+            //鍒ゆ柇浼氳鏈熸槸鍚﹀悎鐞�
+            string s = "";
+            int sYear = 0;
+            int sPeriod = 0;
+            if (DBUtility.Xt_BaseBillFun.Fun_AllowYearPeriod(DBUtility.ClsPub.isDate(this.txtHStationInTime.Text), ref sYear, ref sPeriod, ref s) == false)
+            {
+                MessageBox.Show(s, "鎻愮ず");
+                return false;
+            }
+            //
+            BillNew.omodel.HYear = sYear;
+            BillNew.omodel.HPeriod = sPeriod;
             BillNew.omodel.HBillNo = this.txtHBillNo.Text.Trim();
             BillNew.omodel.HICMOBillNo = this.txtHICMOBillNo.Text.Trim();
             BillNew.omodel.HICMOInterID =  DBUtility.ClsPub.isLong(this.txtHICMOBillNo.Tag);
@@ -954,6 +978,7 @@
                     txtHGroupID.Tag = 0;
                     txtHGroupName.Text = "";
                 }
+                txtHQty.Focus();
             }
         }
 
@@ -1008,7 +1033,12 @@
                 {
                     Sub_WriteInForm_SM2(Ds.Tables[0], i);
                 }
-                txtHQty.Focus();
+                //濡傛灉绯荤粺鍙傛暟鍚敤浜� 杩涚珯鍗曠粦瀹氶厤浠舵竻鍗曞垯 浠庣敓浜х敤鏂欐竻鍗曚腑鑾峰彇宸ュ簭BOM鍐欏叆 涓存椂琛紝骞跺姞杞借〃鏍�
+
+                //鍒锋柊琛ㄤ綋缃戞牸鏁版嵁 
+
+                //
+                txtHGroupID.Focus();
             }
         }
 
@@ -1418,5 +1448,22 @@
         {
             this.Sub_AddBill();
         }
+
+        //閰嶄欢鏉″舰鐮� 鍥炶溅浜嬩欢
+        private void txtHBarCode_Mater_KeyDown(object sender, KeyEventArgs e)
+        {
+            if (e.KeyCode == Keys.Return)
+            {
+                //鍏堝垽鏂� 涓存椂琛ㄤ腑鏄惁鏈夋暟鎹�
+
+                //鍒ゆ柇鏉″舰鐮佹槸鍚﹀湪鏉＄爜妗ｆ涓�
+
+                //鍒ゆ柇鏉″舰鐮佹槸鍚﹀悎鐞�
+
+                //鍐欏叆 鎵爜璁板綍琛�
+
+                //鍒锋柊琛ㄤ綋缃戞牸鏁版嵁
+
+            }
     }
 }
\ No newline at end of file

--
Gitblit v1.9.1