From 76c42727bf5a17e2e520401b7de8108e7aec3a49 Mon Sep 17 00:00:00 2001
From: zzr99 <1940172413@qq.com>
Date: 星期二, 17 五月 2022 10:44:06 +0800
Subject: [PATCH] nothing
---
WorkM/流转卡管理/MES_StationOutBill.cs | 64 ++++++++++++++++++++++++++++++--
1 files changed, 60 insertions(+), 4 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 1fbb721..84bf6e6 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,9 +591,26 @@
MessageBox.Show("宸ヤ綔涓績娌℃湁閫夋嫨锛�", "鎻愮ず");
return false;
}
- if (DBUtility.ClsPub.isDoule(txtHQty.Text) + DBUtility.ClsPub.isDoule(txtHWasterQty.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)
@@ -652,6 +669,35 @@
MessageBox.Show("鍗曟嵁鍙烽噸澶嶏紒", "鎻愮ず");
return false;
}
+
+ //鏍规嵁涓嶅悓瀹㈡埛锛屽褰曞叆鎬诲伐鏃朵笌鏍囧噯鎬诲伐鏃惰繘琛屽姣斿垽鏂�
+ SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
+ long sMaterID = DBUtility.ClsPub.isLong(this.txtHMaterID.Tag);
+ long sProcID = DBUtility.ClsPub.isLong(this.txtHProcID.Tag);
+ double sQty = DBUtility.ClsPub.isDoule(this.txtHQty.Text);
+ double sBadCount = DBUtility.ClsPub.isDoule(this.txtHBadCount.Text);
+ double sWasterQty = DBUtility.ClsPub.isDoule(this.txtHWasterQty.Text);
+ double sWorkTimes = DBUtility.ClsPub.isSingle(this.txtHWorkTimes.Text);
+ DataSet Ds;
+ Ds = oCn.RunProcReturn("exec h_p_MES_StationOutBill_WorkTimesCtrl " + sMaterID.ToString() + "," + sProcID.ToString() + "," + sQty.ToString() + "," + sBadCount.ToString() + "," + sWasterQty.ToString() + "," + sWorkTimes.ToString(), "h_p_MES_StationOutBill_WorkTimesCtrl");
+ if (Ds == null || Ds.Tables[0].Rows.Count == 0)
+ {
+ MessageBox.Show("褰曞叆鎬诲伐鏃朵笌鏍囧噯鎬诲伐鏃跺姣斿垽鏂け璐ワ紒", "鎻愮ず");
+ return false;
+ }
+ else
+ {
+ if (DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0][0]) == 1)
+ {
+ MessageBox.Show(DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HRemark"]));
+ return false;
+ }
+ else if (DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0][0]) == 2)
+ {
+ MessageBox.Show(DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HRemark"]));
+ }
+ }
+
return true;
}
//淇濆瓨鍗曟嵁
@@ -674,8 +720,18 @@
if (BillStatus == DBUtility.ClsPub.Enum_BillStatus.BillStatus_Modify)
BillNew.omodel.HInterID = BillOld.omodel.HInterID;
//涓荤被璧嬪��
- BillNew.omodel.HYear = 2011;
- BillNew.omodel.HPeriod = 1;
+ //鍒ゆ柇浼氳鏈熸槸鍚﹀悎鐞�
+ string s = "";
+ int sYear = 0;
+ int sPeriod = 0;
+ if (DBUtility.Xt_BaseBillFun.Fun_AllowYearPeriod(DBUtility.ClsPub.isDate(this.txtHStationOutTime.Text), ref sYear, ref sPeriod, ref s) == false)
+ {
+ MessageBox.Show(s, "鎻愮ず");
+ return false;
+ }
+ //
+ BillNew.omodel.HYear = sYear;
+ BillNew.omodel.HPeriod = sPeriod;
BillNew.omodel.HBillNo = this.txtHBillNo.Text.Trim();
BillNew.omodel.HICMOBillNo = this.txtHICMOBillNo.Text.Trim();
BillNew.omodel.HICMOInterID = DBUtility.ClsPub.isLong(this.txtHICMOBillNo.Tag);
@@ -1613,7 +1669,7 @@
oBF.txtHICMOInterID.Text = Pub_Class.ClsPub.isStrNull(txtHICMOBillNo.Tag);
oBF.txtHICMOBillNo.Text = txtHICMOBillNo.Text;
oBF.txtHProcExchQty.Text = ClsPub.isStrNull(ClsPub.isDoule(txtHPlanQty.Text));
- oBF.txtHPlanQty.Text = ClsPub.isStrNull(ClsPub.isDoule(txtHBadCount.Text));
+ oBF.txtHPlanQty.Text = ClsPub.isStrNull(ClsPub.isDoule(txtHWasterQty.Text));
oBF.txtHPlanPNL.Text = ClsPub.isStrNull(ClsPub.isDoule(txtHBadPNL.Text));
oBF.txtHBadPNL.Text = ClsPub.isStrNull(ClsPub.isDoule(txtHBadPNL.Text));
oBF.txtHBadQty.Text = ClsPub.isStrNull(ClsPub.isDoule(txtHWasterQty.Text));
--
Gitblit v1.9.1