From d3473e15fd14ea84a1378f3d3841bcad16c2d9f3 Mon Sep 17 00:00:00 2001
From: yxj <yxj@hz-kingdee.com>
Date: 星期二, 18 六月 2024 15:32:04 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/DLL/ClsQC_PatrolProcCheckBill.cs | 139 ++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 122 insertions(+), 17 deletions(-)
diff --git a/WebAPI/DLL/ClsQC_PatrolProcCheckBill.cs b/WebAPI/DLL/ClsQC_PatrolProcCheckBill.cs
index d1dc5c0..e8511ee 100644
--- a/WebAPI/DLL/ClsQC_PatrolProcCheckBill.cs
+++ b/WebAPI/DLL/ClsQC_PatrolProcCheckBill.cs
@@ -9,11 +9,12 @@
{
public Model.ClsQC_PatrolProcCheckBillMain omodel = new Model.ClsQC_PatrolProcCheckBillMain();
public List<Model.ClsQC_PatrolProcCheckBillSub> DetailColl = new List<Model.ClsQC_PatrolProcCheckBillSub>();
+ public List<Model.ClsQC_PatrolProcCheckBillSub_BadReason> DetailColl_Bad = new List<Model.ClsQC_PatrolProcCheckBillSub_BadReason>();
//public List<Model.ClsQC_PatrolProcCheckBillSub_Item> DetailColl1 = new List<Model.ClsQC_PatrolProcCheckBillSub_Item>();
public ClsQC_PatrolProcCheckBill()
{
base.MvarItemKeySub = "QC_PatrolProcCheckBillSub";
- base.MvarItemKeySub2 = "";
+ base.MvarItemKeySub2 = "QC_PatrolProcCheckBillSub_BadReason";
base.MvarItemKeySub3 = "";
base.MvarItemKeySub4 = "";
base.MvarItemKey="QC_PatrolProcCheckBillMain";
@@ -36,11 +37,30 @@
{
try
{
+
+
+ //淇濆瓨鍓嶆帶鍒�=========================================
+ string HBillNote = "";
+ DataSet ds = oCn.RunProcReturn("Exec h_p_QC_PatrolProcCheckBill_BeforeSaveCtrl " + omodel.HInterID.ToString() + ", '" + omodel.HBillNo + "','" + HBillNote + "',1 ", "h_p_QC_PatrolProcCheckBill_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;
+ }
+ //=========================================================
+
+
//
oCn.BeginTran();
string sqlerro = @"UpDate QC_PatrolProcCheckBillMain set " +
" HBillNo='" + omodel.HBillNo + "'" + //鍥哄畾璧嬪��===============
",HDate='" + omodel.HDate + "'" +
+ ",HLastResult='" + omodel.HLastResult + "'" +
",HYear='" + omodel.HYear.ToString() + "'" +
",HPeriod='" + omodel.HPeriod.ToString() + "'" +
",HBillStatus='" + omodel.HBillStatus + "'" +
@@ -59,20 +79,23 @@
//",HCloseType="+omodel.HCloseType.ToString()+
//",HDeleteMan='" + omodel.HDeleteMan + "'" +
//",HDeleteDate='" + omodel.HDeleteDate + "'" +
- ",HPrintQty=" + omodel.HPrintQty.ToString() +
+ //",HPrintQty=" + omodel.HPrintQty.ToString() +
//========================================
//",HSupID=" + omodel.HSupID.ToString() +
//",HEmpID=" + omodel.HEmpID.ToString() +
- ",HSourceID=" + omodel.HSourceID.ToString() +
- ",HICMOInterID=" + omodel.HICMOInterID.ToString() +
- ",HICMOBillNo='" + omodel.HICMOBillNo + "'" +
- ",HICMOQty=" + omodel.HICMOQty.ToString() +
- ",HProcExchInterID=" + omodel.HICMOQty.ToString() +
- ",HProcExchEntryID=" + omodel.HICMOQty.ToString() +
- ",HProcExchBillNo='" + omodel.HProcExchBillNo + "'" +
- ",HProcExchQty=" + omodel.HICMOQty.ToString() +
- ",HMaterID=" + omodel.HMaterID.ToString() +
+ //",HSourceID=" + omodel.HSourceID.ToString() +
+ //",HICMOInterID=" + omodel.HICMOInterID.ToString() +
+ //",HICMOBillNo='" + omodel.HICMOBillNo + "'" +
+ //",HICMOQty=" + omodel.HICMOQty.ToString() +
+ //",HProcExchInterID=" + omodel.HICMOQty.ToString() +
+ //",HProcExchEntryID=" + omodel.HICMOQty.ToString() +
+ //",HProcExchBillNo='" + omodel.HProcExchBillNo + "'" +
+ //",HProcExchQty=" + omodel.HICMOQty.ToString() +
+ //",HMaterID=" + omodel.HMaterID.ToString() +
",HFirstCheckEmp=" + omodel.HFirstCheckEmp.ToString() +
+ ",HMainProcID=" + omodel.HMainProcID.ToString() +
+ ",HShiftsID=" + omodel.HShiftsID.ToString() +
+ ",HErrTreatment='" + omodel.HErrTreatment + "'" +
" where HInterID=" + lngBillKey.ToString();
//鏇存柊涓昏〃
oCn.RunProc(sqlerro);
@@ -80,8 +103,11 @@
DeleteRelation(ref sReturn, lngBillKey);
//鍒犻櫎瀛愯〃
DeleteBillSub(lngBillKey);
+ //鍒犻櫎瀛愯〃2
+ DeleteBillSub2(lngBillKey);
//鎻掑叆瀛愯〃
omodel.HInterID = lngBillKey;
+ //鎻掑叆瀛愯〃
foreach (Model.ClsQC_PatrolProcCheckBillSub oSub in DetailColl)
{
oCn.RunProc("Insert into QC_PatrolProcCheckBillSub " +
@@ -89,14 +115,28 @@
",HEntryCloseDate,HCloseType,HRemark,HSourceInterID" +
",HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" +
",HQCCheckItemID,HQCStd,HQCNote1,HQCNote2,HQCNote3,HQCNote4" +
- ",HQCNote5,HQCNote6,HQCNote7,HQCNote8,HQCNote9,HQCNote10"+
+ ",HQCNote5,HQCNote6,HQCNote7,HQCNote8,HQCNote9,HQCNote10" +
") values("
+ omodel.HInterID.ToString() + ",'" + oSub.HBillNo_bak + "'," + oSub.HEntryID.ToString() + ",'" + oSub.HCloseMan + "'" +
",getdate()," + Convert.ToString(oSub.HCloseType ? 1 : 0) + ",'" + oSub.HRemark + "'," + oSub.HSourceInterID.ToString() +
"," + oSub.HSourceEntryID.ToString() + ",'" + oSub.HSourceBillNo + "','" + oSub.HSourceBillType + "'," + oSub.HRelationQty.ToString() + "," + oSub.HRelationMoney.ToString() +
- "," + oSub.HQCCheckItemID.ToString() + ",'" + oSub.HQCStd + "','" + oSub.HQCNote1 + "','" + oSub.HQCNote2 + "','" + oSub.HQCNote3+ "','" + oSub.HQCNote4+ "'" +
- ",'" + oSub.HQCNote5+ "','" + oSub.HQCNote6 + "','" + oSub.HQCNote7 + "','" + oSub.HQCNote8 + "','" + oSub.HQCNote9 + "','" + oSub.HQCNote10 + "'" +
+ "," + oSub.HQCCheckItemID.ToString() + ",'" + oSub.HQCStd + "','" + oSub.HQCNote1 + "','" + oSub.HQCNote2 + "','" + oSub.HQCNote3 + "','" + oSub.HQCNote4 + "'" +
+ ",'" + oSub.HQCNote5 + "','" + oSub.HQCNote6 + "','" + oSub.HQCNote7 + "','" + oSub.HQCNote8 + "','" + oSub.HQCNote9 + "','" + oSub.HQCNote10 + "'" +
") ");
+ }
+
+ //鎻掑叆瀛愯〃2
+ foreach (Model.ClsQC_PatrolProcCheckBillSub_BadReason oBad in DetailColl_Bad)
+ {
+ oCn.RunProc("Insert into QC_PatrolProcCheckBillSub_BadReason " +
+ " (HInterID,HBillNo_bak,HEntryID,HSEQ" +
+ ",HCreateDate,HBadReasonID,HEmpID,HProcID" +
+ ",HCheckEmpID,HFinishDate,HMaterID,HQty,HRemark" +
+ ") values("
+ + omodel.HInterID.ToString() + ",'" + oBad.HBillNo_bak + "'," + oBad.HEntryID + "," + oBad.HSEQ + ",'" + oBad.HCreateDate + "',"
+ + oBad.HBadReasonID + "," + oBad.HEmpID + "," + oBad.HProcID + "," + oBad.HCheckEmpID + ",'" + oBad.HFinishDate + "',"
+ + oBad.HMaterID + "," + oBad.HQty + ",'" + oBad.HRemark + "'"
+ + ") ");
}
//foreach (Model.ClsQC_PatrolProcCheckBillSub_Item oSub2 in DetailColl1)
//{
@@ -125,6 +165,24 @@
// return false;
// }
//}
+
+ //=========================淇濆瓨鍚庢帶鍒�
+ DataSet ds2 = oCn.RunProcReturn("Exec h_p_QC_PatrolProcCheckBill_AfterSaveCtrl " + omodel.HInterID.ToString() + ", '" + omodel.HBillNo + "',1 ", "h_p_QC_PatrolProcCheckBill_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;
@@ -143,6 +201,23 @@
{
//寰楀埌mainid
omodel.HInterID = DBUtility.ClsPub.CreateBillID(BillType, ref DBUtility.ClsPub.sExeReturnInfo);
+
+ //淇濆瓨鍓嶆帶鍒�=========================================
+ string HBillNote = "";
+ DataSet ds = oCn.RunProcReturn("Exec h_p_QC_PatrolProcCheckBill_BeforeSaveCtrl " + omodel.HInterID.ToString() + ", '" + omodel.HBillNo + "','" + HBillNote + "',1 ", "h_p_QC_PatrolProcCheckBill_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;
+ }
+ //=========================================================
+
+
//鑻AINDI閲嶅鍒欓噸鏂拌幏鍙�
oCn.BeginTran();
//涓昏〃
@@ -150,12 +225,12 @@
"(HBillType,HBillSubType,HInterID,HBillNo,HBillStatus,HDate,HMaker,HMakeDate" +
",HYear,HPeriod,HRemark" +
",HSourceID,HICMOInterID,HICMOBillNo,HICMOQty,HProcExchInterID,HProcExchEntryID" +
- ",HProcExchBillNo,HProcExchQty,HMaterID,HFirstCheckEmp" +
+ ",HProcExchBillNo,HProcExchQty,HMaterID,HFirstCheckEmp,HMainProcID,HLastResult,HShiftsID,HErrTreatment" +
") " +
- " values('" + this.BillType + "','" + this.HBillSubType + "'," + omodel.HInterID.ToString() + ",'" + omodel.HBillNo + "'," + omodel.HBillStatus.ToString() + ",'" + omodel.HDate + "','" + DBUtility.ClsPub.CurUserName + "',getdate()" +
+ " values('" + this.BillType + "','" + this.HBillSubType + "'," + omodel.HInterID.ToString() + ",'" + omodel.HBillNo + "'," + omodel.HBillStatus.ToString() + ",'" + omodel.HDate + "','" + omodel.HMaker + "',getdate()" +
"," + omodel.HYear.ToString() + "," + omodel.HPeriod.ToString() + ",'" + omodel.HRemark + "'" +
"," + omodel.HSourceID.ToString() + "," + omodel.HICMOInterID.ToString() + ",'" + omodel.HICMOBillNo + "'," + omodel.HICMOQty.ToString() + "," + omodel.HProcExchInterID.ToString() + "," + omodel.HProcExchEntryID.ToString() +
- ",'" + omodel.HProcExchBillNo + "'," + omodel.HProcExchQty.ToString() + "," + omodel.HMaterID.ToString() + "," + omodel.HFirstCheckEmp.ToString() +
+ ",'" + omodel.HProcExchBillNo + "'," + omodel.HProcExchQty.ToString() + "," + omodel.HMaterID.ToString() + "," + omodel.HFirstCheckEmp.ToString() + "," + omodel.HMainProcID +" ,"+ omodel.HLastResult + "," + omodel.HShiftsID + ",'" + omodel.HErrTreatment + "'" +
") ");
//鎻掑叆瀛愯〃
foreach (Model.ClsQC_PatrolProcCheckBillSub oSub in DetailColl)
@@ -173,6 +248,19 @@
"," + oSub.HQCCheckItemID.ToString() + ",'" + oSub.HQCStd + "','" + oSub.HQCNote1 + "','" + oSub.HQCNote2 + "','" + oSub.HQCNote3 + "','" + oSub.HQCNote4 + "'" +
",'" + oSub.HQCNote5 + "','" + oSub.HQCNote6 + "','" + oSub.HQCNote7 + "','" + oSub.HQCNote8 + "','" + oSub.HQCNote9 + "','" + oSub.HQCNote10 + "'" +
") ");
+ }
+ //鎻掑叆瀛愯〃2
+ foreach (Model.ClsQC_PatrolProcCheckBillSub_BadReason oBad in DetailColl_Bad)
+ {
+ oCn.RunProc("Insert into QC_PatrolProcCheckBillSub_BadReason " +
+ " (HInterID,HBillNo_bak,HEntryID,HSEQ" +
+ ",HCreateDate,HBadReasonID,HEmpID,HProcID" +
+ ",HCheckEmpID,HFinishDate,HMaterID,HQty,HRemark" +
+ ") values("
+ + omodel.HInterID.ToString() + ",'" + oBad.HBillNo_bak + "'," + oBad.HEntryID + "," + oBad.HSEQ + ",'" + oBad.HCreateDate + "',"
+ + oBad.HBadReasonID + "," + oBad.HEmpID + "," + oBad.HProcID + "," + oBad.HCheckEmpID + ",'" + oBad.HFinishDate + "',"
+ + oBad.HMaterID + "," + oBad.HQty + ",'" + oBad.HRemark + "'"
+ + ") ");
}
//foreach (Model.ClsQC_PatrolProcCheckBillSub_Item oSub2 in DetailColl1)
//{
@@ -202,6 +290,23 @@
// }
//}
//
+
+ //=========================淇濆瓨鍚庢帶鍒�
+ DataSet ds2 = oCn.RunProcReturn("Exec h_p_QC_PatrolProcCheckBill_AfterSaveCtrl " + omodel.HInterID.ToString() + ", '" + omodel.HBillNo + "',1 ", "h_p_QC_PatrolProcCheckBill_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;
--
Gitblit v1.9.1