1

WebApiNET6-master/APIs/Controllers/BaseInfoController.cs

@@ -69,6 +69,8 @@ namespace APIs.Controllers
         private readonly IBussinessInventoryService _bussinessInventoryService;
         private readonly IBussinessInventoryDetailService _bussinessInventoryDetailService;
         private readonly IChannelService _channelService;
+        private readonly IViewWarrantyWarnService _viewWarrantyWarnService;
+
         private readonly DehumidifierHelper _dehumidifierHelper;
 
         public BaseInfoController(IMapper mapper, DehumidifierHelper dehumidifierHelper, IPoliceService policeService, IEquipmentTypeService equipmentTypeService,
@@ -76,8 +78,10 @@ namespace APIs.Controllers
             IInvService invService, IUsersService usersService, ILogService logService, IDevHistoryService devHistoryService,
             IDevService devService, IWarehouseService warehouseService, IOrderService orderService, ISupplierService supplierService,
             IThisInfoService thisInfoService, IPrintService printService, IPoliceFingerService policeFingerService, IPoliceInfoService policeInfoService,
-            IBussinessInventoryService bussinessInventoryService, IBussinessInventoryDetailService bussinessInventoryDetailService, IChannelService channelService)
+            IBussinessInventoryService bussinessInventoryService, IBussinessInventoryDetailService bussinessInventoryDetailService, IChannelService channelService,
+            IViewWarrantyWarnService viewWarrantyWarnService)
         {
+            Mapper = mapper;
             _dehumidifierHelper = dehumidifierHelper;
             _carService = carService;
             _equipmentSizeService = equipmentSizeService;
@@ -99,7 +103,7 @@ namespace APIs.Controllers
             _bussinessInventoryService = bussinessInventoryService;
             _bussinessInventoryDetailService = bussinessInventoryDetailService;
             _channelService = channelService;
-            Mapper = mapper;
+            _viewWarrantyWarnService = viewWarrantyWarnService;
         }
 
         /// <summary>
@@ -812,11 +816,11 @@ namespace APIs.Controllers
                                     updateTime = DateTime.Now,
                                     price = myOrder.DetailList?.FirstOrDefault(s => s.equipmentSize.Equals(mysize.id))?.price ?? 0,
                                 });
-
                             }
                         }
 
                         //出入库子单
+
                         var inv = await _inventoryService.QueryOne(s => s.epc.Equals(epc));
                         logDetailList.Add(new LogDetail() 
                         {
@@ -831,7 +835,7 @@ namespace APIs.Controllers
                             equipmentType = 0,
                             supplierId = mysupplier?.id ?? "",
                             supplierName = mysupplier?.name ?? "",
-                            price = inv?.price ?? 0,
+                            price = inv == null ? (myOrder.DetailList?.FirstOrDefault(s => s.equipmentSize.Equals(mysize.id))?.price ?? 0) : (inv?.price ?? 0),
                             createTime = DateTime.Now,
                             updateTime = DateTime.Now,
                         });

WebApiNET6-master/APIs/Startup.cs

@@ -79,7 +79,7 @@ namespace APIs
             services.AddScoped<IBussinessInventoryService, BussinessInventoryService>();
             services.AddScoped<IBussinessInventoryDetailService, BussinessInventoryDetailService>();
             services.AddScoped<IChannelService, ChannelService>();
-
+            services.AddScoped<IViewWarrantyWarnService, ViewWarrantyWarnService>();
             #endregion
 
             #region Repository
@@ -107,6 +107,7 @@ namespace APIs
             services.AddScoped<IBussinessInventoryRepository, BussinessInventoryRepository>();
             services.AddScoped<IBussinessInventoryDetailRepository, BussinessInventoryDetailRepository>();
             services.AddScoped<IChannelRepository, ChannelRepository>();
+            services.AddScoped<IViewWarrantyWarnRepository, ViewWarrantyWarnRepository>();
             #endregion
 
             #region 注册RabbitMQ消费者

WebApiNET6-master/Models/Table/ViewWarrantyWarn.cs

+using SqlSugar;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Models.Table
+{
+    [SugarTable("view_warranty_warn")]
+    public class ViewWarrantyWarn : BaseTable
+    {
+        [SugarColumn(IsPrimaryKey = true)]
+        public string? id { get; set; }
+
+        [SugarColumn(ColumnName = "type_id")]
+        public string? typeId { get; set; }
+
+        [SugarColumn(ColumnName = "size_id")]
+        public string? sizeId { get; set; }
+
+        [SugarColumn(ColumnName = "supplier_id")]
+        public string? supplierId { get; set; }
+
+        public string? epc { get; set; }
+
+        [SugarColumn(ColumnName = "type_name")]
+        public string? typeName { get; set; }
+
+        [SugarColumn(ColumnName = "size_name")]
+        public string? sizeName { get; set; }
+
+        [SugarColumn(ColumnName = "supplier_name")]
+        public string? supplierName { get; set; }
+
+        [SugarColumn(ColumnName = "production_date")]
+        public DateTime? productionDate { get; set; }
+
+        [SugarColumn(ColumnName = "warranty_period")]
+        public int warrantyPeriod { get; set; }
+    }
+}

WebApiNET6-master/Repositories/IRepository/IBussiness/IViewWarrantyWarnRepository.cs

+using Models.Table;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Repositories.IRepository.IBussiness
+{
+    public interface IViewWarrantyWarnRepository : IBaseRepository<ViewWarrantyWarn>
+    {
+    }
+}

WebApiNET6-master/Repositories/Repository/Bussiness/LogSummaryRepository.cs

@@ -257,7 +257,7 @@ namespace Repositories.Repository.Bussiness
                         myOrder.actualQuantity = summary.number;
                         myOrder.price = sumPrice;
                         myOrder.isUpload = 1;
-                        myOrder.orderState = 0;
+                        //myOrder.orderState = 0;
                         myOrder.updateTime = DateTime.Now;
 
                         var orderrs = context.UpdateNav(myOrder).Include(z1 => z1.DetailList).ExecuteCommand();

WebApiNET6-master/Repositories/Repository/Bussiness/ViewWarrantyWarnRepository.cs

+using Models.Table;
+using Repositories.IRepository;
+using Repositories.IRepository.IBussiness;
+using Repositories.IRepository.IUnitOfWork;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Repositories.Repository.Bussiness
+{
+    public class ViewWarrantyWarnRepository : BaseRepository<ViewWarrantyWarn>, IViewWarrantyWarnRepository
+    {
+        public ViewWarrantyWarnRepository(ILocalSugarUnitOfWork sugarUnitOfWork) : base(sugarUnitOfWork)
+        {
+
+        }
+    }
+}

WebApiNET6-master/Services/Interface/IViewWarrantyWarnService.cs

+using Models.Table;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Services.Interface
+{
+    public interface IViewWarrantyWarnService : IBaseServices<ViewWarrantyWarn>
+    {
+    }
+}

WebApiNET6-master/Services/ViewWarrantyWarnService.cs

+using Models.Table;
+using Repositories.IRepository.IBussiness;
+using Services.Interface;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Services
+{
+    public class ViewWarrantyWarnService : BaseService<ViewWarrantyWarn>, IViewWarrantyWarnService
+    {
+        private readonly IViewWarrantyWarnRepository _viewWarrantyWarnRepository;
+        public ViewWarrantyWarnService(IViewWarrantyWarnRepository viewWarrantyWarnRepository)
+        {
+            base.BaseDal = viewWarrantyWarnRepository;
+            _viewWarrantyWarnRepository = viewWarrantyWarnRepository;
+        }
+
+    }
+}