From 911220a0e60d4192cf6b23f95301edb0fbd75764 Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期五, 28 三月 2025 16:24:14 +0800
Subject: [PATCH] 采购调价单添加字段,采购入库单审核报错返回语句修改

---
 WebAPI/Controllers/CGGL/Kf_POStockInBillController.cs          |    4 ++--
 WebAPI/Properties/PublishProfiles/FolderProfilewtt.pubxml.user |   34 +++++++++++++++++-----------------
 DAL/采购管理/ClsCg_POStockInChangeBill.cs                          |   10 ++++++++--
 Model/采购管理/ClsCg_POStockInChangeBillSub.cs                     |    2 ++
 4 files changed, 29 insertions(+), 21 deletions(-)

diff --git "a/DAL/\351\207\207\350\264\255\347\256\241\347\220\206/ClsCg_POStockInChangeBill.cs" "b/DAL/\351\207\207\350\264\255\347\256\241\347\220\206/ClsCg_POStockInChangeBill.cs"
index b6d83f8..968ef65 100644
--- "a/DAL/\351\207\207\350\264\255\347\256\241\347\220\206/ClsCg_POStockInChangeBill.cs"
+++ "b/DAL/\351\207\207\350\264\255\347\256\241\347\220\206/ClsCg_POStockInChangeBill.cs"
@@ -78,7 +78,7 @@
                 {
                     string subSql = "insert into Cg_POStockInChangeBillSub " +
                         "(HInterID,HEntryID,HBillNo_bak,HRemark,HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" +
-                        ",HMaterID,HUnitID,HQty,HTaxPrice_Old,HTaxPrice_New,HMoney_New) " +
+                        ",HMaterID,HUnitID,HQty,HTaxPrice_Old,HTaxPrice_New,HMoney_New,HTaxRate_Old,HTaxRate_New) " +
                         " values(" +
                         "" + omodel.HInterID.ToString() +
                         "," + oSub.HEntryID.ToString() +
@@ -96,6 +96,8 @@
                         "," + oSub.HTaxPrice_Old + "" +
                         "," + oSub.HTaxPrice_New + "" +
                         "," + oSub.HMoney_New + "" +
+                        "," + oSub.HTaxRate_Old + "" +
+                        "," + oSub.HTaxRate_New + "" +
                         ")";
                     oCn.RunProc(subSql);
                 }
@@ -185,7 +187,7 @@
                 {
                     string subSql = "insert into Cg_POStockInChangeBillSub " +
                         "(HInterID,HEntryID,HBillNo_bak,HRemark,HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" +
-                        ",HMaterID,HUnitID,HQty,HTaxPrice_Old,HTaxPrice_New,HMoney_New) " +
+                        ",HMaterID,HUnitID,HQty,HTaxPrice_Old,HTaxPrice_New,HMoney_New,HTaxRate_Old,HTaxRate_New) " +
                         " values(" +
                         "" + omodel.HInterID.ToString() +
                         "," + oSub.HEntryID.ToString() +
@@ -203,6 +205,8 @@
                         "," + oSub.HTaxPrice_Old + "" +
                         "," + oSub.HTaxPrice_New + "" +
                         "," + oSub.HMoney_New + "" +
+                        "," + oSub.HTaxRate_Old + "" +
+                        "," + oSub.HTaxRate_New + "" +
                         ")";
                     oCn.RunProc(subSql);
                 }
@@ -316,6 +320,8 @@
                     oSub.HTaxPrice_Old = DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[i]["HTaxPrice_Old"]);
                     oSub.HTaxPrice_New = DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[i]["HTaxPrice_New"]);
                     oSub.HMoney_New = DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[i]["HMoney_New"]);
+                    oSub.HTaxRate_Old = DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[i]["HTaxRate_Old"]);
+                    oSub.HTaxRate_New = DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[i]["HTaxRate_New"]);
 
                     DetailColl.Add(oSub);
                 }
diff --git "a/Model/\351\207\207\350\264\255\347\256\241\347\220\206/ClsCg_POStockInChangeBillSub.cs" "b/Model/\351\207\207\350\264\255\347\256\241\347\220\206/ClsCg_POStockInChangeBillSub.cs"
index b23539c..09f2bc9 100644
--- "a/Model/\351\207\207\350\264\255\347\256\241\347\220\206/ClsCg_POStockInChangeBillSub.cs"
+++ "b/Model/\351\207\207\350\264\255\347\256\241\347\220\206/ClsCg_POStockInChangeBillSub.cs"
@@ -12,5 +12,7 @@
         public double HTaxPrice_New;
         public double HQty;
         public double HMoney_New;
+        public double HTaxRate_Old;
+        public double HTaxRate_New;
     }
 }
diff --git a/WebAPI/Controllers/CGGL/Kf_POStockInBillController.cs b/WebAPI/Controllers/CGGL/Kf_POStockInBillController.cs
index 30b3ee1..c9f22a9 100644
--- a/WebAPI/Controllers/CGGL/Kf_POStockInBillController.cs
+++ b/WebAPI/Controllers/CGGL/Kf_POStockInBillController.cs
@@ -728,7 +728,7 @@
                     {
                         objJsonResult.code = "0";
                         objJsonResult.count = 0;
-                        objJsonResult.Message = "鍗曟嵁宸插叧闂�!涓嶈兘鍐嶆瀹℃牳锛�";
+                        objJsonResult.Message = "鍗曟嵁宸插叧闂�!";
                         objJsonResult.data = null;
                         return objJsonResult;
                     }
@@ -736,7 +736,7 @@
                     {
                         objJsonResult.code = "0";
                         objJsonResult.count = 0;
-                        objJsonResult.Message = "鍗曟嵁宸蹭綔搴�!涓嶈兘鍐嶆瀹℃牳锛�";
+                        objJsonResult.Message = "鍗曟嵁宸蹭綔搴�!";
                         objJsonResult.data = null;
                         return objJsonResult;
                     }
diff --git a/WebAPI/Properties/PublishProfiles/FolderProfilewtt.pubxml.user b/WebAPI/Properties/PublishProfiles/FolderProfilewtt.pubxml.user
index a392786..82d454e 100644
--- a/WebAPI/Properties/PublishProfiles/FolderProfilewtt.pubxml.user
+++ b/WebAPI/Properties/PublishProfiles/FolderProfilewtt.pubxml.user
@@ -45,28 +45,28 @@
       <publishTime>02/22/2013 16:43:40</publishTime>
     </File>
     <File Include="bin/BLL.dll">
-      <publishTime>03/26/2025 08:14:43</publishTime>
+      <publishTime>03/28/2025 15:33:34</publishTime>
     </File>
     <File Include="bin/BLL.pdb">
-      <publishTime>03/26/2025 08:14:43</publishTime>
+      <publishTime>03/28/2025 15:33:34</publishTime>
     </File>
     <File Include="bin/BouncyCastle.Crypto.dll">
       <publishTime>12/18/2020 05:32:28</publishTime>
     </File>
     <File Include="bin/DAL.dll">
-      <publishTime>03/26/2025 08:14:40</publishTime>
+      <publishTime>03/28/2025 15:33:31</publishTime>
     </File>
     <File Include="bin/DAL.pdb">
-      <publishTime>03/26/2025 08:14:40</publishTime>
+      <publishTime>03/28/2025 15:33:31</publishTime>
     </File>
     <File Include="bin/Dapper.dll">
       <publishTime>07/22/2016 22:52:40</publishTime>
     </File>
     <File Include="bin/DBUtility.dll">
-      <publishTime>03/26/2025 08:14:32</publishTime>
+      <publishTime>03/28/2025 15:33:25</publishTime>
     </File>
     <File Include="bin/DBUtility.pdb">
-      <publishTime>03/26/2025 08:14:32</publishTime>
+      <publishTime>03/28/2025 15:33:25</publishTime>
     </File>
     <File Include="bin/Grpc.Core.Api.dll">
       <publishTime>03/22/2022 13:17:26</publishTime>
@@ -111,10 +111,10 @@
       <publishTime>07/25/2012 19:48:56</publishTime>
     </File>
     <File Include="bin/Model.dll">
-      <publishTime>03/26/2025 08:14:34</publishTime>
+      <publishTime>03/28/2025 15:33:26</publishTime>
     </File>
     <File Include="bin/Model.pdb">
-      <publishTime>03/26/2025 08:14:34</publishTime>
+      <publishTime>03/28/2025 15:33:26</publishTime>
     </File>
     <File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs">
       <publishTime>04/15/2024 12:55:45</publishTime>
@@ -147,25 +147,25 @@
       <publishTime>10/23/2021 17:07:54</publishTime>
     </File>
     <File Include="bin/Pub_Class.dll">
-      <publishTime>03/26/2025 08:14:29</publishTime>
+      <publishTime>03/28/2025 15:33:23</publishTime>
     </File>
     <File Include="bin/Pub_Class.pdb">
-      <publishTime>03/26/2025 08:14:29</publishTime>
+      <publishTime>03/28/2025 15:33:23</publishTime>
     </File>
     <File Include="bin/Pub_Control.dll">
-      <publishTime>03/26/2025 08:14:31</publishTime>
+      <publishTime>03/28/2025 15:33:24</publishTime>
     </File>
     <File Include="bin/Pub_Control.pdb">
-      <publishTime>03/26/2025 08:14:31</publishTime>
+      <publishTime>03/28/2025 15:33:24</publishTime>
     </File>
     <File Include="bin/RestSharp.dll">
       <publishTime>08/31/2012 06:22:50</publishTime>
     </File>
     <File Include="bin/SQLHelper.dll">
-      <publishTime>03/26/2025 08:14:30</publishTime>
+      <publishTime>03/28/2025 15:33:23</publishTime>
     </File>
     <File Include="bin/SQLHelper.pdb">
-      <publishTime>03/26/2025 08:14:30</publishTime>
+      <publishTime>03/28/2025 15:33:23</publishTime>
     </File>
     <File Include="bin/Swashbuckle.Core.dll">
       <publishTime>02/16/2015 01:57:08</publishTime>
@@ -294,10 +294,10 @@
       <publishTime>11/24/2014 19:18:48</publishTime>
     </File>
     <File Include="bin/WebAPI.dll">
-      <publishTime>03/26/2025 08:14:56</publishTime>
+      <publishTime>03/28/2025 15:33:44</publishTime>
     </File>
     <File Include="bin/WebAPI.pdb">
-      <publishTime>03/26/2025 08:14:56</publishTime>
+      <publishTime>03/28/2025 15:33:44</publishTime>
     </File>
     <File Include="bin/WebAPI.XmlSerializers.dll">
       <publishTime>08/16/2024 16:55:28</publishTime>
@@ -495,7 +495,7 @@
       <publishTime>04/29/2024 08:30:03</publishTime>
     </File>
     <File Include="Web.config">
-      <publishTime>03/26/2025 08:15:20</publishTime>
+      <publishTime>03/28/2025 15:33:55</publishTime>
     </File>
   </ItemGroup>
 </Project>
\ No newline at end of file

--
Gitblit v1.9.1