From 51aebb52e3f964ad5d0e96c6b92ae8e455b24ceb Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期五, 10 四月 2026 13:08:17 +0800
Subject: [PATCH] 需要修改的,   不选板材,直接按照板材规格扣减库存。  发版套数不填的话就是1.  扣减库存的量就是  数量*发版套数 20260410  试卷 6年级添加 答题卡 选项  完成

---
 CY_ECommercePlatform/CY.WebForm/Pages/business/AgMergerOrderEdit.aspx.cs |   46 ++++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 44 insertions(+), 2 deletions(-)

diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgMergerOrderEdit.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgMergerOrderEdit.aspx.cs
index b0d1827..00ff908 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgMergerOrderEdit.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgMergerOrderEdit.aspx.cs
@@ -1002,7 +1002,7 @@
                                         m_OA_OutOfStorageOld.GoodsId = m_OA_InventoryOld.GoodsId;
                                         m_OA_OutOfStorageOld.CargoSpaceId = 0;
                                         m_OA_OutOfStorageOld.WarehouseId = m_OA_InventoryOld.WarehouseId;
-                                        m_OA_OutOfStorageOld.InfoType = "纭鍑哄簱";
+                                        m_OA_OutOfStorageOld.InfoType = "鍑哄簱";
                                         m_OA_OutOfStorageOld.SuppliersId = 0;
                                         m_OA_OutOfStorageOld.Price = 0;
                                         m_OA_OutOfStorageOld.Quantity = PMS_PaperCount1_NEW[Array.IndexOf(PSF_PaperId_NEW, item)].ToInt32() ?? 0;
@@ -1014,7 +1014,10 @@
                                         m_OA_OutOfStorageOld.BrandId = m_OA_InventoryOld.BrandId;
                                         m_OA_OutOfStorageOld.PaperWeightId = m_OA_InventoryOld.PaperWeightId;
                                         m_OA_OutOfStorageOld.SpecificationId = m_OA_InventoryOld.SpecificationId;
+                                        m_OA_OutOfStorageOld.InventoryId = m_OA_InventoryOld.Keyid;
                                         m_OA_OutOfStorageList.Add(m_OA_OutOfStorageOld);
+                                        m_OA_InventoryOld.InventoryCount = m_OA_InventoryOld.InventoryCount - m_OA_OutOfStorageOld.Quantity;
+                                        m_OA_InventoryList.Add(m_OA_InventoryOld);
                                     }
                                 }
                             }
@@ -1028,7 +1031,7 @@
                                     m_OA_OutOfStorage.GoodsId = m_OA_Inventory.GoodsId;
                                     m_OA_OutOfStorage.CargoSpaceId = 0;
                                     m_OA_OutOfStorage.WarehouseId = m_OA_Inventory.WarehouseId;
-                                    m_OA_OutOfStorage.InfoType = "纭鍑哄簱";
+                                    m_OA_OutOfStorage.InfoType = "鍑哄簱";
                                     m_OA_OutOfStorage.SuppliersId = 0;
                                     m_OA_OutOfStorage.Price = 0;
                                     if (j == 0)
@@ -1051,10 +1054,49 @@
                                     m_OA_OutOfStorage.BrandId = m_OA_Inventory.BrandId;
                                     m_OA_OutOfStorage.PaperWeightId = m_OA_Inventory.PaperWeightId;
                                     m_OA_OutOfStorage.SpecificationId = m_OA_Inventory.SpecificationId;
+                                    m_OA_OutOfStorage.InventoryId = m_OA_Inventory.Keyid;
                                     m_OA_OutOfStorageList.Add(m_OA_OutOfStorage);
+                                    m_OA_Inventory.InventoryCount = m_OA_Inventory.InventoryCount - m_OA_OutOfStorage.Quantity;
+                                    m_OA_InventoryList.Add(m_OA_Inventory);
                                 }
                             }
                         }
+
+                        var CTPSpecNamei = CTPSpecName[i];
+                        var CTPCounti = CTPCount[i];
+                        var PSF_Fabantaoshui = PSF_Fabantaoshu[i];
+                        if (!string.IsNullOrEmpty(CTPCounti))
+                        {
+                            OA_Inventory m_OA_InventoryOld = bll_OA_InventoryBLL.SelecetModelDetailInfoList(CurrentUser.MemberId, "", "", "鏉挎潗", "", CTPSpecNamei).FirstOrDefault();
+                            if (m_OA_InventoryOld != null)
+                            {
+                                OA_OutOfStorage m_OA_OutOfStorageOld = new OA_OutOfStorage();
+                                m_OA_OutOfStorageOld.FirmId = CurrentUser.MemberId;
+                                m_OA_OutOfStorageOld.GoodsId = m_OA_InventoryOld.GoodsId;
+                                m_OA_OutOfStorageOld.CargoSpaceId = 0;
+                                m_OA_OutOfStorageOld.WarehouseId = m_OA_InventoryOld.WarehouseId;
+                                m_OA_OutOfStorageOld.InfoType = "鍑哄簱";
+                                m_OA_OutOfStorageOld.SuppliersId = 0;
+                                m_OA_OutOfStorageOld.Price = 0;
+                                m_OA_OutOfStorageOld.Quantity = CTPCounti.ToInt32() ?? 0;
+                                if (!string.IsNullOrEmpty(PSF_Fabantaoshui))
+                                {
+                                    m_OA_OutOfStorageOld.Quantity = m_OA_OutOfStorageOld.Quantity * (PSF_Fabantaoshui.ToInt32() ?? 0);
+                                }
+                                m_OA_OutOfStorageOld.AllMoney = 0;
+                                m_OA_OutOfStorageOld.LastUpdateTime = DateTime.Now;
+                                m_OA_OutOfStorageOld.Operator = CurrentUser.ShortName;
+                                m_OA_OutOfStorageOld.Remark = "";
+                                m_OA_OutOfStorageOld.TanPrice = 0;
+                                m_OA_OutOfStorageOld.BrandId = m_OA_InventoryOld.BrandId;
+                                m_OA_OutOfStorageOld.PaperWeightId = m_OA_InventoryOld.PaperWeightId;
+                                m_OA_OutOfStorageOld.SpecificationId = m_OA_InventoryOld.SpecificationId;
+                                m_OA_OutOfStorageOld.InventoryId = m_OA_InventoryOld.Keyid;
+                                m_OA_OutOfStorageList.Add(m_OA_OutOfStorageOld);
+                                m_OA_InventoryOld.InventoryCount = m_OA_InventoryOld.InventoryCount - m_OA_OutOfStorageOld.Quantity;
+                                m_OA_InventoryList.Add(m_OA_InventoryOld);
+                            }
+                        }
                     }
                 }
 

--
Gitblit v1.9.1