From fe256a7afaa132910875d3dc73783d9ab2d7ace5 Mon Sep 17 00:00:00 2001
From: liulijun <liulijun@hnkhzn.com>
Date: 星期四, 12 三月 2026 18:57:44 +0800
Subject: [PATCH] 老厂排程单页面增加用纸顺序号和是否缺料
---
项目代码/WMS/WMSServices/WIDESEA_OutboundService/OutLineViewService.cs | 25 +++++++------------------
1 files changed, 7 insertions(+), 18 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_OutboundService/OutLineViewService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_OutboundService/OutLineViewService.cs"
index 29ca532..c14c34e 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_OutboundService/OutLineViewService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_OutboundService/OutLineViewService.cs"
@@ -4,9 +4,11 @@
using System.Linq;
using System.Text;
using System.Threading.Tasks;
+using WIDESEA_Common.TaskEnum;
using WIDESEA_Core;
using WIDESEA_Core.BaseRepository;
using WIDESEA_Core.BaseServices;
+using WIDESEA_Core.Helper;
using WIDESEA_IBasicRepository;
using WIDESEA_IOutboundRepository;
using WIDESEA_IOutboundService;
@@ -37,8 +39,9 @@
try
{
//鑾峰彇鏁版嵁
- List<Dt_OutLineView> lineViews = BaseDal.QueryData();
-
+ List<Dt_OutLineView> lineViews = BaseDal.QueryData().OrderBy(x=>x.CreateDate).ToList();
+ int taskCount = BaseDal.Db.Queryable<Dt_Task>().Where(x=>x.TaskType==TaskTypeEnum.OldYLOutbound.ObjToInt() && x.TaskStatus==TaskStatusEnum.Line_Executing.ObjToInt()).Count();
+ content.OK($"{taskCount}", lineViews);
}
catch (Exception ex)
{
@@ -58,22 +61,8 @@
{
//鑾峰彇褰撳墠鑰佸巶缂撳瓨鎵�鏈夌焊鍗蜂俊鎭�
List<Dt_OutLineView> outLineViews = BaseDal.QueryData();
- //鑾峰彇褰撳墠绾稿嵎涓暟
- int? outLineCount = outLineViews?.Select(x => x.PalletCode).Distinct().Count();
- if (outLineViews==null || outLineViews.Count<=0 || outLineCount<=2)
- {
- List<Dt_OutLineView> outLineViewsAdd = outStockLockInfos.Select(x => _mapper.Map<Dt_OutLineView>(x)).ToList();
- BaseDal.AddData(outLineViewsAdd);
- }
- else
- {
- //鑾峰彇鏈�鏃╃殑绾稿嵎淇℃伅
- string? code= outLineViews.FirstOrDefault()?.PalletCode;
- List<Dt_OutLineView> outLineViewsDel = outLineViews.Where(x=>x.PalletCode==code).ToList();
- List<Dt_OutLineView> outLineViewsAdd = outStockLockInfos.Select(x => _mapper.Map<Dt_OutLineView>(x)).ToList();
- BaseDal.DeleteData(outLineViewsDel);
- BaseDal.AddData(outLineViewsAdd);
- }
+ List<Dt_OutLineView> outLineViewsAdd = outStockLockInfos.Select(x => _mapper.Map<Dt_OutLineView>(x)).ToList();
+ BaseDal.AddData(outLineViewsAdd);
content.OK("鎴愬姛");
}
catch (Exception ex)
--
Gitblit v1.9.3