edit

SiteCore/Handler/sync.order.cs

@@ -56,7 +56,7 @@ namespace SiteCore.Handler
 
             string poscode = CurrentUser.UserPost.Post.Code;
             DataStruct dStruct = GetPostStruct();
-            
+
             //apiHelper.Api_SyncOrderByTime("598825");
             //apiHelper.API_GetWaybill("ZTO-CAINIAO-TZJK", "4233447147588233939");
             //apiHelper.Api_SyacOrder("2460143282114312263", "yujia");
@@ -67,7 +67,7 @@ namespace SiteCore.Handler
             //CeErpTradeCell entity = CeErpTradeCell.GetByCtid("2484048723252587257");
             //int sid = commonHelper.autoDistributeToSupplier(entity);
             // string a  = apiHelper.API_GetPrintData("YT8951457355085");
-            //tmcHelper.Api_TmcTradeMsg("{\"content\":{\"businessType\":\"GUARANTEE\",\"buyerMemo\":\"\",\"consolidateType\":\"\",\"createTime\":1743037314000,\"deliveryType\":\"OFFLINE\",\"discountFee\":0.0,\"flag\":\"NONE\",\"latestDeliveryTime\":1743210111000,\"lines\":[{\"mark2\":[],\"num\":2,\"outerId\":\"JSBHUVZYT\",\"payment\":100.0,\"picUrl\":\"https://img.alicdn.com/bao/uploaded/i2/2200806677467/O1CN01FNM4MW251wJNQ0RTV_!!0-item_pic.jpg\",\"platServiceFee\":0.0,\"price\":50.0,\"refOlId\":\"4279817918999398627\",\"refSkuId\":\"0\",\"refSpuId\":\"743796792540\",\"refundStatus\":\"NO_REFUND\",\"sellPrice\":50.0,\"singleFee\":50.0,\"spuOuterId\":\"JSBHUVZYT\",\"standards\":\"\",\"status\":\"NOT_SHIPPED\",\"title\":\"【活动价】镜子贴纸定制婚礼迎宾牌装饰静电贴镜面玻璃窗户字母转印贴画墙贴\",\"totalFee\":100.0,\"totalPrice\":100.0,\"totalSellPrice\":100.0}],\"logisticsOrderNo\":\"\",\"mark2\":[],\"modifyTime\":1743040267000,\"openBuyerId\":\"AAEXRHraABkUZRPgSx1Mbz6h\",\"openBuyerNick\":\"天**\",\"openSellerNick\":\"翊喜旗舰店\",\"orderSource\":\"SYNC\",\"orderTime\":1743037310000,\"payTime\":1743037311000,\"payment\":100.0,\"platServiceFee\":0.0,\"posCode\":\"yixi\",\"posId\":598788,\"postFee\":0.0,\"props\":{\"payType\":\"ALI_PAY\",\"govSubsidyAmount\":0},\"receivedPayment\":0.0,\"receiverCity\":\"齐齐哈尔市\",\"receiverCountry\":\"中国\",\"receiverDistrict\":\"建华区\",\"receiverId\":\"82f9bfecd2ef7df766b42edd73faa2f3$\",\"receiverState\":\"黑龙江省\",\"receiverTown\":\"文化街道\",\"refOid\":\"4279817918999398627\",\"refType\":\"TMALL\",\"refundStatus\":\"NO_REFUND\",\"sellerMemo\":\"500x640mm-1张-uv静电膜-模切-单面印刷-天意5516-昕昕-50，580x585mm-1张-uv静电膜-模切-单面印刷-天意5516-昕昕-50\",\"serviceFee\":0.0,\"status\":\"NOT_SHIPPED\",\"totalFee\":100.0,\"totalPrice\":100.0,\"totalSellPrice\":100.0,\"type\":\"SALE\"}}");
+            //tmcHelper.Api_TmcTradeMsg("{\"content\":{\"businessType\":\"GUARANTEE\",\"buyerMemo\":\"\",\"consolidateType\":\"\",\"createTime\":1744213772000,\"deliveryType\":\"OFFLINE\",\"discountFee\":0.0,\"flag\":\"NONE\",\"latestDeliveryTime\":1744818568000,\"lines\":[{\"mark2\":[],\"num\":1,\"outerId\":\"\",\"payment\":270.0,\"picUrl\":\"https://img.alicdn.com/bao/uploaded/i2/2214103531955/O1CN01DdUiJW1QJRIWIiuyV_!!0-item_pic.jpg\",\"platServiceFee\":0.0,\"price\":30.0,\"refOlId\":\"4295347347682697938\",\"refSkuId\":\"0\",\"refSpuId\":\"795632307774\",\"refundStatus\":\"NO_REFUND\",\"sellPrice\":30.0,\"singleFee\":270.0,\"spuOuterId\":\"\",\"standards\":\"\",\"status\":\"NOT_SHIPPED\",\"title\":\"【优惠价】纸质书签定制古风可手写硬卡纸制作来图定做创意卡片打印logo高档异形卡书法古典标签小卡印刷中国风文创设计\",\"totalFee\":270.0,\"totalPrice\":30.0,\"totalSellPrice\":30.0}],\"logisticsOrderNo\":\"\",\"mark2\":[],\"modifyTime\":1744213828000,\"openBuyerId\":\"AAHnRHraABkUZRPgSx30RW3E\",\"openBuyerNick\":\"s**\",\"openSellerNick\":\"福同鑫旗舰店\",\"orderSource\":\"SYNC\",\"orderTime\":1744212346000,\"payTime\":1744213768000,\"payment\":270.0,\"platServiceFee\":0.0,\"posCode\":\"futongxin\",\"posId\":613307,\"postFee\":240.0,\"props\":{\"payType\":\"ALI_PAY\",\"govSubsidyAmount\":0},\"receivedPayment\":0.0,\"receiverCity\":\"成都市\",\"receiverCountry\":\"中国\",\"receiverDistrict\":\"成华区\",\"receiverId\":\"d3709f8bce7faa8f6cc4587ff26feb66$\",\"receiverState\":\"四川省\",\"receiverTown\":\"猛追湾街道\",\"refOid\":\"4295347347682697938\",\"refType\":\"TMALL\",\"refundStatus\":\"NO_REFUND\",\"sellerMemo\":\"40x110mm-1000张-卡片-300克铜板纸-双面印刷覆哑膜直角裁切-summer67821-条条-打孔配流苏\",\"serviceFee\":0.0,\"status\":\"NOT_SHIPPED\",\"totalFee\":270.0,\"totalPrice\":30.0,\"totalSellPrice\":30.0,\"type\":\"SALE\"}}");
             //refundTmcHelper.Api_TmcRefundMsg("{\"content\":{\"afterStatus\":\"SUCCESS\",\"createTime\":1735287446000,\"desc\":\"\",\"interceptInvestor\":\"NONE\",\"interceptStatus\":\"NONE\",\"interceptType\":\"NONE\",\"lines\":[{\"num\":2,\"outerId\":\"\",\"price\":50.0,\"refAid\":\"313001208133750610\",\"refAlId\":\"313001208133750610\",\"refBoughtSkuId\":\"\",\"refOid\":\"4181722704291751006\",\"refOlId\":\"4181722704291751006\",\"refSkuId\":\"0\",\"refSpuId\":\"865893808768\",\"refundFee\":98.86,\"refundStatus\":\"SUCCESS\",\"title\":\"新年会抽奖券定制2025蛇年公司活动正副可撕代金券打印纪念票根奖品兑换尾牙晚宴邀请卡号码牌创意入场券设计\",\"totalFee\":98.86,\"type\":1}],\"logisticsCompany\":\"\",\"logisticsOrderNo\":\"\",\"mark2\":[],\"openBuyerNick\":\"0**\",\"openSellerNick\":\"万慕办公旗舰店\",\"posCode\":\"wanmu\",\"posId\":598798,\"reason\":\"订单信息拍错（规格/尺码/颜色等）\",\"receiverCity\":\"\",\"receiverCountry\":\"中国\",\"receiverDistrict\":\"\",\"receiverId\":\"\",\"receiverState\":\"\",\"receiverTown\":\"\",\"receiverZip\":\"\",\"refAid\":\"313001208133750610\",\"refOid\":\"4181722704291751006\",\"refPlatform\":\"TB\",\"refType\":\"TMALL\",\"refundCreateTime\":1735287358000,\"refundFee\":\"98.86\",\"refundPhase\":\"ON_SALE\",\"refundTime\":1735289443000,\"refundUpdateTime\":1735289443000,\"refundVersion\":1735287358100,\"senderAddress\":\"\",\"senderCity\":\"\",\"senderCountry\":\"中国\",\"senderDistrict\":\"\",\"senderMobile\":\"\",\"senderName\":\"\",\"senderPhone\":\"\",\"senderState\":\"\",\"senderTown\":\"\",\"senderZip\":\"\",\"status\":\"SUCCESS\",\"statusCode\":\"SUCCESS\",\"statusName\":\"退款成功\",\"totalFee\":\"98.86\",\"type\":\"REFUND\",\"updateTime\":1735289479000}}");
             List<string> lw = new List<string>();
             string tid = GetPostString("ctid");
@@ -2959,16 +2959,19 @@ namespace SiteCore.Handler
             string sellermemo = GetPostString("seller_memo");
             if (sellermemo.Length > 0) lw.Add(string.Format("seller_memo like '%{0}%'", sellermemo));
             lw.Add(string.Format("OrderState >= 3 and OrderState <= 5"));
-            if (CurrentUser.User.TeamIds.Length > 0)
+            if (CurrentUser.UserPost.Post.Code != "SysAdmin")
             {
-                if (CurrentUser.UserPost.Post.Code == "Place" || CurrentUser.UserPost.Post.Code == "PlaceMr")
-                    lw.Add(string.Format("(DesignUserId = {0} or DesignUserId in ({1})   )", CurrentUser.UserID, CurrentUser.User.TeamIds));
+                if (CurrentUser.User.TeamIds.Length > 0)
+                {
+                    if (CurrentUser.UserPost.Post.Code == "Place" || CurrentUser.UserPost.Post.Code == "PlaceMr")
+                        lw.Add(string.Format("(DesignUserId = {0} or DesignUserId in ({1})   )", CurrentUser.UserID, CurrentUser.User.TeamIds));
+                    else
+                        lw.Add(string.Format("(DesignUserId = {0} or ((IsReturn>0 or MemoOpt>0) and DesignUserId in ({1})))", CurrentUser.UserID, CurrentUser.User.TeamIds));
+                }
                 else
-                    lw.Add(string.Format("(DesignUserId = {0} or ((IsReturn>0 or MemoOpt>0) and DesignUserId in ({1})))", CurrentUser.UserID, CurrentUser.User.TeamIds));
-            }
-            else
-            {
-                lw.Add(string.Format("DesignUserId = {0} ", CurrentUser.UserID));
+                {
+                    lw.Add(string.Format("DesignUserId = {0} ", CurrentUser.UserID));
+                }
             }
 
             if (tid.Length <= 0)
@@ -5716,6 +5719,12 @@ namespace SiteCore.Handler
                         isUseLastWayBillCode = true;
                     }
 
+                    if (entity.OrderState == 7 && "2".Equals(isTogether))
+                    {
+
+                        ReturnSuccess(JsonConvert.SerializeObject(new { restype = 2, data = "" }));
+                        return;
+                    }
 
                     if (entity.IsSF > 0 && cpCode.IndexOf("SF") == -1)
                     {
@@ -5918,11 +5927,14 @@ namespace SiteCore.Handler
                             LogHelper.addLog(ctid, CurrentUser.UserID, "发货成功-" + cpCode + "-" + curUseWayBillCode);
                             //CeErpDataSendOrderInfo.createObject(entity.ctid);
                             CeErpDeliverMark ceErpDeliverMark = CeErpDeliverMark.GetByCtid(ctid);
-                            if (isTogether == "1" && ceErpDeliverMark == null)
+                            if (!string.IsNullOrEmpty(isTogether))
                             {
-                                StringBuilder sqlsb = new StringBuilder();
-                                sqlsb.AppendFormat("update ce_erptradecell with(rowlock) set OrderState=7,OutSid='{2}' where tid='{0}' and OrderState=6 and SupplierId={1}", entity.tid, entity.SupplierId, curUseWayBillCode);
-                                DbHelper.DbConn.ExecuteNonQuery(sqlsb.ToString());
+                                if (Convert.ToInt32(isTogether) > 0 && ceErpDeliverMark == null)
+                                {
+                                    StringBuilder sqlsb = new StringBuilder();
+                                    sqlsb.AppendFormat("update ce_erptradecell with(rowlock) set OrderState=7,OutSid='{2}' where tid='{0}' and OrderState=6 and SupplierId={1}", entity.tid, entity.SupplierId, curUseWayBillCode);
+                                    DbHelper.DbConn.ExecuteNonQuery(sqlsb.ToString());
+                                }
                             }
                             if (ceErpDeliverMark != null)
                             {
@@ -5974,11 +5986,14 @@ namespace SiteCore.Handler
                             commonHelper.sendCytExpress(exinfo);
                         }
                         CeErpDeliverMark ceErpDeliverMark = CeErpDeliverMark.GetByCtid(ctid);
-                        if (isTogether == "1" && ceErpDeliverMark == null)
+                        if (!string.IsNullOrEmpty(isTogether))
                         {
-                            StringBuilder sqlsb = new StringBuilder();
-                            sqlsb.AppendFormat("update ce_erptradecell with(rowlock) set OrderState=7,OutSid='{2}' where tid='{0}' and OrderState=6 and SupplierId={1}", entity.tid, entity.SupplierId, curUseWayBillCode);
-                            DbHelper.DbConn.ExecuteNonQuery(sqlsb.ToString());
+                            if (Convert.ToInt32(isTogether) > 0 && ceErpDeliverMark == null)
+                            {
+                                StringBuilder sqlsb = new StringBuilder();
+                                sqlsb.AppendFormat("update ce_erptradecell with(rowlock) set OrderState=7,OutSid='{2}' where tid='{0}' and OrderState=6 and SupplierId={1}", entity.tid, entity.SupplierId, curUseWayBillCode);
+                                DbHelper.DbConn.ExecuteNonQuery(sqlsb.ToString());
+                            }
                         }
                         if (ceErpDeliverMark != null)
                         {
@@ -12915,30 +12930,35 @@ namespace SiteCore.Handler
                 CeErpTradeCell entity = CeErpTradeCell.GetByCtid(eid);
                 if (entity != null)
                 {
+                    if (entity.OrderState > 6)
+                    {
+                        ReturnSuccess("{" + string.Format("\"data\":{0}", Utils.Serialization.JsonString.DataTable2MiniAjaxJson(new DataTable())) + "}");
+                        return;
+                    }
                     StringBuilder sql = new StringBuilder();
                     sql.AppendFormat("select * from ce_erptradecell where SupplierId={0} and orderstate=6 and tid='{1}';", entity.SupplierId, entity.tid);
                     DataTable dt = DbHelper.DbConn.ExecuteDataset(sql.ToString()).Tables[0];
                     List<string> ids = new List<string>();
                     if (dt != null && dt.Rows.Count > 1)
                     {
-                        bool needhe = false;
+                        bool needhe = true;
                         foreach (DataRow dr in dt.Rows)
                         {
                             ids.Add("'" + dr["ctid"] + "'");
-                            //备注有合包
-                            if (dr["seller_memo"].ToString().IndexOf("合包") > -1)
-                            {
-                                needhe = true;
-                            }
-                            if (dr["OtherMemo"].ToString().IndexOf("合包") > -1)
-                            {
-                                needhe = true;
-                            }
-                            //顺丰快递
-                            if (Convert.ToInt32(dr["IsSF"]) > 0)
-                            {
-                                needhe = true;
-                            }
+                            /* //备注有合包
+                             if (dr["seller_memo"].ToString().IndexOf("合包") > -1)
+                             {
+                                 needhe = true;
+                             }
+                             if (dr["OtherMemo"].ToString().IndexOf("合包") > -1)
+                             {
+                                 needhe = true;
+                             }
+                             //顺丰快递
+                             if (Convert.ToInt32(dr["IsSF"]) > 0)
+                             {
+                                 needhe = true;
+                             }*/
                         }
                         if (!needhe)
                         {
@@ -12969,10 +12989,12 @@ namespace SiteCore.Handler
                                 dr["dstate"] = 1;
                             }
                         }
-
+                        ReturnSuccess("{" + string.Format("\"data\":{0}", Utils.Serialization.JsonString.DataTable2MiniAjaxJson(dt)) + "}");
+                        return;
                     }
-                    ReturnSuccess("{" + string.Format("\"data\":{0}", Utils.Serialization.JsonString.DataTable2MiniAjaxJson(dt)) + "}");
+                    ReturnSuccess("{" + string.Format("\"data\":{0}", Utils.Serialization.JsonString.DataTable2MiniAjaxJson(new DataTable())) + "}");
                     return;
+
                 }
                 returnErrorMsg("未找到订单");
                 return;

SiteCore/taobao/commonHelper.cs

@@ -1879,7 +1879,8 @@ namespace SiteCore
             return new designApiResponseVo(-1, check_info);
         }
         static List<int> products = new List<int>() { 29, 2489, 2517, 2518, 2519, 2520, 2533, 2534, 2558, 2576, 2577, 2578, 2579, 2580, 2581, 2582, 2583, 2584, 2587, 2588, 2589, 2590, 2591, 2592, 2593, 2594, 2595, 2596, 2597, 2598, 2599, 2600, 2601, 2602, 2603, 2604, 2605, 2606, 2607, 2608, 2609, 2610, 2611, 2612, 2613, 2614, 2615, 2616, 2617, 2618, 2619, 2620, 2621, 2622, 2634, 2644, 2645, 2646, 2648, 2649, 2650 };
-        static List<int> shops = new List<int>() { 2, 77, 121, 122, 65, 87, 26, 45, 17, 21, 52, 54, 103, 107, 108, 109, 118, 63, 64, 66, 49, 67, 105, 35, 57, 29, 53, 62 };
+        static List<int> shops = new List<int>() { 2, 77, 121, 122, 65, 87, 26, 45, 17, 21, 52, 54, 103, 107, 108, 109, 118, 63, 64, 66, 49, 67, 105, 35, 57, 29, 53, 62, 134 };
+        static List<int> no_design_shops = new List<int>() { 134 };
         public static designApiResponseVo checkOrderDesignInfo(CeErpTradeCell ceErpTradeCell, string post = "", DataTable dt = null)
         {
             if (ceErpTradeCell.DispatchSort == 2)
@@ -1915,7 +1916,7 @@ namespace SiteCore
                 {
                     drop = false;
                 }
-                if (!drop)
+                if (!drop && no_design_shops.IndexOf(ceErpTradeCell.ShopId) == -1)
                 {
                     CeErpDesignInfo ceErpDesignInfo = CeErpDesignInfo.GetByShopDesign(3542, ceErpTradeCell.ShopId, ceErpTradeCell.ProductId);
 

SiteCore/taobao/tmcHelper.cs

@@ -390,7 +390,7 @@ namespace SiteCore
 
         static List<string> postcodes = new List<string>()
         {
-           "yujia","taolai","zhufan","dingyi","lingtao","yangguangmao","xinkeli","yuejia","maiyu","xiyinshuo","hanghe","midier"
+           "yujia","taolai","zhufan","dingyi","lingtao","yangguangmao","xinkeli","yuejia","maiyu","xiyinshuo"
         };
 
         public static void Api_TmcTradeMsg(string res)
@@ -998,7 +998,7 @@ namespace SiteCore
                                 entity.IsOldCustomer = 1;
                                 if (oldRes == 2) entity.IsOldCustomerMore = 1;
                             }
-
+                            CeErpTradeCellExtend.createInfo(entity.ctid, 10, 10);
                         }
                         //if (trade != null)
                         //{
@@ -2444,10 +2444,6 @@ namespace SiteCore
                     entity.OrderSn = orderSn;
                 }
             }
-            else
-            {
-                entity.OrderSn = ctid;
-            }
             entity.UpdateTime = DateTime.Now;
             entity.tid = father.tid;
             entity.SplitTag = splitTag;
@@ -2621,10 +2617,6 @@ namespace SiteCore
                     entity.OrderSn = orderSn;
                 }
             }
-            else
-            {
-                entity.OrderSn = ctid;
-            }
             entity.UpdateTime = DateTime.Now;
             entity.tid = father.tid;
             entity.SplitTag = splitTag;
@@ -2983,10 +2975,7 @@ namespace SiteCore
                     entity.OrderSn = orderSn;
                 }
             }
-            else
-            {
-                entity.OrderSn = ctid;
-            }
+
             entity.UpdateTime = DateTime.Now;
             entity.tid = father.tid;
             entity.SplitTag = splitTag;

Web/EDelivery/DeliveredList.aspx.cs

@@ -60,6 +60,7 @@ public partial class EDelivery_DeliveredList : BasePage
             AppendScript("printPageUrl='" + webConfig.SiteUrl + "';");
             AppendScript("userPostCode='" + CurrentUser.UserPost.Post.Code + "';");
             AppendScript("cdrImgUrl='" + webConfig.ltFileSiteUrl + "/d/ws';");
+            AppendScript("supperIds='" + CurrentUser.User.pemVend + "';");
             //StringBuilder sql = new StringBuilder();
             //sql.AppendFormat("select * from s_runinfotype");
             //DataSet ds = DbHelper.DbConn.ExecuteDataset(sql.ToString());

Web/EDelivery/DeliveryUnusual.aspx

@@ -22,7 +22,7 @@
                 <div type="indexcolumn" width="20"></div>
                 <div type="checkcolumn" width="20"></div>
                 <div field="tid" width="100" align="center" headeralign="center">订单编号</div>
-                <div name="orderptime" width="90" align="center" headeralign="center" renderer="orderPTimeRenderer">付款时间</div>
+                <div field="pay_time" name="orderptime" width="90" align="center" headeralign="center" renderer="orderPTimeRenderer">付款时间</div>
                 <%--<div name="buyermobile" width="80" align="center" headeralign="center" renderer="buyerMobileRenderer">客户</div>--%>
                 <div field="FinishPlaceTime" name="overtime" width="90" align="center" headeralign="center" renderer="overTimeRenderer">下单时间</div>
                 <%--<div field="payment" id="id_payment"  runat="server" visible="false" width="40" align="center" headeralign="center">金额</div>--%>

Web/EDelivery/PddDelivered.aspx.cs

@@ -60,6 +60,7 @@ public partial class EDelivery_PddDelivered : BasePage
             AppendScript("printPageUrl='" + webConfig.SiteUrl + "';");
             AppendScript("userPostCode='" + CurrentUser.UserPost.Post.Code + "';");
             AppendScript("cdrImgUrl='" + webConfig.ltFileSiteUrl + "/d/ws';");
+            AppendScript("supperIds='" + CurrentUser.User.pemVend + "';");
             //StringBuilder sql = new StringBuilder();
             //sql.AppendFormat("select * from s_runinfotype");
             //DataSet ds = DbHelper.DbConn.ExecuteDataset(sql.ToString());

Web/EDelivery/js/pddPrintBill.js

@@ -449,10 +449,12 @@ function sendPrintData(iTag) {
         //mini.get("id_sysWaybillBtn").enable();
         return;
     }
+    let vend_list = supperIds == null ? [] : supperIds.split(",");
     //console.log("start" + billOrderList.length);
     var item = billOrderList[iTag];
-    let vend_list = supperIds == null ? [] : supperIds.split(",");
-    if (vend_list.indexOf("97") > -1) {
+    let suppiers = ["97", "98"];
+    let intersection = vend_list.length == 0 ? [] : suppiers.filter(function (v) { return vend_list.indexOf(v) > -1 });
+    if (intersection.length > 0) {
         checkOrderSplit(item, iTag)
     } else {
         if (item.SplitTag.length > 0) {
@@ -488,7 +490,7 @@ function doRealGetPrintData(item, iTag, isTogether = 0) {
             errorMsg += data.data;
             errorMsg += ",";
         }
-        else {
+        else if (data.restype == 1) {
             if (cpcode == "SFFQ-LY") {
                 doPrintSF(data, item.seller_memo);
             }
@@ -626,7 +628,7 @@ function checkOrderSplit(item, iTag) {
                     callback: function (action) {
 
                         if (action == "合并打单") {
-                            doRealGetPrintData(item, iTag, 1);
+                            doRealGetPrintData(item, iTag, 2);
                         }
                         else if (action == "取消打印") {
                             mini.get("id_saveWaybillBtn").enable();

Web/EDelivery/js/printBill.js

@@ -440,7 +440,9 @@ function sendPrintData(iTag) {
     let vend_list = supperIds == null ? [] : supperIds.split(",");
     //console.log("start" + billOrderList.length);
     var item = billOrderList[iTag];
-    if (vend_list.indexOf("97") > -1) {
+    let suppiers = ["97", "98"];
+    let intersection = vend_list.length == 0 ? [] : suppiers.filter(function (v) { return vend_list.indexOf(v) > -1 });
+    if (intersection.length > 0) {
         checkOrderSplit(item, iTag);
     } else {
         if (item.SplitTag.length > 0) {
@@ -476,12 +478,13 @@ function doRealGetPrintData(item, iTag, isTogether = 0) {
             errorMsg += data.data;
             errorMsg += ",\n";
         }
-        else {
+        else if (data.restype == 1) {
             if (cpcode == "SFFQ-LY") {
                 doPrintSF(data, item.seller_memo);
             }
-            else
+            else {
                 doPrintEn(data.data, item.seller_memo);
+            }
         }
 
 
@@ -614,7 +617,7 @@ function checkOrderSplit(item, iTag) {
                     callback: function (action) {
 
                         if (action == "合并打单") {
-                            doRealGetPrintData(item, iTag, 1);
+                            doRealGetPrintData(item, iTag, 2);
                         }
                         else if (action == "取消打印") {
                             mini.get("id_saveWaybillBtn").enable();

Web/js/view.ex.js

@@ -475,7 +475,7 @@ function copyText(obj) {
     var div = obj;
     var rec = grid.getSelected();
     let text = div.innerText;
-    div.innerText = text + "《" + rec.ctid + "》";
+    div.innerText = text + "《" + rec.ctid + "-" + rec.seller_nick + "》";
     if (document.body.createTextRange) {
         var range = document.body.createTextRange();
         range.moveToElementText(div);