From c0ea121256e4c23dba0efda571269c706766126a Mon Sep 17 00:00:00 2001
From: zzr99 <1940172413@qq.com>
Date: 星期三, 08 十二月 2021 19:13:03 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WorkM/流转卡管理/MES_StationOutBill.cs | 64 ++++++++++++++++++++++++++++++--
1 files changed, 60 insertions(+), 4 deletions(-)
diff --git "a/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/MES_StationOutBill.cs" "b/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/MES_StationOutBill.cs"
index 6098e2f..c699816 100644
--- "a/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/MES_StationOutBill.cs"
+++ "b/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/MES_StationOutBill.cs"
@@ -60,9 +60,16 @@
public void Sub_ClearBill()
{
DBUtility.Xt_BaseBillFun.Sub_ClearBill(gbUp);
- txtHSourceName.Focus();
+ DBUtility.Xt_BaseBillFun.Sub_ClearBill1(tabPage2);
+ DBUtility.Xt_BaseBillFun.Sub_ClearBill1(tabPage3);
initGrid();
initGrid_Sub();
+ txtHBarCode.Text = "";
+ txtHProcExchBillNo.Enabled = true;
+ txtHProcNo.Enabled = true;
+ txtHBarCode.Enabled = true;
+ tabControl2.SelectedIndex = 0;
+ txtHSourceName.Focus();
//寰楀埌鎿嶄綔鍛樹俊鎭紙鍑虹珯鎿嶄綔鍛橀粯璁や负鐧诲綍浜猴紝鏍规嵁鐧诲綍浜虹敤鎴峰悕锛屾壘鍒拌亴鍛樺悓鍚嶇殑璁板綍锛岄粯璁ゅ啓鍏� 鎿嶄綔鍛� 鏂囨湰妗嗭紱濡傛灉娌℃壘鍒板垯涓虹┖锛涳級
DataSet Ds;
SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
@@ -184,6 +191,8 @@
cmdXG.Enabled = true;
cmdCancel.Enabled = true;
cmdChecker.Enabled = true;
+ cmdBFChecker.Enabled = true;
+ txtHBarCode.Enabled = false;
Sub_LrtextStatus(false);
break;
case DBUtility.ClsPub.Enum_BillStatus.BillStatus_AddNew:
@@ -194,6 +203,7 @@
cmdXG.Enabled = false;
cmdCancel.Enabled = true;
cmdChecker.Enabled = false;
+ cmdBFChecker.Enabled = false;
Sub_LrtextStatus(true);
break;
case DBUtility.ClsPub.Enum_BillStatus.BillStatus_Modify:
@@ -204,6 +214,7 @@
cmdXG.Enabled = false;
cmdCancel.Enabled = true;
cmdChecker.Enabled = false;
+ cmdBFChecker.Enabled = false;
Sub_LrtextStatus(true);
break;
}
@@ -663,8 +674,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.txtHStationOutTime.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);
@@ -791,6 +812,7 @@
private void initGrid()
{
DBUtility.Xt_BaseBillFun.initGridMESList(grdCardList, this.Name + "grdCardList");
+ grdCardList.DataSource = null;
}
@@ -1554,6 +1576,40 @@
oBF.HMainSourceInterID = BillOld.omodel.HInterID;
oBF.HProcExchInterID = lngBillKey;
oBF.HProcExchEntryID = lngBillSubKey;
+ oBF.HBillSubType = "涓嶈壇璇勫";
+ oBF.txtHLotNo.Text = txtHProcExchBillNo.Text;
+ oBF.txtHOrderProcNo.Text = txtHOrderProcNO.Text;
+ oBF.txtHMaterID.Text = txtHMaterName.Text;
+ oBF.txtHMaterNumber.Text = txtHMaterID.Text;
+ oBF.txtHModel.Text = txtHMaterModel.Text;
+ oBF.txtHMaterID.Tag = txtHMaterID.Tag;
+ oBF.txtHProcID.Tag = txtHProcID.Tag;
+ oBF.txtHProcID.Text = txtHProcID.Text;
+ oBF.txtHWorkCenterID.Text = txtHCenterID.Text;
+ oBF.txtHWorkCenterID.Tag = txtHCenterID.Tag;
+ oBF.txtHICMOInterID.Text = Pub_Class.ClsPub.isStrNull(txtHICMOBillNo.Tag);
+ oBF.txtHICMOBillNo.Text = txtHICMOBillNo.Text;
+ oBF.txtHProcExchQty.Text = ClsPub.isStrNull(ClsPub.isDoule(txtHPlanQty.Text));
+ oBF.txtHPlanQty.Text = ClsPub.isStrNull(ClsPub.isDoule(txtHBadCount.Text));
+ oBF.txtHPlanPNL.Text = ClsPub.isStrNull(ClsPub.isDoule(txtHBadPNL.Text));
+ oBF.txtHBadPNL.Text = ClsPub.isStrNull(ClsPub.isDoule(txtHBadPNL.Text));
+ oBF.txtHBadQty.Text = ClsPub.isStrNull(ClsPub.isDoule(txtHBadCount.Text));
+ oBF.ShowDialog();
+ if (oBF.BillChange)
+ {
+ this.Sub_ShowBill();
+ }
+ }
+
+ //鎶ュ簾鍝佽川纭鎸夐挳
+ private void cmdBFChecker_Click(object sender, EventArgs e)
+ {
+ QC_NoPassProdCheckBill oBF = new QC_NoPassProdCheckBill();
+ oBF.BillStatus = DBUtility.ClsPub.Enum_BillStatus.BillStatus_AddNew;
+ oBF.HMainSourceInterID = BillOld.omodel.HInterID;
+ oBF.HProcExchInterID = lngBillKey;
+ oBF.HProcExchEntryID = lngBillSubKey;
+ oBF.HBillSubType = "鎶ュ簾璇勫";
oBF.txtHLotNo.Text = txtHProcExchBillNo.Text;
oBF.txtHOrderProcNo.Text = txtHOrderProcNO.Text;
oBF.txtHMaterID.Text = txtHMaterName.Text;
@@ -1575,7 +1631,7 @@
if (oBF.BillChange)
{
this.Sub_ShowBill();
- }
+ }
}
private void label20_Click(object sender, EventArgs e)
--
Gitblit v1.9.1