方舱智能密集库
blame | 历史 | 补丁 | 提交 | 提交对比 | 忽略空白
dengjunjie
2025-10-24 d55ef610a530c2ab0a30d6ecdc1e7e4ab54cc896 
 н¨Îļþ¼Ð/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/CabinOrderServices.cs


@@ -1,6 +1,7 @@


using HslCommunication;


using MailKit.Search;


using Microsoft.AspNetCore.Mvc;


using Microsoft.Data.SqlClient;


using Newtonsoft.Json;


using SqlSugar;


using System;


@@ -40,11 +41,12 @@


        private readonly IInventory_BatchServices _inventory_BatchServices;


        private readonly IInventoryInfoService _inventoryInfoService;


        private readonly ICabinOrderDetailServices _cabinOrderDetailServices;


        private readonly IDeliveryOrderServices _eliveryOrderServices;


        private readonly ISupplyTaskService _supplyTaskService;


        private readonly ISupplyTaskHtyService _supplyTaskHtyService;


        public IRepository<Dt_CabinOrder> Repository => BaseDal;




        public CabinOrderServices(IRepository<Dt_CabinOrder> BaseDal, IBasicService basicService, IMedicineGoodsServices medicineGoodsServices, IUnitOfWorkManage unitOfWorkManage, IInventory_BatchServices inventory_BatchServices, IInventoryInfoService inventoryInfoService, ICabinOrderDetailServices cabinOrderDetailServices, ICabinOrderHtyServices cabinOrderHtyServices, ICabinOrderDetailHtyServices cabinOrderDetailHtyServices, ISupplyTaskService supplyTaskService, ISupplyTaskHtyService supplyTaskHtyService) : base(BaseDal)


        public CabinOrderServices(IRepository<Dt_CabinOrder> BaseDal, IBasicService basicService, IMedicineGoodsServices medicineGoodsServices, IUnitOfWorkManage unitOfWorkManage, IInventory_BatchServices inventory_BatchServices, IInventoryInfoService inventoryInfoService, ICabinOrderDetailServices cabinOrderDetailServices, ICabinOrderHtyServices cabinOrderHtyServices, ICabinOrderDetailHtyServices cabinOrderDetailHtyServices, ISupplyTaskService supplyTaskService, ISupplyTaskHtyService supplyTaskHtyService, IDeliveryOrderServices eliveryOrderServices) : base(BaseDal)


        {


            _basicService = basicService;


            _medicineGoodsServices = medicineGoodsServices;


@@ -54,6 +56,7 @@


            _cabinOrderDetailServices = cabinOrderDetailServices;


            _supplyTaskService = supplyTaskService;


            _supplyTaskHtyService = supplyTaskHtyService;


            _eliveryOrderServices = eliveryOrderServices;


        }






@@ -126,7 +129,7 @@


                Dt_CabinOrder cabinOrder = BaseDal.Db.Queryable<Dt_CabinOrder>().Where(x => x.Order_no == orderNo && x.Warehouse_no == warehouseCode).Includes(x => x.Details).First();


                if (cabinOrder == null || cabinOrder.OdrderStatus == "已完成")


                    return WebResponseContent.Instance.Error($"入库单已完成");


                Dt_CabinOrderDetail cabinOrderDetail = cabinOrder.Details.Where(x => x.Goods_no == materielCode && x.Batch_num == batchNo && x.Status == 2).First();


                Dt_CabinOrderDetail cabinOrderDetail = cabinOrder.Details.Where(x => x.Goods_no == materielCode && x.Batch_num == batchNo && x.Status == 2).FirstOrDefault();


                if (cabinOrderDetail == null || cabinOrderDetail.OrderDetailStatus == "已完成")


                    return WebResponseContent.Instance.Error($"入库单明细已完成");


                Dt_MaterielInfo materielInfo = _basicService.MaterielInfoService.Repository.QueryFirst(x => x.MaterielCode == cabinOrderDetail.Goods_no);


@@ -286,7 +289,7 @@


            }


            return content;


        }


        static string SearchDate = "2025-10-10 00:00:00";


        static string SearchDate = "2025-09-10 00:00:00";


        /// <summary>


        /// èŽ·å–上游系统的入库单


        /// </summary>


@@ -356,9 +359,33 @@


                            List<Dt_CabinOrder>? dt_CabinOrders = responseContent.Data as List<Dt_CabinOrder>;


                            if (dt_CabinOrders != null) _CabinOrders.AddRange(dt_CabinOrders);


                        }


                        else


                        else if (order.order_type == "3")//入库退料


                        {


                            //创建出库单


                            #region è½¬æ¢ä¸ºå‡ºåº“单


                            UpstramOutOrderInfo upstramOutOrderInfo = new UpstramOutOrderInfo()


                            {


                                order_no = order.order_no,


                                order_type = order.order_type,


                                warehouse_no = order.warehouse_no,


                                details = new List<UpstreamOutOrderDetail>()


                            };


                            foreach (var item in order.details)


                            {


                                UpstreamOutOrderDetail detail = new UpstreamOutOrderDetail()


                                {


                                    batch_num = item.batch_num,


                                    goods_no = item.goods_no,


                                    order_qty = item.order_qty,


                                    exp_date = item.exp_date,


                                };


                                upstramOutOrderInfo.details.Add(detail);


                            }


                            _eliveryOrderServices.CreateOutboundOrder(upstramOutOrderInfo);


                            #endregion


                        }


                        else if (order.order_type == "5")//报溢入库


                        {




                        }


                    };


@@ -569,9 +596,10 @@


                //    .Includes(o => o.Details, d => d.MedicineGoods)


                //    .ToList();


                //查出包含全部的入库单，包含全部明细+一个明细对应一个商品


                var reslut = WarehouseEnum.立库.ObjToInt().ToString("000");


                var orders = BaseDal.Db.CopyNew()


                .Queryable<Dt_CabinOrder>()


                .Where(o => o.OdrderStatus == "新建" && o.Warehouse_no == WarehouseEnum.立库.ObjToInt().ToString("000"))


                .Where(o => o.OdrderStatus == "新建" && o.Warehouse_no == reslut)


                .Includes(o => o.Details, d => d.MedicineGoods)


                .ToList();


                // 3. å†è¿‡æ»¤æŽ‰ä¸ç¬¦åˆæ¡ä»¶çš„明细（只保留 Status=0）