edit

SiteCore/Handler/sync.order.cs

@@ -7396,7 +7396,8 @@ namespace SiteCore.Handler
                         }
                         if (st != "下单员")
                         {
-                            designHelper.API_GetPrintData_CreateOrder(newentity);
+                            designApiResponseVo response = designHelper.API_GetPrintData_CreateOrder(newentity);
+                            LogHelper.addLog(newentity.ctid, CurrentUser.UserID, "售后单生成指派：" + response.msg, newentity.OrderState, 1);
                         }
                     }
 

SiteCore/taoObj/api_trade_info.cs

@@ -208,6 +208,7 @@ namespace SiteCore.taoObj
             /// 工艺
             /// </summary>
             public string craft { get; set; }
+            public string craftText { get; set; }
             /// <summary>
             /// 产品数量
             /// </summary>

SiteCore/taobao/designHelper.cs

@@ -75,7 +75,7 @@ namespace SiteCore.Handler
             string post_url = pUrl + "createOrder";
             CeErpOrderFormData formData = null;
 
-            if (!ceErpTradeCell.ctid.Contains("S_") && ceErpTradeCell.ShopId != 136)
+            if (!ceErpTradeCell.ctid.Contains("S_") && ceErpTradeCell.ShopId != 136 && ceErpTradeCell.ShopId != 95)
             {
                 formData = CeErpOrderFormData.GetByTid(ceErpTradeCell.ctid.ToString());
                 if (formData == null)

SiteCore/taobao/preSalesHelper.cs

@@ -1818,7 +1818,7 @@ namespace SiteCore.Handler
                 entity.ProductSize = item.size;
                 entity.Material = item.material;
                 entity.CustomerUserId = item.erpCustomerServiceId;
-                //entity.Craft = item.craft;
+                //entity.Craft = item.craftText;
                 entity.ProductCount = item.productQuantity;
 
                 entity.ProductId = tmcHelper.getProductIdByName(item.cate3Id);
@@ -1868,7 +1868,7 @@ namespace SiteCore.Handler
                 entity.ParentSplitNo = item.parentSplitNo;
 
                 CeErpTradeCellExtend ceErpTradeCellExtend = CeErpTradeCellExtend.getByTid(entity.ctid);
-
+                string sql_pay = "";
                 if (ceErpTradeCellExtend == null)
                 {
                     ceErpTradeCellExtend = new CeErpTradeCellExtend();
@@ -1925,8 +1925,7 @@ namespace SiteCore.Handler
                         }
                         if ("外协".Equals(ceErpTradeCellExtend.ToType))
                         {
-                            string sql_pay = "update CE_ErpTradeCell with(rowlock) set DispatchSort=2 where ctid='" + ceErpTradeCellExtend.ctid + "';";
-                            CeErpTradeCell.ExecuteNonQuery(sql_pay.ToString());
+                            sql_pay = "update CE_ErpTradeCell with(rowlock) set DispatchSort=2 where ctid='" + ceErpTradeCellExtend.ctid + "';";
                         }
                     }
                     ceErpTradeCellExtend.Create();
@@ -2166,7 +2165,10 @@ namespace SiteCore.Handler
                     designHelper.API_update_renewOrder(entity);
                     entity.Update();
                 }
-
+                if (!string.IsNullOrEmpty(sql_pay))
+                {
+                    CeErpTradeCell.ExecuteNonQuery(sql_pay.ToString());
+                }
                 if (isCopyFile)
                 {
                     apiUploaderResponse upResult = CopyDesignFile(entity.ctid, item.oldOrderSn, entity.CustomerUserId);

Web/EDelivery/AllPlaceList.aspx

@@ -30,6 +30,14 @@
                 <div field="ProductName" visible="false" align="center" headeralign="center">产品类型</div>
                 <div field="ProductSize" visible="false" align="center" headeralign="center">产品尺寸</div>
                 <div field="ProductCount" visible="false" align="center" headeralign="center">产品数量</div>
+                <div field="cate1" visible="false" align="center" headeralign="center">分类1</div>
+                <div field="cate2" visible="false" align="center" headeralign="center">分类2</div>
+                <div field="materials" visible="false" align="center" headeralign="center">材质</div>
+                <div field="width" visible="false" align="center" headeralign="center">宽</div>
+                <div field="height" visible="false" align="center" headeralign="center">高</div>
+                <div field="length" visible="false" align="center" headeralign="center">长</div>
+                <div field="quantity" visible="false" align="center" headeralign="center">数量</div>
+                <div field="numbers" visible="false" align="center" headeralign="center">款数</div>
                 <div field="payment_cyt" id="id_payment_cyt" runat="server" width="150" align="center" headeralign="center" visible="false">成本价</div>
                 <div field="seller_memo" width="150" align="center" headeralign="center" renderer="memoRenderer">备注</div>
                 <div field="OtherMemo" width="100" align="center" headeralign="center">额外备注</div>

Web/EDelivery/PackCenter.aspx

@@ -0,0 +1,179 @@
+<%@ Page Language="C#" MasterPageFile="~/MasterPage/ErpView.master" AutoEventWireup="true" CodeFile="PackCenter.aspx.cs" Inherits="EDelivery_PackCenter" %>
+
+<asp:Content ID="Content1" ContentPlaceHolderID="head" runat="Server">
+    <script>
+        let productHourList = []
+        //查询按钮
+        function searchFn() {
+            var form = new mini.Form("#ctl00_f_all");
+            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
+            });
+        }
+        //清除查询内容
+        function clearFn() {
+            var form = new mini.Form("#ctl00_f_all");
+            form.clear();
+        }
+        function orderPTimeRenderer(e) {
+            var grid = e.sender;
+            var record = e.record;
+            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>";
+            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) {
+            var record = e.record;
+            var html = "<div style=\"display:flex;flex-direction:column;\">";
+            if (record.IsSF == 1) {
+                html += ("<div style=\"color:blue;\"> 顺丰寄付 </div>");
+            }
+            else if (record.IsSF == 2) {
+                html += ("<div style=\"color:green;\"> 顺丰到付 </div>");
+            }
+
+            html += "</div>";
+            return html;
+        }
+
+        function supStateRenderer(e) {
+            var record = e.record;
+            var html = "<div style=\"display:flex;flex-direction:column;\">";
+            if (record.SupState == 1) {
+                html += ("<div style=\"color:blue;\"> 已生产 </div>");
+            }
+            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 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>
+        </div>
+    </div>
+</asp:Content>

Web/EDelivery/PackCenter.aspx.cs

@@ -0,0 +1,48 @@
+using SiteCore;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+
+public partial class EDelivery_PackCenter : BasePage
+{
+
+    protected override void OnPreInit(EventArgs e)
+    {
+        _repTitle = "生产列表";
+        PmTag = "PackCenter";
+        //_selfCheckPermission = true;
+        _keyFilterVisible = false;
+        _addVisible = false;
+        _filterDateBtn = false;
+        _filterItem = "order,memo,order_area,place_time,shouhuo,unusualcon";
+    }
+
+    protected void Page_Load(object sender, EventArgs e)
+    {
+        if (!IsPostBack)
+        {
+            string sData = GetString("sData");
+            if (sData != "") AppendScript("openPageData=" + sData + ";");
+
+            AppendScript("printPageUrl='" + webConfig.SiteUrl + "';");
+            AppendScript("userPostCode='" + CurrentUser.UserPost.Post.Code + "';");
+            AppendScript("cdrImgUrl='" + webConfig.ltFileSiteUrl + "/d/ws';");
+            //StringBuilder sql = new StringBuilder();
+            //sql.AppendFormat("select * from s_runinfotype");
+            //DataSet ds = DbHelper.DbConn.ExecuteDataset(sql.ToString());
+            //DataTable dt = ds.Tables[0];
+            //AppendScript("tData=" + JsonString.DataTable2Json(dt) + ";");
+
+            //selType.DataSource = dt;
+            //selType.DataValueField = "ID";
+            //selType.DataTextField = "Name";
+            //selType.DataBind();
+        }
+        //foreach (DataRow dr in dt.Rows)
+        //{
+        //}
+    }
+}

Web/EOrder/OrderList.aspx

@@ -132,6 +132,14 @@
                 <div field="ProductName" visible="false" align="center" headeralign="center">产品类型</div>
                 <div field="ProductSize" visible="false" align="center" headeralign="center">产品尺寸</div>
                 <div field="ProductCount" visible="false" align="center" headeralign="center">产品数量</div>
+                <div field="cate1" visible="false" align="center" headeralign="center">分类1</div>
+                <div field="cate2" visible="false" align="center" headeralign="center">分类2</div>
+                <div field="materials" visible="false" align="center" headeralign="center">材质</div>
+                <div field="width" visible="false" align="center" headeralign="center">宽</div>
+                <div field="height" visible="false" align="center" headeralign="center">高</div>
+                <div field="length" visible="false" align="center" headeralign="center">长</div>
+                <div field="quantity" visible="false" align="center" headeralign="center">数量</div>
+                <div field="numbers" visible="false" align="center" headeralign="center">款数</div>
 
                 <div field="buyer_message" visible="false" align="center" headeralign="center">买家留言</div>
                 <div field="SupplierName" visible="false" align="center" headeralign="center">供应商</div>