From 166ad531bfd4c5744d98d2176ac52d9c7bd2e54d Mon Sep 17 00:00:00 2001
From: yxj <1qaz@123>
Date: 星期五, 15 四月 2022 13:37:42 +0800
Subject: [PATCH] 出站汇报单汇报前，根据不同客户，对录入总工时与标准总工时进行对比判断；基础资料生产资源DAL模块中返回信息公用标准方法恢复
---
DAL/基础资料/公用基础资料/ClsGy_Source_View.cs | 90 ++++++++++++++++++++++++++------------------
WorkM/流转卡管理/MES_StationOutBill.cs | 29 ++++++++++++++
2 files changed, 82 insertions(+), 37 deletions(-)
diff --git "a/DAL/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_Source_View.cs" "b/DAL/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_Source_View.cs"
index 2e63ab9..9171336 100644
--- "a/DAL/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_Source_View.cs"
+++ "b/DAL/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_Source_View.cs"
@@ -31,30 +31,30 @@
GC.SuppressFinalize(this);
}
//
-
- //杩斿洖椤圭洰淇℃伅
- //public override bool GetInfoByID(Int64 sItemID)
- //{
- // DataSet DS ;
- // try
- // {
- // DS = oCn.RunProcReturn("Select * from " + MvarItemKey + " Where HItemID='" + sItemID + "'", MvarItemKey, ref DBUtility.ClsPub.sExeReturnInfo);
- // if (DS.Tables[0].Rows.Count == 0)
- // return false;
- // else
- // {
- // return GetInfo(DS);
- // }
- // }
- // catch (Exception e)
- // {
- // throw (e);
- // }
- //}
-
//杩斿洖椤圭洰淇℃伅
public override bool GetInfoByID(Int64 sItemID)
+ {
+ DataSet DS;
+ try
+ {
+ DS = oCn.RunProcReturn("Select * from " + MvarItemKey + " Where HItemID='" + sItemID + "'", MvarItemKey, ref DBUtility.ClsPub.sExeReturnInfo);
+ if (DS.Tables[0].Rows.Count == 0)
+ return false;
+ else
+ {
+ return GetInfo(DS);
+ }
+ }
+ catch (Exception e)
+ {
+ throw (e);
+ }
+ }
+
+
+ //杩斿洖椤圭洰淇℃伅 濂ラ偊涓撶敤
+ public bool GetInfoByID_AoBang(Int64 sItemID)
{
DataSet DS;
try
@@ -160,22 +160,19 @@
omodel.HItemID = Convert.ToInt64(DS.Tables[0].Rows[0]["HItemID"]);
omodel.HNumber = DS.Tables[0].Rows[0]["HNumber"].ToString().Trim();
omodel.HName = DS.Tables[0].Rows[0]["HName"].ToString().Trim();
-
- //20220331淇敼
- //omodel.HHelpCode = DS.Tables[0].Rows[0]["HHelpCode"].ToString().Trim();
- //omodel.HShortNumber = DS.Tables[0].Rows[0]["HShortNumber"].ToString().Trim();
- //omodel.HParentID = Convert.ToInt64(DS.Tables[0].Rows[0]["HParentID"]);
- //omodel.HLevel = Convert.ToInt64(DS.Tables[0].Rows[0]["HLevel"]);
- //omodel.HEndFlag = (bool)DS.Tables[0].Rows[0]["HEndFlag"];
- //omodel.HStopflag = (bool)DS.Tables[0].Rows[0]["HStopflag"];
- //omodel.HRemark = DS.Tables[0].Rows[0]["HRemark"].ToString().Trim();
- //omodel.HProcID = Convert.ToInt64(DS.Tables[0].Rows[0]["HProcID"]);
- //omodel.HRelationID = Convert.ToInt64(DS.Tables[0].Rows[0]["HRelationID"]);
- //omodel.HCenterID = Convert.ToInt64(DS.Tables[0].Rows[0]["HCenterID"]);
- //omodel.HBarCode = DS.Tables[0].Rows[0]["HBarCodeForBase"].ToString().Trim();
- //omodel.HType = DS.Tables[0].Rows[0]["HType"].ToString().Trim();
- //omodel.HEquipFileID_K3 = Convert.ToInt64(DS.Tables[0].Rows[0]["HEquipFileID_K3"]);
- //淇敼鐨勫湴鏂瑰埌杩欓噷
+ omodel.HHelpCode = DS.Tables[0].Rows[0]["HHelpCode"].ToString().Trim();
+ omodel.HShortNumber = DS.Tables[0].Rows[0]["HShortNumber"].ToString().Trim();
+ omodel.HParentID = Convert.ToInt64(DS.Tables[0].Rows[0]["HParentID"]);
+ omodel.HLevel = Convert.ToInt64(DS.Tables[0].Rows[0]["HLevel"]);
+ omodel.HEndFlag = (bool)DS.Tables[0].Rows[0]["HEndFlag"];
+ omodel.HStopflag = (bool)DS.Tables[0].Rows[0]["HStopflag"];
+ omodel.HRemark = DS.Tables[0].Rows[0]["HRemark"].ToString().Trim();
+ omodel.HProcID = Convert.ToInt64(DS.Tables[0].Rows[0]["HProcID"]);
+ omodel.HRelationID = Convert.ToInt64(DS.Tables[0].Rows[0]["HRelationID"]);
+ omodel.HCenterID = Convert.ToInt64(DS.Tables[0].Rows[0]["HCenterID"]);
+ omodel.HBarCode = DS.Tables[0].Rows[0]["HBarCodeForBase"].ToString().Trim();
+ omodel.HType = DS.Tables[0].Rows[0]["HType"].ToString().Trim();
+ omodel.HEquipFileID_K3 = Convert.ToInt64(DS.Tables[0].Rows[0]["HEquipFileID_K3"]);
//omodel.HGroupK3ID = Convert.ToInt64(DS.Tables[0].Rows[0]["HGroupK3ID"]);
//omodel.HGroupID = Convert.ToInt64(DS.Tables[0].Rows[0]["HGroupID"]);
@@ -195,6 +192,25 @@
}
}
+ //杩斿洖椤圭洰淇℃伅 濂ラ偊涓撶敤
+ public bool GetInfo_AoBang(DataSet DS)
+ {
+ try
+ {
+ omodel = new Model.ClsGy_Source_Model();
+
+ omodel.HItemID = Convert.ToInt64(DS.Tables[0].Rows[0]["HItemID"]);
+ omodel.HNumber = DS.Tables[0].Rows[0]["HNumber"].ToString().Trim();
+ omodel.HName = DS.Tables[0].Rows[0]["HName"].ToString().Trim();
+ return true;
+
+ }
+ catch (Exception e)
+ {
+ throw (e);
+ }
+ }
+
/// <summary>
/// 寰楀埌榛樿璧勬簮鏍规嵁閮ㄩ棬
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 f967c86..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"
@@ -669,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;
}
//淇濆瓨鍗曟嵁
--
Gitblit v1.9.1