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.BLL/OA/OA_OutOfStorageBLL.cs |   74 +++++++++++++++++++-----------------
 1 files changed, 39 insertions(+), 35 deletions(-)

diff --git a/CY_ECommercePlatform/CY.BLL/OA/OA_OutOfStorageBLL.cs b/CY_ECommercePlatform/CY.BLL/OA/OA_OutOfStorageBLL.cs
index df7cbed..8ae4dcc 100644
--- a/CY_ECommercePlatform/CY.BLL/OA/OA_OutOfStorageBLL.cs
+++ b/CY_ECommercePlatform/CY.BLL/OA/OA_OutOfStorageBLL.cs
@@ -93,7 +93,7 @@
             return outOfStorageDAL.getModelList(pa, FirmId, Operator, InfoType, SuppliersId, GoodsNameId, WarehouseId, beginTime, endTime, BrandName, SpeceicationName, PaperWeightName, GoodsTypeId);
         }
 
-        public bool InsertModelList(string[] Keys, int? WarehouseId)
+        public bool InsertModelList(string[] Keys, int? WarehouseId, string WarehouseName )
         {
             try
             {
@@ -102,6 +102,7 @@
                 {
                     foreach (var Keyid in Keys)
                     {
+
                         OA_Procurement m_OA_Procurement = new OA_Procurement();
                         OA_Inventory m_OA_Inventory = new OA_Inventory();
                         OA_OutOfStorage m_OA_OutOfStorage = new OA_OutOfStorage();
@@ -112,41 +113,44 @@
 
                         m_OA_Procurement = _OA_ProcurementBLL.SelectSingleModel(Keyid);
                         m_OA_Procurement.PurchaseStatusId = 201;
-                        m_OA_Procurement.Remark = m_OA_WarehouseInfo.WarehouseName;
+                        m_OA_Procurement.WarehouseName = m_OA_WarehouseInfo.WarehouseName;
+                        if (!WarehouseName.Equals("涓婃満浣跨敤"))
+                        {
+                            //搴撳瓨琛ㄥ璞�
+                            m_OA_Inventory.CargoSpaceId = 0;
+                            m_OA_Inventory.FirmId = m_OA_Procurement.FirmId;
+                            m_OA_Inventory.GoodsId = m_OA_Procurement.GoodsId;
+                            m_OA_Inventory.InventoryCount = m_OA_Procurement.Quantity;
+                            m_OA_Inventory.LastUpdateTime = DateTime.Now;
+                            m_OA_Inventory.Operator = m_OA_Procurement.Operator;
+                            m_OA_Inventory.Remark = "";
+                            m_OA_Inventory.WarehouseId = WarehouseId;
+                            m_OA_Inventory.BrandId = m_OA_Procurement.BrandId;
+                            m_OA_Inventory.SpecificationId = m_OA_Procurement.SpecificationId;
+                            m_OA_Inventory.PaperWeightId = m_OA_Procurement.PaperWeightId;
+                            m_OA_Inventory.UnitPrice = m_OA_Procurement.Price ?? 0;
+                            m_OA_Inventory.TotalPrice = m_OA_Procurement.AllMoney ?? 0;
 
-                        //搴撳瓨琛ㄥ璞�
-                        m_OA_Inventory.CargoSpaceId = 0;
-                        m_OA_Inventory.FirmId = m_OA_Procurement.FirmId;
-                        m_OA_Inventory.GoodsId = m_OA_Procurement.GoodsId;
-                        m_OA_Inventory.InventoryCount = m_OA_Procurement.Quantity;
-                        m_OA_Inventory.LastUpdateTime = DateTime.Now;
-                        m_OA_Inventory.Operator = m_OA_Procurement.Operator;
-                        m_OA_Inventory.Remark = "";
-                        m_OA_Inventory.WarehouseId = WarehouseId;
-                        m_OA_Inventory.BrandId = m_OA_Procurement.BrandId;
-                        m_OA_Inventory.SpecificationId = m_OA_Procurement.SpecificationId;
-                        m_OA_Inventory.PaperWeightId = m_OA_Procurement.PaperWeightId;
-                        m_OA_Inventory.UnitPrice = m_OA_Procurement.Price ?? 0;
-                        m_OA_Inventory.TotalPrice = m_OA_Procurement.AllMoney ?? 0;
-
-                        //鍑哄叆搴撲俊鎭〃瀵硅薄
-                        m_OA_OutOfStorage.FirmId = m_OA_Procurement.FirmId;
-                        m_OA_OutOfStorage.GoodsId = m_OA_Procurement.GoodsId;
-                        m_OA_OutOfStorage.CargoSpaceId = 0;
-                        m_OA_OutOfStorage.LastUpdateTime = DateTime.Now;
-                        m_OA_OutOfStorage.Operator = m_OA_Procurement.Operator;
-                        m_OA_OutOfStorage.Remark = "";
-                        m_OA_OutOfStorage.WarehouseId = WarehouseId;
-                        m_OA_OutOfStorage.SuppliersId = m_OA_Procurement.SuppliersId;
-                        m_OA_OutOfStorage.AllMoney = m_OA_Procurement.AllMoney;
-                        m_OA_OutOfStorage.InfoType = "鍏ュ簱";
-                        m_OA_OutOfStorage.Price = m_OA_Procurement.Price;
-                        m_OA_OutOfStorage.Quantity = m_OA_Procurement.Quantity;
-                        m_OA_OutOfStorage.BrandId = m_OA_Procurement.BrandId;
-                        m_OA_OutOfStorage.SpecificationId = m_OA_Procurement.SpecificationId;
-                        m_OA_OutOfStorage.PaperWeightId = m_OA_Procurement.PaperWeightId;
-                        m_OA_OutOfStorage.TanPrice = m_OA_Procurement.TanPrice ?? 0;
-                        isSuccess = InsertModel(m_OA_Inventory, m_OA_OutOfStorage);
+                            //鍑哄叆搴撲俊鎭〃瀵硅薄
+                            m_OA_OutOfStorage.FirmId = m_OA_Procurement.FirmId;
+                            m_OA_OutOfStorage.GoodsId = m_OA_Procurement.GoodsId;
+                            m_OA_OutOfStorage.CargoSpaceId = 0;
+                            m_OA_OutOfStorage.LastUpdateTime = DateTime.Now;
+                            m_OA_OutOfStorage.Operator = m_OA_Procurement.Operator;
+                            m_OA_OutOfStorage.Remark = "";
+                            m_OA_OutOfStorage.WarehouseId = WarehouseId;
+                            m_OA_OutOfStorage.SuppliersId = m_OA_Procurement.SuppliersId;
+                            m_OA_OutOfStorage.AllMoney = m_OA_Procurement.AllMoney;
+                            m_OA_OutOfStorage.InfoType = "鍏ュ簱";
+                            m_OA_OutOfStorage.Price = m_OA_Procurement.Price;
+                            m_OA_OutOfStorage.Quantity = m_OA_Procurement.Quantity;
+                            m_OA_OutOfStorage.BrandId = m_OA_Procurement.BrandId;
+                            m_OA_OutOfStorage.SpecificationId = m_OA_Procurement.SpecificationId;
+                            m_OA_OutOfStorage.PaperWeightId = m_OA_Procurement.PaperWeightId;
+                            m_OA_OutOfStorage.TanPrice = m_OA_Procurement.TanPrice ?? 0;
+                            isSuccess = InsertModel(m_OA_Inventory, m_OA_OutOfStorage);
+                        }
+                        
 
                         if (isSuccess)
                         {

--
Gitblit v1.9.1