edit

BizCom/Dao/CeErpTrade.cs

@@ -307,7 +307,7 @@ namespace BizCom
 
         private string _receiver_zip = "";
         /// <summary>
-        ///收货人的邮编
+        ///收货人的身份证
         /// </summary>
         [Property]
         public string receiver_zip

SiteCore/Handler/sync.order.cs

@@ -149,7 +149,7 @@ namespace SiteCore.Handler
             {
                 if (ex_psize == 0)
                 {
-                    lw.Add(string.Format("datediff(d,pay_time,getdate())<=92 "));
+                    lw.Add(string.Format("pay_time >= DATEADD(DAY, -31, GETDATE()) "));
                 }
 
                 if (PKey != "admin")
@@ -1348,6 +1348,12 @@ namespace SiteCore.Handler
                 string eid = GetPostString("ctid");
                 CeErpTradeCell entity = null;
                 if (eid != "") entity = CeErpTradeCell.GetByCtid(eid);
+                CeErpTrade father = CeErpTrade.Get(entity.tid);
+                if (father.receiver_state.Contains("台湾") && string.IsNullOrEmpty(father.receiver_zip))
+                {
+                    returnErrorMsg("台湾客户需填写身份证号！");
+                    return;
+                }
                 if (entity != null)
                 {
                     if (entity.ctid.IndexOf("C") != -1)
@@ -3911,11 +3917,11 @@ namespace SiteCore.Handler
                 if (eid != "") entity = CeErpTradeCell.GetByCtid(eid);
                 if (entity != null)
                 {
-                    /*if (entity.IsHaveNewOrder == 2 && CurrentUser.UserPost.Post.Code != "SysAdmin")
+                    if (entity.IsHaveNewOrder == 2 && CurrentUser.UserPost.Post.Code != "SysAdmin")
                     {
                         returnErrorMsg("订单正在下载中无法退回！");
                         return;
-                    }*/
+                    }
                     if (CurrentUser.UserPost.Post.Code != "Supplier")//不是供应商打回
                     {
                         string key = "return_order_" + entity.SupplierId;
@@ -5422,7 +5428,7 @@ namespace SiteCore.Handler
             }
             else
             {
-                lw.Add(string.Format("datediff(d,pay_time,getdate())<=92 "));
+                lw.Add(string.Format("pay_time >= DATEADD(DAY, -31, GETDATE()) "));
             }
 
             string posTag = CurrentUser.UserPost.Post.Code;
@@ -5435,7 +5441,7 @@ namespace SiteCore.Handler
                 string supplier = GetPostString("supplier");
                 if (supplier.Length > 0) lw.Add(string.Format("SupplierName like '%{0}%'", supplier));
             }
-            lw.Add(string.Format("(OrderState = 7 or OrderState=8)"));
+            lw.Add(string.Format(" OrderState IN (7, 8)"));
             lw.Add(string.Format("type != 'PDD' "));
             lw.Add(string.Format("IsRefund!={0}", 2));
             dStruct.Order = "MemoOpt desc, FinishPlaceTime desc";
@@ -10977,8 +10983,13 @@ namespace SiteCore.Handler
                 {
                     if (entity.OrderState == -1)
                     {
+                        CeErpTrade ceErpTrade = CeErpTrade.Get(entity.tid);
                         CeErpTradeCellExtend ceErpTradeCellExtend = CeErpTradeCellExtend.getByTid(entity.ctid);
-
+                        if (!string.IsNullOrEmpty(ceErpTrade.receiver_state) && ceErpTrade.receiver_state.Contains("台湾") && string.IsNullOrEmpty(ceErpTrade.receiver_zip))
+                        {
+                            returnErrorMsg("台湾客户需填写身份证！");
+                            return;
+                        }
                         if (string.IsNullOrEmpty(ceErpTradeCellExtend.spu_id) && !entity.ctid.Contains("N_") && !entity.ctid.Contains("S_"))
                         {
                             returnErrorMsg("订单spu没有确认无法通过审核！");
@@ -13530,6 +13541,36 @@ namespace SiteCore.Handler
             }
             returnErrorMsg("缺少必要的参数");
         }
+        public void backPackOrderInfo()
+        {
+            string id = GetPostString("id");
+            if (!string.IsNullOrEmpty(id))
+            {
+                CeErpPackData ceErpPackData = CeErpPackData.Get(id);
+                if (ceErpPackData == null)
+                {
+                    returnSuccessMsg("查无数据");
+                    return;
+                }
+                ceErpPackData.upStatus = 4;
+                ceErpPackData.Update();
+                List<string> list = new List<string>();
+                StringBuilder sql = new StringBuilder();
+                sql.AppendFormat("select * from CE_ErpPackDataItem where packId = {0}", ceErpPackData.ID);
+                DataTable dt = DbHelper.DbConn.ExecuteDataset(sql.ToString()).Tables[0];
+                for (int i = 0; i < dt.Rows.Count; i++)
+                {
+                    DataRow row = dt.Rows[i];
+                    list.Add("'" + row["ctid"].ToString() + "'");
+                }
+                string textCtids = string.Join(",", list);
+                DbHelper.DbConn.ExecuteNonQuery(string.Format("update CE_ErpTradeCell set OrderState=5,IsVerifyToSupplier=0,IsReturn=1,ReturnTime=GETDATE(),ReturnReason='无法打包' where ctid in ({0}) and OrderState=6", textCtids));
+                DbHelper.DbConn.ExecuteNonQuery(string.Format("insert into CE_ErpTradeLog(tid,orderstate,userid,operatetime,con) select ctid,{1},{2},getdate(),'{3}' from ce_erptradecell where ctid in ({0}) ;", textCtids, (int)OrderState.下单完成, 0, "无法打包退回"));
+                returnSuccessMsg("退回成功");
+                return;
+            }
+            returnErrorMsg("缺少必要的参数");
+        }
         public void addPackDownNum()
         {
             string id = GetPostString("id");
@@ -13747,6 +13788,21 @@ namespace SiteCore.Handler
             ReturnSuccess("{" + string.Format("\"data\":{0}", "[]") + "}");
             return;
         }
+
+        public void addPersonId()
+        {
+            string tid = GetPostString("tid");
+            string personId = GetPostString("personId");
+            CeErpTrade ceErpTrade = CeErpTrade.Get(tid);
+            if (ceErpTrade != null)
+            {
+                ceErpTrade.receiver_zip = personId;
+                ceErpTrade.Update();
+                returnSuccessMsg("保存成功");
+                return;
+            }
+            returnErrorMsg("缺少必要的参数");
+        }
     }
 
 }

SiteCore/taobao/apiCaiYingTong.cs

@@ -513,6 +513,10 @@ namespace SiteCore.Handler
             }
 
             CeErpTradeResponsible ceErpTradeResponsible = CeErpTradeResponsible.GetByUserId(entity.ctid, 64, 1, 0);
+            if (ceErpTradeResponsible == null)
+            {
+                ceErpTradeResponsible = CeErpTradeResponsible.GetByUserId(entity.ctid, 80, 1, 0);
+            }
             if (ceErpTradeResponsible != null)
             {
                 id = ceErpTradeResponsible.ID.ToString();

SiteCore/taobao/tmcHelper.cs

@@ -1504,6 +1504,10 @@ namespace SiteCore
                         }
                     }
                 }
+                if (father.receiver_state.Contains("台湾") && string.IsNullOrEmpty(father.receiver_zip))
+                {
+                    entity.OrderState = -1;
+                }
                 if (ishaveBu)
                 {
                     entity.Update();
@@ -1564,6 +1568,10 @@ namespace SiteCore
                     entity.IsSample = 1;
                     entity.SupplierId = Convert.ToInt32(webConfig.SampleOrderSupplier);
                     entity.IsOldCustomer = 0;
+                    if (father.receiver_state.Contains("台湾") && string.IsNullOrEmpty(father.receiver_zip))
+                    {
+                        entity.OrderState = -1;
+                    }
                     father.create_time = DateTime.Now;
                     father.Update();
                     entity.Create();
@@ -1571,6 +1579,10 @@ namespace SiteCore
                 }
                 else
                 {
+                    if (father.receiver_state.Contains("台湾") && string.IsNullOrEmpty(father.receiver_zip))
+                    {
+                        entity.OrderState = -1;
+                    }
                     entity.IsSample = 1;
                     entity.UpdateTime = DateTime.Now;
                     entity.seller_memo = smemo;
@@ -2003,7 +2015,10 @@ namespace SiteCore
 
                 }
             }
-
+            if (father.receiver_state.Contains("台湾") && string.IsNullOrEmpty(father.receiver_zip))
+            {
+                entity.OrderState = -1;
+            }
             if (isNull)
             {
                 father.create_time = DateTime.Now;
@@ -2173,6 +2188,10 @@ namespace SiteCore
                 }
 
             }
+            if (father.receiver_state.Contains("台湾") && string.IsNullOrEmpty(father.receiver_zip))
+            {
+                entity.OrderState = -1;
+            }
             if (isNull)
             {
                 father.create_time = DateTime.Now;
@@ -2355,7 +2374,10 @@ namespace SiteCore
                     entity.IsOldCustomerMore = 1;
                 }
             }
-
+            if (father.receiver_state.Contains("台湾") && string.IsNullOrEmpty(father.receiver_zip))
+            {
+                entity.OrderState = -1;
+            }
             if (isNull)
             {
                 father.create_time = DateTime.Now;
@@ -2527,6 +2549,10 @@ namespace SiteCore
             entity.seller_memo = newmemo;
             entity.OtherMemo = newOtherMemo;
             entity.pay_time = father.pay_time;
+            if (father.receiver_state.Contains("台湾") && string.IsNullOrEmpty(father.receiver_zip))
+            {
+                entity.OrderState = -1;
+            }
             if (isNull)
             {
                 father.create_time = DateTime.Now;
@@ -2907,6 +2933,10 @@ namespace SiteCore
                 entity.FinishPlaceTime = DateTime.Now;
                 entity.SupplierId = 5;//-福广
             }
+            if (father.receiver_state.Contains("台湾") && string.IsNullOrEmpty(father.receiver_zip))
+            {
+                entity.OrderState = -1;
+            }
             if (ishave)
             {
 
@@ -3323,6 +3353,11 @@ namespace SiteCore
                 entity.FinishPlaceTime = DateTime.Now;
                 entity.SupplierId = 5;//-福广
             }
+            //台湾省要审核
+            if (father.receiver_state.Contains("台湾") && string.IsNullOrEmpty(father.receiver_zip))
+            {
+                entity.OrderState = -1;
+            }
             if (ishave)
             {
                 entity.Update();
@@ -3334,6 +3369,7 @@ namespace SiteCore
                 entity.Create();
                 CeErpTradeCellExtend.createInfo(entity.ctid, 10, 10);
             }
+
             //dataHelper.sendErpTradeCellInfo(new dataSendTradeCellBean(entity, father));
             CeErpSukuraData.createInfo(entity.ctid, 1);
             LogHelper.addLog(entity.ctid, entity.CustomerUserId, "普通推送生成：" + entity.seller_memo, entity.OrderState);

Web/EDelivery/DeliveredList.aspx

@@ -37,6 +37,7 @@
                 <div field="delivery_time" width="80" align="center" headeralign="center" renderer="deliveryTimeRenderer">发货时间</div>
                 <div field="OutSid" width="50" align="center" headeralign="center">快递信息</div>
                 <div field="OutSid" width="50" align="center" headeralign="center" renderer="changeDeliveryRenderer">修改快递信息</div>
+                <div field="receiver_zip" width="50" align="center" headeralign="center">身份证</div>
                 <div name="action" width="60" headeralign="center" align="center" renderer="actionRenderer" cellstyle="padding:0;">#</div>
             </div>
         </div>

Web/EDelivery/PackCenter.aspx

@@ -28,6 +28,7 @@
             return html;
         }
         function rePackData(id) {
+            if (!confirm("确认重新打包单吗?")) return;
             postAjax("rePackOrderInfo", { id }, function (data) { resultShow(data, "grid.reload();"); });
         }
         function supStateRenderer(e) {
@@ -56,11 +57,18 @@
                 html += getGridBtn("notify1", "下载", "downUrl('" + record.fileUrl + "','" + record.ID + "')");
             }
             if (record.upStatus == 3) {
-                html += getGridBtn("notify", "重新打包", "rePackData(" + record.ID + ")");
+                html += getGridBtn("edit", "重新打包", "rePackData(" + record.ID + ")");
+                html += getGridBtn("memo", "退回", "backOrder(" + record.ID + ")");
             }
             html += getGridBtn("task", "查看订单", "viewOrder(" + record.ID + ")");
             return html;
         }
+        function backOrder(id) {
+            if (!confirm("确认退回订单吗?")) return;
+            postAjax("backPackOrderInfo", { id }, function (data) {
+                resultShow(data, "grid.reload();");
+            });
+        }
         function downUrl(url, id) {
             postAjax("addPackDownNum", { id }, function (data) {
                 window.open(url);

Web/EDelivery/PddDelivered.aspx

@@ -37,6 +37,7 @@
                 <div field="delivery_time" width="80" align="center" headeralign="center" renderer="deliveryTimeRenderer">发货时间</div>
                 <div field="OutSid" width="50" align="center" headeralign="center">快递信息</div>
                 <div field="OutSid" width="50" align="center" headeralign="center" renderer="changeDeliveryRenderer">修改快递信息</div>
+                <div field="receiver_zip" width="50" align="center" headeralign="center">身份证</div>
                 <div name="action" width="60" headeralign="center" align="center" renderer="actionRenderer" cellstyle="padding:0;">#</div>
             </div>
         </div>

Web/EOrder/OrderList.aspx

@@ -810,6 +810,25 @@
             </div>
         </div>
     </div>
+    <div id="personInfo_win" class="mini-window" title="客户信息" style="width: 1000px; height: 500px; position: relative; display: none">
+        <input type="hidden" id="person_ctid" />
+        <table class="win_tb" border="0" cellpadding="0" cellspacing="1">
+            <tr>
+                <td class="td1">身份证</td>
+                <td class="td2" colspan="3">
+                    <input id="textPersonId" style="width: 96%; height: 60px;" />
+                </td>
+            </tr>
+            <tr>
+                <td colspan="4">
+                    <div class="win_btn" style="text-align: center;">
+                        <a class="mini-button" iconcls="icon-ok" onclick="savePersonInfoFn">保存</a>&nbsp;
+                        <a class="mini-button" iconcls="icon-cancel" onclick="cancelPersonInfoFn">取消</a>
+                    </div>
+                </td>
+            </tr>
+        </table>
+    </div>
     <div id="knowledge_win" class="mini-window" title="知识库" style="width: 750px; height: 570px; position: relative; display: none">
         <iframe src="" id="knowledge_wev" style="width: 100%; height: 100%"></iframe>
     </div>

Web/EOrder/js/p_order.js

@@ -44,7 +44,10 @@ function orderAction(e) {
     }
 
     if (record.OrderState == -1) {
-        html += getGridBtn("memo2", "通过审核", "passToOrder('" + id + "')");
+        html += getGridBtn("info", "通过审核", "passToOrder('" + id + "')");
+        if (record.receiver_state.indexOf("台湾") > -1) {
+            html += getGridBtn("laboratory", "身份证", "setPersonIdInfo()");
+        }
     }
     if (record.ctid.indexOf("S_") > -1) {
         if (userPostCode == "AfterSaleMaster" || userPostCode == "SysAdmin" || userPostCode == "AfterSale" || userId == "82" || userId == "2846") {
@@ -62,6 +65,32 @@ function orderAction(e) {
     return html;
 }
 
+function setPersonIdInfo() {
+    let rec = grid.getSelected();
+    $("#textPersonId").val(rec.receiver_zip);
+    mini.get("personInfo_win").show();
+}
+function savePersonInfoFn() {
+    let rec = grid.getSelected();
+    let personId = $("#textPersonId").val();
+    let tid = rec.tid;
+    if (personId == "") {
+        return mini.showTips({
+            content: "请填写身份证号码！",
+            state: "danger",
+            x: "Center",
+            y: "Center",
+            timeout: 1000
+        });
+    }
+    postAjax("addPersonId", { tid, personId }, function (data) {
+        resultShow(data, "grid.reload();");
+        mini.get("personInfo_win").hide();
+    });
+}
+function cancelPersonInfoFn() {
+    mini.get("personInfo_win").hide();
+}
 function passToOrder(ctid) {
     postAjax("back_supplier_query", "ctid=" + ctid, function (data) {
         if (data.length > 0) {
@@ -1332,7 +1361,7 @@ function onCopyOrder(e) {
     var rec = grid.getSelected();
     //rec.ctid
     copyTextPlus(rec.ctid);
-}function onCopyOrderSn(e) {
+} function onCopyOrderSn(e) {
     var rec = grid.getSelected();
     //rec.ctid
     copyTextPlus(rec.OrderSn);