From 259584df9c06ade70f1f351affb35d4922e1263d Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期五, 07 十一月 2025 16:23:13 +0800
Subject: [PATCH] 这个打印送货单,你们给我做两种,做一张打印没得数量的,做一张打印有数量的。送货单格式就是32开,就哎就是A4排一半。你们打了测试,注意,美观。 把那个把它做出来,下一批就用这个自动打。 不是不是打印的要数量都是有数量,要没得数量都没得数量。就是点打印的时候就两个按钮嘛,一个是有数量打印,或者或者或者空白送货单打印。 现在这个现在的送货单都是没有数量噻。现在那个要的,比如你那里再打你那个打印关闭的按钮,要把搞成两个打印嘛,就是打印空白送货单和打印送货单。 好点打印空白送货单的,就是现在这样子。点打印送货单,打印的就是那个跟有有就是有数据的送货单。作业本送货统计查询,状态查询需要修改逻辑

---
 CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanWentiList.aspx.cs |   52 +++++++++++-----------------------------------------
 1 files changed, 11 insertions(+), 41 deletions(-)

diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanWentiList.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanWentiList.aspx.cs
index 09dc2fb..4000063 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanWentiList.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanWentiList.aspx.cs
@@ -54,7 +54,7 @@
                     case "wanjie":
                         AcceptAll();
                         break;
-                    case "AcceptOrderAll2":
+                    case "AcceptOrderAll":
                         AcceptAll2();
                         break; 
                     default:
@@ -77,7 +77,7 @@
             //this.selDriverId.Items.Insert(0, new ListItem("鍏ㄩ儴", ""));
 
 
-            this.selDriverIddo.DataSource = bll_OA_StaffBLL.SelectListByFirmId(CurrentUser.MemberId, null, null).Where(x => x.BF_IsDriver == true);//.Where(x => x.SM_Post.Equals("椹鹃┒鍛�"));
+            this.selDriverIddo.DataSource = bll_OA_StaffBLL.SelectListByFirmId(CurrentUser.MemberId, null, null);//.Where(x => x.BF_IsDriver == true); 
             this.selDriverIddo.DataTextField = "Name";
             this.selDriverIddo.DataValueField = "Keyid";
             this.selDriverIddo.DataBind();
@@ -199,27 +199,17 @@
         public void AcceptAll2()
         {
             Response.Clear();
-            int? carid = Request["CarId"].ToInt32(); //this.CarId.Value.ToGuid2();
-            int? driverId = Request["DriverId"].ToInt32(); //this.DriverId.Value.ToGuid2();
+            
             string ids = string.Empty;
-            string DeliverTimes = string.Empty;
-            string BuyerIds = string.Empty;
+            
             if (Request["ids"] != null)
             {
                 ids = Request["ids"].ToString();
             }
-            if (Request["DeliverTimes"] != null)
-            {
-                DeliverTimes = Request["DeliverTimes"].ToString();
-            }
-            if (Request["BuyerIds"] != null)
-            {
-                BuyerIds = Request["BuyerIds"].ToString();
-            }
+            
 
             string[] idsArray = ids.Split(',');
-            string[] DeliverTimesArray = DeliverTimes.Split(',');
-            string[] BuyerIdsArray = BuyerIds.Split(',');
+           
 
             if (idsArray != null && idsArray.Length > 0)
             {
@@ -227,33 +217,13 @@
                 {
                     bool result = true;
 
-                    OA_DeliverPlan oA_DeliverPlan = _OA_DeliverPlanPaicheBLL.GetModelByKeyid(idsArray[i].ToGuid2(), BuyerIdsArray[i].ToGuid2(), DeliverTimesArray[i].ToDateTime2());
-                    if (oA_DeliverPlan == null)
+                    OA_DeliverPlan oA_DeliverPlan = _OA_DeliverPlanPaicheBLL.GetModelByKeyid(idsArray[i].ToGuid2(), null, null);
+                    if (oA_DeliverPlan != null)
+                    
                     {
-                        oA_DeliverPlan = new OA_DeliverPlan();
-                        oA_DeliverPlan.Keyid = Guid.NewGuid();
-                        oA_DeliverPlan.FirmId = CurrentUser.MemberId;
-                        oA_DeliverPlan.DeliverTime = DeliverTimesArray[i].ToDateTime2();
-                        oA_DeliverPlan.BuyerId = BuyerIdsArray[i].ToGuid2();
-                        oA_DeliverPlan.DeliveredTime = null;
-                        oA_DeliverPlan.Zhuyishixiang = "";
-                        oA_DeliverPlan.Gongzuokaoping = "";
-                        oA_DeliverPlan.CarId = carid;
-                        oA_DeliverPlan.DriverId = driverId;
-                        oA_DeliverPlan.Transferstatus = 1;
-                        oA_DeliverPlan.TransfersTime = null;
-                        oA_DeliverPlan.Sort = 1;
-                        oA_DeliverPlan.Creater = CurrentUser.TrueMemberId;
-                        oA_DeliverPlan.CreateTime = DateTime.Now;
-                        oA_DeliverPlan.Updater = CurrentUser.TrueMemberId;
-                        oA_DeliverPlan.LastUpdateTime = DateTime.Now;
                         oA_DeliverPlan.wentifankui = "";
-                        result = _OA_DeliverPlanPaicheBLL.InsertModel(oA_DeliverPlan);
-                    }
-                    else
-                    {
-                        oA_DeliverPlan.CarId = carid;
-                        oA_DeliverPlan.DriverId = driverId;
+                        oA_DeliverPlan.LastUpdateTime = DateTime.Now;
+                        oA_DeliverPlan.Updater = CurrentUser.TrueMemberId;
                         result = _OA_DeliverPlanPaicheBLL.UpdateModel(oA_DeliverPlan);
                     }
                     if (!result)

--
Gitblit v1.9.1