1、修改命名空间

2、增加UTF-8空格强转校验

src/WmsWebApi.Application.Contracts/Boms/BomDetailDto.cs

@@ -2,7 +2,8 @@
 using System.ComponentModel.DataAnnotations;
 using Volo.Abp.Application.Dtos;
 
-namespace WmsWebApi.Boms;
+namespace WmsWebApi.Boms
+{
 
 public class BomDetailDto : EntityDto
 {
@@ -38,3 +39,4 @@ public class BomDetailDto : EntityDto
     public string SANKA { get; set; }
     public string SANFE { get; set; }
 }
+}

src/WmsWebApi.Application.Contracts/Boms/BomDto.cs

@@ -5,8 +5,8 @@ using System.Runtime.Serialization;
 using System.Xml.Serialization;
 using Volo.Abp.Application.Dtos;
 
-namespace WmsWebApi.Boms;
+namespace WmsWebApi.Boms
-
+{ 
 public class BomDto : EntityDto
 {
     /// <summary>
@@ -60,3 +60,4 @@ public class BomDto : EntityDto
 
     public virtual List<BomDetailDto> items { get; set; }
 }
+}

src/WmsWebApi.Application.Contracts/Boms/IBomService.cs

@@ -2,7 +2,7 @@
 using System.Threading.Tasks;
 using Volo.Abp.Application.Services;
 
-namespace WmsWebApi.Boms;
+namespace WmsWebApi.Boms { 
 
 public interface IBomService : IApplicationService
 {
@@ -13,3 +13,4 @@ public interface IBomService : IApplicationService
 
     public Task<ReturnResult> AddAsync(object content);
 }
+}

src/WmsWebApi.Application.Contracts/Boms/ReturnResult.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace WmsWebApi.Boms;
+namespace WmsWebApi.Boms { 
 
 public class ReturnResult
 {
@@ -10,3 +10,4 @@ public class ReturnResult
 
     public string REQUEST_SYSTEM { get; set; } = "WinWMS";
 }
+}

src/WmsWebApi.Application.Contracts/OtherZll/IOtherZllService.cs

@@ -2,7 +2,7 @@
 using System.Threading.Tasks;
 using Volo.Abp.Application.Services;
 
-namespace WmsWebApi.OtherZll;
+namespace WmsWebApi.OtherZll {
 
 /// <summary>
 /// 其他领物料
@@ -16,3 +16,5 @@ public interface IOtherZllService : IApplicationService
 
     public Task<ReturnResult> AddAsync(object content);
 }
+
+}

src/WmsWebApi.Application.Contracts/OtherZll/OtherZllDto.cs

@@ -5,7 +5,9 @@ using System.Runtime.Serialization;
 using System.Xml.Serialization;
 using Volo.Abp.Application.Dtos;
 
-namespace WmsWebApi.OtherZll;
+namespace WmsWebApi.OtherZll
+{
+
 
 public class OtherZllDto : EntityDto
 {
@@ -61,3 +63,5 @@ public class OtherZllDto : EntityDto
     public string LGORT1 { get; set; }
 
 }
+
+}

src/WmsWebApi.Application.Contracts/OtherZll/ReturnResult.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace WmsWebApi.OtherZll;
+namespace WmsWebApi.OtherZll {
 
 public class ReturnResult
 {
@@ -10,3 +10,4 @@ public class ReturnResult
 
     public string REQUEST_SYSTEM { get; set; } = "WinWMS";
 }
+}

src/WmsWebApi.Application.Contracts/PPLan/IPPlanService.cs

@@ -2,17 +2,19 @@
 using System.Threading.Tasks;
 using Volo.Abp.Application.Services;
 
-namespace WmsWebApi.PPLan;
+namespace WmsWebApi.PPLan
-
-/// <summary>
-/// 计划
-/// </summary>
-public interface IPPlanService : IApplicationService
 {
+
+    /// <summary>
+    /// 计划
+    /// </summary>
+    public interface IPPlanService : IApplicationService
+    {
         /// <summary>
         /// 是否是请求重试
         /// </summary>
         public bool IsRequestRetry { get; set; }
 
         public Task<ReturnResult> AddAsync(object content);
+    }
 }

src/WmsWebApi.Application.Contracts/PPLan/PPlanDto.cs

@@ -5,10 +5,11 @@ using System.Runtime.Serialization;
 using System.Xml.Serialization;
 using Volo.Abp.Application.Dtos;
 
-namespace WmsWebApi.PPLan;
+namespace WmsWebApi.PPLan
-
-public class PPlanDto : EntityDto
 {
+
+    public class PPlanDto : EntityDto
+    {
         /// <summary>
         /// 计划订单中的订单结束日期
         /// </summary>
@@ -93,4 +94,5 @@ public class PPlanDto : EntityDto
         [Display(Name = "更改时间")]
         public string ZCTIME { get; set; }
 
+    }
 }

src/WmsWebApi.Application.Contracts/PPLan/ReturnResult.cs

@@ -1,12 +1,14 @@
 using System;
 
-namespace WmsWebApi.PPLan;
+namespace WmsWebApi.PPLan
-
-public class ReturnResult
 {
+
+    public class ReturnResult
+    {
         public char TYPE { get; set; } = 'S';
 
         public string MESSAGE { get; set; } = "接收成功！";
 
         public string REQUEST_SYSTEM { get; set; } = "WinWMS";
+    }
 }

src/WmsWebApi.Application.Contracts/Parts/IPartService.cs

@@ -2,7 +2,7 @@
 using System.Threading.Tasks;
 using Volo.Abp.Application.Services;
 
-namespace WmsWebApi.Parts;
+namespace WmsWebApi.Parts {
 
 /// <summary>
 /// 零件
@@ -16,3 +16,4 @@ public interface IPartService : IApplicationService
 
     public Task<ReturnResult> AddAsync(object content);
 }
+}

src/WmsWebApi.Application.Contracts/Parts/PartDetailDto.cs

@@ -2,7 +2,7 @@
 using System.ComponentModel.DataAnnotations;
 using Volo.Abp.Application.Dtos;
 
-namespace WmsWebApi.Parts;
+namespace WmsWebApi.Parts {
 
 public class PartDetailDto : EntityDto
 {
@@ -19,3 +19,4 @@ public class PartDetailDto : EntityDto
 
     public string CHARACT_DESCR { get; set; }
 }
+}

src/WmsWebApi.Application.Contracts/Parts/PartDto.cs

@@ -5,8 +5,7 @@ using System.Runtime.Serialization;
 using System.Xml.Serialization;
 using Volo.Abp.Application.Dtos;
 
-namespace WmsWebApi.Parts;
+namespace WmsWebApi.Parts { 
-
 public class PartDto : EntityDto
 {
 
@@ -518,3 +517,4 @@ public class PartDto : EntityDto
     [DataMember, XmlArray("partDetails")]
     public virtual List<PartDetailDto> zzchar { get; set; }
 }
+}

src/WmsWebApi.Application.Contracts/Parts/ReturnResult.cs

@@ -1,9 +1,10 @@
 using System;
 
-namespace WmsWebApi.Parts;
+namespace WmsWebApi.Parts
-
-public class ReturnResult
 {
+
+    public class ReturnResult
+    {
         public char TYPE { get; set; } = 'S';
 
         public string MESSAGE { get; set; } = "接收成功！";
@@ -13,4 +14,5 @@ public class ReturnResult
         public string MESSAGE_V2 { get; set; } = DateTime.Now.ToString("HH:mm:ss");
 
         public string REQUEST_SYSTEM { get; set; } = "WinWMS";
+    }
 }

src/WmsWebApi.Application.Contracts/ProductRecieve/IProductRecieveService.cs

@@ -2,17 +2,19 @@
 using System.Threading.Tasks;
 using Volo.Abp.Application.Services;
 
-namespace WmsWebApi.ProductRecieve;
+namespace WmsWebApi.ProductRecieve
-
-/// <summary>
-/// Agv完工收货入库
-/// </summary>
-public interface IProductRecieveService : IApplicationService
 {
+
+    /// <summary>
+    /// Agv完工收货入库
+    /// </summary>
+    public interface IProductRecieveService : IApplicationService
+    {
         /// <summary>
         /// 是否是请求重试
         /// </summary>
         public bool IsRequestRetry { get; set; }
 
         public Task<ReturnResult> AddAsync(object content);
+    }
 }

src/WmsWebApi.Application.Contracts/ProductRecieve/PRDetailDto.cs

@@ -2,11 +2,12 @@
 using System.ComponentModel.DataAnnotations;
 using Volo.Abp.Application.Dtos;
 
-namespace WmsWebApi.ProductRecieve;
+namespace WmsWebApi.ProductRecieve
-
-public class PRDetailDto : EntityDto
 {
 
+    public class PRDetailDto : EntityDto
+    {
+
         public string BarCode { get; set; }
 
         public string Batch { get; set; }
@@ -38,4 +39,5 @@ public class PRDetailDto : EntityDto
         public string TraceBackCode { get; set; }
 
         public string Unit { get; set; }
+    }
 }

src/WmsWebApi.Application.Contracts/ProductRecieve/PRDto.cs

@@ -5,10 +5,11 @@ using System.Runtime.Serialization;
 using System.Xml.Serialization;
 using Volo.Abp.Application.Dtos;
 
-namespace WmsWebApi.ProductRecieve;
+namespace WmsWebApi.ProductRecieve
-
-public class PRDto : EntityDto
 {
+
+    public class PRDto : EntityDto
+    {
         /// <summary>
         /// 过账日期
         /// </summary>
@@ -48,4 +49,5 @@ public class PRDto : EntityDto
         public string SourceBillNum { get; set; }
 
         public virtual List<PRDetailDto> items { get; set; }
+    }
 }

src/WmsWebApi.Application.Contracts/ProductRecieve/ReturnResult.cs

@@ -1,12 +1,14 @@
 using System;
 
-namespace WmsWebApi.ProductRecieve;
+namespace WmsWebApi.ProductRecieve
-
-public class ReturnResult
 {
+
+    public class ReturnResult
+    {
         public char TYPE { get; set; } = 'S';
 
         public string MESSAGE { get; set; } = "接收成功！";
 
         public string REQUEST_SYSTEM { get; set; } = "WinWMS";
+    }
 }

src/WmsWebApi.Application.Contracts/Purchase/IPurchaseService.cs

@@ -2,7 +2,7 @@
 using System.Threading.Tasks;
 using Volo.Abp.Application.Services;
 
-namespace WmsWebApi.Purchase;
+namespace WmsWebApi.Purchase { 
 
 /// <summary>
 /// 采购
@@ -16,3 +16,4 @@ public interface IPurchaseService : IApplicationService
 
     public Task<ReturnResult> AddAsync(object content);
 }
+}

src/WmsWebApi.Application.Contracts/Purchase/PurchaseDetailDto.cs

@@ -2,7 +2,7 @@
 using System.ComponentModel.DataAnnotations;
 using Volo.Abp.Application.Dtos;
 
-namespace WmsWebApi.Purchase;
+namespace WmsWebApi.Purchase { 
 
 public class PurchaseDetailDto : EntityDto
 {
@@ -24,3 +24,4 @@ public class PurchaseDetailDto : EntityDto
     public string EBELP { get; set; }
     public string BWART { get; set; }
 }
+}

src/WmsWebApi.Application.Contracts/Purchase/PurchaseDto.cs

@@ -5,7 +5,7 @@ using System.Runtime.Serialization;
 using System.Xml.Serialization;
 using Volo.Abp.Application.Dtos;
 
-namespace WmsWebApi.Purchase;
+namespace WmsWebApi.Purchase { 
 
 public class PurchaseDto : EntityDto
 {
@@ -28,3 +28,4 @@ public class PurchaseDto : EntityDto
 
     public virtual List<PurchaseDetailDto> zzmseg { get; set; }
 }
+}

src/WmsWebApi.Application.Contracts/Purchase/ReturnResult.cs

@@ -1,12 +1,14 @@
 using System;
 
-namespace WmsWebApi.Purchase;
+namespace WmsWebApi.Purchase
-
-public class ReturnResult
 {
+
+    public class ReturnResult
+    {
         public char TYPE { get; set; } = 'S';
 
         public string MESSAGE { get; set; } = "接收成功！";
 
         public string REQUEST_SYSTEM { get; set; } = "WinWMS";
+    }
 }

src/WmsWebApi.Application.Contracts/StockMove/IStockMoveService.cs

@@ -2,17 +2,19 @@
 using System.Threading.Tasks;
 using Volo.Abp.Application.Services;
 
-namespace WmsWebApi.StockMove;
+namespace WmsWebApi.StockMove
-
-/// <summary>
-/// Agv出入库
-/// </summary>
-public interface IStockMoveService : IApplicationService
 {
+
+    /// <summary>
+    /// Agv出入库
+    /// </summary>
+    public interface IStockMoveService : IApplicationService
+    {
         /// <summary>
         /// 是否是请求重试
         /// </summary>
         public bool IsRequestRetry { get; set; }
 
         public Task<ReturnResult> AddAsync(object content);
+    }
 }

src/WmsWebApi.Application.Contracts/StockMove/ReturnResult.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace WmsWebApi.StockMove;
+namespace WmsWebApi.StockMove { 
 
 public class ReturnResult
 {
@@ -10,3 +10,4 @@ public class ReturnResult
 
     public string REQUEST_SYSTEM { get; set; } = "WinWMS";
 }
+}

src/WmsWebApi.Application.Contracts/StockMove/SSDetailDto.cs

@@ -2,7 +2,7 @@
 using System.ComponentModel.DataAnnotations;
 using Volo.Abp.Application.Dtos;
 
-namespace WmsWebApi.StockMove;
+namespace WmsWebApi.StockMove { 
 
 public class SSDetailDto : EntityDto
 {
@@ -39,3 +39,4 @@ public class SSDetailDto : EntityDto
 
     public string Unit { get; set; }
 }
+}

src/WmsWebApi.Application.Contracts/StockMove/SSDto.cs

@@ -5,7 +5,7 @@ using System.Runtime.Serialization;
 using System.Xml.Serialization;
 using Volo.Abp.Application.Dtos;
 
-namespace WmsWebApi.StockMove;
+namespace WmsWebApi.StockMove { 
 
 public class SSDto : EntityDto
 {
@@ -49,3 +49,4 @@ public class SSDto : EntityDto
 
     public virtual List<SSDetailDto> items { get; set; }
 }
+}

src/WmsWebApi.Application.Contracts/ZlldcjLogs/IZlldcjLogAppService.cs

@@ -3,12 +3,12 @@ using System.Collections.Generic;
 using System.Threading.Tasks;
 using Volo.Abp.Application.Services;
 
-namespace WmsWebApi.ZlldcjLogs;
+namespace WmsWebApi.ZlldcjLogs { 
 
 /// <summary>
 /// 领物料
 /// </summary>
-public interface IZlldcjLogAppService :IApplicationService
+public interface IZlldcjLogAppService : IApplicationService
 {
     /// <summary>
     /// 是否是请求重试
@@ -21,3 +21,4 @@ public interface IZlldcjLogAppService :IApplicationService
 
     public Task<ReturnResult> CloseAsync(object content);
 }
+}

src/WmsWebApi.Application.Contracts/ZlldcjLogs/ReturnResult.cs

@@ -1,7 +1,7 @@
 using Microsoft.AspNetCore.Mvc;
 using System.Threading.Tasks;
 
-namespace WmsWebApi.ZlldcjLogs;
+namespace WmsWebApi.ZlldcjLogs { 
 
 public class ReturnResult
 {
@@ -16,3 +16,4 @@ public class ReturnResult
 
     }
 }
+}

src/WmsWebApi.Application.Contracts/ZlldcjLogs/ZlldcjLog.cs

@@ -2,9 +2,9 @@
 using System.ComponentModel.DataAnnotations;
 using Volo.Abp.Application.Dtos;
 
-namespace WmsWebApi.ZlldcjLogs;
+namespace WmsWebApi.ZlldcjLogs { 
 
-public class ZlldcjLogDto:EntityDto
+public class ZlldcjLogDto : EntityDto
 {
     /// <summary>
     /// 单据号
@@ -161,7 +161,8 @@ public class ZlldcjLogDto:EntityDto
     /// </summary>
     [Display(Name = "交货项目")]
     public string POSNR { get; set; }
-/*
+    /*
         [Display(Name = "接口类型")]
         public string IType { get; set; }*/
 }
+}

src/WmsWebApi.Application/Boms/BomService.cs

@@ -16,11 +16,12 @@ using WmsWebApi.EntityFrameworkCore;
 using WmsWebApi.Jsons;
 using WmsWebApi.Wms;
 
-namespace WmsWebApi.Boms;
+namespace WmsWebApi.Boms
-
-[Route("/api/bom")]
-public class BomService : ApplicationService, IBomService
 {
+
+    [Route("/api/bom")]
+    public class BomService : ApplicationService, IBomService
+    {
         private readonly ITmPgPartgroupRepository _tmPgPartgroupRepository;
         private readonly ITaBomRepository _taBomRepository;
         private readonly ITaPartRepository _taPartRepository;
@@ -303,4 +304,5 @@ public class BomService : ApplicationService, IBomService
                 await uow.SaveChangesAsync();
             }
         }
+    }
 }

src/WmsWebApi.Application/OtherZll/OtherZllService.cs

@@ -18,14 +18,15 @@ using WmsWebApi.Jsons;
 using WmsWebApi.Options;
 using WmsWebApi.Wms;
 
-namespace WmsWebApi.OtherZll;
+namespace WmsWebApi.OtherZll
-
-/// <summary>
-/// 其他领物料
-/// </summary>
-[Route("/api/OtherZll")]
-public class OtherZllService : ApplicationService, IOtherZllService
 {
+
+    /// <summary>
+    /// 其他领物料
+    /// </summary>
+    [Route("/api/OtherZll")]
+    public class OtherZllService : ApplicationService, IOtherZllService
+    {
         private readonly ITsStockDetailRepository _tsStockDetailRepository;
         private readonly ITbProductReceiveRepository _tbProductReceiveRepository;
         private readonly ITbBillRepository _tbBillRepository;
@@ -443,4 +444,5 @@ public class OtherZllService : ApplicationService, IOtherZllService
                 await uow.SaveChangesAsync();
             }
         }
+    }
 }

src/WmsWebApi.Application/PPlan/PPlanService.cs

@@ -14,14 +14,15 @@ using WmsWebApi.Jsons;
 using WmsWebApi.PPLan;
 using WmsWebApi.Wms;
 
-namespace WmsWebApi.PPlan;
+namespace WmsWebApi.PPlan
-
-/// <summary>
-/// 计划
-/// </summary>
-[Route("/api/PPlan")]
-public class PPlanService : ApplicationService, IPPlanService
 {
+
+    /// <summary>
+    /// 计划
+    /// </summary>
+    [Route("/api/PPlan")]
+    public class PPlanService : ApplicationService, IPPlanService
+    {
         private readonly ITmPgPartgroupRepository _tmPgPartgroupRepository;
         private readonly ITmPgPlanRepository _tmPgPlanRepository;
         private readonly ITbBillRepository _tbBillRepository;
@@ -75,7 +76,7 @@ public class PPlanService : ApplicationService, IPPlanService
         {
             var result = new ReturnResult();
             PPlanDto _planDto;
-        bool bUpdate = false,bOtherWork = false,bErr = false;
+            bool bUpdate = false, bOtherWork = false, bErr = false;
             try
             {
                 _planDto = JsonConvert.DeserializeObject<PPlanDto>(content.ToString());
@@ -262,4 +263,5 @@ public class PPlanService : ApplicationService, IPPlanService
                 await uow.SaveChangesAsync();
             }
         }
+    }
 }

src/WmsWebApi.Application/ProductRecieve/ProductRecieveService.cs

@@ -21,7 +21,7 @@ using WmsWebApi.Wms;
 using WmsWebApi.WMS;
 using WmsWebApi.WMS.IRepository;
 
-namespace WmsWebApi.ProductRecieve;
+namespace WmsWebApi.ProductRecieve { 
 
 /// <summary>
 /// Agv完工收货入库
@@ -401,3 +401,4 @@ public class ProductRecieveService : ApplicationService, IProductRecieveService
         }
     }
 }
+}

src/WmsWebApi.Application/Purchase/PurchaseService.cs

@@ -17,7 +17,7 @@ using WmsWebApi.Jsons;
 using WmsWebApi.Purchase;
 using WmsWebApi.Wms;
 
-namespace WmsWebApi.PPlan;
+namespace WmsWebApi.PPlan {
 
 /// <summary>
 /// 采购
@@ -84,7 +84,7 @@ public class PurchaseService : ApplicationService, IPurchaseService
     {
         var result = new ReturnResult();
         PurchaseDto _purchaseDto;
-        bool bUpdate = false,bOtherWork = false,bErr = false;
+        bool bUpdate = false, bOtherWork = false, bErr = false;
         bool bTypeErr = false;
         try
         {
@@ -110,7 +110,7 @@ public class PurchaseService : ApplicationService, IPurchaseService
         try
         {
             var _dtoDetails = _purchaseDto.zzmseg.Where(p => p.WERKS == "1000");
-            if(_dtoDetails == null || _dtoDetails.Count() == 0)
+            if (_dtoDetails == null || _dtoDetails.Count() == 0)
             {
                 bOtherWork = true;
                 result.MESSAGE = "err:没有1000工厂数据!";
@@ -132,7 +132,7 @@ public class PurchaseService : ApplicationService, IPurchaseService
                     {
                         var tbBill = new TB_BILL
                         {
-                            BillNum = _purchaseDto.MBLNR+"."+po,
+                            BillNum = _purchaseDto.MBLNR + "." + po,
                             SourceBillNum2 = _purchaseDto.MBLNR,
                             BillTime = DateTime.Now,
                             StartTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"),
@@ -148,7 +148,7 @@ public class PurchaseService : ApplicationService, IPurchaseService
                         //_billList.Add(tbBill);
                         bool bHaveDetails = false;
 
-                        var newDtoList = _dtoDetails.Where(p=>p.EBELN == po).GroupBy(x => new { x.MATNR, x.CHARG }).
+                        var newDtoList = _dtoDetails.Where(p => p.EBELN == po).GroupBy(x => new { x.MATNR, x.CHARG }).
                             Select(group => new
                             {
                                 MATNR = group.Key.MATNR,
@@ -167,7 +167,7 @@ public class PurchaseService : ApplicationService, IPurchaseService
                                 result.MESSAGE += $"err:物料 {item.MATNR} 不在WinWMS管理!";
                                 continue;
                             }
-                            if(!part.IsAskMerge)
+                            if (!part.IsAskMerge)
                             {
                                 //result.TYPE = 'E';
                                 bTypeErr = true;
@@ -341,7 +341,7 @@ public class PurchaseService : ApplicationService, IPurchaseService
                             }
                             bHaveDetails = true;
                         }
-                        if(bHaveDetails)
+                        if (bHaveDetails)
                             _billList.Add(tbBill);
                     }
                     if (!bErr)
@@ -350,9 +350,9 @@ public class PurchaseService : ApplicationService, IPurchaseService
                         await _tbProductReceiveRepository.AddAsync(_recieveList);
                         if (_stockList != null && _stockList.Count() > 0)
                             await _tsStockDetailRepository.AddAsync(_stockList);
-                        if(_stockUpdateList != null && _stockUpdateList.Count() > 0)
+                        if (_stockUpdateList != null && _stockUpdateList.Count() > 0)
                             await _tmPgWmsUpdate.UpdateTsStock(_stockUpdateList);
-                        if(_stockDelList != null && _stockDelList.Count() > 0)
+                        if (_stockDelList != null && _stockDelList.Count() > 0)
                             await _tmPgWmsUpdate.DeleteTsStock(_stockDelList);
                         await _tlTransactionRepository.AddAsync(_transList);
                     }
@@ -366,7 +366,7 @@ public class PurchaseService : ApplicationService, IPurchaseService
             }
             await CurrentUnitOfWork.SaveChangesAsync();
         }
-        catch(Exception ex)
+        catch (Exception ex)
         {
             bErr = true;
             dto.EnumRetryStatus = Enums.EnumRetryStatus.WaitRetry;
@@ -450,3 +450,4 @@ public class PurchaseService : ApplicationService, IPurchaseService
         }
     }
 }
+}

src/WmsWebApi.Application/StockMove/StockMoveService.cs

@@ -23,7 +23,7 @@ using WmsWebApi.Wms;
 using WmsWebApi.WMS;
 using WmsWebApi.WMS.IRepository;
 
-namespace WmsWebApi.StockMove;
+namespace WmsWebApi.StockMove { 
 
 /// <summary>
 /// Agv出入库
@@ -570,3 +570,4 @@ public class StockMoveService : ApplicationService, IStockMoveService
         }
     }
 }
+}

src/WmsWebApi.Application/TbParts/PartService.cs

@@ -5,6 +5,7 @@ using Polly;
 using Polly.Retry;
 using System;
 using System.Linq;
+using System.Text;
 using System.Threading.Tasks;
 using Volo.Abp.Application.Services;
 using Volo.Abp.Domain.Repositories;
@@ -14,8 +15,8 @@ using WmsWebApi.EntityFrameworkCore;
 using WmsWebApi.Jsons;
 using WmsWebApi.Wms;
 
-namespace WmsWebApi.Parts;
+namespace WmsWebApi.Parts 
-
+{
 /// <summary>
 /// 零件
 /// </summary>
@@ -71,10 +72,14 @@ public class PartService : ApplicationService, IPartService
     {
         var result = new ReturnResult();
         PartDto _part;
-        bool bUpdate = false,bOtherWork = false,bErr = false;
+        bool bUpdate = false, bOtherWork = false, bErr = false;
         try
         {
-            _part = JsonConvert.DeserializeObject<PartDto>(content.ToString());
+                string contentstr = content.ToString();
+                byte[] space = new byte[] { 0xc2, 0xa0 };
+                string UTFSpace = Encoding.GetEncoding("UTF-8").GetString(space);
+                contentstr = contentstr.Replace(UTFSpace, " ");
+                _part = JsonConvert.DeserializeObject<PartDto>(contentstr.ToString());
         }
         catch (Exception ex)
         {
@@ -365,3 +370,4 @@ public class PartService : ApplicationService, IPartService
         }
     }
 }
+}

src/WmsWebApi.Application/ZlldcjLogs/ZlldcjLogAppService.cs

@@ -18,7 +18,7 @@ using WmsWebApi.Enums;
 using WmsWebApi.Jsons;
 using WmsWebApi.Wms;
 
-namespace WmsWebApi.ZlldcjLogs;
+namespace WmsWebApi.ZlldcjLogs { 
 
 /// <summary>
 /// 领物料
@@ -447,3 +447,4 @@ public class ZlldcjLogAppService : ApplicationService, IZlldcjLogAppService
         return result;
     }
 }
+}

src/WmsWebApi.Domain/Boms/BomManager.cs

@@ -9,10 +9,11 @@ using Volo.Abp.Domain.Services;
 using WmsWebApi.TbOrfers;
 using WmsWebApi.Wms;
 
-namespace WmsWebApi.Boms;
+namespace WmsWebApi.Boms
-
-public class BomManager : DomainService, IBomManager
 {
+
+    public class BomManager : DomainService, IBomManager
+    {
         private readonly IRepository<WmsWebApiBOMDTO, Guid> _bomDtoRepository;
         private readonly IRepository<WmsWebApiBom, Guid> _bomRepository;
         private readonly IRepository<WmsWebApiBomDetail, Guid> _bomDetailRepository;
@@ -47,4 +48,5 @@ public class BomManager : DomainService, IBomManager
             await _bomDetailRepository.InsertManyAsync(bomDetails);
             return bomDetails[0];
         }
+    }
 }

src/WmsWebApi.Domain/Boms/IBomManager.cs

@@ -1,12 +1,14 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
 
-namespace WmsWebApi.Boms;
+namespace WmsWebApi.Boms
-
-public interface IBomManager
 {
+
+    public interface IBomManager
+    {
         Task<WmsWebApiBOMDTO> AddAsync(WmsWebApiBOMDTO part);
 
         Task<WmsWebApiBom> AddBomAsync(WmsWebApiBom bom);
         Task<WmsWebApiBomDetail> AddBomDetailAsync(List<WmsWebApiBomDetail> bomDetails);
+    }
 }

src/WmsWebApi.Domain/OtherZll/IOtherZllManager.cs

@@ -1,9 +1,11 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
 
-namespace WmsWebApi.OtherZll;
+namespace WmsWebApi.OtherZll
-
-public interface IOtherZllManager
 {
+
+    public interface IOtherZllManager
+    {
         Task<WmsWebApiOtherZLLDTO> AddAsync(WmsWebApiOtherZLLDTO dto);
+    }
 }

src/WmsWebApi.Domain/OtherZll/OtherZllManager.cs

@@ -9,10 +9,11 @@ using Volo.Abp.Domain.Services;
 using WmsWebApi.TbOrfers;
 using WmsWebApi.Wms;
 
-namespace WmsWebApi.OtherZll;
+namespace WmsWebApi.OtherZll
-
-public class OtherZllManager : DomainService, IOtherZllManager
 {
+
+    public class OtherZllManager : DomainService, IOtherZllManager
+    {
         private readonly IRepository<WmsWebApiOtherZLLDTO, Guid> _otherZLLDTORepository;
 
         public OtherZllManager(
@@ -30,4 +31,5 @@ public class OtherZllManager : DomainService, IOtherZllManager
             return dto;
         }
 
+    }
 }

src/WmsWebApi.Domain/PPlan/IPPlanManager.cs

@@ -1,9 +1,11 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
 
-namespace WmsWebApi.PPlan;
+namespace WmsWebApi.PPlan
-
-public interface IPPlanManager
 {
+
+    public interface IPPlanManager
+    {
         Task<WmsWebApiPPLANDTO> AddAsync(WmsWebApiPPLANDTO pplan);
+    }
 }

src/WmsWebApi.Domain/PPlan/PPlanManager.cs

@@ -9,10 +9,11 @@ using Volo.Abp.Domain.Services;
 using WmsWebApi.TbOrfers;
 using WmsWebApi.Wms;
 
-namespace WmsWebApi.PPlan;
+namespace WmsWebApi.PPlan
-
-public class PPlanManager : DomainService, IPPlanManager
 {
+
+    public class PPlanManager : DomainService, IPPlanManager
+    {
         private readonly IRepository<WmsWebApiPPLANDTO, Guid> _bomDtoRepository;
 
         public PPlanManager(
@@ -30,4 +31,5 @@ public class PPlanManager : DomainService, IPPlanManager
             return pplan;
         }
 
+    }
 }

src/WmsWebApi.Domain/Parts/IPartManager.cs

@@ -1,9 +1,11 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
 
-namespace WmsWebApi.Parts;
+namespace WmsWebApi.Parts
-
-public interface IPartManager
 {
+
+    public interface IPartManager
+    {
         Task<WmsWebApiPARTDTO> AddAsync(WmsWebApiPARTDTO part);
+    }
 }

src/WmsWebApi.Domain/Parts/PartManager.cs

@@ -9,10 +9,11 @@ using Volo.Abp.Domain.Services;
 using WmsWebApi.TbOrfers;
 using WmsWebApi.Wms;
 
-namespace WmsWebApi.Parts;
+namespace WmsWebApi.Parts
-
-public class PartManager : DomainService, IPartManager
 {
+
+    public class PartManager : DomainService, IPartManager
+    {
         private readonly IRepository<WmsWebApiPARTDTO, Guid> _partDtoRepository;
 
         public PartManager(
@@ -30,4 +31,5 @@ public class PartManager : DomainService, IPartManager
             return part;
         }
 
+    }
 }

src/WmsWebApi.Domain/ProductRecieve/IProductRecieveManager.cs

@@ -1,9 +1,11 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
 
-namespace WmsWebApi.Domain;
+namespace WmsWebApi.Domain
-
-public interface IProductRecieveManager
 {
+
+    public interface IProductRecieveManager
+    {
         Task<WmsWebApiProductRecieveDTO> AddAsync(WmsWebApiProductRecieveDTO part);
+    }
 }

src/WmsWebApi.Domain/ProductRecieve/ProductRecieveManager.cs

@@ -9,10 +9,11 @@ using Volo.Abp.Domain.Services;
 using WmsWebApi.TbOrfers;
 using WmsWebApi.Wms;
 
-namespace WmsWebApi.Domain;
+namespace WmsWebApi.Domain
-
-public class ProductRecieveManager : DomainService, IProductRecieveManager
 {
+
+    public class ProductRecieveManager : DomainService, IProductRecieveManager
+    {
         private readonly IRepository<WmsWebApiProductRecieveDTO, Guid> _partDtoRepository;
 
         public ProductRecieveManager(
@@ -30,4 +31,5 @@ public class ProductRecieveManager : DomainService, IProductRecieveManager
             return part;
         }
 
+    }
 }

src/WmsWebApi.Domain/Purchase/IPurchaseManager.cs

@@ -1,9 +1,11 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
 
-namespace WmsWebApi.Purchase;
+namespace WmsWebApi.Purchase
-
-public interface IPurchaseManager
 {
+
+    public interface IPurchaseManager
+    {
         Task<WmsWebApiPURCHASEDTO> AddAsync(WmsWebApiPURCHASEDTO dto);
+    }
 }

src/WmsWebApi.Domain/Purchase/PurchaseManager.cs

@@ -9,7 +9,7 @@ using Volo.Abp.Domain.Services;
 using WmsWebApi.TbOrfers;
 using WmsWebApi.Wms;
 
-namespace WmsWebApi.Purchase;
+namespace WmsWebApi.Purchase { 
 
 public class PurchaseManager : DomainService, IPurchaseManager
 {
@@ -31,3 +31,4 @@ public class PurchaseManager : DomainService, IPurchaseManager
     }
 
 }
+}

src/WmsWebApi.Domain/StockMove/IStockMoveManager.cs

@@ -1,9 +1,10 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
 
-namespace WmsWebApi.Domain;
+namespace WmsWebApi.Domain { 
 
 public interface IStockMoveManager
 {
     Task<WmsWebApiStockMoveDTO> AddAsync(WmsWebApiStockMoveDTO part);
 }
+}

src/WmsWebApi.Domain/StockMove/StockMoveManager.cs

@@ -9,7 +9,7 @@ using Volo.Abp.Domain.Services;
 using WmsWebApi.TbOrfers;
 using WmsWebApi.Wms;
 
-namespace WmsWebApi.Domain;
+namespace WmsWebApi.Domain { 
 
 public class StockMoveManager : DomainService, IStockMoveManager
 {
@@ -31,3 +31,4 @@ public class StockMoveManager : DomainService, IStockMoveManager
     }
 
 }
+}

src/WmsWebApi.Domain/TbOrfers/TbOrder.cs

@@ -1,11 +1,12 @@
 using System;
 using Volo.Abp.Domain.Entities;
 
-namespace WmsWebApi.TbOrfers;
+namespace WmsWebApi.TbOrfers { 
 
-public class TbOrder:BasicAggregateRoot<Guid>
+public class TbOrder : BasicAggregateRoot<Guid>
 {
     public string OrderNumber { get; set; }
 
     public int Status { get; set; }
 }
+}

src/WmsWebApi.Domain/WMS/TbBillExtensions.cs

@@ -1,10 +1,11 @@
 using Volo.Abp;
 using WmsWebApi.Wms;
 
-namespace WmsWebApi.Wms;
+namespace WmsWebApi.Wms
-
-public static class TbBillExtensions
 {
+
+    public static class TbBillExtensions
+    {
         public static void CheckStatusIsOpen(this TB_BILL exist)
         {
             if (exist.State == 9)
@@ -21,7 +22,7 @@ public static class TbBillExtensions
             }
         }
 
-    public static void CheckIsExist(this TB_BILL exist,string orderNumber)
+        public static void CheckIsExist(this TB_BILL exist, string orderNumber)
         {
             if (exist == null)
             {
@@ -45,4 +46,5 @@ public static class TbBillExtensions
             }
         }
 
+    }
 }

src/WmsWebApi.Domain/ZlldcjLogs/IZlldcjLogManager.cs

@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
 
-namespace WmsWebApi.ZlldcjLogs;
+namespace WmsWebApi.ZlldcjLogs { 
 
 public interface IZlldcjLogManager
 {
@@ -9,3 +9,4 @@ public interface IZlldcjLogManager
     Task<ZlldcjLog> CloseAsync(List<ZlldcjLog> zlldcjLogs);
     Task<WmsWebApiZLLDCJDTO> AddDtoAsync(WmsWebApiZLLDCJDTO dto);
 }
+}

src/WmsWebApi.Domain/ZlldcjLogs/WmsWebApiZLLDCJDTO.cs

@@ -6,7 +6,7 @@ using Volo.Abp.Domain.Entities.Auditing;
 using Volo.Abp.Guids;
 using WmsWebApi.Enums;
 
-namespace WmsWebApi.ZlldcjLogs;
+namespace WmsWebApi.ZlldcjLogs { 
 
 public class WmsWebApiZLLDCJDTO : BasicAggregateRoot<Guid>
 {
@@ -43,3 +43,4 @@ public class WmsWebApiZLLDCJDTO : BasicAggregateRoot<Guid>
         this.Id = guidGenerator.Create();
     }
 }
+}

src/WmsWebApi.Domain/ZlldcjLogs/ZlldcjLog.cs

@@ -3,9 +3,9 @@ using System.ComponentModel.DataAnnotations;
 using Volo.Abp.Domain.Entities.Auditing;
 using Volo.Abp.Guids;
 
-namespace WmsWebApi.ZlldcjLogs;
+namespace WmsWebApi.ZlldcjLogs { 
 
-public class ZlldcjLog:CreationAuditedAggregateRoot<Guid>
+public class ZlldcjLog : CreationAuditedAggregateRoot<Guid>
 {
     /// <summary>
     /// 单据号
@@ -174,3 +174,4 @@ public class ZlldcjLog:CreationAuditedAggregateRoot<Guid>
     [Display(Name = "接口类型")]
     public string IType { get; set; }
 }
+}

src/WmsWebApi.Domain/ZlldcjLogs/ZlldcjLogExtensions.cs

@@ -1,7 +1,7 @@
 using Volo.Abp;
 using WmsWebApi.TbOrfers;
 
-namespace WmsWebApi.ZlldcjLogs;
+namespace WmsWebApi.ZlldcjLogs { 
 
 public static class ZlldcjLogExtensions
 {
@@ -13,7 +13,7 @@ public static class ZlldcjLogExtensions
         }
     }
 
-    public static void CheckIsExist(this TbOrder exist,string orderNumber)
+    public static void CheckIsExist(this TbOrder exist, string orderNumber)
     {
         if (exist == null)
         {
@@ -30,3 +30,4 @@ public static class ZlldcjLogExtensions
     }
 
 }
+}

src/WmsWebApi.Domain/ZlldcjLogs/ZlldcjLogManager.cs

@@ -9,10 +9,11 @@ using Volo.Abp.Domain.Services;
 using WmsWebApi.TbOrfers;
 using WmsWebApi.Wms;
 
-namespace WmsWebApi.ZlldcjLogs;
+namespace WmsWebApi.ZlldcjLogs
-
-public class ZlldcjLogManager:DomainService,IZlldcjLogManager
 {
+
+    public class ZlldcjLogManager : DomainService, IZlldcjLogManager
+    {
         private readonly IRepository<ZlldcjLog, Guid> _zlldcjLogsRepository;
         private readonly IRepository<WmsWebApiZLLDCJDTO, Guid> _zlldcjDtoRepository;
         private readonly ITbBillRepository _tbBillRepository;
@@ -21,7 +22,7 @@ public class ZlldcjLogManager:DomainService,IZlldcjLogManager
         //private readonly ITmOtherAskRepositoryUpdate _tmOtherAskRepositoryUpdate;
 
         public ZlldcjLogManager(
-        IRepository<ZlldcjLog,Guid> zlldcjLogsRepository
+            IRepository<ZlldcjLog, Guid> zlldcjLogsRepository
             , IRepository<WmsWebApiZLLDCJDTO, Guid> zlldcjDtoRepository
             , ITbBillRepository tbBillRepository
             , ITmSapMoveTypeRepository tbSapMoveTypeRepository
@@ -56,7 +57,7 @@ public class ZlldcjLogManager:DomainService,IZlldcjLogManager
                 //...
             };
             //确定SubBillType
-        var sapMoveType = await _tbSapMoveTypeRepository.FirstOrDefaultAsync(p=> p.SAPBillType == zlldcjLogs[0].ZDJLX
+            var sapMoveType = await _tbSapMoveTypeRepository.FirstOrDefaultAsync(p => p.SAPBillType == zlldcjLogs[0].ZDJLX
                                                                                   && p.GetOrBack == zlldcjLogs[0].ZLTLX
                                                                                   && p.MoveType == zlldcjLogs[0].BWART);
             var sapBillDesc = "";
@@ -170,4 +171,5 @@ public class ZlldcjLogManager:DomainService,IZlldcjLogManager
             await _zlldcjLogsRepository.InsertManyAsync(dtos);
             return dtos.Count;
         }
+    }
 }

src/WmsWebApi.Domain/ZlldgbLogs/IZlldgbLogManager.cs

@@ -1,9 +1,11 @@
 using System.Threading.Tasks;
 
-namespace WmsWebApi.ZlldgbLogs;
+namespace WmsWebApi.ZlldgbLogs
-
-public interface IZlldgbLogManager
 {
+
+    public interface IZlldgbLogManager
+    {
         Task<ZlldgbLog> AddAsync(ZlldgbLog zlldcjLog);
         Task<ZlldgbLog> CloseAsync(ZlldgbLog zlldcjLog);
+    }
 }

src/WmsWebApi.Domain/ZlldgbLogs/ZlldgbLog.cs

@@ -3,9 +3,9 @@ using System.ComponentModel.DataAnnotations;
 using Volo.Abp.Domain.Entities.Auditing;
 using Volo.Abp.Guids;
 
-namespace WmsWebApi.ZlldgbLogs;
+namespace WmsWebApi.ZlldgbLogs { 
 
-public class ZlldgbLog:CreationAuditedAggregateRoot<Guid>
+public class ZlldgbLog : CreationAuditedAggregateRoot<Guid>
 {
     /// <summary>
     /// 单据号
@@ -168,3 +168,4 @@ public class ZlldgbLog:CreationAuditedAggregateRoot<Guid>
         this.Id = guidGenerator.Create();
     }
 }
+}

src/WmsWebApi.Domain/ZlldgbLogs/ZlldgbLogExtensions.cs

@@ -1,7 +1,7 @@
 using Volo.Abp;
 using WmsWebApi.TbOrfers;
 
-namespace WmsWebApi.ZlldgbLogs;
+namespace WmsWebApi.ZlldgbLogs { 
 
 public static class ZlldgbLogExtensions
 {
@@ -13,7 +13,7 @@ public static class ZlldgbLogExtensions
         }
     }
 
-    public static void CheckIsExist(this TbOrder exist,string orderNumber)
+    public static void CheckIsExist(this TbOrder exist, string orderNumber)
     {
         if (exist == null)
         {
@@ -30,3 +30,4 @@ public static class ZlldgbLogExtensions
     }
 
 }
+}

src/WmsWebApi.Domain/ZlldgbLogs/ZlldgbLogManager.cs

@@ -6,16 +6,16 @@ using Volo.Abp.Domain.Repositories;
 using Volo.Abp.Domain.Services;
 using WmsWebApi.TbOrfers;
 
-namespace WmsWebApi.ZlldgbLogs;
+namespace WmsWebApi.ZlldgbLogs { 
 
-public class ZlldgbLogManager:DomainService,IZlldgbLogManager
+public class ZlldgbLogManager : DomainService, IZlldgbLogManager
 {
     private readonly IRepository<ZlldgbLog, Guid> _zlldcjLogsRepository;
     private readonly IRepository<TbOrder, Guid> _tbOrderRepository;
 
     public ZlldgbLogManager(
-        IRepository<ZlldgbLog,Guid> zlldcjLogsRepository
+        IRepository<ZlldgbLog, Guid> zlldcjLogsRepository
-        ,IRepository<TbOrder,Guid> tbOrderRepository)
+        , IRepository<TbOrder, Guid> tbOrderRepository)
     {
         _zlldcjLogsRepository = zlldcjLogsRepository;
         _tbOrderRepository = tbOrderRepository;
@@ -63,3 +63,4 @@ public class ZlldgbLogManager:DomainService,IZlldgbLogManager
 
 
 }
+}