From 00e25e4a9c9bd2fc91558c3c1a68f47db6d08b1d Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期一, 08 七月 2024 18:57:35 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
DAL/仓库管理/ClsKf_SellOutBillForLayUI.cs | 23 ++++++++++++++++++++---
1 files changed, 20 insertions(+), 3 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 5503ce8..88dae58 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
{
@@ -187,6 +195,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);
@@ -203,7 +214,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" +
@@ -232,6 +243,7 @@
"," + oSub.HUnitID.ToString() + "" +
"," + oSub.HQtyMust.ToString() + "" +
"," + oSub.HQty.ToString() + "" +
+ "," + oSub.HPieceQty.ToString() + "" +
"," + oSub.HPrice.ToString() + "" +
"," + oSub.HMoney.ToString() + "" +
"," + oSub.HTaxPrice.ToString() + "" +
@@ -363,7 +375,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() + "" +
@@ -413,6 +425,9 @@
"," + DBUtility.ClsPub.BoolToString(omodel.HRedBlueFlag) + "" +
"," + omodel.HCarriage + "" +
",'" + omodel.HCheckStatusMan + "'" +
+ ",'" + omodel.HProjectID.ToString() + "'" +
+ ",'" + omodel.HGroupID.ToString() + "'" +
+ ",'" + omodel.HPriceType + "'" +
") ";
oCn.RunProc(mainSql);
@@ -444,7 +459,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" +
@@ -473,6 +488,7 @@
"," + oSub.HUnitID.ToString() + "" +
"," + oSub.HQtyMust.ToString() + "" +
"," + oSub.HQty.ToString() + "" +
+ "," + oSub.HPieceQty.ToString() + "" +
"," + oSub.HPrice.ToString() + "" +
"," + oSub.HMoney.ToString() + "" +
"," + oSub.HTaxPrice.ToString() + "" +
@@ -654,6 +670,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