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/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