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/work/Adm_tongxunluList.aspx.cs |   70 +++++++++++++++++++++++++++++++++-
 1 files changed, 67 insertions(+), 3 deletions(-)

diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/work/Adm_tongxunluList.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/work/Adm_tongxunluList.aspx.cs
index 38fbdef..9584130 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/work/Adm_tongxunluList.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/work/Adm_tongxunluList.aspx.cs
@@ -19,6 +19,7 @@
         Adm_tongxunluBLL bll_Adm_tongxunluBLL = null;
         Sys_DictionaryBLL bll_Sys_DictionaryBLL = null;
         OA_StaffBLL bll_OA_StaffBLL = null;
+        public string BF_IsChangyongziliao  = "";
 
         //鍒濆鍖�
         public Adm_tongxunluList()
@@ -59,6 +60,8 @@
                     this.seltype.DataBind();
                     this.seltype.Items.Insert(0, new ListItem("鍏ㄩ儴", ""));
 
+                   
+
                     BindList();
                 }
               
@@ -89,13 +92,74 @@
         //缁戝畾鏁版嵁
         private void BindList()
         {
+            var oA_Staff = bll_OA_StaffBLL.GetModelByKeyid(CurrentUser.StaffId);
+            var IsChangyongziliao = false;
+            if (oA_Staff != null)
+            {
+                if (oA_Staff.BF_IsChangyongziliao.HasValue && oA_Staff.BF_IsChangyongziliao.Value == true)
+                {
+                    BF_IsChangyongziliao = "";
+                }
+                else
+                {
+                    BF_IsChangyongziliao = "style=\"display:none;\"";
+                }
+                if (oA_Staff.BF_IsChangyongziliao.HasValue)
+                {
+                    IsChangyongziliao = oA_Staff.BF_IsChangyongziliao.Value;
+                }
+            }
+
             Pagination pa = new Pagination();
             pa.PageSize = UCPager1.AspNetPager.PageSize;
             pa.PageIndex = UCPager1.AspNetPager.CurrentPageIndex;
             
-            
-            
-            this.RepClientList.DataSource = bll_Adm_tongxunluBLL.SelectModelPage(pa, CurrentUser.MemberId, this.seltype.Value, this.txtdanwei_name.Value.Trim());
+            var    adm_Tongxunlus = bll_Adm_tongxunluBLL.SelectModelPage(pa, CurrentUser.MemberId, this.seltype.Value, this.txtdanwei_name.Value.Trim(), IsChangyongziliao, CurrentUser.StaffId, this.selquanxin.Value);
+            if(adm_Tongxunlus!=null)
+            {
+             var oA_Staffs =   bll_OA_StaffBLL.SelectListByFirmId(CurrentUser.MemberId,null,null);
+                foreach(var adm_Tongxunlu in adm_Tongxunlus)
+                {
+                    if (adm_Tongxunlu.beuzhu.Length > 40)
+                    {
+                        adm_Tongxunlu.beuzhuName = adm_Tongxunlu.beuzhu.Substring(0, 40);
+                    }
+                    else
+                    {
+                        adm_Tongxunlu.beuzhuName = adm_Tongxunlu.beuzhu;
+                    }
+                    if (string.IsNullOrEmpty(adm_Tongxunlu.Jusequanxian))
+                    {
+                        adm_Tongxunlu.JusequanxianName = "";
+
+                    }
+                    else
+                    {
+                        var Jusequanxia = adm_Tongxunlu.Jusequanxian.Trim(',').Split(',');
+                        var Jusequanxian = new List<int?>();
+                        foreach(var jjj in Jusequanxia)
+                        {
+                            Jusequanxian.Add(jjj.ToInt32());
+                        }
+
+                        var staffs = oA_Staffs.Where(x => Jusequanxian.Contains(x.Keyid)).ToList();
+                        adm_Tongxunlu.JusequanxianName = "";
+                        foreach (var  staff in staffs)
+                        {
+                            adm_Tongxunlu.JusequanxianName += staff.Name + ",";
+                        }
+                        if (adm_Tongxunlu.JusequanxianName.Length > 40)
+                        {
+                            adm_Tongxunlu.JusequanxianNameshot = adm_Tongxunlu.JusequanxianName.Substring(0, 40);
+                        }
+                        else
+                        {
+                            adm_Tongxunlu.JusequanxianNameshot = adm_Tongxunlu.JusequanxianName;
+                        }
+                    }
+                }
+            }
+            this.RepClientList.DataSource = adm_Tongxunlus;
             this.RepClientList.DataBind();
             UCPager1.AspNetPager.RecordCount = pa.RecordCount;
         }

--
Gitblit v1.9.1