优化出入库逻辑

dengjunjie

2025-05-20 be484c84a25d1f6c769e7b5e958048d745942e55

 ÏîÄ¿´úÂë/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs

@@ -17,6 +17,7 @@

using AutoMapper;
using MailKit.Search;
using Newtonsoft.Json;
using OfficeOpenXml.FormulaParsing.Excel.Functions.Text;
using SqlSugar;
using System;
@@ -38,6 +39,7 @@
using WIDESEA_Core.Helper;
using WIDESEA_DTO.Inbound;
using WIDESEA_DTO.Stock;
using WIDESEA_DTO.WCSInfo;
using WIDESEA_IBasicRepository;
using WIDESEA_IBasicService;
using WIDESEA_IInboundService;
@@ -249,6 +251,72 @@

            return WebResponseContent.Instance.OK();
        }
        public WebResponseContent ModifyBarcode(string barcode, string newBarcode)
        {
            WebResponseContent webResponseContent = new WebResponseContent();
            try
            {
                Dt_Task? dt_Task = BaseDal.QueryFirst(x => x.PalletCode == barcode);
                if (dt_Task == null) throw new Exception($"未找到托盘号为【{barcode}】的任务！");
                if (TaskEnumHelper.GetTaskTypeGroup(dt_Task.TaskType) != TaskTypeGroup.InboundGroup)
                    throw new Exception($"只可修改入库任务,如需修改其他任务类型请联系管理员！");
                var stock = _stockService.StockInfoService.Repository.QueryFirst(x => x.PalletCode == newBarcode);
                if (stock != null) throw new Exception($"托盘号【{newBarcode}】已存在库存信息！");
                stock = _stockService.StockInfoService.Repository.QueryFirst(x => x.PalletCode == barcode);
                if (stock == null) throw new Exception($"托盘号【{barcode}】未找到库存信息！");
                stock.PalletCode = newBarcode;
                dt_Task.PalletCode = newBarcode;
                Db.Ado.BeginTran();
                WMSTaskDTO wMSTaskDTOs = _mapper.Map<WMSTaskDTO>(dt_Task);
                var ResultData = HttpHelper.PostAsync(WCSInterfaceAddress.ModifyBarcode, wMSTaskDTOs.ToJson(), headers: new Dictionary<string, string>());
                if (ResultData.Result == null) throw new Exception($"WCS响应超时");
                WebResponseContent content = JsonConvert.DeserializeObject<WebResponseContent>(ResultData.Result);
                if (content == null) throw new Exception($"WCS无响应");
                if (!content.Status) throw new Exception(content.Message);
                BaseDal.UpdateData(dt_Task);
                _stockService.StockInfoService.Repository.UpdateData(stock);
                Db.Ado.CommitTran();
                webResponseContent.OK();
            }
            catch (Exception ex)
            {
                Db.Ado.RollbackTran();
                webResponseContent.Error(ex.Message);
            }
            return webResponseContent;
        }
        public WebResponseContent CancelTask(WMSTaskDTO WMStask)
        {
            WebResponseContent webResponseContent = new WebResponseContent();
            try
            {
                Dt_Task task = BaseDal.QueryFirst(x => x.TaskNum == WMStask.TaskNum && x.TaskType == WMStask.TaskType);
                if (task == null) return WebResponseContent.Instance.Error("未找到任务信息");
                Dt_StockInfo? _StockInfo = _stockService.StockInfoService.GetStockByPalletCode(task.PalletCode);
                if (_StockInfo != null)
                {
                    Dt_StockInfoDetail? detail = _StockInfo.Details.FirstOrDefault();
                    if (detail != null)
                    {
                        Dt_InboundOrder dt_InboundOrder = _inboundService.InbounOrderService.GetInboundOrder(detail.OrderNo);
                        Dt_InboundOrderDetail? inboundOrderDetail = dt_InboundOrder.Details.FirstOrDefault(x => x.BatchNo == detail.BatchNo);
                        if (inboundOrderDetail != null)
                        {
                            inboundOrderDetail.ReceiptQuantity--;
                            _inboundService.InboundOrderDetailService.Repository.UpdateData(inboundOrderDetail);
                        }
                        _stockService.StockInfoDetailService.Repository.DeleteAndMoveIntoHty(_StockInfo.Details, OperateType.AGV删除);
                    }
                    _stockService.StockInfoService.Repository.DeleteAndMoveIntoHty(_StockInfo, OperateType.AGV删除);
                }
                BaseDal.DeleteAndMoveIntoHty(task, /*App.User.UserId == 0 ? OperateType.自动完成 :*/ OperateType.AGV删除);
            }
            catch (Exception ex)
            {
                webResponseContent.Error(ex.Message);
            }
            return webResponseContent;
        }
        /// <summary>
        /// åŒæ­¥ä»»åŠ¡çŠ¶æ€
        /// </summary>
@@ -333,6 +401,8 @@
                if (Sourcelocation != null)
                {
                    /*if (task.TaskType == TaskOutboundTypeEnum.Outbound.ObjToInt())*/
                    if (BaseDal.QueryFirst(x => x.SourceAddress == task.SourceAddress && x.TaskState < TaskOutStatusEnum.SC_OutFinish.ObjToInt()) == null)
                        Sourcelocation.LocationStatus = LocationStatusEnum.InStock.ObjToInt();
                    Sourcelocation.CurrentQty--;
                    if (Sourcelocation.CurrentQty <= 0)
                    {