From f5b8c1ae89286dada20ea433ffac84f4c9e72a29 Mon Sep 17 00:00:00 2001
From: huanghongfeng <huanghongfeng@hnkhzn.com>
Date: 星期五, 06 六月 2025 14:31:25 +0800
Subject: [PATCH] 1
---
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/Task_HtyService.cs | 79 +++++++++++++++++++++++++++++++++++++++
1 files changed, 78 insertions(+), 1 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/Task_HtyService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/Task_HtyService.cs"
index ce649d1..7494c11 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/Task_HtyService.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/Task_HtyService.cs"
@@ -14,6 +14,7 @@
using System.Text;
using System.Threading.Tasks;
using WIDESEA_Core;
+using WIDESEA_Core.Attributes;
using WIDESEA_Core.BaseRepository;
using WIDESEA_Core.BaseServices;
using WIDESEA_Core.Enums;
@@ -96,7 +97,7 @@
//鑾峰彇鎺掑簭瀛楁
Dictionary<string, OrderByType> orderbyDic = options.GetPageDataSort(TProperties);
List<Dt_Task_Hty> entities = BaseDal.QueryData(wheres, orderbyDic);
- var stockdct = entities
+ /*var stockdct = entities
.GroupBy(x => new { x.TaskType,x.MaterialType })
.Select(g => new Dt_Task_Htyt
{
@@ -105,6 +106,30 @@
PalletCodequantity = g.Count(),
})
.ToList();
+
+ byte[] data = exporter.ExportAsByteArray(stockdct).Result;*/
+
+ var stockdct = entities
+ .Select(g => new Dt_Task_Htykt
+ {
+ TaskNum = g.TaskNum,
+ PalletCode = g.PalletCode,
+ Roadway = g.Roadway,
+ TaskType = g.TaskType.ToString() == "100" ? "鍑哄簱" : g.TaskType.ToString() == "104" ? "鍑虹┖鎵�" : g.TaskType.ToString() == "200" ? "鍏ュ簱" : "绉诲簱",
+ TaskStatus = g.TaskStatus.ToString()=="290"?"鍏ュ簱瀹屾垚":"鍑哄簱瀹屾垚", // 鎴栬�呭彲浠ユ牴鎹叿浣撶姸鎬佺爜杞崲
+ SourceAddress = g.SourceAddress,
+ TargetAddress = g.TargetAddress,
+ Remark = g.Remark,
+ Creater = g.Creater,
+ CreateDate = g.CreateDate,
+ Modifier = g.Modifier,
+ ModifyDate = g.ModifyDate,
+ MaterialType = g.MaterialType.ToString() == "0" ? "鍘熸潗鏂�" : "鎴愬搧",
+ PalletCodequantity = g.PalletCodequantity.ToString(), // 杞崲涓哄瓧绗︿覆
+ PLCTo = g.PLCTo.ToString(), // 鎴栬�呭彲浠ユ牴鎹叿浣撳�艰浆鎹�
+ OperateType = g.OperateType.ToString()
+ })
+ .ToList();
byte[] data = exporter.ExportAsByteArray(stockdct).Result;
@@ -130,4 +155,56 @@
[ExporterHeader(DisplayName = "鏁伴噺")]
public int PalletCodequantity { get; set; }
}
+
+
+ public class Dt_Task_Htykt
+ {
+ [ExporterHeader(DisplayName = "浠诲姟鍙�")]
+ public int TaskNum { get; set; }
+
+ [ExporterHeader(DisplayName = "鎵樼洏缂栧彿")]
+ public string PalletCode { get; set; }
+
+ [ExporterHeader(DisplayName = "宸烽亾鍙�")]
+ public string Roadway { get; set; }
+
+ [ExporterHeader(DisplayName = "浠诲姟绫诲瀷")]
+ public string TaskType { get; set; }
+
+ [ExporterHeader(DisplayName = "浠诲姟鐘舵��")]
+ public string TaskStatus { get; set; }
+
+ [ExporterHeader(DisplayName = "璧峰鍦板潃")]
+ public string SourceAddress { get; set; }
+
+ [ExporterHeader(DisplayName = "鐩爣鍦板潃")]
+ public string TargetAddress { get; set; }
+
+ [ExporterHeader(DisplayName = "澶囨敞")]
+ public string Remark { get; set; }
+
+ [ExporterHeader(DisplayName = "鍒涘缓浜�")]
+ public string Creater { get; set; }
+
+ [ExporterHeader(DisplayName = "鍒涘缓鏃堕棿")]
+ public DateTime CreateDate { get; set; }
+
+ [ExporterHeader(DisplayName = "淇敼浜�")]
+ public string Modifier { get; set; }
+
+ [ExporterHeader(DisplayName = "淇敼鏃ユ湡")]
+ public DateTime? ModifyDate { get; set; }
+
+ [ExporterHeader(DisplayName = "鐗╂枡绫诲瀷")]
+ public string MaterialType { get; set; }
+
+ [ExporterHeader(DisplayName = "鎵樼洏鏁伴噺")]
+ public string PalletCodequantity { get; set; }
+
+ [ExporterHeader(DisplayName = "鍘熸潗鏂欏幓鍚�")]
+ public string PLCTo { get; set; }
+
+ [ExporterHeader(DisplayName = "瀹屾垚鎯呭喌")]
+ public string OperateType { get; set; }
+ }
}
\ No newline at end of file
--
Gitblit v1.9.3