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


@@ -129,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);


@@ -289,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>


@@ -596,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）