From d22bbad221b392dcf606e5cca06f83b3a7b10eb7 Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期四, 09 十一月 2023 21:08:30 +0800
Subject: [PATCH] 生产订单变更单：审核后反写生产订单的数量
---
WebAPI/Controllers/SCGL/Sc_ICMOChangeBillController.cs | 17 ++++++++
WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user | 34 ++++++++--------
DAL/APS/ClsSc_ICMOChangeBill.cs | 5 ++
WebAPI/Controllers/XSGL/Xs_CusRatingChangeBillController.cs | 27 +++++++++++++
4 files changed, 66 insertions(+), 17 deletions(-)
diff --git a/DAL/APS/ClsSc_ICMOChangeBill.cs b/DAL/APS/ClsSc_ICMOChangeBill.cs
index 0de92e6..4f75751 100644
--- a/DAL/APS/ClsSc_ICMOChangeBill.cs
+++ b/DAL/APS/ClsSc_ICMOChangeBill.cs
@@ -236,6 +236,11 @@
omodel.HCloseType = DBUtility.ClsPub.isBool(Ds.Tables[0].Rows[0]["HCloseType"]);
omodel.HDeleteDate = Ds.Tables[0].Rows[0]["HDeleteDate"].ToString().Trim();
omodel.HDeleteMan = Ds.Tables[0].Rows[0]["HDeleteMan"].ToString().Trim();
+
+ omodel.HMainSourceInterID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HMainSourceInterID"]);
+ omodel.HMainSourceEntryID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HMainSourceEntryID"]);
+ omodel.HMainSourceBillNo = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HMainSourceBillNo"]);
+ omodel.HMainSourceBillType = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HMainSourceBillType"]);
//========================================================
omodel.HDeptID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HDeptID"]);
diff --git a/WebAPI/Controllers/SCGL/Sc_ICMOChangeBillController.cs b/WebAPI/Controllers/SCGL/Sc_ICMOChangeBillController.cs
index df2b71b..e404a26 100644
--- a/WebAPI/Controllers/SCGL/Sc_ICMOChangeBillController.cs
+++ b/WebAPI/Controllers/SCGL/Sc_ICMOChangeBillController.cs
@@ -487,9 +487,26 @@
return objJsonResult;
}
+ //鍙嶅啓婧愬崟鏁版嵁
+ oCN.BeginTran();
+ string sql = "select * from Sc_ICMOBillSub where HInterID = " + oBill.omodel.HMainSourceInterID + " and HEntryID =" + oBill.omodel.HMainSourceEntryID;
+ ds = oCN.RunProcReturn(sql, "Sc_ICMOBillSub");
+ if(ds==null || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "瀹℃牳澶辫触!鍘熷洜:婧愬崟鏁版嵁涓嶅瓨鍦紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ sql = "update Sc_ICMOBillSub set HQty = " + oBill.DetailColl[0].HQty_New + " where HInterID = " + oBill.omodel.HMainSourceInterID + " and HEntryID =" + oBill.omodel.HMainSourceEntryID;
+ oCN.RunProc(sql);
+
//瀹℃牳鎻愪氦
if (oBill.CheckBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo) == true)
{
+ oCN.Commit();
+
objJsonResult.code = "1";
objJsonResult.count = 1;
objJsonResult.Message = "瀹℃牳鎴愬姛";
diff --git a/WebAPI/Controllers/XSGL/Xs_CusRatingChangeBillController.cs b/WebAPI/Controllers/XSGL/Xs_CusRatingChangeBillController.cs
index fbc3a11..d8ed3a9 100644
--- a/WebAPI/Controllers/XSGL/Xs_CusRatingChangeBillController.cs
+++ b/WebAPI/Controllers/XSGL/Xs_CusRatingChangeBillController.cs
@@ -468,9 +468,36 @@
//杩涜闇�瑕佽繘琛岀殑瀹℃牳/鍙嶅鏍告搷浣�
if (IsAudit == 0) //瀹℃牳鎻愪氦
{
+ //鍙嶅啓瀹㈡埛淇＄敤棰濆害
+ oCN.BeginTran();
+ string sql = "select * from Gy_Customer_Credit where HCusID = " + oBill.omodel.HCusID;
+ ds = oCN.RunProcReturn(sql, "Gy_Customer_Credit");
+ if (ds.Tables[0].Rows.Count == 0)
+ {
+ sql = "insert into Gy_Customer_Credit" +
+ "(HCusID,HCreditRating_Now,HUpdateTime,HUpdateMan)" +
+ " values(" +
+ "" + oBill.omodel.HCusID +
+ "," + oBill.omodel.HNewRating +
+ ",'" + DateTime.Now.ToString("yyyy-MM-dd") + "'" +
+ ",'" + CurUserName + "'" +
+ ")";
+ oCN.RunProc(sql);
+ }
+ else
+ {
+ sql = "update Gy_Customer_Credit set " +
+ "HCreditRating_Now = " + oBill.omodel.HNewRating +
+ ",HUpdateTime = '" + DateTime.Now.ToString("yyyy-MM-dd") + "'" +
+ ",HUpdateMan = '" + CurUserName + "'" +
+ " where HCusID = " + oBill.omodel.HCusID;
+ oCN.RunProc(sql);
+ }
//瀹℃牳鎻愪氦
if (oBill.CheckBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo) == true)
{
+ oCN.Commit();
+
objJsonResult.code = "1";
objJsonResult.count = 1;
objJsonResult.Message = "瀹℃牳鎴愬姛";
diff --git a/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user b/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
index b8f47a5..2c2e5af 100644
--- a/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
+++ b/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
@@ -20,12 +20,12 @@
<File Include="bin/BLL.dll">
<publishTime>11/09/2022 16:02:08</publishTime>
<publishTime>11/02/2022 22:03:01</publishTime>
- <publishTime>11/09/2023 20:08:36</publishTime>
+ <publishTime>11/09/2023 20:43:20</publishTime>
</File>
<File Include="bin/BLL.pdb">
<publishTime>11/09/2022 16:02:08</publishTime>
<publishTime>11/02/2022 22:03:01</publishTime>
- <publishTime>11/09/2023 20:08:36</publishTime>
+ <publishTime>11/09/2023 20:43:20</publishTime>
</File>
<File Include="bin/BouncyCastle.Crypto.dll">
<publishTime>12/18/2020 05:32:28</publishTime>
@@ -33,12 +33,12 @@
<File Include="bin/DAL.dll">
<publishTime>11/09/2022 16:02:06</publishTime>
<publishTime>11/02/2022 22:02:58</publishTime>
- <publishTime>11/09/2023 20:08:34</publishTime>
+ <publishTime>11/09/2023 20:43:18</publishTime>
</File>
<File Include="bin/DAL.pdb">
<publishTime>11/09/2022 16:02:06</publishTime>
<publishTime>11/02/2022 22:02:58</publishTime>
- <publishTime>11/09/2023 20:08:34</publishTime>
+ <publishTime>11/09/2023 20:43:18</publishTime>
</File>
<File Include="bin/Dapper.dll">
<publishTime>07/22/2016 22:52:40</publishTime>
@@ -46,12 +46,12 @@
<File Include="bin/DBUtility.dll">
<publishTime>11/02/2022 22:02:56</publishTime>
<publishTime>11/15/2022 13:55:23</publishTime>
- <publishTime>11/09/2023 20:08:30</publishTime>
+ <publishTime>11/09/2023 20:43:14</publishTime>
</File>
<File Include="bin/DBUtility.pdb">
<publishTime>11/09/2022 16:01:58</publishTime>
<publishTime>11/02/2022 22:02:56</publishTime>
- <publishTime>11/09/2023 20:08:30</publishTime>
+ <publishTime>11/09/2023 20:43:14</publishTime>
</File>
<File Include="bin/Grpc.Core.Api.dll">
<publishTime>03/22/2022 13:17:26</publishTime>
@@ -107,12 +107,12 @@
<File Include="bin/Model.dll">
<publishTime>11/09/2022 16:02:01</publishTime>
<publishTime>11/02/2022 22:02:56</publishTime>
- <publishTime>11/09/2023 20:08:31</publishTime>
+ <publishTime>11/09/2023 20:43:15</publishTime>
</File>
<File Include="bin/Model.pdb">
<publishTime>11/09/2022 16:02:01</publishTime>
<publishTime>11/02/2022 22:02:56</publishTime>
- <publishTime>11/09/2023 20:08:31</publishTime>
+ <publishTime>11/09/2023 20:43:15</publishTime>
</File>
<File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs">
<publishTime>04/06/2023 15:57:02</publishTime>
@@ -147,33 +147,33 @@
<File Include="bin/Pub_Class.dll">
<publishTime>11/09/2022 16:01:56</publishTime>
<publishTime>11/02/2022 22:02:54</publishTime>
- <publishTime>11/09/2023 20:08:29</publishTime>
+ <publishTime>11/09/2023 20:43:13</publishTime>
</File>
<File Include="bin/Pub_Class.pdb">
<publishTime>11/09/2022 16:01:56</publishTime>
<publishTime>11/02/2022 22:02:54</publishTime>
- <publishTime>11/09/2023 20:08:29</publishTime>
+ <publishTime>11/09/2023 20:43:13</publishTime>
</File>
<File Include="bin/Pub_Control.dll">
<publishTime>11/09/2022 16:01:57</publishTime>
<publishTime>11/02/2022 22:02:55</publishTime>
- <publishTime>11/09/2023 20:08:30</publishTime>
+ <publishTime>11/09/2023 20:43:13</publishTime>
</File>
<File Include="bin/Pub_Control.pdb">
<publishTime>11/09/2022 16:01:57</publishTime>
<publishTime>11/02/2022 22:02:55</publishTime>
- <publishTime>11/09/2023 20:08:30</publishTime>
+ <publishTime>11/09/2023 20:43:13</publishTime>
</File>
<File Include="bin/RestSharp.dll">
<publishTime>08/31/2012 06:22:50</publishTime>
</File>
<File Include="bin/SQLHelper.dll">
- <publishTime>11/09/2023 20:08:30</publishTime>
+ <publishTime>11/09/2023 20:43:14</publishTime>
</File>
<File Include="bin/SQLHelper.pdb">
<publishTime>11/09/2022 16:01:57</publishTime>
<publishTime>11/02/2022 22:02:55</publishTime>
- <publishTime>11/09/2023 20:08:30</publishTime>
+ <publishTime>11/09/2023 20:43:14</publishTime>
</File>
<File Include="bin/stdole.dll">
<publishTime>05/09/2021 13:35:37</publishTime>
@@ -286,7 +286,7 @@
<File Include="bin/WebAPI.dll">
<publishTime>11/14/2022 11:23:59</publishTime>
<publishTime>11/02/2022 22:03:04</publishTime>
- <publishTime>11/09/2023 20:08:42</publishTime>
+ <publishTime>11/09/2023 20:43:26</publishTime>
</File>
<File Include="bin/WebAPI.dll.config">
<publishTime>12/15/2021 17:59:43</publishTime>
@@ -294,7 +294,7 @@
<File Include="bin/WebAPI.pdb">
<publishTime>11/14/2022 11:23:59</publishTime>
<publishTime>11/02/2022 22:03:04</publishTime>
- <publishTime>11/09/2023 20:08:42</publishTime>
+ <publishTime>11/09/2023 20:43:26</publishTime>
</File>
<File Include="bin/WebGrease.dll">
<publishTime>07/18/2013 01:03:52</publishTime>
@@ -503,7 +503,7 @@
<File Include="Web.config">
<publishTime>11/14/2022 11:24:08</publishTime>
<publishTime>11/02/2022 22:03:20</publishTime>
- <publishTime>11/09/2023 20:09:00</publishTime>
+ <publishTime>11/09/2023 20:43:31</publishTime>
</File>
</ItemGroup>
</Project>
\ No newline at end of file
--
Gitblit v1.9.1