From e0713b58eaa9749631ee9c31b5ff1856d922a76e Mon Sep 17 00:00:00 2001
From: zrg <z1873@LAPTOP-EAVL132E>
Date: 星期三, 11 三月 2026 20:42:05 +0800
Subject: [PATCH] 巡检 保存前 保存后存储过程名字修改,条码生成选源单华舟修改

---
 DAL/仓库管理/ClsKf_SellOutBillForLayUI.cs |   25 ++++++++++++++++++++-----
 1 files changed, 20 insertions(+), 5 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 942808f..b133f98 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
                 {
 
@@ -79,6 +83,10 @@
                 else if(DetailColl[0].HSourceBillType == "1401")                    //閿�鍞鍗�
                 {
                     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
                 {
@@ -162,6 +170,7 @@
                     ",HSTOCKORGID = " + omodel.HOrgID + "" +
                     ",HOWNERID = " + omodel.HOrgID + "" +
                     ",HOrgID = " + omodel.HOrgID + "" +
+                    ",HBillNo='" + omodel.HBillNo + "'" +
                     ",HMainSourceInterID = " + omodel.HMainSourceInterID + "" +
                     ",HMainSourceEntryID = " + omodel.HMainSourceEntryID + "" +
                     ",HMainSourceBillNo = '" + omodel.HMainSourceBillNo + "'" +
@@ -211,7 +220,7 @@
                      ",HSPID,HSCWHID,HSCSPID,HSPGroupID,HBatchNo,HPOOrderInterID,HPOOrderEntryID,HPOOrderBillNo" +
                      ",HQty_Full,HQty_Empty,HQty_Back,HCostPrice,HCostMoney,HSalePrice" +
                      ",HPropertyID,HSecUnitID,HSecUnitRate" +
-                     ",HEngineNum,HUnderPanNum,HLeaveFactCard" +
+                     ",HEngineNum,HUnderPanNum,HLeaveFactCard,HReqBuyQty,HReqOutQty,HCurrentInventory" +
                      ") values(" +
                      "" + omodel.HInterID.ToString() + "" +
                      "," + (HEntryID++) + "" +
@@ -266,6 +275,9 @@
                      ",'" + oSub.HEngineNum + "'" +
                      ",'" + oSub.HUnderPanNum + "'" +
                      ",'" + oSub.HLeaveFactCard + "'" +
+                     "," + oSub.HReqBuyQty +
+                     "," + oSub.HReqOutQty +
+                     "," + oSub.HCurrentInventory +
                      ") ";
 
                     oCn.RunProc(subSql);
@@ -297,7 +309,7 @@
                 //鎺у埗鍏宠仈鏁伴噺
 
                 //=========================淇濆瓨鍚庢帶鍒�  
-                DataSet ds2 = oCn.RunProcReturn("h_p_Kf_SellOutBill_AfterSaveCtrl " + omodel.HInterID.ToString() + ", '" + omodel.HBillNo + "',1 ", "h_p_Kf_SellOutBill_AfterSaveCtrl");
+                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 = "淇濆瓨鍚庢帶鍒跺垽鏂け璐ワ紒";
@@ -376,7 +388,7 @@
                     "," + omodel.HYear.ToString() + "" +
                     "," + omodel.HPeriod.ToString() + "" +
                     ",'" + this.BillType + "'" +
-                    ",'" + this.HBillSubType + "'" +
+                    ",'" + omodel.HBillSubType + "'" +
                     ",'" + omodel.HRemark + "'" +
                     ",'" + omodel.HMaker + "'" +
                     "," + "getdate()" + "" +
@@ -456,7 +468,7 @@
                       ",HSPID,HSCWHID,HSCSPID,HSPGroupID,HBatchNo,HPOOrderInterID,HPOOrderEntryID,HPOOrderBillNo" +
                       ",HQty_Full,HQty_Empty,HQty_Back,HCostPrice,HCostMoney,HSalePrice" +
                       ",HPropertyID,HSecUnitID,HSecUnitRate" +
-                      ",HEngineNum,HUnderPanNum,HLeaveFactCard" +
+                      ",HEngineNum,HUnderPanNum,HLeaveFactCard,HReqBuyQty,HReqOutQty,HCurrentInventory" +
                       ") values(" +
                       "" + omodel.HInterID.ToString() + "" +
                       "," + (HEntryID++) + "" +
@@ -511,6 +523,9 @@
                       ",'" + oSub.HEngineNum + "'" +
                       ",'" + oSub.HUnderPanNum + "'" +
                       ",'" + oSub.HLeaveFactCard + "'" +
+                      "," + oSub.HReqBuyQty +
+                      "," + oSub.HReqOutQty + 
+                      "," + oSub.HCurrentInventory +
                       ") ";
 
                     oCn.RunProc(subSql);
@@ -542,7 +557,7 @@
 
                 //
                 //=========================淇濆瓨鍚庢帶鍒�  
-                DataSet ds2 = oCn.RunProcReturn("h_p_Kf_SellOutBill_AfterSaveCtrl " + omodel.HInterID.ToString() + ", '" + omodel.HBillNo + "',1 ", "h_p_Kf_SellOutBill_AfterSaveCtrl");
+                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 = "淇濆瓨鍚庢帶鍒跺垽鏂け璐ワ紒";

--
Gitblit v1.9.1