From 1e1425d8a7cfad573ff77f2cb3a84064bc056a81 Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期日, 09 七月 2023 13:20:03 +0800
Subject: [PATCH] 1

---
 WebAPI/Controllers/项目管理/工程项目/PM_ProjectBillController.cs |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)

diff --git "a/WebAPI/Controllers/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\347\250\213\351\241\271\347\233\256/PM_ProjectBillController.cs" "b/WebAPI/Controllers/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\347\250\213\351\241\271\347\233\256/PM_ProjectBillController.cs"
index 46ae3d7..329aa8e 100644
--- "a/WebAPI/Controllers/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\347\250\213\351\241\271\347\233\256/PM_ProjectBillController.cs"
+++ "b/WebAPI/Controllers/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\347\250\213\351\241\271\347\233\256/PM_ProjectBillController.cs"
@@ -227,7 +227,6 @@
 
                 ds = oCN.RunProcReturn("select * from PM_ProjectBillMain where HInterID = " + HInterID + " and HBillNo = '" + HBillNo + "'", "PM_ProjectBillMain");
 
-                oCN.BeginTran();
                 if ((OperationType == 1 || OperationType == 2) && ds.Tables[0].Rows.Count == 0)//鏂板
                 {
                     string sql = "insert into PM_ProjectBillMain" +
@@ -318,7 +317,6 @@
                 objJsonResult = AddBillSub1(msg3, HInterID, HBillNo, OperationType);
                 objJsonResult = AddBillSub2(msg4, HInterID, HBillNo, OperationType);
 
-                oCN.Commit();
 
                 if (objJsonResult.code == "0")
                 {
@@ -469,12 +467,12 @@
 
                 if (sWhere == null || sWhere.Equals(""))
                 {
-                    ds = oCN.RunProcReturn("select * from PM_ProjectBillMain order by HProNumber ", "PM_ProjectBillMain");
+                    ds = oCN.RunProcReturn("select * from PM_ProjectBillMain order by HBillNo ", "PM_ProjectBillMain");
                 }
                 else
                 {
                     string sql1 = "select * from PM_ProjectBillMain where 1 = 1 ";
-                    string sql = sql1 + sWhere + " order by HProNumber ";
+                    string sql = sql1 + sWhere + " order by HBillNo ";
                     ds = oCN.RunProcReturn(sql, "PM_ProjectBillMain");
                 }
 

--
Gitblit v1.9.1