From 8745be5d72c3056cc8ea5f7ea7e5b7631a588b84 Mon Sep 17 00:00:00 2001
From: huangxiaoqiang <huangxiaoqiang@hnkhzn.com>
Date: 星期四, 04 十二月 2025 09:56:19 +0800
Subject: [PATCH] 1
---
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_StorageBasicServices/Stock/StockInfoService.cs | 37 +++++++++++++++++++++++++++++++++----
1 files changed, 33 insertions(+), 4 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageBasicServices/Stock/StockInfoService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageBasicServices/Stock/StockInfoService.cs"
index ef5112f..ea87b9d 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageBasicServices/Stock/StockInfoService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageBasicServices/Stock/StockInfoService.cs"
@@ -23,6 +23,7 @@
using WIDESEA_DTO.Stock;
using WIDESEA_DTO.WMS;
using WIDESEA_IOrderRepository;
+using WIDESEA_IOrderServices;
using WIDESEA_Model.Models;
using WIDESEA_Model.Models.Order;
using WIDESEA_OrderRepository;
@@ -35,6 +36,7 @@
{
private readonly ILocationStatusChangeRecordRepository _locationStatusChangeRecordRepository;
private readonly IDt_InboundOrderRepository _inboundOrderRepository;
+ private readonly IDt_InboundOrderService _inboundOrderService;
private readonly IUnitOfWorkManage _unitOfWorkManage;
private readonly IStockInfoDetailRepository _stockInfoDetailRepository;
private readonly IDt_TaskService _taskService;
@@ -52,7 +54,8 @@
ILocationInfoRepository locationRepository,
IDt_TaskRepository taskRepository,
IDt_OrderOutDetailsRepository outDetailsRepository,
- IDt_Task_HtyRepository task_HtyRepository) : base(BaseDal)
+ IDt_Task_HtyRepository task_HtyRepository,
+ IDt_InboundOrderService inboundOrderService) : base(BaseDal)
{
_locationStatusChangeRecordRepository = locationStatusChangeRecordRepository;
_inboundOrderRepository = inboundOrderRepository;
@@ -63,6 +66,7 @@
_taskRepository = taskRepository;
_outDetailsRepository = outDetailsRepository;
_task_HtyRepository = task_HtyRepository;
+ _inboundOrderService = inboundOrderService;
}
#region 鏂规硶閲嶅啓
/// <summary>
@@ -120,11 +124,11 @@
}
else if (item.Name.Contains("materielCode"))
{
- materielCode = x => x.StockInfoDetails.Any(d => d.MaterielCode == item.Value);
+ materielCode = x => x.StockInfoDetails.Any(d => d.MaterielCode.Contains(item.Value));
}
else if (item.Name.Contains("materielName"))
{
- materielName = x => x.StockInfoDetails.Any(d => d.MaterielName == item.Value);
+ materielName = x => x.StockInfoDetails.Any(d => d.MaterielName.Contains(item.Value));
}
}
//.IncludesAllFirstLayer()
@@ -197,7 +201,7 @@
}
locationsNew.Add(item);
}
- else if (item.AreaId == 2)
+ else if (item.AreaId == 2 || item.AreaId == 7)
{
var locationLateral = _locationRepository.QueryData(x => x.Row == item.Row && x.Column > item.Column && x.Remark == item.Remark);
@@ -579,4 +583,29 @@
}
}
#endregion
+
+ #region 鎵撳嵃搴撳瓨鍗曚釜鐗╂枡浜岀淮鐮�
+ public async Task<WebResponseContent> PrintOrder(object[] key)
+ {
+ WebResponseContent content = new WebResponseContent();
+ try
+ {
+ List<Dt_InboundOrder> inboundOrders = new List<Dt_InboundOrder>();
+ foreach (var item in key)
+ {
+ var order = _inboundOrderRepository.QueryFirst(x => x.OrderNo == item.ToString());
+ if (order != null)
+ {
+ inboundOrders.Add(order);
+ }
+ }
+ return _inboundOrderService.PrintInbound(inboundOrders); ;
+ }
+ catch (Exception ex)
+ {
+ return content.Error("鏈煡閿欒锛岃鑱旂郴绠＄悊鍛�");
+ }
+ }
+
+ #endregion
}
\ No newline at end of file
--
Gitblit v1.9.3