就是受理，生产之后就不能修改，撤销工单之后就可以修改

username@email.com

7 小时以前 ea71208bf0d457f948edb7d16b29f94ae5dd3def

就是受理，生产之后就不能修改，撤销工单之后就可以修改

 CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderBasicDAL.cs

@@ -410,7 +410,7 @@
            {
                new SqlParameter("@Keyid",OrderId)
            };
            string sql = " Update [EC_OrderExtend] Set [SurplusPrintNum]=[PrintNum]   where [Keyid] = (select [OrderId] from [OA_OrderWorkListRelation] where [RelationTargetId] = @Keyid and [RelationTypeId]=4 )  ;Update [EC_OrderBasic] Set [OrderState]=2   where [Keyid] = (select [OrderId] from [OA_OrderWorkListRelation] where [RelationTargetId] = @Keyid and [RelationTypeId]=4 )   ";
            string sql = " Update [EC_OrderExtend] Set [SurplusPrintNum]=[PrintNum]   where [Keyid] = (select [OrderId] from [OA_OrderWorkListRelation] where [RelationTargetId] = @Keyid and [RelationTypeId]=4 )  ;Update [EC_OrderBasic] Set [OrderState]=1   where [Keyid] = (select [OrderId] from [OA_OrderWorkListRelation] where [RelationTargetId] = @Keyid and [RelationTypeId]=4 )   ";

            try
            {

 CY_ECommercePlatform/CY.WebForm/Pages/business/AgMergerOrderList.aspx.cs

@@ -77,7 +77,7 @@
                            List<EC_OrderOperate> oprates = new List<EC_OrderOperate>();
                            oprates.Add(new EC_OrderOperate()
                            {
                                OperateType = 2,
                                OperateType = 1,
                                OrderId = _eC_OrderBasic.Keyid,
                                Operator = CurrentUser.ShortName,
                                Remark = ""

 CY_ECommercePlatform/CY.WebForm/Pages/business/AgOutsourcSingleAllList.aspx

@@ -25,9 +25,9 @@
        }

        //删除
        function onChexiao(keyid) {
        function onChexiao(keyid, OldOrderId) {
            top.Dialog.confirm("确定要撤销该外协订单吗？", function () {
                window.location = "/Pages/business/AgOutsourcSingleAllList.aspx?chexiao=" + keyid;
                window.location = "/Pages/business/AgOutsourcSingleAllList.aspx?chexiao=" + keyid + "&OldOrderId=" + OldOrderId;
            });
        }

@@ -467,7 +467,7 @@
                                </td>
                                <td>
                                        <span menu_member_case_id="case_outAfterOrder" menu_member_case_name="修改" class="a_under <%#Eval("OrderState").ToString() == "1"||Eval("OrderState").ToString() == "2"||Eval("OrderState").ToString() == "3"?"":"UnRecive" %>" onclick='outAfterOrder(<%#Eval("Keyid") %>,<%#Eval("OldOrderId") %>)'>修改</span>&nbsp; 
                                    <span menu_member_case_id="case_chexiaoOrder" menu_member_case_name="撤销" class="a_under <%#Eval("OrderState").ToString() == "1"?"":"UnRecive" %>" onclick='onChexiao(<%#Eval("Keyid") %>)'>撤销</span>&nbsp; 
                                    <span menu_member_case_id="case_chexiaoOrder" menu_member_case_name="撤销" class="a_under <%#Eval("OrderState").ToString() == "1"?"":"UnRecive" %>" onclick='onChexiao(<%#Eval("Keyid") %>,<%#Eval("OldOrderId") %>)'>撤销</span>&nbsp; 
                                        <span menu_member_case_id="case_deleteOrder" menu_member_case_name="删除" class="a_under <%#Eval("OrderState").ToString() == "1"?"":"UnRecive" %>" onclick='onDelete(<%#Eval("Keyid") %>)'>删除</span>
                                </td>
                            </tr>

 CY_ECommercePlatform/CY.WebForm/Pages/business/AgOutsourcSingleAllList.aspx.cs

@@ -48,10 +48,10 @@
            if (!string.IsNullOrEmpty(Request["chexiao"]))
            {
                EC_OrderBasic _eC_OrderBasic = bll_EC_OrderBasicBLL.SelectModelById(Request["chexiao"].ToInt32().Value);
                if(_eC_OrderBasic.SellerName != "其他")
                {
                    JavaScript.MessageBox("已经确认供应商不能撤单！", this);
                }
                //if(_eC_OrderBasic.SellerName != "其他")
                //{
                //    JavaScript.MessageBox("已经确认供应商不能撤单！", this);
                //}
                if (_eC_OrderBasic.BuyerId == CurrentUser.MemberId)
                {
                    var res = false;
@@ -66,6 +66,16 @@
                    {
                        try
                        {
                            //修改订单状态
                            List<EC_OrderOperate> oprates = new List<EC_OrderOperate>();
                            oprates.Add(new EC_OrderOperate()
                            {
                                OperateType = 1,
                                OrderId = Request["OldOrderId"].ToInt32().Value,
                                Operator = CurrentUser.ShortName,
                                Remark = ""
                            });
                            res = bll_EC_OrderBasicBLL.UpdateOrderState(oprates[0]);
                            res = bll_EC_OrderBasicBLL.UpdateOldOrderSurplusPrintNum(Request["chexiao"].ToInt32().Value);
                            res = bll_EC_OrderBasicBLL.DeleteOutOrder(Request["chexiao"].ToInt32().Value);
                            scope.Complete();

 CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderList.aspx.cs

@@ -68,7 +68,7 @@
                        List<EC_OrderOperate> oprates = new List<EC_OrderOperate>();
                        oprates.Add(new EC_OrderOperate()
                        {
                            OperateType = 2,
                            OperateType = 1,
                            OrderId = _eC_OrderBasic.Keyid,
                            Operator = CurrentUser.ShortName,
                            Remark = ""

 CY_ECommercePlatform/CY.WebForm/Pages/business/OrderEdit.aspx.cs

@@ -104,6 +104,11 @@
            }

            EC_OrderBasic _eC_OrderBasic = _eC_OrderBasicBLL.SelectModelById(orderId.Value);
            if(_eC_OrderBasic.OrderState != 1)
            {
                JavaScript.MessageBox("只有状态为已下单的订单才能修改！", this, "window.location = 'OrderList.aspx';");
                return;
            }
            this.txtKeyid.Value = MyConvert.ConvertToString(_eC_OrderBasic.Keyid);
            this.txtOrderId.Value = MyConvert.ConvertToString(_eC_OrderBasic.SellerOrderId);
            this.txtCustormerName.Value = MyConvert.ConvertToString(_eC_OrderBasic.BuyerName);

 CY_ECommercePlatform/CY.WebForm/Pages/business/OrderList.aspx

@@ -544,7 +544,7 @@
                                    <%#Container.ItemIndex + (UCPager1.PageSize *( UCPager1.PageIndex-1)+1)%>
                                </td>
                                <td style="text-align: center;">
                                    <span class="edit a_under" <%#(int.Parse(Eval("OrderState").ToString())>=4||int.Parse(Eval("OrderState").ToString())<=0||int.Parse(Eval("OrderTypeId").ToString())>1)?"title=''":"title='点击修改订单'" %> onclick="window.location='OrderEdit.aspx?Target=ToUpSetData&orderId=<%#Eval("Keyid") %>';">
                                    <span class="edit a_under" <%#(int.Parse(Eval("OrderState").ToString())>=2||int.Parse(Eval("OrderState").ToString())<=0||int.Parse(Eval("OrderTypeId").ToString())>1)?"title=''":"title='点击修改订单' onclick=\"window.location='OrderEdit.aspx?Target=ToUpSetData&orderId="+Eval("Keyid")+"';\" " %> >
                                        <%#Eval("SellerOrderId")%></span><input type="hidden" id="hideOrderState" runat="server" value='<%#Eval("OrderState")%>' /><input type="hidden" id="hidOrderType" runat="server" value='<%#Eval("OrderTypeId")%>' />
                                    <%--<a href='javascript:void(0)' class='a_under' title='点击查看订单详情' style="display: <%#1.Equals(Eval("OrderState"))?"none;":""%>" onclick='ShowOrder(<%#Eval("Keyid") %>)'>
                                            <%#Eval("SellerOrderId")%></a>--%>