edit

SiteCore/Handler/sync.order.cs

@@ -847,7 +847,7 @@ namespace SiteCore.Handler
                     CeErpTradeCellExtend ceErpTradeCellExtend = CeErpTradeCellExtend.getByTid(entity.ctid);
                     if (ceErpTradeCellExtend != null && ceErpTradeCellExtend.orderFrom == 30)
                     {
-                        //dataHelper.api_orderBack(entity.ctid, "0", "");
+                        dataHelper.api_orderBack(entity.ctid, "0", "");
                     }
                     commonHelper.sendSpuData(entity, ceErpTradeCellExtend);
                     apiDesign.API_GetPrintData_ModifyOrder(entity.ctid, memo, ismemoopt, false);
@@ -1382,7 +1382,7 @@ namespace SiteCore.Handler
                     CeErpTradeCellExtend ceErpTradeCellExtend = CeErpTradeCellExtend.getByTid(entity.ctid);
                     if (ceErpTradeCellExtend != null && ceErpTradeCellExtend.orderFrom == 30)
                     {
-                        //dataHelper.api_orderBack(entity.ctid, "0", "");
+                        dataHelper.api_orderBack(entity.ctid, "0", "");
                     }
                     returnSuccessMsg("领单成功！");
                     return;
@@ -5884,6 +5884,7 @@ namespace SiteCore.Handler
                 string cpCode = GetPostString("cpcode"); //"code":"YTO","id":1,"cpCode":"YTO-CAINIAO",
                 string cpName = GetPostString("cpname");
                 string isTogether = GetPostString("together");
+                string printType = GetPostString("printType");
                 //var res_obj = new
                 //{
                 //    restype = 1,
@@ -5903,7 +5904,7 @@ namespace SiteCore.Handler
                         isUseLastWayBillCode = true;
                     }
 
-                    if (entity.OrderState == 7 && "2".Equals(isTogether))
+                    if (entity.OrderState == 7 && "delivering".Equals(printType))
                     {
 
                         ReturnSuccess(JsonConvert.SerializeObject(new { restype = 2, data = "" }));

Web/EDelivery/DeliveredList.aspx

@@ -1,7 +1,7 @@
 <%@ Page Title="" Language="C#" MasterPageFile="~/MasterPage/ErpView.master" AutoEventWireup="true" CodeFile="DeliveredList.aspx.cs" Inherits="EDelivery_DeliveredList" %>
 
 <asp:Content ID="Content1" ContentPlaceHolderID="head" runat="Server">
-    <script type="text/javascript" src="js/printBill.js"></script>
+    <script type="text/javascript" src="js/printBill.js?v=<%=SiteVer %>"></script>
     <script type="text/javascript" src="js/DeliveredList.js?v=<%=SiteVer %>"></script>
 
 </asp:Content>

Web/EDelivery/PddDelivered.aspx

@@ -1,7 +1,7 @@
 <%@ Page Title="" Language="C#" MasterPageFile="~/MasterPage/ErpView.master" AutoEventWireup="true" CodeFile="PddDelivered.aspx.cs" Inherits="EDelivery_PddDelivered" %>
 
 <asp:Content ID="Content1" ContentPlaceHolderID="head" runat="Server">
-    <script type="text/javascript" src="js/pddPrintBill.js"></script>
+    <script type="text/javascript" src="js/pddPrintBill.js?v=<%=SiteVer %>"></script>
     <script type="text/javascript" src="js/PddDelivered.js?v=<%=SiteVer %>"></script>
 
 </asp:Content>

Web/EDelivery/PddDelivering.aspx

@@ -3,7 +3,7 @@
 <asp:Content ID="Content1" ContentPlaceHolderID="head" runat="Server">
         <link href="../css/imgbox.css" rel="stylesheet" />
     <script src="../js/imgbox-1.0.3.js"></script>
-    <script type="text/javascript" src="js/pddPrintBill.js"></script>
+    <script type="text/javascript" src="js/pddPrintBill.js?v=<%=SiteVer %>"></script>
     <script type="text/javascript" src="js/PddDelivering.js?v=<%=SiteVer %>"></script>
 
 </asp:Content>

Web/EDelivery/WaitingDelivery.aspx

@@ -3,7 +3,7 @@
 <asp:Content ID="Content1" ContentPlaceHolderID="head" runat="Server">
     <link href="../css/imgbox.css" rel="stylesheet" />
     <script src="../js/imgbox-1.0.3.js"></script>
-    <script type="text/javascript" src="js/printBill.js"></script>
+    <script type="text/javascript" src="js/printBill.js?v=<%=SiteVer %>"></script>
     <script type="text/javascript" src="js/WaitingDelivery.js?v=<%=SiteVer %>"></script>
 
 </asp:Content>

Web/EDelivery/js/DeliveredList.js

@@ -3,6 +3,7 @@ var edit_id = "";
 var _memo_msg = "";
 var socket = null;
 var userPostCode = "";
+const printType = "delivered";
 function addFn() {
     edit_id = "";
     edit_shop = "";

Web/EDelivery/js/PddDelivered.js

@@ -3,6 +3,7 @@ var edit_id = "";
 var _memo_msg = "";
 var socket = null;
 var userPostCode = "";
+const printType = "delivered";
 function addFn() {
     edit_id = "";
     edit_shop = "";

Web/EDelivery/js/PddDelivering.js

@@ -7,6 +7,7 @@ var memoType = 0;
 var productHourList = [];
 var cdrImgUrl = null;
 var supperIds = null;
+const printType = "delivering";
 function addFn() {
     edit_id = "";
     edit_shop = "";

Web/EDelivery/js/WaitingDelivery.js

@@ -7,6 +7,7 @@ var memoType = 0;
 var productHourList = [];
 var cdrImgUrl = null;
 var supperIds = null;
+const printType = "delivering";
 function addFn() {
     edit_id = "";
     edit_shop = "";

Web/EDelivery/js/pddPrintBill.js

@@ -486,6 +486,7 @@ function doRealGetPrintData(item, iTag, isTogether = 0, ctids = "") {
     parms.cpname = cpname;
     parms.together = isTogether;
     parms.ctids = ctids;
+    parms.printType = printType;
     $("#progressShowDiv").html("电子面单打印中...进度：" + (iTag + 1));
     postAjaxSync("set_erp_printwaybill", parms, function (data) {
         //console.log("back" + billOrderList.length);

Web/EDelivery/js/printBill.js

@@ -474,6 +474,7 @@ function doRealGetPrintData(item, iTag, isTogether = 0, ctids = "") {
     parms.cpname = cpname;
     parms.together = isTogether;
     parms.ctids = ctids;
+    parms.printType = printType;
     $("#progressShowDiv").html("电子面单打印中...进度：" + (iTag + 1));
     postAjaxSync("set_erp_printwaybill", parms, function (data) {
         //console.log("back" + billOrderList.length);