From b0688c1efd606284fd5bc31f2d60a1fec9aef968 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期二, 08 四月 2025 11:20:50 +0800
Subject: [PATCH] 自定义菜单优化
---
WebAPI/Controllers/基础资料/基础资料/Gy_TaxMIXController.cs | 16 ++++++++++++----
1 files changed, 12 insertions(+), 4 deletions(-)
diff --git "a/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_TaxMIXController.cs" "b/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_TaxMIXController.cs"
index de562b1..0250671 100644
--- "a/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_TaxMIXController.cs"
+++ "b/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_TaxMIXController.cs"
@@ -110,6 +110,9 @@
{
DAL.ClsGy_TaxMIX_Ctl oBill = new DAL.ClsGy_TaxMIX_Ctl();
List<Model.ClsGy_TaxMIXMain_Model> lsmain = new List<Model.ClsGy_TaxMIXMain_Model>();
+ //List<Model.ClsGy_TaxMIXSub_Model> lssub = new List<Model.ClsGy_TaxMIXSub_Model>();
+ List<Model.ClsGy_TaxMIXSub_Model> lssub = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsGy_TaxMIXSub_Model>>(msg2);
+
msg1 = msg1.Replace("\\", "");
msg1 = msg1.Replace("\n", ""); //\n
lsmain = oListModels.getObjectByJson_Gy_TaxMIXMain(msg1);
@@ -241,6 +244,10 @@
oItem.HLevel = 1; //绛夌骇 DBUtility.ClsPub.GetLevel(oItem.HNumber.Trim())
oBill.oModel = oItem;
}
+ foreach (Model.ClsGy_TaxMIXSub_Model oItemSub in lssub)
+ {
+ oBill.DetailColl.Add(oItemSub);
+ }
//淇濆瓨
//淇濆瓨瀹屾瘯鍚庡鐞�
bool bResult;
@@ -329,7 +336,7 @@
}
oCN.RunProc("delete from Gy_TaxMIXMain where HItemID=" + HItemID);
- oCN.RunProc("delete from Gy_TaxMIXSub where HTaxMixID=" + HItemID);
+ oCN.RunProc("delete from Gy_TaxMIXSub where HItemID=" + HItemID);
oCN.Commit();//鎻愪氦浜嬪姟
objJsonResult.code = "0";
objJsonResult.count = 1;
@@ -580,7 +587,8 @@
#region [瀛愯〃鏁版嵁璧嬪�糫
var subData = new
{
- HItemID = oSub["Id"],
+ HItemID = jsonData.HItemID,
+ HEntryID = oSub["Id"],
HTAXBENCHMARK = oSub["TaxBenchMark_Id"],
FTAXRATEID = oSub["TaxRateID_Id"],
FTAXBENCHMARKCORRVALUE = oSub["TaxBenchMarkCorrValue"],
@@ -594,9 +602,9 @@
//鎻掑叆瀛愯〃
sql = $@"
insert into Gy_TaxMIXSub
- (HItemID,HTAXBENCHMARK,FTAXRATEID,FTAXBENCHMARKCORRVALUE,HTaxMixID)
+ (HItemID,HEntryID,HTAXBENCHMARK,FTAXRATEID,FTAXBENCHMARKCORRVALUE,HTaxMixID)
values
- ({subData.HItemID},'{subData.HTAXBENCHMARK}',{subData.FTAXRATEID},'{subData.FTAXBENCHMARKCORRVALUE}',{subData.HTaxMixID})";
+ ({subData.HItemID},{subData.HEntryID},'{subData.HTAXBENCHMARK}',{subData.FTAXRATEID},'{subData.FTAXBENCHMARKCORRVALUE}',{subData.HTaxMixID})";
oCN.RunProc(sql);
--
Gitblit v1.9.1