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/AbstractFactory/Factory.cs | 112 +++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 107 insertions(+), 5 deletions(-)
diff --git a/CY_ECommercePlatform/AbstractFactory/Factory.cs b/CY_ECommercePlatform/AbstractFactory/Factory.cs
index 2d6fb2e..4ebce72 100644
--- a/CY_ECommercePlatform/AbstractFactory/Factory.cs
+++ b/CY_ECommercePlatform/AbstractFactory/Factory.cs
@@ -110,16 +110,16 @@
if (DALInterface.None == dalInterface || 0 == dalInterface)
return null;//浼犲叆鍊间负鏃犳晥鍊兼椂鐩存帴鏀惧洖绌�
- string cashKey = dalInterface.ToString();//鑾峰彇缂撳瓨閿�
- object dal = CACHE.RetrieveObject(cashKey);//浠庣紦瀛樿幏鍙栬闂璞�
-
+ //string cashKey = dalInterface.ToString();//鑾峰彇缂撳瓨閿�
+ //object dal = CACHE.RetrieveObject(cashKey);//浠庣紦瀛樿幏鍙栬闂璞�
+ object dal = null;
if (null == dal && null != OBJECT_PATH && OBJECT_PATH.ContainsKey(dalInterface))//娌℃湁琚紦瀛樹笖鏈夊璇ユ帴鍙ｈ繘琛岄厤缃�
{
string path = string.Format("{0}.{1}", GetDALPath(), OBJECT_PATH[dalInterface]);
Assembly abl = GetDALAssembly();
dal = abl.CreateInstance(path);
- CACHE.AddObject(cashKey, dal);
+ //CACHE.AddObject(cashKey, dal);
}
else
{
@@ -201,6 +201,8 @@
OBJECT_PATH.Add(DALInterface.IOA_CommodityDAL, "OA_CommodityDAL");
OBJECT_PATH.Add(DALInterface.IOA_CommoditySpeciAssociateDAL, "OA_CommoditySpeciAssociateDAL");
OBJECT_PATH.Add(DALInterface.IOA_CorporateClientsDAL, "OA_CorporateClientsDAL");
+ //鏂板鍔犲姙鍏郴缁熷悎浣滃鎴风殑鍚堝悓琛�
+ OBJECT_PATH.Add(DALInterface.IOA_CorporateClientsContractDAL, "OA_SpecificationDAL");
OBJECT_PATH.Add(DALInterface.IOA_CustomerAccessRecordDAL, "OA_CustomerAccessRecordDAL");
OBJECT_PATH.Add(DALInterface.IOA_CustomerCommunicationsDAL, "OA_CustomerCommunicationsDAL");
OBJECT_PATH.Add(DALInterface.IOA_FirmAccountDAL, "OA_FirmAccountDAL");
@@ -215,6 +217,7 @@
OBJECT_PATH.Add(DALInterface.IOA_ProcurementDAL, "OA_ProcurementDAL");
OBJECT_PATH.Add(DALInterface.IOA_RemittanceAdviceDAL, "OA_RemittanceAdviceDAL");
OBJECT_PATH.Add(DALInterface.IOA_SpecificationDAL, "OA_SpecificationDAL");
+
OBJECT_PATH.Add(DALInterface.IOA_StaffDAL, "OA_StaffDAL");
OBJECT_PATH.Add(DALInterface.IOA_StaffRoleRelDAL, "OA_StaffRoleRelDAL");
OBJECT_PATH.Add(DALInterface.IOA_SubjectSetDAL, "OA_SubjectSetDAL");
@@ -228,6 +231,7 @@
OBJECT_PATH.Add(DALInterface.IOA_CarExaminedDAL, "OA_CarExaminedDAL");
OBJECT_PATH.Add(DALInterface.IOA_CarInsuranceDAL, "OA_CarInsuranceDAL");
OBJECT_PATH.Add(DALInterface.IOA_CarMaintenanceDAL, "OA_CarMaintenanceDAL");
+ OBJECT_PATH.Add(DALInterface.IOA_CarrepairDAL, "OA_CarrepairDAL");
OBJECT_PATH.Add(DALInterface.IOA_CarManageDAL, "OA_CarManageDAL");
OBJECT_PATH.Add(DALInterface.IOA_CarTransferDAL, "OA_CarTransferDAL");
OBJECT_PATH.Add(DALInterface.IOA_CarViolationDAL, "OA_CarViolationDAL");
@@ -255,6 +259,21 @@
OBJECT_PATH.Add(DALInterface.IOA_WageAwardPunishDAL, "OA_WageAwardPunishDAL");
OBJECT_PATH.Add(DALInterface.IOA_DeliverPlanDAL, "OA_DeliverPlanDAL");
OBJECT_PATH.Add(DALInterface.IOA_KipiaoshenqingDAL, "OA_KipiaoshenqingDAL");
+ OBJECT_PATH.Add(DALInterface.IOA_KaipiaonewcuishouDAL, "OA_KaipiaonewcuishouDAL");
+ OBJECT_PATH.Add(DALInterface.IOA_KaipiaonewhuikuanDAL, "OA_KaipiaonewhuikuanDAL");
+ OBJECT_PATH.Add(DALInterface.IOA_KaipiaoJineQuerenDAL, "OA_KaipiaoJineQuerenDAL");
+ OBJECT_PATH.Add(DALInterface.IOA_FukuanshenqingDAL, "OA_FukuanshenqingDAL");
+ OBJECT_PATH.Add(DALInterface.IOA_BaozhengjincuishouDAL, "OA_BaozhengjincuishouDAL");
+ OBJECT_PATH.Add(DALInterface.IOA_BaozhengjinDAL, "OA_BaozhengjinDAL");
+ OBJECT_PATH.Add(DALInterface.IOA_WorkPlan_shenpiDAL, "OA_WorkPlan_shenpiDAL");
+ OBJECT_PATH.Add(DALInterface.IOA_WorkPlan_attachmentDAL, "OA_WorkPlan_attachmentDAL");
+ OBJECT_PATH.Add(DALInterface.IOA_ShejijijianDAL, "OA_ShejijijianDAL");
+ OBJECT_PATH.Add(DALInterface.IOA_DeliverPlanPaicheDAL, "OA_DeliverPlanPaicheDAL");
+ OBJECT_PATH.Add(DALInterface.IOA_DriverRecordDAL, "OA_DriverRecordDAL");
+ OBJECT_PATH.Add(DALInterface.IOA_ShiJuanBiaoQianDAL, "OA_ShiJuanBiaoQianDAL");
+ OBJECT_PATH.Add(DALInterface.IOA_KaipiaonewDAL, "OA_KaipiaonewDAL");
+ OBJECT_PATH.Add(DALInterface.ICoreCmsPlanOrderDAL, "CoreCmsPlanOrderDAL");
+ OBJECT_PATH.Add(DALInterface.ICoreCmsPlanOrderItemDAL, "CoreCmsPlanOrderItemDAL");
OBJECT_PATH.Add(DALInterface.IOA_YujihuikuanDAL, "OA_YujihuikuanDAL");
OBJECT_PATH.Add(DALInterface.IOA_CuikuanjiluDAL, "OA_CuikuanjiluDAL");
#endregion
@@ -347,6 +366,7 @@
OBJECT_PATH.Add(DALInterface.IPVCFastCostDAL, "PVCFastCostDAL");
OBJECT_PATH.Add(DALInterface.IPVCAfterCostDAL, "PVCAfterCostDAL");
OBJECT_PATH.Add(DALInterface.IPaperTypeDAL, "PaperTypeDAL");
+ OBJECT_PATH.Add(DALInterface.IWorkBookTypeDAL, "WorkBookTypeDAL");
OBJECT_PATH.Add(DALInterface.IStickyHandBagCostDAL, "StickyHandBagCostDAL");
OBJECT_PATH.Add(DALInterface.IStickEnvelopeCostDAL, "StickEnvelopeCostDAL");
OBJECT_PATH.Add(DALInterface.IRopeCostDAL, "RopeCostDAL");
@@ -641,6 +661,11 @@
/// 鍔炲叕绯荤粺鍚堜綔瀹㈡埛-鏁版嵁搴撴搷浣滄帴鍙�
/// </summary>
IOA_CorporateClientsDAL = 76,
+
+ /// <summary>
+ /// 鍔炲叕绯荤粺鍚堜綔瀹㈡埛鍚堝悓闄勪欢-鏁版嵁搴撴搷浣滄帴鍙� 寤栨柊澧炲姞
+ /// </summary>
+ IOA_CorporateClientsContractDAL = 1176,
/// <summary>
/// 鍔炲叕绯荤粺鎰忓悜瀹㈡埛璁块棶璁板綍-鏁版嵁搴撴搷浣滄帴鍙�
/// </summary>
@@ -738,7 +763,7 @@
/// </summary>
IOA_WorkPlanDAL = 100,
/// <summary>
- /// 杞﹁締骞村璁板綍鏁版嵁璁块棶鎺ュ彛
+ /// 杞﹁締骞存璁板綍鏁版嵁璁块棶鎺ュ彛
/// </summary>
IOA_CarExaminedDAL = 101,
/// <summary>
@@ -749,6 +774,10 @@
/// 杞﹁締淇濆吇璁板綍鏁版嵁璁块棶鎺ュ彛
/// </summary>
IOA_CarMaintenanceDAL = 103,
+ /// <summary>
+ /// 杞﹁締缁翠慨璁板綍鏁版嵁璁块棶鎺ュ彛
+ /// </summary>
+ IOA_CarrepairDAL = 666,
/// <summary>
/// 杞﹁締绠＄悊鏁版嵁璁块棶鎺ュ彛
/// </summary>
@@ -857,6 +886,77 @@
/// 寮�绁ㄧ敵璇�
/// </summary>
IOA_KipiaoshenqingDAL = 1131,
+ /// <summary>
+ /// 寮�绁ㄧ敵璇�
+ /// </summary>
+ IOA_KaipiaonewcuishouDAL = 1931,
+ /// <summary>
+ /// 寮�绁ㄧ敵璇�
+ /// </summary>
+ IOA_KaipiaonewhuikuanDAL = 1933,
+ /// <summary>
+ /// 寮�绁ㄧ敵璇�
+ /// </summary>
+ IOA_KaipiaoJineQuerenDAL = 1934,
+ /// <summary>
+ /// 寮�绁ㄧ敵璇�
+ /// </summary>
+ IOA_FukuanshenqingDAL = 1935,
+ /// <summary>
+ /// 寮�绁ㄧ敵璇�
+ /// </summary>
+ IOA_BaozhengjincuishouDAL = 1936,
+ /// <summary>
+ /// 寮�绁ㄧ敵璇�
+ /// </summary>
+ IOA_BaozhengjinDAL = 1937,
+
+ /// <summary>
+ /// 寮�绁ㄧ敵璇�
+ /// </summary>
+ IOA_WorkPlan_shenpiDAL = 1938,
+
+ /// <summary>
+ /// 寮�绁ㄧ敵璇�
+ /// </summary>
+ IOA_WorkPlan_attachmentDAL = 1939,
+
+ /// <summary>
+ /// 寮�绁ㄧ敵璇�
+ /// </summary>
+ IOA_ShejijijianDAL = 1940,
+
+ /// <summary>
+ /// 閫佽揣瀹夋帓
+ /// </summary>
+ IOA_DeliverPlanPaicheDAL = 1941,
+
+
+ /// <summary>
+ /// 閫佽揣瀹夋帓
+ /// </summary>
+ IOA_DriverRecordDAL = 1942,
+
+ /// <summary>
+ /// 璇曞嵎鏍囩
+ /// </summary>
+ IOA_ShiJuanBiaoQianDAL = 1943,
+
+
+ /// <summary>
+ /// 寮�绁ㄧ敵璇�
+ /// </summary>
+ IOA_KaipiaonewDAL = 1932,
+
+ /// <summary>
+ /// 璁″垝璁㈠崟
+ /// </summary>
+ ICoreCmsPlanOrderDAL = 1231,
+
+ /// <summary>
+ /// 璁″垝璁㈠崟鏄庣粏
+ /// </summary>
+ ICoreCmsPlanOrderItemDAL = 1331,
/// <summary>
/// 棰勮鏀舵鏃堕棿
/// </summary>
@@ -1090,6 +1190,8 @@
IPaperTypeDAL = 262,
+ IWorkBookTypeDAL = 500,
+
IStickyHandBagCostDAL = 263,
IStickEnvelopeCostDAL = 264,
--
Gitblit v1.9.1