From 6488c1842ddb2e2478b2ac278829c215b478adfc Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期五, 08 三月 2024 13:42:52 +0800
Subject: [PATCH] 返修流程;下销售订单子类型HBillSubType为售后订单类型(允许单价为0),下推生产订单 (售后订单类型)、生产订单下推/批量下推工序流转卡(售后订单类型),打卷入库,销售出库;

---
 WebAPI/Controllers/CGGL/Cg_PayableBillController.cs |   15 +++++++++------
 1 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/WebAPI/Controllers/CGGL/Cg_PayableBillController.cs b/WebAPI/Controllers/CGGL/Cg_PayableBillController.cs
index 2027a30..32f81ee 100644
--- a/WebAPI/Controllers/CGGL/Cg_PayableBillController.cs
+++ b/WebAPI/Controllers/CGGL/Cg_PayableBillController.cs
@@ -173,10 +173,10 @@
                 msg3 = msg3.Replace("\\", "");
                 msg3 = msg3.Replace("\n", "");  //\n
                 //msg2 = msg2.Replace("'", "鈥�");
-                List<Model.ClsCg_PayableBillSub> ls = new List<Model.ClsCg_PayableBillSub>();
-                ls = oListModels.getObjectByJson_Cg_PayableBillSub(msg3);
+                List<Model.ClsCg_PayableSub> ls = new List<Model.ClsCg_PayableSub>();
+                ls = oListModels.getObjectByJson_Cg_PayableSub(msg3);
                 int i = 0;
-                foreach (Model.ClsCg_PayableBillSub oItemSub in ls)
+                foreach (Model.ClsCg_PayableSub oItemSub in ls)
                 {
                     i++;
                     oItemSub.HEntryID = i;
@@ -336,7 +336,7 @@
                 oCN.BeginTran();
 
                 oCN.RunProc("delete from Cg_PayableBillMain where HInterID = " + HInterID);
-                oCN.RunProc("delete from Cg_PayableBillSub where HInterID= " + HInterID);
+                oCN.RunProc("delete from Cg_PayableSub where HInterID= " + HInterID);
 
                 ////鍒犻櫎鍚庢帶鍒�==================================================================================      
                 //string sql2 = "exec h_p_Xs_ReceivableBill_AfterDelCtrl " + BillOld.omodel.HInterID + ",'" + BillOld.omodel.HBillNo + "','" + user + "'";
@@ -367,7 +367,7 @@
 
                 objJsonResult.code = "1";
                 objJsonResult.count = 1;
-                objJsonResult.Message = "鎮ㄥ凡鍒犻櫎鍗曟嵁鍙蜂负" + BillOld.omodel.HBillNo + "鐨勫簲鏀跺崟锛�";
+                objJsonResult.Message = "鎮ㄥ凡鍒犻櫎鍗曟嵁鍙蜂负" + BillOld.omodel.HBillNo + "鐨勫簲浠樺崟锛�";
                 objJsonResult.data = null;
                 return objJsonResult;
             }
@@ -382,6 +382,8 @@
             }
         }
         #endregion
+
+
 
         #region 搴斾粯鍗� 瀹℃牳/鍙嶅鏍�
         /// <summary>
@@ -576,7 +578,7 @@
             }
             catch (Exception e)
             {
-                oCN.RollBack();
+                //oCN.RollBack();
 
                 objJsonResult.code = "0";
                 objJsonResult.count = 0;
@@ -587,6 +589,7 @@
         }
         #endregion
 
+
         #region 搴斾粯鍗� 鍏抽棴/鍙嶅叧闂�
         /// <summary>
         /// </summary>

--
Gitblit v1.9.1