From c052583025ff87735d2120dc63aeee7ea5e5524e Mon Sep 17 00:00:00 2001
From: wzp <2040239371@qq.com>
Date: 星期三, 23 十一月 2022 09:25:11 +0800
Subject: [PATCH] 多项优化

---
 web/web/GwOrder.ashx |   17 +++++++++++------
 1 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/web/web/GwOrder.ashx b/web/web/GwOrder.ashx
index 6718de6..e774479 100644
--- a/web/web/GwOrder.ashx
+++ b/web/web/GwOrder.ashx
@@ -173,8 +173,8 @@
                 //str1 = str1 + "<td>" + bean.Remark + "</td>";
 
                 str1 += "<td  class=\"text-right\">";
-                str1 += string.Format("<a href=\"javascript:;\" data-orderid=\"{0}\" class=\"action-modal-detail btn  btn-success btn-xs\"><i class=\"fa fa-search\"></i>&nbsp;鏌ョ湅</a> ", (object) bean.OrderId);
-                str1 += string.Format("<a href=\"javascript:;\" data-orderid=\"{0}\" class=\"action-modal-audit btn  btn-success btn-xs\"><i class=\"fa fa-search\"></i>&nbsp;瀹℃牳</a> ", (object) bean.OrderId);
+                str1 += string.Format("<a href=\"javascript:;\" data-orderid=\"{0}\" class=\"action-modal-detail btn  btn-info btn-xs\"><i class=\"fa fa-search\"></i>&nbsp;鏌ョ湅</a> ", (object) bean.OrderId);
+                str1 += string.Format("<a href=\"javascript:;\" data-orderid=\"{0}\" style=\"margin-top:10px; \" class=\"action-modal-audit btn  btn-success btn-xs\"><i class=\"fa fa-edit\"></i>&nbsp;瀹℃牳</a> ", (object) bean.OrderId);
                 if(bean.Status == 0) {
                     str1 += string.Format("<a href=\"javascript:;\" data-orderid=\"{0}\" class=\"action-modal-cancel btn  btn-success btn-xs\"><i class=\"fa fa-search\"></i>&nbsp;鍙栨秷</a> ", (object) bean.OrderId);
                 }
@@ -237,7 +237,7 @@
                 str1 += "<tr><td>" + bean.OrderId + "</td>";
                 str1 = str1 + "<td>" + bean.SpId + "</td>";
                 str1 = str1 + "<td>" + bean.ClientId + "</td>";
-                //str1 = str1 + "<td>" + bean.Company + "</td>";
+                str1 = str1 + "<td>" + bean.Company + "</td>";
                 str1 = str1 + "<td>" + ProductToName(bean.ProductId) + "</td>";
                 //str1 = str1 + "<td>" + bean.ComboId + "</td>";
                 str1 = str1 + "<td>" + bean.BasicNum + "</td>";
@@ -316,7 +316,7 @@
         Int64 basicNum = context.GetInt64("basicNum");
         Int64 givingNum = context.GetInt64("givingNum");
         string clientId = "";
-        Int64 payAmount = 0;
+        Int64 payAmount = 0;//閲戦
         Int64 tmpPayAmount = Math.Max((int) (context.GetDecimal("payAmount", new Decimal(4, 0, 0, false, (byte) 2)) * new Decimal(1000)), 0);
         payAmount = tmpPayAmount;
         //double price = context.GetDecimal(price);
@@ -325,7 +325,7 @@
         int status = context.GetInt("status");  //0-瀹℃牳涓嶉�氳繃锛�1-瀹℃牳閫氳繃
         string auditReason = context.GetString("auditReason");
 
-        if (status == 0 && string.IsNullOrEmpty(auditReason) )
+        if (status == 0 && string.IsNullOrEmpty(auditReason))
         {
             throw new ArgumentException("璇疯緭鍏ヤ笉閫氳繃鍘熷洜锛�");
         }
@@ -425,7 +425,6 @@
                 nextSort = nowSort + 1;
                 //鑾峰彇瀹℃牳娴佺▼鐨勭涓�鐜妭娴佺▼浠ｇ爜
                 nextFlowCode = getNextFlowCode(flowGroup, nextSort);
-
             }
 
         }
@@ -672,6 +671,12 @@
         productId = gwSp.ProductId;
         price = gwSp.Price;
 
+
+        if (string.IsNullOrEmpty(gwSp.ProductId))
+        {
+            throw new ArgumentException("浜у搧閰嶇疆涓嶅厑璁镐负绌猴紒璇峰厛閰嶇疆璐﹀彿鎵�鍏宠仈浜у搧锛�");
+        }
+
         orderNumTotal = basicNum + givingNum;
         orderAmountTotal = basicNum * price;
 

--
Gitblit v1.9.1