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 | 278 ++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 230 insertions(+), 48 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 84bf6e6..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"
@@ -87,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)
@@ -428,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();
@@ -473,7 +477,7 @@
//鍗曟嵁瀹屾暣鎬у垽鏂� 鏈畬鎴�
private bool Sub_AllowSave()
- {
+ {
//鍒ゆ柇璇ョ敤鎴峰悕鏄惁鏈夎宸ョ珯鏉冮檺
//if (BillNew.CheckCenterIDByUser(DBUtility.ClsPub.isLong(txtHCenterID.Tag)) == false)
//{
@@ -523,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)
@@ -576,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("鐢熶骇璧勬簮娌℃湁閫夋嫨锛�", "鎻愮ず");
@@ -777,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++)
@@ -1276,6 +1409,7 @@
txtHEmpID.Tag = 0;
txtHEmpName.Text = "";
}
+ txtHQty.Focus();
}
}
@@ -1305,6 +1439,7 @@
txtHSourceID.Tag = 0;
txtHSourceName.Text = "";
}
+ txtHMouldNum.Focus();
}
}
@@ -1313,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();
}
}
@@ -1522,7 +1679,7 @@
{
//txtHWasterQty.Select();
//cmdOK.Focus();
- txtHDSQty.Focus();
+ txtHQCCheckID.Focus();
}
}
private void txtHPieceQty_KeyDown(object sender, KeyEventArgs e)
@@ -1714,7 +1871,7 @@
{
Sub_WriteInForm_SM2(Ds.Tables[0], i);
}
- txtHPayProcID.Focus();
+ txtHSourceID.Focus();
//濡傛灉鏄敮涓� 鏍哥畻宸ュ簭鍒� 榛樿甯﹀嚭 骞惰烦鑷� 鑱屽憳
//if (oProc.GetSubProcInfoByID(DBUtility.ClsPub.isLong(txtHProcID.Tag)))
//{
@@ -2474,6 +2631,7 @@
txtHQCCheckID.Tag = 0;
txtHQCCheckName.Text = "";
}
+ txtHBadCount.Focus();
}
}
@@ -2592,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