From 11e647a74f651ad1e22b7bfe67d9e27db87ab645 Mon Sep 17 00:00:00 2001
From: jingh <jingh@LAPTOP-I53VDLOO>
Date: 星期四, 31 三月 2022 19:45:05 +0800
Subject: [PATCH] 流转卡原料批次非必录，出站单委外接收不良+报废+合格不能小于等于0，并且分别都不能小于0
---
WorkM/流转卡管理/Sc_ProcessExchangeBill.cs | 10 +++++-----
WorkM/流转卡管理/MES_StationOutBill.cs | 19 ++++++++++++++++++-
WorkM/流转卡管理/MES_StationEntrustOutBill.cs | 11 +++++++++--
3 files changed, 32 insertions(+), 8 deletions(-)
diff --git "a/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/MES_StationEntrustOutBill.cs" "b/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/MES_StationEntrustOutBill.cs"
index c11f3ab..f878735 100644
--- "a/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/MES_StationEntrustOutBill.cs"
+++ "b/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/MES_StationEntrustOutBill.cs"
@@ -660,14 +660,16 @@
// MessageBox.Show("鎺ユ敹涓暟涓嶈兘涓�0锛�", "鎻愮ず");
// return false;
//}
- if (DBUtility.ClsPub.isDoule(txtHQty.Text.Trim()) + DBUtility.ClsPub.isDoule(txtHWasterQty.Text.Trim()) <= 0)
+ if (DBUtility.ClsPub.isDoule(txtHQty.Text.Trim())
+ + DBUtility.ClsPub.isDoule(txtHWasterQty.Text.Trim())
+ + DBUtility.ClsPub.isDoule(txtHBadCount.Text) <= 0)
{
MessageBox.Show("鎺ユ敹涓暟涓嶈兘涓�0锛�", "鎻愮ず");
return false;
}
if (DBUtility.ClsPub.isDoule(txtHQty.Text.Trim()) < 0)
{
- MessageBox.Show("鎺ユ敹涓暟涓嶈兘灏忎簬0锛�", "鎻愮ず");
+ MessageBox.Show("鎺ユ敹鍚堟牸涓暟涓嶈兘灏忎簬0锛�", "鎻愮ず");
return false;
}
//if (DBUtility.ClsPub.isDoule(txtHQty.Text.Trim()) > DBUtility.ClsPub.isDoule(txtHPlanQty.Text.Trim()))
@@ -681,6 +683,11 @@
MessageBox.Show("涓嶅悎鏍兼暟涓嶈兘灏忎簬0锛�", "鎻愮ず");
return false;
}
+ if (DBUtility.ClsPub.isDoule(txtHBadCount.Text.Trim()) < 0)
+ {
+ MessageBox.Show("涓嶈壇鍝佹暟涓嶈兘灏忎簬0锛�", "鎻愮ず");
+ return false;
+ }
//if (DBUtility.ClsPub.isDoule(txtHWasterQty.Text.Trim()) > DBUtility.ClsPub.isDoule(txtHPlanQty.Text.Trim()))
//{
// MessageBox.Show("涓嶅悎鏍兼暟涓嶈兘澶т簬璁″垝鏁伴噺锛�", "鎻愮ず");
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 b51259a..f967c86 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"
@@ -591,11 +591,28 @@
MessageBox.Show("宸ヤ綔涓績娌℃湁閫夋嫨锛�", "鎻愮ず");
return false;
}
- if (DBUtility.ClsPub.isDoule(txtHQty.Text) + DBUtility.ClsPub.isDoule(txtHWasterQty.Text) + DBUtility.ClsPub.isDoule(txtHBadCount.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)
{
MessageBox.Show("宸ユ椂蹇呴』澶т簬0锛�", "鎻愮ず");
diff --git "a/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/Sc_ProcessExchangeBill.cs" "b/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/Sc_ProcessExchangeBill.cs"
index 93167f5..03322e9 100644
--- "a/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/Sc_ProcessExchangeBill.cs"
+++ "b/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/Sc_ProcessExchangeBill.cs"
@@ -1288,11 +1288,11 @@
return false;
}
//txtHMateOutBatchNo
- if (DBUtility.ClsPub.isStrNull(txtHMateOutBatchNo.Text) == "")
- {
- MessageBox.Show("鍘熸枡鎵规涓嶈兘涓虹┖锛�", "鎻愮ず");
- return false;
- }
+ //if (DBUtility.ClsPub.isStrNull(txtHMateOutBatchNo.Text) == "")
+ //{
+ // MessageBox.Show("鍘熸枡鎵规涓嶈兘涓虹┖锛�", "鎻愮ず");
+ // return false;
+ //}
}
//鍗曟嵁鍙锋槸鍚﹂噸澶�
--
Gitblit v1.9.1