From 58a1b8b7db72225e0c2acca4f76399899f1bda4f Mon Sep 17 00:00:00 2001
From: wankeda <Administrator@DESKTOP-HAU3ST3>
Date: 星期五, 09 一月 2026 15:14:41 +0800
Subject: [PATCH] 1
---
WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs | 2885 ++++++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 2,269 insertions(+), 616 deletions(-)
diff --git a/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs b/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs
index f264e11..86d454a 100644
--- a/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs
+++ b/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs
@@ -34,6 +34,7 @@
using System.Threading.Tasks;
using WIDESEA_BasicRepository;
using WIDESEA_Common;
+using WIDESEA_Common.OrderEnum;
using WIDESEA_Common.TaskEnum;
using WIDESEA_Core;
using WIDESEA_Core.BaseRepository;
@@ -41,11 +42,13 @@
using WIDESEA_Core.Enums;
using WIDESEA_Core.Helper;
using WIDESEA_Core.TaskEnum;
+using WIDESEA_DTO.Basic;
using WIDESEA_DTO.Inbound;
using WIDESEA_DTO.Stock;
using WIDESEA_DTO.Task;
using WIDESEA_IBasicRepository;
using WIDESEA_IBasicService;
+using WIDESEA_IInboundRepository;
using WIDESEA_IInboundService;
using WIDESEA_IOutboundRepository;
using WIDESEA_IOutboundService;
@@ -55,14 +58,29 @@
using WIDESEA_ITaskInfoRepository;
using WIDESEA_ITaskInfoService;
using WIDESEA_Model.Models;
+using WIDESEA_Model.Models.Inbound;
using WIDESEA_StockRepository;
using WIDESEA_TaskInfoRepository;
using static WIDESEA_Common.Authentication;
+using static WIDESEA_Common.HouseBackboundPassBack;
using static WIDESEA_Common.HouseInboundPassBack;
using static WIDESEA_Common.HouseoutboundPassBack;
using static WIDESEA_Common.InventoryAllocate;
using static WIDESEA_ITaskInfoService.ITaskService;
using Parameter = WIDESEA_Common.Parameter;
+using WIDESEA_DTO.ERP;
+using WIDESEA_OutboundRepository;
+using System.ComponentModel.DataAnnotations;
+using System;
+using System.IO;
+using System.Net.Http;
+using System.Threading.Tasks;
+using Spire.Pdf;
+using WIDESEA_InboundRepository;
+using System.Drawing.Printing;
+using System;
+using WIDESEA_Common.Log;
+using static WIDESEA_Common.HouseInboundPassBack.data.data1;
namespace WIDESEA_TaskInfoService
{
@@ -88,10 +106,15 @@
private readonly IOutboundOrderDetail_HtyService _outboundOrderDetail_HtyService;
private readonly IPalletTypeInfoRepository _palletTypeInfoRepository;
private readonly IOutboundOrderDetailRepository _outboundOrderDetailRepository;
+ private readonly INewOutboundOrderDetailRepository _newOutboundOrderDetailRepository;
private readonly IStockInfoDetailRepository _stockInfoDetailRepository;
+ private readonly IReturnOrderRepository _returnOrderRepository;
+ private readonly IProductionRepository _productionRepository;
+ private readonly IInboundRepository _inboundRepository;
+
public ITaskRepository Repository => BaseDal;
- public TaskService(ITaskRepository BaseDal, IMapper mapper, IUnitOfWorkManage unitOfWorkManage, IMaterielInfoService materielInfoService, IInboundOrderDetail_HtyService inboundOrderDetail_HtyService, IOutboundOrder_HtyService outboundOrder_HtyService, IOutboundOrderDetail_HtyService outboundOrderDetail_HtyService, IInboundOrder_HtyService inboundOrder_HtyService, IStockRepository stockRepository, IInboundOrderDetailService inboundOrderDetailService, IBasicService basicService, IOutboundService outboundService, IInboundService inboundService, IRecordService recordService, IStockService stockService, ITask_HtyService taskHtyService, ILocationInfoService locationInfoService, IOutboundOrderDetailRepository outboundOrderDetailRepository, IBasicRepository basicRepository, IStockInfoDetailRepository stockInfoDetailRepository, IPalletTypeInfoRepository palletTypeInfoRepository) : base(BaseDal)
+ public TaskService(ITaskRepository BaseDal, IMapper mapper, IUnitOfWorkManage unitOfWorkManage, IMaterielInfoService materielInfoService, IInboundOrderDetail_HtyService inboundOrderDetail_HtyService, IOutboundOrder_HtyService outboundOrder_HtyService, IOutboundOrderDetail_HtyService outboundOrderDetail_HtyService, IInboundOrder_HtyService inboundOrder_HtyService, IStockRepository stockRepository, IInboundOrderDetailService inboundOrderDetailService, IBasicService basicService, IOutboundService outboundService, IInboundService inboundService, IRecordService recordService, IStockService stockService, ITask_HtyService taskHtyService, ILocationInfoService locationInfoService, IOutboundOrderDetailRepository outboundOrderDetailRepository, IBasicRepository basicRepository, IStockInfoDetailRepository stockInfoDetailRepository, IPalletTypeInfoRepository palletTypeInfoRepository, IReturnOrderRepository returnOrderRepository, IProductionRepository productionRepository, IInboundRepository inboundRepository, INewOutboundOrderDetailRepository newOutboundOrderDetailRepository) : base(BaseDal)
{
_mapper = mapper;
_stockRepository = stockRepository;
@@ -113,12 +136,19 @@
_basicRepository = basicRepository;
_stockInfoDetailRepository = stockInfoDetailRepository;
_palletTypeInfoRepository = palletTypeInfoRepository;
+ _returnOrderRepository = returnOrderRepository;
+ _productionRepository = productionRepository;
+ _inboundRepository = inboundRepository;
+ _newOutboundOrderDetailRepository = newOutboundOrderDetailRepository;
}
public string ReceiveWMSTaskin = WIDESEA_Core.Helper.AppSettings.Configuration["ReceiveWMSTaskin"];
+ public string ReceiveWMSTaskreturn = WIDESEA_Core.Helper.AppSettings.Configuration["ReceiveWMSTaskreturn"];
public string ReceiveWMSTaskout = WIDESEA_Core.Helper.AppSettings.Configuration["ReceiveWMSTaskout"];
public string ReceiveWMSTaskAUT = WIDESEA_Core.Helper.AppSettings.Configuration["ReceiveWMSTaskAUT"];
public string ReceiveWMSTaskAllocatein = WIDESEA_Core.Helper.AppSettings.Configuration["ReceiveWMSTaskAllocatein"];
+ public string ReceiveERPTaskout = WIDESEA_Core.Helper.AppSettings.Configuration["ReceiveERPTaskout"];
+ public string InMaterialWarehousingCallback = WIDESEA_Core.Helper.AppSettings.Configuration["InMaterialWarehousingCallback"];
/// <summary>
@@ -140,6 +170,54 @@
return WebResponseContent.Instance.Error($"鏈壘鍒癢CSApi鍦板潃,璇锋鏌ラ厤缃枃浠�");
}
string response = HttpHelper.Post($"{url}/api/Task/ReceiveTask", taskDTOs.Serialize());
+
+ return JsonConvert.DeserializeObject<WebResponseContent>(response) ?? WebResponseContent.Instance.Error("杩斿洖閿欒");
+ }
+ catch (Exception ex)
+ {
+ return WebResponseContent.Instance.Error(ex.Message);
+ }
+ }
+
+ public WebResponseContent PushTasksWCS(List<Dt_Task> tasks, string agvDescription = "")
+ {
+ try
+ {
+ List<WMSTaskDTO> taskDTOs = _mapper.Map<List<WMSTaskDTO>>(tasks);
+ taskDTOs.ForEach(x =>
+ {
+ x.AGVArea = agvDescription;
+ });
+ string url = AppSettings.app("WCS");
+ if (string.IsNullOrEmpty(url))
+ {
+ return WebResponseContent.Instance.Error($"鏈壘鍒癢CSApi鍦板潃,璇锋鏌ラ厤缃枃浠�");
+ }
+ string response = HttpHelper.Post($"{url}/api/Task/ReceiveCPTask", taskDTOs.Serialize());
+
+ return JsonConvert.DeserializeObject<WebResponseContent>(response) ?? WebResponseContent.Instance.Error("杩斿洖閿欒");
+ }
+ catch (Exception ex)
+ {
+ return WebResponseContent.Instance.Error(ex.Message);
+ }
+ }
+
+ public WebResponseContent FeedBackWCSTaskCompleted(int taskNum)
+ {
+ try
+ {
+ Dt_Task task = BaseDal.QueryFirst(x => x.TaskNum == taskNum);
+ if (task == null)
+ {
+ return WebResponseContent.Instance.Error("鏈壘鍒拌浠诲姟淇℃伅");
+ }
+ string url = AppSettings.app("WCS");
+ if (string.IsNullOrEmpty(url))
+ {
+ return WebResponseContent.Instance.Error($"鏈壘鍒癢CSApi鍦板潃,璇锋鏌ラ厤缃枃浠�");
+ }
+ string response = HttpHelper.Post($"{url}/api/Task/RecWMSTaskCompleted?taskNum=" + taskNum);
return JsonConvert.DeserializeObject<WebResponseContent>(response) ?? WebResponseContent.Instance.Error("杩斿洖閿欒");
}
@@ -381,7 +459,7 @@
{
return WebResponseContent.Instance.Error($"鏈壘鍒拌浠诲姟");
}
- if (task.TaskType != TaskTypeEnum.Inbound.ObjToInt())
+ if (task.TaskType.GetTaskTypeGroup() != TaskTypeGroup.InboundGroup)
{
return WebResponseContent.Instance.Error($"浠诲姟绫诲瀷閿欒");
}
@@ -415,13 +493,404 @@
Dt_Warehouse warehouse = _basicService.WarehouseService.Repository.QueryFirst(x => x.WarehouseId == task.WarehouseId);
dt_StockInfo.LocationCode = dt_LocationInfo.LocationCode;
+ if (task.TaskType == TaskTypeEnum.InSyncretism.ObjToInt())
+ {
+ int laststatus = dt_LocationInfo.LocationStatus;
+ dt_LocationInfo.LocationStatus = LocationStatusEnum.InStock.ObjToInt();
+ ///鏇存柊搴撳瓨鐘舵��
+ dt_StockInfo.StockStatus = StockStatusEmun.鍏ュ簱瀹屾垚.ObjToInt();
+ // 鏇存柊搴撳瓨鏄庣粏鐘舵��
+ dt_StockInfo.Details.ForEach(x => x.Status = StockStatusEmun.鍏ュ簱瀹屾垚.ObjToInt());
+
+ _unitOfWorkManage.BeginTran();
+
+ // 鏇存柊浠诲姟鐘舵��
+ UpdateTaskStatus(task);
+
+ // 鏇存柊璐т綅鐘舵��
+ UpdateLocationStatus(dt_LocationInfo, laststatus);
+
+ // 鏇存柊搴撳瓨淇℃伅
+ UpdateStockInfo(dt_StockInfo);
+
+ AddRecords(task, dt_StockInfo, dt_LocationInfo, laststatus);
+
+ //杩斿洖smom搴撳瓨绉诲姩鏁版嵁銆傘�傘�傘��
+
+ _unitOfWorkManage.CommitTran();
+ }
+ else
+ {
+ if (warehouse.WarehouseCode.Contains("CP"))
+ {
+
+ if (task.TaskType == TaskTypeEnum.SurplusReturn.ObjToInt() || task.TaskType == TaskTypeEnum.ReverseIn.ObjToInt())
+ {
+ return ReturnInbound(task, dt_StockInfo, dt_LocationInfo);
+ }
+ // 1. 鑾峰彇鍏ュ簱鍗曚俊鎭�
+ Dt_InboundOrder? inboundOrder = null;
+ if (!string.IsNullOrEmpty(dt_StockInfo.Details.FirstOrDefault()?.OrderNo))
+ {
+ inboundOrder = _inboundService.InbounOrderService.Db.Queryable<Dt_InboundOrder>()
+ .Where(x => x.OrderNo == dt_StockInfo.Details.FirstOrDefault().OrderNo)
+ .Includes(x => x.Details)
+ .First();
+ }
+
+ // 3. 澶勭悊鍏ュ簱閫昏緫
+ if (task.TaskType == TaskTypeEnum.Inbound.ObjToInt())
+ {
+ int lastStatus = dt_LocationInfo.LocationStatus;
+ dt_LocationInfo.LocationStatus = LocationStatusEnum.InStock.ObjToInt();
+
+ if (task.TaskType == TaskTypeEnum.Inbound.ObjToInt() && inboundOrder == null)
+ {
+ return WebResponseContent.Instance.Error("鏈壘鍒板叆搴撳崟淇℃伅");
+ }
+ var allBoxCodesForDetail = BaseDal.Db.Queryable<Dt_StockInfoDetailCP>()
+ .Where(x => x.StockDetailId == dt_StockInfo.Details.FirstOrDefault().Id)
+ .Select(x => x.BoxCode)
+ .ToList();
+
+ // 2. 鑾峰彇鎵樼洏涓嬬殑鎵�鏈夌鍙�
+ var boxCodes = new List<string>();
+
+ // 鏂规硶1锛氫粠搴撳瓨鏄庣粏鐨凚oxCodes瀛楁鑾峰彇锛堢粍鐩樻椂淇濆瓨鐨勶級
+ foreach (var detail in allBoxCodesForDetail)
+ {
+ if (!string.IsNullOrEmpty(detail))
+ {
+ var codes = detail.Split(',', StringSplitOptions.RemoveEmptyEntries);
+ boxCodes.AddRange(codes);
+ }
+ }
+
+ // 鏍规嵁鎵樼洏鏄庣粏鑾峰彇瀵瑰簲鐨勫叆搴撳崟鏄庣粏
+ List<Dt_InboundOrderDetail> inboundOrderDetails = new List<Dt_InboundOrderDetail>();
+
+ // 澶勭悊澶氫釜搴撳瓨鏄庣粏鐨勬儏鍐�
+ foreach (var stockDetail in dt_StockInfo.Details)
+ {
+ if (!string.IsNullOrEmpty(stockDetail.OrderNo))
+ {
+ var detail = inboundOrder.Details.FirstOrDefault(x => x.LinId == stockDetail.LinId && x.BatchNo == stockDetail.BatchNo);
+
+ if (detail != null && !inboundOrderDetails.Any(x => x.Id == detail.Id))
+ {
+ inboundOrderDetails.Add(detail);
+ }
+ }
+ }
+
+ if (!inboundOrderDetails.Any())
+ {
+ return WebResponseContent.Instance.Error($"鏈壘鍒板搴旂殑鍏ュ簱鍗曟槑缁�");
+ }
+
+ // 鏇存柊鍏ュ簱鍗曟槑缁嗙姸鎬�
+ foreach (var inboundOrderDetail in inboundOrderDetails)
+ {
+ // 妫�鏌ヨ鏄庣粏鏄惁宸插叏閮ㄥ叆搴�
+ decimal totalStockQuantity = dt_StockInfo.Details
+ .Where(x => x.LinId == inboundOrderDetail.LinId && x.BatchNo == inboundOrderDetail.BatchNo)
+ .Sum(x => x.StockQuantity);
+
+ decimal orderQuantity = Convert.ToDecimal(inboundOrderDetail.OrderQuantity);
+ decimal receiptQuantity = Convert.ToDecimal(inboundOrderDetail.ReceiptQuantity);
+ decimal overInQuantity = Convert.ToDecimal(inboundOrderDetail.OverInQuantity);
+
+ // 鏇存柊鏀惰揣鏁伴噺
+ inboundOrderDetail.OverInQuantity = totalStockQuantity += overInQuantity;
+
+ // 妫�鏌ユ槸鍚﹀叏閮ㄥ畬鎴�
+ if (inboundOrderDetail.OverInQuantity == inboundOrderDetail.OrderQuantity)
+ {
+ inboundOrderDetail.OrderDetailStatus = OrderDetailStatusEnum.Over.ObjToInt();
+ }
+ else
+ {
+ inboundOrderDetail.OrderDetailStatus = OrderDetailStatusEnum.Inbounding.ObjToInt();
+ }
+ }
+
+ ///鏇存柊搴撳瓨鐘舵��
+ dt_StockInfo.StockStatus = StockStatusEmun.鍏ュ簱瀹屾垚.ObjToInt();
+ // 鏇存柊搴撳瓨鏄庣粏鐘舵��
+ dt_StockInfo.Details.ForEach(x => x.Status = StockStatusEmun.鍏ュ簱瀹屾垚.ObjToInt());
+
+ // 3. 鏌ヨ鎴愬搧鍏ュ簱鏄庣粏锛圕P鍏ュ簱鍗曟槑缁嗭級
+ List<Dt_CPInboundOrderDetail> cpInboundDetails = new List<Dt_CPInboundOrderDetail>();
+ if (boxCodes.Any())
+ {
+ cpInboundDetails = BaseDal.Db.Queryable<Dt_CPInboundOrderDetail>()
+ .Where(x => boxCodes.Contains(x.BoxCode))
+ .ToList();
+ }
+
+ // 鏇存柊鎴愬搧鍏ュ簱鏄庣粏鐘舵��
+ if (cpInboundDetails.Any())
+ {
+ foreach (var cpDetail in cpInboundDetails)
+ {
+ cpDetail.CPOrderDetailStatus = InboundStatusEnum.鍏ュ簱瀹屾垚.ObjToInt();
+ }
+ }
+
+ // 4. 鏌ヨ骞舵洿鏂版垚鍝佸簱瀛樻槑缁嗭紙濡傛灉鏈夊崟鐙殑鎴愬搧搴撳瓨琛級
+ List<Dt_StockInfoDetailCP> cpStockDetails = new List<Dt_StockInfoDetailCP>();
+ if (boxCodes.Any())
+ {
+ cpStockDetails = BaseDal.Db.Queryable<Dt_StockInfoDetailCP>()
+ .Where(x => boxCodes.Contains(x.BoxCode))
+ .ToList();
+
+ // 鏇存柊鎴愬搧搴撳瓨鏄庣粏鐘舵��
+ foreach (var cpStockDetail in cpStockDetails)
+ {
+ cpStockDetail.CPStockDetailStatus = StockStatusEmun.鍏ュ簱瀹屾垚.ObjToInt();
+ }
+ }
+
+ try
+ {
+ _unitOfWorkManage.BeginTran();
+
+ // 鏇存柊浠诲姟鐘舵��
+ UpdateTaskStatus(task);
+
+ // 鏇存柊璐т綅鐘舵��
+ UpdateLocationStatus(dt_LocationInfo, lastStatus);
+
+ // 鏇存柊搴撳瓨淇℃伅
+ UpdateStockInfo(dt_StockInfo);
+
+ // 娣诲姞璁板綍
+ AddRecords(task, dt_StockInfo, dt_LocationInfo, lastStatus);
+
+ // 鏇存柊鍏ュ簱鍗曟槑缁�
+ if (inboundOrderDetails.Any())
+ {
+ BaseDal.Db.Updateable(inboundOrderDetails).ExecuteCommand();
+
+ // 妫�鏌ュ叆搴撳崟鏄惁鍏ㄩ儴瀹屾垚
+ bool allCompleted = inboundOrder.Details.All(x =>
+ x.OrderDetailStatus == OrderDetailStatusEnum.Over.ObjToInt());
+
+ if (allCompleted)
+ {
+ inboundOrder.OrderStatus = InboundStatusEnum.鍏ュ簱瀹屾垚.ObjToInt();
+ }
+ else
+ {
+ inboundOrder.OrderStatus = InboundStatusEnum.鍏ュ簱涓�.ObjToInt();
+ }
+ }
+
+ // 鏇存柊鍏ュ簱鍗�
+ UpdateInboundOrder(inboundOrder, inboundOrderDetails.FirstOrDefault());
+
+ // 鏇存柊鎴愬搧鍏ュ簱鏄庣粏鐘舵��
+ if (cpInboundDetails.Any())
+ {
+ BaseDal.Db.Updateable(cpInboundDetails).ExecuteCommand();
+ }
+
+ // 鏇存柊鎴愬搧搴撳瓨鏄庣粏鐘舵��
+ if (cpStockDetails.Any())
+ {
+ BaseDal.Db.Updateable(cpStockDetails).ExecuteCommand();
+ }
+
+ // 鍗曟嵁鏁伴噺鍏ㄩ儴涓婃灦瀹屾垚锛屽鐞哤MS鍥炰紶
+ if (inboundOrderDetails.Any(x => x.OrderDetailStatus == OrderDetailStatusEnum.Over.ObjToInt()) && inboundOrder.System.Equals("ERP"))
+ {
+ foreach (var detail in inboundOrderDetails.Where(x => x.OrderDetailStatus == OrderDetailStatusEnum.Over.ObjToInt()))
+ {
+ FeedBackInboundERP(inboundOrder.UpperOrderNo, detail.LinId);
+ }
+ }
+ if (inboundOrder.OrderStatus == InboundStatusEnum.鍏ュ簱瀹屾垚.ObjToInt() && inboundOrder.OrderType == 0 && inboundOrder.System.Equals("SMOM"))
+ {
+ List<Dt_StockInfo> StockInfos = _stockRepository.StockInfoRepository.Db
+ .Queryable<Dt_StockInfo>()
+ .Includes(x => x.Details, d => d.StockDetails)
+ .Where(x => x.WarehouseId == task.WarehouseId &&
+ x.Details.Any(v => v.OrderNo == inboundOrder.OrderNo))
+ .ToList();
+
+ if (StockInfos.Count == 0) throw new Exception("鏈壘鍒板簱瀛樹俊鎭�");
+ var houseInboundPassBack = new HouseInboundPassBack
+ {
+ ApiType = "AsnController",
+ Method = "AsrsGroudingAsn",
+ Parameters = new List<HouseInboundPassBack.data>
+ {
+ new HouseInboundPassBack.data
+ {
+ Value = new List<data.data1>
+ {
+ new data.data1
+ {
+ AsnNo = inboundOrder.OrderNo,
+ //InWarehouse = task.Roadway,
+ TransactionCode = inboundOrder.TransactionCode,
+ InoutType = inboundOrder.OrderType,
+ OrderType = inboundOrder.InoutType,
+ // 閬嶅巻鎵�鏈夊簱瀛樻槑缁嗭紝娣诲姞鍒� DetailList
+ DetailList = StockInfos.Select(d => new data.data1.Inbound
+ {
+ LinId = d.Details.FirstOrDefault()?.LinId?? "",
+ MaterielCode = d.Details.FirstOrDefault()?.MaterielCode?? "",
+ OrderQuantity = d.Details.FirstOrDefault().StockQuantity,
+ BatchNo = d.Details.FirstOrDefault()?.BatchNo,
+ LPNNo = d.PalletCode,
+ FinishQty = d.Details.FirstOrDefault().StockQuantity,
+ LocationName = d.LocationCode,
+ LabelList= d.Details
+ .Where(detail => detail.StockDetails != null)
+ .SelectMany(detail => detail.StockDetails)
+ .Where(stockDetail => !string.IsNullOrEmpty(stockDetail.BoxCode))
+ .Select(stockDetail => stockDetail.BoxCode )
+ .ToList()
+ }).ToList()
+ }
+ }
+ }
+ }
+ };
+
+ //var authResult = AuthenticateWithWMS();
+ //if (authResult.IsSuccess)
+ //{
+ // houseInboundPassBack.Context = new Dictionary<string, string>
+ // {
+ // { "Ticket", authResult.Ticket },
+ // { "InvOrgId", authResult.InvOrgId }
+ // };
+
+ // var response = HttpHelper.Post<MomRequestContent>(ReceiveWMSTaskin, houseInboundPassBack, "绔嬪簱鍏ュ簱鏁伴噺鍥炰紶WMS");
+ // // 鍒ゆ柇Success鐨勫��
+ // if (!response.Success)
+ // {
+ // throw new Exception($"鎿嶄綔澶辫触: {response.Message ?? "鏈彁渚涢敊璇俊鎭�"}");
+ // }
+
+ //}
+
+ }
+ else if (inboundOrder.OrderStatus == InboundStatusEnum.鍏ュ簱瀹屾垚.ObjToInt() && inboundOrder.OrderType == 2 && inboundOrder.System.Equals("SMOM"))
+ {
+ List<Dt_StockInfo> StockInfos = _stockRepository.StockInfoRepository.Db
+ .Queryable<Dt_StockInfo>()
+ .Includes(x => x.Details, d => d.StockDetails)
+ .Where(x => x.WarehouseId == task.WarehouseId &&
+ x.Details.Any(v => v.OrderNo == inboundOrder.OrderNo))
+ .ToList();
+ if (StockInfos.Count == 0) throw new Exception("鏈壘鍒板簱瀛樹俊鎭�");
+ var inventoryAllocate = new InventoryAllocate
+ {
+ ApiType = "InventoryAllocateController",
+ Method = "AsrsFinishedStockCount",
+ Parameters = new List<InventoryAllocate.Allocate>
+ {
+ new InventoryAllocate.Allocate
+ {
+ Value = new List<Allocate.data1>
+ {
+ new Allocate.data1
+ {
+ No = inboundOrder.OrderNo,
+ //InWarehouse = task.Roadway,
+ TransactionCode = inboundOrder.TransactionCode,
+ InoutType = inboundOrder.OrderType,
+ OrderType = inboundOrder.InoutType,
+ ActiveType=1,
+ DetailList = StockInfos.Select(d => new Allocate.data1.Inventory
+ {
+ LinId = d.Details.FirstOrDefault()?.LinId?? "",
+ MaterielCode = d.Details.FirstOrDefault()?.MaterielCode?? "",
+ OrderQuantity = d.Details.FirstOrDefault().StockQuantity,
+ BatchNo = d.Details.FirstOrDefault()?.BatchNo,
+ LPNNo = d.PalletCode,
+ FinishQty = d.Details.FirstOrDefault().StockQuantity,
+ LocationName = d.LocationCode,
+ OrinalLocation=d.Details.FirstOrDefault()?.OrinalLocation,
+ LabelList= d.Details
+ .Where(detail => detail.StockDetails != null)
+ .SelectMany(detail => detail.StockDetails)
+ .Where(stockDetail => !string.IsNullOrEmpty(stockDetail.BoxCode))
+ .Select(stockDetail => stockDetail.BoxCode )
+ .ToList()
+ }).ToList()
+ }
+ }
+ }
+ }
+ };
+
+ //var authResult = AuthenticateWithWMS();
+ //if (authResult.IsSuccess)
+ //{
+ // inventoryAllocate.Context = new Dictionary<string, string>
+ // {
+ // { "Ticket", authResult.Ticket },
+ // { "InvOrgId", authResult.InvOrgId }
+ // };
+
+ // var response = HttpHelper.Post<MomRequestContent>(ReceiveWMSTaskAllocatein, inventoryAllocate, "璋冩嫧鍏ュ簱鏁伴噺鍥炰紶WMS");
+ // if (!response.Success)
+ // {
+ // throw new Exception($"鎿嶄綔澶辫触锛歿response.Message ?? "鏈彁渚涢敊璇俊鎭�"}");
+ // }
+ //}
+ }
+
+ _unitOfWorkManage.CommitTran();
+ return WebResponseContent.Instance.OK();
+ }
+ catch (Exception ex)
+ {
+ _unitOfWorkManage.RollbackTran();
+ throw new Exception($"鍏ュ簱澶勭悊澶辫触锛歿ex.Message}", ex);
+ }
+ }
+ }
+ else
+ {
+ Dt_InboundOrder? inboundOrder = _inboundService.InbounOrderService.Db.Queryable<Dt_InboundOrder>().Where(x => x.OrderNo == dt_StockInfo.Details.FirstOrDefault().OrderNo).Includes(x => x.Details).First();
+ Dt_InboundOrderDetail? inboundOrderDetail = null;
+
+ // 3. 澶勭悊鍏ュ簱閫昏緫
+ if (task.TaskType == TaskTypeEnum.Inbound.ObjToInt())
+ {
+ return ProcessInbound(task, dt_StockInfo, dt_LocationInfo);
+ }
+ if (task.TaskType == TaskTypeEnum.SurplusReturn.ObjToInt() || task.TaskType == TaskTypeEnum.ReverseIn.ObjToInt())
+ {
+ return ReturnInbound(task, dt_StockInfo, dt_LocationInfo);
+ }
+ if (task.TaskType == TaskTypeEnum.InInventory.ObjToInt())
+ {
+ int lastStatus = dt_LocationInfo.LocationStatus;
+ dt_LocationInfo.LocationStatus = LocationStatusEnum.InStock.ObjToInt();
+ dt_StockInfo.StockStatus = StockStatusEmun.鍏ュ簱瀹屾垚.ObjToInt();
+ // 鏇存柊搴撳瓨鏄庣粏鐘舵��
+ dt_StockInfo.Details.ForEach(x => x.Status = StockStatusEmun.鍏ュ簱瀹屾垚.ObjToInt());
+ _unitOfWorkManage.BeginTran();
+ UpdateTaskStatus(task);
+ UpdateLocationStatus(dt_LocationInfo, lastStatus);
+ UpdateStockInfo(dt_StockInfo);
+ AddRecords(task, dt_StockInfo, dt_LocationInfo, lastStatus);
+ _unitOfWorkManage.CommitTran();
+ return WebResponseContent.Instance.OK();
+
+ }
+ }
+ }
- Dt_InboundOrder? inboundOrder = _inboundService.InbounOrderService.Db.Queryable<Dt_InboundOrder>().Where(x => x.OrderNo == dt_StockInfo.Details.FirstOrDefault().OrderNo).Includes(x => x.Details).First();
- Dt_InboundOrderDetail? inboundOrderDetail = null;
-
- // 3. 澶勭悊鍏ュ簱閫昏緫
- return ProcessInbound(task, dt_StockInfo, dt_LocationInfo);
+ return WebResponseContent.Instance.OK();
}
catch (Exception ex)
{
@@ -440,11 +909,12 @@
.Includes(x => x.Details)
.First();
- if (inboundOrder == null) return WebResponseContent.Instance.Error("鏈壘鍒板叆搴撳崟淇℃伅");
-
+ if (task.TaskType == TaskTypeEnum.Inbound.ObjToInt() && inboundOrder == null)
+ {
+ return WebResponseContent.Instance.Error("鏈壘鍒板叆搴撳崟淇℃伅");
+ }
Dt_InboundOrderDetail inboundOrderDetail = inboundOrder.Details
- .FirstOrDefault(x => x.LinId == stockInfo.Details.FirstOrDefault()?.LinId);
-
+ .FirstOrDefault(x => x.LinId == stockInfo.Details.FirstOrDefault()?.LinId);
//if (inboundOrder != null && stockInfo.StockStatus == StockStatusEmun.鍏ュ簱纭.ObjToInt())
//{
//鍏ュ簱鏁伴噺鍥炰紶
@@ -456,6 +926,29 @@
// return ProcessAllocateInbound(task, stockInfo, locationInfo, lastStatus, inboundOrder, inboundOrderDetail);
//}
}
+ private WebResponseContent ReturnInbound(Dt_Task task, Dt_StockInfo stockInfo, Dt_LocationInfo locationInfo)
+ {
+ int lastStatus = locationInfo.LocationStatus;
+ locationInfo.LocationStatus = LocationStatusEnum.InStock.ObjToInt();
+
+ Dt_ReturnOrder returnOrder = _returnOrderRepository.QueryFirst(x => x.OrderNo == stockInfo.Details.FirstOrDefault().OrderNo);
+ if (returnOrder == null)
+ {
+ return WebResponseContent.Instance.Error("鏈壘鍒板洖搴撳崟淇℃伅");
+ }
+ //if (inboundOrder != null && stockInfo.StockStatus == StockStatusEmun.鍏ュ簱纭.ObjToInt())
+ //{
+ //鍏ュ簱鏁伴噺鍥炰紶
+ return SurplusReturnInbound(task, stockInfo, locationInfo, lastStatus, returnOrder);
+ //}
+ //else
+ //{
+ // //璋冩嫧鍑哄叆搴撲换鍔℃暟閲忓洖浼�
+ // return ProcessAllocateInbound(task, stockInfo, locationInfo, lastStatus, inboundOrder, inboundOrderDetail);
+ //}
+ }
+
+
//鍏朵粬鍏ュ簱
private WebResponseContent ProcessNormalInbound(Dt_Task task, Dt_StockInfo stockInfo, Dt_LocationInfo locationInfo,
int lastStatus, Dt_InboundOrder inboundOrder, Dt_InboundOrderDetail inboundOrderDetail)
@@ -487,16 +980,77 @@
UpdateInboundOrder(inboundOrder, inboundOrderDetail);
// 鍗曟嵁鏁伴噺鍏ㄩ儴涓婃灦瀹屾垚锛屽鐞哤MS鍥炰紶
- if (inboundOrder.OrderStatus == InboundStatusEnum.鍏ュ簱瀹屾垚.ObjToInt() && inboundOrder.OrderType == 0)
+ if (inboundOrderDetail.OrderDetailStatus == OrderDetailStatusEnum.Over.ObjToInt() && inboundOrder.System.Equals("ERP"))
{
- var stockInfoDetail = stockInfo.Details.FirstOrDefault();
- SendInboundInfoToWMS(task, inboundOrder, stockInfo);
+ FeedBackInboundERP(inboundOrder.UpperOrderNo, inboundOrderDetail.LinId);
}
- else if (inboundOrder.OrderStatus == InboundStatusEnum.鍏ュ簱瀹屾垚.ObjToInt() && inboundOrder.OrderType == 2)
+ if (inboundOrder.OrderStatus == InboundStatusEnum.鍏ュ簱瀹屾垚.ObjToInt() && inboundOrder.OrderType == 0 && inboundOrder.System.Equals("SMOM"))
+ {
+ //SendInboundInfoToWMS(task, inboundOrder, stockInfo);
+ }
+ else if (inboundOrder.OrderStatus == InboundStatusEnum.鍏ュ簱瀹屾垚.ObjToInt() && inboundOrder.OrderType == 2 && inboundOrder.System.Equals("SMOM"))
{
SendAllocateInfoToWMS(task, inboundOrder, stockInfo);
}
+ _unitOfWorkManage.CommitTran();
+ return WebResponseContent.Instance.OK();
+ }
+ catch
+ {
+ _unitOfWorkManage.RollbackTran();
+ throw;
+ }
+ }
+ //鍥炲簱閫昏緫澶勭悊骞朵笂鎶MS
+ private WebResponseContent SurplusReturnInbound(Dt_Task task, Dt_StockInfo stockInfo, Dt_LocationInfo locationInfo,
+ int lastStatus, Dt_ReturnOrder returnOrder)
+ {
+ returnOrder.OrderStatus = InOrderStatusEnum.鍏ュ簱瀹屾垚.ObjToInt();
+
+ if (task.TaskType == TaskTypeEnum.ReverseIn.ObjToInt())
+ {
+ foreach (var item in stockInfo.Details)
+ {
+ item.StockQuantity = returnOrder.OrderQuantity;
+ returnOrder.OverInQuantity = returnOrder.OrderQuantity;
+ }
+ }
+ else
+ {
+ foreach (var item in stockInfo.Details)
+ {
+ returnOrder.OverInQuantity += item.StockQuantity;
+ }
+ }
+ ///鏇存柊搴撳瓨鐘舵��
+ stockInfo.StockStatus = StockStatusEmun.鍏ュ簱瀹屾垚.ObjToInt();
+ // 鏇存柊搴撳瓨鏄庣粏鐘舵��
+ stockInfo.Details.ForEach(x => x.Status = StockStatusEmun.鍏ュ簱瀹屾垚.ObjToInt());
+
+ try
+ {
+ _unitOfWorkManage.BeginTran();
+
+ // 鏇存柊浠诲姟鐘舵��
+ UpdateTaskStatus(task);
+
+ // 鏇存柊璐т綅鐘舵��
+ UpdateLocationStatus(locationInfo, lastStatus);
+
+ // 鏇存柊搴撳瓨淇℃伅
+ UpdateStockInfo(stockInfo);
+
+ // 娣诲姞璁板綍
+ AddRecords(task, stockInfo, locationInfo, lastStatus);
+
+ //鏇存柊鍥炲簱鍗�
+ _returnOrderRepository.UpdateData(returnOrder);
+
+ if (returnOrder.OrderType == OrderTypeEnum.鍙嶆嫞鍥炲簱鍗�.ObjToInt() && (returnOrder.LocationCode == null || returnOrder.LocationCode == ""))
+ {
+ SurplusReturnInboundToWMS(task, returnOrder, stockInfo, locationInfo);
+ }
_unitOfWorkManage.CommitTran();
return WebResponseContent.Instance.OK();
}
@@ -585,7 +1139,8 @@
private void UpdateTaskStatus(Dt_Task task)
{
- task.TaskStatus = InTaskStatusEnum.InFinish.ObjToInt();
+ task.TaskStatus = TaskStatusEnum.Finish.ObjToInt();
+ FeedBackWCSTaskCompleted(task.TaskNum);
BaseDal.DeleteAndMoveIntoHty(task, App.User.UserId > 0 ? OperateType.浜哄伐瀹屾垚 : OperateType.鑷姩瀹屾垚);
}
@@ -621,7 +1176,7 @@
}
}
- private void SendInboundInfoToWMS(Dt_Task task, Dt_InboundOrder inboundOrder, Dt_StockInfo stockInfo)
+ private WebResponseContent SendInboundInfoToWMS(Dt_Task task, Dt_InboundOrder inboundOrder, Dt_StockInfo stockInfo)
{
@@ -640,33 +1195,33 @@
ApiType = "AsnController",
Method = "AsrsGroudingAsn",
Parameters = new List<HouseInboundPassBack.data>
- {
- new HouseInboundPassBack.data
- {
- Value = new List<data.data1>
- {
- new data.data1
{
- AsnNo = inboundOrder.OrderNo,
- //InWarehouse = task.Roadway,
- TransactionCode = inboundOrder.TransactionCode,
- InoutType = inboundOrder.OrderType,
- OrderType = inboundOrder.InoutType,
- // 閬嶅巻鎵�鏈夊簱瀛樻槑缁嗭紝娣诲姞鍒� DetailList
- DetailList = StockInfos.Select(d => new data.data1.Inbound
+ new HouseInboundPassBack.data
{
- LinId = d.Details.FirstOrDefault()?.LinId?? "",
- MaterielCode = d.Details.FirstOrDefault()?.MaterielCode?? "",
- OrderQuantity = d.Details.FirstOrDefault().StockQuantity,
- BatchNo = d.BatchNo,
- LPNNo = d.PalletCode,
- FinishQty = d.Details.FirstOrDefault().StockQuantity,
- LocationName = d.LocationCode
- }).ToList()
+ Value = new List<data.data1>
+ {
+ new data.data1
+ {
+ AsnNo = inboundOrder.OrderNo,
+ //InWarehouse = task.Roadway,
+ TransactionCode = inboundOrder.TransactionCode,
+ InoutType = inboundOrder.OrderType,
+ OrderType = inboundOrder.InoutType,
+ // 閬嶅巻鎵�鏈夊簱瀛樻槑缁嗭紝娣诲姞鍒� DetailList
+ DetailList = StockInfos.Select(d => new data.data1.Inbound
+ {
+ LinId = d.Details.FirstOrDefault()?.LinId?? "",
+ MaterielCode = d.Details.FirstOrDefault()?.MaterielCode?? "",
+ OrderQuantity = d.Details.FirstOrDefault().StockQuantity,
+ BatchNo = d.BatchNo,
+ LPNNo = d.PalletCode,
+ FinishQty = d.Details.FirstOrDefault().StockQuantity,
+ LocationName = d.LocationCode
+ }).ToList()
+ }
+ }
+ }
}
- }
- }
- }
};
var authResult = AuthenticateWithWMS();
@@ -678,8 +1233,80 @@
{ "InvOrgId", authResult.InvOrgId }
};
- HttpHelper.Post<WebResponseContent>(ReceiveWMSTaskin, houseInboundPassBack, "绔嬪簱鍏ュ簱鏁伴噺鍥炰紶WMS");
+ var response = HttpHelper.Post<MomRequestContent>(ReceiveWMSTaskin, houseInboundPassBack, "绔嬪簱鍏ュ簱鏁伴噺鍥炰紶WMS");
+ // 鍒ゆ柇Success鐨勫��
+ if (response.Success)
+ {
+ // 濡傛灉Success涓簍rue锛岃繑鍥為渶瑕佺殑鍊硷紙杩欓噷浠ヨ繑鍥炴暣涓搷搴斿璞′负渚嬶級
+ return WebResponseContent.Instance.OK();
+ }
+ else
+ {
+ // 濡傛灉Success涓篺alse锛屾姏鍑哄紓甯稿苟鍖呭惈閿欒淇℃伅
+ throw new Exception($"鎿嶄綔澶辫触: {response.Message ?? "鏈彁渚涢敊璇俊鎭�"}");
+ }
+
}
+ return WebResponseContent.Instance.OK();
+ }
+
+ private WebResponseContent SurplusReturnInboundToWMS(Dt_Task task, Dt_ReturnOrder returnOrder, Dt_StockInfo stockInfo, Dt_LocationInfo locationInfo)
+ {
+ List<Dt_StockInfo> StockInfos = _stockRepository.StockInfoRepository.Db.Queryable<Dt_StockInfo>().Where(x => x.WarehouseId == task.WarehouseId).Includes(x => x.Details).Where(x => x.Details.Any(v => v.OrderNo == returnOrder.OrderNo)).ToList();
+ Dt_Warehouse warehouse = _basicService.WarehouseService.Repository.QueryFirst(x => x.WarehouseId == task.WarehouseId);
+ if (StockInfos.Count == 0) throw new Exception("鏈壘鍒板簱瀛樹俊鎭�");
+ var houseReturnOrders = new HouseBackboundPassBack
+ {
+ ApiType = "ShippingOrderController",
+ Method = "returnShippingOrderUnPickingToAsrsCallback",
+ Parameters = new List<HouseBackboundPassBack.backdata>
+ {
+ new HouseBackboundPassBack.backdata
+ {
+ Value= new List<backdata.backdata1>
+ {
+ new backdata.backdata1
+ {
+ OrderType = returnOrder.OrderType,
+ MaterielCode = returnOrder.MaterielCode,
+ MaterielName = returnOrder.MaterielName,
+ MaterieSpec = returnOrder.MaterieSpec,
+ BatchNo = returnOrder.BatchNo,
+ OrderQuantity = returnOrder.OrderQuantity,
+ Remark = returnOrder.Remark,
+ LinId = returnOrder.LinId,
+ LPNNo = returnOrder.LPNNo,
+ LocationCode = locationInfo.LocationCode,
+ WarehouseCode = returnOrder.WarehouseCode,
+ System = returnOrder.System,
+ }
+ }
+ }
+ }
+ };
+ var authResult = AuthenticateWithWMS();
+ if (authResult.IsSuccess)
+ {
+ houseReturnOrders.Context = new Dictionary<string, string>
+ {
+ { "Ticket", authResult.Ticket },
+ { "InvOrgId", authResult.InvOrgId }
+ };
+ var response = HttpHelper.Post<MomRequestContent>(ReceiveWMSTaskreturn, houseReturnOrders, "鍙栨秷鍙戣揣鍚庣珛搴撳弽鎷ｅ叆搴撳洖浼燱MS");
+ // 鍒ゆ柇Success鐨勫��
+ if (response.Success)
+ {
+ // 濡傛灉Success涓簍rue锛岃繑鍥為渶瑕佺殑鍊硷紙杩欓噷浠ヨ繑鍥炴暣涓搷搴斿璞′负渚嬶級
+ return WebResponseContent.Instance.OK();
+ }
+ else
+ {
+ // 濡傛灉Success涓篺alse锛屾姏鍑哄紓甯稿苟鍖呭惈閿欒淇℃伅
+ throw new Exception($"鎿嶄綔澶辫触: {response.Message ?? "鏈彁渚涢敊璇俊鎭�"}");
+ }
+
+ }
+ return WebResponseContent.Instance.OK();
}
private void ProcessAllocateInboundOrder(Dt_InboundOrder inboundOrder, Dt_InboundOrderDetail inboundOrderDetail)
@@ -757,7 +1384,7 @@
MaterielCode = d.Details.FirstOrDefault()?.MaterielCode?? "",
OrderQuantity = d.Details.FirstOrDefault().StockQuantity,
BatchNo = d.BatchNo,
- LPN_No = d.PalletCode,
+ LPNNo = d.PalletCode,
FinishQty = d.Details.FirstOrDefault().StockQuantity,
LocationName = d.LocationCode
}).ToList()
@@ -839,26 +1466,260 @@
if (!validationResult.Status) return validationResult;
int lastStatus = locationInfo.LocationStatus;
- locationInfo.LocationStatus = LocationStatusEnum.InStock.ObjToInt();
- Dt_OutboundOrderDetail outboundOrderDetails = _outboundService.OutboundOrderService.Db.Queryable<Dt_OutboundOrderDetail>()
- .Where(x => x.BatchNo == stockInfo.Details.FirstOrDefault().BatchNo)
- .First();
- if (outboundOrderDetails == null) return WebResponseContent.Instance.Error("鏈壘鍒板嚭搴撳崟淇℃伅");
+ ///鐩樼偣鍑哄簱浠诲姟瀹屾垚閫昏緫
+ if (task.TaskType == TaskTypeEnum.OutInventory.ObjToInt())
+ {
+ return OutInventoryCompleted(task, stockInfo, locationInfo);
+ }
+ if (task.TaskType == TaskTypeEnum.OutSyncretism.ObjToInt())
+ {
+ stockInfo.StockStatus = StockStatusEmun.鍚堟墭鍑哄簱瀹屾垚.ObjToInt();
+ stockInfo.Details.ForEach(x =>
+ {
+ x.Status = StockStatusEmun.鍚堟墭鍑哄簱瀹屾垚.ObjToInt();
+ });
+ _unitOfWorkManage.BeginTran();
+ _stockRepository.StockInfoRepository.UpdateData(stockInfo);
+ _stockRepository.StockInfoDetailRepository.UpdateData(stockInfo.Details);
+ BaseDal.DeleteAndMoveIntoHty(task, App.User.UserId == 0 ? OperateType.鑷姩瀹屾垚 : OperateType.浜哄伐瀹屾垚);
+ _unitOfWorkManage.CommitTran();
+ }
+ else
+ {
+ Dt_Warehouse warehouse = _basicRepository.WarehouseRepository.QueryFirst(x => x.WarehouseId == task.WarehouseId);
- Dt_OutboundOrder inboundOrder = _outboundService.OutboundOrderService.Db.Queryable<Dt_OutboundOrder>()
- .Where(x => x.Id == outboundOrderDetails.OrderId)
- .Includes(x => x.Details)
- .First();
+ if (warehouse.WarehouseCode.Contains("CP"))
+ {
+ try
+ {
+ Dt_NewOutboundOrder outboundOrder = _outboundService.NewOutboundOrderService.Db.Queryable<Dt_NewOutboundOrder>().Where(x => x.OrderNo == task.OrderNo).Includes(x => x.Details)
+ .First();
- if (inboundOrder == null) return WebResponseContent.Instance.Error("鏈壘鍒板嚭搴撳崟淇℃伅");
- // 2. 澶勭悊鍑哄簱璁㈠崟璇︽儏
- //var outboundOrderDetails = ProcessOutboundOrderDetails(outStockLockInfos);
+ Dt_NewOutboundOrderDetail outboundOrderDetails = _outboundService.NewOutboundOrderDetailService.Db.Queryable<Dt_NewOutboundOrderDetail>()
+ .Where(x => x.OrderId == outboundOrder.Id && x.LocationName == stockInfo.LocationCode&&x.LPNNo==stockInfo.PalletCode)
+ .First();
+ //List<Dt_StockInfoDetail> stockInfoDetail = _stockInfoDetailRepository.QueryData(x => x.StockId == stockInfo.Id).ToList();
+ //foreach (var item in stockInfoDetail)
+ //{
+ // outboundOrderDetails = _outboundService.NewOutboundOrderDetailService.Db.Queryable<Dt_NewOutboundOrderDetail>()
+ // .Where(x => x.OrderId == outboundOrder.Id && x.BatchNo == item.BatchNo && x.LocationName == stockInfo.LocationCode)
+ // .First();
- UpdateOutboundOrderDetails(stockInfo, inboundOrder, ref outboundOrderDetails);
+ // item.OutboundQuantity += outboundOrderDetails.OverOutQuantity;
+ //}
- // 3. 鎵ц鏍稿績鍑哄簱閫昏緫
- return ExecuteOutboundLogic(task, stockInfo, locationInfo, outboundOrderDetails, inboundOrder);
+ int overCount = outboundOrder.Details.Count(x => x.OrderDetailStatus == OrderDetailStatusEnum.Over.ObjToInt());
+
+ foreach (var item in stockInfo.Details)
+ {
+ if (outboundOrderDetails == null) continue;
+
+ outboundOrderDetails.OverOutQuantity += item.OutboundQuantity;
+
+ if (outboundOrderDetails.OverOutQuantity == outboundOrderDetails.OrderQuantity)
+ {
+ outboundOrderDetails.OrderDetailStatus = OrderDetailStatusEnum.Over.ObjToInt();
+ overCount++;
+ }
+ }
+ if (outboundOrder.Details.Count == overCount)
+ {
+ outboundOrder.OrderStatus = OutboundStatusEnum.鍑哄簱瀹屾垚.ObjToInt();
+ }
+
+ _unitOfWorkManage.BeginTran();
+ ///鏇存柊鍑哄簱鍗�
+ _outboundService.NewOutboundOrderService.Repository.UpdateData(outboundOrder);
+ // 鏇存柊鍑哄簱璁㈠崟璇︽儏
+ _outboundService.NewOutboundOrderDetailService.Repository.UpdateData(outboundOrderDetails);
+
+ // 鏇存柊搴撳瓨鐘舵��
+ AddCPRetrueOrder(stockInfo, outboundOrder, outboundOrderDetails);
+
+ // 鍖哄垎鍗曟嵁鏁版嵁鏉ユ簮鏇存柊璐т綅鐘舵��
+ if (outboundOrder.System == null)
+ {
+ return WebResponseContent.Instance.Error("鍑哄簱鍗曟暟鎹簮涓虹┖");
+ }
+ if (!outboundOrder.System.Equals("SMOM"))
+ {
+ UpdateLocationStatus(locationInfo);
+ }
+ // 澶勭悊浠诲姟瀹屾垚
+ CompleteTask(task);
+
+ // 娣诲姞鐘舵�佸彉鏇磋褰�
+ AddStatusChangeRecord(task, stockInfo, locationInfo);
+
+ string path = "http://fr.mankun.com:8080/webroot/decision/view/report?viewlet=fr-report\\SMOM/Product/Produce/OutBoundDetileReport.cpt&op=write&format=pdf";
+ string fullPath = AppDomain.CurrentDomain.BaseDirectory;
+ var url = Path.Combine(fullPath, "wwwroot", "Reports");
+ string savePath = Path.Combine(url, "鏈鍑哄簱.pdf");
+
+
+ if (outboundOrderDetails.OrderDetailStatus == OrderDetailStatusEnum.Over.ObjToInt() && outboundOrder.System.Equals("ERP"))
+ {
+ FeedBackOutERP(outboundOrder.OrderNo, outboundOrderDetails.LinId);
+ DownloadReport(path, savePath, outboundOrderDetails.Id);
+ }
+ ///鍗曟嵁瀹屾垚鎺ㄩ�丼MOM绯荤粺
+ if (outboundOrder.OrderStatus == OutboundStatusEnum.鍑哄簱瀹屾垚.ObjToInt() && outboundOrder.System.Equals("SMOM"))
+ {
+ var stockInfoDetail1 = stockInfo.Details.FirstOrDefault();
+ List<Dt_OutStockLockInfo> outStockLockInfo = _outboundService.OutboundStockLockInfoService.Repository.QueryData(x => x.OrderNo == outboundOrder.OrderNo);
+
+ if (outStockLockInfo.Count == 0) throw new Exception("鏈壘鍒板簱瀛樹俊鎭�");
+ //閲囪喘鍑哄簱
+ if (outboundOrder.OrderType == 1)
+ {
+ var passBack = new HouseoutboundPassBack
+ {
+ ApiType = "ShippingOrderController",
+ Method = "AsrsOutboundSO",
+ Parameters = new List<HouseoutboundPassBack.datas>
+ {
+ new HouseoutboundPassBack.datas
+ {
+ Value = new List<HouseoutboundPassBack.datas.data1>
+ {
+ new HouseoutboundPassBack.datas.data1
+ {
+ No = outboundOrder.OrderNo,
+ OutWareHouse = task.Roadway,
+ TransactionCode = outboundOrder.TransactionCode,
+ InoutType = outboundOrder.OrderType,
+ OrderType = outboundOrder.InoutType,
+ DetailList = outStockLockInfo.Select(d => new HouseoutboundPassBack.datas.data1.Inbound
+ {
+ LinId = d.LinId?? "",
+ LPN_No = d.PalletCode,
+ MaterielCode = d.MaterielCode?? "",
+ OrderQuantity = d.OrderQuantity,
+ BatchNo = d.BatchNo,
+ FinishQty = d.OrderQuantity,
+ LocationName = d.LocationCode
+ })
+ .ToList()
+
+ }
+ }
+ }
+ }
+ };
+
+ // var authResult = AuthenticateWithWMS();
+ // if (authResult.IsSuccess)
+ // {
+ // passBack.Context = new Dictionary<string, string>
+ //{
+ // { "Ticket", authResult.Ticket },
+ // { "InvOrgId", authResult.InvOrgId }
+ //};
+ // var response = HttpHelper.Post<MomRequestContent>(ReceiveWMSTaskout, passBack, "绔嬪簱鍑哄簱鏁伴噺鍥炰紶WMS");
+ // if (!response.Success)
+ // {
+ // throw new Exception($"鎿嶄綔澶辫触: {response.Message ?? "鏈彁渚涢敊璇俊鎭�"}");
+ // }
+ // }
+ }
+ //璋冩嫧鍑哄簱
+ if (outboundOrder.OrderType == 2)
+ {
+ var allocate = new InventoryAllocate
+ {
+ ApiType = "InventoryAllocateController",
+ Method = "AsrsFinishedStockCount",
+ Parameters = new List<Allocate>
+ {
+ new Allocate
+ {
+ Value = new List<Allocate.data1>
+ {
+ new Allocate.data1
+ {
+ No = outboundOrder.OrderNo,
+ InWarehouse = task.Roadway,
+ TransactionCode = outboundOrder.TransactionCode,
+ InoutType = outboundOrder.OrderType,
+ OrderType = outboundOrder.InoutType,
+ ActiveType=2,
+ DetailList = outStockLockInfo.Select(item =>
+ {
+ return new Allocate.data1.Inventory
+ {
+ LinId = outboundOrderDetails.LinId,
+ LPNNo = item.PalletCode,
+ MaterielCode = outboundOrderDetails.MaterielCode,
+ OrderQuantity = outboundOrderDetails.OrderQuantity,
+ BatchNo = outboundOrderDetails.BatchNo,
+ FinishQty = outboundOrderDetails.OrderQuantity,
+ OrinalLocation=outboundOrderDetails.OrinalLocation,
+ LocationName = task.SourceAddress
+ };
+ }).ToList()
+ }
+ }
+ }
+ }
+ };
+
+ //var authResult = AuthenticateWithWMS();
+ //if (authResult.IsSuccess)
+ //{
+ // allocate.Context = new Dictionary<string, string>
+ //{
+ // { "Ticket", authResult.Ticket },
+ // { "InvOrgId", authResult.InvOrgId }
+ //};
+ // var response = HttpHelper.Post<MomRequestContent>(ReceiveWMSTaskin, allocate, "绔嬪簱鍏ュ簱鏁伴噺鍥炰紶WMS");
+ // if (!response.Success)
+ // {
+ // throw new Exception($"鎿嶄綔澶辫触: {response.Message ?? "鏈彁渚涢敊璇俊鎭�"}");
+ // }
+ //}
+ }
+ }
+
+ if (outboundOrder.OrderType == 240) // 鐩樼偣鍑哄簱
+ {
+ // 鐩樼偣鍑哄簱鐗规畩澶勭悊閫昏緫
+ }
+
+ _unitOfWorkManage.CommitTran();
+ return WebResponseContent.Instance.OK();
+ }
+ catch
+ {
+ _unitOfWorkManage.RollbackTran();
+ throw;
+ }
+ }
+ else
+ {
+ Dt_OutboundOrder inboundOrder = _outboundService.OutboundOrderService.Db.Queryable<Dt_OutboundOrder>()
+ .Where(x => x.OrderNo == task.OrderNo)
+ .Includes(x => x.Details)
+ .First();
+
+ if (inboundOrder == null) return WebResponseContent.Instance.Error("鏈壘鍒板嚭搴撳崟淇℃伅");
+
+ Dt_OutboundOrderDetail outboundOrderDetails = _outboundService.OutboundOrderService.Db.Queryable<Dt_OutboundOrderDetail>()
+ .Where(x => x.OrderId == inboundOrder.Id && x.BatchNo == stockInfo.Details.FirstOrDefault().BatchNo)
+ .First();
+ if (outboundOrderDetails.LocationName != null && outboundOrderDetails.LocationName != "")
+ {
+ outboundOrderDetails = _outboundService.OutboundOrderService.Db.Queryable<Dt_OutboundOrderDetail>()
+ .Where(x => x.OrderId == inboundOrder.Id && x.BatchNo == stockInfo.Details.FirstOrDefault().BatchNo && x.LocationName == stockInfo.LocationCode)
+ .First();
+ }
+ if (outboundOrderDetails == null) return WebResponseContent.Instance.Error("鏈壘鍒板嚭搴撳崟淇℃伅");
+ UpdateOutboundOrderDetails(stockInfo, inboundOrder, ref outboundOrderDetails);
+ // 3. 鎵ц鏍稿績鍑哄簱閫昏緫
+ return ExecuteOutboundLogic(task, stockInfo, locationInfo, outboundOrderDetails, inboundOrder);
+ }
+ }
+ return WebResponseContent.Instance.OK();
}
catch (Exception ex)
{
@@ -888,7 +1749,7 @@
if (stockInfo == null) return WebResponseContent.Instance.Error("鏈壘鍒板簱瀛樹俊鎭�");
if (locationInfo == null) return WebResponseContent.Instance.Error("鏈壘鍒拌揣浣嶄俊鎭�");
- if (outStockLockInfos == null || outStockLockInfos.Count == 0)
+ if ((outStockLockInfos == null || outStockLockInfos.Count == 0) && task.TaskType != TaskTypeEnum.OutInventory.ObjToInt())
return WebResponseContent.Instance.Error("鏈壘鍒板嚭搴撹鎯呬俊鎭�");
return WebResponseContent.Instance.OK();
@@ -916,7 +1777,7 @@
//}
private WebResponseContent ExecuteOutboundLogic(Dt_Task task, Dt_StockInfo stockInfo,
- Dt_LocationInfo locationInfo, Dt_OutboundOrderDetail outboundOrderDetails,Dt_OutboundOrder inboundOrder)
+ Dt_LocationInfo locationInfo, Dt_OutboundOrderDetail outboundOrderDetails, Dt_OutboundOrder inboundOrder)
{
try
{
@@ -926,12 +1787,18 @@
// 鏇存柊鍑哄簱璁㈠崟璇︽儏
_outboundService.OutboundOrderDetailService.Repository.UpdateData(outboundOrderDetails);
- // 鏇存柊搴撳瓨鐘舵��
- DeleteAndMoveIntoHtStockStatus(stockInfo);
+ // 鏇存柊搴撳瓨鐘舵�� 鍥炲簱鍗�
+ AddRetrueOrder(stockInfo, inboundOrder);
- // 鏇存柊璐т綅鐘舵��
- UpdateLocationStatus(locationInfo);
-
+ // 鍖哄垎鍗曟嵁鏁版嵁鏉ユ簮鏇存柊璐т綅鐘舵��
+ if (inboundOrder.System == null)
+ {
+ return WebResponseContent.Instance.Error("鍑哄簱鍗曟暟鎹簮涓虹┖");
+ }
+ if (!inboundOrder.System.Equals("SMOM"))
+ {
+ UpdateLocationStatus(locationInfo);
+ }
// 澶勭悊浠诲姟瀹屾垚
CompleteTask(task);
@@ -939,27 +1806,37 @@
AddStatusChangeRecord(task, stockInfo, locationInfo);
// 鏍规嵁璁㈠崟绫诲瀷澶勭悊涓嶅悓閫昏緫
- var outDetail = _outboundService.OutboundOrderDetailService.Db.Queryable<Dt_OutboundOrderDetail>()
- .Where(x => x.BatchNo == outboundOrderDetails.BatchNo).First();
+
var outboundOrder = _outboundService.OutboundOrderService.Db.Queryable<Dt_OutboundOrder>()
- .Where(x => x.Id == outDetail.OrderId).Includes(x => x.Details).First();
+ .Where(x => x.OrderNo == inboundOrder.OrderNo).First();
+ var outDetail = _outboundService.OutboundOrderDetailService.Db.Queryable<Dt_OutboundOrderDetail>()
+ .Where(x => x.OrderId == outboundOrder.Id && x.BatchNo == outboundOrderDetails.BatchNo).First();
+
+ string path = "http://fr.mankun.com:8080/webroot/decision/view/report?viewlet=fr-report\\SMOM/Product/Produce/OutBoundDetileReport.cpt&op=write&format=pdf";
+ string fullPath = AppDomain.CurrentDomain.BaseDirectory;
+ var url = Path.Combine(fullPath, "wwwroot", "Reports");
+ string savePath = Path.Combine(url, "鏈鍑哄簱.pdf");
- if (outboundOrder.OrderStatus == OutboundStatusEnum.鍑哄簱瀹屾垚.ObjToInt())
+ if (outboundOrderDetails.OrderDetailStatus == OrderDetailStatusEnum.Over.ObjToInt() && inboundOrder.System.Equals("ERP"))
+ {
+ FeedBackOutERP(outboundOrder.OrderNo, outboundOrderDetails.LinId);
+ DownloadReport(path, savePath, outboundOrderDetails.Id);
+ }
+ ///鍗曟嵁瀹屾垚鎺ㄩ�丼MOM绯荤粺
+ if (outboundOrder.OrderStatus == OutboundStatusEnum.鍑哄簱瀹屾垚.ObjToInt() && inboundOrder.System.Equals("SMOM"))
{
var stockInfoDetail = stockInfo.Details.FirstOrDefault();
- //ProcessNormalOutbound(task, stockInfo, outboundOrder, outDetail);
- SendNormalOutboundToWMS(task, outboundOrder, stockInfoDetail, outDetail);
+ ProcessNormalOutbound(task, stockInfo, outboundOrder, outDetail);
+ //DownloadReport(path, savePath, outboundOrderDetails.Id);
+ //printTest(savePath);
+ //SendNormalOutboundToWMS(task, outboundOrder, stockInfoDetail, outDetail);
}
if (outboundOrder.OrderType == 240) // 鐩樼偣鍑哄簱
{
// 鐩樼偣鍑哄簱鐗规畩澶勭悊閫昏緫
}
- //else // 璋冩嫧鍑哄簱
- //{
- // ProcessAllocateOutbound(task, stockInfo, outboundOrder, outDetail);
- //}
_unitOfWorkManage.CommitTran();
return WebResponseContent.Instance.OK();
@@ -970,10 +1847,10 @@
throw;
}
}
- private void UpdateOutboundOrderDetails(Dt_StockInfo stockInfo, Dt_OutboundOrder inboundOrder,ref Dt_OutboundOrderDetail inboundOrderDetail)
+ private void UpdateOutboundOrderDetails(Dt_StockInfo stockInfo, Dt_OutboundOrder inboundOrder, ref Dt_OutboundOrderDetail inboundOrderDetail)
{
int overCount = inboundOrder.Details.Count(x => x.OrderDetailStatus == OrderDetailStatusEnum.Over.ObjToInt());
- inboundOrderDetail = inboundOrder.Details.FirstOrDefault(x => x.BatchNo == stockInfo.Details.FirstOrDefault()?.BatchNo);
+ //inboundOrderDetail = inboundOrder.Details.FirstOrDefault(x => x.BatchNo == stockInfo.Details.FirstOrDefault()?.BatchNo&&x.LPNNo==stockInfo.PalletCode);
foreach (var item in stockInfo.Details)
{
@@ -1013,7 +1890,8 @@
private void CompleteTask(Dt_Task task)
{
- task.TaskStatus = OutTaskStatusEnum.OutFinish.ObjToInt();
+ task.TaskStatus = TaskStatusEnum.Finish.ObjToInt();
+ FeedBackWCSTaskCompleted(task.TaskNum);
BaseDal.DeleteAndMoveIntoHty(task, App.User.UserId == 0 ? OperateType.鑷姩瀹屾垚 : OperateType.浜哄伐瀹屾垚);
}
@@ -1055,9 +1933,9 @@
//MoveOutboundDetailToHistory(outDetail);
// 鍙戦�佸嚭搴撲俊鎭埌WMS
- if (outboundOrder.OrderStatus == OutboundStatusEnum.鍑哄簱瀹屾垚.ObjToInt() && outboundOrder.OrderType == 0)
+ if (outboundOrder.OrderStatus == OutboundStatusEnum.鍑哄簱瀹屾垚.ObjToInt() && outboundOrder.OrderType == 1)
{
- SendNormalOutboundToWMS(task, outboundOrder, stockInfoDetail, outDetail);
+ //SendNormalOutboundToWMS(task, outboundOrder, stockInfoDetail, outDetail);
}
else if (outboundOrder.OrderStatus == OutboundStatusEnum.鍑哄簱瀹屾垚.ObjToInt() && outboundOrder.OrderType == 2)
{
@@ -1120,21 +1998,21 @@
_outboundService.OutboundOrderService.DeleteData(outDetail);
}
- private void SendNormalOutboundToWMS(Dt_Task task, Dt_OutboundOrder outboundOrder,
+ private WebResponseContent SendNormalOutboundToWMS(Dt_Task task, Dt_OutboundOrder outboundOrder,
Dt_StockInfoDetail stockInfoDetail, Dt_OutboundOrderDetail outDetail)
+ {
+
+ //List<Dt_StockInfo> StockInfos = _stockRepository.StockInfoRepository.Db.Queryable<Dt_StockInfo>().Where(x => x.WarehouseId == task.WarehouseId).Includes(x => x.Details).Where(x => x.Details.Any(v => v.BatchNo == outDetail.BatchNo)).ToList();
+ List<Dt_OutStockLockInfo> outStockLockInfos = _outboundService.OutboundStockLockInfoService.Repository.QueryData(x => x.OrderNo == outboundOrder.OrderNo);
+
+ if (outStockLockInfos.Count == 0) throw new Exception("鏈壘鍒板簱瀛樹俊鎭�");
+
+ // 鏋勫缓鍥炰紶鏁版嵁锛屽皢鎵�鏈夊尮閰嶇殑搴撳瓨鏄庣粏鍔犲叆 DetailList
+ var passBack = new HouseoutboundPassBack
{
-
- //List<Dt_StockInfo> StockInfos = _stockRepository.StockInfoRepository.Db.Queryable<Dt_StockInfo>().Where(x => x.WarehouseId == task.WarehouseId).Includes(x => x.Details).Where(x => x.Details.Any(v => v.BatchNo == outDetail.BatchNo)).ToList();
- List<Dt_OutStockLockInfo> outStockLockInfos = _outboundService.OutboundStockLockInfoService.Repository.QueryData(x => x.OrderNo == outboundOrder.OrderNo);
-
- if (outStockLockInfos.Count == 0) throw new Exception("鏈壘鍒板簱瀛樹俊鎭�");
-
- // 鏋勫缓鍥炰紶鏁版嵁锛屽皢鎵�鏈夊尮閰嶇殑搴撳瓨鏄庣粏鍔犲叆 DetailList
- var passBack = new HouseoutboundPassBack
- {
- ApiType = "InventoryAllocateController",
- Method = "AsrsFinishedStockCount",
- Parameters = new List<HouseoutboundPassBack.datas>
+ ApiType = "ShippingOrderController",
+ Method = "AsrsOutboundSO",
+ Parameters = new List<HouseoutboundPassBack.datas>
{
new HouseoutboundPassBack.datas
{
@@ -1174,8 +2052,21 @@
{ "InvOrgId", authResult.InvOrgId }
};
- HttpHelper.Post<WebResponseContent>(ReceiveWMSTaskin, passBack, "绔嬪簱鍏ュ簱鏁伴噺鍥炰紶WMS");
+ var response = HttpHelper.Post<MomRequestContent>(ReceiveWMSTaskout, passBack, "绔嬪簱鍑哄簱鏁伴噺鍥炰紶WMS");
+ // 鍒ゆ柇Success鐨勫��
+ if (response.Success)
+ {
+ // 濡傛灉Success涓簍rue锛岃繑鍥為渶瑕佺殑鍊硷紙杩欓噷浠ヨ繑鍥炴暣涓搷搴斿璞′负渚嬶級
+ return WebResponseContent.Instance.OK();
+ }
+ else
+ {
+ // 濡傛灉Success涓篺alse锛屾姏鍑哄紓甯稿苟鍖呭惈閿欒淇℃伅
+ throw new Exception($"鎿嶄綔澶辫触: {response.Message ?? "鏈彁渚涢敊璇俊鎭�"}");
+ }
+
}
+ return WebResponseContent.Instance.OK();
}
private void SendAllocateOutboundToWMS(Dt_Task task, Dt_OutboundOrder outboundOrder,
@@ -1204,15 +2095,15 @@
OrderType = outboundOrder.InoutType,
DetailList = outStockLockInfos.Select(item =>
{
- var detail = _stockService.StockInfoDetailService.Repository.QueryFirst(x => x.StockId == item.Id);
+ //var detail = _stockService.StockInfoDetailService.Repository.QueryFirst(x => x.StockId == item.StockId);
return new Allocate.data1.Inventory
{
LinId = outDetail.LinId,
- LPN_No = item.PalletCode,
- MaterielCode = detail.MaterielCode,
- OrderQuantity = detail.OutboundQuantity,
- BatchNo = detail.BatchNo,
- FinishQty = detail.OutboundQuantity,
+ LPNNo = item.PalletCode,
+ MaterielCode = outDetail.MaterielCode,
+ OrderQuantity = outDetail.OrderQuantity,
+ BatchNo = outDetail.BatchNo,
+ FinishQty = outDetail.OrderQuantity,
LocationName = task.SourceAddress
};
}).ToList()
@@ -1243,525 +2134,1287 @@
App.User.UserId == 0 ? OperateType.鑷姩瀹屾垚 : OperateType.浜哄伐瀹屾垚);
}
- #endregion
- #endregion
+ private void AddRetrueOrder(Dt_StockInfo stockInfo, Dt_OutboundOrder outboundOrder)
+ {
+ Dt_StockInfoDetail stockInfoDetail = _stockService.StockInfoDetailService.Db.Queryable<Dt_StockInfoDetail>()
+ .Where(x => x.StockId == stockInfo.Id)
+ .First();
+ if (stockInfoDetail == null)
+ {
+ throw new Exception("寤虹珛鍥炲簱鍗曟椂锛屾湭鎵惧埌璇ュ簱瀛樹俊鎭�");
+ }
+ if (outboundOrder.OrderType == OrderTypeEnum.鍙嶆嫞鍑哄簱鍗�.ObjToInt())
+ {
+ Dt_ReturnOrder returnOrder = _returnOrderRepository.QueryFirst(x => x.LPNNo == stockInfo.PalletCode && x.LocationCode == stockInfo.LocationCode && x.OrderStatus == InOrderStatusEnum.鏈紑濮�.ObjToInt());
+ if (returnOrder == null)
+ {
+ throw new Exception("鍙嶆嫞鍑哄簱鍚庯紝鏈壘鍒板搴斿弽鎷ｅ洖搴撳崟淇℃伅");
+ }
+ stockInfo.LocationCode = "";
+ stockInfo.StockStatus = StockStatusEmun.鍙嶆嫞鍏ュ簱.ObjToInt();
+ stockInfo.Remark = "鍙嶆嫞鍏ュ簱";
+ stockInfoDetail.OutboundQuantity = 0;
+ stockInfoDetail.StockQuantity += returnOrder.OrderQuantity;
+ stockInfoDetail.OrderNo = returnOrder.OrderNo;
+ }
+ else
+ {
+ decimal returnQuantity = stockInfoDetail.StockQuantity - stockInfoDetail.OutboundQuantity;
+ if (returnQuantity > 0)
+ {
+ Dt_ReturnOrder returnOrder = new Dt_ReturnOrder
+ {
+ MaterielCode = stockInfoDetail.MaterielCode,
+ MaterielName = stockInfoDetail.MaterielName,
+ BatchNo = stockInfoDetail.BatchNo,
+ OrderQuantity = returnQuantity,
+ ReceiptQuantity = returnQuantity,
+ OrderStatus = InOrderStatusEnum.鏈紑濮�.ObjToInt(),
+ LinId = stockInfoDetail.LinId,
+ LPNNo = stockInfo.PalletCode,
+ Creater = "LK",
+ CreateDate = DateTime.Now,
+ OrderType = OrderTypeEnum.浣欐枡鍥炲簱鍗�.ObjToInt(),
+ System = "WMS"
+ };
+ if (outboundOrder.System == "SMOM" && stockInfo.LocationCode != null)
+ {
+ returnOrder.LocationCode = stockInfo.LocationCode;
+ }
+ _unitOfWorkManage.BeginTran();
+ _returnOrderRepository.AddData(returnOrder);
+ stockInfo.LocationCode = "";
+ stockInfo.StockStatus = StockStatusEmun.浣欐枡閫�搴�.ObjToInt();
+ stockInfo.Remark = "浣欐枡閫�搴�";
+ stockInfoDetail.OutboundQuantity = 0;
+ stockInfoDetail.StockQuantity = returnQuantity;
+ stockInfoDetail.OrderNo = returnOrder.OrderNo;
+ _stockService.StockInfoService.Repository.UpdateData(stockInfo);
+ _stockService.StockInfoDetailService.Repository.UpdateData(stockInfoDetail);
+ _unitOfWorkManage.CommitTran();
+ }
+ else
+ {
+ DeleteAndMoveIntoHtStockStatus(stockInfo);
+ }
+ }
+
+ }
+
+ //鎴愬搧鍥炲簱鍗�
+ private void AddCPRetrueOrder(Dt_StockInfo stockInfo, Dt_NewOutboundOrder outboundOrder, Dt_NewOutboundOrderDetail outboundOrderDetail)
+ {
+ List<Dt_StockInfoDetail> stockInfoDetails = _stockService.StockInfoDetailService.Db.Queryable<Dt_StockInfoDetail>()
+ .Where(x => x.StockId == stockInfo.Id)
+ .ToList();
+
+ if (stockInfoDetails == null || stockInfoDetails.Count == 0)
+ {
+ throw new Exception("寤虹珛鍥炲簱鍗曟椂锛屾湭鎵惧埌璇ュ簱瀛樹俊鎭�");
+ }
+
+ // 鎵惧埌涓庡綋鍓嶅嚭搴撳崟鏄庣粏鍖归厤鐨勫簱瀛樻槑缁�
+ var matchedStockDetail = stockInfoDetails.FirstOrDefault(x =>
+ x.MaterielCode == outboundOrderDetail.MaterielCode &&
+ x.BatchNo == outboundOrderDetail.BatchNo);
+
+ if (matchedStockDetail == null)
+ {
+ throw new Exception($"鏈壘鍒板尮閰嶇殑搴撳瓨鏄庣粏淇℃伅锛岀墿鏂�:{outboundOrderDetail.MaterielCode}, 鎵规:{outboundOrderDetail.BatchNo}");
+ }
+
+ if (outboundOrder.OrderType == OrderTypeEnum.鍙嶆嫞鍑哄簱鍗�.ObjToInt())
+ {
+ Dt_ReturnOrder returnOrder = _returnOrderRepository.QueryFirst(x =>
+ x.LPNNo == stockInfo.PalletCode &&
+ x.LocationCode == stockInfo.LocationCode &&
+ x.OrderStatus == InOrderStatusEnum.鏈紑濮�.ObjToInt());
+
+ if (returnOrder == null)
+ {
+ throw new Exception("鍙嶆嫞鍑哄簱鍚庯紝鏈壘鍒板搴斿弽鎷ｅ洖搴撳崟淇℃伅");
+ }
+
+ // 鍙噺鍘诲崟鎹槑缁嗕腑鐨勬暟閲�
+ matchedStockDetail.OutboundQuantity = 0;
+ matchedStockDetail.StockQuantity = outboundOrderDetail.OrderQuantity;
+ matchedStockDetail.OrderNo = returnOrder.OrderNo;
+
+ // 鏇存柊搴撳瓨鐘舵��
+ stockInfo.LocationCode = "";
+ stockInfo.StockStatus = StockStatusEmun.鍙嶆嫞鍏ュ簱.ObjToInt();
+ stockInfo.Remark = "鍙嶆嫞鍏ュ簱";
+
+ // 鏇存柊鍖归厤鐨勬槑缁�
+ _stockService.StockInfoDetailService.Repository.UpdateData(matchedStockDetail);
+ }
+ else
+ {
+ // 璁＄畻褰撳墠鎵规鐨勫墿浣欐暟閲�
+ decimal remainingQuantity = matchedStockDetail.StockQuantity - outboundOrderDetail.OrderQuantity;
+
+ _unitOfWorkManage.BeginTran();
+
+ try
+ {
+ if (remainingQuantity > 0)
+ {
+ // 涓哄綋鍓嶆壒娆″垱寤鸿繑搴撳崟
+ Dt_ReturnOrder returnOrder = new Dt_ReturnOrder
+ {
+ MaterielCode = matchedStockDetail.MaterielCode,
+ MaterielName = matchedStockDetail.MaterielName,
+ BatchNo = matchedStockDetail.BatchNo,
+ OrderQuantity = remainingQuantity,
+ ReceiptQuantity = remainingQuantity,
+ OrderStatus = InOrderStatusEnum.鏈紑濮�.ObjToInt(),
+ LinId = matchedStockDetail.LinId,
+ LPNNo = stockInfo.PalletCode,
+ Creater = "LK",
+ CreateDate = DateTime.Now,
+ OrderType = OrderTypeEnum.浣欐枡鍥炲簱鍗�.ObjToInt(),
+ System = "WMS"
+ };
+
+ if (outboundOrder.System == "SMOM" && stockInfo.LocationCode != null)
+ {
+ returnOrder.LocationCode = stockInfo.LocationCode;
+ }
+
+ // 娣诲姞杩斿簱鍗�
+ _returnOrderRepository.AddData(returnOrder);
+
+ // 鏇存柊褰撳墠鎵规鏄庣粏锛氬彧淇濈暀鍑哄簱鏁伴噺锛屽叾浣欒繑搴�
+ matchedStockDetail.StockQuantity = outboundOrderDetail.OrderQuantity;
+ matchedStockDetail.OutboundQuantity = outboundOrderDetail.OrderQuantity;
+ matchedStockDetail.OrderNo = returnOrder.OrderNo;
+
+ _stockService.StockInfoDetailService.Repository.UpdateData(matchedStockDetail);
+
+ // 澶勭悊鍏朵粬鎵规鐨勫簱瀛樻槑缁嗭紙鍏ㄩ儴杩斿簱锛�
+ var otherBatchDetails = stockInfoDetails
+ .Where(x => x.Id != matchedStockDetail.Id && x.StockQuantity > 0)
+ .ToList();
+
+ foreach (var otherDetail in otherBatchDetails)
+ {
+ if (otherDetail.StockQuantity > 0)
+ {
+ // 涓哄叾浠栨壒娆″垱寤鸿繑搴撳崟
+ Dt_ReturnOrder otherReturnOrder = new Dt_ReturnOrder
+ {
+ MaterielCode = otherDetail.MaterielCode,
+ MaterielName = otherDetail.MaterielName,
+ BatchNo = otherDetail.BatchNo,
+ OrderQuantity = otherDetail.StockQuantity,
+ ReceiptQuantity = otherDetail.StockQuantity,
+ OrderStatus = InOrderStatusEnum.鏈紑濮�.ObjToInt(),
+ LinId = otherDetail.LinId,
+ LPNNo = stockInfo.PalletCode,
+ Creater = "LK",
+ CreateDate = DateTime.Now,
+ OrderType = OrderTypeEnum.浣欐枡鍥炲簱鍗�.ObjToInt(),
+ System = "WMS"
+ };
+
+ if (outboundOrder.System == "SMOM" && stockInfo.LocationCode != null)
+ {
+ otherReturnOrder.LocationCode = stockInfo.LocationCode;
+ }
+
+ _returnOrderRepository.AddData(otherReturnOrder);
+
+ // 鍏朵粬鎵规鍏ㄩ儴杩斿簱锛屽簱瀛樻竻闆�
+ otherDetail.StockQuantity = 0;
+ otherDetail.OutboundQuantity = 0;
+ otherDetail.OrderNo = otherReturnOrder.OrderNo;
+
+ _stockService.StockInfoDetailService.Repository.UpdateData(otherDetail);
+ }
+ }
+
+ // 鏇存柊搴撳瓨涓昏〃鐘舵��
+ stockInfo.LocationCode = "";
+ stockInfo.StockStatus = StockStatusEmun.浣欐枡閫�搴�.ObjToInt();
+ stockInfo.Remark = "浣欐枡閫�搴�";
+ _stockService.StockInfoService.Repository.UpdateData(stockInfo);
+ }
+ else if (remainingQuantity == 0)
+ {
+ // 褰撳墠鎵规姝ｅソ鍑哄畬
+ matchedStockDetail.OutboundQuantity = matchedStockDetail.StockQuantity;
+ _stockService.StockInfoDetailService.Repository.DeleteAndMoveIntoHty(matchedStockDetail, App.User.UserId == 0 ? OperateType.鑷姩瀹屾垚 : OperateType.浜哄伐瀹屾垚);
+
+ // 鍏朵粬鎵规鍏ㄩ儴杩斿簱
+ var otherBatchDetails = stockInfoDetails
+ .Where(x => x.Id != matchedStockDetail.Id && x.StockQuantity > 0)
+ .ToList();
+
+ foreach (var otherDetail in otherBatchDetails)
+ {
+ if (otherDetail.StockQuantity > 0)
+ {
+ Dt_ReturnOrder otherReturnOrder = new Dt_ReturnOrder
+ {
+ MaterielCode = otherDetail.MaterielCode,
+ MaterielName = otherDetail.MaterielName,
+ BatchNo = otherDetail.BatchNo,
+ OrderQuantity = otherDetail.StockQuantity,
+ ReceiptQuantity = otherDetail.StockQuantity,
+ OrderStatus = InOrderStatusEnum.鏈紑濮�.ObjToInt(),
+ LinId = otherDetail.LinId,
+ LPNNo = stockInfo.PalletCode,
+ Creater = "LK",
+ CreateDate = DateTime.Now,
+ OrderType = OrderTypeEnum.浣欐枡鍥炲簱鍗�.ObjToInt(),
+ System = "WMS"
+ };
+
+ if (outboundOrder.System == "SMOM" && stockInfo.LocationCode != null)
+ {
+ otherReturnOrder.LocationCode = stockInfo.LocationCode;
+ }
+
+ _returnOrderRepository.AddData(otherReturnOrder);
+ }
+ }
+
+ // 濡傛灉鎵�鏈夋壒娆￠兘鍑哄畬浜嗭紝鍒犻櫎搴撳瓨
+ var totalRemaining = stockInfoDetails.Sum(x => x.StockQuantity);
+ if (totalRemaining == 0)
+ {
+ DeleteAndMoveIntoHtStockStatus(stockInfo);
+ }
+ else
+ {
+ // 杩樻湁搴撳瓨锛屾洿鏂扮姸鎬�
+ stockInfo.LocationCode = "";
+ stockInfo.StockStatus = StockStatusEmun.浣欐枡閫�搴�.ObjToInt();
+ stockInfo.Remark = "浣欐枡閫�搴�";
+ _stockService.StockInfoService.Repository.UpdateData(stockInfo);
+ }
+ }
+ else
+ {
+ throw new Exception($"鍑哄簱鏁伴噺 {outboundOrderDetail.OrderQuantity} 澶т簬搴撳瓨鏁伴噺 {matchedStockDetail.StockQuantity}");
+ }
+
+ _unitOfWorkManage.CommitTran();
+ }
+ catch
+ {
+ _unitOfWorkManage.RollbackTran();
+ throw;
+ }
+ }
+ }
+ /// <summary>
+ /// 鍗曟嵁鏄庣粏鍑哄簱瀹屾垚鍥炶皟ERP(琛ㄥ崟鎻愪氦)
+ /// </summary>
+ /// <param name="outboundOrder"></param>
+ /// <param name="outboundOrderDetail"></param>
+ /// <returns></returns>
+ /// <exception cref="Exception"></exception>
+ public WebResponseContent FeedBackOutERP(string orderNO, string linId)
+ {
+ Dt_OutStockLockInfo outStockLockInfos = _outboundService.OutboundStockLockInfoService.Repository.QueryFirst(x => x.OrderNo == orderNO && x.LinId == linId);
+ if (outStockLockInfos == null)
+ {
+ return WebResponseContent.Instance.Error("鏈壘鍒板嚭搴撳簱瀛樹俊鎭�");
+ }
+ var postContent = new MultipartFormDataContent();
+ postContent.Headers.Add("ContentType", $"multipart/form-data");
+ postContent.Add(new StringContent(outStockLockInfos.LinId), "ids");
+ string result = string.Empty;
+ HttpClient client = null;
+ try
+ {
+ using (client = new HttpClient())
+ {
+ HttpResponseMessage response = client.PostAsync(ReceiveERPTaskout, postContent)
+ .ConfigureAwait(false).GetAwaiter().GetResult();
+
+ // 纭繚鍝嶅簲鎴愬姛
+ response.EnsureSuccessStatusCode();
+
+ result = response.Content.ReadAsStringAsync()
+ .ConfigureAwait(false).GetAwaiter().GetResult();
+ }
+
+ // 鍋囪ERP杩斿洖鎴愬姛鏃惰繑鍥炴垚鍔熷搷搴�
+ return WebResponseContent.Instance.OK(result);
+ }
+ catch (HttpRequestException ex)
+ {
+ // 澶勭悊HTTP璇锋眰鐩稿叧寮傚父
+ return WebResponseContent.Instance.Error($"HTTP璇锋眰閿欒: {ex.Message}");
+ }
+ catch (Exception ex)
+ {
+ // 澶勭悊鍏朵粬寮傚父
+ return WebResponseContent.Instance.Error($"澶勭悊澶辫触: {ex.Message}");
+ }
+ }
+
+ public WebResponseContent FeedBackInboundERP(string upperOrderNo, string linId)
+ {
+ if (upperOrderNo == null)
+ {
+ return WebResponseContent.Instance.Error("鏈壘鍒板叆搴撳崟淇℃伅");
+ }
+ List<FeedbackInboundOrderERP> feedbackInboundOrderERPs = new List<FeedbackInboundOrderERP>();
+
+ FeedbackInboundOrderERP feedbackInboundOrder = new FeedbackInboundOrderERP()
+ {
+ code = upperOrderNo,
+ itemId = linId,
+ success = true
+
+ };
+ feedbackInboundOrderERPs.Add(feedbackInboundOrder);
+ var response = HttpHelper.Post<WebResponseContent>(InMaterialWarehousingCallback, feedbackInboundOrderERPs, "鍏ュ簱鍗曞畬鎴愬洖浼燛RP");
+ // 鍒ゆ柇Success鐨勫��
+ if (response.Code == 0)
+ {
+ // 濡傛灉Success涓簍rue锛岃繑鍥為渶瑕佺殑鍊硷紙杩欓噷浠ヨ繑鍥炴暣涓搷搴斿璞′负渚嬶級
+ return WebResponseContent.Instance.OK();
+ }
+ else
+ {
+ // 濡傛灉Success涓篺alse锛屾姏鍑哄紓甯稿苟鍖呭惈閿欒淇℃伅
+ throw new Exception($"鎿嶄綔澶辫触: {response.Message ?? "鏈彁渚涢敊璇俊鎭�"}");
+ }
+ }
+ // 鏂规硶澹版槑娣诲姞 async 鍏抽敭瀛楋紝杩斿洖鍊兼敼涓� Task<string>
+ public async Task<string> DownloadReport(string path, string savePath, int orderId)
+ {
+ string reportUrl = path + "&orderId=" + orderId;
+
+ try
+ {
+ string directory = Path.GetDirectoryName(savePath);
+ Console.WriteLine($"涓嬭浇鍦板潃: {reportUrl}");
+ Console.WriteLine($"淇濆瓨璺緞: {savePath}");
+
+ // 纭繚鐩綍瀛樺湪
+ if (!Directory.Exists(directory))
+ {
+ Directory.CreateDirectory(directory);
+ Console.WriteLine($"宸插垱寤虹洰褰�: {directory}");
+ }
+
+ // 娓呯悊鐩綍涓嬬幇鏈夋枃浠�
+ if (File.Exists(savePath))
+ {
+ File.Delete(savePath);
+ Console.WriteLine($"宸插垹闄ゆ棫鏂囦欢: {savePath}");
+ }
+
+ // 浣跨敤涓存椂鏂囦欢鍚嶄笅杞斤紝涓嬭浇瀹屾垚鍚庡啀閲嶅懡鍚�
+ string tempFilePath = savePath + ".tmp";
+
+ // 寮傛涓嬭浇鏂囦欢
+ using (var httpClient = new HttpClient())
+ {
+ httpClient.Timeout = TimeSpan.FromMinutes(5);
+
+ using (var response = await httpClient.GetAsync(reportUrl, HttpCompletionOption.ResponseHeadersRead).ConfigureAwait(false))
+ {
+ response.EnsureSuccessStatusCode();
+
+ using (var contentStream = await response.Content.ReadAsStreamAsync().ConfigureAwait(false))
+ {
+ Console.WriteLine($"寮�濮嬪啓鍏ヤ复鏃舵枃浠�: {tempFilePath}");
+
+ using (var fileStream = new FileStream(
+ tempFilePath,
+ FileMode.Create,
+ FileAccess.Write,
+ FileShare.None,
+ bufferSize: 4096,
+ useAsync: true
+ ))
+ {
+ await contentStream.CopyToAsync(fileStream).ConfigureAwait(false);
+ await fileStream.FlushAsync().ConfigureAwait(false);
+ Console.WriteLine($"涓存椂鏂囦欢鍐欏叆瀹屾垚: {tempFilePath}");
+ }
+ }
+ }
+ }
+
+ // 鍏抽敭浼樺寲锛氱‘淇濇枃浠跺畬鍏ㄥ啓鍏ョ鐩�
+ await EnsureFileCompletelyWritten(tempFilePath);
+
+ // 閲嶅懡鍚嶄负鐩爣鏂囦欢
+ File.Move(tempFilePath, savePath, true);
+ Console.WriteLine($"鏂囦欢閲嶅懡鍚嶅畬鎴�: {savePath}");
+
+ // 楠岃瘉鏂囦欢鍙闂�
+ await ValidateFileAccessible(savePath);
+
+ // 鎵撳嵃鏂囦欢
+ PrintTestDirect(savePath);
+
+ return savePath;
+ }
+ catch (Exception ex)
+ {
+ Console.WriteLine($"涓嬭浇澶辫触: {ex.Message}");
+ throw new InvalidOperationException($"鏂囦欢涓嬭浇寮傚父: {ex.Message}", ex);
+ }
+ }
+
+ /// <summary>
+ /// 纭繚鏂囦欢瀹屽叏鍐欏叆纾佺洏
+ /// </summary>
+ private async Task EnsureFileCompletelyWritten(string filePath)
+ {
+ const int maxRetries = 5;
+ const int delayMs = 500;
+
+ for (int i = 0; i < maxRetries; i++)
+ {
+ try
+ {
+ // 灏濊瘯浠ヨ鍙栨ā寮忔墦寮�鏂囦欢锛岀‘淇濇枃浠舵病鏈夎鍗犵敤
+ using (var fs = new FileStream(filePath,
+ FileMode.Open,
+ FileAccess.Read,
+ FileShare.Read,
+ bufferSize: 4096,
+ useAsync: true))
+ {
+ // 楠岃瘉鏂囦欢鏈夊唴瀹�
+ if (fs.Length > 0)
+ {
+ Console.WriteLine($"鏂囦欢楠岃瘉鎴愬姛: 澶у皬={fs.Length}瀛楄妭 (灏濊瘯 {i + 1}/{maxRetries})");
+ return;
+ }
+ else
+ {
+ Console.WriteLine($"璀﹀憡: 鏂囦欢澶у皬涓�0 (灏濊瘯 {i + 1}/{maxRetries})");
+ }
+ }
+ }
+ catch (IOException ex)
+ {
+ Console.WriteLine($"鏂囦欢鍙兘浠嶅湪鍐欏叆涓� (灏濊瘯 {i + 1}/{maxRetries}): {ex.Message}");
+ }
+
+ if (i < maxRetries - 1)
+ {
+ await Task.Delay(delayMs);
+ }
+ }
+
+ throw new IOException($"鏂囦欢鍐欏叆鏈畬鎴愭垨鏃犳硶璁块棶: {filePath}");
+ }
+
+ /// <summary>
+ /// 楠岃瘉鏂囦欢鍙闂笖涓嶄负绌�
+ /// </summary>
+ private async Task ValidateFileAccessible(string filePath)
+ {
+ const int maxRetries = 3;
+ const int delayMs = 300;
+
+ for (int i = 0; i < maxRetries; i++)
+ {
+ try
+ {
+ if (!File.Exists(filePath))
+ {
+ throw new FileNotFoundException($"鏂囦欢涓嶅瓨鍦�: {filePath}");
+ }
+
+ var fileInfo = new FileInfo(filePath);
+
+ // 楠岃瘉鏂囦欢澶у皬澶т簬0
+ if (fileInfo.Length == 0)
+ {
+ throw new InvalidDataException($"鏂囦欢澶у皬涓�0: {filePath}");
+ }
+
+ // 楠岃瘉鏂囦欢涓嶆槸瀹屽叏鐢辩┖瀛楃缁勬垚锛堝彲閫夋鏌ワ級
+ await ValidateFileContent(filePath);
+
+ Console.WriteLine($"鏂囦欢楠岃瘉閫氳繃: {filePath} (澶у皬={fileInfo.Length}瀛楄妭)");
+ return;
+ }
+ catch (Exception ex)
+ {
+ Console.WriteLine($"鏂囦欢楠岃瘉澶辫触 (灏濊瘯 {i + 1}/{maxRetries}): {ex.Message}");
+
+ if (i == maxRetries - 1)
+ {
+ throw;
+ }
+
+ await Task.Delay(delayMs);
+ }
+ }
+ }
+
+ /// <summary>
+ /// 楠岃瘉鏂囦欢鍐呭锛堝彲閫夛級
+ /// </summary>
+ private async Task ValidateFileContent(string filePath)
+ {
+ try
+ {
+ // 璇诲彇鏂囦欢鍓嶅嚑涓瓧鑺傦紝纭繚涓嶆槸瀹屽叏鐢辩┖瀛楃缁勬垚
+ using (var fs = new FileStream(filePath, FileMode.Open, FileAccess.Read, FileShare.Read, 4096, true))
+ {
+ byte[] buffer = new byte[Math.Min(1024, fs.Length)];
+ int bytesRead = await fs.ReadAsync(buffer, 0, buffer.Length);
+
+ // 妫�鏌ユ槸鍚﹂兘鏄�0锛堢┖鏂囦欢锛�
+ if (bytesRead > 0 && buffer.All(b => b == 0))
+ {
+ throw new InvalidDataException("鏂囦欢鍐呭寮傚父: 鍏ㄩ儴涓�0瀛楄妭");
+ }
+ }
+ }
+ catch (Exception ex)
+ {
+ Console.WriteLine($"鏂囦欢鍐呭楠岃瘉寮傚父: {ex.Message}");
+ // 鍙互閫夋嫨鏄惁鎶涘嚭寮傚父
+ }
+ }
+
+ public virtual void PrintTestDirect(string fullPath)
+ {
+ const int maxRetryCount = 3;
+ const int retryDelayMs = 1000;
+
+ if (!File.Exists(fullPath))
+ {
+ Console.WriteLine($"鎵撳嵃澶辫触锛氭枃浠朵笉瀛樺湪 {fullPath}");
+ return;
+ }
+
+ // 鑾峰彇鎵撳嵃鏈哄悕绉�
+ string printerName = AppSettings.app("PrinterName");
+
+ // 灏濊瘯涓嶅悓鐨勬墦鍗版柟娉�
+ for (int retryCount = 0; retryCount < maxRetryCount; retryCount++)
+ {
+ try
+ {
+ Console.WriteLine($"灏濊瘯鎵撳嵃 (鏂规硶 {retryCount + 1}/{maxRetryCount}): {fullPath}");
+
+ switch (retryCount)
+ {
+ case 0:
+ // 鏂规硶1: 浣跨敤鍘熷鎵撳嵃鍛戒护
+ PrintUsingRawCommand(fullPath, printerName);
+ break;
+ case 1:
+ // 鏂规硶3: 鐩存帴浣跨敤Spire.PDF浣嗙畝鍖栬缃�
+ PrintUsingSpireSimple(fullPath, printerName);
+ break;
+ case 2:
+ // 鏂规硶3: 鐩存帴浣跨敤Spire.PDF浣嗙畝鍖栬缃�
+ PrintUsingSpireSimple(fullPath, printerName);
+ break;
+ }
+
+ Console.WriteLine("鎵撳嵃浠诲姟鍙戦�佹垚鍔�");
+ return;
+ }
+ catch (Exception ex)
+ {
+ Console.WriteLine($"鎵撳嵃鏂规硶 {retryCount + 1} 澶辫触: {ex.Message}");
+
+ if (retryCount < maxRetryCount - 1)
+ {
+ Thread.Sleep(retryDelayMs);
+ }
+ }
+ }
+
+ Console.WriteLine("鎵�鏈夋墦鍗版柟娉曢兘澶辫触");
+ }
+
+ /// <summary>
+ /// 浣跨敤鍘熷鎵撳嵃鍛戒护
+ /// </summary>
+ private void PrintUsingRawCommand(string filePath, string printerName)
+ {
+ try
+ {
+ // 鏂规硶1: 浣跨敤Process鐩存帴鎵撳嵃
+ var process = new System.Diagnostics.Process();
+ process.StartInfo.FileName = filePath;
+ process.StartInfo.Verb = "print";
+ process.StartInfo.CreateNoWindow = true;
+ process.StartInfo.WindowStyle = System.Diagnostics.ProcessWindowStyle.Hidden;
+ process.Start();
+
+ // 绛夊緟涓�娈垫椂闂磋鎵撳嵃浠诲姟鎻愪氦
+ if (!process.WaitForExit(5000))
+ {
+ Console.WriteLine("鎵撳嵃杩涚▼鏈強鏃堕��鍑猴紝浣嗕换鍔″彲鑳藉凡鎻愪氦");
+ }
+ }
+ catch
+ {
+ // 濡傛灉涓婅堪鏂规硶澶辫触锛屽皾璇曚娇鐢╮undll32
+ try
+ {
+ var args = $@"/c rundll32.exe C:\Windows\System32\shimgvw.dll,ImageView_PrintTo ""{filePath}"" ""{printerName}""";
+ System.Diagnostics.Process.Start("cmd.exe", args);
+ }
+ catch
+ {
+ throw;
+ }
+ }
+ }
+
+ /// <summary>
+ /// 浣跨敤Spire.PDF浣嗙畝鍖栬缃�
+ /// </summary>
+ private void PrintUsingSpireSimple(string filePath, string printerName)
+ {
+ using (Spire.Pdf.PdfDocument pdf = new Spire.Pdf.PdfDocument())
+ {
+ // 浣跨敤鏈�灏忛厤缃姞杞芥枃浠�
+ pdf.LoadFromFile(filePath);
+
+ // 璁剧疆鍩烘湰鎵撳嵃鏈轰俊鎭�
+ if (!string.IsNullOrEmpty(printerName))
+ {
+ pdf.PrintSettings.PrinterName = printerName;
+ }
+
+ // 鐩存帴鎵撳嵃锛屼笉妫�鏌�
+ pdf.Print();
+ }
+ }
+
+ /// <summary>
+ /// 妫�鏌ユ枃浠舵槸鍚﹀彲璁块棶
+ /// </summary>
+ private bool IsFileAccessible(string filePath)
+ {
+ try
+ {
+ using (FileStream fs = new FileStream(filePath, FileMode.Open, FileAccess.Read, FileShare.ReadWrite))
+ {
+ return fs.Length > 0;
+ }
+ }
+ catch
+ {
+ return false;
+ }
+ }
+
+ /// <summary>
+ /// 灏濊瘯寮哄埗鍨冨溇鍥炴敹锛岄噴鏀惧彲鑳藉瓨鍦ㄧ殑鏂囦欢鍙ユ焺
+ /// </summary>
+ private void TryForceGarbageCollection()
+ {
+ try
+ {
+ GC.Collect();
+ GC.WaitForPendingFinalizers();
+ Console.WriteLine("宸叉墽琛屽瀮鍦惧洖鏀�");
+ }
+ catch (Exception ex)
+ {
+ Console.WriteLine($"鍨冨溇鍥炴敹澶辫触: {ex.Message}");
+ }
+ }
-
- #region
- //public WebResponseContent InboundTaskCompleted(int taskNum)
- //{
- // try
- // {
- // Dt_Task task = BaseDal.QueryFirst(x => x.TaskNum == taskNum);
- // if (task == null)
- // {
- // return WebResponseContent.Instance.Error($"鏈壘鍒拌浠诲姟");
- // }
- // if (task.TaskType != TaskTypeEnum.Inbound.ObjToInt())
- // {
- // return WebResponseContent.Instance.Error($"浠诲姟绫诲瀷閿欒");
- // }
- // Dt_StockInfo dt_StockInfo = _stockRepository.StockInfoRepository.Db.Queryable<Dt_StockInfo>().Where(x => x.PalletCode == task.PalletCode).Includes(x => x.Details).First();
- // if (dt_StockInfo == null)
- // {
- // return WebResponseContent.Instance.Error($"鏈壘鍒版墭鐩樺搴旂殑缁勭洏淇℃伅");
- // }
-
- // if (!string.IsNullOrEmpty(dt_StockInfo.LocationCode))
- // {
- // return WebResponseContent.Instance.Error($"璇ユ墭鐩樺凡缁戝畾璐т綅");
- // }
-
- // if (dt_StockInfo.Details == null || dt_StockInfo.Details.Count == 0)
- // {
- // return WebResponseContent.Instance.Error($"鏈壘鍒拌鎵樼洏搴撳瓨鏄庣粏淇℃伅");
- // }
- // Dt_LocationInfo dt_LocationInfo = _basicService.LocationInfoService.Repository.QueryFirst(x => x.LocationCode == task.TargetAddress);
- // if (dt_LocationInfo == null)
- // {
- // return WebResponseContent.Instance.Error($"鏈壘鍒扮洰鏍囪揣浣嶄俊鎭�");
- // }
-
- // if (dt_LocationInfo.LocationStatus == LocationStatusEnum.InStock.ObjToInt())
- // {
- // return WebResponseContent.Instance.Error($"璐т綅鐘舵�佷笉姝ｇ‘");
- // }
- // int lastStatus = dt_LocationInfo.LocationStatus;
- // dt_LocationInfo.LocationStatus = LocationStatusEnum.InStock.ObjToInt();
- // Dt_Warehouse warehouse = _basicService.WarehouseService.Repository.QueryFirst(x => x.WarehouseId == task.WarehouseId);
-
- // dt_StockInfo.LocationCode = dt_LocationInfo.LocationCode;
-
-
- // Dt_InboundOrder? inboundOrder = _inboundService.InbounOrderService.Db.Queryable<Dt_InboundOrder>().Where(x => x.InboundOrderNo == dt_StockInfo.Details.FirstOrDefault().OrderNo).Includes(x => x.Details).First();
- // Dt_InboundOrderDetail? inboundOrderDetail = null;
- // //鍒ゆ柇鍗曟嵁绫诲瀷鏄叆搴撹繕鏄皟鎷ㄥ叆搴撱�傘�傘�傚叆搴�
- // if (inboundOrder.OrderType == 0 && inboundOrder != null && dt_StockInfo.StockStatus == StockStatusEmun.鍏ュ簱纭.ObjToInt())
- // {
- // #region //鍒ゆ柇鍏ュ簱鍗曟嵁鏄庣粏鍙湁鏈�鍚庝竴鏉″畬鎴愭椂鍒犻櫎鍏ュ簱鍗�
- // //鏌ヨ鍘熷畬鎴愮殑鍏ュ簱鏄庣粏鏁伴噺
- // int overCount = inboundOrder.Details.Where(x => x.OrderDetailStatus == OrderDetailStatusEnum.Over.ObjToInt()).ToList().Count;
- // //鏄庣粏id鏌ヨ
- // inboundOrderDetail = inboundOrder.Details.FirstOrDefault(x => x.LinId == dt_StockInfo.Details.FirstOrDefault()?.LinId);
- // foreach (var item in dt_StockInfo.Details)
- // {
- // if (inboundOrderDetail == null)
- // {
- // continue;
- // }
- // inboundOrderDetail.OverInQuantity += item.StockQuantity;
- // if (inboundOrderDetail.OverInQuantity == inboundOrderDetail.OrderQuantity)
- // {
- // inboundOrderDetail.OrderDetailStatus = OrderDetailStatusEnum.Over.ObjToInt();
- // overCount += 1;
- // }
- // else if (inboundOrderDetail.OrderDetailStatus == OrderDetailStatusEnum.New.ObjToInt())
- // {
- // inboundOrderDetail.OrderDetailStatus = InboundStatusEnum.鍏ュ簱涓�.ObjToInt();
- // }
- // }
- // dt_StockInfo.Details.ForEach(x =>
- // {
- // x.Status = StockStatusEmun.鍏ュ簱瀹屾垚.ObjToInt();
- // });
-
- // _unitOfWorkManage.BeginTran();
- // task.TaskStatus = InTaskStatusEnum.InFinish.ObjToInt();
- // BaseDal.DeleteAndMoveIntoHty(task, App.User.UserId > 0 ? OperateType.浜哄伐瀹屾垚 : OperateType.鑷姩瀹屾垚);
-
- // _basicService.LocationInfoService.Repository.UpdateData(dt_LocationInfo);
- // _stockRepository.StockInfoRepository.UpdateData(dt_StockInfo);
- // _stockRepository.StockInfoDetailRepository.UpdateData(dt_StockInfo.Details);
- // _recordService.LocationStatusChangeRecordSetvice.AddLocationStatusChangeRecord(dt_LocationInfo, lastStatus, StockChangeType.Inbound.ObjToInt(), "", task.TaskNum);
- // _recordService.StockQuantityChangeRecordService.AddStockChangeRecord(dt_StockInfo, dt_StockInfo.Details, dt_StockInfo.Details.Sum(x => x.StockQuantity), dt_StockInfo.Details.Sum(x => x.StockQuantity), StockChangeType.Inbound, task.TaskNum);
- // if (inboundOrder != null)
- // {
- // _inboundService.InbounOrderService.UpdateData(inboundOrder);
- // _inboundService.InboundOrderDetailService.UpdateData(inboundOrderDetail);
- // }
- // _unitOfWorkManage.CommitTran();
-
-
-
-
- // if (inboundOrder.Details.Count == 1)
- // {
- // var stockInfoDetail = dt_StockInfo.Details.FirstOrDefault();
-
- // #region//鍏ュ簱淇℃伅杩斿洖涓婁綅WMS銆傘�傜珛搴撳叆搴撴暟閲忓洖浼�
- // HouseInboundPassBack houseInboundPassBack = new HouseInboundPassBack();
- // houseInboundPassBack.ApiType = "AsnController";
- // houseInboundPassBack.Method = "AsrsGroudingAsn";
- // data data = new data();
- // data.data1 data1 = new data.data1();
- // data1.AsnNo = task.OrderNo;
- // data1.InWarehouse = task.Roadway;
- // data1.TransactionCode = inboundOrder.TransactionCode;
- // data1.InoutType = inboundOrder.OrderType;
- // data1.OrderType = inboundOrder.InoutType;
- // data.data1.Inbound inbound = new data.data1.Inbound
- // {
- // LinId = stockInfoDetail.LinId,
- // MaterielCode = stockInfoDetail.MaterielCode,
- // OrderQuantity = stockInfoDetail.StockQuantity,
- // BatchNo = stockInfoDetail.BatchNo,
- // FinishQty = stockInfoDetail.StockQuantity,
- // LocationName = task.TargetAddress
- // };
- // data.Value.Add(data1);
- // data1.DetailList.Add(inbound);
- // houseInboundPassBack.Parameters.Add(data);
- // Authentication authentication = new Authentication()
- // {
- // ApiType = "AuthenticationController",
- // Parameters = new List<Parameter>
- // {
- // new Parameter { Value = "LKAdmin"},
- // new Parameter { Value = "LKAdmin"},
- // },
- // Method = "Login",
- // };
- // var responses1 = HttpHelper.Post<WebResponseContent>(ReceiveWMSTaskAUT, authentication, "鐧诲綍WMS璐﹀彿");
- // var Ticket = responses1.Context["Ticket"].ToString();
- // var InvOrgId = responses1.Context["InvOrgId"].ToString();
- // if (Ticket != null)
- // {
- // houseInboundPassBack.Context = new Dictionary<string, string>();
- // houseInboundPassBack.Context.Add("Ticket", Ticket);
- // houseInboundPassBack.Context.Add("InvOrgId", InvOrgId);
- // var responses = HttpHelper.Post<WebResponseContent>(ReceiveWMSTaskin, houseInboundPassBack, "绔嬪簱鍏ュ簱鏁伴噺鍥炰紶WMS");
- // }
- // #endregion
- // }
- // }
- // else
- // {
- // #region //鍒ゆ柇璋冩嫧鍏ュ簱鍗曟嵁鏄庣粏鍙湁鏈�鍚庝竴鏉″畬鎴愭椂鍒犻櫎鍏ュ簱鍗曞苟涓�娆¤繑鍥炲叆搴撴槑缁嗕俊鎭�
- // if (inboundOrder.Details.Count == 1)
- // {
- // List<Dt_StockInfo> StockInfo = _stockService.StockInfoService.Repository.QueryData(x => x.BatchNo == inboundOrderDetail.BatchNo);
- // Dt_InboundOrder_Hty inboundOrder_Hty = new Dt_InboundOrder_Hty
- // {
- // OrderStatus = inboundOrder.OrderStatus,
- // CreateType = inboundOrder.CreateType,
- // //SourceId = oldOutboundOrder.SourceId,
- // UpperOrderNo = inboundOrder.UpperOrderNo,
- // OrderNo = inboundOrder.OrderNo,
- // //OutWareHouse = inboundOrder.OutWareHouse,
- // TransactionCode = inboundOrder.TransactionCode,
- // InoutType = inboundOrder.InoutType,
- // OrderType = inboundOrder.OrderType,
- // Creater = "WMS",
- // CreateDate = DateTime.Now,
- // };
- // _inboundOrder_HtyService.AddData(inboundOrder_Hty);
- // _inboundService.InbounOrderService.DeleteData(inboundOrder);
- // Dt_InboundOrderDetail_Hty dt_InboundOrderDetail_HtyS = new Dt_InboundOrderDetail_Hty
- // {
- // OrderId = inboundOrderDetail.OrderId,
- // MaterielCode = inboundOrderDetail.MaterielCode,
- // MaterielName = inboundOrderDetail.MaterielName,
- // BatchNo = inboundOrderDetail.BatchNo,
- // OrderQuantity = inboundOrderDetail.OrderQuantity,
- // ReceiptQuantity = inboundOrderDetail.ReceiptQuantity,
- // OverInQuantity = inboundOrderDetail.OverInQuantity,
- // OrderDetailStatus = inboundOrderDetail.OrderDetailStatus,
- // Creater = "WMS",
- // CreateDate = DateTime.Now,
- // };
- // _inboundOrderDetail_HtyService.AddData(dt_InboundOrderDetail_HtyS);
- // _inboundService.InboundOrderDetailService.DeleteData(inboundOrderDetail);
- // #endregion
- // #region//璋冩嫧浠诲姟鏁伴噺鍥炰紶WMS
- // InventoryAllocate inventoryAllocate = new InventoryAllocate();
- // inventoryAllocate.ApiType = "InventoryAllocateController";
- // inventoryAllocate.Method = "AsrsFinishedStockCount";
-
- // Allocate allocate = new Allocate();
-
- // Allocate.data1 data1 = new Allocate.data1();
- // data1.No = task.OrderNo;
- // data1.InWarehouse = task.Roadway;
- // data1.TransactionCode = inboundOrder.TransactionCode;
- // data1.InoutType = inboundOrder.OrderType;
- // data1.OrderType = inboundOrder.InoutType;
- // foreach (var item in StockInfo)
- // {
- // Dt_StockInfoDetail detail = _stockService.StockInfoDetailService.Repository.QueryFirst(x => x.StockId == item.Id);
- // Allocate.data1.Inventory inbound = new Allocate.data1.Inventory();
- // inbound.LinId = detail.LinId;
- // inbound.LPN_No = item.PalletCode;
- // inbound.MaterielCode = detail.MaterielCode;
- // inbound.OrderQuantity = detail.StockQuantity;
- // inbound.BatchNo = detail.BatchNo;
- // inbound.FinishQty = detail.StockQuantity;
- // inbound.LocationName = item.LocationCode;
- // data1.DetailList.Add(inbound);
- // }
- // allocate.Value.Add(data1);
- // inventoryAllocate.Parameters.Add(allocate);
- // Authentication authentication = new Authentication()
- // {
- // ApiType = "AuthenticationController",
- // Parameters = new List<Parameter>
- // {
- // new Parameter { Value = "LKAdmin"},
- // new Parameter { Value = "LKAdmin"},
- // },
- // Method = "Login",
- // };
- // var responses1 = HttpHelper.Post<WebResponseContent>(ReceiveWMSTaskAUT, authentication, "鐧诲綍WMS璐﹀彿");
- // var Ticket = responses1.Context["Ticket"].ToString();
- // var InvOrgId = responses1.Context["InvOrgId"].ToString();
- // if (Ticket != null)
- // {
- // inventoryAllocate.Context = new Dictionary<string, string>();
- // inventoryAllocate.Context.Add("Ticket", Ticket);
- // inventoryAllocate.Context.Add("InvOrgId", InvOrgId);
- // var responses = HttpHelper.Post<WebResponseContent>(ReceiveWMSTaskAllocatein, inventoryAllocate, "璋冩嫧鍏ュ簱鏁伴噺鍥炰紶WMS");
- // }
- // }
- // #endregion
- // Dt_InboundOrderDetail_Hty dt_InboundOrderDetail_Hty = new Dt_InboundOrderDetail_Hty
- // {
- // OrderId = inboundOrderDetail.OrderId,
- // MaterielCode = inboundOrderDetail.MaterielCode,
- // MaterielName = inboundOrderDetail.MaterielName,
- // BatchNo = inboundOrderDetail.BatchNo,
- // OrderQuantity = inboundOrderDetail.OrderQuantity,
- // ReceiptQuantity = inboundOrderDetail.ReceiptQuantity,
- // OverInQuantity = inboundOrderDetail.OverInQuantity,
- // OrderDetailStatus = inboundOrderDetail.OrderDetailStatus,
- // Creater = "WMS",
- // CreateDate = DateTime.Now,
- // };
- // _inboundOrderDetail_HtyService.AddData(dt_InboundOrderDetail_Hty);
- // _inboundService.InboundOrderDetailService.DeleteData(inboundOrderDetail);
- // }
- // return WebResponseContent.Instance.OK();
- // }
- // catch (Exception ex)
- // {
- // _unitOfWorkManage.RollbackTran();
- // return WebResponseContent.Instance.Error(ex.Message);
- // }
- //}
- #endregion
- #region
- //public WebResponseContent OutboundTaskCompleted(int taskNum)
- //{
- // try
- // {
- // Dt_Task task = BaseDal.QueryFirst(x => x.TaskNum == taskNum);
- // if (task == null)
- // {
- // return WebResponseContent.Instance.Error($"鏈壘鍒颁换鍔′俊鎭�");
- // }
-
- // Dt_StockInfo stockInfo = _stockService.StockInfoService.Repository.GetStockInfo(task.PalletCode);
-
- // Dt_LocationInfo locationInfo = _basicService.LocationInfoService.Repository.QueryFirst(x => x.LocationCode == task.SourceAddress);
- // if (stockInfo == null)
- // {
- // return WebResponseContent.Instance.Error($"鏈壘鍒板簱瀛樹俊鎭�");
- // }
- // if (locationInfo == null)
- // {
- // return WebResponseContent.Instance.Error($"鏈壘鍒拌揣浣嶄俊鎭�");
- // }
-
- // List<Dt_OutStockLockInfo> outStockLockInfos = _outboundService.OutboundStockLockInfoService.Repository.QueryData(x => x.TaskNum == taskNum);
- // if (outStockLockInfos == null || outStockLockInfos.Count == 0)
- // {
- // return WebResponseContent.Instance.Error($"鏈壘鍒板嚭搴撹鎯呬俊鎭�");
- // }
-
- // List<Dt_OutboundOrderDetail> outboundOrderDetails = new List<Dt_OutboundOrderDetail>();
- // for (int i = 0; i < outStockLockInfos.Count; i++)
- // {
- // Dt_OutboundOrderDetail outboundOrderDetail = _outboundService.OutboundOrderDetailService.Repository.QueryFirst(x => x.Id == outStockLockInfos[i].OrderDetailId);
- // if (outboundOrderDetail != null)
- // {
- // outboundOrderDetail.OverOutQuantity = outboundOrderDetail.LockQuantity;
- // if (outboundOrderDetail.LockQuantity == outboundOrderDetail.OrderQuantity)
- // {
- // outboundOrderDetail.OrderDetailStatus = OrderDetailStatusEnum.Over.ObjToInt();
- // }
- // outboundOrderDetails.Add(outboundOrderDetail);
- // }
- // }
-
- // _unitOfWorkManage.BeginTran();
- // _outboundService.OutboundOrderDetailService.Repository.UpdateData(outboundOrderDetails);
-
- // stockInfo.LocationCode = locationInfo.LocationCode;
- // stockInfo.StockStatus = StockStatusEmun.鍑哄簱瀹屾垚.ObjToInt();
- // _stockService.StockInfoService.Repository.UpdateData(stockInfo);
-
- // int beforeStatus = locationInfo.LocationStatus;
- // locationInfo.LocationStatus = LocationStatusEnum.Free.ObjToInt();
- // _basicService.LocationInfoService.Repository.UpdateData(locationInfo);
- // BaseDal.DeleteAndMoveIntoHty(task, App.User.UserId == 0 ? OperateType.鑷姩瀹屾垚 : OperateType.浜哄伐瀹屾垚);
-
- // _recordService.LocationStatusChangeRecordSetvice.AddLocationStatusChangeRecord(locationInfo, beforeStatus, StockChangeType.Outbound.ObjToInt(), stockInfo.Details.FirstOrDefault()?.OrderNo ?? "", task.TaskNum);
- // _unitOfWorkManage.CommitTran();
- // Dt_StockInfoDetail stockInfoDetail = _stockRepository.StockInfoDetailRepository.Db.Queryable<Dt_StockInfoDetail>().Where(x => x.StockId == stockInfo.Id).First();
- // Dt_OutboundOrderDetail outDetail = _outboundService.OutboundOrderDetailService.Db.Queryable<Dt_OutboundOrderDetail>().Where(x => x.LPNNo == stockInfo.PalletCode).First();
- // Dt_OutboundOrder outboundOrder = _outboundService.OutboundOrderService.Db.Queryable<Dt_OutboundOrder>().Where(x => x.Id == outDetail.OrderId).Includes(x => x.Details).First();
- // //鍒ゆ柇鍗曟嵁绫诲瀷鏄嚭搴撹繕鏄皟鎷ㄥ嚭搴撱�傘�傘�傚嚭搴�
- // if (outboundOrder.OrderType == 1)
- // {
- // #region //鍒ゆ柇鍑哄簱鍗曟嵁鏄庣粏鍙湁鏈�鍚庝竴鏉″畬鎴愭椂鍒犻櫎鍑哄簱鍗�
- // if (outboundOrder.Details.Count == 1)
- // {
- // Dt_OutboundOrder_Hty inboundOrder_Hty = new Dt_OutboundOrder_Hty
- // {
- // OrderStatus = outboundOrder.OrderStatus,
- // CreateType = outboundOrder.CreateType,
- // //SourceId = oldOutboundOrder.SourceId,
- // UpperOrderNo = outboundOrder.UpperOrderNo,
- // OrderNo = outboundOrder.OrderNo,
- // OutWareHouse = outboundOrder.OutWareHouse,
- // TransactionCode = outboundOrder.TransactionCode,
- // InoutType = outboundOrder.InoutType,
- // OrderType = outboundOrder.OrderType,
- // Creater = "WMS",
- // CreateDate = DateTime.Now,
- // };
- // _outboundOrder_HtyService.AddData(inboundOrder_Hty);
- // _outboundService.OutboundOrderService.DeleteData(outboundOrder);
- // }
- // Dt_OutboundOrderDetail_Hty dt_InboundOrderDetail_Hty = new Dt_OutboundOrderDetail_Hty
- // {
- // OrderId = outDetail.OrderId,
- // MaterielCode = outDetail.MaterielCode,
- // MaterielName = outDetail.MaterielName,
- // BatchNo = outDetail.BatchNo,
- // OrderQuantity = outDetail.OrderQuantity,
- // //ReceiptQuantity = outDetail.ReceiptQuantity,
- // //OverInQuantity = outDetail.OverInQuantity,
- // OrderDetailStatus = outDetail.OrderDetailStatus,
- // Creater = "WMS",
- // CreateDate = DateTime.Now,
- // };
- // _outboundOrderDetail_HtyService.AddData(dt_InboundOrderDetail_Hty);
- // _outboundService.OutboundOrderService.DeleteData(outDetail);
- // #endregion
- // #region//鍑哄簱淇℃伅杩斿洖涓婁綅WMS銆傘�傘�傜珛搴撳嚭搴撴暟閲忓洖浼�
- // HouseoutboundPassBack houseInboundPassBack = new HouseoutboundPassBack();
- // houseInboundPassBack.ApiType = "ShippingOrderController";
- // houseInboundPassBack.Method = "AsrsOutboundSO";
- // datas datas = new datas();
- // datas.data1 data1 = new datas.data1();
- // data1.No = outboundOrder.OrderNo;
- // data1.OutWareHouse = task.Roadway;
- // data1.TransactionCode = outboundOrder.TransactionCode;
- // data1.InoutType = outboundOrder.OrderType;
- // data1.OrderType = outboundOrder.InoutType;
-
- // datas.data1.Inbound inbound = new datas.data1.Inbound();
- // inbound.LinId = outDetail.LinId;
- // inbound.LPN_No = task.PalletCode;
- // inbound.MaterielCode = stockInfoDetail.MaterielCode;
- // inbound.OrderQuantity = stockInfoDetail.OutboundQuantity;
- // inbound.BatchNo = stockInfoDetail.BatchNo;
- // inbound.FinishQty = stockInfoDetail.OutboundQuantity;
- // inbound.LocationName = task.SourceAddress;
- // datas.Value.Add(data1);
- // data1.DetailList.Add(inbound);
- // houseInboundPassBack.Parameters.Add(datas);
- // Authentication authentication = new Authentication()
- // {
- // ApiType = "AuthenticationController",
- // Parameters = new List<Parameter>
- // {
- // new Parameter { Value = "LKAdmin"},
- // new Parameter { Value = "LKAdmin"},
- // },
- // Method = "Login",
- // };
- // var responses1 = HttpHelper.Post<WebResponseContent>(ReceiveWMSTaskAUT, authentication, "鐧诲綍WMS璐﹀彿");
- // var Ticket = responses1.Context["Ticket"].ToString();
- // var InvOrgId = responses1.Context["InvOrgId"].ToString();
- // if (Ticket != null)
- // {
- // houseInboundPassBack.Context = new Dictionary<string, string>();
- // houseInboundPassBack.Context.Add("Ticket", Ticket);
- // houseInboundPassBack.Context.Add("InvOrgId", InvOrgId);
- // var responses = HttpHelper.Post<WebResponseContent>(ReceiveWMSTaskout, houseInboundPassBack, "绔嬪簱鍑哄簱鏁伴噺鍥炰紶WMS");
- // }
- // #endregion
- // //鍒犻櫎搴撳瓨淇℃伅
- // _stockService.StockInfoService.Repository.DeleteAndMoveIntoHty(stockInfo, App.User.UserId == 0 ? OperateType.鑷姩瀹屾垚 : OperateType.浜哄伐瀹屾垚);
- // _stockService.StockInfoDetailService.Repository.DeleteAndMoveIntoHty(stockInfo.Details, App.User.UserId == 0 ? OperateType.鑷姩瀹屾垚 : OperateType.浜哄伐瀹屾垚);
- // }
- // else if (outboundOrder.OrderType == 240)
- // {
- // //鐩樼偣鍑哄簱浠诲姟瀹屾垚銆併�併�併�併�併�併�併�併�佷笉鑳藉垹闄ゅ簱瀛樼瓑閫昏緫
- // }
- // else
- // {
-
- // List<Dt_StockInfo> StockInfo = _stockService.StockInfoService.Repository.QueryData(x => x.BatchNo == outDetail.BatchNo);
- // if (outboundOrder.Details.Count == 1)
- // {
- // Dt_OutboundOrder_Hty inboundOrder_Hty = new Dt_OutboundOrder_Hty
- // {
- // OrderStatus = outboundOrder.OrderStatus,
- // CreateType = outboundOrder.CreateType,
- // //SourceId = oldOutboundOrder.SourceId,
- // UpperOrderNo = outboundOrder.UpperOrderNo,
- // OrderNo = outboundOrder.OrderNo,
- // OutWareHouse = outboundOrder.OutWareHouse,
- // TransactionCode = outboundOrder.TransactionCode,
- // InoutType = outboundOrder.InoutType,
- // OrderType = outboundOrder.OrderType,
- // Creater = "WMS",
- // CreateDate = DateTime.Now,
- // };
- // _outboundOrder_HtyService.AddData(inboundOrder_Hty);
- // _outboundService.OutboundOrderService.DeleteData(outboundOrder);
- // }
- // Dt_OutboundOrderDetail_Hty dt_InboundOrderDetail_Hty = new Dt_OutboundOrderDetail_Hty
- // {
- // OrderId = outDetail.OrderId,
- // MaterielCode = outDetail.MaterielCode,
- // MaterielName = outDetail.MaterielName,
- // BatchNo = outDetail.BatchNo,
- // OrderQuantity = outDetail.OrderQuantity,
- // //ReceiptQuantity = outDetail.ReceiptQuantity,
- // //OverInQuantity = outDetail.OverInQuantity,
- // OrderDetailStatus = outDetail.OrderDetailStatus,
- // Creater = "WMS",
- // CreateDate = DateTime.Now,
- // };
- // _outboundOrderDetail_HtyService.AddData(dt_InboundOrderDetail_Hty);
- // _outboundService.OutboundOrderService.DeleteData(outDetail);
-
- // InventoryAllocate inventoryAllocate = new InventoryAllocate();
- // inventoryAllocate.ApiType = "InventoryAllocateController";
- // inventoryAllocate.Method = "AsrsFinishedStockCount";
-
- // Allocate allocate = new Allocate();
-
- // Allocate.data1 data1 = new Allocate.data1();
- // data1.No = outboundOrder.OrderNo;
- // data1.InWarehouse = task.Roadway;
- // data1.TransactionCode = outboundOrder.TransactionCode;
- // data1.InoutType = outboundOrder.OrderType;
- // data1.OrderType = outboundOrder.InoutType;
-
- // foreach (var item in StockInfo)
- // {
- // Dt_StockInfoDetail detail = _stockService.StockInfoDetailService.Repository.QueryFirst(x => x.StockId == item.Id);
- // Allocate.data1.Inventory inbound = new Allocate.data1.Inventory();
- // inbound.LinId = outDetail.LinId;
- // inbound.LPN_No = item.PalletCode;
- // inbound.MaterielCode = detail.MaterielCode;
- // inbound.OrderQuantity = detail.OutboundQuantity;
- // inbound.BatchNo = detail.BatchNo;
- // inbound.FinishQty = detail.OutboundQuantity;
- // inbound.LocationName = task.SourceAddress;
- // data1.DetailList.Add(inbound);
- // }
-
-
- // allocate.Value.Add(data1);
- // inventoryAllocate.Parameters.Add(allocate);
- // Authentication authentication = new Authentication()
- // {
- // ApiType = "AuthenticationController",
- // Parameters = new List<Parameter>
- // {
- // new Parameter { Value = "LKAdmin"},
- // new Parameter { Value = "LKAdmin"},
- // },
- // Method = "Login",
- // };
- // var responses1 = HttpHelper.Post<WebResponseContent>(ReceiveWMSTaskAUT, authentication, "鐧诲綍WMS璐﹀彿");
- // var Ticket = responses1.Context["Ticket"].ToString();
- // var InvOrgId = responses1.Context["InvOrgId"].ToString();
- // if (Ticket != null)
- // {
- // inventoryAllocate.Context = new Dictionary<string, string>();
- // inventoryAllocate.Context.Add("Ticket", Ticket);
- // inventoryAllocate.Context.Add("InvOrgId", InvOrgId);
- // var responses = HttpHelper.Post<WebResponseContent>(ReceiveWMSTaskAllocatein, inventoryAllocate, "璋冩嫧鍑哄簱鏁伴噺鍥炰紶WMS");
- // }
- // _stockService.StockInfoService.Repository.DeleteAndMoveIntoHty(stockInfo, App.User.UserId == 0 ? OperateType.鑷姩瀹屾垚 : OperateType.浜哄伐瀹屾垚);
- // _stockService.StockInfoDetailService.Repository.DeleteAndMoveIntoHty(stockInfo.Details, App.User.UserId == 0 ? OperateType.鑷姩瀹屾垚 : OperateType.浜哄伐瀹屾垚);
- // }
- // return WebResponseContent.Instance.OK();
- // }
- // catch (Exception ex)
- // {
- // _unitOfWorkManage.RollbackTran();
- // return WebResponseContent.Instance.Error(ex.Message);
- // }
- //}
- #endregion
+ /// <summary>
+ /// 鐩樼偣鍑哄簱瀹屾垚
+ /// </summary>
+ public WebResponseContent OutInventoryCompleted(Dt_Task task, Dt_StockInfo stockInfo, Dt_LocationInfo locationInfo)
+ {
+ WebResponseContent content = new WebResponseContent();
+ try
+ {
+ //鑾峰彇瀵瑰簲鐩樼偣鍗�
+ Dt_TakeStockOrder takeStockOrder = _inboundRepository.TakeStockOrderRepository.Db.Queryable<Dt_TakeStockOrder>().Where(x => x.OrderNo == task.OrderNo).Includes(x => x.Details).First();
+ if (takeStockOrder == null)
+ {
+ return content.Error($"鐩樼偣鍗晎task.OrderNo}涓嶅瓨鍦�");
+ }
+ if (takeStockOrder.TakeStockStatus != TakeStockStatusEnum.鐩樼偣涓�.ObjToInt())
+ {
+ return content.Error($"鐩樼偣鍗晎task.OrderNo}鐩樼偣宸插畬鎴愭垨鏈紑濮�");
+ }
+ if (stockInfo.StockStatus != StockStatusEmun.鍑哄簱閿佸畾.ObjToInt())
+ {
+ return content.Error($"{stockInfo.PalletCode}搴撳瓨鐘舵�佷笉姝ｇ‘");
+ }
+ if (locationInfo.LocationStatus != LocationStatusEnum.Lock.ObjToInt())
+ {
+ return content.Error($"{locationInfo.LocationCode}璐т綅鐘舵�佷笉姝ｇ‘");
+ }
+ //鏍规嵁浠诲姟鎵樼洏鏌ョ洏鐐规槑缁�
+ Dt_TakeStockOrderDetail? takeStockOrderDetail = takeStockOrder.Details.FirstOrDefault(x => x.TakePalletCode == stockInfo.PalletCode);
+ if (takeStockOrderDetail == null)
+ {
+ return content.Error($"{stockInfo.PalletCode}鏈壘鍒板搴旂洏鐐规槑缁�");
+ }
+ if (takeStockOrderDetail.TakeDetalStatus != TakeStockDetailStatusEnum.鐩樼偣鍑哄簱涓�.ObjToInt())
+ {
+ return content.Error($"{stockInfo.PalletCode}鐩樼偣鏄庣粏鐘舵�佷笉姝ｇ‘");
+ }
+ takeStockOrderDetail.TakeDetalStatus = TakeStockDetailStatusEnum.鐩樼偣鍑哄簱瀹屾垚.ObjToInt();
+ stockInfo.StockStatus = StockStatusEmun.鐩樼偣鍑哄簱瀹屾垚.ObjToInt();
+ stockInfo.Details.ForEach(x =>
+ {
+ x.Status = StockStatusEmun.鐩樼偣鍑哄簱瀹屾垚.ObjToInt();
+ });
+ stockInfo.LocationCode = "";
+ task.TaskStatus = TaskStatusEnum.Finish.ObjToInt();
+ int beforeStatus = locationInfo.LocationStatus;
+ locationInfo.LocationStatus = LocationStatusEnum.Free.ObjToInt();
+ _unitOfWorkManage.BeginTran();
+ //璐т綅鍙樺姩璁板綍
+ _basicService.LocationInfoService.UpdateData(locationInfo);
+ _recordService.LocationStatusChangeRecordSetvice.AddLocationStatusChangeRecord(locationInfo, beforeStatus, LocationStatusEnum.Free.ObjToInt(), LocationChangeType.OutboundCompleted.ObjToInt(), takeStockOrder?.OrderNo ?? "", task.TaskNum);
+ _inboundRepository.TakeStockOrderDetailRepository.UpdateData(takeStockOrderDetail);
+ _stockRepository.StockInfoRepository.UpdateData(stockInfo);
+ _stockRepository.StockInfoDetailRepository.UpdateData(stockInfo.Details);
+ BaseDal.DeleteAndMoveIntoHty(task, App.User.UserId == 0 ? OperateType.鑷姩瀹屾垚 : OperateType.浜哄伐瀹屾垚);
+ _unitOfWorkManage.CommitTran();
+ content.OK();
+ }
+ catch (Exception ex)
+ {
+ _unitOfWorkManage.RollbackTran();
+ content.Error(ex.Message);
+ }
+ return content;
+ }
}
+ #endregion
+ #endregion
+
+
+
+
+
+ #region
+ //public WebResponseContent InboundTaskCompleted(int taskNum)
+ //{
+ // try
+ // {
+ // Dt_Task task = BaseDal.QueryFirst(x => x.TaskNum == taskNum);
+ // if (task == null)
+ // {
+ // return WebResponseContent.Instance.Error($"鏈壘鍒拌浠诲姟");
+ // }
+ // if (task.TaskType != TaskTypeEnum.Inbound.ObjToInt())
+ // {
+ // return WebResponseContent.Instance.Error($"浠诲姟绫诲瀷閿欒");
+ // }
+ // Dt_StockInfo dt_StockInfo = _stockRepository.StockInfoRepository.Db.Queryable<Dt_StockInfo>().Where(x => x.PalletCode == task.PalletCode).Includes(x => x.Details).First();
+ // if (dt_StockInfo == null)
+ // {
+ // return WebResponseContent.Instance.Error($"鏈壘鍒版墭鐩樺搴旂殑缁勭洏淇℃伅");
+ // }
+
+ // if (!string.IsNullOrEmpty(dt_StockInfo.LocationCode))
+ // {
+ // return WebResponseContent.Instance.Error($"璇ユ墭鐩樺凡缁戝畾璐т綅");
+ // }
+
+ // if (dt_StockInfo.Details == null || dt_StockInfo.Details.Count == 0)
+ // {
+ // return WebResponseContent.Instance.Error($"鏈壘鍒拌鎵樼洏搴撳瓨鏄庣粏淇℃伅");
+ // }
+ // Dt_LocationInfo dt_LocationInfo = _basicService.LocationInfoService.Repository.QueryFirst(x => x.LocationCode == task.TargetAddress);
+ // if (dt_LocationInfo == null)
+ // {
+ // return WebResponseContent.Instance.Error($"鏈壘鍒扮洰鏍囪揣浣嶄俊鎭�");
+ // }
+
+ // if (dt_LocationInfo.LocationStatus == LocationStatusEnum.InStock.ObjToInt())
+ // {
+ // return WebResponseContent.Instance.Error($"璐т綅鐘舵�佷笉姝ｇ‘");
+ // }
+ // int lastStatus = dt_LocationInfo.LocationStatus;
+ // dt_LocationInfo.LocationStatus = LocationStatusEnum.InStock.ObjToInt();
+ // Dt_Warehouse warehouse = _basicService.WarehouseService.Repository.QueryFirst(x => x.WarehouseId == task.WarehouseId);
+
+ // dt_StockInfo.LocationCode = dt_LocationInfo.LocationCode;
+
+
+ // Dt_InboundOrder? inboundOrder = _inboundService.InbounOrderService.Db.Queryable<Dt_InboundOrder>().Where(x => x.InboundOrderNo == dt_StockInfo.Details.FirstOrDefault().OrderNo).Includes(x => x.Details).First();
+ // Dt_InboundOrderDetail? inboundOrderDetail = null;
+ // //鍒ゆ柇鍗曟嵁绫诲瀷鏄叆搴撹繕鏄皟鎷ㄥ叆搴撱�傘�傘�傚叆搴�
+ // if (inboundOrder.OrderType == 0 && inboundOrder != null && dt_StockInfo.StockStatus == StockStatusEmun.鍏ュ簱纭.ObjToInt())
+ // {
+ // #region //鍒ゆ柇鍏ュ簱鍗曟嵁鏄庣粏鍙湁鏈�鍚庝竴鏉″畬鎴愭椂鍒犻櫎鍏ュ簱鍗�
+ // //鏌ヨ鍘熷畬鎴愮殑鍏ュ簱鏄庣粏鏁伴噺
+ // int overCount = inboundOrder.Details.Where(x => x.OrderDetailStatus == OrderDetailStatusEnum.Over.ObjToInt()).ToList().Count;
+ // //鏄庣粏id鏌ヨ
+ // inboundOrderDetail = inboundOrder.Details.FirstOrDefault(x => x.LinId == dt_StockInfo.Details.FirstOrDefault()?.LinId);
+ // foreach (var item in dt_StockInfo.Details)
+ // {
+ // if (inboundOrderDetail == null)
+ // {
+ // continue;
+ // }
+ // inboundOrderDetail.OverInQuantity += item.StockQuantity;
+ // if (inboundOrderDetail.OverInQuantity == inboundOrderDetail.OrderQuantity)
+ // {
+ // inboundOrderDetail.OrderDetailStatus = OrderDetailStatusEnum.Over.ObjToInt();
+ // overCount += 1;
+ // }
+ // else if (inboundOrderDetail.OrderDetailStatus == OrderDetailStatusEnum.New.ObjToInt())
+ // {
+ // inboundOrderDetail.OrderDetailStatus = InboundStatusEnum.鍏ュ簱涓�.ObjToInt();
+ // }
+ // }
+ // dt_StockInfo.Details.ForEach(x =>
+ // {
+ // x.Status = StockStatusEmun.鍏ュ簱瀹屾垚.ObjToInt();
+ // });
+
+ // _unitOfWorkManage.BeginTran();
+ // task.TaskStatus = InTaskStatusEnum.InFinish.ObjToInt();
+ // BaseDal.DeleteAndMoveIntoHty(task, App.User.UserId > 0 ? OperateType.浜哄伐瀹屾垚 : OperateType.鑷姩瀹屾垚);
+
+ // _basicService.LocationInfoService.Repository.UpdateData(dt_LocationInfo);
+ // _stockRepository.StockInfoRepository.UpdateData(dt_StockInfo);
+ // _stockRepository.StockInfoDetailRepository.UpdateData(dt_StockInfo.Details);
+ // _recordService.LocationStatusChangeRecordSetvice.AddLocationStatusChangeRecord(dt_LocationInfo, lastStatus, StockChangeType.Inbound.ObjToInt(), "", task.TaskNum);
+ // _recordService.StockQuantityChangeRecordService.AddStockChangeRecord(dt_StockInfo, dt_StockInfo.Details, dt_StockInfo.Details.Sum(x => x.StockQuantity), dt_StockInfo.Details.Sum(x => x.StockQuantity), StockChangeType.Inbound, task.TaskNum);
+ // if (inboundOrder != null)
+ // {
+ // _inboundService.InbounOrderService.UpdateData(inboundOrder);
+ // _inboundService.InboundOrderDetailService.UpdateData(inboundOrderDetail);
+ // }
+ // _unitOfWorkManage.CommitTran();
+
+
+
+
+ // if (inboundOrder.Details.Count == 1)
+ // {
+ // var stockInfoDetail = dt_StockInfo.Details.FirstOrDefault();
+
+ // #region//鍏ュ簱淇℃伅杩斿洖涓婁綅WMS銆傘�傜珛搴撳叆搴撴暟閲忓洖浼�
+ // HouseInboundPassBack houseInboundPassBack = new HouseInboundPassBack();
+ // houseInboundPassBack.ApiType = "AsnController";
+ // houseInboundPassBack.Method = "AsrsGroudingAsn";
+ // data data = new data();
+ // data.data1 data1 = new data.data1();
+ // data1.AsnNo = task.OrderNo;
+ // data1.InWarehouse = task.Roadway;
+ // data1.TransactionCode = inboundOrder.TransactionCode;
+ // data1.InoutType = inboundOrder.OrderType;
+ // data1.OrderType = inboundOrder.InoutType;
+ // data.data1.Inbound inbound = new data.data1.Inbound
+ // {
+ // LinId = stockInfoDetail.LinId,
+ // MaterielCode = stockInfoDetail.MaterielCode,
+ // OrderQuantity = stockInfoDetail.StockQuantity,
+ // BatchNo = stockInfoDetail.BatchNo,
+ // FinishQty = stockInfoDetail.StockQuantity,
+ // LocationName = task.TargetAddress
+ // };
+ // data.Value.Add(data1);
+ // data1.DetailList.Add(inbound);
+ // houseInboundPassBack.Parameters.Add(data);
+ // Authentication authentication = new Authentication()
+ // {
+ // ApiType = "AuthenticationController",
+ // Parameters = new List<Parameter>
+ // {
+ // new Parameter { Value = "LKAdmin"},
+ // new Parameter { Value = "LKAdmin"},
+ // },
+ // Method = "Login",
+ // };
+ // var responses1 = HttpHelper.Post<WebResponseContent>(ReceiveWMSTaskAUT, authentication, "鐧诲綍WMS璐﹀彿");
+ // var Ticket = responses1.Context["Ticket"].ToString();
+ // var InvOrgId = responses1.Context["InvOrgId"].ToString();
+ // if (Ticket != null)
+ // {
+ // houseInboundPassBack.Context = new Dictionary<string, string>();
+ // houseInboundPassBack.Context.Add("Ticket", Ticket);
+ // houseInboundPassBack.Context.Add("InvOrgId", InvOrgId);
+ // var responses = HttpHelper.Post<WebResponseContent>(ReceiveWMSTaskin, houseInboundPassBack, "绔嬪簱鍏ュ簱鏁伴噺鍥炰紶WMS");
+ // }
+ // #endregion
+ // }
+ // }
+ // else
+ // {
+ // #region //鍒ゆ柇璋冩嫧鍏ュ簱鍗曟嵁鏄庣粏鍙湁鏈�鍚庝竴鏉″畬鎴愭椂鍒犻櫎鍏ュ簱鍗曞苟涓�娆¤繑鍥炲叆搴撴槑缁嗕俊鎭�
+ // if (inboundOrder.Details.Count == 1)
+ // {
+ // List<Dt_StockInfo> StockInfo = _stockService.StockInfoService.Repository.QueryData(x => x.BatchNo == inboundOrderDetail.BatchNo);
+ // Dt_InboundOrder_Hty inboundOrder_Hty = new Dt_InboundOrder_Hty
+ // {
+ // OrderStatus = inboundOrder.OrderStatus,
+ // CreateType = inboundOrder.CreateType,
+ // //SourceId = oldOutboundOrder.SourceId,
+ // UpperOrderNo = inboundOrder.UpperOrderNo,
+ // OrderNo = inboundOrder.OrderNo,
+ // //OutWareHouse = inboundOrder.OutWareHouse,
+ // TransactionCode = inboundOrder.TransactionCode,
+ // InoutType = inboundOrder.InoutType,
+ // OrderType = inboundOrder.OrderType,
+ // Creater = "WMS",
+ // CreateDate = DateTime.Now,
+ // };
+ // _inboundOrder_HtyService.AddData(inboundOrder_Hty);
+ // _inboundService.InbounOrderService.DeleteData(inboundOrder);
+ // Dt_InboundOrderDetail_Hty dt_InboundOrderDetail_HtyS = new Dt_InboundOrderDetail_Hty
+ // {
+ // OrderId = inboundOrderDetail.OrderId,
+ // MaterielCode = inboundOrderDetail.MaterielCode,
+ // MaterielName = inboundOrderDetail.MaterielName,
+ // BatchNo = inboundOrderDetail.BatchNo,
+ // OrderQuantity = inboundOrderDetail.OrderQuantity,
+ // ReceiptQuantity = inboundOrderDetail.ReceiptQuantity,
+ // OverInQuantity = inboundOrderDetail.OverInQuantity,
+ // OrderDetailStatus = inboundOrderDetail.OrderDetailStatus,
+ // Creater = "WMS",
+ // CreateDate = DateTime.Now,
+ // };
+ // _inboundOrderDetail_HtyService.AddData(dt_InboundOrderDetail_HtyS);
+ // _inboundService.InboundOrderDetailService.DeleteData(inboundOrderDetail);
+ // #endregion
+ // #region//璋冩嫧浠诲姟鏁伴噺鍥炰紶WMS
+ // InventoryAllocate inventoryAllocate = new InventoryAllocate();
+ // inventoryAllocate.ApiType = "InventoryAllocateController";
+ // inventoryAllocate.Method = "AsrsFinishedStockCount";
+
+ // Allocate allocate = new Allocate();
+
+ // Allocate.data1 data1 = new Allocate.data1();
+ // data1.No = task.OrderNo;
+ // data1.InWarehouse = task.Roadway;
+ // data1.TransactionCode = inboundOrder.TransactionCode;
+ // data1.InoutType = inboundOrder.OrderType;
+ // data1.OrderType = inboundOrder.InoutType;
+ // foreach (var item in StockInfo)
+ // {
+ // Dt_StockInfoDetail detail = _stockService.StockInfoDetailService.Repository.QueryFirst(x => x.StockId == item.Id);
+ // Allocate.data1.Inventory inbound = new Allocate.data1.Inventory();
+ // inbound.LinId = detail.LinId;
+ // inbound.LPN_No = item.PalletCode;
+ // inbound.MaterielCode = detail.MaterielCode;
+ // inbound.OrderQuantity = detail.StockQuantity;
+ // inbound.BatchNo = detail.BatchNo;
+ // inbound.FinishQty = detail.StockQuantity;
+ // inbound.LocationName = item.LocationCode;
+ // data1.DetailList.Add(inbound);
+ // }
+ // allocate.Value.Add(data1);
+ // inventoryAllocate.Parameters.Add(allocate);
+ // Authentication authentication = new Authentication()
+ // {
+ // ApiType = "AuthenticationController",
+ // Parameters = new List<Parameter>
+ // {
+ // new Parameter { Value = "LKAdmin"},
+ // new Parameter { Value = "LKAdmin"},
+ // },
+ // Method = "Login",
+ // };
+ // var responses1 = HttpHelper.Post<WebResponseContent>(ReceiveWMSTaskAUT, authentication, "鐧诲綍WMS璐﹀彿");
+ // var Ticket = responses1.Context["Ticket"].ToString();
+ // var InvOrgId = responses1.Context["InvOrgId"].ToString();
+ // if (Ticket != null)
+ // {
+ // inventoryAllocate.Context = new Dictionary<string, string>();
+ // inventoryAllocate.Context.Add("Ticket", Ticket);
+ // inventoryAllocate.Context.Add("InvOrgId", InvOrgId);
+ // var responses = HttpHelper.Post<WebResponseContent>(ReceiveWMSTaskAllocatein, inventoryAllocate, "璋冩嫧鍏ュ簱鏁伴噺鍥炰紶WMS");
+ // }
+ // }
+ // #endregion
+ // Dt_InboundOrderDetail_Hty dt_InboundOrderDetail_Hty = new Dt_InboundOrderDetail_Hty
+ // {
+ // OrderId = inboundOrderDetail.OrderId,
+ // MaterielCode = inboundOrderDetail.MaterielCode,
+ // MaterielName = inboundOrderDetail.MaterielName,
+ // BatchNo = inboundOrderDetail.BatchNo,
+ // OrderQuantity = inboundOrderDetail.OrderQuantity,
+ // ReceiptQuantity = inboundOrderDetail.ReceiptQuantity,
+ // OverInQuantity = inboundOrderDetail.OverInQuantity,
+ // OrderDetailStatus = inboundOrderDetail.OrderDetailStatus,
+ // Creater = "WMS",
+ // CreateDate = DateTime.Now,
+ // };
+ // _inboundOrderDetail_HtyService.AddData(dt_InboundOrderDetail_Hty);
+ // _inboundService.InboundOrderDetailService.DeleteData(inboundOrderDetail);
+ // }
+ // return WebResponseContent.Instance.OK();
+ // }
+ // catch (Exception ex)
+ // {
+ // _unitOfWorkManage.RollbackTran();
+ // return WebResponseContent.Instance.Error(ex.Message);
+ // }
+ //}
+ #endregion
+ #region
+ //public WebResponseContent OutboundTaskCompleted(int taskNum)
+ //{
+ // try
+ // {
+ // Dt_Task task = BaseDal.QueryFirst(x => x.TaskNum == taskNum);
+ // if (task == null)
+ // {
+ // return WebResponseContent.Instance.Error($"鏈壘鍒颁换鍔′俊鎭�");
+ // }
+
+ // Dt_StockInfo stockInfo = _stockService.StockInfoService.Repository.GetStockInfo(task.PalletCode);
+
+ // Dt_LocationInfo locationInfo = _basicService.LocationInfoService.Repository.QueryFirst(x => x.LocationCode == task.SourceAddress);
+ // if (stockInfo == null)
+ // {
+ // return WebResponseContent.Instance.Error($"鏈壘鍒板簱瀛樹俊鎭�");
+ // }
+ // if (locationInfo == null)
+ // {
+ // return WebResponseContent.Instance.Error($"鏈壘鍒拌揣浣嶄俊鎭�");
+ // }
+
+ // List<Dt_OutStockLockInfo> outStockLockInfos = _outboundService.OutboundStockLockInfoService.Repository.QueryData(x => x.TaskNum == taskNum);
+ // if (outStockLockInfos == null || outStockLockInfos.Count == 0)
+ // {
+ // return WebResponseContent.Instance.Error($"鏈壘鍒板嚭搴撹鎯呬俊鎭�");
+ // }
+
+ // List<Dt_OutboundOrderDetail> outboundOrderDetails = new List<Dt_OutboundOrderDetail>();
+ // for (int i = 0; i < outStockLockInfos.Count; i++)
+ // {
+ // Dt_OutboundOrderDetail outboundOrderDetail = _outboundService.OutboundOrderDetailService.Repository.QueryFirst(x => x.Id == outStockLockInfos[i].OrderDetailId);
+ // if (outboundOrderDetail != null)
+ // {
+ // outboundOrderDetail.OverOutQuantity = outboundOrderDetail.LockQuantity;
+ // if (outboundOrderDetail.LockQuantity == outboundOrderDetail.OrderQuantity)
+ // {
+ // outboundOrderDetail.OrderDetailStatus = OrderDetailStatusEnum.Over.ObjToInt();
+ // }
+ // outboundOrderDetails.Add(outboundOrderDetail);
+ // }
+ // }
+
+ // _unitOfWorkManage.BeginTran();
+ // _outboundService.OutboundOrderDetailService.Repository.UpdateData(outboundOrderDetails);
+
+ // stockInfo.LocationCode = locationInfo.LocationCode;
+ // stockInfo.StockStatus = StockStatusEmun.鍑哄簱瀹屾垚.ObjToInt();
+ // _stockService.StockInfoService.Repository.UpdateData(stockInfo);
+
+ // int beforeStatus = locationInfo.LocationStatus;
+ // locationInfo.LocationStatus = LocationStatusEnum.Free.ObjToInt();
+ // _basicService.LocationInfoService.Repository.UpdateData(locationInfo);
+ // BaseDal.DeleteAndMoveIntoHty(task, App.User.UserId == 0 ? OperateType.鑷姩瀹屾垚 : OperateType.浜哄伐瀹屾垚);
+
+ // _recordService.LocationStatusChangeRecordSetvice.AddLocationStatusChangeRecord(locationInfo, beforeStatus, StockChangeType.Outbound.ObjToInt(), stockInfo.Details.FirstOrDefault()?.OrderNo ?? "", task.TaskNum);
+ // _unitOfWorkManage.CommitTran();
+ // Dt_StockInfoDetail stockInfoDetail = _stockRepository.StockInfoDetailRepository.Db.Queryable<Dt_StockInfoDetail>().Where(x => x.StockId == stockInfo.Id).First();
+ // Dt_OutboundOrderDetail outDetail = _outboundService.OutboundOrderDetailService.Db.Queryable<Dt_OutboundOrderDetail>().Where(x => x.LPNNo == stockInfo.PalletCode).First();
+ // Dt_OutboundOrder outboundOrder = _outboundService.OutboundOrderService.Db.Queryable<Dt_OutboundOrder>().Where(x => x.Id == outDetail.OrderId).Includes(x => x.Details).First();
+ // //鍒ゆ柇鍗曟嵁绫诲瀷鏄嚭搴撹繕鏄皟鎷ㄥ嚭搴撱�傘�傘�傚嚭搴�
+ // if (outboundOrder.OrderType == 1)
+ // {
+ // #region //鍒ゆ柇鍑哄簱鍗曟嵁鏄庣粏鍙湁鏈�鍚庝竴鏉″畬鎴愭椂鍒犻櫎鍑哄簱鍗�
+ // if (outboundOrder.Details.Count == 1)
+ // {
+ // Dt_OutboundOrder_Hty inboundOrder_Hty = new Dt_OutboundOrder_Hty
+ // {
+ // OrderStatus = outboundOrder.OrderStatus,
+ // CreateType = outboundOrder.CreateType,
+ // //SourceId = oldOutboundOrder.SourceId,
+ // UpperOrderNo = outboundOrder.UpperOrderNo,
+ // OrderNo = outboundOrder.OrderNo,
+ // OutWareHouse = outboundOrder.OutWareHouse,
+ // TransactionCode = outboundOrder.TransactionCode,
+ // InoutType = outboundOrder.InoutType,
+ // OrderType = outboundOrder.OrderType,
+ // Creater = "WMS",
+ // CreateDate = DateTime.Now,
+ // };
+ // _outboundOrder_HtyService.AddData(inboundOrder_Hty);
+ // _outboundService.OutboundOrderService.DeleteData(outboundOrder);
+ // }
+ // Dt_OutboundOrderDetail_Hty dt_InboundOrderDetail_Hty = new Dt_OutboundOrderDetail_Hty
+ // {
+ // OrderId = outDetail.OrderId,
+ // MaterielCode = outDetail.MaterielCode,
+ // MaterielName = outDetail.MaterielName,
+ // BatchNo = outDetail.BatchNo,
+ // OrderQuantity = outDetail.OrderQuantity,
+ // //ReceiptQuantity = outDetail.ReceiptQuantity,
+ // //OverInQuantity = outDetail.OverInQuantity,
+ // OrderDetailStatus = outDetail.OrderDetailStatus,
+ // Creater = "WMS",
+ // CreateDate = DateTime.Now,
+ // };
+ // _outboundOrderDetail_HtyService.AddData(dt_InboundOrderDetail_Hty);
+ // _outboundService.OutboundOrderService.DeleteData(outDetail);
+ // #endregion
+ // #region//鍑哄簱淇℃伅杩斿洖涓婁綅WMS銆傘�傘�傜珛搴撳嚭搴撴暟閲忓洖浼�
+ // HouseoutboundPassBack houseInboundPassBack = new HouseoutboundPassBack();
+ // houseInboundPassBack.ApiType = "ShippingOrderController";
+ // houseInboundPassBack.Method = "AsrsOutboundSO";
+ // datas datas = new datas();
+ // datas.data1 data1 = new datas.data1();
+ // data1.No = outboundOrder.OrderNo;
+ // data1.OutWareHouse = task.Roadway;
+ // data1.TransactionCode = outboundOrder.TransactionCode;
+ // data1.InoutType = outboundOrder.OrderType;
+ // data1.OrderType = outboundOrder.InoutType;
+
+ // datas.data1.Inbound inbound = new datas.data1.Inbound();
+ // inbound.LinId = outDetail.LinId;
+ // inbound.LPN_No = task.PalletCode;
+ // inbound.MaterielCode = stockInfoDetail.MaterielCode;
+ // inbound.OrderQuantity = stockInfoDetail.OutboundQuantity;
+ // inbound.BatchNo = stockInfoDetail.BatchNo;
+ // inbound.FinishQty = stockInfoDetail.OutboundQuantity;
+ // inbound.LocationName = task.SourceAddress;
+ // datas.Value.Add(data1);
+ // data1.DetailList.Add(inbound);
+ // houseInboundPassBack.Parameters.Add(datas);
+ // Authentication authentication = new Authentication()
+ // {
+ // ApiType = "AuthenticationController",
+ // Parameters = new List<Parameter>
+ // {
+ // new Parameter { Value = "LKAdmin"},
+ // new Parameter { Value = "LKAdmin"},
+ // },
+ // Method = "Login",
+ // };
+ // var responses1 = HttpHelper.Post<WebResponseContent>(ReceiveWMSTaskAUT, authentication, "鐧诲綍WMS璐﹀彿");
+ // var Ticket = responses1.Context["Ticket"].ToString();
+ // var InvOrgId = responses1.Context["InvOrgId"].ToString();
+ // if (Ticket != null)
+ // {
+ // houseInboundPassBack.Context = new Dictionary<string, string>();
+ // houseInboundPassBack.Context.Add("Ticket", Ticket);
+ // houseInboundPassBack.Context.Add("InvOrgId", InvOrgId);
+ // var responses = HttpHelper.Post<WebResponseContent>(ReceiveWMSTaskout, houseInboundPassBack, "绔嬪簱鍑哄簱鏁伴噺鍥炰紶WMS");
+ // }
+ // #endregion
+ // //鍒犻櫎搴撳瓨淇℃伅
+ // _stockService.StockInfoService.Repository.DeleteAndMoveIntoHty(stockInfo, App.User.UserId == 0 ? OperateType.鑷姩瀹屾垚 : OperateType.浜哄伐瀹屾垚);
+ // _stockService.StockInfoDetailService.Repository.DeleteAndMoveIntoHty(stockInfo.Details, App.User.UserId == 0 ? OperateType.鑷姩瀹屾垚 : OperateType.浜哄伐瀹屾垚);
+ // }
+ // else if (outboundOrder.OrderType == 240)
+ // {
+ // //鐩樼偣鍑哄簱浠诲姟瀹屾垚銆併�併�併�併�併�併�併�併�佷笉鑳藉垹闄ゅ簱瀛樼瓑閫昏緫
+ // }
+ // else
+ // {
+
+ // List<Dt_StockInfo> StockInfo = _stockService.StockInfoService.Repository.QueryData(x => x.BatchNo == outDetail.BatchNo);
+ // if (outboundOrder.Details.Count == 1)
+ // {
+ // Dt_OutboundOrder_Hty inboundOrder_Hty = new Dt_OutboundOrder_Hty
+ // {
+ // OrderStatus = outboundOrder.OrderStatus,
+ // CreateType = outboundOrder.CreateType,
+ // //SourceId = oldOutboundOrder.SourceId,
+ // UpperOrderNo = outboundOrder.UpperOrderNo,
+ // OrderNo = outboundOrder.OrderNo,
+ // OutWareHouse = outboundOrder.OutWareHouse,
+ // TransactionCode = outboundOrder.TransactionCode,
+ // InoutType = outboundOrder.InoutType,
+ // OrderType = outboundOrder.OrderType,
+ // Creater = "WMS",
+ // CreateDate = DateTime.Now,
+ // };
+ // _outboundOrder_HtyService.AddData(inboundOrder_Hty);
+ // _outboundService.OutboundOrderService.DeleteData(outboundOrder);
+ // }
+ // Dt_OutboundOrderDetail_Hty dt_InboundOrderDetail_Hty = new Dt_OutboundOrderDetail_Hty
+ // {
+ // OrderId = outDetail.OrderId,
+ // MaterielCode = outDetail.MaterielCode,
+ // MaterielName = outDetail.MaterielName,
+ // BatchNo = outDetail.BatchNo,
+ // OrderQuantity = outDetail.OrderQuantity,
+ // //ReceiptQuantity = outDetail.ReceiptQuantity,
+ // //OverInQuantity = outDetail.OverInQuantity,
+ // OrderDetailStatus = outDetail.OrderDetailStatus,
+ // Creater = "WMS",
+ // CreateDate = DateTime.Now,
+ // };
+ // _outboundOrderDetail_HtyService.AddData(dt_InboundOrderDetail_Hty);
+ // _outboundService.OutboundOrderService.DeleteData(outDetail);
+
+ // InventoryAllocate inventoryAllocate = new InventoryAllocate();
+ // inventoryAllocate.ApiType = "InventoryAllocateController";
+ // inventoryAllocate.Method = "AsrsFinishedStockCount";
+
+ // Allocate allocate = new Allocate();
+
+ // Allocate.data1 data1 = new Allocate.data1();
+ // data1.No = outboundOrder.OrderNo;
+ // data1.InWarehouse = task.Roadway;
+ // data1.TransactionCode = outboundOrder.TransactionCode;
+ // data1.InoutType = outboundOrder.OrderType;
+ // data1.OrderType = outboundOrder.InoutType;
+
+ // foreach (var item in StockInfo)
+ // {
+ // Dt_StockInfoDetail detail = _stockService.StockInfoDetailService.Repository.QueryFirst(x => x.StockId == item.Id);
+ // Allocate.data1.Inventory inbound = new Allocate.data1.Inventory();
+ // inbound.LinId = outDetail.LinId;
+ // inbound.LPN_No = item.PalletCode;
+ // inbound.MaterielCode = detail.MaterielCode;
+ // inbound.OrderQuantity = detail.OutboundQuantity;
+ // inbound.BatchNo = detail.BatchNo;
+ // inbound.FinishQty = detail.OutboundQuantity;
+ // inbound.LocationName = task.SourceAddress;
+ // data1.DetailList.Add(inbound);
+ // }
+
+
+ // allocate.Value.Add(data1);
+ // inventoryAllocate.Parameters.Add(allocate);
+ // Authentication authentication = new Authentication()
+ // {
+ // ApiType = "AuthenticationController",
+ // Parameters = new List<Parameter>
+ // {
+ // new Parameter { Value = "LKAdmin"},
+ // new Parameter { Value = "LKAdmin"},
+ // },
+ // Method = "Login",
+ // };
+ // var responses1 = HttpHelper.Post<WebResponseContent>(ReceiveWMSTaskAUT, authentication, "鐧诲綍WMS璐﹀彿");
+ // var Ticket = responses1.Context["Ticket"].ToString();
+ // var InvOrgId = responses1.Context["InvOrgId"].ToString();
+ // if (Ticket != null)
+ // {
+ // inventoryAllocate.Context = new Dictionary<string, string>();
+ // inventoryAllocate.Context.Add("Ticket", Ticket);
+ // inventoryAllocate.Context.Add("InvOrgId", InvOrgId);
+ // var responses = HttpHelper.Post<WebResponseContent>(ReceiveWMSTaskAllocatein, inventoryAllocate, "璋冩嫧鍑哄簱鏁伴噺鍥炰紶WMS");
+ // }
+ // _stockService.StockInfoService.Repository.DeleteAndMoveIntoHty(stockInfo, App.User.UserId == 0 ? OperateType.鑷姩瀹屾垚 : OperateType.浜哄伐瀹屾垚);
+ // _stockService.StockInfoDetailService.Repository.DeleteAndMoveIntoHty(stockInfo.Details, App.User.UserId == 0 ? OperateType.鑷姩瀹屾垚 : OperateType.浜哄伐瀹屾垚);
+ // }
+ // return WebResponseContent.Instance.OK();
+ // }
+ // catch (Exception ex)
+ // {
+ // _unitOfWorkManage.RollbackTran();
+ // return WebResponseContent.Instance.Error(ex.Message);
+ // }
+ //}
+ #endregion
}
--
Gitblit v1.9.3