From 259584df9c06ade70f1f351affb35d4922e1263d Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期五, 07 十一月 2025 16:23:13 +0800
Subject: [PATCH] 这个打印送货单，你们给我做两种，做一张打印没得数量的，做一张打印有数量的。送货单格式就是32开，就哎就是A4排一半。你们打了测试，注意，美观。 把那个把它做出来，下一批就用这个自动打。 不是不是打印的要数量都是有数量，要没得数量都没得数量。就是点打印的时候就两个按钮嘛，一个是有数量打印，或者或者或者空白送货单打印。 现在这个现在的送货单都是没有数量噻。现在那个要的，比如你那里再打你那个打印关闭的按钮，要把搞成两个打印嘛，就是打印空白送货单和打印送货单。 好点打印空白送货单的，就是现在这样子。点打印送货单，打印的就是那个跟有有就是有数据的送货单。作业本送货统计查询，状态查询需要修改逻辑
---
CY_ECommercePlatform/CY.SQLDAL/OA/OA_FukuanshenqingDAL.cs | 36 ++++++++++++++++++++++++++----------
1 files changed, 26 insertions(+), 10 deletions(-)
diff --git a/CY_ECommercePlatform/CY.SQLDAL/OA/OA_FukuanshenqingDAL.cs b/CY_ECommercePlatform/CY.SQLDAL/OA/OA_FukuanshenqingDAL.cs
index ecd4633..2fd0b7a 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,15 @@
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),
+ new SqlParameter("@Molingmoney",trueModel.Molingmoney.HasValue?trueModel.Molingmoney.Value:0),
};
- 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,Molingmoney)"
+ + " Values (@FirmId,@SupplierId,@Fukuanshenqingstatus, @ApprovalStatus, @Fukuanmoney, @Bank, @AccountID, @Yishoumoney, @Youwufapiao, @Creater,@CreateTime,@Updater,@LastUpdateTime,@Fukuanyongtu,@FukuanStatus,@remark,@DindanId,@Huming,@SupplierName,@Molingmoney )";
int id = 0;
try
{
@@ -161,8 +164,16 @@
{
return false;
}
- SqlParameter KehuqianshouTime = null;
-
+ SqlParameter ShuomingTime = null;
+ if (trueModel.ShuomingTime.HasValue)
+ {
+ ShuomingTime = new SqlParameter("@ShuomingTime", trueModel.ShuomingTime);
+ }
+ else
+ {
+ ShuomingTime = new SqlParameter("@ShuomingTime", DBNull.Value);
+ }
+
IList<SqlParameter> sqlParms = new List<SqlParameter>()
{
@@ -186,9 +197,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),
+ new SqlParameter("@Kaipiaoshuoming",string.IsNullOrEmpty(trueModel.Kaipiaoshuoming)?"":trueModel.Kaipiaoshuoming),
+ new SqlParameter("@Shuominger",string.IsNullOrEmpty(trueModel.Shuominger)?"":trueModel.Shuominger),
+ ShuomingTime,
+
};
- 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,Kaipiaoshuoming=@Kaipiaoshuoming,Shuominger=@Shuominger,ShuomingTime=@ShuomingTime where [Keyid] =@Keyid ";
try
{
--
Gitblit v1.9.1