作业本送货 加上客户单位 完成 订单状态默认未送货 完成

username@email.com

2025-09-23 389b4da5feedfc0b49d7c6540bc836267d7bbee0

 CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderBasicDAL.cs

@@ -1339,7 +1339,7 @@
        /// </summary>
        /// <param name="pagination"></param>
        /// <returns></returns>
        public IEnumerable<EC_OrderBasic> SelectModelPageWorkBook(Infrastructure.Query.Pagination pagination, Guid _MemberID, string txtBeginDate, string txtEndDate, string txtOrderId, string txtSearchyjname, string selCustormerManager, string selBusinessManager, string selOrderStates)
        public IEnumerable<EC_OrderBasic> SelectModelPageWorkBook(Infrastructure.Query.Pagination pagination, Guid _MemberID, string txtBeginDate, string txtEndDate, string txtOrderId, string txtSearchyjname, string selCustormerManager, string selBusinessManager, string selOrderStates, string BuyerName)
        {
            try
            {
@@ -1364,6 +1364,9 @@
                if (!string.IsNullOrEmpty(txtSearchyjname))
                    condition += " and ob.DocumentName like '%" + txtSearchyjname + "%'";

                if (!string.IsNullOrEmpty(BuyerName))
                    condition += " and ob.BuyerName like '%" + BuyerName + "%'";

                if (!string.IsNullOrEmpty(selCustormerManager))
                    condition += " and oe.CustomerManagerId = '" + selCustormerManager + "'";

@@ -1371,7 +1374,17 @@
                    condition += " and oe.BusinessManagerId = '" + selBusinessManager + "'";

                if (!string.IsNullOrEmpty(selOrderStates))
                    condition += " and ob.OrderState = '" + selOrderStates + "'";
                {
                    if(selOrderStates == "0")
                    {
                        condition += " and ob.OrderState  in (1,2,3,4)";
                    }
                    else if (selOrderStates == "1")
                    {
                        condition += " and ob.OrderState in ( 5,6,-1)";
                    }
                }