From cab2f5a8f48277f1280e7b5803576f33e76a6b8c Mon Sep 17 00:00:00 2001
From: ch <37327@LLOOCCY>
Date: 星期二, 27 十二月 2022 09:45:54 +0800
Subject: [PATCH] 修改了检验单JSON

---
 WorkM/流转卡管理/MES_StationOutBill.cs |  145 ++++++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 139 insertions(+), 6 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 7d741e9..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++)

--
Gitblit v1.9.1