新增客服上传客户文件

BizCom/Dao/CeErpTradeCellFile.cs

@@ -0,0 +1,98 @@
+using BizCom.Enum;
+using Castle.ActiveRecord;
+using NHibernate.Criterion;
+using System;
+using System.Text;
+
+namespace BizCom
+{
+    [ActiveRecord("CE_ErpTradeCellFile")]
+    public class CeErpTradeCellFile : ComBase<CeErpTradeCellFile>
+    {
+
+        /// <summary>
+        /// 
+        /// </summary>
+        [PrimaryKey(PrimaryKeyType.Native)]
+        public int ID { get; set; }
+
+        private string _tid = "";
+        [Property]
+        public string tid
+        {
+            get { return _tid; }
+            set { _tid = value; }
+        }
+        private string _ctid = "";
+        [Property]
+        public string ctid
+        {
+            get { return _ctid; }
+            set { _ctid = value; }
+        }
+        private bool _isDel = false;
+        /// <summary>
+        /// ÊÇ·ñɾ³ý
+        /// </summary>
+        [Property]
+        public bool isDel
+        {
+            get { return _isDel; }
+            set { _isDel = value; }
+        }
+
+        private string _url = "";
+        /// <summary>
+        /// µØÖ·
+        /// </summary>
+        [Property]
+        public string url
+        {
+            get { return _url; }
+            set { _url = value; }
+        }
+
+        private DateTime _createtime;
+        [Property]
+        public DateTime createtime
+        {
+            get { return _createtime; }
+            set { _createtime = value; }
+        }
+
+        private string _type;
+        /// <summary>
+        /// ÀàÐÍ
+        /// </summary>
+        [Property]
+        public string type
+        {
+            get { return _type; }
+            set { _type = value; }
+        }
+        public CeErpTradeCellFile() { }
+        public CeErpTradeCellFile(string tid, string ctid, string url, string type)
+        {
+            _tid = tid;
+            _ctid = ctid;
+            _url = url;
+            _type = type;
+            _createtime = DateTime.Now;
+        }
+
+        public static void delByCtid(string tid, string ctid, string type)
+        {
+            StringBuilder sql = new StringBuilder();
+            sql.AppendFormat("update CE_ErpTradeCellFile set isDel=1 where tid='{0}' and ctid='{1}' and type='{2}';", tid, ctid, type);
+            ExecuteNonQuery(sql.ToString());
+        }
+
+        public static void delByID(string ID)
+        {
+            StringBuilder sql = new StringBuilder();
+            sql.AppendFormat("update CE_ErpTradeCellFile set isDel=1 where ID='{0}';", ID);
+            ExecuteNonQuery(sql.ToString());
+        }
+
+    }
+}

BizCom/Enum/TradeCellFile.cs

@@ -0,0 +1,20 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BizCom.Enum
+{
+    public enum TradeCellFile
+    {
+        /// <summary>
+        /// 源文件
+        /// </summary>
+        ORI_FILE,
+        /// <summary>
+        /// 包裹图片
+        /// </summary>
+        PACK_FILE
+    }
+}

Web/EDesign/MyDesignList.aspx

@@ -2,12 +2,12 @@
 
 <asp:Content ID="Content1" ContentPlaceHolderID="head" runat="Server">
     <script type="text/javascript" src="js/MyDesignList.js?v=<%=SiteVer %>"></script>
-    
+
 </asp:Content>
 <asp:Content ID="Content2" ContentPlaceHolderID="btn" runat="Server">
     <a id="btnTransDesign" class="mini-button mini-button-primary" runat="server" visible="false" iconcls="icon-reload" onclick="transFn()">设计转单</a>
     <%--<a id="btnFinishDesign" class="mini-button mini-button-danger" runat="server" visible="false" iconcls="icon-ok" onclick="finishDesignFn()">设计完成</a>--%>
-    <a id="btnReturnCus" class="mini-button mini-button-primary" runat="server" visible="false"  style="padding: 2px 5px 2px 5px;" iconcls="icon-folder" onclick="returnOrder_CusFn()">退单客服</a>
+    <a id="btnReturnCus" class="mini-button mini-button-primary" runat="server" visible="false" style="padding: 2px 5px 2px 5px;" iconcls="icon-folder" onclick="returnOrder_CusFn()">退单客服</a>
     <a class="mini-button mini-button-primary" iconcls="icon-user" onclick="backAftersaleFn()">打回售后单</a>
     <a id="btnAutoUpload" class="mini-button mini-button-success" runat="server" visible="false" iconcls="icon-print" onclick="autoDownLoadFn()">自动上传</a>
     <a class="mini-button mini-button-primary" iconcls="icon-user" onclick="aftersaleFn()">售后</a>
@@ -15,14 +15,14 @@
 </asp:Content>
 <asp:Content ID="Content4" ContentPlaceHolderID="content" runat="Server">
     <div class="mini-fit">
-        <div id="m_grid" class="mini-datagrid" autoLoad="false" style="width: 100%; height: 100%;" contextMenu="#gridMenu" showemptytext="true" emptytext="暂无记录"  url="../handler/sync.ashx?t=get_erp_mydesignlist">
+        <div id="m_grid" class="mini-datagrid" autoload="false" style="width: 100%; height: 100%;" contextmenu="#gridMenu" showemptytext="true" emptytext="暂无记录" url="../handler/sync.ashx?t=get_erp_mydesignlist">
             <div property="columns">
                 <div type="indexcolumn" width="20"></div>
                 <div type="checkcolumn" width="20"></div>
                 <div name="orderid" width="110" align="center" headeralign="center" renderer="orderIdRenderer">订单编号</div>
                 <div name="orderptime" width="80" align="center" headeralign="center" renderer="orderPTimeRenderer">付款时间</div>
                 <%--<div name="buyermobile" width="60" align="center" headeralign="center" renderer="buyerMobileRenderer">客户</div>--%>
-                <div field="payment" width="40" align="center" headeralign="center" renderer="paymentRenderer">金额</div> 
+                <div field="payment" width="40" align="center" headeralign="center" renderer="paymentRenderer">金额</div>
                 <div name="orderscus" width="60" align="center" headeralign="center" renderer="orderCusRenderer">客服</div>
                 <div field="seller_memo" width="150" align="center" headeralign="center" renderer="memoRenderer">备注</div>
                 <div field="OtherMemo" width="80" align="center" headeralign="center">额外备注</div>
@@ -35,11 +35,11 @@
         </div>
     </div>
 
-    <ul id="gridMenu" class="mini-contextmenu" onbeforeopen="onBeforeOpen">              
-        <li name="edit" iconCls="icon-copy" onclick="onCopyOrder">复制单号</li>  
-        <li name="edit" iconCls="icon-copy" onclick="onCopyBuyerNick">复制旺旺号</li>  
-        <li name="edit" iconCls="icon-user" onclick="onTagRefund">退款挽回</li>  
-        <li name="edit" iconCls="icon-xiaoshou" onclick="onTagMore">微信推购</li>  
+    <ul id="gridMenu" class="mini-contextmenu" onbeforeopen="onBeforeOpen">
+        <li name="edit" iconcls="icon-copy" onclick="onCopyOrder">复制单号</li>
+        <li name="edit" iconcls="icon-copy" onclick="onCopyBuyerNick">复制旺旺号</li>
+        <li name="edit" iconcls="icon-user" onclick="onTagRefund">退款挽回</li>
+        <li name="edit" iconcls="icon-xiaoshou" onclick="onTagMore">微信推购</li>
     </ul>
 
     <div id="memo_win" class="mini-window" title="备注信息" style="width: 550px; height: 260px; position: relative; display: none">
@@ -70,7 +70,7 @@
         </table>
     </div>
 
-     <div id="trans_win" class="mini-window" title="设计转单" style="width: 360px; height: 180px; position: relative; display: none">
+    <div id="trans_win" class="mini-window" title="设计转单" style="width: 360px; height: 180px; position: relative; display: none">
         <table class="win_tb" border="0" cellpadding="0" cellspacing="1">
             <tr>
                 <td class="td1">本部设计</td>
@@ -94,7 +94,7 @@
             <tr>
                 <td class="td1">加急时间</td>
                 <td class="td2">
-                    <input id="txtUrgencyTime" name="sign_date1" data-options="{otype:'daterange',havetime:'1'}" class="mini-textbox inp-time"/>
+                    <input id="txtUrgencyTime" name="sign_date1" data-options="{otype:'daterange',havetime:'1'}" class="mini-textbox inp-time" />
                 </td>
             </tr>
             <tr>
@@ -112,9 +112,19 @@
         <table class="win_tb" border="0" cellpadding="0" cellspacing="1">
             <tr>
                 <td class="td1">售后原因</td>
-                <td class="td2"><select id="reason" style="width:80%;"><option value="客服问题">客服问题</option><option value="设计问题">设计问题</option><option value="客户问题">客户问题</option><option value="车间问题">车间问题</option>
-                    <option value="下单问题">下单问题</option><option value="快递问题">快递问题</option><option value="超成本">超成本</option><option value="重复下单">重复下单</option><option value="报价系统问题">报价系统问题</option>
-                    <option value="没按报价系统报价">没按报价系统报价</option></select>
+                <td class="td2">
+                    <select id="reason" style="width: 80%;">
+                        <option value="客服问题">客服问题</option>
+                        <option value="设计问题">设计问题</option>
+                        <option value="客户问题">客户问题</option>
+                        <option value="车间问题">车间问题</option>
+                        <option value="下单问题">下单问题</option>
+                        <option value="快递问题">快递问题</option>
+                        <option value="超成本">超成本</option>
+                        <option value="重复下单">重复下单</option>
+                        <option value="报价系统问题">报价系统问题</option>
+                        <option value="没按报价系统报价">没按报价系统报价</option>
+                    </select>
                 </td>
             </tr>
             <tr>
@@ -131,12 +141,13 @@
     <div id="modify_win" class="mini-window" title="预估设计费" style="width: 550px; height: 400px; position: relative; display: none">
         <table class="win_tb" border="0" cellpadding="0" cellspacing="1">
             <tr>
-                <div  class="size" style="color: red;">尺寸规格按照长x宽（单位mm），多尺寸用","分隔</div>
+                <div class="size" style="color: red;">尺寸规格按照长x宽（单位mm），多尺寸用","分隔</div>
             </tr>
             <tr>
                 <td class="td1" style="width: 80px">设计费</td>
                 <td class="td2">
-                    <input type="text" id="txtDesignPrice" style="width: 100px" /> 元
+                    <input type="text" id="txtDesignPrice" style="width: 100px" />
+                    元
                     <input type="hidden" id="txtSize" value="" />
                 </td>
             </tr>
@@ -168,7 +179,7 @@
                 <td class="td1" style="width: 80px">设计类型</td>
                 <td class="td2">
                     <input type="radio" name="designType" value="0" title="设计" checked="checked" />设计
-                    <input type="radio" name="designType" value="1" title="改稿"/>改稿
+                    <input type="radio" name="designType" value="1" title="改稿" />改稿
                 </td>
             </tr>
             <tr>
@@ -201,5 +212,24 @@
         </div>
     </div>
 
+    <div id="uploaderOriFile_win" class="mini-window" title="上传文件地址" style="width: 1000px; height: 300px; position: relative; display: none">
+        <table class="win_tb" border="0" cellpadding="0" cellspacing="1">
+            <tr>
+                <td class="td1">文件地址</td>
+                <td class="td2">
+                    <div id="oriFile_url" style="gap: 10px; display: flex; flex-direction: column;"></div>
+                </td>
+            </tr>
+            <tr>
+                <td colspan="5">
+                    <div class="win_btn" style="text-align: center;">
+                        <a class="mini-button" iconcls="icon-ok" onclick="saveUploaderOriFileFn">确定</a>&nbsp;
+                        <a class="mini-button" iconcls="icon-cancel" onclick="cancelUploaderOriFileFn">取消</a>
+                    </div>
+                </td>
+            </tr>
+        </table>
+    </div>
+
 </asp:Content>
 

Web/EDesign/js/MyDesignList.js

@@ -83,7 +83,7 @@ function buyerMobileRenderer(e) {
     var rowIndex = e.rowIndex;
     var html = "<div style=\"display:flex;flex-direction:column;align-items:center;\">";
     html += "<div>" + record.receiver_mobile + "</div>";
-    html += "<div><a class=\"a_def\" href=\"javascript:voiceNotifyFn('" + tid + "')\"><span class=\"icon-i icon-phone\"></span> <span>" + record.CallTimes + "</span></a>&nbsp;&nbsp;&nbsp;&nbsp;<a class=\"a_def\" href=\"javascript:smsNotifyFn('" + tid +"')\"><span class=\"icon-i icon-sms\"></span> <span>" + record.NoteTimes + "</span></a></div>";
+    html += "<div><a class=\"a_def\" href=\"javascript:voiceNotifyFn('" + tid + "')\"><span class=\"icon-i icon-phone\"></span> <span>" + record.CallTimes + "</span></a>&nbsp;&nbsp;&nbsp;&nbsp;<a class=\"a_def\" href=\"javascript:smsNotifyFn('" + tid + "')\"><span class=\"icon-i icon-sms\"></span> <span>" + record.NoteTimes + "</span></a></div>";
     html += "</div>";
     return html;
 }
@@ -169,6 +169,7 @@ function actionRenderer(e) {
     html += getGridBtn("copies", "标记", "designMemoFn('" + id + "')");
     html += getGridBtn("notify1", "加急", "urgencyFn('" + id + "')");
     html += getGridBtn("memo", "文件", "fileUrlFn('" + record.tid + "')");
+    html += getGridBtn("memo", "客户文件", "oriFileUrlFn('" + record.tid + "','" + record.ctid + "')");
     //if (record.IsNeedDesignPrice == 1) {
     //    html += getGridBtn("izc", "设计费", "priceFn('" + id + "')");
     //}
@@ -185,6 +186,23 @@ function fileUrlFn(tid) {
         }
     });
 }
+function oriFileUrlFn(tid, ctid) {
+    postAjax("getCellFile", { tid: tid, ctid: ctid, type: "ORI_FILE" }, function (data) {
+        $("#oriFile_url").empty();
+        let html = ``;
+        for (var i = 0; i < data.length; i++) {
+            html += `<div style="display:flex;gap:10px">
+                        <div>${data[i].url}</div>
+                        <div style="cursor: pointer;" onclick="downCellFile('${data[i].url}')")>下载</div>
+                    </div>`
+        }
+        $("#oriFile_url").append(html == '' ? "暂无文件" : html);
+        mini.get("uploaderOriFile_win").show();
+    });
+}
+function downCellFile(url) {
+    window.open(url);
+}
 //售后标记按钮
 function aftersaleFn() {
     var rec = grid.getSelected();
@@ -236,7 +254,7 @@ function backAftersaleFn() {
     }
 }
 
-function startDesignFn(eid,isNeed, remark) {
+function startDesignFn(eid, isNeed, remark) {
     edit_id = eid;
     if (userPostCode != "Place" && userPostCode != "wxDesigner" && userPostCode != "Director" && isNeed == 1) {
         mini.get("modify_win").show();
@@ -259,7 +277,7 @@ function startDesignFn(eid,isNeed, remark) {
         } else {
             $("#txtDesignSize").val(goodsSize);
         }
-        
+
         /*mini.prompt("请输入设计费：", "设计费"
             function (action, value) {
                 if (action == "ok") {
@@ -281,7 +299,7 @@ function startDesignFn(eid,isNeed, remark) {
             resultShow(data, "grid.reload();");
         });
     }
-    
+
 }
 
 function saveModifyFn() {
@@ -315,7 +333,7 @@ function saveModifyFn() {
         mini.alert("请填写设计费");
         return;
     }
-    
+
     postAjax("ins_erp_designprice", parms, function (data) {
         mini.get("modify_win").hide();
         resultShow(data, "grid.reload();");
@@ -346,7 +364,7 @@ function designMemoFn(eid) {
 }
 function priceFn(eid) {
     edit_id = eid;
-   
+
 }
 //点击改稿或者定稿重置状态
 function clickResetOptFn() {
@@ -365,7 +383,7 @@ function memoFn(eid) {
     if (mm != "") mm = mm.replace(/&lt;br&gt;/g, "\n");
     $("#txtMemo").val(mm);
     mini.get("memo_win").show();
-    
+
     mini.get("aMemoMsgGai").setChecked(false);
     mini.get("aMemoMsgDing").setChecked(false);
     mini.get("aMemoMsgCha").setChecked(false);
@@ -451,7 +469,7 @@ function returnOrder_CusFn() {
 //转单
 function transFn() {
     var rows = grid.getSelecteds();
-    if (rows != undefined && rows != "" && rows.length>0) {
+    if (rows != undefined && rows != "" && rows.length > 0) {
         mini.get("trans_win").show();
         $("#trans_win").find("input").val("");
     }
@@ -510,7 +528,7 @@ function searchFn() {
     //console.log("565656565", data);
     grid.load({
         ctid: s.tid, shopname: s.shop, buyer_nick: s.ww, orderState: s.state, apdate1: s.assigndate1, apdate2: s.assigndate2,
-        date1: s.date1, date2: s.date2, address: s.address, seller_memo: s.memo, olddown:s.olddown
+        date1: s.date1, date2: s.date2, address: s.address, seller_memo: s.memo, olddown: s.olddown
     });
 }
 function onSearchCheckedChanged(e) {
@@ -639,8 +657,8 @@ $(function (e) {
     }
 
     //if (openPageState != null) {
-       //grid.load({
-            //orderState: openPageState
-            //});
+    //grid.load({
+    //orderState: openPageState
+    //});
     //}
 });

Web/EOrder/OrderList.aspx

@@ -186,6 +186,8 @@
         <li name="edit" iconcls="icon-add" onclick="onAddWechatTag">已添加微信</li>
         <li name="edit" iconcls="icon-epay" onclick="onShowRule">知识库</li>
         <li name="edit" iconcls="icon-stop" onclick="onReturnVisit">客户回访</li>
+        <li name="edit" iconcls="icon-stop" onclick="onOriFileVisit('ORI_FILE')">查看客户文件</li>
+        <li name="edit" iconcls="icon-stop" onclick="onOriFileVisit('PACK_FILE')">查看包裹图片</li>
     </ul>
 
 
@@ -786,6 +788,31 @@
         </table>
     </div>
 
+    <div id="uploaderOriFile_win" class="mini-window" title="上传文件地址" style="width: 1000px; height: 300px; position: relative; display: none">
+        <table class="win_tb" border="0" cellpadding="0" cellspacing="1">
+            <tr>
+                <td class="td1"></td>
+                <td class="td2">
+                    <input type="file" id="ori_file" multiple />
+                </td>
+            </tr>
+            <tr>
+                <td class="td1">文件地址</td>
+                <td class="td2">
+                    <div id="oriFile_url" style="gap: 10px; display: flex; flex-direction: column;"></div>
+                </td>
+            </tr>
+            <tr>
+                <td colspan="5">
+                    <div class="win_btn" style="text-align: center;">
+                        <a class="mini-button" iconcls="icon-ok" onclick="saveUploaderOriFileFn">确定</a>&nbsp;
+                        <a class="mini-button" iconcls="icon-cancel" onclick="cancelUploaderOriFileFn">取消</a>
+                    </div>
+                </td>
+            </tr>
+        </table>
+    </div>
+
     <div id="urgency_win" class="mini-window" title="加急" style="width: 360px; height: 180px; position: relative; display: none">
         <table class="win_tb" border="0" cellpadding="0" cellspacing="1">
             <tr>
@@ -1007,35 +1034,7 @@
                 console.log(e);
             }
         }
-        /*document.getElementById('address_file').addEventListener('change', function (e) {
-            const file = e.target?.files[0];
-            const reader = new FileReader();
-            reader.onload = function (option) {
-                const data = new Uint8Array(option.target.result);
-                const workbook = XLSX.read(data, { type: 'array' });
-                const sheetName = workbook.SheetNames[0]; // 获取第一个工作表的名称
-                const sheet = workbook.Sheets[sheetName]; // 获取工作表数据
-                const jsonData = XLSX.utils.sheet_to_json(sheet);
-                let names = ["订单号", "文件名", "数量", "地址", "备注"];
-                let isval = true;
-                for (let i = 0; i < jsonData.length; i++) {
-                    let item = jsonData[i];
-                    for (let key in item) {
-                        if (names.indexOf(key) == -1) {
-                            isval = false;
-                        }
-                    }
-                }
-                if (isval) {
-                    putObject(file);
-                } else {
-                    e.target.value = '';
-                    resultShow("请上传正确的文件");
-                }
-            };
-            reader.readAsArrayBuffer(file);
-            putObject(file);
-        });*/
+
         let tagIds = [];
         let tagId = 0;
         let uploaderAddressTid = "";
@@ -1145,6 +1144,85 @@
         function cancelUploaderAddressFn() {
             mini.get("uploaderAddress_win").hide();
         }
+        //订单附件开始
+        let ori_tid = "";
+        let ori_ctid = "";
+        let ori_type = "";
+        function onOriFileVisit(type) {
+            let rec = grid.getSelected();
+            ori_tid = rec.tid;
+            ori_ctid = rec.ctid;
+            ori_type = type;
+            $("#ori_file").hide();
+            if (type == "ORI_FILE") {
+                $("#ori_file").show();
+            }
+            getFilesList();
+            mini.get("uploaderOriFile_win").show();
+            document.getElementById('ori_file').value = "";
+        }
+
+        function getFilesList() {
+            postAjax("getCellFile", { tid: ori_tid, ctid: ori_ctid, type: ori_type }, function (data) {
+                $("#oriFile_url").empty();
+                let html = ``;
+                for (var i = 0; i < data.length; i++) {
+                    let delBtn = `<div style="cursor: pointer;" onclick="delCellFile('${data[i].ID}')">删除</div>`;
+                    html += `<div style="display:flex;gap:10px">
+                        <div>${data[i].url}</div>
+                        <div style="cursor: pointer;" onclick="downCellFile('${data[i].url}')")>下载</div>
+                        ${ori_type == "ORI_FILE" ? delBtn : ""}
+                    </div>`
+                }
+                $("#oriFile_url").append(html == "" ? "暂无文件" : html);
+            });
+        }
+
+        function cancelUploaderOriFileFn() {
+            mini.get("uploaderOriFile_win").hide();
+        }
+
+        function downCellFile(url) {
+            window.open(url);
+        }
+        function delCellFile(id) {
+            postAjax("delCellFile", { id }, function (data) {
+                getFilesList();
+            });
+        }
+
+        document.getElementById('ori_file').addEventListener('change', async function (e) {
+            const file = e.target?.files;
+            const reader = new FileReader();
+            let list = [];
+            for (var i = 0; i < file.length; i++) {
+                let url = await putOriObject(file[i]);
+                list.push(url)
+            }
+            postAjax("saveCellFile", { tid: ori_tid, ctid: ori_ctid, type: ori_type, urls: list.join(",") }, function (data) {
+                getFilesList();
+            });
+            document.getElementById('ori_file').value = "";
+
+        });
+
+        async function putOriObject(file) {
+            try {
+                let fileDir = dateFtt("yyyyMMdd", new Date())
+                let name = "oriDoc/" + fileDir + "/" + guid() + getSuff(file.name);
+                // 填写Object完整路径。Object完整路径中不能包含Bucket名称。
+                // 您可以通过自定义文件名（例如exampleobject.txt）或文件完整路径（例如exampledir/exampleobject.txt）的形式实现将数据上传到当前Bucket或Bucket中的指定目录。
+                // data对象可以自定义为file对象、Blob数据或者OSS Buffer。
+                const options = {
+                    headers: { "Content-Type": "text/plain" },
+                };
+                const result = await client.put(name, file, options);
+                return result.url;
+            } catch (e) {
+                console.log(e);
+            }
+        }
+        ///订单附件结束
         function dateFtt(fmt, date) {
             var o = {
                 "M+": date.getMonth() + 1,                 //月份   

Web/EOrder/js/p_order.js

@@ -193,6 +193,7 @@ function oldCusToOrder(ctid) {
     );
 }
 
+
 function onDrawSummaryCell(e) {
     var result = e.result;
     var rdata = result.data;

Web/Global.asax

@@ -116,6 +116,7 @@
                                  typeof(CeErpPackData),
                                  typeof(CeErpPackDataItem),
                                  typeof(CeErpSupplierProductTime),
+                                 typeof(CeErpTradeCellFile),
                                  typeof(CeErpDataSendOrderInfo)
 
                              };

ecomServer/MainForm.cs

@@ -346,7 +346,7 @@ namespace ErpServer
                                         {
                                             DataTable dataTable = SqlHelper.ExecuteDataset(string.Format("SELECT orderFrom FROM [dbo].[Ce_ErpTradeCellExtend] WHERE ctid = '{0}'", dr["ctid"].ToString())).Tables[0];
                                             int num = 0;
-                                            if (dataTable!= null && dataTable.Rows.Count > 0 && !Convert.IsDBNull(dataTable.Rows[0]["orderFrom"]))
+                                            if (dataTable != null && dataTable.Rows.Count > 0 && !Convert.IsDBNull(dataTable.Rows[0]["orderFrom"]))
                                             {
                                                 num = Convert.ToInt16(dataTable.Rows[0]["orderFrom"]);
                                             }
@@ -952,7 +952,7 @@ namespace ErpServer
                                     }
                                     int[] uv_productIds = new int[] { 14, 43, 2487, 2531, 2654, 2656 };
                                     //指定店铺老客户和指定店铺单价500以上分给指定部门
-                                    if (!uv_productIds.Contains(ProductId) && ((IsOldCustomer == "1" && userId == 241) || (userId == 241 && Convert.ToDouble(dr["payment"]) >= 500)))
+                                    if (!uv_productIds.Contains(ProductId) && ((IsOldCustomer == "1" && userId == 241)))
                                     {
                                         //手绘   logo  画册 海报  宣传单
                                         if ((IsOldCustomer == "1" && (ProductId == 28 || ProductId == 57 || ProductId == 40 || ProductId == 4 || ProductId == 13)))