From 871a7e1ce9a1b1925e228864baf42cafd41371f2 Mon Sep 17 00:00:00 2001
From: heshaofeng <heshaofeng@hnkhzn.com>
Date: 星期三, 03 十二月 2025 10:04:29 +0800
Subject: [PATCH] 提交
---
项目代码/WMS无仓储版/WIDESEA_WMSServer/WIDESEA_AllocateService/AllocateService.cs | 181 ++++++++++++++++++++++++++++++++++++++++----
1 files changed, 162 insertions(+), 19 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_AllocateService/AllocateService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_AllocateService/AllocateService.cs"
index ae0c484..e96816c 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_AllocateService/AllocateService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_AllocateService/AllocateService.cs"
@@ -5,7 +5,9 @@
using SqlSugar.Extensions;
using System;
using System.Collections.Generic;
+using System.Dynamic;
using System.Linq;
+using System.Reflection;
using System.Text;
using System.Threading.Tasks;
using WIDESEA_Common.AllocateEnum;
@@ -16,6 +18,7 @@
using WIDESEA_Core.CodeConfigEnum;
using WIDESEA_Core.DB;
using WIDESEA_Core.Enums;
+using WIDESEA_Core.Helper;
using WIDESEA_Core.Seed;
using WIDESEA_IAllocateService;
using WIDESEA_IInboundService;
@@ -34,6 +37,8 @@
public readonly IRepository<Dt_AllocateOrder> _allocateOrderRepository;
public readonly IRepository<Dt_AllocateOrderDetail> _allocateOrderDetailRepository;
+ public readonly IRepository<Dt_InboundOrderDetail> _inboundOrderDetailRepository;
+
private readonly ILogger<AllocateService> _logger;
public AllocateService(IRepository<Dt_AllocateOrder> BaseDal,
IUnitOfWorkManage unitOfWorkManage,
@@ -41,6 +46,7 @@
IOutboundService outboundService,
IRepository<Dt_AllocateOrder> allocateOrderRepository,
IRepository<Dt_AllocateOrderDetail> allocateOrderDetailRepository,
+ IRepository<Dt_InboundOrderDetail> inboundOrderDetailRepository,
ILogger<AllocateService> logger) : base(BaseDal)
{
_unitOfWorkManage = unitOfWorkManage;
@@ -49,6 +55,7 @@
_allocateOrderRepository = allocateOrderRepository;
_allocateOrderDetailRepository = allocateOrderDetailRepository;
_logger = logger;
+ _inboundOrderDetailRepository = inboundOrderDetailRepository;
}
public IRepository<Dt_AllocateOrder> Repository => BaseDal;
@@ -97,21 +104,21 @@
{
if (Enum.TryParse<BusinessTypeEnum>(allocateOrder.BusinessType, out var businessType))
{
- if (businessType == BusinessTypeEnum.鏅轰粨璋冨閮ㄤ粨搴�)
+ if (businessType == BusinessTypeEnum.澶栭儴浠撳簱璋冩櫤浠�)
{
- allocateOrder.OrderType = InOrderTypeEnum.Allocat.ObjToInt();
+ allocateOrder.OrderType = (int)InOrderTypeEnum.AllocatInbound;
var inboundOrders = ConvertToInboundOrders(allocateOrder);
await _inboundService.InbounOrderService.ReceiveInboundOrder(inboundOrders, 1);
}
- else if (businessType == BusinessTypeEnum.澶栭儴浠撳簱璋冩櫤浠� || businessType == BusinessTypeEnum.鏅轰粨璋冩櫤浠�)
+ else if (businessType == BusinessTypeEnum.鏅轰粨璋冨閮ㄤ粨搴� || businessType == BusinessTypeEnum.鏅轰粨璋冩櫤浠�)
{
- if (businessType == BusinessTypeEnum.澶栭儴浠撳簱璋冩櫤浠�)
+ if (businessType == BusinessTypeEnum.鏅轰粨璋冨閮ㄤ粨搴�)
{
- allocateOrder.OrderType = InOrderTypeEnum.Allocat.ObjToInt();
+ allocateOrder.OrderType = (int)InOrderTypeEnum.AllocatOutbound;
}
else if (businessType == BusinessTypeEnum.鏅轰粨璋冩櫤浠�)
{
- allocateOrder.OrderType = InOrderTypeEnum.InternalAllocat.ObjToInt();
+ allocateOrder.OrderType = (int)InOrderTypeEnum.InternalAllocat;
}
var outboundOrders = ConvertToOutboundOrders(allocateOrder);
@@ -261,14 +268,14 @@
{
if (Enum.TryParse<BusinessTypeEnum>(allocateOrder.BusinessType, out var businessType))
{
- if (businessType == BusinessTypeEnum.鏅轰粨璋冨閮ㄤ粨搴�)
+ if (businessType == BusinessTypeEnum.澶栭儴浠撳簱璋冩櫤浠�)
{
_inboundService.InbounOrderService.Db.Deleteable<Dt_InboundOrder>().Where(x => x.UpperOrderNo == upperOrderNo).ExecuteCommand();
_inboundService.InboundOrderDetailService.Db.Deleteable<Dt_InboundOrderDetail>()
.Where(p => SqlFunc.Subqueryable<Dt_InboundOrder>().Where(s => s.Id == p.OrderId && s.UpperOrderNo == upperOrderNo).Any()).ExecuteCommand();
}
- else if (businessType == BusinessTypeEnum.澶栭儴浠撳簱璋冩櫤浠� || businessType == BusinessTypeEnum.鏅轰粨璋冩櫤浠�)
+ else if (businessType == BusinessTypeEnum.鏅轰粨璋冨閮ㄤ粨搴� || businessType == BusinessTypeEnum.鏅轰粨璋冩櫤浠�)
{
_outboundService.OutboundOrderService.Db.Deleteable<Dt_OutboundOrder>().Where(x => x.UpperOrderNo == upperOrderNo).ExecuteCommand();
_outboundService.OutboundOrderDetailService.Db.Deleteable<Dt_OutboundOrderDetail>()
@@ -279,6 +286,11 @@
public List<Dt_InboundOrder> ConvertToInboundOrders(Dt_AllocateOrder allocateOrder)
{
+ var distinctDetails = allocateOrder.Details
+ .GroupBy(d => d.Barcode)
+ .Select(g => g.First())
+ .ToList();
+
return new List<Dt_InboundOrder>()
{
new Dt_InboundOrder(){
@@ -293,9 +305,9 @@
IsBatch=allocateOrder.IsBatch,
FactoryArea=allocateOrder.FactoryArea,
Remark=allocateOrder.Remark,
- Details=allocateOrder.Details.Select(detail=>new Dt_InboundOrderDetail
+ Details=distinctDetails.Select(detail=>new Dt_InboundOrderDetail
{
- OrderId= detail.OrderId,
+ OrderId= 0,
MaterielCode=detail.MaterielCode,
MaterielName="",
BatchNo=detail.BatchNo,
@@ -305,6 +317,7 @@
OrderDetailStatus=detail.OrderDetailStatus,
Unit=detail.Unit,
RowNo=0,
+ lineNo=detail.LineNo,
SupplyCode=detail.SupplyCode,
WarehouseCode=detail.WarehouseCode,
Barcode=detail.Barcode,
@@ -318,6 +331,18 @@
public Dt_OutboundOrder ConvertToOutboundOrders(Dt_AllocateOrder allocateOrder)
{
+
+ var distinctDetails = allocateOrder.Details
+ .GroupBy(d => string.IsNullOrEmpty(d.Barcode)
+ ? $"{d.MaterielCode}_{d.BatchNo}_{d.SupplyCode}_{d.WarehouseCode}"
+ : d.Barcode)
+ .Select(g => new
+ {
+ Detail = g.First(),
+ //姹囨�诲垎缁勫唴鐨勬暟閲�
+ Qty = g.Sum(x => x.BarcodeQty ?? x.OrderQuantity)
+ }).ToList();
+
return new Dt_OutboundOrder()
{
WarehouseId = allocateOrder.WarehouseId,
@@ -332,20 +357,23 @@
Remark = allocateOrder.Remark,
DepartmentCode = "",
DepartmentName = "",
- Details = allocateOrder.Details.Select(detail => new Dt_OutboundOrderDetail
+ Details = distinctDetails.Select(item => new Dt_OutboundOrderDetail
{
- OrderId = detail.OrderId,
- MaterielCode = detail.MaterielCode,
+ OrderId = 0,
+ MaterielCode = item.Detail.MaterielCode,
MaterielName = "",
- BatchNo = detail.BatchNo,
- OrderQuantity = detail.OrderQuantity,
+ BatchNo = item.Detail.BatchNo,
+ OrderQuantity = item.Detail.OrderQuantity,
+ BarcodeQty = item.Detail.BarcodeQty??0,
+ BarcodeUnit = item.Detail.BarcodeUnit??"",
LockQuantity = 0,
+ lineNo = item.Detail.LineNo,
OverOutQuantity = 0,
- OrderDetailStatus = detail.OrderDetailStatus,
- Unit = detail.Unit,
+ OrderDetailStatus = item.Detail.OrderDetailStatus,
+ Unit = item.Detail.Unit,
RowNo = 0,
- SupplyCode = detail.SupplyCode,
- WarehouseCode = detail.WarehouseCode,
+ SupplyCode = item.Detail.SupplyCode,
+ WarehouseCode = item.Detail.WarehouseCode,
}).ToList()
};
@@ -410,5 +438,120 @@
return code;
}
}
+
+ //public override PageGridData<Dt_AllocateOrder> PageGridData(PageDataOptions options)
+ //{
+ // string wheres = ValidatePageOptions(options);
+ // //鑾峰彇鎺掑簭瀛楁
+ // Dictionary<string, SqlSugar.OrderByType> orderbyDic = GetPageDataSort(options, TProperties);
+ // List<OrderByModel> orderByModels = new List<OrderByModel>();
+ // foreach (var item in orderbyDic)
+ // {
+ // OrderByModel orderByModel = new()
+ // {
+ // FieldName = item.Key,
+ // OrderByType = item.Value
+ // };
+ // orderByModels.Add(orderByModel);
+ // }
+
+
+ // int totalCount = 0;
+ // List<SearchParameters> searchParametersList = new List<SearchParameters>();
+ // if (!string.IsNullOrEmpty(options.Wheres))
+ // {
+ // try
+ // {
+ // searchParametersList = options.Wheres.DeserializeObject<List<SearchParameters>>();
+ // options.Filter = searchParametersList;
+ // }
+ // catch { }
+ // }
+ // var data = BaseDal.Db.Queryable<Dt_AllocateOrderDetail>()
+ // .WhereIF(!wheres.IsNullOrEmpty(), wheres)
+ // .OrderBy(orderByModels)
+ // .ToPageList(options.Page, options.Rows, ref totalCount);
+ // Dt_AllocateOrder allocateOrder = _allocateOrderRepository.QueryFirst(x => x.Id == (int)options.Value);
+ // Dt_InboundOrder _InboundOrder = SqlSugarHelper.DbWMS.Queryable<Dt_InboundOrder>().Where(x => x.UpperOrderNo == allocateOrder.UpperOrderNo).First();
+ // var details = _inboundOrderDetailRepository.QueryData(x => x.OrderId == _InboundOrder.Id);
+ // foreach (var item in data)
+ // {
+ // var detail = details.Where(x => x.MaterielCode == item.MaterielCode).FirstOrDefault();
+ // if (detail != null)
+ // {
+ // item.OrderQuantity = detail.OrderQuantity;
+ // item.ReceiptQuantity = detail.ReceiptQuantity;
+ // item.OverInQuantity = detail.OverInQuantity;
+ // item.OrderDetailStatus = detail.OrderDetailStatus;
+ // }
+ // }
+ // return new PageGridData<Dt_AllocateOrderDetail>(totalCount, data);
+
+
+
+
+ // return new PageGridData<Dt_InboundOrderDetail>(totalCount, data);
+ //}
+
+ public override PageGridData<Dt_InboundOrderDetail> GetDetailPage(PageDataOptions options)
+ {
+ string wheres = ValidatePageOptions(options);
+ //鑾峰彇鎺掑簭瀛楁
+ Dictionary<string, SqlSugar.OrderByType> orderbyDic = GetPageDataSort(options, TProperties);
+ List<OrderByModel> orderByModels = new List<OrderByModel>();
+ foreach (var item in orderbyDic)
+ {
+ OrderByModel orderByModel = new()
+ {
+ FieldName = item.Key,
+ OrderByType = item.Value
+ };
+ orderByModels.Add(orderByModel);
+ }
+
+
+ int totalCount = 0;
+ List<SearchParameters> searchParametersList = new List<SearchParameters>();
+ if (!string.IsNullOrEmpty(options.Wheres))
+ {
+ try
+ {
+ searchParametersList = options.Wheres.DeserializeObject<List<SearchParameters>>();
+ options.Filter = searchParametersList;
+ }
+ catch { }
+ }
+ //var data = BaseDal.Db.Queryable<Dt_AllocateOrderDetail>()
+ // .WhereIF(!wheres.IsNullOrEmpty(), wheres)
+ // .OrderBy(orderByModels)
+ // .ToPageList(options.Page, options.Rows, ref totalCount);
+ //Dt_AllocateOrder allocateOrder = _allocateOrderRepository.QueryFirst(x => x.Id == (int)options.Value);
+ //Dt_InboundOrder _InboundOrder = SqlSugarHelper.DbWMS.Queryable<Dt_InboundOrder>().Where(x => x.UpperOrderNo == allocateOrder.UpperOrderNo).First();
+ //var details = _inboundOrderDetailRepository.QueryData(x => x.OrderId == _InboundOrder.Id );
+ //foreach (var item in data)
+ //{
+ // var detail = details.Where(x => x.MaterielCode == item.MaterielCode).FirstOrDefault();
+ // if (detail != null)
+ // {
+ // item.OrderQuantity = detail.OrderQuantity;
+ // item.ReceiptQuantity = detail.ReceiptQuantity;
+ // item.OverInQuantity = detail.OverInQuantity;
+ // item.OrderDetailStatus = detail.OrderDetailStatus;
+ // }
+ //}
+ //return new PageGridData<Dt_AllocateOrderDetail>(totalCount, data);
+
+ Dt_AllocateOrder allocateOrder = _allocateOrderRepository.QueryFirst(x => x.Id == (int)options.Value);
+ Dt_InboundOrder _InboundOrder = SqlSugarHelper.DbWMS.Queryable<Dt_InboundOrder>().Where(x => x.UpperOrderNo == allocateOrder.UpperOrderNo).First();
+
+ var data = BaseDal.Db.Queryable<Dt_InboundOrderDetail>()
+ .WhereIF(!wheres.IsNullOrEmpty(), wheres)
+ .WhereIF(!_InboundOrder.IsNullOrEmpty(), x => x.OrderId == _InboundOrder.Id)
+ .OrderBy(orderByModels)
+ .ToPageList(options.Page, options.Rows, ref totalCount);
+
+
+ return new PageGridData<Dt_InboundOrderDetail>(totalCount, data);
+ }
}
}
--
Gitblit v1.9.3