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 | 90 +++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 90 insertions(+), 0 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 1a351f6..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();
@@ -561,6 +565,90 @@
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;
}
}
@@ -820,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++)
--
Gitblit v1.9.1