优化

yanjinhui

2025-11-12 b790305873e20a7f26d63c71623210964105014e

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

@@ -19,6 +19,7 @@
using static WIDESEA_DTO.SquareCabin.AlarmDto;
using OfficeOpenXml.Style;
using System.Security.Policy;
using SqlSugar;

namespace WIDESEA_SquareCabinServices
{
@@ -43,6 +44,164 @@
        }

        #region ä¸‹å‘立库入库单
        //public WebResponseContent EdiIn()
        //{
        //    try
        //    {
        //        var reslut = WarehouseEnum.立库.ObjToInt().ToString("000");
        //        var orders = _cabinOrderServices.Repository.QueryData(x => x.OdrderStatus == "新建" && x.Warehouse_no == reslut).ToList();
        //        if (orders.Count < 1) return WebResponseContent.Instance.OK();
        //        string url = "http://172.16.1.2:9357/file-admin/api/in/ediIn";
        //        var cabinOrderDetails = _cabinDetailServices.Repository.QueryData(x => orders.Select(x => x.Id).ToList().Contains(x.OrderId)).ToList();
        //        var materielInfos = _materielInfoService.Repository.QueryData(x => cabinOrderDetails.Select(x => x.Goods_no).Contains(x.MaterielCode)).ToList();
        //        foreach (var order in orders)
        //        {
        //            order.Details = cabinOrderDetails.Where(x => x.OrderId == order.Id).ToList();
        //            foreach (var item in order.Details)
        //            {
        //                item.MedicineGoods = materielInfos.Where(x => x.MaterielCode == item.Goods_no).First();
        //            }
        //            #region ä¸‹å‘WCS
        //            string materialCode = order.Details.FirstOrDefault()?.MedicineGoods?.MaterielErpType ?? "YY";
        //            var ediDto = new ToediInInfo
        //            {
        //                //客户代码
        //                customerCode = "905",
        //                //物料类型
        //                materialCode = materialCode,
        //                //入库单号
        //                externalOrderNo = order.Order_no,
        //                //入库单类型
        //                inOrderType = order.Order_type == "5" ? "20" : "10",
        //                //优先级
        //                priority = 0,
        //                //是否取消
        //                Is_cancel = 0,
        //                details = order.Details.Select(d => new ToediInDetail
        //                {
        //                    //批号
        //                    batchNo = d.Batch_num,
        //                    //产品
        //                    productCode = d.Goods_no,
        //                    //sku名称
        //                    productName = d.MedicineGoods.MaterielName,
        //                    //sku规格
        //                    productSpecifications = d.MedicineGoods.MaterielSpec,
        //                    //数量
        //                    quantity = (int)d.Order_qty,
        //                    //效期
        //                    validityPeriod = d.Exp_date,
        //                    //生产厂家
        //                    manufacturer = d.MedicineGoods.Factory,
        //                    //房号
        //                    libraryNo = order.Warehouse_no,
        //                }).ToList()
        //            };
        //            var result = HttpHelper.Post(url, ediDto.ToJsonString());
        //            var resp = JsonConvert.DeserializeObject<TowcsResponse<object>>(result);
        //            if (resp != null && resp.code == "0")
        //            {
        //                order.OdrderStatus = "开始";
        //                foreach (var item in cabinOrderDetails.Where(x => x.OrderId == order.Id))
        //                {
        //                    item.Status = 1;
        //                    item.OrderDetailStatus = "开始";
        //                }
        //            }
        //            #endregion
        //        }
        //        _cabinOrderServices.UpdateData(orders);
        //        _cabinDetailServices.UpdateData(cabinOrderDetails);
        //        return WebResponseContent.Instance.OK();
        //    }
        //    catch (Exception ex)
        //    {
        //        Console.WriteLine("下发WCS入库单异常：" + ex.Message);
        //        return WebResponseContent.Instance.Error(ex.Message);
        //    }
        //}
        #endregion

        #region ä¸‹å‘立库出库单
        //public WebResponseContent EdiOut()
        //{
        //    try
        //    {
        //        var reslut = WarehouseEnum.立库.ObjToInt().ToString("000");
        //        var orders = _deliveryOrderServices.Repository.QueryData(x => x.OutStatus == "新建" && x.Warehouse_no == reslut).ToList();
        //        if (orders.Count < 1) return WebResponseContent.Instance.OK();
        //        string url = "http://172.16.1.2:9357/file-admin/api/out/ediOut";
        //        var deliveryOrderDetails = _deliveryOrderDetailServices.Repository.QueryData(x => orders.Select(x => x.Id).ToList().Contains(x.DeliveryOrderId)).ToList();
        //        var materielInfos = _materielInfoService.Repository.QueryData(x => deliveryOrderDetails.Select(x => x.Goods_no).Contains(x.MaterielCode)).ToList();
        //        foreach (var order in orders)
        //        {
        //            order.Details = deliveryOrderDetails.Where(x => x.DeliveryOrderId == order.Id).ToList();
        //            foreach (var item in order.Details)
        //            {
        //                item.MedicineGoods = materielInfos.Where(x => x.MaterielCode == item.Goods_no).First();
        //            }
        //            #region ä¸‹å‘WCS
        //            string materialCode = order.Details.FirstOrDefault()?.MedicineGoods?.MaterielErpType ?? "YY";
        //            var ediDto = new ToediOutInfo
        //            {
        //                //客户代码
        //                customerCode = "905",
        //                //物料类型
        //                materialCode = materialCode,
        //                externalOrderNo = order.Out_no,
        //                outOrderType = order.Out_type,
        //                priority = 1,
        //                Is_cancel = 0,
        //                details = order.Details.Select(d => new ToeOutdiInDetail
        //                {
        //                    batchNo = d.Batch_num,
        //                    productCode = d.Goods_no,
        //                    productName = d.MedicineGoods.MaterielName,
        //                    productSpecifications = d.MedicineGoods.MaterielModel,
        //                    quantity = (int)d.Order_qty,
        //                }).ToList()
        //            };
        //            switch (order.Out_type)
        //            {
        //                case "1"://正常出库
        //                case "3"://入库退货
        //                    ediDto.outOrderType = "10";//一般交易出库单
        //                    break;
        //                case "6"://盘亏出库
        //                    ediDto.outOrderType = "30";//盘亏出库单
        //                    break;
        //            }
        //            var result = HttpHelper.Post(url, ediDto.ToJsonString());
        //            var resp = JsonConvert.DeserializeObject<TowcsResponse<object>>(result);
        //            if (resp != null && resp.code == "0")
        //            {
        //                order.OutStatus = "开始";
        //                foreach (var item in deliveryOrderDetails.Where(x => x.DeliveryOrderId == order.Id))
        //                {
        //                    item.Status = 1;
        //                    item.OotDetailStatus = "开始";
        //                }
        //            }
        //            #endregion
        //        }
        //        _deliveryOrderServices.UpdateData(orders);
        //        _deliveryOrderDetailServices.UpdateData(deliveryOrderDetails);
        //        return WebResponseContent.Instance.OK();
        //    }
        //    catch (Exception ex)
        //    {
        //        Console.WriteLine("下发WCS出库单异常：" + ex.Message);
        //        return WebResponseContent.Instance.Error(ex.Message);
        //    }
        //}
        #endregion





        // ä½¿ç”¨ SqlSugar çš„ Ado.Connection æ‰‹åŠ¨ç®¡ç†
        #region ä¸‹å‘立库入库单
        public WebResponseContent EdiIn()
        {
            try
@@ -50,58 +209,64 @@
                var reslut = WarehouseEnum.立库.ObjToInt().ToString("000");
                var orders = _cabinOrderServices.Repository.QueryData(x => x.OdrderStatus == "新建" && x.Warehouse_no == reslut).ToList();
                if (orders.Count < 1) return WebResponseContent.Instance.OK();

                string url = "http://172.16.1.2:9357/file-admin/api/in/ediIn";
                var cabinOrderDetails = _cabinDetailServices.Repository.QueryData(x => orders.Select(x => x.Id).ToList().Contains(x.OrderId)).ToList();
                var materielInfos = _materielInfoService.Repository.QueryData(x => cabinOrderDetails.Select(x => x.Goods_no).Contains(x.MaterielCode)).ToList();
                var orderIds = orders.Select(x => x.Id).ToList();

                var cabinOrderDetails = _cabinDetailServices.Repository.QueryData(x => orderIds.Contains(x.OrderId)).ToList();

                var goodsCodes = cabinOrderDetails.Select(x => x.Goods_no).Distinct().ToList();
                var materielInfos = _materielInfoService.Repository.QueryData(x => goodsCodes.Contains(x.MaterielCode)).ToList();

                foreach (var order in orders)
                {
                    order.Details = cabinOrderDetails.Where(x => x.OrderId == order.Id).ToList();
                    foreach (var item in order.Details)
                    {
                        item.MedicineGoods = materielInfos.Where(x => x.MaterielCode == item.Goods_no).First();
                    }

                    // å…³é”®ä¿®æ”¹ï¼šä¸è®¾ç½®å¯¼èˆªå±žæ€§ï¼Œé¿å…è§¦å‘延迟加载
                    // foreach (var item in order.Details)
                    // {
                    //     item.MedicineGoods = materielInfos.Where(x => x.MaterielCode == item.Goods_no).First();
                    // }

                    #region ä¸‹å‘WCS
                    string materialCode = order.Details.FirstOrDefault()?.MedicineGoods?.MaterielErpType ?? "YY";
                    // ç›´æŽ¥ä»Ž materielInfos æŸ¥è¯¢ï¼Œä¸é€šè¿‡å¯¼èˆªå±žæ€§
                    var firstDetail = order.Details.FirstOrDefault();
                    var firstMedicine = firstDetail != null ?
                        materielInfos.FirstOrDefault(x => x.MaterielCode == firstDetail.Goods_no) : null;

                    string materialCode = firstMedicine?.MaterielErpType ?? "YY";

                    var ediDto = new ToediInInfo
                    {
                        //客户代码
                        customerCode = "905",
                        //物料类型
                        materialCode = materialCode,
                        //入库单号
                        externalOrderNo = order.Order_no,
                        //入库单类型
                        inOrderType = order.Order_type == "5" ? "20" : "10",
                        //优先级
                        priority = 0,
                        //是否取消
                        Is_cancel = 0,
                        details = order.Details.Select(d => new ToediInDetail
                        details = order.Details.Select(d =>
                        {
                            //批号
                            batchNo = d.Batch_num,
                            //产品
                            productCode = d.Goods_no,
                            //sku名称
                            productName = d.MedicineGoods.MaterielName,
                            //sku规格
                            productSpecifications = d.MedicineGoods.MaterielSpec,
                            //数量
                            quantity = (int)d.Order_qty,
                            //效期
                            validityPeriod = d.Exp_date,
                            //生产厂家
                            manufacturer = d.MedicineGoods.Factory,
                            //房号
                            libraryNo = order.Warehouse_no,
                            var medicine = materielInfos.FirstOrDefault(x => x.MaterielCode == d.Goods_no);
                            return new ToediInDetail
                            {
                                batchNo = d.Batch_num,
                                productCode = d.Goods_no,
                                productName = medicine?.MaterielName ?? string.Empty,
                                productSpecifications = medicine?.MaterielSpec ?? string.Empty,
                                quantity = (int)d.Order_qty,
                                validityPeriod = d.Exp_date,
                                manufacturer = medicine?.Factory ?? string.Empty,
                                libraryNo = order.Warehouse_no,
                            };
                        }).ToList()
                    };

                    var result = HttpHelper.Post(url, ediDto.ToJsonString());
                    var resp = JsonConvert.DeserializeObject<TowcsResponse<object>>(result);
                    if (resp != null && resp.code == "0")
                    {
                        order.OdrderStatus = "开始";
                        foreach (var item in cabinOrderDetails.Where(x => x.OrderId == order.Id))
                        foreach (var item in order.Details)
                        {
                            item.Status = 1;
                            item.OrderDetailStatus = "开始";
@@ -109,6 +274,7 @@
                    }
                    #endregion
                }

                _cabinOrderServices.UpdateData(orders);
                _cabinDetailServices.UpdateData(cabinOrderDetails);
                return WebResponseContent.Instance.OK();
@@ -119,6 +285,7 @@
                return WebResponseContent.Instance.Error(ex.Message);
            }
        }

        #endregion

        #region ä¸‹å‘立库出库单
@@ -129,37 +296,55 @@
                var reslut = WarehouseEnum.立库.ObjToInt().ToString("000");
                var orders = _deliveryOrderServices.Repository.QueryData(x => x.OutStatus == "新建" && x.Warehouse_no == reslut).ToList();
                if (orders.Count < 1) return WebResponseContent.Instance.OK();

                string url = "http://172.16.1.2:9357/file-admin/api/out/ediOut";
                var deliveryOrderDetails = _deliveryOrderDetailServices.Repository.QueryData(x => orders.Select(x => x.Id).ToList().Contains(x.DeliveryOrderId)).ToList();
                var materielInfos = _materielInfoService.Repository.QueryData(x => deliveryOrderDetails.Select(x => x.Goods_no).Contains(x.MaterielCode)).ToList();
                var orderIds = orders.Select(x => x.Id).ToList();

                var deliveryOrderDetails = _deliveryOrderDetailServices.Repository.QueryData(x => orderIds.Contains(x.DeliveryOrderId)).ToList();

                var goodsCodes = deliveryOrderDetails.Select(x => x.Goods_no).Distinct().ToList();
                var materielInfos = _materielInfoService.Repository.QueryData(x => goodsCodes.Contains(x.MaterielCode)).ToList();

                foreach (var order in orders)
                {
                    order.Details = deliveryOrderDetails.Where(x => x.DeliveryOrderId == order.Id).ToList();
                    foreach (var item in order.Details)
                    {
                        item.MedicineGoods = materielInfos.Where(x => x.MaterielCode == item.Goods_no).First();
                    }

                    // å…³é”®ä¿®æ”¹ï¼šä¸è®¾ç½®å¯¼èˆªå±žæ€§ï¼Œé¿å…è§¦å‘延迟加载
                    // foreach (var item in order.Details)
                    // {
                    //     item.MedicineGoods = materielInfos.Where(x => x.MaterielCode == item.Goods_no).First();
                    // }

                    #region ä¸‹å‘WCS
                    string materialCode = order.Details.FirstOrDefault()?.MedicineGoods?.MaterielErpType ?? "YY";
                    // ç›´æŽ¥ä»Ž materielInfos æŸ¥è¯¢ï¼Œä¸é€šè¿‡å¯¼èˆªå±žæ€§
                    var firstDetail = order.Details.FirstOrDefault();
                    var firstMedicine = firstDetail != null ?
                        materielInfos.FirstOrDefault(x => x.MaterielCode == firstDetail.Goods_no) : null;

                    string materialCode = firstMedicine?.MaterielErpType ?? "YY";

                    var ediDto = new ToediOutInfo
                    {
                        //客户代码
                        customerCode = "905",
                        //物料类型
                        materialCode = materialCode,
                        externalOrderNo = order.Out_no,
                        outOrderType = order.Out_type,
                        priority = 1,
                        Is_cancel = 0,
                        details = order.Details.Select(d => new ToeOutdiInDetail
                        details = order.Details.Select(d =>
                        {
                            batchNo = d.Batch_num,
                            productCode = d.Goods_no,
                            productName = d.MedicineGoods.MaterielName,
                            productSpecifications = d.MedicineGoods.MaterielModel,
                            quantity = (int)d.Order_qty,
                            var medicine = materielInfos.FirstOrDefault(x => x.MaterielCode == d.Goods_no);
                            return new ToeOutdiInDetail
                            {
                                batchNo = d.Batch_num,
                                productCode = d.Goods_no,
                                productName = medicine.MaterielName,
                                productSpecifications = medicine.MaterielModel,
                                quantity = (int)d.Order_qty,
                            };
                        }).ToList()
                    };

                    switch (order.Out_type)
                    {
                        case "1"://正常出库
@@ -170,12 +355,13 @@
                            ediDto.outOrderType = "30";//盘亏出库单
                            break;
                    }

                    var result = HttpHelper.Post(url, ediDto.ToJsonString());
                    var resp = JsonConvert.DeserializeObject<TowcsResponse<object>>(result);
                    if (resp != null && resp.code == "0")
                    {
                        order.OutStatus = "开始";
                        foreach (var item in deliveryOrderDetails.Where(x => x.DeliveryOrderId == order.Id))
                        foreach (var item in order.Details)
                        {
                            item.Status = 1;
                            item.OotDetailStatus = "开始";
@@ -183,6 +369,7 @@
                    }
                    #endregion
                }

                _deliveryOrderServices.UpdateData(orders);
                _deliveryOrderDetailServices.UpdateData(deliveryOrderDetails);
                return WebResponseContent.Instance.OK();
@@ -195,6 +382,10 @@
        }
        #endregion





        #region å…¥åº“完成上报ERP
        /// <summary>
        /// å…¥åº“报完成接口