username@email.com
2025-10-24 c05f1b8cf051bb46f6ec8f9855a9c3fd11c88f67
修改一下订单管理和生产管理的流程

业务经理下单后,该订单自动在“生产安排”中显示(以前是点“受理”后才在生产安排中显示)

生产安排中,订单进行和“专版工单”和“合版工单”的操作后,订单管理中该订单的“受理”表格自动打“√”

USE [ECTEST_NEW]
GO
/****** Object: StoredProcedure [dbo].[sp_AgOrderProduction_Search] Script Date: 2025/10/23 9:02:32 ******/
SET ANSI_NULLS ON
GO
SET QUOTED_IDENTIFIER ON
GO
ALTER Procedure [dbo].[sp_AgOrderProduction_Search]
(
@pageIndex int,--页数
@pageSize int,--每页显示行数
@pageCount int Output,--输出总页数
@recordCount bigint Output,--结果行数
@buyerId uniqueidentifier,--买家编号
@sellerId uniqueidentifier,--卖家
@orderId varchar(25),--订单编号(卖家订单编号)
@buyerName varchar(50),--买家姓名
@createTimeBegin date,--下单开始日期
@createTimeEnd date,--下单截止日期
@printType int,--印刷类型
@orderType int,--订单类型
@orderState varchar(20),--订单状态
@orderPayState int,--订单支付状态
@creater varchar(20),--制单人
/*客户条件*/
@customerLevel int,--客户级别
@customerManager int,--客户经理
@businessManager int--业务经理

)
As
Declare @resultSql varchar(max)--总条件
Declare @orderCondition varchar(200)--订单查询条件
Declare @extendCondition varchar(200)--扩展表查询条件

Select @extendCondition='',@resultSql=' EC_OrderBasic as ob Inner Join Pay_TradingSingle as ts On(ob.Keyid = ts.OrderId '

/*
拼接条件
*/
/*主表条件拼接begin*/
Select @resultSql=@resultSql + Case When @buyerId Is Null Then '' Else ' And '''+CONVERT(varchar(36),@buyerId)+'''=ob.BuyerId ' End;
Select @resultSql=@resultSql + Case When @sellerId Is Null Then '' Else ' And '''+CONVERT(varchar(36),@sellerId)+'''=ob.SellerId ' End;
Select @resultSql=@resultSql + Case When @orderId Is Null Then '' Else ' And ob.SellerOrderId Like(''%'+@orderId+'%'') ' End;
Select @resultSql=@resultSql + Case When @buyerName Is Null Then '' Else ' And ob.BuyerName like ('''+@buyerName+'%'') ' End;
Select @resultSql=@resultSql + Case When @createTimeBegin Is Null Then '' Else ' And ob.CreateTime >='''+Convert(varchar(10),@createTimeBegin)+''' ' End;
Select @resultSql=@resultSql + Case When @createTimeEnd Is Null Then '' Else ' And ob.CreateTime <='''+Convert(varchar(10),@createTimeEnd )+''' ' End;
Select @resultSql=@resultSql + Case When @printType Is Null Then '' Else ' And '+CONVERT(varchar(10),@printType)+'=ob.PrintTypeId ' End;
Select @resultSql=@resultSql + Case When @orderType Is Null Then '' Else ' And '+CONVERT(varchar(10),@orderType)+'= ob.OrderTypeId ' End;
Select @resultSql=@resultSql + Case When @orderPayState Is Null Then '' Else ' And '+CONVERT(varchar(10),@orderPayState)+'=ob.PayState ' End;
Select @resultSql=@resultSql + Case When @creater Is Null Then '' Else ' And ob.Creater like ('''+@creater+'%'') ' End;
Select @resultSql=@resultSql+') '

/*主表条件拼接end*/

/*扩展表条件拼接begin*/
Select @extendCondition=@extendCondition+ Case When @customerLevel Is Null Then '' Else ' And '+CONVERT(varchar(10),@customerLevel) +'=oe.CustomerLevelId ' End;
Select @extendCondition=@extendCondition+ Case When @customerManager Is Null Then '' Else ' And '+CONVERT(varchar(10),@customerManager)+'= oe.BusinessManagerId ' End;
Select @extendCondition=@extendCondition+ Case When @businessManager Is Null Then '' Else ' And '+CONVERT(varchar(10),@businessManager)+'= oe.CustomerManagerId ' End;

/*扩展表条件拼接end*/
/*整合sql*/
Select @resultSql=@resultSql +' Inner Join EC_OrderExtend as oe On(ob.Keyid=oe.Keyid '+ Case When LEN(@extendCondition)=0 Then '' Else @extendCondition+'' End+' )';
Select @resultSql=@resultSql +' Left Join SysInquiry_PrintingType as pt On(ob.PrintTypeId=pt.Keyid)'
Select @resultSql=@resultSql +' Left Join Sys_Dictionary as otp On (otp.DicType=''EC_订单类型'' And otp.MeanValue = ob.OrderTypeId )'
Select @resultSql=@resultSql +' Left Join Sys_Dictionary as ost On (ost.DicType=''EC_订单状态'' And ost.MeanValue = ob.OrderState )'
Select @resultSql=@resultSql +' Left Join Sys_Dictionary as opt On (opt.DicType=''EC_订单支付状态'' And opt.MeanValue = ob.PayState )'

if @orderState IS NOT NULL
begin
Select @resultSql=@resultSql + ' where (ob.OrderState in ( '+ @orderState +')) ';
end
else
begin
Select @resultSql=@resultSql + ' where (ob.OrderState = 1 or ob.OrderState = 2 or ob.OrderState = 3) ';
end

PRINT @resultSql

Declare @returnState int

--执行分页存储过程
EXECUTE @returnState=[dbo].[SP_CurrencyPage]
' ob.*,oe.PrintNum,oe.ExigencyCaseId,oe.SurplusPrintNum,ts.OnlineMoney,ts.LineMoney,ts.UsedCredit,ts.PayedMoney,pt.PrintName as PrintTypeName,otp.Name as OrderTypeName ,ost.Name as OrderStateName ,opt.Name as PayStateName '
,@resultSql
,''
,' ob.SellerOrderId desc '
,' TempT.SellerOrderId desc '
,@pageIndex
,@pageSize
,@pageCount OUTPUT
,@recordCount OUTPUT

return @returnState
4个文件已修改
16 ■■■■ 已修改文件
CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderBasicDAL.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/business/AgOrderProduction.aspx.cs 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/business/InvoicingConfirm.aspx 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/business/OrderList.aspx 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderBasicDAL.cs
@@ -1176,7 +1176,7 @@
                new SqlParameter("@createTimeEnd",DBNull.Value){SqlDbType=SqlDbType.Date},
                new SqlParameter("@printType",DBNull.Value){SqlDbType=SqlDbType.Int},
                new SqlParameter("@orderType",DBNull.Value){SqlDbType=SqlDbType.Int},
                new SqlParameter("@orderState",DBNull.Value){SqlDbType=SqlDbType.Int},
                new SqlParameter("@orderState",DBNull.Value){SqlDbType=SqlDbType.VarChar,Size=20},
                new SqlParameter("@orderPayState",DBNull.Value){SqlDbType=SqlDbType.Int},
                new SqlParameter("@creater",DBNull.Value){SqlDbType=SqlDbType.VarChar,Size=20},
                new SqlParameter("@customerLevel",DBNull.Value){SqlDbType=SqlDbType.Int},
CY_ECommercePlatform/CY.WebForm/Pages/business/AgOrderProduction.aspx.cs
@@ -87,12 +87,12 @@
                this.selPrintTypes.Items.Insert(0, new ListItem("所有", ""));
                this.selOrderTypes.Items.Add(new ListItem("所有", ""));
                this.selOrderStates.Items.Add(new ListItem("所有", ""));
                this.selOrderStates.Items.Add(new ListItem("未开工", "2"));
                this.selOrderStates.Items.Add(new ListItem("未开工", "1,2"));
                this.selOrderStates.Items.Add(new ListItem("已开工", "3"));
                this.selPrintTypes.Value = "";
                this.selOrderTypes.Value = "";
                this.selOrderStates.Value = "2";
                this.selOrderStates.Value = "1,2";
                this.selPayStates.Value = "";
                this.selClientManager.DataSource = bll_OA_StaffBLL.SelectListByFirmId(CurrentUser.MemberId, false, true);
@@ -172,7 +172,7 @@
        /// <param name="e"></param>
        private void AspNetPager_PageChanged(object sender, EventArgs e)
        {
            if(this.selOrderStates.Value == "2")
            if(this.selOrderStates.Value == "1,2")
            {
                UCPager1.AspNetPager.PageSize = 1000;
            }
CY_ECommercePlatform/CY.WebForm/Pages/business/InvoicingConfirm.aspx
@@ -380,7 +380,7 @@
                            <tr>
                                 
                               <td>
                                    <%#Container.ItemIndex +1 /*(UCPager1.PageSize *( UCPager1.PageIndex-1)+1)*/%>
                                    <%#(UCPager1.PageSize *( UCPager1.PageIndex-1) + Container.ItemIndex +1)%>
                                </td>
                                <td>
                                   <%#Eval("CreateTime", "{0:yyyy-MM-dd}")%>
CY_ECommercePlatform/CY.WebForm/Pages/business/OrderList.aspx
@@ -389,9 +389,9 @@
                            <a href="javascript:;" class='delete' menu_member_case_id="case_deleteOrderList" menu_member_case_name="批量删除" onclick="ToBatch(BatchDelete,IsObjCanntDelete);"><span class="icon_delete">批量删除</span></a>
                            <div class="box_tool_line">
                            </div>
                            <a href="javascript:;" menu_member_case_id="case_ToAllAcceptList" menu_member_case_name="批量受理" onclick="ToAllAccept();"><span class="icon_edit">批量受理</span></a>
                           <%-- <a href="javascript:;" menu_member_case_id="case_ToAllAcceptList" menu_member_case_name="批量受理" onclick="ToAllAccept();"><span class="icon_edit">批量受理</span></a>
                            <div class="box_tool_line">
                            </div>
                            </div>--%>
                            <a href="javascript:;" menu_member_case_id="case_ToCompledList" menu_member_case_name="批量完工" onclick="ToCompled();"><span class="icon_edit">批量完工</span></a>
                            <div class="box_tool_line">
                            </div>
@@ -605,7 +605,7 @@
                                        <%#true.Equals(Eval("IsPrint")) ? "√" : "打印"%></span>
                                </td>
                                <td class="td_hide" menu_member_case_id="case_ToAccept" menu_member_case_name="受理">
                                    <span class="<%#IsCanOpearte(Eval("Keyid"),Eval("OrderState"),Eval("OutId"),"受理")?"hand_yes":"hand_no"%>" <%#IsOpearted(Eval("Keyid"), Eval("OrderState"), "受理") ?"title='已受理'":"title='受理'"%> onclick="ToAccept(<%#Eval("SumPrice" )%>,'<%#Eval("SellerOrderId")%>',<%#Eval("Keyid")%>,<%#Eval("OrderTypeId")%>)">
                                    <span class="<%#IsCanOpearte(Eval("Keyid"),Eval("OrderState"),Eval("OutId"),"受理")?"hand_yes":"hand_no"%>" <%#IsOpearted(Eval("Keyid"), Eval("OrderState"), "受理") ?"title='已受理'":"title='受理'"%> <%--onclick="ToAccept(<%#Eval("SumPrice" )%>,'<%#Eval("SellerOrderId")%>',<%#Eval("Keyid")%>,<%#Eval("OrderTypeId")%>)"--%> >
                                        <%#IsOpearted(Eval("Keyid"), Eval("OrderState"), "受理") ? "√" : "受理"%></span>
                                </td>
                                 <td >