From db54c83e9cd007498dd6bb696879930dd3b6462a Mon Sep 17 00:00:00 2001
From: zzr99 <1940172413@qq.com>
Date: 星期五, 20 五月 2022 23:08:24 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WorkM/车间管理/QC_NoPassProdCheckBill.cs | 26 +++++++++++++++++++++++++-
1 files changed, 25 insertions(+), 1 deletions(-)
diff --git "a/WorkM/\350\275\246\351\227\264\347\256\241\347\220\206/QC_NoPassProdCheckBill.cs" "b/WorkM/\350\275\246\351\227\264\347\256\241\347\220\206/QC_NoPassProdCheckBill.cs"
index 51cad72..1c0679d 100644
--- "a/WorkM/\350\275\246\351\227\264\347\256\241\347\220\206/QC_NoPassProdCheckBill.cs"
+++ "b/WorkM/\350\275\246\351\227\264\347\256\241\347\220\206/QC_NoPassProdCheckBill.cs"
@@ -19,6 +19,7 @@
public long HProcExchInterID;
public long HProcExchEntryID;
public long HMainSourceInterID;
+ public string HBillSubType;
//瀹氫箟鍒�
public const Int16 HTagCol = 0;
public const Int16 HSnoCol = 1;
@@ -175,6 +176,15 @@
if (!DBUtility.Xt_BaseBillFun.Fun_AllowDeleteBill(BillOld, ref s))
{
MessageBox.Show(s + "锛屼笉鍏佽鍒犻櫎", "鎻愮ず");
+ return;
+ }
+ //
+ ClsXt_SystemParameter oClsXt_SystemParameter = new ClsXt_SystemParameter();
+ string DeleteCtl = oClsXt_SystemParameter.GetSingleSystemParameter("QC_NoPassProdCheckBill_DeleteCtl", ref DBUtility.ClsPub.sExeReturnInfo);
+
+ if (DeleteCtl == "Y" && BillOld.omodel.HMaker != DBUtility.ClsPub.CurUserName && DBUtility.ClsPub.CurUserName != "admin" && DBUtility.ClsPub.CurUserName != "Admin")
+ {
+ MessageBox.Show("鐧诲綍鐢ㄦ埛涓庡埗鍗曚汉涓嶄竴鑷达紝涓嶅厑璁稿垹闄�", "鎻愮ず");
return;
}
//
@@ -1140,6 +1150,19 @@
}
}
+ else
+ {
+ if (DBUtility.ClsPub.isDoule(grdMain.Rows[i].Cells[HBadQtyCol].Value) != 0)
+ {
+ MessageBox.Show("绗�" + (i + 1) + "琛岋紝娌℃湁涓嶈壇鍘熷洜涓嶈兘濉啓涓嶈壇鏁伴噺锛�");
+ return false;
+ }
+ if (DBUtility.ClsPub.isDoule(grdMain.Rows[i].Cells[HBadPCSQtyCol].Value) != 0)
+ {
+ MessageBox.Show("绗�" + (i + 1) + "琛岋紝娌℃湁涓嶈壇鍘熷洜涓嶈兘濉啓涓嶈壇PCS鏁伴噺锛�");
+ return false;
+ }
+ }
}
//if (ClsPub.isDoule(txtHBadPNL.Text) != sPNLQty)
//{
@@ -1148,7 +1171,7 @@
//}
if (ClsPub.isDoule(txtHBadQty.Text) != sPCSQty)
{
- MessageBox.Show("鏄庣粏鎶ュ簾PCS鏁颁笉绛変簬鎬绘姤搴烶CS锛屼笉鍏佽淇濆瓨锛�");
+ MessageBox.Show("琛ㄤ綋鏄庣粏涓嶈壇鏁颁笉绛変簬琛ㄥご鎬讳笉鑹暟閲忥紝涓嶅厑璁镐繚瀛橈紒");
return false;
}
}
@@ -1236,6 +1259,7 @@
BillNew.omodel.HGroupName = ClsPub.isStrNull(this.cmbHGroupName.Text);
BillNew.omodel.HOrderProcNo = ClsPub.isStrNull(this.txtHOrderProcNo.Text);
BillNew.omodel.HProcExchQty = ClsPub.isDoule(this.txtHProcExchQty.Text);
+ BillNew.omodel.HBillSubType = HBillSubType;
//鏄庣粏绫昏祴鍊�
BillNew.DetailColl=new List<Model.ClsQC_NoPassProdCheckBillSub>();
--
Gitblit v1.9.1