From 579d2b489f9565f6e506ddbef634d65aa20dc27e Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期四, 12 六月 2025 14:03:28 +0800
Subject: [PATCH] 解决合并冲突
---
DAL/计划管理/ClsGy_MaterialTechParamBillMain.cs | 157 ++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 114 insertions(+), 43 deletions(-)
diff --git "a/DAL/\350\256\241\345\210\222\347\256\241\347\220\206/ClsGy_MaterialTechParamBillMain.cs" "b/DAL/\350\256\241\345\210\222\347\256\241\347\220\206/ClsGy_MaterialTechParamBillMain.cs"
index e84b64c..f4e6bc0 100644
--- "a/DAL/\350\256\241\345\210\222\347\256\241\347\220\206/ClsGy_MaterialTechParamBillMain.cs"
+++ "b/DAL/\350\256\241\345\210\222\347\256\241\347\220\206/ClsGy_MaterialTechParamBillMain.cs"
@@ -5,7 +5,7 @@
namespace DAL
{
- public class ClsGy_MaterialTechParamBillMain : DBUtility.ClsXt_BaseBill
+ public class ClsGy_MaterialTechParamBillMain : DBUtility.ClsXt_BaseBill
{
public Model.ClsGy_MaterialTechParamBillMain omodel = new Model.ClsGy_MaterialTechParamBillMain();
public List<Model.ClsGy_MaterialTechParamBillSub> DetailColl = new List<Model.ClsGy_MaterialTechParamBillSub>();
@@ -16,9 +16,9 @@
base.MvarItemKeySub2 = "";
base.MvarItemKeySub3 = "";
base.MvarItemKeySub4 = "";
- base.MvarItemKey= "Gy_MaterialTechParamBillMain";
- base.MvarReportTitle= "浜у搧宸ヨ壓鍙傛暟娓呭崟";
- base.BillType="3334";
+ base.MvarItemKey = "Gy_MaterialTechParamBillMain";
+ base.MvarReportTitle = "浜у搧宸ヨ壓鍙傛暟娓呭崟";
+ base.BillType = "3334";
base.HBillSubType = "3334";
}
@@ -38,6 +38,22 @@
try
{
oCn.BeginTran();
+
+ //淇濆瓨鍓嶆帶鍒�=========================================
+ string HBillNote = "";
+ DataSet ds = oCn.RunProcReturn("Exec h_p_Gy_MaterialTechParamBill_BeforeSaveCtrl " + omodel.HInterID.ToString() + ", '" + omodel.HBillNo + "',2 ", "h_p_Gy_MaterialTechParamBill_BeforeSaveCtrl");
+ if (ds == null)
+ {
+ sReturn = "淇濆瓨鍓嶅垽鏂け璐ワ紒";
+ return false;
+ }
+ if (DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBack"]) != "0")
+ {
+ sReturn = "淇濆瓨澶辫触锛�" + DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBackRemark"]);
+ return false;
+ }
+ //=========================================================
+
//鏇存柊涓昏〃
string mainSql = "update Gy_MaterialTechParamBillMain set " +
" HBillNo = '" + omodel.HBillNo +
@@ -46,7 +62,7 @@
"', HUpDater = '" + omodel.HUpDater +
"', HUpDateDate = getdate()" +
//===============================================================
-
+
", HDeptID = '" + omodel.HDeptID +
"', HEmpID = '" + omodel.HEmpID +
"', HMaterID = '" + omodel.HMaterID +
@@ -54,6 +70,7 @@
"', HProcID = '" + omodel.HProcID +
"', HEquipID = '" + omodel.HEquipID +
"', HOrgID = '" + omodel.HOrgID +
+ "', HMouldID = '" + omodel.HMouldID +
"' where HInterID = " + omodel.HInterID;
oCn.RunProc(mainSql);
@@ -64,39 +81,58 @@
//鎻掑叆瀛愯〃
omodel.HInterID = lngBillKey;
+ //鎻掑叆瀛愯〃
foreach (Model.ClsGy_MaterialTechParamBillSub oSub in DetailColl)
{
string subSql = "insert into Gy_MaterialTechParamBillSub" +
- "" +
- "" +
- "" +
- "(HInterID,HEntryID,HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType" +
- ",HTechParamID,HTechParamUnitID,HStd,HMax,HMin,HDataForm,HDataUnit,HDataTimes) " +
- " values(" +
- "" + omodel.HInterID.ToString() +
- "," + oSub.HEntryID.ToString() +
- "," + oSub.HSourceInterID +
- "," + oSub.HSourceEntryID +
- ",'" + oSub.HSourceBillNo +
- "','" + oSub.HSourceBillType +
- "','" + oSub.HTechParamID +
- "','" + oSub.HTechParamUnitID +
- "'," + oSub.HStd +
- "," + oSub.HMax +
- ",'" + oSub.HMin +
- "','" + oSub.HDataForm +
- "','" + oSub.HDataUnit +
- "'," + oSub.HDataTimes +
- ")";
+ "(HInterID,HEntryID,HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType" +
+ ",HTechParamID,HTechParamUnitID,HStd,HMax,HMin,HDataForm,HDataUnit,HDataTimes,HTechParamClassID,HSNO,HStdNextTimes,HTechParamIDStd,HIsRequired) " +
+ " values(" +
+ "" + omodel.HInterID.ToString() +
+ "," + oSub.HEntryID.ToString() +
+ "," + oSub.HSourceInterID +
+ "," + oSub.HSourceEntryID +
+ ",'" + oSub.HSourceBillNo +
+ "','" + oSub.HSourceBillType +
+ "','" + oSub.HTechParamID +
+ "','" + oSub.HTechParamUnitID +
+ "','" + oSub.HStd +
+ "','" + oSub.HMax +
+ "','" + oSub.HMin +
+ "','" + oSub.HDataForm +
+ "','" + oSub.HDataUnit +
+ "','" + oSub.HDataTimes +
+ "','" + oSub.HTechParamClassID +
+ "','" + oSub.HSNO +
+ "','" + oSub.HStdNextTimes +
+ "','" + oSub.HTechParamIDStd +
+ "','" + Convert.ToString(oSub.HIsRequired ? 1 : 0) +
+ "')";
oCn.RunProc(subSql);
}
+
+ //=========================淇濆瓨鍚庢帶鍒�
+ DataSet ds2 = oCn.RunProcReturn("Exec h_p_Gy_MaterialTechParamBill_AfterSaveCtrl " + omodel.HInterID.ToString() + ", '" + omodel.HBillNo + "',2 ", "h_p_Gy_MaterialTechParamBill_AfterSaveCtrl");
+ if (ds2 == null)
+ {
+ sReturn = "淇濆瓨鍚庢帶鍒跺垽鏂け璐ワ紒";
+ oCn.RollBack();
+ return false;
+ }
+ if (DBUtility.ClsPub.isStrNull(ds2.Tables[0].Rows[0]["HBack"]) != "0")
+ {
+ sReturn = "淇濆瓨澶辫触2锛�" + DBUtility.ClsPub.isStrNull(ds2.Tables[0].Rows[0]["HBackRemark"]);
+ oCn.RollBack();
+ return false;
+ }
+ //============================
sReturn = "淇敼鍗曟嵁鎴愬姛锛�";
oCn.Commit();
return true;
}
catch (Exception e)
- {
+ {
sReturn = e.Message;
oCn.RollBack();
throw (e);
@@ -114,11 +150,26 @@
oCn.BeginTran();
+ //淇濆瓨鍓嶆帶鍒�=========================================
+ string HBillNote = "";
+ ds = oCn.RunProcReturn("Exec h_p_Gy_MaterialTechParamBill_BeforeSaveCtrl " + omodel.HInterID.ToString() + ", '" + omodel.HBillNo + "',1 ", "h_p_Gy_MaterialTechParamBill_BeforeSaveCtrl");
+ if (ds == null)
+ {
+ sReturn = "淇濆瓨鍓嶅垽鏂け璐ワ紒";
+ return false;
+ }
+ if (DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBack"]) != "0")
+ {
+ sReturn = "淇濆瓨澶辫触锛�" + DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBackRemark"]);
+ return false;
+ }
+ //=========================================================
+
//妫�鏌ヤ富琛ㄥ唴鐮佹槸鍚﹂噸澶嶏紝鑻ラ噸澶嶅垯閲嶆柊鐢熸垚骞剁户缁鏌ワ紝鐩村埌涓嶅啀閲嶅
while (true)
{
ds = oCn.RunProcReturn("select * from Gy_MaterialTechParamBillMain where HInterID = " + omodel.HInterID, "Gy_MaterialTechParamBillMain");
- if(ds!=null && ds.Tables[0].Rows.Count > 0)
+ if (ds != null && ds.Tables[0].Rows.Count > 0)
{
omodel.HInterID = DBUtility.ClsPub.CreateBillID(BillType, ref DBUtility.ClsPub.sExeReturnInfo);
}
@@ -131,7 +182,7 @@
//鎻掑叆涓昏〃
string mainSql = "insert into Gy_MaterialTechParamBillMain" +
"(HYear,HPeriod,HBillType,HBillSubType,HInterID,HDate,HBillNo,HRemark,HMaker,HMakeDate" +
- ",HDeptID,HEmpID,HMaterID,HWorkCenterID,HEquipID,HOrgID,HProcID ) " +
+ ",HDeptID,HEmpID,HMaterID,HWorkCenterID,HEquipID,HOrgID,HProcID,HMouldID ) " +
"values(" +
"" + omodel.HYear.ToString() +
"," + omodel.HPeriod.ToString() +
@@ -149,7 +200,8 @@
"','" + omodel.HWorkCenterID +
"','" + omodel.HEquipID +
"','" + omodel.HOrgID +
- "','" + omodel.HProcID +
+ "','" + omodel.HProcID +
+ "','" + omodel.HMouldID +
"')";
oCn.RunProc(mainSql);
@@ -158,11 +210,8 @@
foreach (Model.ClsGy_MaterialTechParamBillSub oSub in DetailColl)
{
string subSql = "insert into Gy_MaterialTechParamBillSub" +
- "" +
- "" +
- "" +
"(HInterID,HEntryID,HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType" +
- ",HTechParamID,HTechParamUnitID,HStd,HMax,HMin,HDataForm,HDataUnit,HDataTimes) " +
+ ",HTechParamID,HTechParamUnitID,HStd,HMax,HMin,HDataForm,HDataUnit,HDataTimes,HTechParamClassID,HSNO,HStdNextTimes,HTechParamIDStd,HIsRequired) " +
" values(" +
"" + omodel.HInterID.ToString() +
"," + oSub.HEntryID.ToString() +
@@ -171,16 +220,38 @@
",'" + oSub.HSourceBillNo +
"','" + oSub.HSourceBillType +
"','" + oSub.HTechParamID +
- "','" + oSub.HTechParamUnitID +
- "'," + oSub.HStd +
- "," + oSub.HMax +
- ",'" + oSub.HMin +
+ "','" + oSub.HTechParamUnitID +
+ "','" + oSub.HStd +
+ "','" + oSub.HMax +
+ "','" + oSub.HMin +
"','" + oSub.HDataForm +
- "','" + oSub.HDataUnit +
- "'," + oSub.HDataTimes +
- ")";
+ "','" + oSub.HDataUnit +
+ "','" + oSub.HDataTimes +
+ "','" + oSub.HTechParamClassID +
+ "','" + oSub.HSNO +
+ "','" + oSub.HStdNextTimes +
+ "','" + oSub.HTechParamIDStd +
+ "','" + Convert.ToString(oSub.HIsRequired ? 1 : 0)+
+ "')";
oCn.RunProc(subSql);
}
+
+ //=========================淇濆瓨鍚庢帶鍒�
+ DataSet ds2 = oCn.RunProcReturn("Exec h_p_Gy_MaterialTechParamBill_AfterSaveCtrl " + omodel.HInterID.ToString() + ", '" + omodel.HBillNo + "',1 ", "h_p_Gy_MaterialTechParamBill_AfterSaveCtrl");
+ if (ds2 == null)
+ {
+ sReturn = "淇濆瓨鍚庢帶鍒跺垽鏂け璐ワ紒";
+ oCn.RollBack();
+ return false;
+ }
+ if (DBUtility.ClsPub.isStrNull(ds2.Tables[0].Rows[0]["HBack"]) != "0")
+ {
+ sReturn = "淇濆瓨澶辫触2锛�" + DBUtility.ClsPub.isStrNull(ds2.Tables[0].Rows[0]["HBackRemark"]);
+ oCn.RollBack();
+ return false;
+ }
+ //============================
+
sReturn = "鏂板鍗曟嵁鎴愬姛锛�";
oCn.Commit();
return true;
@@ -237,7 +308,7 @@
//========================================================
omodel.HOrgID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HOrgID"]);
-
+
//
//寰幆
@@ -261,7 +332,7 @@
oSub.HEntryCloseDate = DBUtility.ClsPub.isDate(DsSub.Tables[0].Rows[i]["HEntryCloseDate"]);
oSub.HRemark = DsSub.Tables[0].Rows[i]["HRemark"].ToString().Trim();
//===================================================
-
+
DetailColl.Add(oSub);
}
sReturn = "鏄剧ず鍗曟嵁鎴愬姛锛�";
--
Gitblit v1.9.1