增加质检出入库逻辑

dengjunjie

2025-07-09 7ca9651f81d7b84f054194d3d46fdbd1d9c8b922

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

@@ -1,13 +1,18 @@
using System;
using MailKit.Search;
using Newtonsoft.Json;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Reflection.Metadata;
using System.Text;
using System.Threading.Tasks;
using WIDESEA_Common;
using WIDESEA_Core;
using WIDESEA_Core.Enums;
using WIDESEA_Core.Helper;
using WIDESEA_DTO.WCSInfo;
using WIDESEA_Model.Models;
using WIDESEAWCS_DTO.WCSInfo;

namespace WIDESEA_TaskInfoService
{
@@ -37,7 +42,7 @@
                TaskState = AGVTaskStatusEnum.AGV_New.ObjToInt(),
                TaskType = TaskTypeEnum.AGVCarry.ObjToInt(),
            };
            cachePoint.PointStatus = LocationStatusEnum.Lock.ObjToInt();
            cachePoint.PointStatus = LocationStatusEnum.OutLock.ObjToInt();

            _basicService.CachePointService.Repository.UpdateData(cachePoint);
            Repository.AddData(task);
@@ -68,7 +73,7 @@
                TaskState = AGVTaskStatusEnum.AGV_New.ObjToInt(),
                TaskType = TaskTypeEnum.AGVCarry.ObjToInt(),
            };
            cachePoint.PointStatus = LocationStatusEnum.Lock.ObjToInt();
            cachePoint.PointStatus = LocationStatusEnum.OutLock.ObjToInt();

            _basicService.CachePointService.Repository.UpdateData(cachePoint);
            Repository.AddData(task);
@@ -92,19 +97,112 @@
                OrderNo = "",
                PalletCode = startPoint + "-AGV",
                Roadway = "",
                SourceAddress = startPoint, 
                SourceAddress = startPoint,
                TargetAddress = cachePoint.PointCode,
                //SourceKey = 0,
                TaskNum = BaseDal.GetTaskNum(nameof(SequenceEnum.SeqTaskNum)),
                TaskState = AGVTaskStatusEnum.AGV_New.ObjToInt(),
                TaskType = TaskTypeEnum.AGVCarry.ObjToInt(),
            };
            cachePoint.PointStatus = LocationStatusEnum.Lock.ObjToInt();
            cachePoint.PointStatus = LocationStatusEnum.OutLock.ObjToInt();

            _basicService.CachePointService.Repository.UpdateData(cachePoint);
            Repository.AddData(task);
            return WebResponseContent.Instance.OK();
        }
        /// <summary>
        /// äººå·¥ç»„盘入库
        /// </summary>
        /// <param name="saveModel"></param>
        /// <returns></returns>
        public WebResponseContent InMateriel(SaveModel saveModel)
        {
            WebResponseContent responseContent = new WebResponseContent();
            try
            {
                var palletCode = saveModel.MainData["palletCode"].ToString();
                if (string.IsNullOrEmpty(palletCode)) throw new Exception("托盘号不可为空");
                //var orderNo = saveModel.MainData["orderNo"].ToString();
                //if (string.IsNullOrEmpty(orderNo)) throw new Exception("批号不可为空");
                var qty = saveModel.MainData["qty"].ToString();
                if (string.IsNullOrEmpty(qty)) throw new Exception("袋数不可为空");
                var batchNo = saveModel.MainData["batchNo"].ToString();
                if (string.IsNullOrEmpty(batchNo)) throw new Exception("柜号不可为空");

                #region æŸ¥è¯¢åº“存、入库单
                Dt_InventoryInfo inventoryInfo = _inventoryInfoRepository.QueryFirst(x => x.PalletCode == palletCode);
                if (inventoryInfo != null) throw new Exception($"托盘【{palletCode}】已存在库存信息");
                Dt_InboundOrderDetail? inboundOrderDetail = _inboundService.InboundOrderDetailService.Repository.QueryFirst(x => x.BatchNo == batchNo);
                if (inboundOrderDetail == null) throw new Exception($"未找到批号【{batchNo}】的入库单");
                if (inboundOrderDetail.OrderQuantity - inboundOrderDetail.ReceiptQuantity < qty.ObjToInt()) throw new Exception($"批号【{batchNo}】可组盘数量不足");
                Dt_InboundOrder? inboundOrder = _inboundService.InbounOrderService.Repository.QueryFirst(x => x.Id == inboundOrderDetail.OrderId);
                if (inboundOrder == null) throw new Exception($"未找到批号为【{batchNo}】的入库单");
                Dt_Inventory_Batch inventory_Batch = _inventoryBatchRepository.QueryFirst(x => x.BatchNo == batchNo);
                if (inventory_Batch == null) throw new Exception($"未找到批号为【{batchNo}】的批次信息");
                #endregion

                #region åˆ›å»ºä»»åŠ¡
                Dt_Task dt_Task = new Dt_Task()
                {
                    CurrentAddress = "1001",
                    NextAddress = "1002",
                    SourceAddress = "RGRK",
                    TargetAddress = "SC01",
                    Creater = "System",
                    PalletCode = palletCode,
                    Roadway = "SC01",
                    OrderNo = batchNo,
                    TaskNum = BaseDal.GetTaskNum(nameof(SequenceEnum.SeqTaskNum)),
                    TaskState = InTaskStatusEnum.AGV_InFinish.ObjToInt(),
                    TaskType = inboundOrder.OrderType == InOrderTypeEnum.Quality.ObjToInt() ? TaskTypeEnum.InQuality.ObjToInt() : TaskTypeEnum.Inbound.ObjToInt(),
                    CreateDate = DateTime.Now,
                    Dispatchertime = DateTime.Now,
                };
                #endregion

                #region æ·»åŠ åº“存信息、处理入库单
                inventoryInfo = new Dt_InventoryInfo()
                {
                    BatchNo = inventory_Batch.BatchNo,
                    MaterielCode = inventory_Batch.MaterielCode,
                    MaterielName = inventory_Batch.MaterielName,
                    PalletCode = palletCode,
                    ProductionDate = inventory_Batch.ProductionDate,
                    StockStatus = StockStatusEmun.组盘暂存.ObjToInt(),
                    ProductStatus = dt_Task.TaskType == TaskTypeEnum.InQuality.ObjToInt() ? ProductStatusEmun.待检2.ObjToInt() : ProductStatusEmun.待检1.ObjToInt(),
                    ShelfLife = inventory_Batch.ShelfLife,
                    ValidityPeriod = inventory_Batch.ValidityPeriod,
                    StockQuantity = qty.ObjToInt(),
                    BoxQuantity = (qty.ObjToInt() % 8 > 0) ? (qty.ObjToInt() / 8) + 1 : qty.ObjToInt() / 8,
                    Creater = "System"
                };
                inboundOrder.OrderStatus = InboundStatusEnum.入库中.ObjToInt();
                inboundOrderDetail.ReceiptQuantity += inventoryInfo.StockQuantity;
                inboundOrderDetail.OrderDetailStatus = OrderDetailStatusEnum.GroupAndInbound.ObjToInt();
                inventory_Batch.ProductStatus = inventoryInfo.ProductStatus;
                #endregion

                Db.Ado.BeginTran();
                _inboundService.InbounOrderService.UpdateData(inboundOrder);
                _inboundService.InboundOrderDetailService.UpdateData(inboundOrderDetail);
                _inventoryInfoRepository.AddData(inventoryInfo);
                _inventoryBatchRepository.UpdateData(inventory_Batch);
                AddData(dt_Task);
                List<WMSTaskDTO> wMSTaskDTOs = _mapper.Map<List<WMSTaskDTO>>(new List<Dt_Task> { dt_Task });
                var ResultData = HttpHelper.PostAsync(WCSInterfaceAddress.ReceiveTask, wMSTaskDTOs.ToJson(), headers: new Dictionary<string, string>());
                if (ResultData.Result == null) throw new Exception($"向WCS下发入库任务超时");
                responseContent = JsonConvert.DeserializeObject<WebResponseContent>(ResultData.Result);
                if (responseContent == null) throw new Exception($"下发入库任务WCS无响应");
                if (!responseContent.Status) throw new Exception(responseContent.Message);
                Db.Ado.CommitTran();
            }
            catch (Exception ex)
            {
                Db.Ado.RollbackTran();
                responseContent.Error(ex.Message);
            }
            return responseContent;
        }

        private Dt_CachePoint GetCachePointByStartPoint(string startPoint)
        {