From a9a3f943efb083de8ed88b293897886b3ef612a2 Mon Sep 17 00:00:00 2001
From: helongyang <647556386@qq.com>
Date: 星期一, 11 八月 2025 17:37:09 +0800
Subject: [PATCH] 功能增添优化
---
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_OutboundService/OutboundOrderService.cs | 103 ++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 92 insertions(+), 11 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_OutboundService/OutboundOrderService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_OutboundService/OutboundOrderService.cs"
index 132956c..79d9568 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_OutboundService/OutboundOrderService.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_OutboundService/OutboundOrderService.cs"
@@ -61,6 +61,31 @@
_outStockLockInfoService = outStockLockInfoService;
_outboundOrderRepository = outboundOrderRepository;
}
+ public override PageGridData<Dt_OutboundOrder> GetPageData(PageDataOptions options)
+ {
+ PageGridData<Dt_OutboundOrder> pageGridData = base.GetPageData(options);
+
+ ISugarQueryable<Dt_OutboundOrder> sugarQueryable1 = BaseDal.Db.Queryable<Dt_OutboundOrder>().Includes(x => x.Details);
+ if (!string.IsNullOrEmpty(options.Wheres))
+ {
+
+ List<SearchParameters> searchParametersList = options.Wheres.DeserializeObject<List<SearchParameters>>();
+ int totalCount = 0;
+ if (searchParametersList.Count > 0)
+ {
+ {
+ SearchParameters? searchParameters = searchParametersList.FirstOrDefault(x => x.Name == nameof(Dt_OutboundOrderDetail.MaterielCode).FirstLetterToLower());
+ if (searchParameters != null)
+ {
+ sugarQueryable1 = sugarQueryable1.Where(x => x.Details.Any(v => v.MaterielCode.Contains(searchParameters.Value)));
+ List<Dt_OutboundOrder> dataList = sugarQueryable1.ToPageList(options.Page, options.Rows, ref totalCount);
+ return new PageGridData<Dt_OutboundOrder>(totalCount, dataList);
+ }
+ }
+ }
+ }
+ return pageGridData;
+ }
public override WebResponseContent AddData(SaveModel saveModel)
{
if (saveModel.MainData.TryGetValue(nameof(Dt_OutboundOrder.UpperOrderNo).FirstLetterToLower(), out object? upperOrderNo) && upperOrderNo != null && !string.IsNullOrEmpty(upperOrderNo.ToString()))
@@ -88,17 +113,17 @@
int pageNo = saveModel.MainData["pageNo"].ObjToInt();
string? orderNo = saveModel.MainData["orderNo"].ToString();
int warehouseId = saveModel.MainData["warehouseId"].ObjToInt();
- List<Dt_OutboundOrder> dt_ReceiveOrders = new List<Dt_OutboundOrder>();
+ List<Dt_OutboundOrder> _OutboundOrders = new List<Dt_OutboundOrder>();
if (string.IsNullOrEmpty(orderNo))
{
- dt_ReceiveOrders = Db.Queryable<Dt_OutboundOrder>().Where(x => x.OrderStatus < OutLockStockStatusEnum.鍑哄簱瀹屾垚.ObjToInt() && x.WarehouseId == warehouseId).OrderByDescending(x => x.CreateDate).ToPageList(pageNo, 5);
+ _OutboundOrders = Db.Queryable<Dt_OutboundOrder>().Where(x => x.OrderStatus < OutOrderStatusEnum.鍑哄簱瀹屾垚.ObjToInt() && x.WarehouseId == warehouseId).OrderByDescending(x => x.CreateDate).ToPageList(pageNo, 5);
}
else
{
- dt_ReceiveOrders = Db.Queryable<Dt_OutboundOrder>().Where(x => (x.OrderNo.Contains(orderNo)) && x.OrderStatus < OutLockStockStatusEnum.鍑哄簱瀹屾垚.ObjToInt() && x.WarehouseId == warehouseId).OrderByDescending(x => x.CreateDate).ToPageList(pageNo, 5);
+ _OutboundOrders = Db.Queryable<Dt_OutboundOrder>().Where(x => (x.OrderNo.Contains(orderNo)) && x.OrderStatus < OutOrderStatusEnum.鍑哄簱瀹屾垚.ObjToInt() && x.WarehouseId == warehouseId).OrderByDescending(x => x.CreateDate).ToPageList(pageNo, 5);
}
- content.OK(data: dt_ReceiveOrders);
+ content.OK(data: _OutboundOrders);
}
catch (Exception ex)
{
@@ -173,7 +198,9 @@
StockId = stockInfo.Id,
TaskNum = 0,
OrderQuantity = outboundOrderDetail.OrderQuantity,
- Unit = outboundOrderDetail.Unit
+ Unit = outboundOrderDetail.Unit,
+ ProductionDate = stockInfoDetail.ProductionDate,
+ EffectiveDate = stockInfoDetail.EffectiveDate
};
#region 淇敼鍑哄簱鍗�
@@ -235,7 +262,7 @@
ERPPickItemModel pickItemModel = new ERPPickItemModel()
{
Lotno = item.BatchNo,
- Qty = item.AssignQuantity.ObjToInt().ToString(),
+ Qty = item.AssignQuantity.ToString(),
Location = WarehouseCode
};
//鑾峰彇鍑哄簱鍗曟槑缁�
@@ -266,7 +293,7 @@
Deptno = outboundOrder.DepartmentCode,
Deptname = outboundOrder.DepartmentName,
Createtime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"),
- Createuser = string.IsNullOrEmpty(Createuser) ? Createuser : "admin",
+ Createuser = Createuser,
Issitem = new List<ERPIssueItemModel>() { issueItemModel },
};
//鏇存柊鍙戞枡鍗曞彿
@@ -283,30 +310,38 @@
{
try
{
+ Dt_OutboundOrder oldOutboundOrder = BaseDal.Db.Queryable<Dt_OutboundOrder>().Where(x => x.UpperOrderNo == model.OrderNo && x.OrderStatus < OutOrderStatusEnum.鍏抽棴.ObjToInt()).Includes(x => x.Details).OrderBy(x => x.CreateDate).First();
Dt_MaterielInfo materielInfo = _basicService.MaterielInfoService.Repository.QueryFirst(x => x.MaterielCode == model.MCode);
+
if (materielInfo == null)
{
+ DelOutOrder(oldOutboundOrder);
return WebResponseContent.Instance.Error($"鏈壘鍒拌鐗╂枡淇℃伅");
}
Dt_Warehouse warehouse = _basicService.WarehouseService.Repository.QueryFirst(x => x.WarehouseCode == model.WaId);
if (warehouse == null)
{
+ DelOutOrder(oldOutboundOrder);
return WebResponseContent.Instance.Error($"鏈壘鍒拌浠撳簱淇℃伅");
}
-
- Dt_OutboundOrder oldOutboundOrder = BaseDal.Db.Queryable<Dt_OutboundOrder>().Where(x => x.UpperOrderNo == model.OrderNo).Includes(x => x.Details).First();
-
+ if (materielInfo.WarehouseId!= materielInfo.WarehouseId)
+ {
+ DelOutOrder(oldOutboundOrder);
+ return WebResponseContent.Instance.Error($"鐗╂枡{materielInfo}涓嶅睘浜巤warehouse.WarehouseName}");
+ }
if (model.Way == 1)
{
if (oldOutboundOrder != null)
{
if (oldOutboundOrder.Details.FirstOrDefault(x => x.RowNo == Convert.ToInt32(model.RowNo)) != null)
{
+ DelOutOrder(oldOutboundOrder);
return WebResponseContent.Instance.Error($"璇ユ槑缁嗚鍙峰凡瀛樺湪");
}
if (oldOutboundOrder.WarehouseId != warehouse.WarehouseId)
{
+ DelOutOrder(oldOutboundOrder);
return WebResponseContent.Instance.Error($"浠撳簱涓嶄竴鑷�");
}
else
@@ -412,6 +447,28 @@
return WebResponseContent.Instance.Error(ex.Message);
}
}
+ /// <summary>
+ /// 璇ュ崟鎹け璐ヨ繘琛屽垹闄�
+ /// </summary>
+ /// <returns></returns>
+ public void DelOutOrder(Dt_OutboundOrder outboundOrder)
+ {
+ try
+ {
+ if (outboundOrder != null && outboundOrder.Details.Count > 0)
+ {
+ _unitOfWorkManage.BeginTran();
+ _outboundOrderRepository.DeleteAndMoveIntoHty(outboundOrder, OperateTypeEnum.鑷姩鍒犻櫎);
+ _outboundOrderDetailRepository.DeleteAndMoveIntoHty(outboundOrder.Details, OperateTypeEnum.鑷姩鍒犻櫎);
+ _unitOfWorkManage.CommitTran();
+ }
+ }
+ catch (Exception ex)
+ {
+ _unitOfWorkManage.RollbackTran();
+ throw new Exception(ex.Message);
+ }
+ }
//涓婃姤鍑哄簱瀹屾垚
public WebResponseContent TestOutUpload(int id, List<Dt_OutStockLockInfo>? outStockLockInfos)
{
@@ -474,7 +531,7 @@
issueModel = new ERPIssueModel()
{
UniqueTag = id.ToString(),
- Code = CreateCodeByRule(nameof(RuleCodeEnum.FLCodeRule)),//娴嬭瘯
+ Code = CreateCodeByRule(nameof(RuleCodeEnum.FLCodeRule)),
WarehouseCode = warehouse.WarehouseCode,
Docremark = "",
Deptno = outboundOrder.DepartmentCode,
@@ -687,5 +744,29 @@
}
return content;
}
+ public WebResponseContent OutUpOrderGetFLOrder()
+ {
+ WebResponseContent content = new WebResponseContent();
+ try
+ {
+ //鑾峰彇鍑哄簱鍗�
+ List<Dt_OutboundOrder> outboundOrders = BaseDal.QueryData(x => x.OrderStatus == OutOrderStatusEnum.鍑哄簱瀹屾垚.ObjToInt() && x.UpFLOrderNo == null);
+ List<Sys_Log> logs = BaseDal.Db.Queryable<Sys_Log>().Where(x => x.RequestParam.Contains("棰嗘枡鍑哄簱閫氱煡鍗�") && x.Id > 14606).ToList();
+ foreach (var item in outboundOrders)
+ {
+ Sys_Log? log = logs.FirstOrDefault(x=>x.RequestParam.Contains(item.UpperOrderNo));
+ if (log == null) { continue; }
+ ERPBaseModel <ERPIssueModel> baseModel= log.RequestParam.DeserializeObject<ERPBaseModel<ERPIssueModel>>();
+ item.UpFLOrderNo = baseModel.Data.Code;
+ }
+ BaseDal.UpdateData(outboundOrders);
+ content.OK();
+ }
+ catch (Exception ex)
+ {
+ content.Error(ex.Message);
+ }
+ return content;
+ }
}
}
--
Gitblit v1.9.3