From 5682de3c920409114609ecabca3046d2236aade8 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期三, 21 九月 2022 14:51:59 +0800
Subject: [PATCH] 注释委外接收单列表，委外发出单列表数据的排序
---
WorkM/流转卡管理/MES_StationEntrustOutBill.cs | 111 +++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 107 insertions(+), 4 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 37d803f..20cea37 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"
@@ -482,6 +482,7 @@
this.txtHBadPNL.Text = BillOld.omodel.HBadPNL.ToString();
this.txtHRemark.Text = BillOld.omodel.HRemark.ToString();
this.txtHWasterQty.Text = BillOld.omodel.HWasterQty.ToString();
+ this.txtHBadCount.Text = BillOld.omodel.HBadCount.ToString();
this.txtHQty.Text = BillOld.omodel.HQty.ToString();
this.txtHPieceQty.Text = BillOld.omodel.HPieceQty.ToString();
this.txtHPlanPieceQty.Text = BillOld.omodel.HPlanPieceQty.ToString();
@@ -659,14 +660,16 @@
// MessageBox.Show("鎺ユ敹涓暟涓嶈兘涓�0锛�", "鎻愮ず");
// return false;
//}
- if (DBUtility.ClsPub.isDoule(txtHQty.Text.Trim()) + DBUtility.ClsPub.isDoule(txtHWasterQty.Text.Trim()) <= 0)
+ if (DBUtility.ClsPub.isDoule(txtHQty.Text.Trim())
+ + DBUtility.ClsPub.isDoule(txtHWasterQty.Text.Trim())
+ + DBUtility.ClsPub.isDoule(txtHBadCount.Text) <= 0)
{
MessageBox.Show("鎺ユ敹涓暟涓嶈兘涓�0锛�", "鎻愮ず");
return false;
}
if (DBUtility.ClsPub.isDoule(txtHQty.Text.Trim()) < 0)
{
- MessageBox.Show("鎺ユ敹涓暟涓嶈兘灏忎簬0锛�", "鎻愮ず");
+ MessageBox.Show("鎺ユ敹鍚堟牸涓暟涓嶈兘灏忎簬0锛�", "鎻愮ず");
return false;
}
//if (DBUtility.ClsPub.isDoule(txtHQty.Text.Trim()) > DBUtility.ClsPub.isDoule(txtHPlanQty.Text.Trim()))
@@ -678,6 +681,11 @@
if (DBUtility.ClsPub.isDoule(txtHWasterQty.Text.Trim()) < 0)
{
MessageBox.Show("涓嶅悎鏍兼暟涓嶈兘灏忎簬0锛�", "鎻愮ず");
+ return false;
+ }
+ if (DBUtility.ClsPub.isDoule(txtHBadCount.Text.Trim()) < 0)
+ {
+ MessageBox.Show("涓嶈壇鍝佹暟涓嶈兘灏忎簬0锛�", "鎻愮ず");
return false;
}
//if (DBUtility.ClsPub.isDoule(txtHWasterQty.Text.Trim()) > DBUtility.ClsPub.isDoule(txtHPlanQty.Text.Trim()))
@@ -750,8 +758,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.HInnerBillNo = this.txtHInnerBillNo.Text.Trim();
BillNew.omodel.HICMOBillNo = this.txtHICMOBillNo.Text.Trim();
@@ -782,6 +800,7 @@
BillNew.omodel.HOrderProcNO = DBUtility.ClsPub.isStrNull(this.txtHOrderProcNO.Text);
BillNew.omodel.HBadPNL = DBUtility.ClsPub.isDoule(this.txtHBadPNL.Text);
BillNew.omodel.HWasterQty = DBUtility.ClsPub.isDoule(this.txtHWasterQty.Text);
+ BillNew.omodel.HBadCount = DBUtility.ClsPub.isDoule(this.txtHBadCount.Text);
BillNew.omodel.HRemark = DBUtility.ClsPub.isStrNull(this.txtHRemark.Text);
BillNew.omodel.HLastSubProc = true;
BillNew.omodel.HMainSourceInterID = sHMainSourceInterID;
@@ -1865,6 +1884,7 @@
if (e.KeyCode == Keys.Enter)
{
txtHPrice.Select();
+ txtHInnerBillNo.Focus();
}
}
@@ -1881,6 +1901,7 @@
if (e.KeyCode == Keys.Enter)
{
txtHPieceQty.Select();
+ txtHBadCount.Focus();
}
}
@@ -2480,5 +2501,87 @@
{
this.Sub_AddBill();
}
+
+ //鎶ュ簾鍝佽川纭鎸夐挳
+ 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;
+ 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 = "";
+ oBF.txtHWorkCenterID.Tag = 0;
+ 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(txtHWasterQty.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(txtHWasterQty.Text));
+ oBF.ShowDialog();
+ if (oBF.BillChange)
+ {
+ this.Sub_ShowBill();
+ }
+ }
+
+ //涓嶈壇鍝佽川纭鎸夐挳
+ private void cmdChecker_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;
+ 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 = "";
+ oBF.txtHWorkCenterID.Tag = 0;
+ 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 txtHInnerBillNo_KeyDown(object sender, KeyEventArgs e)
+ {
+ if (e.KeyCode == Keys.Enter)
+ {
+ txtHWasterQty.Focus();
+ }
+ }
+
+ private void txtHBadCount_KeyDown(object sender, KeyEventArgs e)
+ {
+ if (e.KeyCode == Keys.Enter)
+ {
+ cmdOK.Focus();
+ }
+ }
}
}
\ No newline at end of file
--
Gitblit v1.9.1