Merge branch 'master' of http://115.159.85.185:8098/r/ZhiHuiQiCe/FangCangZh...

dengjunjie

2025-10-17 55142f3214485c7ec12c5e414a56519f66a1eb1d

 н¨Îļþ¼Ð/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/DeliveryOrderServices.cs

@@ -25,7 +25,7 @@

namespace WIDESEA_SquareCabinServices
{
    public class DeliveryOrderServices : ServiceBase<Dt_DeliveryOrder, IRepository<Dt_DeliveryOrder>>, IDeliveryOrderServices
    public partial class DeliveryOrderServices : ServiceBase<Dt_DeliveryOrder, IRepository<Dt_DeliveryOrder>>, IDeliveryOrderServices
    {
        static string SearchDate = "";
        private readonly IBasicService _basicService;
@@ -34,8 +34,9 @@
        private readonly IInventoryInfoService _inventoryInfoService;
        private readonly IDeliveryOrderDetailServices _deliveryOrderDetailServices;
        private readonly ISupplyTaskService _supplyTaskService;
        private readonly ICabinOrderServices _cabinOrderServices;
        public IRepository<Dt_DeliveryOrder> Repository => BaseDal;
        public DeliveryOrderServices(IRepository<Dt_DeliveryOrder> BaseDal, IBasicService basicService, IUnitOfWorkManage unitOfWorkManage, IInventory_BatchServices inventory_BatchServices, IInventoryInfoService inventoryInfoService, IDeliveryOrderDetailServices deliveryOrderDetailServices, ISupplyTaskService supplyTaskService) : base(BaseDal)
        public DeliveryOrderServices(IRepository<Dt_DeliveryOrder> BaseDal, IBasicService basicService, IUnitOfWorkManage unitOfWorkManage, IInventory_BatchServices inventory_BatchServices, IInventoryInfoService inventoryInfoService, IDeliveryOrderDetailServices deliveryOrderDetailServices, ISupplyTaskService supplyTaskService, ICabinOrderServices cabinOrderServices) : base(BaseDal)
        {
            _basicService = basicService;
            _unitOfWorkManage = unitOfWorkManage;
@@ -43,6 +44,7 @@
            _supplyTaskService = supplyTaskService;
            _inventory_BatchServices = inventory_BatchServices;
            _inventoryInfoService = inventoryInfoService;
            _cabinOrderServices = cabinOrderServices;
        }

        /// <summary>
@@ -275,7 +277,7 @@
                                return q.OrderBy(i => i.InDate).ToList();
                            };

                            // 4️⃣分配散件（优先立库 Status=1）
                            // 4️⃣分配散件（优先立库 Status=0）
                            decimal remainingPartial = partialQty;
                            if (remainingPartial > 0)
                            {
@@ -301,7 +303,7 @@
                                    };
                                    entityOrder.Details.Add(detail);

                                    inv.OutboundQuantity += (float)use;
                                    inv.OutboundQuantity += use;
                                    BaseDal.Db.Updateable(inv).ExecuteCommand();

                                    remainingPartial -= use;
@@ -332,7 +334,7 @@
                                        };
                                        entityOrder.Details.Add(detail);

                                        inv.OutboundQuantity += (float)use;
                                        inv.OutboundQuantity += use;
                                        BaseDal.Db.Updateable(inv).ExecuteCommand();

                                        remainingPartial -= use;
@@ -375,7 +377,7 @@
                                    };
                                    entityOrder.Details.Add(detail);

                                    inv.OutboundQuantity += (float)useQty;
                                    inv.OutboundQuantity += useQty;
                                    BaseDal.Db.Updateable(inv).ExecuteCommand();

                                    remainingFullBoxes -= useBoxes;
@@ -410,7 +412,7 @@
                                        };
                                        entityOrder.Details.Add(detail);

                                        inv.OutboundQuantity += (float)useQty;
                                        inv.OutboundQuantity += useQty;
                                        BaseDal.Db.Updateable(inv).ExecuteCommand();

                                        remainingFullBoxes -= useBoxes;
@@ -525,9 +527,16 @@
                            decimal orderQty = (decimal)item.order_qty;

                            //  2️⃣ æŸ¥ç‰©æ–™åŸºç¡€ä¿¡æ¯ï¼ˆèŽ·å–箱规）
                            var medication = BaseDal.Db.Queryable<Dt_MedicineGoods>()
                                .Where(m => m.Goods_no == item.goods_no)
                            var medication = BaseDal.Db.Queryable<Dt_MaterielInfo>()
                                .Where(m => m.MaterielCode == item.goods_no)
                                .First();
                            //如果物料信息不存在，跳过整个入库单
                            if (medication == null)
                            {
                                skipOrder = true;
                                Console.WriteLine($"跳过入库单 {outorder.order_no}，原因：未找到商品 [{item.goods_no}] çš„物料信息。");
                                break;
                            }


                            //  è‹¥ç‰©æ–™ä¸å­˜åœ¨æˆ– MaterielSourceType ä¸ºç©ºï¼Œåˆ™è·³è¿‡æ•´ä¸ªå‡ºåº“单
@@ -785,10 +794,10 @@
                        string materialCode = "YY";//默认值
                                                   //获取当前订单的第一个明细项
                        var firstDetail = order.Details.FirstOrDefault();
                        if (firstDetail?.MedicineGoods != null && !string.IsNullOrEmpty(firstDetail.MedicineGoods.MaterialCode))
                        if (firstDetail?.MedicineGoods != null && !string.IsNullOrEmpty(firstDetail.MedicineGoods.MaterielErpType))
                        {
                            //如果条件满足，将物料代码设置为第一个明细项对应的药品物料代码
                            materialCode = firstDetail.MedicineGoods.MaterialCode;
                            materialCode = firstDetail.MedicineGoods.MaterielErpType;
                        }
                        // 3. ç»„装 DTO
                        var ediDto = new TowcsDto.ToediOutInfo
@@ -803,8 +812,8 @@
                            {
                                batchNo = d.Batch_num,
                                productCode = d.Goods_no,
                                productName = d.MedicineGoods?.Goods_spm,
                                productSpecifications = d.MedicineGoods?.Model,
                                productName = d.MedicineGoods?.MaterielName,
                                productSpecifications = d.MedicineGoods?.MaterielModel,
                                quantity = (int)d.Order_qty,
                                //stocktakingDetails = order.Out_type == "3"
                                //    ? new List<ToOutediInStock>
@@ -1221,6 +1230,7 @@
                    MaterielCode = inventoryInfo.MaterielCode,
                    MaterielSpec = inventoryInfo.MaterielSpec,
                    TaskType = TaskTypeEnum.OutInventory.ObjToInt(),
                    TaskStatus = SupplyStatusEnum.CheckFinish.ObjToInt(),
                    CreateDate = DateTime.Now,
                    Creater = App.User.UserName,
                    LocationCode = LocationCode,
@@ -1324,6 +1334,7 @@
                    MaterielName = inventoryInfo.MaterielName,
                    MaterielCode = inventoryInfo.MaterielCode,
                    MaterielSpec = inventoryInfo.MaterielSpec,
                    TaskStatus = SupplyStatusEnum.OutFinish.ObjToInt(),
                    TaskType = TaskTypeEnum.OutPick.ObjToInt(),
                    CreateDate = DateTime.Now,
                    Creater = App.User.UserName,