From 35b1af99c388b5f03b8bf8de53852e5b5e9e60c4 Mon Sep 17 00:00:00 2001
From: liulijun <liulijun@hnkhzn.com>
Date: 星期二, 31 三月 2026 14:08:21 +0800
Subject: [PATCH] 调整了货位详细信息悬浮窗的显示位置
---
项目代码/WMS/WMSServices/WIDESEA_OutboundService/OutSGOrderService.cs | 135 ++++++++++++++++++++++++++++++++++++++++----
1 files changed, 122 insertions(+), 13 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_OutboundService/OutSGOrderService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_OutboundService/OutSGOrderService.cs"
index 6c40d09..8a17d2e 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_OutboundService/OutSGOrderService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_OutboundService/OutSGOrderService.cs"
@@ -1,4 +1,4 @@
-锘縰sing AutoMapper;
+using AutoMapper;
using System;
using System.Collections.Generic;
using System.Linq;
@@ -20,6 +20,11 @@
using WIDESEA_Common.WareHouseEnum;
using WIDESEA_Core.Helper;
using System.Reflection;
+using System.Text.RegularExpressions;
+using Microsoft.AspNetCore.Http;
+using HslCommunication;
+using SqlSugar;
+using WIDESEA_Core.Enums;
namespace WIDESEA_OutboundService
{
@@ -42,6 +47,81 @@
_mapper = mapper;
_unitOfWorkManage = unitOfWorkManage;
}
+
+ public override PageGridData<Dt_OutSGOrder> GetPageData(PageDataOptions options)
+ {
+ // 1. 璋冪敤鍩虹被鏂规硶鑾峰彇鍒嗛〉鏁版嵁
+ PageGridData<Dt_OutSGOrder> pageData = base.GetPageData(options);
+
+ // 2. 濡傛灉鏈夋暟鎹紝澶勭悊姣忎釜璁㈠崟鐨勭墿鏂欑紪鍙峰拰骞呭
+ if (pageData.Rows != null && pageData.Rows.Count > 0)
+ {
+ // 鑾峰彇鎵�鏈夎鍗旾D
+ var orderIds = pageData.Rows.Select(o => o.Id).ToList();
+
+ // 鎵归噺鏌ヨ鎵�鏈夊叧鑱旂殑鏄庣粏锛屾寜OutSGOrderId鍗囧簭銆両d闄嶅簭鎺掑簭锛屼笌璁㈠崟鏄庣粏椤甸潰淇濇寔涓�鑷�
+ var allDetails = BaseDal.Db.Queryable<Dt_OutSGOrderDetail>()
+ .Where(d => orderIds.Contains(d.OutSGOrderId))
+ .OrderBy(d => d.OutSGOrderId)
+ .OrderByDescending(d => d.Id)
+ .ToList();
+
+ // 鎸夎鍗旾D鍒嗙粍锛屾瘡缁勬槑缁嗘寜Id闄嶅簭鎺掑簭锛屼笌璁㈠崟鏄庣粏椤甸潰淇濇寔涓�鑷�
+ var detailsByOrderId = allDetails.GroupBy(d => d.OutSGOrderId)
+ .ToDictionary(g => g.Key, g => g.OrderByDescending(d => d.Id).ToList());
+
+ // 澶勭悊姣忎釜璁㈠崟
+ foreach (var order in pageData.Rows)
+ {
+ if (detailsByOrderId.TryGetValue(order.Id, out var details))
+ {
+ // 鑾峰彇鎵�鏈夌墿鏂欑紪鍙凤紝鍖呮嫭閲嶅鐨�
+ var allMaterialNos = details
+ .Select(d => d.MaterialNo)
+ .ToList();
+
+ // 鑾峰彇鎵�鏈夊敮涓�鐨勫箙瀹�
+ var uniqueWidths = details
+ .Select(d => d.Width.ToString())
+ .Distinct()
+ .ToList();
+
+ // 璁剧疆鐗╂枡缂栧彿锛屾墍鏈夌墿鏂欑紪鍙风敤鏂滄潬鍒嗛殧锛屽寘鎷噸澶嶇殑
+ order.MaterialNos = string.Join("/", allMaterialNos);
+
+ // 璁剧疆骞呭锛氬鏋滃箙瀹芥湁澶氫釜涓嶄竴鑷寸殑鏁板�煎氨鏄剧ず澶氫釜锛屽鏋滀竴鏍峰氨鏄剧ず涓�涓�
+ order.MaterialWides = uniqueWidths.Count == 1
+ ? uniqueWidths[0]
+ : string.Join("/", uniqueWidths);
+
+ // 璁剧疆妤炲埆锛屽彧鏄剧ず涓�涓紙鍥犱负鎵�鏈夋鍒浉鍚岋級
+ order.BoardFluteNos = details.FirstOrDefault()?.BoardFluteNo ?? "";
+
+ // 璁剧疆鏄惁缂烘枡锛氬鏋滄湁浠讳綍涓�涓槑缁嗘槸缂烘枡鐘舵�侊紝灏辫缃负true
+ // 寮曠敤WIDESEA_Common.OrderEnum鍛藉悕绌洪棿鏉ヤ娇鐢∣utOrderStatusEnum鏋氫妇
+ order.IsLackMaterial = details.Any(d => d.OutSGOrderDetailStatus == 3); // 3鏄己鏂欑姸鎬佺殑鏋氫妇鍊�
+
+ // 鐢熸垚鐗╂枡缂烘枡鐘舵�佸瓧绗︿覆锛氱墿鏂欑紪鍙�:鐘舵��,鐗╂枡缂栧彿:鐘舵��
+ var materialLackStatus = new List<string>();
+ foreach (var detail in details)
+ {
+ var isLack = detail.OutSGOrderDetailStatus == 3;
+ materialLackStatus.Add($"{detail.MaterialNo}:{isLack.ToString().ToLower()}");
+ }
+ order.MaterialLackStatus = string.Join(",", materialLackStatus);
+ }
+ else
+ {
+ order.MaterialNos = "";
+ order.MaterialWides = "";
+ order.IsLackMaterial = false;
+ order.MaterialLackStatus = "";
+ }
+ }
+ }
+
+ return pageData;
+ }
public WebResponseContent AddOutSGOrder(List<SGOutOrderDTO> outOrderDTOs)
{
@@ -49,14 +129,14 @@
try
{
//鑾峰彇鎵�鏈夋帓绋嬪崟
- List<Dt_OutSGOrder> outSGOrders = BaseDal.Db.Queryable<Dt_OutSGOrder>().Includes(x => x.Details).ToList();
- List<Dt_OutSGOrderDetail> outSGOrderDetails= outSGOrders.SelectMany(x=>x.Details).ToList();
- //鍒ゆ柇鍗曟嵁
- Dt_OutSGOrderDetail? ExistAddOutOrderDetail = outSGOrderDetails.FirstOrDefault(x => outOrderDTOs.Select(t => t.BoardMpsDetailId).Distinct().Contains(x.BoardMpsDetailId));
- if (ExistAddOutOrderDetail != null)
- {
- return content.Error($"鍑哄簱鎺掔▼鏄庣粏{nameof(SGOutOrderDTO.BoardMpsDetailId)}:{ExistAddOutOrderDetail.BoardMpsDetailId}宸插瓨鍦�");
- }
+ //List<Dt_OutSGOrder> outSGOrders = BaseDal.Db.Queryable<Dt_OutSGOrder>().Includes(x => x.Details).ToList();
+ //List<Dt_OutSGOrderDetail> outSGOrderDetails= outSGOrders.SelectMany(x=>x.Details).ToList();
+ ////鍒ゆ柇鍗曟嵁
+ //Dt_OutSGOrderDetail? ExistAddOutOrderDetail = outSGOrderDetails.FirstOrDefault(x => outOrderDTOs.Select(t => t.BoardMpsDetailId).Distinct().Contains(x.BoardMpsDetailId));
+ //if (ExistAddOutOrderDetail != null)
+ //{
+ // return content.Error($"鍑哄簱鎺掔▼鏄庣粏{nameof(SGOutOrderDTO.BoardMpsDetailId)}:{ExistAddOutOrderDetail.BoardMpsDetailId}宸插瓨鍦�");
+ //}
//鑾峰彇鎵�鏈夌墿鏂�
List<Dt_MaterielInfo> materielInfos = _basicRepository.MaterielInfoRepository.QueryData(x => x.WarehouseId == WarehouseEnum.LLDYL.ObjToInt() && x.MaterielInvOrgId == MaterielInvOrgEnum.鑰佸巶.ObjToInt() && x.MaterialSourceId != 0);
SGOutOrderDTO? sGOutOrderDTO = outOrderDTOs.FirstOrDefault(x => !materielInfos.Select(x => x.MaterielCode).Contains(x.MaterialNo));
@@ -66,24 +146,38 @@
return content.Error($"鐢熶骇鎺掔▼{sGOutOrderDTO.OrderId}鐗╂枡:{sGOutOrderDTO.MaterialNo}涓嶅瓨鍦�");
}
List<Dt_OutSGOrder> AddOutSGOrders = new List<Dt_OutSGOrder>();
- foreach (var item in outOrderDTOs)
+ foreach (var item in outOrderDTOs.OrderBy(x=>x.Number))
{
//鑾峰彇宸ュ崟
Dt_OutSGOrder? ExistOutSGOrder = AddOutSGOrders.FirstOrDefault(x => x.OrderId == item.OrderId);
- //鑾峰彇鐗╂枡
- Dt_MaterielInfo materielInfo = materielInfos.FirstOrDefault(x => x.MaterielCode == item.MaterialNo);
+
//鏄庣粏鎻愬墠杞崲
Dt_OutSGOrderDetail outSGOrderDetail = _mapper.Map<Dt_OutSGOrderDetail>(item);
+ //鑾峰彇鐗╂枡
+ Dt_MaterielInfo? materielInfo = materielInfos.FirstOrDefault(x => x.MaterielCode == item.MaterialNo);
+ string code = ExtractFirstPercentContent(outSGOrderDetail.Remark);
+ //澶勭悊鐗规畩鎸囧畾鎺掔▼鍒ゆ柇
+ if (!code.IsNullOrEmpty() && code.StartsWith(outSGOrderDetail.MaterialNo))
+ {
+ materielInfo = materielInfos.FirstOrDefault(x => x.MaterielCode == code);
+ if (materielInfo==null)
+ {
+ return content.Error($"鐢熶骇鎺掔▼{item.OrderId}鎸囧畾鎺掔▼鐗╂枡:{code}涓嶅瓨鍦�");
+ }
+ outSGOrderDetail.MaterialNo = code;
+ }
outSGOrderDetail.MaterialName = materielInfo.MaterielName;
+
//鍒ゆ柇宸ュ崟鏄惁宸茬粡瀛樺湪
if (ExistOutSGOrder != null)
{
+ outSGOrderDetail.Number = ExistOutSGOrder.Number;
ExistOutSGOrder.Details.Add(outSGOrderDetail);
}
else
{
-
Dt_OutSGOrder outSGOrder = _mapper.Map<Dt_OutSGOrder>(item);
+ outSGOrderDetail.Number = outSGOrder.Number;
outSGOrder.Details = new List<Dt_OutSGOrderDetail>() { outSGOrderDetail };
AddOutSGOrders.Add(outSGOrder);
}
@@ -97,5 +191,20 @@
}
return content;
}
+ public static string ExtractFirstPercentContent(string input)
+ {
+ if (string.IsNullOrEmpty(input))
+ return null;
+
+ Regex regex = new Regex(@"%(.*?)%");
+ Match match = regex.Match(input);
+
+ if (match.Success && match.Groups[1].Success)
+ {
+ return match.Groups[1].Value.Trim();
+ }
+
+ return null;
+ }
}
}
--
Gitblit v1.9.3