提交更新

code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/BBAC_NOT_SA_DTO.cs

@@ -44,7 +44,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Dtos
         /// </summary>
         public string InvGroupNum { get; set; }
         /// <summary>
-        /// 零件号
+        /// 客户零件号
         /// </summary>
         public string LU { get; set; }
         /// <summary>
@@ -61,7 +61,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Dtos
         public string GroupNum { get; set; }
 
         /// <summary>
-        /// 客户零件号
+        /// 厂内零件号
         /// </summary>
         public string PartCode { get; set; }
 

code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/HBPO_NOT_SA_DTO.cs

@@ -44,7 +44,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Dtos
         /// </summary>
         public string InvGroupNum { get; set; }
         /// <summary>
-        /// 零件号
+        /// 客户零件号
         /// </summary>
         public string LU { get; set; }
         /// <summary>
@@ -64,7 +64,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Dtos
         /// </summary>
         public string GroupNum { get; set; }
         /// <summary>
-        /// 客户零件号
+        /// 厂内零件号
         /// </summary>
         public string PartCode { get; set; }
 

code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/PUB_NOT_SA_DTO.cs

@@ -39,7 +39,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Dtos
         public DateTime SettleDate { get; set; }
         [Display(Name = "发票分组号")]
         public string InvGroupNum { get; set; }
-        [Display(Name = "发票分组号")]
+        [Display(Name = "客户零件号")]
         public string LU { get; set; }
         [Display(Name = "发货单号、交付识别号")]
         public string PN { get; set; }
@@ -50,8 +50,8 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Dtos
         [Display(Name = "结算分组号")]
         public string GroupNum { get; set; }
 
-      
-       
+        [Display(Name = "厂内零件号")]
+        public string PartCode { get; set; }
 
     }
 

code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Managers/BBAC_NOT_SA_MNG.cs

@@ -67,7 +67,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers
             _entity.SetId(Guid.NewGuid());
             _entity.BillNum = billNumber;
             _entity.InvGroupNum = billNumber;
-            _entity.Version = int.Parse(DateTime.Now.ToString("yyyymm"));
+            _entity.Version = int.Parse(DateTime.Now.ToString("yyyyMM"));
             _entity.State = SettleBillState.未结状态;
             _entity.SettleBillNum = string.Empty;
             _entity.BusinessType = EnumBusinessType.JisBBAC;

code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Managers/HBPO_NOT_SA_MNG.cs

@@ -72,7 +72,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers
             var _entity = new HBPO_CAN_SA();
             _entity.BillNum = billNumber;
             _entity.InvGroupNum = billNumber;
-            _entity.Version = int.Parse(DateTime.Now.ToString("yyyymm"));
+            _entity.Version = int.Parse(DateTime.Now.ToString("yyyyMM"));
             _entity.State = SettleBillState.未结状态;
             _entity.SettleBillNum = string.Empty;
             _entity.BusinessType = p_list.FirstOrDefault().BusinessType;

code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Managers/PUB_NOT_SA_MNG.cs

@@ -98,9 +98,10 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers
                 _entity.SetId(Guid.NewGuid());
                 _entity.BillNum = billNumber;
                 _entity.InvGroupNum = billNumber;
-                _entity.Version = int.Parse(DateTime.Now.ToString("yyyymm"));
+                _entity.Version = int.Parse(DateTime.Now.ToString("yyyyMM"));
                 _entity.State = SettleBillState.未结状态;
                 _entity.SettleBillNum = string.Empty;
+                _entity.BusinessType = first.BusinessType;
                 var _entityList = new List<PUB_CAN_SA_DETAIL>();
                 foreach (var itm in notlist)
                 {
@@ -126,7 +127,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers
 
                     _entityList.Add(_detailEntity);
                 }
-                await _notRepository.DbContext.BulkDeleteAsync(p_list);
+                await _repository.DbContext.BulkDeleteAsync(p_list);
                 await _repository.DbContext.BulkInsertAsync(new List<PUB_CAN_SA>() { _entity });
                 await _repository.DbContext.BulkInsertAsync(_entityList);
 
@@ -166,9 +167,11 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers
 
                     _entityList.Add(_detailEntity);
                 }
-                await _notRepository.DbContext.BulkDeleteAsync(p_list);
+               // _repository.DbContext.Database.BeginTransaction();
+                await _repository.DbContext.BulkDeleteAsync(p_list);
                 await _repository.DbContext.BulkInsertAsync(new List<PUB_CAN_SA>() { _entity });
                 await _repository.DbContext.BulkInsertAsync(_entityList);
+                //_repository.DbContext.Database.CommitTransaction();
             }
             return errors;