From 6ddf8b9f723190d42c9e24a31dbd464c9e6d4c04 Mon Sep 17 00:00:00 2001
From: 仲国强 <519541279@qq.com>
Date: 星期三, 29 九月 2021 16:26:14 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WorkM/流转卡管理/MES_StationEntrustOutBill.cs | 25 +++++++++++++++++++++++--
1 files changed, 23 insertions(+), 2 deletions(-)
diff --git "a/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/MES_StationEntrustOutBill.cs" "b/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/MES_StationEntrustOutBill.cs"
index c666828..37d803f 100644
--- "a/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/MES_StationEntrustOutBill.cs"
+++ "b/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/MES_StationEntrustOutBill.cs"
@@ -85,10 +85,23 @@
{
DBUtility.Xt_BaseBillFun.Sub_ClearBill(gbUp);
//DBUtility.Xt_BaseBillFun.Sub_ClearBill(gbUp2);
- txtHBarCode.Focus();
- txtHTaxRate.Text = "16";
+ DBUtility.Xt_BaseBillFun.Sub_ClearBill1(tabPage1);
+ DBUtility.Xt_BaseBillFun.Sub_ClearBill1(tabPage2);
initGrid();
initGrid_Sub();
+ txtHBarCode.Text = "";
+ txtHProcExchBillNo.Enabled = true;
+ txtHWWWorkOrderBillNo.Enabled = true;
+ txtHProcNO.Enabled = true;
+ txtHBarCode.Enabled = true;
+ txtHPieceQty.Enabled = true;
+ txtHBadPNL.Enabled = true;
+ tabControl1.SelectedIndex = 0;
+ txtHBarCode.Focus();
+ lngBillKey = 0;
+ lngBillSubKey = 0;
+ txtHTaxRate.Text = "16";
+ this.txtHICMOBillNo.Tag = "0";
}
//鍑虹珯鎸夐挳
private void cmdOK_Click(object sender, EventArgs e)
@@ -859,6 +872,8 @@
//鍒濆鍖朑RID
private void initGrid()
{
+ DBUtility.Xt_BaseBillFun.initGridMESList(grdCardList, this.Name + "grdCardList");
+ grdCardList.DataSource = null;
//
grdMain.ColumnCount = 10; //鎬诲垪鏁�
@@ -2424,6 +2439,7 @@
if (Ds == null || Ds.Tables[0].Rows.Count == 0)
{
txtHProcExchBillNo.Text = "";
+ txtHBarCode.Text = "";
MessageBox.Show("鏈煡璇㈠埌娴佽浆鍗′俊鎭紒");
return;
}
@@ -2459,5 +2475,10 @@
//}
}
+ //鏂板
+ private void cmdXZ_Click(object sender, EventArgs e)
+ {
+ this.Sub_AddBill();
+ }
}
}
\ No newline at end of file
--
Gitblit v1.9.1