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.SQLDAL/OA/OA_FukuanshenqingDAL.cs | 19 +++++++++++--------
1 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/CY_ECommercePlatform/CY.SQLDAL/OA/OA_FukuanshenqingDAL.cs b/CY_ECommercePlatform/CY.SQLDAL/OA/OA_FukuanshenqingDAL.cs
index ecd4633..94fb374 100644
--- a/CY_ECommercePlatform/CY.SQLDAL/OA/OA_FukuanshenqingDAL.cs
+++ b/CY_ECommercePlatform/CY.SQLDAL/OA/OA_FukuanshenqingDAL.cs
@@ -23,9 +23,9 @@
/// <summary>
/// 鏌ヨ鏉ユ簮
/// </summary>
- const string FROMSOUCEBEFORE = " ( select distinct ok.*, " +
- " oe.Name as SupplierName " +
- " from [OA_Fukuanshenqing] ok left join [OA_Suppliers] oe on oe.Keyid = ok.[SupplierId] " +
+ const string FROMSOUCEBEFORE = " ( select distinct ok.* " +
+ //" oe.Name as SupplierName " +
+ " from [OA_Fukuanshenqing] ok " +
" where 0=0 ";
@@ -78,13 +78,14 @@
new SqlParameter("@LastUpdateTime",trueModel.LastUpdateTime),
new SqlParameter("@Creater",trueModel.Creater),
new SqlParameter("@Huming",string.IsNullOrEmpty(trueModel.Huming)?"":trueModel.Huming),
+ new SqlParameter("@SupplierName",string.IsNullOrEmpty(trueModel.SupplierName)?"":trueModel.SupplierName),
};
- string sql = "Insert Into OA_Fukuanshenqing ([FirmId],[SupplierId],[Fukuanshenqingstatus],[ApprovalStatus], [Fukuanmoney], [Bank],[AccountID], [Yishoumoney],[Youwufapiao], [Creater],[CreateTime],[Updater],[LastUpdateTime],[Fukuanyongtu],FukuanStatus,remark,DindanId,Huming)"
- + " Values (@FirmId,@SupplierId,@Fukuanshenqingstatus, @ApprovalStatus, @Fukuanmoney, @Bank, @AccountID, @Yishoumoney, @Youwufapiao, @Creater,@CreateTime,@Updater,@LastUpdateTime,@Fukuanyongtu,@FukuanStatus,@remark,@DindanId,@Huming )";
+ string sql = "Insert Into OA_Fukuanshenqing ([FirmId],[SupplierId],[Fukuanshenqingstatus],[ApprovalStatus], [Fukuanmoney], [Bank],[AccountID], [Yishoumoney],[Youwufapiao], [Creater],[CreateTime],[Updater],[LastUpdateTime],[Fukuanyongtu],FukuanStatus,remark,DindanId,Huming,SupplierName)"
+ + " Values (@FirmId,@SupplierId,@Fukuanshenqingstatus, @ApprovalStatus, @Fukuanmoney, @Bank, @AccountID, @Yishoumoney, @Youwufapiao, @Creater,@CreateTime,@Updater,@LastUpdateTime,@Fukuanyongtu,@FukuanStatus,@remark,@DindanId,@Huming,@SupplierName )";
try
{
@@ -130,13 +131,14 @@
new SqlParameter("@LastUpdateTime",trueModel.LastUpdateTime),
new SqlParameter("@Creater",trueModel.Creater),
new SqlParameter("@Huming",string.IsNullOrEmpty(trueModel.Huming)?"":trueModel.Huming),
+ new SqlParameter("@SupplierName",string.IsNullOrEmpty(trueModel.SupplierName)?"":trueModel.SupplierName),
};
- string sql = "Insert Into OA_Fukuanshenqing ([FirmId],[SupplierId],[Fukuanshenqingstatus],[ApprovalStatus], [Fukuanmoney], [Bank],[AccountID], [Yishoumoney],[Youwufapiao], [Creater],[CreateTime],[Updater],[LastUpdateTime],[Fukuanyongtu],FukuanStatus,remark,DindanId,Huming)"
- + " Values (@FirmId,@SupplierId,@Fukuanshenqingstatus, @ApprovalStatus, @Fukuanmoney, @Bank, @AccountID, @Yishoumoney, @Youwufapiao, @Creater,@CreateTime,@Updater,@LastUpdateTime,@Fukuanyongtu,@FukuanStatus,@remark,@DindanId,@Huming )";
+ string sql = "Insert Into OA_Fukuanshenqing ([FirmId],[SupplierId],[Fukuanshenqingstatus],[ApprovalStatus], [Fukuanmoney], [Bank],[AccountID], [Yishoumoney],[Youwufapiao], [Creater],[CreateTime],[Updater],[LastUpdateTime],[Fukuanyongtu],FukuanStatus,remark,DindanId,Huming,SupplierName)"
+ + " Values (@FirmId,@SupplierId,@Fukuanshenqingstatus, @ApprovalStatus, @Fukuanmoney, @Bank, @AccountID, @Yishoumoney, @Youwufapiao, @Creater,@CreateTime,@Updater,@LastUpdateTime,@Fukuanyongtu,@FukuanStatus,@remark,@DindanId,@Huming,@SupplierName )";
int id = 0;
try
{
@@ -186,9 +188,10 @@
new SqlParameter("@LastUpdateTime",trueModel.LastUpdateTime),
new SqlParameter("@Creater",trueModel.Creater),
new SqlParameter("@Huming",string.IsNullOrEmpty(trueModel.Huming)?"":trueModel.Huming),
+ new SqlParameter("@SupplierName",string.IsNullOrEmpty(trueModel.SupplierName)?"":trueModel.SupplierName),
};
- string sql = "Update OA_Fukuanshenqing Set [FirmId]=@FirmId,[SupplierId]=@SupplierId,[Fukuanshenqingstatus]=@Fukuanshenqingstatus,[ApprovalStatus]=@ApprovalStatus, [Fukuanmoney]=@Fukuanmoney, [Bank]=@Bank,[AccountID]=@AccountID, [Yishoumoney]=@Yishoumoney,[Youwufapiao]=@Youwufapiao, [Creater]=@Creater,[CreateTime]=@CreateTime,[Updater]=@Updater,[LastUpdateTime]=@LastUpdateTime,Fukuanyongtu=@Fukuanyongtu,FukuanStatus=@FukuanStatus,remark=@remark,DindanId=@DindanId,Huming=@Huming where [Keyid] =@Keyid ";
+ string sql = "Update OA_Fukuanshenqing Set [FirmId]=@FirmId,[SupplierId]=@SupplierId,[Fukuanshenqingstatus]=@Fukuanshenqingstatus,[ApprovalStatus]=@ApprovalStatus, [Fukuanmoney]=@Fukuanmoney, [Bank]=@Bank,[AccountID]=@AccountID, [Yishoumoney]=@Yishoumoney,[Youwufapiao]=@Youwufapiao, [Creater]=@Creater,[CreateTime]=@CreateTime,[Updater]=@Updater,[LastUpdateTime]=@LastUpdateTime,Fukuanyongtu=@Fukuanyongtu,FukuanStatus=@FukuanStatus,remark=@remark,DindanId=@DindanId,Huming=@Huming,SupplierName=@SupplierName where [Keyid] =@Keyid ";
try
{
--
Gitblit v1.9.1