From 8bae9699d6fa35e2ecc1b871e45b6d6d9cbe01f3 Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期六, 05 十月 2024 13:46:49 +0800
Subject: [PATCH] 工艺路线多级审批反审核控制添加
---
DAL/车间管理/ClsWW_EntrustWorkOrderBill.cs | 165 ++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 116 insertions(+), 49 deletions(-)
diff --git "a/DAL/\350\275\246\351\227\264\347\256\241\347\220\206/ClsWW_EntrustWorkOrderBill.cs" "b/DAL/\350\275\246\351\227\264\347\256\241\347\220\206/ClsWW_EntrustWorkOrderBill.cs"
index 06c1015..047d460 100644
--- "a/DAL/\350\275\246\351\227\264\347\256\241\347\220\206/ClsWW_EntrustWorkOrderBill.cs"
+++ "b/DAL/\350\275\246\351\227\264\347\256\241\347\220\206/ClsWW_EntrustWorkOrderBill.cs"
@@ -18,8 +18,8 @@
base.MvarItemKeySub4 = "";
base.MvarItemKey = "WW_EntrustWorkOrderBillMain";
base.MvarReportTitle = "濮斿鍔犲伐鍗�";
- base.BillType = "1602";
- base.HBillSubType = "1602";
+ base.BillType = "3740";
+ base.HBillSubType = "3740";
}
@@ -41,7 +41,7 @@
oCn.BeginTran();
//鍒犻櫎鍏宠仈
DeleteRelation(ref sReturn, lngBillKey);
- oCn.RunProc("exec h_p_WW_EntrustWorkOrderToProcExch_Del " + lngBillKey.ToString());
+ //oCn.RunProc("exec h_p_WW_EntrustWorkOrderToProcExch_Del " + lngBillKey.ToString());
//鍒犻櫎鏄庣粏琛�
DeleteBillSub(lngBillKey);
DeleteBillSub2(lngBillKey);
@@ -66,6 +66,22 @@
{
try
{
+
+ //淇濆瓨鍓嶆帶鍒�=========================================
+ string HBillNote = "";
+ DataSet ds = oCn.RunProcReturn("Exec h_p_WW_EntrustWorkOrderBill_BeforeSaveCtrl " + omodel.HInterID.ToString() + ", '" + omodel.HBillNo + "','" + HBillNote + "',1 ", "h_p_WW_EntrustWorkOrderBill_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();
//鏇存柊涓昏〃
@@ -82,9 +98,9 @@
",HSupID=" + omodel.HSupID.ToString() +
",HOrderProcNO='" + omodel.HOrderProcNO + "'" +
" where HInterID=" + lngBillKey.ToString());
- //鍒犻櫎鍏宠仈
- DeleteRelation(ref sReturn, lngBillKey);
- oCn.RunProc("exec h_p_WW_EntrustWorkOrderToProcExch_Del " + lngBillKey.ToString());
+ ////鍒犻櫎鍏宠仈
+ //DeleteRelation(ref sReturn, lngBillKey);
+ //oCn.RunProc("exec h_p_WW_EntrustWorkOrderToProcExch_Del " + lngBillKey.ToString());
//鍒犻櫎瀛愯〃
DeleteBillSub(lngBillKey);
@@ -97,40 +113,57 @@
",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" +
",HOrderBillNo,HMaterLenModel,HMaterQty,HMaterID,HQty" +
",HEntrustType,HNextProcName,HPrice,HOutQty,HInQty" +
- ",HBackSupDate,HInDate,HWorkProcFlow,HProcID,HLeftMater" +
+ ",HInDate,HWorkProcFlow,HProcID,HLeftMater" +
") values("
+ omodel.HInterID.ToString() + "," + oSub.HEntryID.ToString() + ",'" + oSub.HCloseMan + "','" + oSub.HEntryCloseDate.ToShortDateString() + "'," + 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.HOrderBillNo + "','" + oSub.HMaterLenModel + "'," + oSub.HMaterQty.ToString() + "," + oSub.HMaterID.ToString() + "," + oSub.HQty.ToString() +
",'" + oSub.HEntrustType + "','" + oSub.HNextProcName + "'," + oSub.HPrice.ToString() + "," + oSub.HOutQty.ToString() + "," + oSub.HInQty.ToString() +
- ",'" + oSub.HBackSupDate.ToShortDateString() + "','" + oSub.HInDate.ToShortDateString() + "','" + oSub.HWorkProcFlow + "'," + oSub.HProcID.ToString() +",'" + oSub.HLeftMater + "'" +
+ ",'" + oSub.HInDate.ToShortDateString() + "','" + oSub.HWorkProcFlow + "'," + oSub.HProcID.ToString() +",'" + oSub.HLeftMater + "'" +
") ");
}
- //鏍规嵁鍐呯爜 濮斿宸ュ崟琛ㄥご渚涘簲鍟� 鍥炲～瀵瑰簲娴佽浆鍗� 渚涘簲鍟嗭紝鏈夊澶栨爣璁版墠鍥炲～
- oCn.RunProc("exec h_p_WW_EntrustWorkOrderToProcExch " + omodel.HInterID.ToString());
+ ////鏍规嵁鍐呯爜 濮斿宸ュ崟琛ㄥご渚涘簲鍟� 鍥炲～瀵瑰簲娴佽浆鍗� 渚涘簲鍟嗭紝鏈夊澶栨爣璁版墠鍥炲～
+ //oCn.RunProc("exec h_p_WW_EntrustWorkOrderToProcExch " + omodel.HInterID.ToString());
+ ////
+ ////
+ //DataSet Ds;
+ //Ds = oCn.RunProcReturn("exec h_p_WW_EntrustWorkOrderToProcExch_QtyCtrl " + omodel.HInterID.ToString() + "", "h_p_WW_EntrustWorkOrderToProcExch_QtyCtrl");
+ //if (Ds == null)
+ //{
+ // sReturn = "鍒ゆ柇鏁伴噺澶辫触锛�";
+ // oCn.RollBack();
+ // return false;
+ //}
+ //if (Ds.Tables[0].Rows.Count == 0)
+ //{
+ // sReturn = "鍒ゆ柇鏁伴噺澶辫触锛�";
+ // oCn.RollBack();
+ // return false;
+ //}
+ //if (DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HBack"]) == "2")
+ //{
+ // sReturn = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HBackRemark"]);
+ // oCn.RollBack();
+ // return false;
+ //}
//
- //
- DataSet Ds;
- Ds = oCn.RunProcReturn("exec h_p_WW_EntrustWorkOrderToProcExch_QtyCtrl " + omodel.HInterID.ToString() + "", "h_p_WW_EntrustWorkOrderToProcExch_QtyCtrl");
- if (Ds == null)
+
+
+ //=========================淇濆瓨鍚庢帶鍒�
+ DataSet ds2 = oCn.RunProcReturn("Exec h_p_WW_EntrustWorkOrderBill_AfterSaveCtrl " + omodel.HInterID.ToString() + ", '" + omodel.HBillNo + "',1 ", "h_p_WW_EntrustWorkOrderBill_AfterSaveCtrl");
+ if (ds2 == null)
{
- sReturn = "鍒ゆ柇鏁伴噺澶辫触锛�";
+ sReturn = "淇濆瓨鍚庢帶鍒跺垽鏂け璐ワ紒";
oCn.RollBack();
return false;
}
- if (Ds.Tables[0].Rows.Count == 0)
+ if (DBUtility.ClsPub.isStrNull(ds2.Tables[0].Rows[0]["HBack"]) != "0")
{
- sReturn = "鍒ゆ柇鏁伴噺澶辫触锛�";
+ sReturn = "淇濆瓨澶辫触2锛�" + DBUtility.ClsPub.isStrNull(ds2.Tables[0].Rows[0]["HBackRemark"]);
oCn.RollBack();
return false;
}
- if (DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HBack"]) == "2")
- {
- sReturn = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HBackRemark"]);
- oCn.RollBack();
- return false;
- }
- //
+ //============================
sReturn = "淇敼鍗曟嵁鎴愬姛锛�";
oCn.Commit();
@@ -150,6 +183,22 @@
{
//寰楀埌mainid
omodel.HInterID = DBUtility.ClsPub.CreateBillID(BillType, ref DBUtility.ClsPub.sExeReturnInfo);
+
+ //淇濆瓨鍓嶆帶鍒�=========================================
+ string HBillNote = "";
+ DataSet ds = oCn.RunProcReturn("Exec h_p_WW_EntrustWorkOrderBill_BeforeSaveCtrl " + omodel.HInterID.ToString() + ", '" + omodel.HBillNo + "','" + HBillNote + "',1 ", "h_p_WW_EntrustWorkOrderBill_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;
+ }
+ //=========================================================
+
//omodel.HBillNo = DBUtility.ClsPub.CreateBillCode(BillType, ref DBUtility.ClsPub.sExeReturnInfo, true);
//鑻AINDI閲嶅鍒欓噸鏂拌幏鍙�
//if (IsExistBillNo(ref DBUtility.ClsPub.sExeReturnInfo, omodel.HBillNo, Pub_Class.ClsPub.Enum_BillStatus.BillStatus_AddNew, omodel.HInterID))
@@ -169,8 +218,8 @@
",HDeptID,HSupID,HOrderProcNO" +
") " +
" values('" + this.BillType + "','" + this.HBillSubType + "'," + omodel.HInterID.ToString() + ",'" + omodel.HBillNo + "','" + omodel.HDate + "'" +
- ", " + omodel.HYear.ToString() + "," + omodel.HPeriod.ToString() + ",'" + omodel.HRemark + "','" + DBUtility.ClsPub.CurUserName + "',getdate()" +
- ", " + omodel.HDeptID.ToString() + "," + omodel.HSupID.ToString() + ",'" + omodel.HOrderProcNO + "'" +
+ ", " + omodel.HYear.ToString() + "," + omodel.HPeriod.ToString() + ",'" + omodel.HRemark + "','" + omodel.HMaker + "','" + omodel.HDate+
+ "', " + omodel.HDeptID.ToString() + "," + omodel.HSupID.ToString() + ",'" + omodel.HOrderProcNO + "'" +
") ");
//鎻掑叆瀛愯〃
foreach (Model.ClsWW_EntrustWorkOrderBillSub oSub in DetailColl)
@@ -180,40 +229,58 @@
",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" +
",HOrderBillNo,HMaterLenModel,HMaterQty,HMaterID,HQty" +
",HEntrustType,HNextProcName,HPrice,HOutQty,HInQty" +
- ",HBackSupDate,HInDate,HWorkProcFlow,HProcID,HLeftMater" +
+ ",HInDate,HWorkProcFlow,HProcID,HLeftMater" +
") values("
+ omodel.HInterID.ToString() + "," + oSub.HEntryID.ToString() + ",'" + oSub.HCloseMan + "','" + oSub.HEntryCloseDate.ToShortDateString() + "'," + 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.HOrderBillNo + "','" + oSub.HMaterLenModel + "'," + oSub.HMaterQty.ToString() + "," + oSub.HMaterID.ToString() + "," + oSub.HQty.ToString() +
",'" + oSub.HEntrustType + "','" + oSub.HNextProcName + "'," + oSub.HPrice.ToString() + "," + oSub.HOutQty.ToString() + "," + oSub.HInQty.ToString() +
- ",'" + oSub.HBackSupDate.ToShortDateString() + "','" + oSub.HInDate.ToShortDateString() + "','" + oSub.HWorkProcFlow + "'," + oSub.HProcID.ToString() + ",'" + oSub.HLeftMater + "'" +
+ ",'" + oSub.HInDate.ToShortDateString() + "','" + oSub.HWorkProcFlow + "'," + oSub.HProcID.ToString() + ",'" + oSub.HLeftMater + "'" +
") ");
}
//鏍规嵁鍐呯爜 濮斿宸ュ崟琛ㄥご渚涘簲鍟� 鍥炲～瀵瑰簲娴佽浆鍗� 渚涘簲鍟嗭紝鏈夊澶栨爣璁版墠鍥炲～..骞朵笖鍥炲～ 鍏宠仈鏁伴噺
- oCn.RunProc("exec h_p_WW_EntrustWorkOrderToProcExch " + omodel.HInterID.ToString());
+ //oCn.RunProc("exec h_p_WW_EntrustWorkOrderToProcExch " + omodel.HInterID.ToString());
//
- DataSet Ds;
- Ds = oCn.RunProcReturn("exec h_p_WW_EntrustWorkOrderToProcExch_QtyCtrl " + omodel.HInterID.ToString() + "", "h_p_WW_EntrustWorkOrderToProcExch_QtyCtrl");
- if (Ds == null)
- {
- sReturn = "鍒ゆ柇鏁伴噺澶辫触锛�";
- oCn.RollBack();
- return false;
- }
- if (Ds.Tables[0].Rows.Count == 0)
- {
- sReturn = "鍒ゆ柇鏁伴噺澶辫触锛�";
- oCn.RollBack();
- return false;
- }
- if (DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HBack"]) == "2")
- {
- sReturn = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HBackRemark"]);
- oCn.RollBack();
- return false;
- }
+ //DataSet Ds;
+ //Ds = oCn.RunProcReturn("exec h_p_WW_EntrustWorkOrderToProcExch_QtyCtrl " + omodel.HInterID.ToString() + "", "h_p_WW_EntrustWorkOrderToProcExch_QtyCtrl");
+ //if (Ds == null)
+ //{
+ // sReturn = "鍒ゆ柇鏁伴噺澶辫触锛�";
+ // oCn.RollBack();
+ // return false;
+ //}
+ //if (Ds.Tables[0].Rows.Count == 0)
+ //{
+ // sReturn = "鍒ゆ柇鏁伴噺澶辫触锛�";
+ // oCn.RollBack();
+ // return false;
+ //}
+ //if (DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HBack"]) == "2")
+ //{
+ // sReturn = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HBackRemark"]);
+ // oCn.RollBack();
+ // return false;
+ //}
//
+
+ //=========================淇濆瓨鍚庢帶鍒�
+ DataSet ds2 = oCn.RunProcReturn("Exec h_p_WW_EntrustWorkOrderBill_AfterSaveCtrl " + omodel.HInterID.ToString() + ", '" + omodel.HBillNo + "',1 ", "h_p_WW_EntrustWorkOrderBill_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