From 2e0799149d72031f874f90a0e9f27a60f7a58ce1 Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期三, 18 十二月 2024 14:42:19 +0800
Subject: [PATCH] 工作任务维护，任务汇报列表，工程项目维护，工作周计划列表，工作周总结列表 把分页模式 全部改为 数据库分页；
---
DAL/仓库管理/ClsKf_SellOutBillForLayUI.cs | 92 ++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 88 insertions(+), 4 deletions(-)
diff --git "a/DAL/\344\273\223\345\272\223\347\256\241\347\220\206/ClsKf_SellOutBillForLayUI.cs" "b/DAL/\344\273\223\345\272\223\347\256\241\347\220\206/ClsKf_SellOutBillForLayUI.cs"
index 38e38ca..0adbd5f 100644
--- "a/DAL/\344\273\223\345\272\223\347\256\241\347\220\206/ClsKf_SellOutBillForLayUI.cs"
+++ "b/DAL/\344\273\223\345\272\223\347\256\241\347\220\206/ClsKf_SellOutBillForLayUI.cs"
@@ -51,6 +51,10 @@
{
oCn.RunProc("exec h_p_Xs_UpDateRelation_SeOrderToSellOut_Delete " + lngBillKey.ToString());
}
+ else if (DetailColl[0].HSourceBillType == "1402") //鍙戣揣閫氱煡鍗�
+ {
+ oCn.RunProc("exec h_p_Xs_UpDateRelation_SeOutStockToPOStockIn_Delete " + lngBillKey.ToString());
+ }
else
{
@@ -80,6 +84,10 @@
{
oCn.RunProc("exec h_p_Xs_UpDateRelation_SeOrderToSellOut_Add " + lngBillKey.ToString());
}
+ else if(DetailColl[0].HSourceBillType == "1402") //鍙戣揣閫氱煡鍗�
+ {
+ oCn.RunProc("exec h_p_Xs_UpDateRelation_SeOutStockToPOStockIn_Add " + lngBillKey.ToString());
+ }
else
{
@@ -96,6 +104,22 @@
{
try
{
+ //淇濆瓨鍓嶆帶鍒�=========================================
+ string HBillNote = "";
+ DataSet ds = oCn.RunProcReturn("Exec h_p_Kf_SellOutBill_BeforeSaveCtrl " + omodel.HInterID.ToString() + ", '" + omodel.HBillNo + "','" + HBillNote + "',1 ", "h_p_Kf_SellOutBill_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();
@@ -146,6 +170,7 @@
",HSTOCKORGID = " + omodel.HOrgID + "" +
",HOWNERID = " + omodel.HOrgID + "" +
",HOrgID = " + omodel.HOrgID + "" +
+ ",HBillNo='" + omodel.HBillNo + "'" +
",HMainSourceInterID = " + omodel.HMainSourceInterID + "" +
",HMainSourceEntryID = " + omodel.HMainSourceEntryID + "" +
",HMainSourceBillNo = '" + omodel.HMainSourceBillNo + "'" +
@@ -171,6 +196,9 @@
",HInnerBillNo = '" + omodel.HInnerBillNo + "'" +
",HCarriage = " + omodel.HCarriage + "" +
",HCheckStatusMan = '" + omodel.HCheckStatusMan + "'" +
+ ",HProjectID = '" + omodel.HProjectID.ToString() + "'" +
+ ",HGroupID = '" + omodel.HGroupID.ToString() + "'" +
+ ",HPriceType = '" + omodel.HPriceType + "'" +
" where HInterID = " + lngBillKey;
//鏇存柊涓昏〃
oCn.RunProc(mainSql);
@@ -187,7 +215,7 @@
" (HInterID,HEntryID,HCloseMan,HEntryCloseDate,HCloseType,HRemark" +
",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" +
",HSeOrderInterID,HSeOrderEntryID,HSeOrderBillNo" +
- ",HMaterID,HUnitID,HQtyMust,HQty,HPrice,HMoney,HTaxPrice,HTaxRate,HTaxMoney,HWHID" +
+ ",HMaterID,HUnitID,HQtyMust,HQty,HPieceQty,HPrice,HMoney,HTaxPrice,HTaxRate,HTaxMoney,HWHID" +
",HSPID,HSCWHID,HSCSPID,HSPGroupID,HBatchNo,HPOOrderInterID,HPOOrderEntryID,HPOOrderBillNo" +
",HQty_Full,HQty_Empty,HQty_Back,HCostPrice,HCostMoney,HSalePrice" +
@@ -216,6 +244,7 @@
"," + oSub.HUnitID.ToString() + "" +
"," + oSub.HQtyMust.ToString() + "" +
"," + oSub.HQty.ToString() + "" +
+ "," + oSub.HPieceQty.ToString() + "" +
"," + oSub.HPrice.ToString() + "" +
"," + oSub.HMoney.ToString() + "" +
"," + oSub.HTaxPrice.ToString() + "" +
@@ -276,6 +305,23 @@
AddNewRelation(ref sReturn, omodel.HInterID);
//鎺у埗鍏宠仈鏁伴噺
+ //=========================淇濆瓨鍚庢帶鍒�
+ DataSet ds2 = oCn.RunProcReturn("Exec h_p_Kf_SellOutBill_AfterSaveCtrl " + omodel.HInterID.ToString() + ", '" + omodel.HBillNo + "',1 ", "h_p_Kf_SellOutBill_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();
@@ -305,6 +351,22 @@
{
omodel.HInterID = DBUtility.ClsPub.CreateBillID(BillType, ref DBUtility.ClsPub.sExeReturnInfo);
}
+
+ //淇濆瓨鍓嶆帶鍒�=========================================
+ string HBillNote = "";
+ DataSet ds = oCn.RunProcReturn("Exec h_p_Kf_SellOutBill_BeforeSaveCtrl " + omodel.HInterID.ToString() + ", '" + omodel.HBillNo + "','" + HBillNote + "',1 ", "h_p_Kf_SellOutBill_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();
//涓昏〃
@@ -314,7 +376,7 @@
",HDeptID,HManagerID,HEmpID,HSupID,HSecManagerID,HKeeperID,HWHID,HSCWHID,HCurID,HExRate,HSellSID,HLinkMan,HLinkPhone" +
",HSeOrderBillNo" +
",HConveyCompID,HConveyTypeID,HConveyMoney" +
- ",HExplanation,HInnerBillNo,HRedBlueFlag,HCarriage,HCheckStatusMan" +
+ ",HExplanation,HInnerBillNo,HRedBlueFlag,HCarriage,HCheckStatusMan,HProjectID,HGroupID,HPriceType" +
") " +
"values(" +
"" + omodel.HInterID.ToString() + "" +
@@ -323,7 +385,7 @@
"," + omodel.HYear.ToString() + "" +
"," + omodel.HPeriod.ToString() + "" +
",'" + this.BillType + "'" +
- ",'" + this.HBillSubType + "'" +
+ ",'" + omodel.HBillSubType + "'" +
",'" + omodel.HRemark + "'" +
",'" + omodel.HMaker + "'" +
"," + "getdate()" + "" +
@@ -364,6 +426,9 @@
"," + DBUtility.ClsPub.BoolToString(omodel.HRedBlueFlag) + "" +
"," + omodel.HCarriage + "" +
",'" + omodel.HCheckStatusMan + "'" +
+ ",'" + omodel.HProjectID.ToString() + "'" +
+ ",'" + omodel.HGroupID.ToString() + "'" +
+ ",'" + omodel.HPriceType + "'" +
") ";
oCn.RunProc(mainSql);
@@ -395,7 +460,7 @@
" (HInterID,HEntryID,HCloseMan,HEntryCloseDate,HCloseType,HRemark" +
",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" +
",HSeOrderInterID,HSeOrderEntryID,HSeOrderBillNo" +
- ",HMaterID,HUnitID,HQtyMust,HQty,HPrice,HMoney,HTaxPrice,HTaxRate,HTaxMoney,HWHID" +
+ ",HMaterID,HUnitID,HQtyMust,HQty,HPieceQty,HPrice,HMoney,HTaxPrice,HTaxRate,HTaxMoney,HWHID" +
",HSPID,HSCWHID,HSCSPID,HSPGroupID,HBatchNo,HPOOrderInterID,HPOOrderEntryID,HPOOrderBillNo" +
",HQty_Full,HQty_Empty,HQty_Back,HCostPrice,HCostMoney,HSalePrice" +
@@ -424,6 +489,7 @@
"," + oSub.HUnitID.ToString() + "" +
"," + oSub.HQtyMust.ToString() + "" +
"," + oSub.HQty.ToString() + "" +
+ "," + oSub.HPieceQty.ToString() + "" +
"," + oSub.HPrice.ToString() + "" +
"," + oSub.HMoney.ToString() + "" +
"," + oSub.HTaxPrice.ToString() + "" +
@@ -484,6 +550,23 @@
//鎺у埗鍏宠仈鏁伴噺
//
+ //=========================淇濆瓨鍚庢帶鍒�
+ DataSet ds2 = oCn.RunProcReturn("Exec h_p_Kf_SellOutBill_AfterSaveCtrl " + omodel.HInterID.ToString() + ", '" + omodel.HBillNo + "',1 ", "h_p_Kf_SellOutBill_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;
@@ -588,6 +671,7 @@
oSub.HUnitID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HUnitID"]);
oSub.HQtyMust = DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[i]["HQtyMust"]);
oSub.HQty = DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[i]["HQty"]);
+ oSub.HPieceQty = DBUtility.ClsPub.isInt(DsSub.Tables[0].Rows[i]["HPieceQty"]);
oSub.HPrice = DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[i]["HPrice"]);
oSub.HMoney = DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[i]["HMoney"]);
oSub.HSalePrice = DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[i]["HSalePrice"]);
--
Gitblit v1.9.1