售后待审核新增车间退款差价

SiteCore/Handler/sync.getbase.cs

@@ -363,7 +363,7 @@ namespace SiteCore.Handler
             string orgIds = CurrentUser.User.ManageOrgIds;
             string sql = "";
 
-            if (code == "Designerhd")
+            if (code == "Designerhd" || code == "CustomerMr")
             {
                 //and id in('11','12','13','99','102')
                 if (orgIds == null || orgIds == "")
@@ -381,7 +381,7 @@ namespace SiteCore.Handler
             }
             else
                 sql = "select id,name from CE_ErpOrganization where (Code='designer' or Code like '%wx%' or Code='zz') ";
-            sql += " and id in (132,102,13,119,130,134,107,131,104,36,37,81,82,108,110,111,121,122,133,97,112)";
+            sql += " and id in (132,102,13,119,130,134,107,131,104,36,37,81,82,108,110,111,121,122,133,97,112,40)";
             DataTable dt = DbHelper.DbConn.ExecuteDataset(sql).Tables[0];
             con.Response.Write(Utils.Serialization.JsonString.DataTable2MiniAjaxJson(dt));
         }

SiteCore/Handler/sync.order.cs

@@ -12816,7 +12816,7 @@ namespace SiteCore.Handler
                 if (row["UnusualTime"].ToString() != null && row["UnusualTime"].ToString().Length > 0)
                 {
                     map["unusua"]++;
-                    
+
                 }
                 DateTime FinishPlaceTime = DateTime.Parse(row["FinishPlaceTime"].ToString());
                 //GD-CYT-----64

Web/EAfterSale/WaitingVerify.aspx

@@ -36,6 +36,7 @@
             <div field="OrderState" width="50" align="center" headeralign="center" renderer="orderStatusRenderer">状态</div>
             <div field="supRefundType" width="50" align="center" headeralign="center" runat="server" id="id_supRefundType" visible="false">退款类型</div>
             <div field="payment" id="id_payment" runat="server" visible="false" width="50" align="center" headeralign="center" renderer="payRenderer">金额</div>
+            <div field="DeductFee" id="id_deductFee" runat="server" visible="false" width="50" align="center" headeralign="center">退差价金额</div>
             <div field="UserName" width="60" align="center" headeralign="center">责任人</div>
             <div field="AfterSaleSupplierImg" width="30" align="center" headeralign="center" renderer="ImgRenderer">图片</div>
             <div field="SupplierName" id="id_supplierName" runat="server" visible="false" width="60" align="center" headeralign="center">供应商</div>

Web/EAfterSale/WaitingVerify.aspx.cs

@@ -49,9 +49,11 @@ public partial class EAfterSale_WaitingVerify : BasePage
             id_supRefundType.Visible = true;
             id_supplierResponsible.Visible = true;
             id_AfterSaleMethod.Visible = false;
+            id_deductFee.Visible = true;
         }
         else
         {
+            id_deductFee.Visible = false;
             id_supplierResponsible.Visible = true;
             id_AfterSaleMethod.Visible = true;
             id_payment.Visible = true;
@@ -59,6 +61,11 @@ public partial class EAfterSale_WaitingVerify : BasePage
             id_handler.Visible = true;
             id_afterMemo.Visible = true;
         }
+        if (CurrentUser.UserPost.Post.Code == "SysAdmin" || CurrentUser.UserPost.Post.Code == "AfterSale")
+        {
+            id_deductFee.Visible = true;
+            id_supplierName.Visible = true;
+        }
         if (CurrentUser.UserPost.Post.Code == "SysAdmin" || CurrentUser.UserPost.Post.Code == "Finance")
         {
             id_supplierName.Visible = true;

ecomServer/MainForm.cs

@@ -896,7 +896,7 @@ namespace ErpServer
                     if (isStart)
                     {
 
-                        string sql = "SELECT tid, ctid, IsOldCustomer, shopid, payment, ProductId, isDianziOrder, ( SELECT COUNT ( * ) AS fileNumber FROM CE_ErpTradeCellFile WHERE tid = c.tid AND ctid = c.ctid AND isDel = 0 ) AS fileNumber  FROM CE_ErpTradeCell c WHERE orderstate = 2  AND productid <> 0  AND designuserid = 0  AND payment > 0  AND isrefund = 0  ORDER BY IsUrgency DESC, fileNumber DESC, YEAR ( pay_time ), MONTH ( pay_time ), DAY ( pay_time ), payment DESC;";
+                        string sql = "SELECT tid, ctid, IsOldCustomer, shopid, payment, ProductId, isDianziOrder, ( SELECT COUNT ( * ) AS fileNumber FROM CE_ErpTradeCellFile WHERE tid = c.tid AND ctid = c.ctid AND isDel = 0 ) AS fileNumber  FROM CE_ErpTradeCell c WHERE orderstate = 2  AND productid <> 0  AND designuserid = 0 AND designuserid <> 188  AND payment > 0  AND isrefund = 0  ORDER BY IsUrgency DESC, fileNumber DESC, YEAR ( pay_time ), MONTH ( pay_time ), DAY ( pay_time ), payment DESC;";
                         DataTable dt = SqlHelper.ExecuteDataset(sql).Tables[0];
                         //object result = SqlHelper.ExecuteScalar(sql);
                         if (dt != null && dt.Rows.Count > 0)