添加库存信息和批次信息的可用库存数量

yanjinhui

2025-10-23 770b80efd437680e84a674ddf3db90037a833f47

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

@@ -91,25 +91,27 @@
        public ApiResponse<Dt_InventoryInfo> OrderFeedback(EdiOrderCallbackRequest request)
        {
            try
            {
            {  
                // 1️⃣ æ ¡éªŒè¯·æ±‚
                if (request == null || request.details == null || !request.details.Any())
                {
                    return new ApiResponse<Dt_InventoryInfo> { code = "500", msg = "请求参数无效" };
                }
               

                //查找到全部的

                foreach (var detail in request.details)
                {
                     var goods = Db.Queryable<Dt_MaterielInfo>().Where(x => x.MaterielCode == detail.productCode).First();
                    var goods = Db.Queryable<Dt_MaterielInfo>().Where(x => x.MaterielCode == detail.productCode).First();

                    // 3️⃣ è®¡ç®—入库数量（取正）
                    // 3️ è®¡ç®—入库数量（取正）遍历 orderDetails ä¸­çš„每个 EdiOrderBoxDto å¯¹è±¡
                    decimal orderQty = detail.orderDetails?
                        .Sum(x => decimal.TryParse(x.quantity, out var q) ? Math.Abs(q) : 0)
                        ?? 0;

                    // 5️⃣ æŸ¥è¯¢åº“存详情
                    var entity = BaseDal.Db.Queryable<Dt_InventoryInfo>()
                        .First(x => x.MaterielCode == detail.productCode && x.BatchNo == detail.batchNo&&x.LocationCode=="立库");
                        .First(x => x.MaterielCode == detail.productCode && x.BatchNo == detail.batchNo && x.LocationCode == "立库");
                    //查询物料表
                    var Goods = BaseDal.Db.Queryable<Dt_MaterielInfo>().First(x => x.MaterielCode == detail.productCode);

@@ -128,6 +130,7 @@
                            StockQuantity = 0,
                            OutboundQuantity = 0,
                            SupplyQuantity = 0,
                            AvailableQuantity = 0,
                            InDate = DateTime.Now,
                            ProductionDate = detail.finishDate.ToString("yyyy-MM-dd"),
                            ShelfLife = 0,
@@ -150,6 +153,7 @@
                            BatchNo = detail.batchNo,
                            StockQuantity = 0,
                            OutboundQuantity = 0,
                            AvailableQuantity = 0,
                            SupplyQuantity = 0,
                            ERPStockQuantity = 0,
                            Status = false,
@@ -163,44 +167,50 @@
                    switch (request.orderType)
                    {
                        case "1": //入库
                            entity.StockQuantity += orderQty;
                            entity.StockQuantity = orderQty; //实际库存
                            entity.AvailableQuantity = orderQty;
                            entity.InDate = DateTime.Now;
                            entity.Remark = "入库单回传";
                            //Goods.Business_qty=

                            batch.StockQuantity += orderQty;

                            batch.StockQuantity = orderQty;
                            batch.AvailableQuantity = orderQty;
                            batch.Remark = "入库单回传";
                            UpdateInboundOrderDetailStatus(detail.batchNo, detail.productCode);
                            break;

                        case "2": // å‡ºåº“
                            entity.OutboundQuantity += orderQty; //出库数量
                            entity.StockQuantity -= orderQty;
                        case "2": // å‡ºåº“  æ€»100  å‡º20
                            decimal actualOutQty = entity.StockQuantity - orderQty;// è®¡ç®—本次实际出库数量 20
                            entity.StockQuantity=orderQty; //实际库存数 100
                            entity.OutboundQuantity =Math.Max(0,entity.OutboundQuantity-actualOutQty); //待出库数量
                            entity.AvailableQuantity = entity.StockQuantity - entity.OutboundQuantity;//可用库存
                            if (entity.StockQuantity < 0) entity.StockQuantity = 0;
                            entity.Remark = "出库单回传";

                            //CreateAllocatInOut()
                            batch.OutboundQuantity += orderQty;
                            batch.StockQuantity -= orderQty;

                            batch.StockQuantity = orderQty;
                            batch.OutboundQuantity =Math.Max(0,batch.OutboundQuantity-actualOutQty);//待出库数量
                            batch.AvailableQuantity = batch.StockQuantity - batch.OutboundQuantity; //可用库存
                            if (batch.StockQuantity < 0) batch.StockQuantity = 0;
                            batch.Remark = "出库单回传";
                            UpdateOutboundOrderDetailStatus(detail.batchNo, detail.productCode);
                            //调拨任务
                            _deliveryOrderServices.CreateAllocatInOut(goods);


                            break;

                        case "3": // ç›˜ç‚¹
                            decimal diff = detail.ea ?? 0;             // å·®å¼‚æ•°
                            int flag = detail.isLossOrProfit ?? 3;     // 1=盘亏, 2=盘盈, 3=盘中

                            if (flag == 1) // ç›˜äº
                            {
                                batch.SupplyQuantity = batch.StockQuantity - diff;
                                //库存数-差异数=盘亏
                                batch.SupplyQuantity +=( batch.StockQuantity - diff);
                                batch.Remark = "盘点单回传 - ç›˜äº";
                            }
                            else if (flag == 2) // ç›˜ç›ˆ
                            {
                                batch.SupplyQuantity = batch.StockQuantity + diff;
                                //库存数+差异数=盘盈
                                batch.SupplyQuantity +=(batch.StockQuantity + diff);
                                batch.Remark = "盘点单回传 - ç›˜ç›ˆ";
                            }
                            else // ç›˜ä¸­
@@ -246,6 +256,54 @@
        }


        /// <summary>
        /// æ›´æ–°å…¥åº“单详细
        /// </summary>
        /// <param name="batchNo">批次号</param>
        /// <param name="productCode">物料名编码/param>
        public void UpdateInboundOrderDetailStatus(string batchNo,string productCode)
        {
            try
            {
                //查询详情
                var detail = BaseDal.Db.Queryable<Dt_CabinOrderDetail>()
                .First(x => x.Goods_no == productCode && x.Batch_num == batchNo && x.OrderDetailStatus == "开始" && x.Status == 1);
                //查找到后根据物料状态（OrderDetailStatus==开始） è¯¥çŠ¶æ€Status=1修改该条详情的OrderDetailStatus==已完成
                detail.OrderDetailStatus = "已完成";
                BaseDal.Db.Updateable(detail).ExecuteCommand();
            }
            catch (Exception ex)
            {

                throw;
            }

        }

        /// <summary>
        ///  //查找到后根据物料状态（OrderDetailStatus==开始） è¯¥çŠ¶æ€Status=1修改该条详情的OrderDetailStatus==已完成
        /// </summary>
        /// <param name="batchNo"></param>
        /// <param name="productCode"></param>
        public void UpdateOutboundOrderDetailStatus(string batchNo, string productCode)
        {
            try
            {
                //查询详情
                var detail = BaseDal.Db.Queryable<Dt_DeliveryOrderDetail>()
                .First(x => x.Goods_no == productCode && x.Batch_num == batchNo && x.OotDetailStatus == "开始" && x.Status == 1);
                detail.OotDetailStatus = "已完成";
                BaseDal.Db.Updateable(detail).ExecuteCommand();
            }
            catch (Exception ex)
            {

                throw;
            }
         

        }


        /// <summary>
        /// æŽ¨é€å¼‚常信息给上游系统1.入库单接口；2.入库单报完成接口；3.出库单接口；4.出库报完成接口；5.药品基础信息同步接口；6.供应商信息接口；7.客户信息接口；8.库存