From d5430d9a9e73eae213c16baea9fbbcf54cc5d5da Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期三, 22 一月 2025 16:13:53 +0800
Subject: [PATCH] 库存导出，采购单接收，物料接收优化，前端显示优化，测试架AGV任务大小托盘更改
---
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService_Outbound.cs | 82 ++++++++++++++++++++++-------------------
1 files changed, 44 insertions(+), 38 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService_Outbound.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService_Outbound.cs"
index 8bdc9d9..6ec106d 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService_Outbound.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService_Outbound.cs"
@@ -17,6 +17,7 @@
using WIDESEA_Common.LocationEnum;
using MailKit.Search;
using WIDESEA_External.Model;
+using WIDESEA_Core.CodeConfigEnum;
namespace WIDESEA_TaskInfoService
{
@@ -189,7 +190,7 @@
{
throw new Exception("鏈壘鍒板嚭搴撳崟鏄庣粏淇℃伅");
}
- if (outboundOrderDetails.FirstOrDefault(x => x.OrderDetailStatus >= OrderDetailStatusEnum.New.ObjToInt())!=null)
+ if (outboundOrderDetails.FirstOrDefault(x => x.OrderDetailStatus > OrderDetailStatusEnum.New.ObjToInt() && x.OrderDetailStatus != OrderDetailStatusEnum.AssignOverPartial.ObjToInt()) != null)
{
throw new Exception("鎵�閫夊嚭搴撳崟鏄庣粏瀛樺湪鍑哄簱涓垨宸插畬鎴�");
}
@@ -267,6 +268,7 @@
{
try
{
+ #region MyRegion
Dt_OutboundOrderDetail OrderDetail = _outboundService.OutboundOrderDetailService.Repository.QueryFirst(x => x.Id == orderDetailId);
if (OrderDetail == null)
@@ -355,44 +357,48 @@
_stockRepository.StockInfoDetailRepository.UpdateData(upstockDetails);
_stockRepository.StockInfoDetailRepository.DeleteData(destockDetails);
_unitOfWorkManage.CommitTran();
+ #endregion
#region 涓婃姤ERP
- List<ERPPickModel> eRPPickModels = new List<ERPPickModel>();
- outStockLockInfos.ForEach(x =>
+ if (outboundOrder.OrderStatus == OutOrderStatusEnum.鍑哄簱瀹屾垚.ObjToInt())
{
- ERPPickItemModel pickItemModel = new ERPPickItemModel()
- {
- Lotno = x.BatchNo,
- Qty = x.AssignQuantity.ToString(),
- Location = warehouse.WarehouseCode
- };
- ERPPickModel pickModel = new ERPPickModel()
- {
- Rowindex = OrderDetail.RowNo,
- Material = OrderDetail.MaterielCode,
- Qty = pickItemModel.Qty,
- Dataitem = new List<ERPPickItemModel> { pickItemModel }
- };
- eRPPickModels.Add(pickModel);
- });
- ERPIssueItemModel issueItemModel = new ERPIssueItemModel()
- {
- Pickcode = outboundOrder.UpperOrderNo,
- PickList = eRPPickModels
- };
- ERPIssueModel issueModel = new ERPIssueModel()
- {
- UniqueTag = outboundOrder.Id.ToString(),
- Code = outboundOrder.OrderNo,
- WarehouseCode = warehouse.WarehouseCode,
- Docremark = "",
- Deptno = outboundOrder.DepartmentCode,
- Deptname = outboundOrder.DepartmentName,
- Createtime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"),
- Createuser = App.User.UserName,
- Issitem = new List<ERPIssueItemModel>() { issueItemModel }
- };
- _invokeERPService.InvokeOutStandardsApi(issueModel);
+ //List<ERPPickModel> eRPPickModels = new List<ERPPickModel>();
+ //outStockLockInfos.ForEach(x =>
+ //{
+ // ERPPickItemModel pickItemModel = new ERPPickItemModel()
+ // {
+ // Lotno = x.BatchNo,
+ // Qty = x.AssignQuantity.ToString(),
+ // Location = warehouse.WarehouseCode
+ // };
+ // ERPPickModel pickModel = new ERPPickModel()
+ // {
+ // Rowindex = OrderDetail.RowNo,
+ // Material = OrderDetail.MaterielCode,
+ // Qty = pickItemModel.Qty,
+ // Dataitem = new List<ERPPickItemModel> { pickItemModel }
+ // };
+ // eRPPickModels.Add(pickModel);
+ //});
+ //ERPIssueItemModel issueItemModel = new ERPIssueItemModel()
+ //{
+ // Pickcode = outboundOrder.UpperOrderNo,
+ // PickList = eRPPickModels
+ //};
+ //ERPIssueModel issueModel = new ERPIssueModel()
+ //{
+ // UniqueTag = outboundOrder.Id.ToString(),
+ // Code = _outboundService.OutboundOrderService.CreateCodeByRule(nameof(RuleCodeEnum.FLCodeRule)),
+ // WarehouseCode = warehouse.WarehouseCode,
+ // Docremark = "",
+ // Deptno = outboundOrder.DepartmentCode,
+ // Deptname = outboundOrder.DepartmentName,
+ // Createtime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"),
+ // Createuser = App.User.UserName,
+ // Issitem = new List<ERPIssueItemModel>() { issueItemModel }
+ //};
+ _invokeERPService.InvokeOutStandardsApi(_outboundService.OutboundOrderService.GetERPIssueModel(outboundOrder, warehouse.WarehouseCode));
+ }
#endregion
return WebResponseContent.Instance.OK();
@@ -455,7 +461,7 @@
/// </summary>
/// <param name="keys">鍑哄簱鍗曟槑缁嗕富閿�</param>
/// <returns></returns>
- public WebResponseContent GenerateOutboundTask(int[] keys)
+ public WebResponseContent GenerateOutboundTasks(int[] keys)
{
try
{
@@ -509,7 +515,7 @@
{
List<int> keys = _outboundService.OutboundOrderDetailService.Repository.QueryData(x => x.Id, x => x.OrderId == outboundId);
- return GenerateOutboundTask(keys.ToArray());
+ return GenerateOutboundTasks(keys.ToArray());
}
catch (Exception ex)
{
--
Gitblit v1.9.3