edit

SiteCore/Handler/sync.order.cs

@@ -13598,7 +13598,7 @@ namespace SiteCore.Handler
                     string inSql = string.Format(insterSql.ToString(), ceErpPackData.ID);
                     DbHelper.DbConn.ExecuteNonQuery(inSql);
                 }
-                //DbHelper.DbConn.ExecuteNonQuery(string.Format("update CE_ErpTradeCell set OrderState=6,IsVerifyToSupplier=0 where ctid in ({0}) and OrderState=5 and IsVerifyToSupplier=1", textCtids));
+                DbHelper.DbConn.ExecuteNonQuery(string.Format("update CE_ErpTradeCell set OrderState=6,IsVerifyToSupplier=0 where ctid in ({0}) and OrderState=5 and IsVerifyToSupplier=1", textCtids));
                 returnSuccessMsg("打包成功");
                 return;
             }
@@ -13651,6 +13651,7 @@ namespace SiteCore.Handler
                 lw.Add(string.Format("SupplierId in ({0})", CurrentUser.User.pemVend));
             }
             dStruct.MainWhere = string.Join(" and ", lw.ToArray());
+            dStruct.Order = "createtime desc";
             DataTable dt = WebCache.GetData("view_packCenter", dStruct);
             writeGridDataTableJson(dStruct.TotalCount, dt);
         }

SiteCore/Handler/sync.orderReport.cs

@@ -2186,12 +2186,14 @@ namespace SiteCore.Handler
             dt.Columns.Add(new DataColumn("AllOrder", typeof(string)));
             dt.Columns.Add(new DataColumn("rate", typeof(string)));
             dt.Columns.Add(new DataColumn("rateProp", typeof(string)));
+            dt.Columns.Add(new DataColumn("checkout", typeof(string)));
             DataRow dr_he = dt.NewRow();
             dr_he[0] = "合计";
             dr_he[1] = 0;
             dr_he[2] = 0;
             dr_he[3] = 0;
             dr_he[4] = 100;
+            dr_he[5] = 0;
             foreach (DataRow row in dtafter.Rows)
             {
                 DataRow dr = dt.NewRow();
@@ -2199,6 +2201,7 @@ namespace SiteCore.Handler
                 dr[1] = row["aftersaleOrder"];
                 dr[2] = row["AllOrder"];
                 dr[4] = 0;
+                dr[5] = row["checkout"];
                 decimal rate = 0;
                 if (dr[1].ToString() != "0")
                 {

Web/EAfterSale/IssueContent.aspx

@@ -145,8 +145,8 @@
                 <div field="seller_memo" width="150" align="center" headeralign="center" renderer="memoRenderer">备注</div>
                 <div field="OrderState" width="40" align="center" headeralign="center" renderer="orderStatusRenderer">状态</div>
                 <div field="IsSF" width="50" align="center" headeralign="center" renderer="SFRenderer">是否顺丰</div>
-                <div name="address" width="80" align="center" headeralign="center" renderer="addressRenderer">收货地址</div>
-                <div name="orderscus" width="60" align="center" headeralign="center" renderer="orderCusRenderer">供应商</div>
+                <div field="DeliveryAddress" name="address" width="80" align="center" headeralign="center" renderer="addressRenderer">收货地址</div>
+                <div field="SupplierName" name="orderscus" width="60" align="center" headeralign="center" renderer="orderCusRenderer">供应商</div>
                 <div field="IssueContent" width="60" align="center" headeralign="center">反馈信息</div>
                 <div name="action" width="50" headeralign="center" align="center" renderer="actionRenderer" cellstyle="padding:0;">#</div>
             </div>

Web/EDelivery/js/pddPrintBill.js

@@ -456,9 +456,9 @@ function sendPrintData(iTag) {
     let vend_list = supperIds == null ? [] : supperIds.split(",");
     //console.log("start" + billOrderList.length);
     var item = billOrderList[iTag];
-    let suppiers = ["97", "98", "119", "3"];
+    let suppiers = ["64"];
     let intersection = vend_list.length == 0 ? [] : suppiers.filter(function (v) { return vend_list.indexOf(v) > -1 });
-    if (intersection.length > 0) {
+    if (intersection.length == 0) {
         checkOrderSplit(item, iTag)
     } else {
         if (item.SplitTag.length > 0) {

Web/EDelivery/js/printBill.js

@@ -444,9 +444,9 @@ function sendPrintData(iTag) {
     let vend_list = supperIds == null ? [] : supperIds.split(",");
     //console.log("start" + billOrderList.length);
     var item = billOrderList[iTag];
-    let suppiers = ["97", "98", "119", "3"];
+    let suppiers = ["64"];
     let intersection = vend_list.length == 0 ? [] : suppiers.filter(function (v) { return vend_list.indexOf(v) > -1 });
-    if (intersection.length > 0) {
+    if (intersection.length == 0) {
         checkOrderSplit(item, iTag);
     } else {
         if (item.SplitTag.length > 0) {