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_KipiaoshenqingDAL.cs | 31 ++++++++++++++++++++++++++++---
1 files changed, 28 insertions(+), 3 deletions(-)
diff --git a/CY_ECommercePlatform/CY.SQLDAL/OA/OA_KipiaoshenqingDAL.cs b/CY_ECommercePlatform/CY.SQLDAL/OA/OA_KipiaoshenqingDAL.cs
index 7f3ad88..ffb57ce 100644
--- a/CY_ECommercePlatform/CY.SQLDAL/OA/OA_KipiaoshenqingDAL.cs
+++ b/CY_ECommercePlatform/CY.SQLDAL/OA/OA_KipiaoshenqingDAL.cs
@@ -100,9 +100,12 @@
new SqlParameter("@kpmoney",trueModel.kpmoney),
new SqlParameter("@Huikuanmoney",trueModel.Huikuanmoney.HasValue?trueModel.Huikuanmoney.Value:new decimal(0)),
+ new SqlParameter("@Shenqingleixing",string.IsNullOrEmpty(trueModel.Shenqingleixing)?"":trueModel.Shenqingleixing),
+ new SqlParameter("@Kehumoney",trueModel.Kehumoney.HasValue?trueModel.Kehumoney.Value:new decimal(0)),
+
};
- string sql = "Insert Into OA_Kaipiaoshenqing ([Keyid],[FirmId],[BuyerId],[Kaipiaoshenqing],[Kehuqianshou], [KehuqianshouTime], [KehuqianshouCreater],[KaipiaoquerenTime], [KaipiaoquerenCreater],[BusinessManagerId], [Creater],[CreateTime],[Updater],[LastUpdateTime],[SellerOrderId],remark,ApprovalStatus,Zengjianmoney,Dingdanshu,kpmoney,Huikuanmoney)"
- + " Values ( @Keyid,@FirmId,@BuyerId,@Kaipiaoshenqing, @Kehuqianshou, @KehuqianshouTime, @KehuqianshouCreater, @KaipiaoquerenTime, @KaipiaoquerenCreater, @BusinessManagerId, @Creater,@CreateTime,@Updater,@LastUpdateTime,@SellerOrderId,@remark,@ApprovalStatus,@Zengjianmoney,@Dingdanshu,@kpmoney,@Huikuanmoney )";
+ string sql = "Insert Into OA_Kaipiaoshenqing ([Keyid],[FirmId],[BuyerId],[Kaipiaoshenqing],[Kehuqianshou], [KehuqianshouTime], [KehuqianshouCreater],[KaipiaoquerenTime], [KaipiaoquerenCreater],[BusinessManagerId], [Creater],[CreateTime],[Updater],[LastUpdateTime],[SellerOrderId],remark,ApprovalStatus,Zengjianmoney,Dingdanshu,kpmoney,Huikuanmoney,Shenqingleixing,Kehumoney)"
+ + " Values ( @Keyid,@FirmId,@BuyerId,@Kaipiaoshenqing, @Kehuqianshou, @KehuqianshouTime, @KehuqianshouCreater, @KaipiaoquerenTime, @KaipiaoquerenCreater, @BusinessManagerId, @Creater,@CreateTime,@Updater,@LastUpdateTime,@SellerOrderId,@remark,@ApprovalStatus,@Zengjianmoney,@Dingdanshu,@kpmoney,@Huikuanmoney,@Shenqingleixing,@Kehumoney )";
try
{
_dataBase.ExecuteSql(sql, sqlParms.ToArray<SqlParameter>());
@@ -179,9 +182,10 @@
new SqlParameter("@Fapiaohao",string.IsNullOrEmpty(trueModel.Fapiaohao)?"":trueModel.Fapiaohao),
new SqlParameter("@Huikuanmoney",trueModel.Huikuanmoney.HasValue?trueModel.Huikuanmoney.Value:new decimal(0)),
ShoukuanTime,
+ new SqlParameter("@Kehumoney",trueModel.Kehumoney.HasValue?trueModel.Kehumoney.Value:new decimal(0)),
};
- string sql = "Update OA_Kaipiaoshenqing Set [FirmId]=@FirmId,[BuyerId]=@BuyerId,[Kaipiaoshenqing]=@Kaipiaoshenqing,[Kehuqianshou]=@Kehuqianshou, [KehuqianshouTime]=@KehuqianshouTime, [KehuqianshouCreater]=@KehuqianshouCreater,[KaipiaoquerenTime]=@KaipiaoquerenTime, [KaipiaoquerenCreater]=@KaipiaoquerenCreater,[BusinessManagerId]=@BusinessManagerId, [Creater]=@Creater,[CreateTime]=@CreateTime,[Updater]=@Updater,[LastUpdateTime]=@LastUpdateTime,ApprovalStatus=@ApprovalStatus,Zengjianmoney=@Zengjianmoney,Kehuqianshoutupian=@Kehuqianshoutupian,Fapiaohao=@Fapiaohao,Huikuanmoney=@Huikuanmoney,ShoukuanTime=@ShoukuanTime where [Keyid] =@Keyid ";
+ string sql = "Update OA_Kaipiaoshenqing Set [FirmId]=@FirmId,[BuyerId]=@BuyerId,[Kaipiaoshenqing]=@Kaipiaoshenqing,[Kehuqianshou]=@Kehuqianshou, [KehuqianshouTime]=@KehuqianshouTime, [KehuqianshouCreater]=@KehuqianshouCreater,[KaipiaoquerenTime]=@KaipiaoquerenTime, [KaipiaoquerenCreater]=@KaipiaoquerenCreater,[BusinessManagerId]=@BusinessManagerId, [Creater]=@Creater,[CreateTime]=@CreateTime,[Updater]=@Updater,[LastUpdateTime]=@LastUpdateTime,ApprovalStatus=@ApprovalStatus,Zengjianmoney=@Zengjianmoney,Kehuqianshoutupian=@Kehuqianshoutupian,Fapiaohao=@Fapiaohao,Huikuanmoney=@Huikuanmoney,ShoukuanTime=@ShoukuanTime,Kehumoney=@Kehumoney where [Keyid] =@Keyid ";
try
{
@@ -270,6 +274,27 @@
resultOrderBy = query.Criteria[maxParamIndex].Value.ToString();//= 1 == orderbys.Length ? resultOrderBy : orderbys[1];
}
string fromSouce = string.Format("{0}{1}{2}", FROMSOUCEBEFORE, query.Criteria[0].Value, FROMSOUCEEND);//鎷艰鏉′欢
+
+
+ /// <summary>
+ /// 鏌ヨ鏉ユ簮
+ /// </summary>
+ string fromss = " [OA_Kaipiaoshenqing] ok inner join [OA_CorporateClients] oe on oe.Keyid = ok.[BuyerId] " +
+
+
+
+
+
+ " where 0=0 "+ query.Criteria[0].Value;
+ var ssss = _dataBase.SelectModel<Model.OA_Kaipiaoshenqing>(" sum(ok.kpmoney) as kpmoney,sum(ok.Huikuanmoney) as Huikuanmoney,sum(ok.Zengjianmoney) as Zengjianmoney ", fromss);
+ if (ssss.Count>0)
+ {
+ var aaaaa = ssss.First();
+ pagination.heji1 = aaaaa.kpmoney;
+ pagination.heji2 = aaaaa.Zengjianmoney;
+ pagination.heji3 = aaaaa.Huikuanmoney;
+ }
+
return _dataBase.SelectModelPage<Model.OA_Kaipiaoshenqing>(pagination, SELECTTARGET, fromSouce, orderbys[0], resultOrderBy);
}
--
Gitblit v1.9.1