From fa8310bfd01c7f3123077d6d2f6a96a92645a034 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期四, 09 四月 2026 08:43:30 +0800
Subject: [PATCH] 板材填了就减少库存   根据  板材规格    数量(张)和  发版套数  算出库存需要减少的量,减少库存  完成

---
 CY_ECommercePlatform/CY.BLL/OA/OA_OutOfStorageBLL.cs                      |   24 ++++++
 CY_ECommercePlatform/CY.SQLDAL/OA/OA_OutOfStorageDAL.cs                   |   23 +++++
 CY_ECommercePlatform/CY.WebForm/Pages/business/AgMergerOrderList.aspx.cs  |   77 ++++++++++++++++++
 CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderEdit.aspx    |   17 ++--
 CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderList.aspx.cs |   73 ++++++++++++++++++
 CY_ECommercePlatform/CY.IDAL/OA/IOA_OutOfStorageDAL.cs                    |    2 
 CY_ECommercePlatform/CY.SQLDAL/EC/EC_SpecialOrdersDAL.cs                  |    2 
 CY_ECommercePlatform/CY.WebForm/Pages/business/AgMergerOrderEdit.aspx     |   17 ++--
 8 files changed, 216 insertions(+), 19 deletions(-)

diff --git a/CY_ECommercePlatform/CY.BLL/OA/OA_OutOfStorageBLL.cs b/CY_ECommercePlatform/CY.BLL/OA/OA_OutOfStorageBLL.cs
index 8ae4dcc..5beff3b 100644
--- a/CY_ECommercePlatform/CY.BLL/OA/OA_OutOfStorageBLL.cs
+++ b/CY_ECommercePlatform/CY.BLL/OA/OA_OutOfStorageBLL.cs
@@ -219,5 +219,29 @@
         {
             return outOfStorageDAL.getModelList(pa, FirmId, Keyids);
         }
+
+
+        public IEnumerable<Model.OA_OutOfStorage> getModelListByRemark(Guid FirmId, string Remark)
+        {
+            return outOfStorageDAL.getModelListByRemark( FirmId, Remark);
+        }
+
+        /// <summary>
+        /// 鍒犻櫎鍚堜綔瀹㈡埛
+        /// </summary>
+        /// <param name="rType"></param>
+        /// <returns></returns>
+        public bool DeleteModel(CY.Model.OA_OutOfStorage rType)
+        {
+            try
+            {
+                outOfStorageDAL.DeleteModel(rType);
+            }
+            catch (Exception ex)
+            {
+                throw ex;
+            }
+            return true;
+        }
     }
 }
diff --git a/CY_ECommercePlatform/CY.IDAL/OA/IOA_OutOfStorageDAL.cs b/CY_ECommercePlatform/CY.IDAL/OA/IOA_OutOfStorageDAL.cs
index c0da51f..8917ec0 100644
--- a/CY_ECommercePlatform/CY.IDAL/OA/IOA_OutOfStorageDAL.cs
+++ b/CY_ECommercePlatform/CY.IDAL/OA/IOA_OutOfStorageDAL.cs
@@ -39,5 +39,7 @@
         OA_OutOfStorage GetModelInfo(int? keyid);
 
         IEnumerable<Model.OA_OutOfStorage> getModelList(Pagination pa, Guid FirmId, string Keyids);
+
+        IEnumerable<Model.OA_OutOfStorage> getModelListByRemark(Guid FirmId, string Remark);
     }
 }
diff --git a/CY_ECommercePlatform/CY.SQLDAL/EC/EC_SpecialOrdersDAL.cs b/CY_ECommercePlatform/CY.SQLDAL/EC/EC_SpecialOrdersDAL.cs
index 19902ee..0b57792 100644
--- a/CY_ECommercePlatform/CY.SQLDAL/EC/EC_SpecialOrdersDAL.cs
+++ b/CY_ECommercePlatform/CY.SQLDAL/EC/EC_SpecialOrdersDAL.cs
@@ -314,7 +314,7 @@
                     }
                     foreach (var m_OA_OutOfStorage in m_OA_OutOfStorageList)
                     {
-                        m_OA_OutOfStorage.Remark = string.Format("<span class='a_under' title='鐐瑰嚮鏌ョ湅鏂藉伐鍗曡鎯�' onclick=\"ViewModel_Special('" + m_EC_SpecialOrders.PO_OrderId + "')\">涓撶増锛�" + m_EC_SpecialOrders.PSO_OrderNum + "</span>");
+                        m_OA_OutOfStorage.Remark = string.Format("<span class='a_under' title='鐐瑰嚮鏌ョ湅鏂藉伐鍗曡鎯�' onclick=\"ViewModel_Special('" + m_EC_SpecialOrders.Keyid + "')\">涓撶増锛�" + m_EC_SpecialOrders.PSO_OrderNum + "</span>");
                         dal_OA_OutOfStorageDAL.InserModel(m_OA_OutOfStorage);
                     }
                 }
diff --git a/CY_ECommercePlatform/CY.SQLDAL/OA/OA_OutOfStorageDAL.cs b/CY_ECommercePlatform/CY.SQLDAL/OA/OA_OutOfStorageDAL.cs
index 4dc40d5..0683f84 100644
--- a/CY_ECommercePlatform/CY.SQLDAL/OA/OA_OutOfStorageDAL.cs
+++ b/CY_ECommercePlatform/CY.SQLDAL/OA/OA_OutOfStorageDAL.cs
@@ -274,5 +274,28 @@
 
             return _dataBase.SelectModelPage<Model.OA_OutOfStorage>(pa, selTarget, fromSource, "  a.LastUpdateTime DESC  ");
         }
+
+
+
+
+        public IEnumerable<Model.OA_OutOfStorage> getModelListByRemark(Guid FirmId, string Remark)
+        {
+            try
+            {
+                string Condition = "  FirmId='" + FirmId + "'";
+
+            if (!string.IsNullOrEmpty(Remark))
+            {
+                Condition += string.Format(" and  Remark = '{0}'", Remark);
+            }
+            IList<OA_OutOfStorage> result = _dataBase.SelectModel<OA_OutOfStorage>("*", "OA_OutOfStorage", Condition) as IList<OA_OutOfStorage>;//鎵ц鏌ヨ
+
+            return result;//杩斿洖缁撴灉
+            }
+            catch (Exception ex)
+            {
+                throw ex;
+            }
+        }
     }
 }
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgMergerOrderEdit.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgMergerOrderEdit.aspx
index 3064c67..63cf9c9 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgMergerOrderEdit.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgMergerOrderEdit.aspx
@@ -286,7 +286,7 @@
                         </div>
                                        </td>
                                  <td>
-                                      <input type="text" value_ppwaerid="<%#Container.ItemIndex + 1%>" class="txt CTPCount" name="CTPCount"  value="<%#Eval("PSF_CTPCount")%>" style=" width: 80px" />
+                                      <input type="text" value_ppwaerid="<%#Container.ItemIndex + 1%>" class="txt CTPCount lbCTPCount" name="CTPCount"  value="<%#Eval("PSF_CTPCount")%>" style=" width: 80px" />
 
                                        </td>
                                  <td>
@@ -414,13 +414,13 @@
                                 <td colspan="7">
                                 </td>
                             </tr>
-                            <tr style="display:none;">
-                                <td style="display:none;">
+                            <tr >
+                                <td >
                                     <select keepdefaultstyle="true" value_selwaerid="<%#Container.ItemIndex + 1%>" name="selPlateType" id="selPlateType">
                                         <option value="鏈巶CTP">鏈巶CTP</option>
                                         <option value="鑷甫CTP">鑷甫CTP</option>
-                                        <option value="鑷甫鑿叉灄">鑷甫鑿叉灄</option>
-                                        <option value="鏈巶鑿叉灄">鏈巶鑿叉灄</option>
+                                      <%--  <option value="鑷甫鑿叉灄">鑷甫鑿叉灄</option>
+                                        <option value="鏈巶鑿叉灄">鏈巶鑿叉灄</option>--%>
                                     </select>
                                     <label class="Btnb CangKubtn_o" style="margin-left: 10px;">
                                         <input type="button" value_waerid="<%#Container.ItemIndex + 1%>" class="Btn FromWarehouseByBanCai" value="杩炴帴浠撳簱" id="BtnStorePlate" /></label><input type="hidden" value_ppwaerid="<%#Container.ItemIndex + 1%>" name="PSF_PaperId2" />
@@ -811,9 +811,9 @@
                 } else if ($(this).val() == "鑷甫CTP") {
 
                     $(".FromWarehouseByBanCai[value_WaerId='" + value_SelWaerId + "']").hide();
-                    $(".CTPSpecName[value_ppwaerid='" + value_SelWaerId + "']").hide();
-                    $(".lbCTPCount[value_ppwaerid='" + value_SelWaerId + "']").hide();
-                    $(".tdCTPCount[value_ppwaerid='" + value_SelWaerId + "']").hide();
+                    $(".CTPSpecName[value_ppwaerid='" + value_SelWaerId + "']").show();
+                    $(".lbCTPCount[value_ppwaerid='" + value_SelWaerId + "']").show();
+                    $(".tdCTPCount[value_ppwaerid='" + value_SelWaerId + "']").show();
                     $(".selCTPSpec[value_ppwaerid='" + value_SelWaerId + "']").show();
                     $(".selFilmSpec[value_ppwaerid='" + value_SelWaerId + "']").hide();
 
@@ -821,6 +821,7 @@
                     $(".tdPSSpec[value_ppwaerid='" + value_SelWaerId + "']").hide();
                     $(".lbPSCount[value_ppwaerid='" + value_SelWaerId + "']").hide();
                     $(".tdPsCount[value_ppwaerid='" + value_SelWaerId + "']").hide();
+                    $("input[name='PSF_PaperId2'][value_ppwaerid='" + value_WaerId + "']").val("");
                 }
                 else {
 
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgMergerOrderList.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgMergerOrderList.aspx.cs
index 98c5bcf..9004e55 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgMergerOrderList.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgMergerOrderList.aspx.cs
@@ -22,7 +22,9 @@
         EC_MergerSingleBLL bll_EC_MergerSingleBLL = null;
         OA_CorporateClientsBLL bll_OA_CorporateClientsBLL = null;
         EC_OrderBasicBLL _eC_OrderBasicBLL   = null;
- 
+        OA_OutOfStorageBLL _OA_OutOfStorageBLL = null;
+        OA_InventoryBLL _OA_InventoryBLL = null;
+
 
         //鍒濆鍖�
         public AgMergerOrderList()
@@ -30,6 +32,8 @@
             bll_EC_MergerSingleBLL = new EC_MergerSingleBLL();
             bll_OA_CorporateClientsBLL = new OA_CorporateClientsBLL();
             _eC_OrderBasicBLL = new EC_OrderBasicBLL();
+            _OA_OutOfStorageBLL = new OA_OutOfStorageBLL();
+            _OA_InventoryBLL = new OA_InventoryBLL();
         }
 
         //椤甸潰鍔犺浇
@@ -47,6 +51,40 @@
                 EC_MergerSingle model = bll_EC_MergerSingleBLL.GetModelByKeyid(Request["delete"].ToInt32());
                 if (model != null && model.Keyid != null)
                 {
+                    //閫�鍥炲簱瀛�
+                    var oA_OutOfStorages = _OA_OutOfStorageBLL.getModelListByRemark(model.Member_id, "<span class=''a_under'' title=''鐐瑰嚮鏌ョ湅鏂藉伐鍗曡鎯�'' onclick=\"ViewModel_Merger(''" + model.Keyid + "'')\">鍚堢増锛�" + model.PMS_OrderNum + "</span>").ToList();
+                    if (oA_OutOfStorages != null && oA_OutOfStorages.Count > 0)
+                    {
+                        foreach (var outOfStorage in oA_OutOfStorages)
+                        {
+                            if (outOfStorage.InfoType == "纭鍑哄簱")
+                            {
+                                _OA_OutOfStorageBLL.DeleteModel(outOfStorage);
+                            }
+                            else if (outOfStorage.InfoType == "鍑哄簱")
+                            {
+
+
+                                OA_Inventory Inventory = new OA_Inventory();
+                                Inventory.BrandId = outOfStorage.BrandId;
+                                Inventory.FirmId = outOfStorage.FirmId;
+                                Inventory.GoodsId = outOfStorage.GoodsId;
+                                Inventory.LastUpdateTime = DateTime.Now;
+                                Inventory.WarehouseId = outOfStorage.WarehouseId;
+                                Inventory.SpecificationId = outOfStorage.SpecificationId;
+                                Inventory.PaperWeightId = outOfStorage.PaperWeightId;
+
+                                var m_OA_Inventory = _OA_InventoryBLL.IfHasModel(Inventory);
+                                if (m_OA_Inventory != null)//濡傛灉鎵�閫夎揣浣嶅瓨鍦ㄦ浜у搧
+                                {
+
+                                    m_OA_Inventory.InventoryCount = m_OA_Inventory.InventoryCount + outOfStorage.Quantity;
+                                    bool isSuccess = _OA_InventoryBLL.UpdateModel(m_OA_Inventory);
+                                }
+                                _OA_OutOfStorageBLL.DeleteModel(outOfStorage);
+                            }
+                        }
+                    }
                     bll_EC_MergerSingleBLL.DeleteModel(model);
                     JavaScript.MessageBox("鍒犻櫎鎴愬姛", this);
                     Response.Redirect("/Pages/business/AgMergerOrderList.aspx");
@@ -91,7 +129,42 @@
                         }
                     }
 
-                        bll_EC_MergerSingleBLL.DeleteModel(model);
+                    //閫�鍥炲簱瀛�
+                    var oA_OutOfStorages = _OA_OutOfStorageBLL.getModelListByRemark(model.Member_id, "<span class=''a_under'' title=''鐐瑰嚮鏌ョ湅鏂藉伐鍗曡鎯�'' onclick=\"ViewModel_Merger(''" + model.Keyid + "'')\">鍚堢増锛�" + model.PMS_OrderNum + "</span>").ToList();
+                    if (oA_OutOfStorages != null && oA_OutOfStorages.Count > 0)
+                    {
+                        foreach (var outOfStorage in oA_OutOfStorages)
+                        {
+                            if (outOfStorage.InfoType == "纭鍑哄簱")
+                            {
+                                _OA_OutOfStorageBLL.DeleteModel(outOfStorage);
+                            }
+                            else if (outOfStorage.InfoType == "鍑哄簱")
+                            {
+
+
+                                OA_Inventory Inventory = new OA_Inventory();
+                                Inventory.BrandId = outOfStorage.BrandId;
+                                Inventory.FirmId = outOfStorage.FirmId;
+                                Inventory.GoodsId = outOfStorage.GoodsId;
+                                Inventory.LastUpdateTime = DateTime.Now;
+                                Inventory.WarehouseId = outOfStorage.WarehouseId;
+                                Inventory.SpecificationId = outOfStorage.SpecificationId;
+                                Inventory.PaperWeightId = outOfStorage.PaperWeightId;
+
+                                var m_OA_Inventory = _OA_InventoryBLL.IfHasModel(Inventory);
+                                if (m_OA_Inventory != null)//濡傛灉鎵�閫夎揣浣嶅瓨鍦ㄦ浜у搧
+                                {
+
+                                    m_OA_Inventory.InventoryCount = m_OA_Inventory.InventoryCount + outOfStorage.Quantity;
+                                    bool isSuccess = _OA_InventoryBLL.UpdateModel(m_OA_Inventory);
+                                }
+                                _OA_OutOfStorageBLL.DeleteModel(outOfStorage);
+                            }
+                        }
+                    }
+
+                    bll_EC_MergerSingleBLL.DeleteModel(model);
                     JavaScript.MessageBox("鎾ゅ崟鎴愬姛", this);
                     Response.Redirect("/Pages/business/AgMergerOrderList.aspx");
                 }
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderEdit.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderEdit.aspx
index cae6c64..0940640 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderEdit.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderEdit.aspx
@@ -298,7 +298,7 @@
                         </div>
                                        </td>
                                  <td>
-                                      <input type="text" value_ppwaerid="<%#Container.ItemIndex + 1%>" class="txt CTPCount" name="CTPCount"  value="<%#Eval("PSF_CTPCount")%>" style=" width: 80px" />
+                                      <input type="text" value_ppwaerid="<%#Container.ItemIndex + 1%>" class="txt CTPCount lbCTPCount" name="CTPCount"  value="<%#Eval("PSF_CTPCount")%>" style=" width: 80px" />
 
                                        </td>
                                  <td>
@@ -426,13 +426,13 @@
                                 <td colspan="7">
                                 </td>
                             </tr>
-                            <tr style="display:none;">
-                                <td style="display:none;">
+                            <tr >
+                                <td >
                                     <select keepdefaultstyle="true" value_selwaerid="<%#Container.ItemIndex + 1%>" name="selPlateType" id="selPlateType">
                                         <option value="鏈巶CTP">鏈巶CTP</option>
                                         <option value="鑷甫CTP">鑷甫CTP</option>
-                                        <option value="鑷甫鑿叉灄">鑷甫鑿叉灄</option>
-                                        <option value="鏈巶鑿叉灄">鏈巶鑿叉灄</option>
+                                      <%--  <option value="鑷甫鑿叉灄">鑷甫鑿叉灄</option>
+                                        <option value="鏈巶鑿叉灄">鏈巶鑿叉灄</option>--%>
                                     </select>
                                     <label class="Btnb CangKubtn_o" style="margin-left: 10px;">
                                         <input type="button" value_waerid="<%#Container.ItemIndex + 1%>" class="Btn FromWarehouseByBanCai" value="杩炴帴浠撳簱" id="BtnStorePlate" /></label><input type="hidden" value_ppwaerid="<%#Container.ItemIndex + 1%>" name="PSF_PaperId2" />
@@ -884,9 +884,9 @@
                 } else if ($(this).val() == "鑷甫CTP") {
 
                     $(".FromWarehouseByBanCai[value_WaerId='" + value_SelWaerId + "']").hide();
-                    $(".CTPSpecName[value_ppwaerid='" + value_SelWaerId + "']").hide();
-                    $(".lbCTPCount[value_ppwaerid='" + value_SelWaerId + "']").hide();
-                    $(".tdCTPCount[value_ppwaerid='" + value_SelWaerId + "']").hide();
+                    $(".CTPSpecName[value_ppwaerid='" + value_SelWaerId + "']").show();
+                    $(".lbCTPCount[value_ppwaerid='" + value_SelWaerId + "']").show();
+                    $(".tdCTPCount[value_ppwaerid='" + value_SelWaerId + "']").show();
                     $(".selCTPSpec[value_ppwaerid='" + value_SelWaerId + "']").show();
                     $(".selFilmSpec[value_ppwaerid='" + value_SelWaerId + "']").hide();
 
@@ -894,6 +894,7 @@
                     $(".tdPSSpec[value_ppwaerid='" + value_SelWaerId + "']").hide();
                     $(".lbPSCount[value_ppwaerid='" + value_SelWaerId + "']").hide();
                     $(".tdPsCount[value_ppwaerid='" + value_SelWaerId + "']").hide();
+                    $("input[name='PSF_PaperId2'][value_ppwaerid='" + value_WaerId + "']").val("");
                 }
                 else {
 
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderList.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderList.aspx.cs
index 3f9ddfc..49ce842 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderList.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderList.aspx.cs
@@ -21,12 +21,16 @@
     {
         EC_SpecialOrdersBLL bll_EC_SpecialOrdersBLL = null;
         EC_OrderBasicBLL _eC_OrderBasicBLL = null;
+        OA_OutOfStorageBLL _OA_OutOfStorageBLL = null;
+        OA_InventoryBLL _OA_InventoryBLL = null;
 
         //鍒濆鍖�
         public AgSpecialOrderList()
         {
             bll_EC_SpecialOrdersBLL = new EC_SpecialOrdersBLL();
             _eC_OrderBasicBLL = new EC_OrderBasicBLL();
+            _OA_OutOfStorageBLL = new OA_OutOfStorageBLL();
+            _OA_InventoryBLL = new OA_InventoryBLL();
         }
 
         //椤甸潰鍔犺浇
@@ -42,6 +46,41 @@
                 EC_SpecialOrders model = bll_EC_SpecialOrdersBLL.GetModelByKeyid(Request["delete"].ToInt32());
                 if (model != null && model.Keyid != null)
                 {
+                    //閫�鍥炲簱瀛�
+                    var oA_OutOfStorages = _OA_OutOfStorageBLL.getModelListByRemark(model.Memberid, "<span class='a_under' title='鐐瑰嚮鏌ョ湅鏂藉伐鍗曡鎯�' onclick=\"ViewModel_Special('" + model.Keyid + "')\">涓撶増锛�" + model.PSO_OrderNum + "</span>").ToList();
+                    if (oA_OutOfStorages != null && oA_OutOfStorages.Count > 0)
+                    {
+                        foreach (var outOfStorage in oA_OutOfStorages)
+                        {
+                            if (outOfStorage.InfoType == "纭鍑哄簱")
+                            {
+                                _OA_OutOfStorageBLL.DeleteModel(outOfStorage);
+                            }
+                            else if (outOfStorage.InfoType == "鍑哄簱")
+                            {
+
+
+                                OA_Inventory Inventory = new OA_Inventory();
+                                Inventory.BrandId = outOfStorage.BrandId;
+                                Inventory.FirmId = outOfStorage.FirmId;
+                                Inventory.GoodsId = outOfStorage.GoodsId;
+                                Inventory.LastUpdateTime = DateTime.Now;
+                                Inventory.WarehouseId = outOfStorage.WarehouseId;
+                                Inventory.SpecificationId = outOfStorage.SpecificationId;
+                                Inventory.PaperWeightId = outOfStorage.PaperWeightId;
+
+                                var m_OA_Inventory = _OA_InventoryBLL.IfHasModel(Inventory);
+                                if (m_OA_Inventory != null)//濡傛灉鎵�閫夎揣浣嶅瓨鍦ㄦ浜у搧
+                                {
+
+                                    m_OA_Inventory.InventoryCount = m_OA_Inventory.InventoryCount + outOfStorage.Quantity;
+                                    bool isSuccess = _OA_InventoryBLL.UpdateModel(m_OA_Inventory);
+                                }
+                                _OA_OutOfStorageBLL.DeleteModel(outOfStorage);
+                            }
+                        }
+                    }
+
                     bll_EC_SpecialOrdersBLL.DeleteModel(model);
                     JavaScript.MessageBox("鍒犻櫎鎴愬姛", this);
                     Response.Redirect("/Pages/business/AgSpecialOrderList.aspx");
@@ -80,6 +119,40 @@
 
 
                     }
+                    //閫�鍥炲簱瀛�
+                    var oA_OutOfStorages = _OA_OutOfStorageBLL.getModelListByRemark(model.Memberid, "<span class=''a_under'' title=''鐐瑰嚮鏌ョ湅鏂藉伐鍗曡鎯�'' onclick=\"ViewModel_Special(''" + model.Keyid + "'')\">涓撶増锛�" + model.PSO_OrderNum + "</span>").ToList();
+                    if (oA_OutOfStorages != null && oA_OutOfStorages.Count > 0)
+                    {
+                        foreach(var outOfStorage in oA_OutOfStorages)
+                        {
+                            if (outOfStorage.InfoType == "纭鍑哄簱")
+                            {
+                                _OA_OutOfStorageBLL.DeleteModel(outOfStorage);
+                            }
+                            else if(outOfStorage.InfoType == "鍑哄簱")
+                            {
+
+
+                                OA_Inventory Inventory = new OA_Inventory();
+                                Inventory.BrandId = outOfStorage.BrandId;
+                                Inventory.FirmId = outOfStorage.FirmId;
+                                Inventory.GoodsId = outOfStorage.GoodsId;
+                                Inventory.LastUpdateTime = DateTime.Now;
+                                Inventory.WarehouseId = outOfStorage.WarehouseId;
+                                Inventory.SpecificationId = outOfStorage.SpecificationId;
+                                Inventory.PaperWeightId = outOfStorage.PaperWeightId;
+
+                                var m_OA_Inventory = _OA_InventoryBLL.IfHasModel(Inventory);
+                                if (m_OA_Inventory != null)//濡傛灉鎵�閫夎揣浣嶅瓨鍦ㄦ浜у搧
+                                {
+
+                                    m_OA_Inventory.InventoryCount = m_OA_Inventory.InventoryCount + outOfStorage.Quantity;
+                                    bool isSuccess = _OA_InventoryBLL.UpdateModel(m_OA_Inventory);
+                                }
+                                _OA_OutOfStorageBLL.DeleteModel(outOfStorage);
+                            }                      
+                        }
+                    }
 
                     bll_EC_SpecialOrdersBLL.DeleteModel(model);
                     JavaScript.MessageBox("鎾ゅ崟鎴愬姛", this);

--
Gitblit v1.9.1