增加质检出入库逻辑

dengjunjie

2025-07-09 7ca9651f81d7b84f054194d3d46fdbd1d9c8b922

 ÏîÄ¿´úÂë/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/Service/InboundOrderService.cs

@@ -1,4 +1,5 @@
using AutoMapper;
using Newtonsoft.Json;
using SqlSugar;
using System;
using System.Collections.Generic;
@@ -14,12 +15,14 @@
using WIDESEA_Core.Utilities;
using WIDESEA_DTO;
using WIDESEA_DTO.Inbound;
using WIDESEA_DTO.WCSInfo;
using WIDESEA_IBasicService;
using WIDESEA_IInboundRepository;
using WIDESEA_IInboundService;
using WIDESEA_IStockService;
using WIDESEA_ITaskInfoRepository;
using WIDESEA_Model.Models;
using WIDESEAWCS_DTO.WCSInfo;

namespace WIDESEA_InboundService
{
@@ -35,6 +38,64 @@
        {
            return BaseDal.Db.Queryable<Dt_InboundOrder>().Includes(x => x.Details).First(x => x.OrderNo == inboundOrderNo);
        }
        public bool UpdateDataWithDetail(Dt_InboundOrder inboundOrder)
        {
            return Db.UpdateNav(inboundOrder).Include(x => x.Details).ExecuteCommand();
        }
        /// <summary>
        /// ç©ºæ‰˜ç»„盘入库
        /// </summary>
        /// <param name="materielGroupDTO"></param>
        /// <returns></returns>
        public WebResponseContent PdaAddEmptyStockInfo(string barcode, string station)
        {
            try
            {
                #region æ·»åŠ ä¸€ä¸ªç©ºæ‰˜ç»„盘信息及空托任务并下发给WCS
                Dt_StockInfo stockInfo = _stockService.StockInfoService.Repository.GetStockInfo(barcode);
                if (stockInfo != null) throw new Exception($"托盘号【{stockInfo.PalletCode}】已存在组盘信息");
                Dt_Task task = _taskRepository.QueryFirst(x => x.PalletCode == barcode && x.TaskType == TaskTypeEnum.PalletInbound.ObjToInt());
                if (task == null)
                {
                    task = new Dt_Task()
                    {
                        CurrentAddress = station,
                        NextAddress = "1001",
                        SourceAddress = station,
                        TargetAddress = "SC01",
                        Creater = "System",
                        PalletCode = barcode,
                        Roadway = "SC01",
                        OrderNo = DateTime.Now.ToString("yyMMdd"),
                        TaskNum = _taskRepository.GetTaskNum(nameof(SequenceEnum.SeqTaskNum)),
                        TaskState = InTaskStatusEnum.InNew.ObjToInt(),
                        TaskType = TaskTypeEnum.PalletInbound.ObjToInt(),
                        CreateDate = DateTime.Now,
                        Dispatchertime = DateTime.Now,
                    };
                    Db.Ado.BeginTran();
                    WebResponseContent content = _stockService.StockInfoService.AddStockEmpty(barcode);
                    if (!content.Status) throw new Exception(content.Message);
                    _taskRepository.AddData(task);
                    List<WMSTaskDTO> wMSTaskDTOs = _mapper.Map<List<WMSTaskDTO>>(new List<Dt_Task> { task });
                    var ResultData = HttpHelper.PostAsync(WCSInterfaceAddress.ReceiveTask, wMSTaskDTOs.ToJson(), headers: new Dictionary<string, string>());
                    if (ResultData.Result == null) throw new Exception($"向WCS下发空托入库任务超时");
                    content = JsonConvert.DeserializeObject<WebResponseContent>(ResultData.Result);
                    if (content == null) throw new Exception($"下发空托入库任务WCS无响应");
                    if (!content.Status) throw new Exception(content.Message);
                    Db.Ado.CommitTran();
                }
                else
                    throw new Exception($"托盘号【{barcode}】已存在任务");
                #endregion
                return WebResponseContent.Instance.OK();
            }
            catch (Exception ex)
            {
                Db.Ado.RollbackTran();
                return WebResponseContent.Instance.Error(ex.Message);
            }
        }
        /// <summary>
        /// PDA组盘
        /// å•ç§ç‰©æ–™ç»„盘
@@ -44,7 +105,6 @@
        public WebResponseContent PdaAddStockInfo(PdaMaterielGroupDTO pdaMaterielGroupDTO)
        {
            WebResponseContent content = new WebResponseContent();
            WebResponseContent.Instance.OK();
            try
            {
                Dt_MaterielInfo materielInfo = _basicService.MaterielInfoService.GetMaterielInfo(pdaMaterielGroupDTO.MaterielCode);
@@ -89,11 +149,11 @@
                    stockInfoDetail.StockQuantity += pdaMaterielGroupDTO.ReceiptQuantity;
                    stockInfoDetail.SerialNumber = $"{inboundOrder.OrderNo} | {materielInfo.MaterielCode} | {pdaMaterielGroupDTO.BatchNo} | {(int)stockInfoDetail.StockQuantity}";
                }
                 


                Dt_InboundOrderDetail inboundOrderDetail = inboundOrder.Details.Where(x => materielInfo.MaterielCode == x.MaterielCode && x.BatchNo == pdaMaterielGroupDTO.BatchNo).FirstOrDefault();//订单详情

                inboundOrderDetail.ReceiptQuantity += pdaMaterielGroupDTO.ReceiptQuantity;
                inboundOrderDetail.ReceiptQuantity++;
                inboundOrderDetail.OrderDetailStatus = inboundOrderDetail.OverInQuantity == inboundOrderDetail.OrderQuantity ? OrderDetailStatusEnum.Over.ObjToInt() : OrderDetailStatusEnum.GroupAndInbound.ObjToInt();

                if (inboundOrder.Details.FirstOrDefault(x => x.OrderDetailStatus != OrderDetailStatusEnum.Over.ObjToInt()) == null)
@@ -238,6 +298,10 @@
            {
                return (false, "已上架的托盘不能再次组盘", materielGroupDTO);
            }
            if (stockInfo != null)
            {
                return (false, "已组盘的托盘不能再次组盘", materielGroupDTO);
            }
            if (materielInfo == null)
            {
                return (false, "有物料信息未录入，请录入物料信息", materielGroupDTO);
@@ -261,9 +325,10 @@
            {
                return (false, "物料或批次号有误", materielGroupDTO);
            }
            if (inboundOrderDetail.OrderQuantity - inboundOrderDetail.ReceiptQuantity < materielGroupDTO.ReceiptQuantity)
            if (inboundOrderDetail.OrderQuantity - inboundOrderDetail.ReceiptQuantity < 1)
            {
                return (false, "有物料超出单据数量", materielGroupDTO);
                //return (false, "有物料超出单据数量", materielGroupDTO);
                return (false, "组盘超出单据数量", materielGroupDTO);
            }
            return (true, "成功", inboundOrderDetail);
        }
@@ -345,11 +410,11 @@
            return (true, "成功", materielGroupDTO);
        }

        public WebResponseContent QueryOrderInfo(int pageNo, string orderNo)
        public WebResponseContent QueryOrderInfo(int pageNo, string orderNo, int orderType)
        {
            if (string.IsNullOrEmpty(orderNo))
            {
                object obj = Repository.QueryPage(x => true, pageNo, 10, new Dictionary<string, OrderByType> { { nameof(Dt_InboundOrder.CreateDate), OrderByType.Desc } }).Rows.Select(x => new
                object obj = Repository.QueryPage(x => x.OrderType == orderType, pageNo, 10, new Dictionary<string, OrderByType> { { nameof(Dt_InboundOrder.CreateDate), OrderByType.Desc } }).Rows.Select(x => new
                {
                    x.OrderNo,
                    x.UpperOrderNo,
@@ -360,7 +425,7 @@
            }
            else
            {
                object obj = Repository.QueryPage(x => x.OrderNo == orderNo, pageNo, 10, new Dictionary<string, OrderByType> { { nameof(Dt_InboundOrder.CreateDate), OrderByType.Desc } }).Rows.Select(x => new
                object obj = Repository.QueryPage(x => x.OrderNo.Contains(orderNo), pageNo, 10, new Dictionary<string, OrderByType> { { nameof(Dt_InboundOrder.CreateDate), OrderByType.Desc } }).Rows.Select(x => new
                {
                    x.OrderNo,
                    x.UpperOrderNo,
@@ -370,5 +435,14 @@
                return WebResponseContent.Instance.OK(data: obj);
            }
        }

        public WebResponseContent QueryOrderDetailInfo(int pageNo, string orderNo)
        {
            WebResponseContent content = new WebResponseContent();
            Dt_InboundOrder inboundOrder = GetInboundOrder(orderNo);
            List<Dt_InboundOrderDetail> inboundOrderDetails = inboundOrder.Details;
            content.OK(data: inboundOrderDetails);
            return content;
        }
    }
}