From 10b3f91902107815a16e5ff0528e3880ff100b60 Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期二, 30 四月 2024 17:34:23 +0800
Subject: [PATCH] 1.调拨申请单 增加审核,反审核,关闭,反关闭,作废,反作废,修复编辑数据不能回显,无法编辑,保存失败功能 2.发货通知单 新增编辑 页面 初始化 主管 部门 业务员,修复多条数据 反写 销售订单 失败 3.销售订单列表 增加字段名,用于选单号 赋值表头信息 4.销售出库单 保存时增加 选着源单 发货通知单 后,查询源单是否存在
---
WebAPI/Controllers/XSGL/Kf_SellOutEntryReportController.cs | 22 +++++++++++++---------
1 files changed, 13 insertions(+), 9 deletions(-)
diff --git a/WebAPI/Controllers/XSGL/Kf_SellOutEntryReportController.cs b/WebAPI/Controllers/XSGL/Kf_SellOutEntryReportController.cs
index fa22447..a13da08 100644
--- a/WebAPI/Controllers/XSGL/Kf_SellOutEntryReportController.cs
+++ b/WebAPI/Controllers/XSGL/Kf_SellOutEntryReportController.cs
@@ -37,15 +37,16 @@
try
{
List<object> columnNameList = new List<object>();
+ List<DataTable> tableList = new List<DataTable>();
////鏌ョ湅鏉冮檺
- //if (!DBUtility.ClsPub.Security_Log("Kf_SellOutEntryReport_Query", 1, false, user))
- //{
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒";
- // objJsonResult.data = null;
- // return objJsonResult;
- //}
+ if (!DBUtility.ClsPub.Security_Log("Kf_SellOutEntryReport", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
//鏌ヨ
@@ -60,6 +61,9 @@
ds = oCN.RunProcReturn(sql, "h_p_Kf_SellOutEntryReport");
}
+ tableList.Add(ds.Tables[0]);
+ tableList.Add(ds.Tables[1]);
+
//娣诲姞鍒楀悕
foreach (DataColumn col in ds.Tables[0].Columns)
{
@@ -71,7 +75,7 @@
objJsonResult.code = "1";
objJsonResult.count = 1;
objJsonResult.Message = "Sucess锛�";
- objJsonResult.data = ds.Tables[0];
+ objJsonResult.data = tableList;
objJsonResult.list = columnNameList;
return objJsonResult;
}
--
Gitblit v1.9.1