大众未结明细导入后端服务和前端界面的导入和导出等功能

src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/UnSettleAccounts/UnSettleAccountImportDto.cs

@@ -49,7 +49,7 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
         /// CP7
         /// </summary>
         [ImporterHeader(Name = "CP7日期")]
-        public virtual  DateTime CP7 { set; get; }
+        public virtual DateTime? CP7 { set; get; }
 
         /// <summary>
         /// 零件号

src/Modules/SettleAccount/src/SettleAccount.Application/Entities/UnSettleAccounts/UnSettleAccountAppService.cs

@@ -101,13 +101,15 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
         [Route("ExcelImport")]
         [DisableRequestSizeLimit]
         //[Authorize(SettleAccountPermissions.SettleAccounts.Default)]
-        public async Task<string> UnSettleAccountUploadExcelImport([FromForm] IFormFileCollection files, Guid branchId, string year, string period, string version, string customerCode, string factory)
+        public async Task<string> UnSettleAccountUploadExcelImport([FromForm] IFormFileCollection files, Guid branchId, 
+            string year, string period, string version, string customerCode, string factory)
         {
 
             List<CustomCondition> customConditionList = new List<CustomCondition>();
             customConditionList.Add(new CustomCondition() { Name = "Version", Value = version });
             customConditionList.Add(new CustomCondition() { Name = "CustomerCode", Value = customerCode });
-            customConditionList.Add(new CustomCondition() { Name = "Factory", Value = customerCode });
+            customConditionList.Add(new CustomCondition() { Name = "Year", Value = year });
+            customConditionList.Add(new CustomCondition() { Name = "Factory", Value = factory });
             var _taskid = await _service.ImportEnqueueAsync<ImportTaskArgs>(files, "大众FIS未结算明细", CurrentUser, typeof(UnSettleAccountImportService), customConditionList, (rs) => {
 
             });

src/Modules/SettleAccount/src/SettleAccount.Application/SettleAccountApplicationAutoMapperProfile.cs

@@ -201,8 +201,10 @@ namespace Win.Sfs.SettleAccount
             CreateMapScrapClaimsVersion();
             CreateMapSparePart();
             CreateMapSparePartVersion();
+
             CreateMapSettleAccount();
             CreateMapSettleAccountVersion();
+
             CreateMapUnSettleAccount();
             CreateMapUnSettleAccountVersion();
 
@@ -353,27 +355,23 @@ namespace Win.Sfs.SettleAccount
         /// </summary>
         private void CreateMapUnSettleAccount()
         {
-            CreateMap<Win.Sfs.SettleAccount.Entities.SettleAccounts.SettleAccount, Win.Sfs.SettleAccount.Entities.SettleAccounts.SettleAccountDto>().ReverseMap();
-            CreateMap<Win.Sfs.SettleAccount.Entities.SettleAccounts.SettleAccount, Win.Sfs.SettleAccount.Entities.SettleAccounts.SettleAccountCreateDto>();
-            CreateMap<Win.Sfs.SettleAccount.Entities.SettleAccounts.SettleAccount, Win.Sfs.SettleAccount.Entities.SettleAccounts.SettleAccountUpdateDto>();
-
-            CreateMap<Win.Sfs.SettleAccount.Entities.SettleAccounts.SettleAccount, Win.Sfs.SettleAccount.Entities.SettleAccounts.SettleAccountExportDto>();
-
-
-
-            CreateMap<Win.Sfs.SettleAccount.Entities.SettleAccounts.SettleAccountCreateDto, Win.Sfs.SettleAccount.Entities.SettleAccounts.SettleAccount>();
-            CreateMap<Win.Sfs.SettleAccount.Entities.SettleAccounts.SettleAccountUpdateDto, Win.Sfs.SettleAccount.Entities.SettleAccounts.SettleAccount>();
+            CreateMap<UnSettleAccount, UnSettleAccountDto>().ReverseMap();
+            CreateMap<UnSettleAccount, UnSettleAccountCreateDto>();
+            CreateMap<UnSettleAccount, UnSettleAccountUpdateDto>();
+            CreateMap<UnSettleAccount,UnSettleAccountExportDto>();
+            CreateMap<UnSettleAccountCreateDto, UnSettleAccount>();
+            CreateMap<UnSettleAccountUpdateDto, UnSettleAccount>();
         }
         /// <summary>
         /// 大众FIS未结算明细导入-版本
         /// </summary>
         private void CreateMapUnSettleAccountVersion()
         {
-            CreateMap<Win.Sfs.SettleAccount.Entities.SettleAccounts.SettleAccountVersion, SettleAccountVersionDto>().ReverseMap();
-            CreateMap<Win.Sfs.SettleAccount.Entities.SettleAccounts.SettleAccountVersion, SettleAccountVersionCreateDto>();
-            CreateMap<Win.Sfs.SettleAccount.Entities.SettleAccounts.SettleAccountVersion, SettleAccountVersionUpdateDto>();
-            CreateMap<SettleAccountVersionCreateDto, Win.Sfs.SettleAccount.Entities.SettleAccounts.SettleAccount>();
-            CreateMap<SettleAccountVersionUpdateDto, Win.Sfs.SettleAccount.Entities.SettleAccounts.SettleAccount>();
+            CreateMap<UnSettleAccountVersion, UnSettleAccountVersionDto>().ReverseMap();
+            CreateMap<UnSettleAccountVersion, UnSettleAccountVersionCreateDto>();
+            CreateMap<UnSettleAccountVersion, UnSettleAccountVersionUpdateDto>();
+            CreateMap<UnSettleAccountVersionCreateDto, UnSettleAccount>();
+            CreateMap<UnSettleAccountVersionUpdateDto, UnSettleAccount>();
         }
 
 

src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/UnSettleAccounts/UnSettleAccount.cs

@@ -47,9 +47,9 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
         /// </summary>
         public DateTime CP5A { set; get; }
         /// <summary>
-        /// CP7日期
+        /// CP7日期,可空
         /// </summary>
-        public DateTime CP7 { set; get; }
+        public DateTime? CP7 { set; get; }
 
         /// <summary>
         /// 零件号
@@ -102,7 +102,7 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
         public UnSettleAccount(
             Guid id,
             Guid branchId,
-            string year, string kENNCode, string chassisNumber, string model, DateTime cP5A, DateTime cP7, string materialCode, decimal qty, string settlementID, string settlementSupplier, string period,string settleYear, Guid parentId,string version , DateTime creationTime, Guid guid,string reason) :base(id)
+            string year, string kENNCode, string chassisNumber, string model, DateTime cP5A, DateTime? cP7, string materialCode, decimal qty, string settlementID, string settlementSupplier, string period,string settleYear, Guid parentId,string version , DateTime creationTime, Guid guid,string reason) :base(id)
         {
             BranchId = branchId;
             Year = year;

src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/UnSettleAccount/UnSettleAccountVersionRepository.cs

@@ -17,7 +17,7 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccount
 {
    
 
-    public class UnSettleAccountVersionRepository : EfCoreRepository<SettleAccountDbContext, SettleAccountVersion>, ITransientDependency
+    public class UnSettleAccountVersionRepository : EfCoreRepository<SettleAccountDbContext, UnSettleAccountVersion>, ITransientDependency
     {
         public UnSettleAccountVersionRepository(IDbContextProvider<SettleAccountDbContext> dbContextProvider) : base(dbContextProvider)
         {
@@ -37,19 +37,18 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccount
             }
             return true;
         }
-
-        public virtual bool Insert(string p_version,string p_customCode,string p_factory)
+        public virtual bool Insert(Guid guid, string p_version, string p_customCode, string p_factory)
         {
             try
             {
                 DbContext.Database.SetCommandTimeout(1200);
-                var _first=  GetQueryable().FirstOrDefault(p => p.Version == p_version);
+                var _first = GetQueryable().FirstOrDefault(p => p.Version == p_version);
                 if (_first == null)
                 {
-                    var version = new SettleAccountVersion(GuidGenerator.Create(), GuidGenerator.Create(), DateTime.Now.Year.ToString(), DateTime.Now.Month.ToString(), p_version, p_customCode, p_factory);
-                    List<SettleAccountVersion> _ls = new List<SettleAccountVersion>();
+                    var version = new UnSettleAccountVersion(guid, GuidGenerator.Create(), DateTime.Now.Year.ToString(), DateTime.Now.Month.ToString(), p_version, p_customCode, p_factory);
+                    List<UnSettleAccountVersion> _ls = new List<UnSettleAccountVersion>();
                     _ls.Add(version);
-                    DbContext.BulkInsert(_ls) ;
+                    DbContext.BulkInsert(_ls);
                 }
             }
             catch (Exception e)
@@ -58,5 +57,25 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccount
             }
             return true;
         }
+        //public virtual bool Insert(string p_version,string p_customCode,string p_factory)
+        //{
+        //    try
+        //    {
+        //        DbContext.Database.SetCommandTimeout(1200);
+        //        var _first=  GetQueryable().FirstOrDefault(p => p.Version == p_version);
+        //        if (_first == null)
+        //        {
+        //            var version = new UnSettleAccountVersion(GuidGenerator.Create(), GuidGenerator.Create(), DateTime.Now.Year.ToString(), DateTime.Now.Month.ToString(), p_version, p_customCode, p_factory);
+        //            List<UnSettleAccountVersion> _ls = new List<UnSettleAccountVersion>();
+        //            _ls.Add(version);
+        //            DbContext.BulkInsert(_ls) ;
+        //        }
+        //    }
+        //    catch (Exception e)
+        //    {
+        //        throw e;
+        //    }
+        //    return true;
+        //}
     }
 }

src/Modules/SettleAccount/src/SettleAccount.Job/Services/UnSettleAccount/UnSettleAccountImportService.cs

@@ -42,7 +42,7 @@ namespace TaskJob.Services
             var version = customConditions.Where(p => p.Name == "Version").FirstOrDefault().Value;
             var customerCode = customConditions.Where(p => p.Name == "CustomerCode").FirstOrDefault().Value;
             var year = customConditions.Where(p => p.Name == "Year").FirstOrDefault().Value;
-            var period = customConditions.Where(p => p.Name == "Period").FirstOrDefault().Value;
+            //var period = customConditions.Where(p => p.Name == "Period").FirstOrDefault().Value;
             var factory = customConditions.Where(p => p.Name == "Factory").FirstOrDefault().Value;
             //_versionRepository.Delete(version);
             //_repository.Delete(version);
@@ -85,7 +85,7 @@ namespace TaskJob.Services
                                 where g.Count() > 1
                                 select g;
                     _repository.Insert(_setls);
-                    _versionRepository.Insert(version, customerCode, customerCode);
+                    _versionRepository.Insert(_id, version, customerCode, customerCode);
 
 
                     #region

src/Modules/SettleAccount/src/SettleAccount.Job/SettleAccountJobModule.cs

@@ -56,7 +56,10 @@ namespace Win.Sfs.SettleAccount
                     {
                         return implementationFactory.GetService<SettleAccountImportService>();
                     }
-
+                    if (key.Equals(typeof(UnSettleAccountImportService).FullName))
+                    {
+                        return implementationFactory.GetService<UnSettleAccountImportService>();
+                    }
                     if (key.Equals(typeof(InvoiceImportService).FullName))
                     {
                         return implementationFactory.GetService<InvoiceImportService>();

vue/src/router/modules/vwFisData.js

@@ -17,7 +17,7 @@ const vwFisDataRouter = {
   },
   children: [
     {
-      path: '/settleAccount',
+      path: '/unSettleAccount',
       component: () => import('@/views/ux/vw/dataInput/r3-open'),
       name: 'SettleAccount',//命名路由
       meta: {

vue/src/views/ux/vw/dataInput/r3-open/index.vue

@@ -394,7 +394,7 @@ export default {
       }
       console.log("R3已结导出：" + JSON.stringify(this.versionValueVerson));
       this.$axios
-        .gets("/api/settleaccount/UnSettleAccount/Export", {
+        .posts("/api/settleaccount/UnSettleAccount/Export", {
           version: this.versionValueVerson,
         })
         .then((res) => {
@@ -429,7 +429,10 @@ export default {
               }
               this.listLoading = false;
             });
-        });
+        })
+         .catch(() => {
+          this.listLoading = false;
+        });;
     },
     getList() {
       this.listLoading = true;

vue/src/views/ux/vw/dataInput/r3/index.vue

@@ -416,7 +416,7 @@ export default {
       }
       console.log("R3已结导出：" + JSON.stringify(this.versionValueVerson));
       this.$axios
-        .gets("/api/settleaccount/SettleAccount/Export", {
+        .posts("/api/settleaccount/SettleAccount/Export", {
           version: this.versionValueVerson,
         })
         .then((res) => {

vue/static/tableFieldForSearch.json

@@ -1898,17 +1898,17 @@
       {
         "fieldId": 0,
         "formType": "text",
-        "name": "物料凭证",
+        "name": "工厂",
         "type": 1,
         "value": "",
         "fieldType": 1,
-        "fieldName": "textCode",
+        "fieldName": "factory",
         "setting": []
       },
       {
         "fieldId": 1,
         "formType": "text",
-        "name": "物料编号",
+        "name": "物料号",
         "type": 1,
         "value": "",
         "fieldType": 1,
@@ -1918,11 +1918,11 @@
       {
         "fieldId": 1,
         "formType": "text",
-        "name": "工厂",
+        "name": "零件名称",
         "type": 1,
         "value": "",
         "fieldType": 1,
-        "fieldName": "factory",
+        "fieldName": "materialDesc",
         "setting": []
       }
     ]