From 0fb2957ffd729c1f09b51a73aa2af1c3d39fdcad Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期四, 03 八月 2023 10:19:22 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WorkM/流转卡管理/MES_StationOutBill.cs | 390 ++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 337 insertions(+), 53 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..80db201 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();
@@ -80,6 +87,8 @@
txtHEmpID.Tag = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HItemID"]);
txtHEmpName.Text = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HName"]);
}
+ txtHPersonNums.Text = "1";
+ txtHMachineNums.Text = "1";
}
//鍑虹珯鎸夐挳
private void cmdOK_Click(object sender, EventArgs e)
@@ -184,6 +193,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 +205,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 +216,7 @@
cmdXG.Enabled = false;
cmdCancel.Enabled = true;
cmdChecker.Enabled = false;
+ cmdBFChecker.Enabled = false;
Sub_LrtextStatus(true);
break;
}
@@ -417,6 +430,8 @@
this.txtHWorkTimes.Text = BillOld.omodel.HWorkTimes.ToString();
this.txtHMouldNum.Text = BillOld.omodel.HMouldNum.ToString();
this.txtHSourceNameList.Text = BillOld.omodel.HSourceNameList.ToString();
+ this.txtHPersonNums.Text = BillOld.omodel.HPersonNums.ToString();
+ this.txtHMachineNums.Text = BillOld.omodel.HMachineNums.ToString();
//鍔犺浇琛ㄤ綋
initGrid();
initGrid_Sub();
@@ -462,7 +477,7 @@
//鍗曟嵁瀹屾暣鎬у垽鏂� 鏈畬鎴�
private bool Sub_AllowSave()
- {
+ {
//鍒ゆ柇璇ョ敤鎴峰悕鏄惁鏈夎宸ョ珯鏉冮檺
//if (BillNew.CheckCenterIDByUser(DBUtility.ClsPub.isLong(txtHCenterID.Tag)) == false)
//{
@@ -512,6 +527,133 @@
// return false;
// }
//}
+
+
+ //妯＄┐鍙锋帶鍒�
+ //if (DBUtility.ClsPub.isStrNull(txtHMaterID.Text) == "13000001197")
+ //{
+ // string HMXH = "";
+ // string HZM = "";
+ // HMXH = DBUtility.ClsPub.isStrNull(txtHMouldNum.Text);
+ // HZM = HMXH.Substring(0, 1);
+ // if (HZM != "G")
+ // {
+ // MessageBox.Show("妯＄┐鍙烽敊璇涓�浣嶈閲嶆柊杈撳叆G");
+ // return false;
+ // }
+ //}
+
+
+ if (DBUtility.ClsPub.isStrNull(txtHMaterID.Text) == "3.01.0207" && DBUtility.ClsPub.isStrNull(txtHProcID.Text) == "鎴愬搧妫�楠�")
+ {
+ string HMXH = "";
+ string HZM = "";
+ HMXH = DBUtility.ClsPub.isStrNull(txtHMouldNum.Text);
+ HZM = HMXH.Substring(0, 1);
+ if (HZM != "G")
+ {
+ MessageBox.Show("妯＄┐鍙烽敊璇涓�浣嶈閲嶆柊杈撳叆G");
+ return false;
+ }
+ }
+ if (DBUtility.ClsPub.isStrNull(txtHMaterID.Text) == "3.01.0268" && DBUtility.ClsPub.isStrNull(txtHProcID.Text) == "鎴愬搧妫�楠�")
+ {
+ string HMXH = "";
+ string HZM = "";
+ HMXH = DBUtility.ClsPub.isStrNull(txtHMouldNum.Text);
+ HZM = HMXH.Substring(0, 1);
+ if (HZM != "X")
+ {
+ MessageBox.Show("妯＄┐鍙烽敊璇涓�浣嶈閲嶆柊杈撳叆X");
+ return false;
+ }
+ }
+
+
+
+ if (DBUtility.ClsPub.isStrNull(txtHMaterID.Text) == "3.01.0211" && DBUtility.ClsPub.isStrNull(txtHProcID.Text) == "鎴愬搧妫�楠�")
+ {
+ string HMXH = "";
+ string HZM = "";
+ string HZM2 = "";
+ string HZM3 = "";
+ HMXH = DBUtility.ClsPub.isStrNull(txtHMouldNum.Text);
+ HZM = HMXH.Substring(0, 1);
+ HZM2 = HMXH.Substring(2, 1);
+ HZM3 = HMXH.Substring(3, 1);
+ if (HZM != "0")
+ {
+ MessageBox.Show("妯＄┐鍙烽敊璇涓�浣嶈閲嶆柊杈撳叆0");
+ return false;
+ }
+ if (HZM2 != "0")
+ {
+ MessageBox.Show("妯＄┐鍙烽敊璇涓変綅璇烽噸鏂拌緭鍏�0");
+ return false;
+ }
+ if (HZM3 != "0")
+ {
+ MessageBox.Show("妯＄┐鍙烽敊璇鍥涗綅璇烽噸鏂拌緭鍏�0");
+ return false;
+ }
+ }
+
+ if (DBUtility.ClsPub.isStrNull(txtHMaterID.Text) == "3.01.0266" && DBUtility.ClsPub.isStrNull(txtHProcID.Text) == "鎴愬搧妫�楠�")
+ {
+ string HMXH = "";
+ string HZM = "";
+ string HZM2 = "";
+ string HZM3 = "";
+ HMXH = DBUtility.ClsPub.isStrNull(txtHMouldNum.Text);
+ HZM = HMXH.Substring(0, 1);
+ HZM2 = HMXH.Substring(2, 1);
+ HZM3 = HMXH.Substring(3, 1);
+ if (HZM != "0")
+ {
+ MessageBox.Show("妯＄┐鍙烽敊璇涓�浣嶈閲嶆柊杈撳叆0");
+ return false;
+ }
+ if (HZM2 != "0")
+ {
+ MessageBox.Show("妯＄┐鍙烽敊璇涓変綅璇烽噸鏂拌緭鍏�0");
+ return false;
+ }
+ if (HZM3 != "0")
+ {
+ MessageBox.Show("妯＄┐鍙烽敊璇鍥涗綅璇烽噸鏂拌緭鍏�0");
+ return false;
+ }
+ }
+
+
+ if (DBUtility.ClsPub.isStrNull(txtHMaterID.Text) == "3.01.0267" && DBUtility.ClsPub.isStrNull(txtHProcID.Text) == "鎴愬搧妫�楠�")
+ {
+ string HMXH = "";
+ string HZM = "";
+ string HZM2 = "";
+ string HZM3 = "";
+ HMXH = DBUtility.ClsPub.isStrNull(txtHMouldNum.Text);
+ HZM = HMXH.Substring(0, 1);
+ HZM2 = HMXH.Substring(2, 1);
+ HZM3 = HMXH.Substring(3, 1);
+ if (HZM != "0")
+ {
+ MessageBox.Show("妯＄┐鍙烽敊璇涓�浣嶈閲嶆柊杈撳叆0");
+ return false;
+ }
+ if (HZM2 != "0")
+ {
+ MessageBox.Show("妯＄┐鍙烽敊璇涓変綅璇烽噸鏂拌緭鍏�0");
+ return false;
+ }
+ if (HZM3 != "0")
+ {
+ MessageBox.Show("妯＄┐鍙烽敊璇鍥涗綅璇烽噸鏂拌緭鍏�0");
+ return false;
+ }
+ }
+
+
//蹇呰緭椤圭洰鏄惁涓虹┖
if (DBUtility.ClsPub.isLong(lngBillKey) <= 0)
@@ -565,11 +707,11 @@
MessageBox.Show("鎿嶄綔鍛樻病鏈夐�夋嫨锛�", "鎻愮ず");
return false;
}
- if (DBUtility.ClsPub.isLong(txtHQCCheckID.Tag) == 0)
- {
- MessageBox.Show("妫�楠屽憳娌℃湁閫夋嫨锛�", "鎻愮ず");
- return false;
- }
+ //if (DBUtility.ClsPub.isLong(txtHQCCheckID.Tag) == 0)
+ //{
+ // MessageBox.Show("妫�楠屽憳娌℃湁閫夋嫨锛�", "鎻愮ず");
+ // return false;
+ //}
if (DBUtility.ClsPub.isLong(txtHSourceID.Tag) == 0)
{
MessageBox.Show("鐢熶骇璧勬簮娌℃湁閫夋嫨锛�", "鎻愮ず");
@@ -580,9 +722,26 @@
MessageBox.Show("宸ヤ綔涓績娌℃湁閫夋嫨锛�", "鎻愮ず");
return false;
}
- if (DBUtility.ClsPub.isDoule(txtHQty.Text) + DBUtility.ClsPub.isDoule(txtHWasterQty.Text) <= 0)
+ if (DBUtility.ClsPub.isDoule(txtHQty.Text)
+ + DBUtility.ClsPub.isDoule(txtHWasterQty.Text)
+ + DBUtility.ClsPub.isDoule(txtHBadCount.Text) <= 0)
{
MessageBox.Show("鏁伴噺涓嶈兘涓�0锛�", "鎻愮ず");
+ return false;
+ }
+ if (DBUtility.ClsPub.isDoule(txtHQty.Text.Trim()) < 0)
+ {
+ MessageBox.Show("鍚堟牸涓暟涓嶈兘灏忎簬0锛�", "鎻愮ず");
+ return false;
+ }
+ 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(txtHWorkTimes.Text) <= 0)
@@ -641,6 +800,35 @@
MessageBox.Show("鍗曟嵁鍙烽噸澶嶏紒", "鎻愮ず");
return false;
}
+
+ //鏍规嵁涓嶅悓瀹㈡埛锛屽褰曞叆鎬诲伐鏃朵笌鏍囧噯鎬诲伐鏃惰繘琛屽姣斿垽鏂�
+ SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
+ long sMaterID = DBUtility.ClsPub.isLong(this.txtHMaterID.Tag);
+ long sProcID = DBUtility.ClsPub.isLong(this.txtHProcID.Tag);
+ double sQty = DBUtility.ClsPub.isDoule(this.txtHQty.Text);
+ double sBadCount = DBUtility.ClsPub.isDoule(this.txtHBadCount.Text);
+ double sWasterQty = DBUtility.ClsPub.isDoule(this.txtHWasterQty.Text);
+ double sWorkTimes = DBUtility.ClsPub.isSingle(this.txtHWorkTimes.Text);
+ DataSet Ds;
+ Ds = oCn.RunProcReturn("exec h_p_MES_StationOutBill_WorkTimesCtrl " + sMaterID.ToString() + "," + sProcID.ToString() + "," + sQty.ToString() + "," + sBadCount.ToString() + "," + sWasterQty.ToString() + "," + sWorkTimes.ToString(), "h_p_MES_StationOutBill_WorkTimesCtrl");
+ if (Ds == null || Ds.Tables[0].Rows.Count == 0)
+ {
+ MessageBox.Show("褰曞叆鎬诲伐鏃朵笌鏍囧噯鎬诲伐鏃跺姣斿垽鏂け璐ワ紒", "鎻愮ず");
+ return false;
+ }
+ else
+ {
+ if (DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0][0]) == 1)
+ {
+ MessageBox.Show(DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HRemark"]));
+ return false;
+ }
+ else if (DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0][0]) == 2)
+ {
+ MessageBox.Show(DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HRemark"]));
+ }
+ }
+
return true;
}
//淇濆瓨鍗曟嵁
@@ -663,8 +851,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);
@@ -710,6 +908,8 @@
BillNew.omodel.HWorkTimes = DBUtility.ClsPub.isSingle(this.txtHWorkTimes.Text);
BillNew.omodel.HQCCheckID = DBUtility.ClsPub.isLong(this.txtHQCCheckID.Tag);
BillNew.omodel.HSourceNameList = DBUtility.ClsPub.isStrNull(this.txtHSourceNameList.Text);
+ BillNew.omodel.HPersonNums = DBUtility.ClsPub.isLong(this.txtHPersonNums.Text);
+ BillNew.omodel.HMachineNums = DBUtility.ClsPub.isLong(this.txtHMachineNums.Text);
//鏄庣粏绫昏祴鍊�
BillNew.DetailColl = new List<Model.ClsSc_StationOutBillSub>();
for (int i = 0; i <= grdSub.RowCount - 1; i++)
@@ -791,6 +991,7 @@
private void initGrid()
{
DBUtility.Xt_BaseBillFun.initGridMESList(grdCardList, this.Name + "grdCardList");
+ grdCardList.DataSource = null;
}
@@ -1208,6 +1409,7 @@
txtHEmpID.Tag = 0;
txtHEmpName.Text = "";
}
+ txtHQty.Focus();
}
}
@@ -1237,6 +1439,7 @@
txtHSourceID.Tag = 0;
txtHSourceName.Text = "";
}
+ txtHMouldNum.Focus();
}
}
@@ -1245,50 +1448,72 @@
if (e.KeyCode == Keys.Enter)
{
- // DAL.ClsGy_Employee_View oEmp = new DAL.ClsGy_Employee_View();
+ // DAL.ClsGy_Employee_View oEmp = new DAL.ClsGy_Employee_View();
- // Int64 HCenterID = Pub_Class.ClsPub.isLong(txtHCenterID.Tag);
- // //鑾峰彇鎺т欢浣嶇疆
- // int x = 0; int y = 0;
- // BLL.ClsPub_BLL.SetXY(this, panel4, gbUp, txtHGroupID, ref x, ref y);
- // //閫夋嫨鍩虹
- // BLL.ClsBaseDownSelect.SetTextByGroup(txtHGroupID, HCenterID, x, y);
- // Int64 HGroupID = Pub_Class.ClsPub.isLong(txtHGroupID.Tag.ToString());
- // BillOld.ShowEmpByGroup(HGroupID, ref DBUtility.ClsPub.sExeReturnInfo, false);
-
- // int i = 0;
- // foreach (Model.ClsSc_StationOutBillSub oSub in BillOld.DetailColl)
- // {
- // if (i >= grdSub.RowCount - 1)
- // grdSub.Rows.Add();
-
+ // Int64 HCenterID = Pub_Class.ClsPub.isLong(txtHCenterID.Tag);
+ // //鑾峰彇鎺т欢浣嶇疆
+ // int x = 0; int y = 0;
+ // BLL.ClsPub_BLL.SetXY(this, panel4, gbUp, txtHGroupID, ref x, ref y);
+ // //閫夋嫨鍩虹
+ // BLL.ClsBaseDownSelect.SetTextByGroup(txtHGroupID, HCenterID, x, y);
+ // Int64 HGroupID = Pub_Class.ClsPub.isLong(txtHGroupID.Tag.ToString());
+ // BillOld.ShowEmpByGroup(HGroupID, ref DBUtility.ClsPub.sExeReturnInfo, false);
- // grdSub.Rows[i].Cells[HEmpIDCol].Value = oSub.HEmpID.ToString();
- // if (oEmp.GetInfoByID(oSub.HEmpID))
- // {
+ // int i = 0;
+ // foreach (Model.ClsSc_StationOutBillSub oSub in BillOld.DetailColl)
+ // {
+ // if (i >= grdSub.RowCount - 1)
+ // grdSub.Rows.Add();
- // grdSub.Rows[i].Cells[HEmpNoCol].Value = oEmp.omodel.HNumber;
- // // grdSub.Rows[i].Cells[HEmpIDCol].Value = oEmp.oModel.HItemID;
- // grdSub.Rows[i].Cells[HEmpNumberCol].Value = oEmp.omodel.HNumber;
- // grdSub.Rows[i].Cells[HEmpNameCol].Value = oEmp.omodel.HName;
- // }
- // else
- // {
- // grdSub.Rows[i].Cells[HEmpNoCol].Value = "";
- // // grdSub.Rows[i].Cells[HEmpIDCol].Value = oEmp.oModel.HItemID;
- // grdSub.Rows[i].Cells[HEmpNumberCol].Value = "";
- // grdSub.Rows[i].Cells[HEmpNameCol].Value = "";
- // }
-
-
- // i = i + 1;
- // }
- // //GRID鍏佽鍒锋柊
- //// DBUtility.Xt_BaseBillFun.SetSumGrid(oSumGrid);
- // //
- // //Sub_OperStatus();
- txtHQty.Select();
+ // grdSub.Rows[i].Cells[HEmpIDCol].Value = oSub.HEmpID.ToString();
+ // if (oEmp.GetInfoByID(oSub.HEmpID))
+ // {
+
+ // grdSub.Rows[i].Cells[HEmpNoCol].Value = oEmp.omodel.HNumber;
+ // // grdSub.Rows[i].Cells[HEmpIDCol].Value = oEmp.oModel.HItemID;
+ // grdSub.Rows[i].Cells[HEmpNumberCol].Value = oEmp.omodel.HNumber;
+ // grdSub.Rows[i].Cells[HEmpNameCol].Value = oEmp.omodel.HName;
+ // }
+ // else
+ // {
+ // grdSub.Rows[i].Cells[HEmpNoCol].Value = "";
+ // // grdSub.Rows[i].Cells[HEmpIDCol].Value = oEmp.oModel.HItemID;
+ // grdSub.Rows[i].Cells[HEmpNumberCol].Value = "";
+ // grdSub.Rows[i].Cells[HEmpNameCol].Value = "";
+ // }
+
+
+ // i = i + 1;
+ // }
+ // //GRID鍏佽鍒锋柊
+ //// DBUtility.Xt_BaseBillFun.SetSumGrid(oSumGrid);
+ // //
+ // //Sub_OperStatus();
+
+ if (DBUtility.ClsPub.isStrNull(txtHGroupID.Text) != "")
+ {
+ DAL.ClsGy_Group_View oGroup = new DAL.ClsGy_Group_View();
+ if (oGroup.GetInfoByNumber(DBUtility.ClsPub.isStrNull(txtHGroupID.Text)))
+ {
+ txtHGroupID.Text = oGroup.omodel.HNumber;
+ txtHGroupID.Tag = oGroup.omodel.HItemID;
+ txtHGroupName.Text = oGroup.omodel.HName;
+ }
+ else
+ {
+ txtHGroupID.Text = "";
+ txtHGroupID.Tag = 0;
+ txtHGroupName.Text = "";
+ }
+ }
+ else
+ {
+ txtHGroupID.Text = "";
+ txtHGroupID.Tag = 0;
+ txtHGroupName.Text = "";
+ }
+ txtHEmpID.Focus();
}
}
@@ -1454,7 +1679,7 @@
{
//txtHWasterQty.Select();
//cmdOK.Focus();
- txtHDSQty.Focus();
+ txtHQCCheckID.Focus();
}
}
private void txtHPieceQty_KeyDown(object sender, KeyEventArgs e)
@@ -1554,6 +1779,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 +1834,7 @@
if (oBF.BillChange)
{
this.Sub_ShowBill();
- }
+ }
}
private void label20_Click(object sender, EventArgs e)
@@ -1612,7 +1871,7 @@
{
Sub_WriteInForm_SM2(Ds.Tables[0], i);
}
- txtHPayProcID.Focus();
+ txtHSourceID.Focus();
//濡傛灉鏄敮涓� 鏍哥畻宸ュ簭鍒� 榛樿甯﹀嚭 骞惰烦鑷� 鑱屽憳
//if (oProc.GetSubProcInfoByID(DBUtility.ClsPub.isLong(txtHProcID.Tag)))
//{
@@ -2372,6 +2631,7 @@
txtHQCCheckID.Tag = 0;
txtHQCCheckName.Text = "";
}
+ txtHBadCount.Focus();
}
}
@@ -2490,5 +2750,29 @@
{
}
+
+ private void txtHMouldNum_KeyDown(object sender, KeyEventArgs e)
+ {
+ if (e.KeyCode == Keys.Enter)
+ {
+ txtHGroupID.Focus();
+ }
+ }
+
+ private void txtHBadCount_KeyDown(object sender, KeyEventArgs e)
+ {
+ if (e.KeyCode == Keys.Enter)
+ {
+ txtHWorkTimes.Focus();
+ }
+ }
+
+ private void txtHWorkTimes_KeyDown(object sender, KeyEventArgs e)
+ {
+ if (e.KeyCode == Keys.Enter)
+ {
+ txtHWasterQty.Focus();
+ }
+ }
}
}
\ No newline at end of file
--
Gitblit v1.9.1