From c78341d973da968d25a8185f646b624bd9a5e0d0 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期四, 01 九月 2022 15:07:28 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WorkM/流转卡管理/MES_StationOutBill.cs | 55 +++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 49 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..1a351f6 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"
@@ -473,7 +473,7 @@
//鍗曟嵁瀹屾暣鎬у垽鏂� 鏈畬鎴�
private bool Sub_AllowSave()
- {
+ {
//鍒ゆ柇璇ョ敤鎴峰悕鏄惁鏈夎宸ョ珯鏉冮檺
//if (BillNew.CheckCenterIDByUser(DBUtility.ClsPub.isLong(txtHCenterID.Tag)) == false)
//{
@@ -523,6 +523,49 @@
// 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.isLong(lngBillKey) <= 0)
@@ -576,11 +619,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("鐢熶骇璧勬簮娌℃湁閫夋嫨锛�", "鎻愮ず");
--
Gitblit v1.9.1