From a7e05ebe00fdcb649c012e5afc4a42a8d631e824 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期三, 02 四月 2025 08:38:24 +0800
Subject: [PATCH] 删除客户管理查询条件中的“客户编号” 完成 新增订单---黑白印件 的后道工序最右边增加一个“口 竖式”，同前面套号、压痕一样，默认不勾选，是竖式的业务经理自己下单时勾选 完成提交外协付款申请时，增加上传审批证明的上传图片功能，可以添加多张图片；查询列表中增加“付款状态：全部、已付款、未付款”查询条件，默认全部；“完工状态”改为默认未完工 完成请示批复----付款申请 中也要向上面的需求一样，增加上传审批证明的上传图片功能，可以添加多张图片 完成在“请示批复”中进行“批复”操作的时候要能查看上传的审批图片 完成包装要求”要显示在打印的订单中 完成包装要求”要显示在打印的订单中 完成收据联单的新增订单中，纸张选无碳纸时，不显示“品牌”、“克重”，在联数的后面增加颜色选择：“颜色：上白下红”（匹配联数）订单管理中的“订单状态”删除，删除后新增两个状态：“完工状态：全部、未完工、已完工”和“送货状态：全部、已送货、未送货” 完成请示批复中默认“未批复” 完成请示批复中默认“未批复” 完成
---
CY_ECommercePlatform/CY.BLL/OA/OA_OutOfStorageBLL.cs | 72 +++++++++++++++++++-----------------
1 files changed, 38 insertions(+), 34 deletions(-)
diff --git a/CY_ECommercePlatform/CY.BLL/OA/OA_OutOfStorageBLL.cs b/CY_ECommercePlatform/CY.BLL/OA/OA_OutOfStorageBLL.cs
index df7cbed..5e5e08c 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();
@@ -113,40 +114,43 @@
m_OA_Procurement = _OA_ProcurementBLL.SelectSingleModel(Keyid);
m_OA_Procurement.PurchaseStatusId = 201;
m_OA_Procurement.Remark = 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