edit

SiteCore/Handler/sync.order.cs

@@ -57,6 +57,7 @@ namespace SiteCore.Handler
 
             string poscode = CurrentUser.UserPost.Post.Code;
             DataStruct dStruct = GetPostStruct();
+            //jiemiUtils.ossFileDecrypt("C:\\Users\\231010\\Downloads\\CE_ErpProduct(1).xlsx");
             //apiHelper.Api_SyncOrderByTime("598825");
             //apiHelper.API_GetWaybill("ZTO-CAINIAO-TZJK", "4233447147588233939");
             //apiHelper.Api_SyacOrder("2460143282114312263", "yujia");
@@ -12842,7 +12843,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>() { 13, 2524, 2557, 4, 2554, 57, 19 };
+                    List<int> products = new List<int>() { 4, 13, 19, 24, 32, 57, 1971, 2319, 2377, 2521, 2533, 2554, 2556, 2557, 2558, 2559, 2560, 2561, 2562, 2563, 2564, 2565, 2566, 2571, 2572, 2619, 2634, 2636, 2637, 2638, 2645, 2646 };
 
                     if (products.Contains(ceErpTradeCell.ProductId) || ceErpTradeCell.seller_memo.IndexOf("手绘") > -1 || ceErpTradeCell.seller_memo.IndexOf("电子稿") > -1 || ceErpTradeCell.isDianziOrder > 0)
                     {
@@ -13356,6 +13357,22 @@ namespace SiteCore.Handler
             }
         }
 
+        public void aftersaleCytSend()
+        {
+            string ctid = GetPostString("ctid");
+            if (!string.IsNullOrEmpty(ctid))
+            {
+                CeErpTradeCell ceErpTradeCell = CeErpTradeCell.GetByCtid(ctid);
+                if (ceErpTradeCell != null)
+                {
+                    commonHelper.sendCytAfterSale(ceErpTradeCell);
+                }
+                returnSuccessMsg("推送成功");
+                return;
+            }
+            returnErrorMsg("缺少必要的参数");
+        }
+
         public void packOrderInfo()
         {
             string ctids = GetPostString("ctids");
@@ -13410,6 +13427,25 @@ namespace SiteCore.Handler
             }
             returnErrorMsg("缺少必要的参数");
         }
+
+        public void get_pack_list()
+        {
+            DataStruct dStruct = GetPostStruct();
+            List<string> lw = new List<string>();
+
+            string supplier = GetPostString("supplier");
+            if (supplier.Length > 0) lw.Add(string.Format("SupplierName = '{0}'", supplier));
+
+
+            string posTag = CurrentUser.UserPost.Post.Code;
+            if (posTag == "Supplier")
+            {
+                lw.Add(string.Format("SupplierId in ({0})", CurrentUser.User.pemVend));
+            }
+            dStruct.MainWhere = string.Join(" and ", lw.ToArray());
+            DataTable dt = WebCache.GetData("view_packCenter", dStruct);
+            writeGridDataTableJson(dStruct.TotalCount, dt);
+        }
     }
 
 }

SiteCore/taobao/commonHelper.cs

@@ -2112,6 +2112,7 @@ namespace SiteCore
                                 { "Userid",cytUserId },
                                 //{ "pwd", "lt666888" },
                                 { "LTOrderId", entity.ctid },
+                                { "IdCode", entity.OrderSn },
                                 { "RefundType", refund_type },
                                 { "ReprintReasons", after },
                                 { "ReasonsImgUrls", entity.AfterSaleSupplierImg },
@@ -2719,7 +2720,7 @@ namespace SiteCore
                         CeErpTradeCell ceErpTradeCell = CeErpTradeCell.GetByCtid(ceErpTradeCellExtend.ctid);
                         string result = designHelper.API_CheckOrderTo(ceErpTradeCellExtend.ctid, ceErpTradeCellExtend.spu_id, ceErpTradeCell.ShopId);
                         ceErpTradeCellExtend.ToType = result;
-                        List<int> products = new List<int>() { 13, 2524, 2557, 4, 2554, 57, 19 };
+                        List<int> products = new List<int>() { 4, 13, 19, 24, 32, 57, 1971, 2319, 2377, 2521, 2533, 2554, 2556, 2557, 2558, 2559, 2560, 2561, 2562, 2563, 2564, 2565, 2566, 2571, 2572, 2619, 2634, 2636, 2637, 2638, 2645, 2646 };
 
                         if (products.Contains(ceErpTradeCell.ProductId) || ceErpTradeCell.seller_memo.IndexOf("手绘") > -1 || ceErpTradeCell.seller_memo.IndexOf("电子稿") > -1 || ceErpTradeCell.isDianziOrder > 0)
                         {

SiteCore/taobao/preSalesHelper.cs

@@ -1917,7 +1917,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>() { 13, 2524, 2557, 4, 2554, 57, 19 };
+                        List<int> products = new List<int>() { 4, 13, 19, 24, 32, 57, 1971, 2319, 2377, 2521, 2533, 2554, 2556, 2557, 2558, 2559, 2560, 2561, 2562, 2563, 2564, 2565, 2566, 2571, 2572, 2619, 2634, 2636, 2637, 2638, 2645, 2646 };
 
                         if (products.Contains(entity.ProductId) || entity.seller_memo.IndexOf("手绘") > -1 || entity.seller_memo.IndexOf("电子稿") > -1 || entity.isDianziOrder > 0)
                         {

Web/EDelivery/PackCenter.aspx

@@ -9,8 +9,7 @@
             var data = form.getData(true, false);
             var s = data;
             grid.load({
-                ctid: s.tid, shopname: s.shop, buyer_nick: s.ww, orderState: s.state, order_area: s.order_area, address: s.address,
-                placedate1: s.placedate1, placedate2: s.placedate2, seller_memo: s.memo, supplier: s.supplier, unusualcon: s.unusualcon
+                supplier: s.supplier
             });
         }
         //清除查询内容
@@ -24,155 +23,54 @@
             var tid = record.tid;
             var rowIndex = e.rowIndex;
             var html = "<div style=\"display:flex;flex-direction:column;\">";
-            if (userPostCode != "Supplier") {
-                html += ("<div>" + record.seller_nick + "</div>");
-                html += getWWurlByNick(record.buyer_nick);
-            }
-
-            html += ("<div>" + formatCommonDate(record.pay_time) + "</div>");
-            html += "</div>";
-            return html;
-        }
-        function preDeliveryTime(e) {
-            var record = e.record;
-            var html = "<div style=\"display:flex;flex-direction:column;\">";
-            var addHour = getHourByOrder(record);
-            var day = parseInt(addHour / 24);
-            var dTime = getNextDateByDate(record.FinishPlaceTime, day);
-            var curTime = new Date();
-            if (comptime(curTime, dTime)) {
-                html += ("<div style='color:red;'>" + dTime + "</div>");
-            }
-            else
-                html += ("<div>" + dTime + "</div>");
-            html += "</div>";
-            return html;
-        }
-        function addressRenderer(e) {
-            var grid = e.sender;
-            var record = e.record;
-            var tid = record.tid;
-            var rowIndex = e.rowIndex;
-            var html = "<div>" + record.receiver_name + "  " + record.receiver_mobile + "  " + record.receiver_state + record.receiver_city + record.receiver_district + record.receiver_address + "</div>";
-            return html;
-        }
-        function orderCusRenderer(e) {
-            var grid = e.sender;
-            var record = e.record;
-            var ctid = record.ctid;
-            var rowIndex = e.rowIndex;
-            var html = "<div style=\"display:flex;flex-direction:column;align-items:center;\">";
-            html += ("<a style='color:#0090FF;'>供应商：" + record.SupplierName + "</a>");
-            //if (record.MemoOpt == 3) {
-            //    html += ("<a style=\"width:40px;color:red;border:1px solid red;\" onclick=\"clickResetOptFn()\">查货</a>");
-            //}
+            html += ("<div>" + formatCommonDate(record.createtime) + "</div>");
             html += "</div>";
             return html;
         }
-        function orderStatusRenderer(e) {
-            var grid = e.sender;
-            var record = e.record;
-            var tid = record.tid;
-            var rowIndex = e.rowIndex;
-            var statestr = getOrderStatestrByState(record.OrderState);
-            var html = "<div style=\"display:flex;flex-direction:column;\">";
-            html += ("<div onclick=\"clickToLog('" + record.ctid + "')\" style=\"color:blue;margin-bottom:10px;\">" + statestr + "</div>");
-            var taostatus = getInitStatusstrByState(record.status);
-            html += ("<div>" + taostatus + "</div>");
-            html += "</div>";
-            return html;
-        }
-        function getHourByOrder(order) {
-            var uHour = 48;
-            var useTag = 0;
-            for (var item in productHourList) {
-                if (item.ProductID == order.ProductId && useTag <= 1) {
-                    useTag = 1;
-                    uHour = item.fhTime;
-                    if ((item.Material.length > 0 && order.Material.indexOf(item.Material) != -1) || (item.Craft.length > 0 && order.Craft.indexOf(item.Craft) != -1)) {
-                        uHour = item.fhTime;
-                        useTag = 2;
-                    }
-                }
-            }
-
-            return parseInt(uHour);
-        }
-        function SFRenderer(e) {
+        function supStateRenderer(e) {
             var record = e.record;
             var html = "<div style=\"display:flex;flex-direction:column;\">";
-            if (record.IsSF == 1) {
-                html += ("<div style=\"color:blue;\"> 顺丰寄付 </div>");
+            if (record.upStatus == 0) {
+                html += ("<div style=\"color:blue;\"> 待打包 </div>");
             }
-            else if (record.IsSF == 2) {
-                html += ("<div style=\"color:green;\"> 顺丰到付 </div>");
+            if (record.upStatus == 1) {
+                html += ("<div style=\"color:blue;\"> 打包中 </div>");
+            } if (record.upStatus == 2) {
+                html += ("<div style=\"color:blue;\"> 打包完成 </div>");
+            } if (record.upStatus == 3) {
+                html += ("<div style=\"color:blue;\"> 打包失败 </div>");
+            } if (record.upStatus == 4) {
+                html += ("<div style=\"color:blue;\"> 取消 </div>");
             }
 
             html += "</div>";
             return html;
         }
-
-        function supStateRenderer(e) {
+        function actionRenderer(e) {
             var record = e.record;
-            var html = "<div style=\"display:flex;flex-direction:column;\">";
-            if (record.SupState == 1) {
-                html += ("<div style=\"color:blue;\"> 已生产 </div>");
+            var html = "";
+            if (!!record.fileUrl) {
+                html += getGridBtn("notify1", "下载", "downUrl('" + id + "')");
             }
-            else {
-                html += ("<div style=\"color:green;\"> 未生产 </div>");
-            }
-
-            html += "</div>";
             return html;
         }
-        window.onload = function () {
-            $("#qr_code").keydown(function (event) {
-                if (event.keyCode == 13) {
-                    let value = $("#qr_code").val();
-                    if (value.length > 0) {
-                        $("#qr_code").val("");
-                        let parms = { "ctid": value };
-                        postAjax("change_erp_sup_state", parms, function (data) {
-                            let tid = data?.tid;
-                            if (tid) {
-                                grid.load({
-                                    ctid: tid
-                                });
-                            }
-                        })
-                    }
-                }
-            })
-        }
     </script>
 </asp:Content>
 <asp:Content ID="Content2" ContentPlaceHolderID="btn" runat="Server">
-    <div style="display: flex; align-items: center">
-        <label>扫码枪单号：</label>
-        <span class="mini-textbox-border">
-            <input id="qr_code" class="mini-textbox-input" />
-        </span>
-    </div>
 </asp:Content>
 <asp:Content ID="Content4" ContentPlaceHolderID="content" runat="Server">
     <div class="mini-fit">
-        <div id="m_grid" class="mini-datagrid" style="width: 98%;" contextmenu="#gridMenu" showemptytext="true" emptytext="暂无记录" url="../handler/sync.ashx?t=get_erp_yield_list">
+        <div id="m_grid" class="mini-datagrid" style="width: 98%;" contextmenu="#gridMenu" showemptytext="true" emptytext="暂无记录" url="../handler/sync.ashx?t=get_pack_list">
             <div property="columns">
                 <div type="checkcolumn" width="20"></div>
-                <div name="orderid" width="110" align="center" headeralign="center" renderer="orderIdRenderer">订单编号</div>
-                <div name="orderptime" width="80" align="center" headeralign="center" renderer="orderPTimeRenderer">付款时间</div>
-                <div field="IsSF" width="50" align="center" headeralign="center" renderer="SFRenderer">是否顺丰</div>
-                <div field="seller_memo" width="200" align="center" headeralign="center" renderer="memoRenderer">备注</div>
-                <div field="OtherMemo" id="id_othermemo" runat="server" visible="false" width="80" align="center" headeralign="center">额外备注</div>
-                <div field="FinishPlaceTime" width="60" dateformat="yyyy-MM-dd HH:mm" align="center" headeralign="center">下单时间</div>
-                <div field="" width="60" align="center" headeralign="center" renderer="preDeliveryTime">预计发货</div>
-                <div field="CheckMemo" width="50" align="center" headeralign="center">查单备注</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="AfterSaleMethod" width="80" align="center" headeralign="center">售后方案</div>
-                <div field="UnusualCon" width="50" align="center" headeralign="center">异常解释</div>
-                <div name="orderstatus" width="50" align="center" headeralign="center" renderer="orderStatusRenderer">状态</div>
-                <div name="SupState" width="50" align="center" headeralign="center" renderer="supStateRenderer">生产状态</div>
+                <div field="fileName" width="110" align="center" headeralign="center">名称</div>
+                <div field="createtime" width="80" align="center" headeralign="center" renderer="orderPTimeRenderer">创建时间</div>
+                <div field="upStatus" width="50" align="center" headeralign="center" renderer="supStateRenderer">状态</div>
+                <div field="message" width="200" align="center" headeralign="center">说明</div>
+                <div field="downNum" width="80" align="center" headeralign="center">下载次数</div>
+                <div field="SupplierName" width="60" align="center" headeralign="center">车间</div>
+                <div field="createName" width="60" align="center" headeralign="center">创建人</div>
+                <div name="action" width="60" headeralign="center" align="center" renderer="actionRenderer" cellstyle="padding:0;">#</div>
             </div>
         </div>
     </div>

Web/EDelivery/PackCenter.aspx.cs

@@ -11,13 +11,13 @@ public partial class EDelivery_PackCenter : BasePage
 
     protected override void OnPreInit(EventArgs e)
     {
-        _repTitle = "生产列表";
+        _repTitle = "打包中心";
         PmTag = "PackCenter";
         //_selfCheckPermission = true;
         _keyFilterVisible = false;
         _addVisible = false;
         _filterDateBtn = false;
-        _filterItem = "order,memo,order_area,place_time,shouhuo,unusualcon";
+        _filterItem = "supplier";
     }
 
     protected void Page_Load(object sender, EventArgs e)