From 7db98877235dc8dc88e95bd055484265fe6ea72d Mon Sep 17 00:00:00 2001
From: yxj <1qaz@123>
Date: 星期五, 19 八月 2022 11:03:04 +0800
Subject: [PATCH] WMS条码系统参数新增
---
WebAPI/Controllers/SCGL/Sc_PackUnionBillController.cs | 80 +++++++++++++++++++++------------------
1 files changed, 43 insertions(+), 37 deletions(-)
diff --git a/WebAPI/Controllers/SCGL/Sc_PackUnionBillController.cs b/WebAPI/Controllers/SCGL/Sc_PackUnionBillController.cs
index a78b4e7..392da67 100644
--- a/WebAPI/Controllers/SCGL/Sc_PackUnionBillController.cs
+++ b/WebAPI/Controllers/SCGL/Sc_PackUnionBillController.cs
@@ -78,24 +78,24 @@
columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
}
- if (ds.Tables[0].Rows.Count > 0)
- {
- objJsonResult.code = "1";
- objJsonResult.count = count;
- objJsonResult.Message = "杩斿洖璁板綍鎴愬姛锛�";
- objJsonResult.data = JsonConvert.DeserializeObject<DataTable>(JsonConvert.SerializeObject(ds.Tables[0], new IsoDateTimeConverter { DateTimeFormat = "yyyy-MM-dd HH:mm:ss" })); //搴忓垪鍖朌ataSet涓殑鏃堕棿鏍煎紡锛岀劧鍚庡啀鍙嶅簭鍒楀寲鍥炴潵
- objJsonResult.list = columnNameList;
- return objJsonResult;
- }
- else
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "鏆傛棤璁板綍锛�";
- objJsonResult.data = null;
- objJsonResult.list = columnNameList;
- return objJsonResult;
- }
+ //if (ds.Tables[0].Rows.Count > 0)
+ //{
+ objJsonResult.code = "1";
+ objJsonResult.count = count;
+ objJsonResult.Message = "杩斿洖璁板綍鎴愬姛锛�";
+ objJsonResult.data = JsonConvert.DeserializeObject<DataTable>(JsonConvert.SerializeObject(ds.Tables[0], new IsoDateTimeConverter { DateTimeFormat = "yyyy-MM-dd HH:mm:ss" })); //搴忓垪鍖朌ataSet涓殑鏃堕棿鏍煎紡锛岀劧鍚庡啀鍙嶅簭鍒楀寲鍥炴潵
+ objJsonResult.list = columnNameList;
+ return objJsonResult;
+ //}
+ //else
+ //{
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "鏆傛棤璁板綍锛�";
+ // objJsonResult.data = null;
+ // objJsonResult.list = columnNameList;
+ // return objJsonResult;
+ //}
}
catch (Exception ex)
{
@@ -268,6 +268,7 @@
try
{
ds = oCn.RunProcReturn("select * from h_v_Sc_StationInBillListMain"+sWhere+ "order by hmainid desc", "h_v_Sc_StationInBillListMain");
+
objJsonResult.code = "1";
objJsonResult.count = 1;
objJsonResult.Message = "杩斿洖璁板綍鎴愬姛锛�";
@@ -289,7 +290,7 @@
#region 鏍囧噯宸ユ椂瀵煎嚭Excel琛ㄦ牸鏁版嵁
[Route("Sc_PackUnionBill/Sc_StationInBillSetExcel")]
[HttpGet]
- public HttpResponseMessage Sc_StationInBillSetExcel()
+ public HttpResponseMessage Sc_StationInBillSetExcel(string sWhere)
{
HSSFWorkbook workbook = new HSSFWorkbook();
ISheet sheet = workbook.CreateSheet("sheet1");
@@ -300,14 +301,15 @@
row.CreateCell(1).SetCellValue("娴佽浆鍗″彿");
row.CreateCell(2).SetCellValue("杩涘嚭绔欐墍鐢ㄦ椂闂�");
row.CreateCell(3).SetCellValue("宸ユ椂");
- row.CreateCell(4).SetCellValue("涓嶈壇鏁伴噺");
- row.CreateCell(5).SetCellValue("鎶ュ簾鏁伴噺");
- row.CreateCell(6).SetCellValue("杩涚珯鏁伴噺");
- row.CreateCell(7).SetCellValue("鍑虹珯鏁伴噺");
- row.CreateCell(8).SetCellValue("鍑虹珯鏃堕棿");
- row.CreateCell(9).SetCellValue("杩涚珯鏃堕棿");
- row.CreateCell(10).SetCellValue("鍒跺崟浜�");
- row.CreateCell(11).SetCellValue("鍒跺崟鏃ユ湡");
+ row.CreateCell(4).SetCellValue("宸ュ簭鍚�");
+ row.CreateCell(5).SetCellValue("涓嶈壇鏁伴噺");
+ row.CreateCell(6).SetCellValue("鎶ュ簾鏁伴噺");
+ row.CreateCell(7).SetCellValue("杩涚珯鏁伴噺");
+ row.CreateCell(8).SetCellValue("鍑虹珯鏁伴噺");
+ row.CreateCell(9).SetCellValue("鍑虹珯鏃堕棿");
+ row.CreateCell(10).SetCellValue("杩涚珯鏃堕棿");
+ row.CreateCell(11).SetCellValue("鍒跺崟浜�");
+ row.CreateCell(12).SetCellValue("鍒跺崟鏃ユ湡");
//绮剧‘鎺у埗鍒楀
sheet.SetColumnWidth(1, 5000);
sheet.SetColumnWidth(2, 5000);
@@ -319,8 +321,11 @@
sheet.SetColumnWidth(8, 5000);
sheet.SetColumnWidth(9, 5000);
sheet.SetColumnWidth(10, 5000);
+ sheet.SetColumnWidth(11, 5000);
+ sheet.SetColumnWidth(12, 5000);
+ sheet.SetColumnWidth(13, 5000);
- DataSet ds = oCn.RunProcReturn("select * from h_v_Sc_StationInBillListMain order by hmainid desc", "h_v_Sc_StationInBillListMain");
+ DataSet ds = oCn.RunProcReturn("select * from h_v_Sc_StationInBillListMain" + sWhere + " order by hmainid desc", "h_v_Sc_StationInBillListMain");
for (var i = 0; i < ds.Tables[0].Rows.Count; i++)
{
IRow row1 = sheet.CreateRow(i + 1);
@@ -328,14 +333,15 @@
row1.CreateCell(1).SetCellValue(ds.Tables[0].Rows[i]["娴佽浆鍗″彿"].ToString());
row1.CreateCell(2).SetCellValue(ds.Tables[0].Rows[i]["杩涘嚭绔欐墍鐢ㄦ椂闂�"].ToString());
row1.CreateCell(3).SetCellValue(ds.Tables[0].Rows[i]["宸ユ椂"].ToString());
- row1.CreateCell(4).SetCellValue(ds.Tables[0].Rows[i]["涓嶈壇鏁伴噺"].ToString());
- row1.CreateCell(5).SetCellValue(ds.Tables[0].Rows[i]["鎶ュ簾鏁伴噺"].ToString());
- row1.CreateCell(6).SetCellValue(ds.Tables[0].Rows[i]["杩涚珯鏁伴噺"].ToString());
- row1.CreateCell(7).SetCellValue(ds.Tables[0].Rows[i]["鍑虹珯鏁伴噺"].ToString());
- row1.CreateCell(8).SetCellValue(ds.Tables[0].Rows[i]["鍑虹珯鏃堕棿"].ToString());
- row1.CreateCell(9).SetCellValue(ds.Tables[0].Rows[i]["杩涚珯鏃堕棿"].ToString());
- row1.CreateCell(10).SetCellValue(ds.Tables[0].Rows[i]["鍒跺崟浜�"].ToString());
- row1.CreateCell(11).SetCellValue(ds.Tables[0].Rows[i]["鍒跺崟鏃ユ湡"].ToString());
+ row1.CreateCell(4).SetCellValue(ds.Tables[0].Rows[i]["宸ュ簭鍚�"].ToString());
+ row1.CreateCell(5).SetCellValue(ds.Tables[0].Rows[i]["涓嶈壇鏁伴噺"].ToString());
+ row1.CreateCell(6).SetCellValue(ds.Tables[0].Rows[i]["鎶ュ簾鏁伴噺"].ToString());
+ row1.CreateCell(7).SetCellValue(ds.Tables[0].Rows[i]["杩涚珯鏁伴噺"].ToString());
+ row1.CreateCell(8).SetCellValue(ds.Tables[0].Rows[i]["鍑虹珯鏁伴噺"].ToString());
+ row1.CreateCell(9).SetCellValue(ds.Tables[0].Rows[i]["鍑虹珯鏃堕棿"].ToString());
+ row1.CreateCell(10).SetCellValue(ds.Tables[0].Rows[i]["杩涚珯鏃堕棿"].ToString());
+ row1.CreateCell(11).SetCellValue(ds.Tables[0].Rows[i]["鍒跺崟浜�"].ToString());
+ row1.CreateCell(12).SetCellValue(ds.Tables[0].Rows[i]["鍒跺崟鏃ユ湡"].ToString());
}
System.IO.MemoryStream ms = new System.IO.MemoryStream();
workbook.Write(ms);
@@ -345,7 +351,7 @@
response.Content = new StreamContent(ms);
response.Content.Headers.ContentType = new MediaTypeHeaderValue("application/octet-stream");
- var fileName = "鏍囧噯宸ユ椂_.xls";
+ var fileName = "鏍囧噯宸ユ椂.xls";
response.Content.Headers.ContentDisposition = new ContentDispositionHeaderValue("attachment")
{
--
Gitblit v1.9.1