1

WebApiNET6-master/APIs/Req/CommonReq.cs

-namespace APIs.Req
+using Models.Table;
+
+namespace APIs.Req
 {
     public class CommonReq
     {
@@ -25,4 +27,15 @@
     {
         public string warehouseId { get; set; }
     }
+
+    public class GetWarehouseConfigReq
+    {
+        public string deviceId { get; set; }
+    }
+
+    public class UpdateFingerReq
+    {
+        public string policeId { get; set; }
+        public List<PoliceFinger> fingerList { get; set; }
+    }
 }
\ No newline at end of file

WebApiNET6-master/APIs/Startup.cs

@@ -77,6 +77,7 @@ namespace APIs
             services.AddScoped<IPoliceFingerService, PoliceFingerService>();
             services.AddScoped<IBussinessInventoryService, BussinessInventoryService>();
             services.AddScoped<IBussinessInventoryDetailService, BussinessInventoryDetailService>();
+            services.AddScoped<IChannelService, ChannelService>();
             #endregion
 
             #region Repository
@@ -103,6 +104,7 @@ namespace APIs
             services.AddScoped<IPoliceFingerRepository, PoliceFingerRepository>();
             services.AddScoped<IBussinessInventoryRepository, BussinessInventoryRepository>();
             services.AddScoped<IBussinessInventoryDetailRepository, BussinessInventoryDetailRepository>();
+            services.AddScoped<IChannelRepository, ChannelRepository>();
             #endregion
 
             #region 注册RabbitMQ消费者

WebApiNET6-master/Models/ReqModel/RecordsReq.cs

@@ -64,12 +64,13 @@ namespace Common.Utility.Model
         public int? state { get; set; }
         public string warehouseId { get; set; }
         public string picture { get; set; }
+        public string policeId { get; set; }
     }
 
     public class HandResultReq
     {
         public OrderDetail order { get; set; }
         public List<LogSummary> logList { get; set; }
-        public List<Inventory>? purchaseList { get; set; }
     }
+
 }

WebApiNET6-master/Models/Table/Channel.cs

+using SqlSugar;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Models.Table
+{
+    [SugarTable("base_warehouse_channel")]
+    public class Channel : BaseTable
+    {
+        [SugarColumn(IsPrimaryKey = true)]
+        public string id { get; set; }
+
+        [SugarColumn(ColumnName = "warehouse_id")]
+        public string warehouseId { get; set; }
+
+        [SugarColumn(ColumnName = "config")]
+        public string config { get; set; }
+    }
+}

WebApiNET6-master/Models/Table/PoliceFinger.cs

@@ -30,5 +30,10 @@ namespace Models.Table
         ///</summary>
          [SugarColumn(ColumnName="finger_info"    )]
          public string fingerInfo { get; set; }
+        /// <summary>
+        /// 指纹编号
+        ///</summary>
+        [SugarColumn(ColumnName = "finger_num")]
+        public string fingerNum { get; set; }
     }
 }

WebApiNET6-master/Models/Table/Warehouse.cs

@@ -8,7 +8,7 @@ using System.Threading.Tasks;
 namespace Models.Table
 {
     [SugarTable("base_warehouse")]
-    public class Warehouse : BaseTable
+    public class Warehouse
     {
         [SugarColumn(IsPrimaryKey = true)]
         public string id { get; set; }

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

@@ -10,6 +10,6 @@ namespace Repositories.IRepository.IBussiness
     public interface IBussinessInventoryRepository : IBaseRepository<BussinessInventory>
     {
         Task<BussinessInventory>? GenerateInventoryOrder(BussinessInventory myBIOrder);
-        async Task<bool> OrderRollBack(BussinessInventory myBIOrder);
+        Task<bool> OrderRollBack(BussinessInventory myBIOrder);
     }
 }

WebApiNET6-master/Repositories/IRepository/IBussiness/IChannelRepository.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 IChannelRepository : IBaseRepository<Channel>
+    {
+    }
+}

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

 
+using Common.Utility.Model;
 using Models.SqlModel;
 using Models.Table;
 using System;
@@ -17,5 +18,6 @@ namespace Repositories.IRepository.IBussiness
 
         Task<bool> AddChannelLog(OrderMain? myOrder, LogSummary summary, List<Inventory> newInvs, Tuple<string, string> inv_states);
 
+        Task<bool> HandUploadResult(long? orgid, HandResultReq req);
     }
 }

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

@@ -9,5 +9,6 @@ namespace Repositories.IRepository.IBussiness
 {
     public interface IPoliceFingerRepository : IBaseRepository<PoliceFinger>
     {
+        Task<bool> UpdateFinger(string policeId, List<PoliceFinger> fingers);
     }
 }

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

+using Models.Table;
+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 ChannelRepository : BaseRepository<Channel>, IChannelRepository
+    {
+        public ChannelRepository(ILocalSugarUnitOfWork sugarUnitOfWork) : base(sugarUnitOfWork)
+        {
+
+        }
+    }
+}

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

 using AutoMapper;
+using Common.Utility.Model;
 using Models.SqlModel;
 using Models.Table;
 using Repositories.IRepository.IBussiness;
@@ -21,6 +22,176 @@ namespace Repositories.Repository.Bussiness
             _suger = sugarUnitOfWork;
         }
 
+        public async Task<bool> HandUploadResult(long? orgid, HandResultReq req)
+        {
+            using (var context = _suger.GetDbClient())
+            {
+                try
+                {
+                    context.BeginTran();
+
+                    //更新主单
+                    var mainOrder = context.Queryable<OrderMain>().First(x => x.id.Equals(req.order.orderId));
+                    mainOrder.actualQuantity += req.order.actualNum;
+                    mainOrder.price += req.order.price;
+                    mainOrder.updateTime = DateTime.Now;
+
+                    context.Updateable(mainOrder)
+                        .WhereColumns(s => new { s.actualQuantity, s.price, s.updateTime })
+                        .ExecuteCommand();
+
+                    //更新子单
+                    req.order.updateTime = DateTime.Now;
+                    context.Updateable(req.order)
+                        .WhereColumns(s => new { s.actualNum, s.price, s.updateTime })
+                        .PublicSetColumns(s => s.price, "+")//price += s.price
+                        .PublicSetColumns(s => s.actualNum, "+")
+                        .ExecuteCommand();
+
+                    //新装备
+                    bool isNewEqu = false;
+                    bool isPurchase = false;
+                    List<Inventory> newEquList = new List<Inventory>();
+                    List<PrintDetail> periodInfoList = new List<PrintDetail>();//采购装备质保期维保期生产日期等信息
+
+                    List<string> newEquOrderType = new List<string>() { "purchase", "gift", "allocate" };
+                    if (newEquOrderType.Contains(mainOrder.bussinessType) && mainOrder.orderType.Equals("in"))
+                    {
+                        isNewEqu = true;
+                        periodInfoList = context.Queryable<PrintDetail>().Where(s => s.orderId.Equals(mainOrder.id)).ToList();
+                        if (mainOrder.bussinessType.Equals("purchase"))
+                        {
+                            isPurchase = true;
+                        }
+                    }
+
+                    List<string> InventoryIds = new List<string>();
+
+                    //出入库记录
+                    var supplierDic = context.Queryable<Supplier>().ToList();
+
+                    req.logList.ForEach(s => 
+                    {
+                        s.isUpload = 0;
+                        s.useTime = DateTime.Now;
+                        s.createTime = DateTime.Now;
+                        s.updateTime = DateTime.Now;
+                        s.DetailList.ForEach(c =>
+                        {
+                            var mySup = supplierDic.FirstOrDefault(a => a.code.Equals(c.supplierName));
+
+                            if (!string.IsNullOrEmpty(c.inventoryId)) InventoryIds.Add(c.inventoryId);
+
+                            c.createTime = DateTime.Now;
+                            c.updateTime = DateTime.Now;
+                            c.errorState = 0;
+                            c.state = s.outInState == "in" ? 0 : 1;
+                            c.supplierId = mySup?.id;
+                            c.supplierName = mySup?.name;
+
+                            //新装备
+                            if (isNewEqu)
+                            {
+                                var equ = new Inventory()
+                                {
+                                    id = Guid.NewGuid().ToString(),
+                                    equipmentType = "0",
+                                    typeId = c.equipmentTypeId,
+                                    typeName = c.equipmentName,
+                                    sizeId = c.equipmentSizeId,
+                                    sizeName = c.equipmentSize,
+                                    supplierId = mySup?.id,
+                                    supplierName = mySup?.name,
+                                    epc = c.epc,
+                                    orgId = orgid,
+                                    state = "0",
+                                    lostFlag = "0",
+                                    price = c.price,
+                                    locationType = "0",
+                                    locationId = s.locationId,
+                                    equState = "normal",
+                                    bussinessState = "normal",
+                                    createTime = DateTime.Now,
+                                    updateTime = DateTime.Now,
+                                };
+
+                                c.inventoryId = equ.id;
+
+                                if (isPurchase)
+                                {
+                                    var myperiod = periodInfoList?.FirstOrDefault(b => b.sizeId.Equals(c.equipmentSizeId));
+                                    equ.state = "2";
+                                    equ.maintenancePeriod = myperiod?.maintenancePeriod?.ToString();
+                                    equ.warrantyPeriod = myperiod?.warrantyPeriod?.ToString();
+                                    equ.productionDate = myperiod?.productionDate;
+                                }
+                                newEquList.Add(equ);
+                            }
+                        });
+                    });
+
+                    context.Insertable(req).ExecuteCommand();
+
+                    if(newEquList != null && newEquList.Count() > 0)
+                    {
+                        context.Insertable(newEquList).ExecuteCommand();
+                    }
+
+                    #region 更新装备状态
+                    var target_bussinessState = "normal";
+                    var target_equState = "normal";
+
+                    if (mainOrder.orderType.Equals("out"))//获取装备应设为的状态
+                    {
+                        switch (mainOrder.bussinessType)
+                        {
+                            case "allocate":
+                                target_bussinessState = "transfer";
+                                break;
+                            case "use":
+                                target_bussinessState = "take";
+                                break;
+                            case "remove":
+                                target_bussinessState = "remove";
+                                break;
+                            case "destruction":
+                                target_bussinessState = "destruction";
+                                target_equState = "destory";
+                                break;
+                            case "repair":
+                                target_bussinessState = "repair";
+                                target_equState = "fix";
+                                break;
+                            default:
+                                break;
+                        }
+                    }
+
+                    if(InventoryIds.Count() > 0)
+                    {
+                        context.Updateable<Inventory>()
+                            .Where(s => InventoryIds.Contains(s.id))
+                            .ReSetValue(it => 
+                            { 
+                                it.bussinessState = target_bussinessState;
+                                it.equState = target_equState;
+                                it.updateTime = DateTime.Now;
+                            })
+                            .ExecuteCommand();
+                    }
+                    #endregion
+
+                    context.CommitTran();
+
+                    return true;
+                }
+                catch (Exception e)
+                {
+                    return false;
+                }
+            }
+        }
+
         public async Task<bool> AddChannelLog(OrderMain? myOrder, LogSummary summary, List<Inventory> newInvs, Tuple<string,string> inv_states)
         {
             using (var context = _suger.GetDbClient())
@@ -43,11 +214,12 @@ namespace Repositories.Repository.Bussiness
                     var logrs = context.InsertNav(summary).Include(z1 => z1.DetailList).ExecuteCommand();
 
                     //更新库存状态
+                    var state = newInvs != null && newInvs.Count() > 0 ? "2" : summary.outInState.Equals("out") ? "1" : "0";
                     var invIds = summary.DetailList.Select(a => a.inventoryId).ToList();
                     context.Updateable<Inventory>().Where(s => invIds.Contains(s.id))
                         .SetColumns(i => new Inventory() 
                         {  
-                            state = newInvs != null && newInvs.Count() > 0 ? "2" : summary.outInState.Equals("out") ? "1" : "0", 
+                            state = state, 
                             bussinessState = inv_states.Item1, 
                             equState = inv_states.Item2, 
                             updateTime = DateTime.Now 
@@ -169,5 +341,6 @@ namespace Repositories.Repository.Bussiness
             }
             return true;
         }
+
     }
 }

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

-using Models.Table;
+using AutoMapper;
+using Models.Table;
 using Repositories.IRepository.IBussiness;
 using Repositories.IRepository.IUnitOfWork;
 using System;
@@ -11,9 +12,41 @@ namespace Repositories.Repository.Bussiness
 {
     public class PoliceFingerRepository : BaseRepository<PoliceFinger>, IPoliceFingerRepository
     {
+        protected readonly ILocalSugarUnitOfWork _suger;
+        public IMapper mapper;
         public PoliceFingerRepository(ILocalSugarUnitOfWork sugarUnitOfWork) : base(sugarUnitOfWork)
         {
+            _suger = sugarUnitOfWork;
+        }
+
+        public async Task<bool> UpdateFinger(string policeId, List<PoliceFinger> fingers)
+        {
+            using (var context = _suger.GetDbClient())
+            {
+                try
+                {
+                    fingers.ForEach(s =>
+                    {
+                        s.policeId = policeId;
+                        s.createTime = DateTime.Now;
+                        s.updateTime = DateTime.Now;
+                    });
 
+                    //新增或更新
+                    var x = context.Storageable(fingers).ToStorage();
+                    x.AsInsertable.ExecuteCommand();
+                    x.AsUpdateable.WhereColumns(s => new { s.id, s.fingerNum })//查询字段
+                        .UpdateColumns(s => new { s.fingerInfo, s.updateTime })//更新字段
+                        .IgnoreColumns(s => new { s.policeId, s.fingerNum, s.createTime })//不更新字段
+                        .ExecuteCommand();
+
+                    return true;
+                }
+                catch (Exception e)
+                {
+                    return false;
+                }
+            }
         }
     }
 }

WebApiNET6-master/Services/BussinessInventoryService.cs

@@ -29,7 +29,7 @@ namespace Services
             return _bussinessInventoryRepository.GenerateInventoryOrder(myBIOrder);
         }
 
-        public async Task<bool> OrderRollBack(BussinessInventory myBIOrder)
+        public Task<bool> OrderRollBack(BussinessInventory myBIOrder)
         {
             return _bussinessInventoryRepository.OrderRollBack(myBIOrder);
         }

WebApiNET6-master/Services/ChannelService.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 ChannelService : BaseService<Channel>, IChannelService
+    {
+        private readonly IChannelRepository _channelRepository;
+        public ChannelService(IChannelRepository channelRepository)
+        {
+            base.BaseDal = channelRepository;
+            _channelRepository = channelRepository;
+        }
+
+    }
+}

WebApiNET6-master/Services/Interface/IBussinessInventoryService.cs

@@ -10,6 +10,6 @@ namespace Services.Interface
     public interface IBussinessInventoryService : IBaseServices<BussinessInventory>
     {
         Task<BussinessInventory>? GenerateInventoryOrder(BussinessInventory myBIOrder);
-        async Task<bool> OrderRollBack(BussinessInventory myBIOrder);
+        Task<bool> OrderRollBack(BussinessInventory myBIOrder);
     }
 }

WebApiNET6-master/Services/Interface/IChannelService.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 IChannelService : IBaseServices<Channel>
+    {
+    }
+}

WebApiNET6-master/Services/Interface/ILogService.cs

@@ -20,5 +20,7 @@ namespace Services.Interface
         Task<bool> AddHandLogs(HandRecordsReq model);
 
         Task<bool> AddChannelLog(OrderMain? myOrder, LogSummary summary, List<Inventory> newInvs);
+
+        Task<bool> HandUploadResult(long? orgid, HandResultReq req);
     }
 }

WebApiNET6-master/Services/Interface/IPoliceFingerService.cs

@@ -9,5 +9,6 @@ namespace Services.Interface
 {
     public interface IPoliceFingerService : IBaseServices<PoliceFinger>
     {
+        Task<bool> UpdateFinger(string policeId, List<PoliceFinger> fingers);
     }
 }

WebApiNET6-master/Services/LogService.cs

@@ -28,6 +28,11 @@ namespace Services
             mapper = _mapper;
         }
 
+        public Task<bool> HandUploadResult(long? orgid, HandResultReq req)
+        {
+            return _logSummaryRepository.HandUploadResult(orgid, req);
+        }
+
         public Task<bool> AddChannelLog(OrderMain? myOrder, LogSummary summary, List<Inventory> newInvs)
         {
             var rs1 = "normal";//bussiness_state
@@ -134,5 +139,6 @@ namespace Services
             }).ToList();
             return _logSummaryRepository.AddLogs(log, inveqList, invCarList);
         }
+
     }
 }

WebApiNET6-master/Services/PoliceFingerService.cs

@@ -18,5 +18,9 @@ namespace Services
             _policeFingerRepository = policeFingerRepository;
         }
 
+        public Task<bool> UpdateFinger(string policeId, List<PoliceFinger> fingers)
+        {
+            return _policeFingerRepository.UpdateFinger(policeId, fingers);
+        }
     }
 }