zhuyiyi 7 сар өмнө
parent
commit
5e5115f062

+ 1 - 1
SiteCore/Handler/sync.order.cs

@@ -12873,7 +12873,7 @@ namespace SiteCore.Handler
                     string result = designHelper.API_CheckOrderTo(ceErpTradeCellExtend.ctid, ceErpTradeCellExtend.spu_id, ceErpTradeCell.ShopId);
                     ceErpTradeCellExtend.ToType = result;
                     List<int> products = new List<int>() { 4, 13, 19, 24, 28, 32, 40, 51, 57, 1971, 2319, 2377, 2521, 2524, 2533, 2538, 2542, 2554, 2556, 2557, 2559, 2560, 2561, 2562, 2563, 2564, 2565, 2566, 2568, 2569, 2570, 2571, 2572, 2619, 2625, 2634, 2636, 2637, 2638, 2645, 2646 };
-                    List<int> shopIds = new List<int>() { 5, 6, 8, 10, 11, 12, 14, 15, 16, 17, 18, 21, 23, 24, 27, 28, 31, 32, 56, 61, 63, 64, 66, 124, 126, 127, 128 };
+                    List<int> shopIds = new List<int>() { 5, 6, 8, 10, 11, 12, 14, 15, 16, 18, 24, 27, 28, 31, 32, 56, 61 };
                     if (products.Contains(ceErpTradeCell.ProductId) || ceErpTradeCell.seller_memo.IndexOf("手绘") > -1 || ceErpTradeCell.seller_memo.IndexOf("电子稿") > -1 || ceErpTradeCell.isDianziOrder > 0)
                     {
                         ceErpTradeCellExtend.ToType = "外协";

+ 1 - 1
SiteCore/taobao/commonHelper.cs

@@ -2727,7 +2727,7 @@ namespace SiteCore
                         string result = designHelper.API_CheckOrderTo(ceErpTradeCellExtend.ctid, ceErpTradeCellExtend.spu_id, ceErpTradeCell.ShopId);
                         ceErpTradeCellExtend.ToType = result;
                         List<int> products = new List<int>() { 4, 13, 19, 24, 28, 32, 40, 51, 57, 1971, 2319, 2377, 2521, 2524, 2533, 2538, 2542, 2554, 2556, 2557, 2559, 2560, 2561, 2562, 2563, 2564, 2565, 2566, 2568, 2569, 2570, 2571, 2572, 2619, 2625, 2634, 2636, 2637, 2638, 2645, 2646 };
-                        List<int> shopIds = new List<int>() { 5, 6, 8, 10, 11, 12, 14, 15, 16, 17, 18, 21, 23, 24, 27, 28, 31, 32, 56, 61, 63, 64, 66, 124, 126, 127, 128 };
+                        List<int> shopIds = new List<int>() { 5, 6, 8, 10, 11, 12, 14, 15, 16, 18, 24, 27, 28, 31, 32, 56, 61 };
                         if (products.Contains(ceErpTradeCell.ProductId) || ceErpTradeCell.seller_memo.IndexOf("手绘") > -1 || ceErpTradeCell.seller_memo.IndexOf("电子稿") > -1 || ceErpTradeCell.isDianziOrder > 0)
                         {
                             ceErpTradeCellExtend.ToType = "外协";

+ 1 - 1
SiteCore/taobao/preSalesHelper.cs

@@ -1922,7 +1922,7 @@ namespace SiteCore.Handler
                         string result = designHelper.API_CheckOrderTo(ceErpTradeCellExtend.ctid, ceErpTradeCellExtend.spu_id, entity.ShopId);
                         ceErpTradeCellExtend.ToType = result;
                         List<int> products = new List<int>() { 4, 13, 19, 24, 28, 32, 40, 51, 57, 1971, 2319, 2377, 2521, 2524, 2533, 2538, 2542, 2554, 2556, 2557, 2559, 2560, 2561, 2562, 2563, 2564, 2565, 2566, 2568, 2569, 2570, 2571, 2572, 2619, 2625, 2634, 2636, 2637, 2638, 2645, 2646 };
-                        List<int> shopIds = new List<int>() { 5, 6, 8, 10, 11, 12, 14, 15, 16, 17, 18, 21, 23, 24, 27, 28, 31, 32, 56, 61, 63, 64, 66, 124, 126, 127, 128 };
+                        List<int> shopIds = new List<int>() { 5, 6, 8, 10, 11, 12, 14, 15, 16, 18, 24, 27, 28, 31, 32, 56, 61 };
                         if (products.Contains(entity.ProductId) || entity.seller_memo.IndexOf("手绘") > -1 || entity.seller_memo.IndexOf("电子稿") > -1 || entity.isDianziOrder > 0)
                         {
                             ceErpTradeCellExtend.ToType = "外协";

+ 2 - 1
Web/EAfterSale/AllAfterSale.aspx

@@ -72,6 +72,7 @@
             <%--                <div field="ComName" width="120" align="center" headerAlign="center">公司名称</div>--%>
             <div type="checkcolumn" width="20"></div>
             <div field="tid" width="110" align="center" headeralign="center" renderer="orderIdRenderer">订单编号</div>
+            <div field="OrderSn" width="110" visible="false"  align="center" headeralign="center">识别码</div>
             <div field="SplitTag" width="30" visible="false" align="center" headeralign="center">拆分序号</div>
             <div field="pay_time" width="70" align="center" headeralign="center" renderer="orderPTimeRenderer">付款时间</div>
             <div field="seller_nick" visible="false" width="80" align="center" headeralign="center">店铺</div>
@@ -90,7 +91,7 @@
             <div field="OrgName" width="80" align="center" headeralign="center">客服团队</div>
             <div field="DesignOrg" width="80" align="center" headeralign="center">设计团队</div>
             <div field="AfterSaleMethod" width="120" align="center" headeralign="center">解决方案</div>
-            <div field="supplierResponsible" width="120" visible="false" align="center" headeralign="center">车间方案</div>
+            <div field="supplierResponsible" width="120" align="center" headeralign="center">车间方案</div>
             <div field="AfterSaleResponsible" width="60" align="center" headeralign="center" renderer="responsibleRender">责任人</div>
             <div field="AfterSaleSupplierImg" width="30" align="center" headeralign="center" renderer="ImgRenderer">图片</div>
             <div field="OrderState" width="30" align="center" headeralign="center" renderer="orderStatusRenderer">订单状态</div>