From ae6e40362a745caef9ead36f81f38313fb8c2c66 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期一, 12 五月 2025 16:54:46 +0800
Subject: [PATCH] 扣板:2张  双面机只有“扣板”是2张,其他是1张

---
 CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanYijiao.aspx.cs |   51 ++++++++++++++++++++++++++++++++++++++++-----------
 1 files changed, 40 insertions(+), 11 deletions(-)

diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanYijiao.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanYijiao.aspx.cs
index ab0bd5e..a733b5f 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanYijiao.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanYijiao.aspx.cs
@@ -30,7 +30,7 @@
     public partial class DeliverPlanYijiao : BasePage
     {
        
-        OA_DeliverPlanBLL _OA_DeliverPlanBLL = null;
+        OA_DeliverPlanPaicheBLL _OA_DeliverPlanBLL = null;
         OA_StaffBLL bll_OA_StaffBLL = null;
         OA_CarManageBll _OA_CarManageBll = null;
 
@@ -39,7 +39,7 @@
         public DeliverPlanYijiao()
         {
 
-            _OA_DeliverPlanBLL = new OA_DeliverPlanBLL();
+            _OA_DeliverPlanBLL = new OA_DeliverPlanPaicheBLL();
             bll_OA_StaffBLL = new OA_StaffBLL();
             _OA_CarManageBll = new OA_CarManageBll();
 
@@ -92,16 +92,45 @@
             {
                
 
-                this.IsBusinessManager.Items.Add(new ListItem("涓氬姟缁忕悊", "1"));
-                this.IsBusinessManager.Items.Add(new ListItem("宸ュ巶鐗╂祦閮�", "2"));
+              
 
-                this.IsBusinessManager.SelectedValue = "1";
+               
 
 
 
 
 
-                string keyid = Request["keyid"];
+                string ids = Request["ids"];
+                var deliverPlan = _OA_DeliverPlanBLL.GetModelByKeyid(ids.ToGuid2(), null, null);
+                if (deliverPlan.Transferstatus.HasValue && deliverPlan.Transferstatus != 0)
+                {
+                    if(deliverPlan.TransferType.HasValue && deliverPlan.TransferType.Value == 1)
+                    {
+                        this.IsBusinessManager.Items.Add(new ListItem(deliverPlan.TransferName, "1"));
+                        this.IsBusinessManager.Items.Add(new ListItem("宸ュ巶鐗╂祦閮�", "2"));
+                        this.IsBusinessManager.SelectedValue = deliverPlan.TransferType.Value.ToString();
+                    }
+                    else if (deliverPlan.TransferType.HasValue && deliverPlan.TransferType.Value == 2)
+                    {
+                        this.IsBusinessManager.Items.Add(new ListItem("涓氬姟缁忕悊", "1"));
+                        this.IsBusinessManager.Items.Add(new ListItem("宸ュ巶鐗╂祦閮�", "2"));
+                        this.IsBusinessManager.SelectedValue = deliverPlan.TransferType.Value.ToString();
+                    }
+                    else
+                    {
+                        this.IsBusinessManager.Items.Add(new ListItem("涓氬姟缁忕悊", "1"));
+                        this.IsBusinessManager.Items.Add(new ListItem("宸ュ巶鐗╂祦閮�", "2"));
+                        this.IsBusinessManager.SelectedValue = "1";
+                    }
+                    
+                  
+                }
+                else
+                {
+                    this.IsBusinessManager.Items.Add(new ListItem("涓氬姟缁忕悊", "1"));
+                    this.IsBusinessManager.Items.Add(new ListItem("宸ュ巶鐗╂祦閮�", "2"));
+                    this.IsBusinessManager.SelectedValue = "1";
+                }
 
 
 
@@ -210,11 +239,11 @@
                     }
                    
 
-                    var carManage = _OA_CarManageBll.SelectListByFirmId(CurrentUser.MemberId).Where(x => x.StaffID == deliverPlan.DriverId).FirstOrDefault();
-                    if (carManage != null)
-                    {
-                        deliverPlan.CarId = carManage.Keyid ?? 0;
-                    }
+                    //var carManage = _OA_CarManageBll.SelectListByFirmId(CurrentUser.MemberId).Where(x => x.StaffID == deliverPlan.DriverId).FirstOrDefault();
+                    //if (carManage != null)
+                    //{
+                    //    deliverPlan.CarId = carManage.Keyid ?? 0;
+                    //}
                     isWin = _OA_DeliverPlanBLL.UpdateModel(deliverPlan);
                 }
 

--
Gitblit v1.9.1