Merge branch 'master' of http://dev.ccwin-in.com:3000/BoXu.Zheng/BeiJinSettleAccount

code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/components/list/index.js

@@ -90,7 +90,7 @@ export default {
                   </template>
                 </el-table-column>
               </template>
-              <template v-else>
+              <template v-else-if="item.type!=='object'">
                 <template v-if="!item.hideForList&&showColumn(item,key)">
                   <el-table-column :prop="key" sortable="custom" :sort-orders="['descending', 'ascending', null]">
                     <template #header="scope">{{item.title}}</template>

code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/components/table/index.js

@@ -39,7 +39,7 @@ export default {
         </template>
         <div class="cell el-table__cell" :class="key" v-else-if="!item.hidden">
           <div class="cell">
-            <template v-if="item.input==='datetime'">{{dayjs(model[key]).format('YYYY-MM-DD HH:mm:ss')}}</template>
+            <template v-if="item.input==='datetime'">{{dayjs(row[key]).format('YYYY-MM-DD HH:mm:ss')}} {{}}</template>
             <template v-else>{{row[key]}}</template>
           </div>
         </div>

code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/input/jie-suan.js

@@ -1,12 +1,12 @@
 import businessType, { version, state } from "../_options.js";
 
-export default function (businessType, meta) {
+export default function (type, meta) {
   let service = null;
   let detailService = null;
-  if (businessType === "JisBBAC" || businessType === "MaiDanJianBBAC") {
+  if (type === "JisBBAC" || type === "MaiDanJianBBAC") {
     service = "bbac_sa_service";
     detailService = "bbac_sa_detail_service";
-  } else if (businessType === "JisHBPO" || businessType === "MaiDanJianHBPO") {
+  } else if (type === "JisHBPO" || type === "MaiDanJianHBPO") {
     service = "hbpo_sa_service";
     detailService = "hbpo_sa_detail_service";
   } else {
@@ -100,7 +100,7 @@ export default function (businessType, meta) {
         { label: 1046, value: 1046 },
       ],
       input: "select",
-      hidden: true,
+      hideForList: true,
       default: meta.client === "bbac-1040" ? 1040 : 1046,
     };
     querySchema.properties.filters.default.push({

code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/settle/_check.js

@@ -63,8 +63,8 @@ export default {
         <el-step title="发票预览" />
         <el-step title="重开成功" />
       </el-steps>
-      <div v-loading="loading">
+      <div v-loading="loading" style="height:calc(100% - 60px);">
-        <div class="setup1" v-show="setupRef===1" style="height:calc(100% - 120px);">
+        <div class="setup1" v-show="setupRef===1" style="height:100%;">
           <el-row style="padding:14px 0;height:60px;">
             <el-col>
               <el-button type="primary" @click="showAddAdjDialog">新建</el-button>
@@ -80,7 +80,7 @@ export default {
             </el-row>
           </el-scrollbar>
         </div>
-        <div class="setup2" v-show="setupRef===2" style="height:calc(100% - 60px);background:#ebeef5;">
+        <div class="setup2" v-show="setupRef===2" style="height:100%;background:#ebeef5;">
           <el-row style="width:100%;height:100%;padding:10px;">
             <el-col :span="12" style="height:100%;padding:0 5px 0 0;">
               <el-scrollbar>
@@ -94,7 +94,7 @@ export default {
             </el-col>
           </el-row>
         </div>
-        <div class="setup3" v-show="setupRef===3" style="height:calc(100% - 60px);">
+        <div class="setup3" v-show="setupRef===3" style="height:100%;">
           <el-row style="width:100%;height:100%;padding:10px;">
             <el-col style="height:100%;padding:0 5px 0 0;">
               <el-scrollbar>
@@ -117,7 +117,7 @@ export default {
             </el-col>
           </el-row>
         </div>
-        <div class="setup4" v-show="setupRef===4" style="height:calc(100% - 60px);">
+        <div class="setup4" v-show="setupRef===4" style="height:100%;">
           <el-row style="width:100%;height:100%;padding:10px;">
             <el-col style="height:100%;padding:0 5px 0 0;">
               <el-scrollbar>
@@ -488,7 +488,7 @@ export default {
       },
     };
     const defaultAdjModel = schemaToModel(adjSchema);
-    const adjModel = ref(Object.assign({ invBillNum: "" }, defaultAdjModel));
+    const adjModel = ref(null);
     const addAdjFormRef = ref(null);
     const showAddAdjDialog = () => {
       adjModel.value = Object.assign({}, defaultAdjModel);
@@ -498,7 +498,7 @@ export default {
       try {
         const valid = await addAdjFormRef.value.validate();
         if (valid) {
-          adjList.value.unshift(adjModel.value);
+          adjList.value.unshift(Object.assign({}, adjModel.value));
           addDialogVisible.value = false;
           nextTick(() => {
             scrollRef.value.update();

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

@@ -17,37 +17,36 @@ public class HBPO_SA_DTO : EntityDto<Guid>
     /// </summary>
     [Display(Name = "期间")]
     public int Version { get; set; }
-
     /// <summary>
     /// 结算单据
     /// </summary>
     [Display(Name = "结算单据")]
     public string BillNum { get; set; }
-
     /// <summary>
     /// 出库单号
     /// </summary>
     [Display(Name = "出库单号")]
     public string DNBillNum { get; set; }
-
     /// <summary>
     /// 1、新建 2、已有出库3、已有扣减寄售库
     /// </summary>
     [Display(Name = "状态")]
     public string State { get; set; }
-
     /// <summary>
     /// 明细记录行数
     /// </summary>
     [Display(Name = "明细记录行数")]
     public string RecordCount { get; set; }
-
     /// <summary>
-    /// 工厂地点
+    /// 地点码
     /// </summary>
-    [Display(Name = "工厂地点")]
+    [Display(Name = "地点码")]
     public string Site { get; set; }
-
+    /// <summary>
+    /// 地点
+    /// </summary>
+    [Display(Name = "地点")]
+    public string Place { get; set; }
     /// <summary>
     /// 业务类型
     /// </summary>
@@ -129,7 +128,6 @@ public class HBPO_SA_DETAIL_IMPORT_DTO
     [Display(Name = "ReceiveDate")]
     [ImporterHeader(Name = "ReceiveDate", Format = "yyyy/MM/dd HH:mm:ss")]
     public DateTime SettleDate { set; get; }
-
     /// <summary>
     /// 结算分组号
     /// </summary>
@@ -137,7 +135,6 @@ public class HBPO_SA_DETAIL_IMPORT_DTO
     [Required(ErrorMessage = "{0}不能为空")]
     [ImporterHeader(Name = "DeliveryNode")]
     public string GroupNum { get; set; }
-
     /// <summary>
     /// 到货日期
     /// </summary>
@@ -145,7 +142,6 @@ public class HBPO_SA_DETAIL_IMPORT_DTO
     [Required(ErrorMessage = "{0}不能为空")]
     [ImporterHeader(Name = "DeliveryDate", Format = "MM/yyyy/dd HH:mm:ss")]
     public DateTime? DeliveryDate { get; set; }
-
     /// <summary>
     /// 客户零件号
     /// </summary>
@@ -153,22 +149,19 @@ public class HBPO_SA_DETAIL_IMPORT_DTO
     [Required(ErrorMessage = "{0}不能为空")]
     [ImporterHeader(Name = "PartNumber")]
     public string LU { get; set; }
-
     /// <summary>
-    /// 数量
+    /// 结算数量
     /// </summary>
     [Display(Name = "结算数量")]
     [ImporterHeader(Name = "Qty")]
     public decimal Qty { get; set; }
-
     /// <summary>
-    /// 工厂地点
+    /// 地点
     /// </summary>
-    [Display(Name = "filename")]
+    [Display(Name = "地点")]
     [Required(ErrorMessage = "{0}不能为空")]
     [ImporterHeader(Name = "filename")]
-    public string Site { get; set; }
+    public string Place { get; set; }
-
     /// <summary>
     /// 生产号
     /// </summary>
@@ -216,6 +209,13 @@ public class MaiDanJianHBPOImportDto
     [ImporterHeader(Name = "五联单号")]
     [Required(ErrorMessage = "{0}不能为空")]
     public string GroupNum { get; set; }
+    /// <summary>
+    /// 地点
+    /// </summary>
+    [Display(Name = "地点")]
+    [ImporterHeader(Name = "地点")]
+    [Required(ErrorMessage = "{0}不能为空")]
+    public string Place { get; set; }
 }
 
 /// <summary>

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

@@ -17,24 +17,26 @@ public class PUB_SA_DTO : EntityDto<Guid>
     /// </summary>
     [Display(Name = "期间")]
     public string Version { get; set; }
-
     /// <summary>
     /// 结算单据
     /// </summary>
     [Display(Name = "结算单据")]
     public string BillNum { get; set; }
-
     /// <summary>
     /// 状态
     /// </summary>
     [Display(Name = "状态")]
     public string State { get; set; }
-
     /// <summary>
     /// 业务类型
     /// </summary>
     [Display(Name = "业务类型")]
     public BusinessType BusinessType { get; set; }
+    /// <summary>
+    /// 地点
+    /// </summary>
+    [Display(Name = "地点")]
+    public string Place { get; set; }
 }
 
 /// <summary>
@@ -84,7 +86,6 @@ public class ZhiGongJianBBACImportDto
     [Display(Name = "Pstng Date")]
     [ImporterHeader(Name = "Pstng Date")]
     public DateTime SettleDate { set; get; }
-
     /// <summary>
     /// 客户零件号
     /// </summary>
@@ -92,7 +93,6 @@ public class ZhiGongJianBBACImportDto
     [Required(ErrorMessage = "{0}不能为空")]
     [ImporterHeader(Name = "Material")]
     public string LU { get; set; }
-
     /// <summary>
     /// 生产号
     /// </summary>
@@ -100,22 +100,19 @@ public class ZhiGongJianBBACImportDto
     [ImporterHeader(Name = "External Delivery ID")]
     [Required(ErrorMessage = "{0}不能为空")]
     public string PN { get; set; }
-
     /// <summary>
     /// 数量
     /// </summary>
     [Display(Name = "Quantity")]
     [ImporterHeader(Name = "Quantity")]
     public decimal Qty { get; set; }
-
     /// <summary>
     /// 结算分组号
     /// </summary>
-    [Display(Name = "Delivery")]
+    [Display(Name = "External Delivery ID")]
-    [ImporterHeader(Name = "Delivery")]
+    [ImporterHeader(Name = "External Delivery ID")]
     [Required(ErrorMessage = "{0}不能为空")]
     public string GroupNum { get; set; }
-
     /// <summary>
     /// 根据Vendor=15663496过滤数据
     /// </summary>
@@ -135,7 +132,6 @@ public class ZhiGongJianHBPOImportDto
     [Display(Name = "结算日期")]
     [ImporterHeader(IsIgnore = true)]
     public DateTime SettleDate { set; get; }
-
     /// <summary>
     /// 客户零件号
     /// </summary>
@@ -143,7 +139,6 @@ public class ZhiGongJianHBPOImportDto
     [Required(ErrorMessage = "{0}不能为空")]
     [ImporterHeader(Name = "零件号")]
     public string LU { get; set; }
-
     /// <summary>
     /// 生产号
     /// </summary>
@@ -151,14 +146,12 @@ public class ZhiGongJianHBPOImportDto
     [ImporterHeader(Name = "订单编号")]
     [Required(ErrorMessage = "{0}不能为空")]
     public string PN { get; set; }
-
     /// <summary>
     /// 数量
     /// </summary>
     [Display(Name = "数量")]
     [ImporterHeader(Name = "数量")]
     public decimal Qty { get; set; }
-
     /// <summary>
     /// 结算分组号
     /// </summary>
@@ -166,6 +159,13 @@ public class ZhiGongJianHBPOImportDto
     [ImporterHeader(Name = "订单编号")]
     [Required(ErrorMessage = "{0}不能为空")]
     public string GroupNum { get; set; }
+    /// <summary>
+    /// 地点
+    /// </summary>
+    [Display(Name = "地点")]
+    [ImporterHeader(Name = "地点")]
+    [Required(ErrorMessage = "{0}不能为空")]
+    public string Place { get; set; }
 }
 
 /// <summary>

code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/HBPO_SA_SERVICE.cs

@@ -214,36 +214,11 @@ public class HBPO_SA_SERVICE : SettleAccountApplicationBase<HBPO_SA>
     /// </summary>
     private async Task<IActionResult> ImportJisHBPOAsync([FromForm] IFormFileCollection files)
     {
-        ExportImporter _exportImporter = new ExportImporter();
+        var exportImporter = new ExportImporter();
-        var result = await _exportImporter.UploadExcelImport<HBPO_SA_DETAIL_IMPORT_DTO>(files, _excelImportService).ConfigureAwait(false);
+        var result = await exportImporter.UploadExcelImport<HBPO_SA_DETAIL_IMPORT_DTO>(files, _excelImportService).ConfigureAwait(false);
         var importHBOPSaDetails = ObjectMapper.Map<List<HBPO_SA_DETAIL_IMPORT_DTO>, List<HBPO_SA_DETAIL>>(result);
 
-        importHBOPSaDetails = HandleSaDetails(importHBOPSaDetails);
+        return await SaDataGroupByPlaceAsync(importHBOPSaDetails).ConfigureAwait(false);
-
-        //Site包含CN1 亦庄
-        //Site包含CN5 顺义
-        var importCN1HBOPSaDetails = importHBOPSaDetails.FindAll(t => t.Site.Contains("CN1"));
-        var importCN5HBOPSaDetails = importHBOPSaDetails.FindAll(t => t.Site.Contains("CN5"));
-
-        #region 数据校验
-        var checkList = await CheckAsync(importHBOPSaDetails).ConfigureAwait(false);
-        if (checkList.Count > 0)
-        {
-            string fileName = await ExportErrorReportAsync(checkList).ConfigureAwait(false);
-            return new JsonResult(new { Code = ApplicationConsts.ImportFailCode, Message = "错误提示文件已下载,请打开文件查看", fileName = fileName });
-        }
-        #endregion
-
-        if (importCN1HBOPSaDetails.Any())
-        {
-            await InsertSaDataAsync(importCN1HBOPSaDetails, "CN1").ConfigureAwait(false);
-        }
-        if (importCN5HBOPSaDetails.Any())
-        {
-            await InsertSaDataAsync(importCN5HBOPSaDetails, "CN5").ConfigureAwait(false);
-        }
-
-        return new JsonResult(new { Code = 200, Message = "导入成功" });
     }
 
     /// <summary>
@@ -257,24 +232,7 @@ public class HBPO_SA_SERVICE : SettleAccountApplicationBase<HBPO_SA>
         var importMaiDanHBPOSaDetails = ObjectMapper.Map<List<MaiDanJianHBPOImportDto>, List<HBPO_SA_DETAIL>>(importResults);
         #endregion
 
-        if (!importMaiDanHBPOSaDetails.Any())
+        return await SaDataGroupByPlaceAsync(importMaiDanHBPOSaDetails).ConfigureAwait(false);
-        {
-            return new JsonResult(new { Code = 200, Message = "导入成功" });
-        }
-
-        importMaiDanHBPOSaDetails = HandleSaDetails(importMaiDanHBPOSaDetails);
-
-        #region 数据校验
-        var checkList = await CheckAsync(importMaiDanHBPOSaDetails).ConfigureAwait(false);
-        if (checkList.Count > 0)
-        {
-            string fileName = await ExportErrorReportAsync(checkList).ConfigureAwait(false);
-            return new JsonResult(new { Code = ApplicationConsts.ImportFailCode, Message = "错误提示文件已下载,请打开文件查看", fileName = fileName });
-        }
-        #endregion
-
-        await InsertSaDataAsync(importMaiDanHBPOSaDetails, "").ConfigureAwait(false);
-        return new JsonResult(new { Code = 200, Message = "导入成功" });
     }
 
     /// <summary>
@@ -313,11 +271,49 @@ public class HBPO_SA_SERVICE : SettleAccountApplicationBase<HBPO_SA>
         }).ToList();
     }
 
+    /// <summary>
+    /// 结算数据 Place 分组保存
+    /// </summary>
+    /// <param name="hbpoSaDetails"></param>
+    /// <returns></returns>
+    private async Task<IActionResult> SaDataGroupByPlaceAsync(List<HBPO_SA_DETAIL> hbpoSaDetails)
+    {
+        if (!hbpoSaDetails.Any())
+        {
+            return new JsonResult(new { Code = 200, Message = "导入成功" });
+        }
+
+        hbpoSaDetails = HandleSaDetails(hbpoSaDetails);
+
+        var cn1HBOPSaDetails = hbpoSaDetails.FindAll(t => t.Place.Contains("CN1"));
+        var cn5HBOPSaDetails = hbpoSaDetails.FindAll(t => t.Place.Contains("CN5"));
+
+        #region 数据校验
+        var checkList = await CheckAsync(hbpoSaDetails).ConfigureAwait(false);
+        if (checkList.Count > 0)
+        {
+            string fileName = await ExportErrorReportAsync(checkList).ConfigureAwait(false);
+            return new JsonResult(new { Code = ApplicationConsts.ImportFailCode, Message = "错误提示文件已下载,请打开文件查看", fileName = fileName });
+        }
+        #endregion
+
+        if (cn1HBOPSaDetails.Any())
+        {
+            await InsertSaDataAsync(cn1HBOPSaDetails, "CN1").ConfigureAwait(false);
+        }
+        if (cn5HBOPSaDetails.Any())
+        {
+            await InsertSaDataAsync(cn5HBOPSaDetails, "CN5").ConfigureAwait(false);
+        }
+        return new JsonResult(new { Code = 200, Message = "导入成功" });
+    }
+
     /// <summary>
     /// Insert结算数据
     /// </summary>
-    private async Task InsertSaDataAsync(List<HBPO_SA_DETAIL> hbpoSaDetails, string site)
+    private async Task InsertSaDataAsync(List<HBPO_SA_DETAIL> hbpoSaDetails, string place)
     {
+        var site = "104T";
         //结算单号
         var hbpoSaBillNum = OrderNumberGenerator.GenerateOrderNumber("SA");
         //结算主表
@@ -327,6 +323,7 @@ public class HBPO_SA_SERVICE : SettleAccountApplicationBase<HBPO_SA>
             State = "0",
             BusinessType = BusinessType,
             Site = site,
+            Place = place,
             Version = Version
         };
         //可结算单号
@@ -365,6 +362,7 @@ public class HBPO_SA_SERVICE : SettleAccountApplicationBase<HBPO_SA>
             hbpoSaDetail.BillNum = hbpoSaBillNum;
             hbpoSaDetail.KeyCode = hbpoSaDetail.PN + hbpoSaDetail.LU;
             hbpoSaDetail.BusinessType = BusinessType;
+            hbpoSaDetail.Site = site;
         });
 
         //导入的零件号集合

code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/PUB_SA_SERVICE.cs

@@ -433,21 +433,23 @@ public class PUB_SA_SERVICE : SettleAccountApplicationBase<PUB_SA>
         var materialRelationships = new List<MaterialRelationship>();
 
         #region 处理结算数据
-        pubSaDetails.ForEach(importPubSaDetail =>
+        for (var i = 0; i < pubSaDetails.Count; i++)
-        {
+        {
-            importPubSaDetail.SetId(GuidGenerator.Create());
+            var pubSaDetail = pubSaDetails[i];
-            importPubSaDetail.CustomerPartCodeNoSpace = importPubSaDetail.LU.Replace(" ", "");
+            pubSaDetail.SetId(GuidGenerator.Create());
-            importPubSaDetail.KeyCode = importPubSaDetail.PN + importPubSaDetail.LU;
+            pubSaDetail.CustomerPartCodeNoSpace = pubSaDetail.LU.Replace(" ", "");
-            importPubSaDetail.Version = _version;
+            pubSaDetail.KeyCode = pubSaDetail.PN + pubSaDetail.LU;
-            importPubSaDetail.BusinessType = businessType;
+            pubSaDetail.Version = _version;
-        });
+            pubSaDetail.BusinessType = businessType;
+            pubSaDetail.IndexNum = i;
+        }
         var lus = pubSaDetails.Select(t => t.LU).Distinct().ToList();
 
         var clientCode = businessType switch
         {
             EnumBusinessType.ZhiGongJianBBAC => site,
             EnumBusinessType.ZhiGongJianHBPO => "104T",
-            EnumBusinessType.BeiJian => "1040",
+            EnumBusinessType.BeiJian => "1049",
             EnumBusinessType.YinDuJian => "1040",
             _ => throw new UserFriendlyException($"业务编码错误", "400")
         };
@@ -519,6 +521,7 @@ public class PUB_SA_SERVICE : SettleAccountApplicationBase<PUB_SA>
     {
         //业务类型
         var pubSaFirstDetail = pubSaDetails.First();
+        var place = pubSaFirstDetail.Place;
         //结算单号
         var pubSaBillNum = OrderNumberGenerator.GenerateOrderNumber("SA");
         //结算主表
@@ -528,7 +531,8 @@ public class PUB_SA_SERVICE : SettleAccountApplicationBase<PUB_SA>
             State = "0",
             BusinessType = pubSaFirstDetail.BusinessType,
             Version = pubSaFirstDetail.Version,
-            Site = site
+            Site = site,
+            Place = place
         };
         //可结算单号
         var pubCanSaBillNum = OrderNumberGenerator.GenerateOrderNumber("C");

code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/Prices/PriceListAppService.cs

@@ -93,12 +93,12 @@ public class PriceListAppService : SettleAccountApplicationBase<PriceList>
             var repeat = query.Distinct().ToList();
             foreach (var item in repeat)
             {
-                checkList.Add(new ErrorExportDto(string.Empty, string.Empty, string.Empty, string.Empty, string.Empty, string.Empty, $"导入文件中物料号：{item.LU}，合同签订时间：{item.Date}，时间区间存在交集", string.Empty));
+                checkList.Add(new ErrorExportDto(string.Empty, string.Empty, string.Empty, string.Empty, item.LU, string.Empty, $"合同号：{item.ContractNo}，合同签订时间：{item.Date:yyyy-MM-dd}，时间区间存在交集", string.Empty));
             }
 
             foreach (var item in CheckPriceListContinuity(newPrice))
             {
-                checkList.Add(new ErrorExportDto(string.Empty, string.Empty, string.Empty, string.Empty, string.Empty, string.Empty, $"导入文件中物料号：{item.LU}，合同签订时间：{item.Date}，时间区间【{item.BeginTime}至{item.EndTime}】不连续", string.Empty));
+                checkList.Add(new ErrorExportDto(string.Empty, string.Empty, string.Empty, string.Empty, item.LU, string.Empty, $"合同号：{item.ContractNo}，合同签订时间：{item.Date:yyyy-MM-dd}，时间区间【{item.BeginTime:yyyy-MM-dd}至{item.EndTime:yyyy-MM-dd}】不连续", string.Empty));
             }
         }
         if (checkList.Count > 0)

code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/Prices/PriceListAppServiceBJ.cs

@@ -58,7 +58,7 @@ public class PriceListAppServiceBJ : SettleAccountApplicationBase<PriceListBJ>
         var result = await _exportImporter.UploadExcelImportByHeadDesc<PriceListBJImportDto>(files, _excelImportService).ConfigureAwait(false);
         var filter = new List<string>
         {
-            "1040"
+            "1049"
         };
         result = result.Where(p => filter.Contains(p.Plant)).ToList();
         result.FindAll(t => !string.IsNullOrEmpty(t.ES1) || !string.IsNullOrEmpty(t.ES2)).ForEach(t => t.PartNo = t.PartNo + new string(' ', 6) + t.ES1 + t.ES2);
@@ -76,12 +76,12 @@ public class PriceListAppServiceBJ : SettleAccountApplicationBase<PriceListBJ>
             var repeat = query.Distinct().ToList();
             foreach (var item in repeat)
             {
-                checkList.Add(new ErrorExportDto(string.Empty, string.Empty, string.Empty, string.Empty, string.Empty, string.Empty, $"导入文件中物料号：{item.LU}，合同签订时间：{item.Date}，时间区间存在交集", string.Empty));
+                checkList.Add(new ErrorExportDto(string.Empty, string.Empty, string.Empty, string.Empty, item.LU, string.Empty, $"合同号：{item.ContractNo}，合同签订时间：{item.Date:yyyy-MM-dd}，时间区间存在交集", string.Empty));
             }
 
             foreach (var item in CheckPriceListContinuity(newPrice))
             {
-                checkList.Add(new ErrorExportDto(string.Empty, string.Empty, string.Empty, string.Empty, string.Empty, string.Empty, $"导入文件中物料号：{item.LU}，合同签订时间：{item.Date}，时间区间【{item.BeginDate}至{item.EndDate}】不连续", string.Empty));
+                checkList.Add(new ErrorExportDto(string.Empty, string.Empty, string.Empty, string.Empty, item.LU, string.Empty, $"合同号：{item.ContractNo}，合同签订时间：{item.Date:yyyy-MM-dd}，时间区间【{item.BeginDate:yyyy-MM-dd}至{item.EndDate:yyyy-MM-dd}】不连续", string.Empty));
             }
         }
         if (checkList.Count > 0)

code/src/Modules/SettleAccount/src/SettleAccount.Domain/Bases/EntityBase.cs

@@ -399,10 +399,12 @@ namespace SettleAccount.Bases
         /// 匹配类型
         /// </summary>
         public EnumMappingType MappingType { get; set; }
-
+        /// <summary>
-      
+        /// 地点
-
+        /// </summary>
-
+        [Display(Name = "地点")]
+        [MaxLength(64)]
+        public string Place { get; set; }
     }
 
     public class SA_CAN_BASE : AuditedAggregateRoot<Guid>, ISA_BASE

code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/HBPO_SA.cs

@@ -29,16 +29,22 @@ public class HBPO_SA : AuditedAggregateRoot<Guid>
     /// </summary>
     [Display(Name = "明细记录行数")]
     public string RecordCount { get; set; } = null!;
-
     /// <summary>
-    /// 工厂地点
+    /// 地点码
     /// </summary>
-    [Display(Name = "工厂地点")]
+    [Display(Name = "地点码")]
-    public string Site { get; set; } = null!;
+    [MaxLength(64)]
+    public string Site { get; set; }
     /// <summary>
     /// 业务类型
     /// </summary>
     public EnumBusinessType BusinessType { get; set; }
+    /// <summary>
+    /// 地点
+    /// </summary>
+    [Display(Name = "地点")]
+    [MaxLength(64)]
+    public string Place { get; set; }
 
     public HBPO_SA(Guid guid,  int version, string billNum, string dNBillNum, string state, string recordCount)
     {

code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/PUB_CAN_SA.cs

@@ -108,7 +108,11 @@ public class PUB_CAN_SA_DETAIL : SA_CAN_BASE
 
     [Display(Name = "订单号")]
     public string PoBillNum { get; set; }
-
+    /// <summary>
+    /// 计数
+    /// </summary>
+    [Display(Name = "计数")]
+    public int IndexNum { get; set; }
     /// <summary>
     /// 对应字段DeliveryNode
     /// </summary>

code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/PUB_NOT_SA_DETAIL.cs

@@ -69,7 +69,11 @@ public class PUB_NOT_SA_DETAIL : SA_NOT_BASE
     //public string GroupNum { get; set; } = null!;
     [Display(Name ="订单号")]
     public string PoBillNum { get; set; }
-
+    /// <summary>
+    /// 计数
+    /// </summary>
+    [Display(Name = "计数")]
+    public int IndexNum { get; set; }
 
     public PUB_NOT_SA_DETAIL(string keyCode, int version, string settleBillNum, string lU, string pN, string site, decimal qty, string extend1, string extend2, string extend3, decimal price, string invGroupNum, DateTime settleDate, EnumBusinessType businessType, string groupNum,string partcode,string pobillnum)
     {

code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/PUB_SA.cs

@@ -26,11 +26,17 @@ public class PUB_SA : AuditedAggregateRoot<Guid>
     [Display(Name = "业务分类")]
     public EnumBusinessType BusinessType { get; set; }
     /// <summary>
+    /// 地点码
+    /// </summary>
+    [Display(Name = "地点码")]
+    [MaxLength(64)]
+    public string Site { get; set; }
+    /// <summary>
     /// 地点
     /// </summary>
     [Display(Name = "地点")]
     [MaxLength(64)]
-    public string Site { get; set; }
+    public string Place { get; set; }
 
     public PUB_SA(Guid guid,  int version, string billNum, string state)
     {
@@ -110,12 +116,11 @@ public class PUB_SA_DETAIL:SA_BASE
 
     [Display(Name = "扩展字段3")]
     public string Extend3 { get; set; } = null!;
-
+    /// <summary>
-    ///// <summary>
+    /// 计数
-    ///// 对应字段Reference
+    /// </summary>
-    ///// </summary>
+    [Display(Name = "计数")]
-    //[Display(Name = "结算分组")]
+    public int IndexNum { get; set; }
-    //public string GroupNum { get; set; } = null!;
 
     public PUB_SA_DETAIL(Guid guid, string keyCode, int version, string billNum, string lU, string pN, string site, decimal qty, decimal price, string invGroupNum, DateTime settleDate, string extend1, string extend2, string extend3, string groupNum)
     {

code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Migrations/20230913024309_20230913-1.cs

@@ -0,0 +1,201 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+namespace Win.Sfs.SettleAccount.Migrations
+{
+    public partial class _202309131 : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<int>(
+                name: "IndexNum",
+                table: "Set_PUB_SA_DETAIL",
+                type: "int",
+                nullable: false,
+                defaultValue: 0);
+
+            migrationBuilder.AddColumn<int>(
+                name: "IndexNum",
+                table: "Set_HBPO_SA_DETAIL",
+                type: "int",
+                nullable: false,
+                defaultValue: 0);
+
+            migrationBuilder.AddColumn<int>(
+                name: "IndexNum",
+                table: "Set_BBAC_SA_DETAIL",
+                type: "int",
+                nullable: false,
+                defaultValue: 0);
+
+            migrationBuilder.UpdateData(
+                table: "Set_JobItem",
+                keyColumn: "Id",
+                keyValue: new Guid("185c5968-e02b-267e-db2f-225fccfc9716"),
+                column: "ConcurrencyStamp",
+                value: "99884a6a7033490bbc93b2ffcf1212fe");
+
+            migrationBuilder.UpdateData(
+                table: "Set_JobItem",
+                keyColumn: "Id",
+                keyValue: new Guid("1bb02f67-ed05-6cc1-1507-502e8f6c7a31"),
+                column: "ConcurrencyStamp",
+                value: "d6b499590a7f4d738e6d4d53cbae1419");
+
+            migrationBuilder.UpdateData(
+                table: "Set_JobItem",
+                keyColumn: "Id",
+                keyValue: new Guid("49b1da12-418c-544d-fe8b-be7e5b572452"),
+                column: "ConcurrencyStamp",
+                value: "708a84b07be44ee99c1e70fe0f42820e");
+
+            migrationBuilder.UpdateData(
+                table: "Set_JobItem",
+                keyColumn: "Id",
+                keyValue: new Guid("6f68fc8f-b058-c3f4-e07d-722c61f3f7fa"),
+                column: "ConcurrencyStamp",
+                value: "b80a98f0c7154dfeb56c387e2e22c482");
+
+            migrationBuilder.UpdateData(
+                table: "Set_JobItem",
+                keyColumn: "Id",
+                keyValue: new Guid("7a0dc087-a859-5863-eb6e-56f588bd779e"),
+                column: "ConcurrencyStamp",
+                value: "787cc284e9db4280a35d2ee3d71c0822");
+
+            migrationBuilder.UpdateData(
+                table: "Set_JobItem",
+                keyColumn: "Id",
+                keyValue: new Guid("8f7dc23d-e2e9-3691-cfe9-545bb958e3f2"),
+                column: "ConcurrencyStamp",
+                value: "32e17d97277a40b991b7f54e22668bac");
+
+            migrationBuilder.UpdateData(
+                table: "Set_JobItem",
+                keyColumn: "Id",
+                keyValue: new Guid("b9b9c79f-4894-474b-4f67-b1ec121c41e5"),
+                column: "ConcurrencyStamp",
+                value: "a0869b3e24eb4620bd5f01db384652ac");
+
+            migrationBuilder.UpdateData(
+                table: "Set_JobItem",
+                keyColumn: "Id",
+                keyValue: new Guid("c09c23ea-815f-1b43-4476-2365a8d9a60b"),
+                column: "ConcurrencyStamp",
+                value: "8b15dfbd04ac49f2b52a3db7d7ebe9ed");
+
+            migrationBuilder.UpdateData(
+                table: "Set_JobItem",
+                keyColumn: "Id",
+                keyValue: new Guid("c1f71240-1b81-0107-8b23-ddc9811a3efe"),
+                column: "ConcurrencyStamp",
+                value: "5da31dc2347145acbc2b660c3adbb582");
+
+            migrationBuilder.UpdateData(
+                table: "Set_JobItem",
+                keyColumn: "Id",
+                keyValue: new Guid("ef3d8e8a-a88e-ca1f-e615-714c6bc48824"),
+                column: "ConcurrencyStamp",
+                value: "0227468d6ab64b9c86ed33e7feaf88ae");
+
+            migrationBuilder.UpdateData(
+                table: "Set_JobItem",
+                keyColumn: "Id",
+                keyValue: new Guid("f306b380-47e5-5c01-b902-67ca4113a8f4"),
+                column: "ConcurrencyStamp",
+                value: "8934e9981b4041249cdeaf63ff00c468");
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "IndexNum",
+                table: "Set_PUB_SA_DETAIL");
+
+            migrationBuilder.DropColumn(
+                name: "IndexNum",
+                table: "Set_HBPO_SA_DETAIL");
+
+            migrationBuilder.DropColumn(
+                name: "IndexNum",
+                table: "Set_BBAC_SA_DETAIL");
+
+            migrationBuilder.UpdateData(
+                table: "Set_JobItem",
+                keyColumn: "Id",
+                keyValue: new Guid("185c5968-e02b-267e-db2f-225fccfc9716"),
+                column: "ConcurrencyStamp",
+                value: "dece69c1928241df9f38feccf47d0c0a");
+
+            migrationBuilder.UpdateData(
+                table: "Set_JobItem",
+                keyColumn: "Id",
+                keyValue: new Guid("1bb02f67-ed05-6cc1-1507-502e8f6c7a31"),
+                column: "ConcurrencyStamp",
+                value: "431db509a1f34bfe9fd1a4d7efcf1d4c");
+
+            migrationBuilder.UpdateData(
+                table: "Set_JobItem",
+                keyColumn: "Id",
+                keyValue: new Guid("49b1da12-418c-544d-fe8b-be7e5b572452"),
+                column: "ConcurrencyStamp",
+                value: "06df83918cbc4543a2b44a83f739dc67");
+
+            migrationBuilder.UpdateData(
+                table: "Set_JobItem",
+                keyColumn: "Id",
+                keyValue: new Guid("6f68fc8f-b058-c3f4-e07d-722c61f3f7fa"),
+                column: "ConcurrencyStamp",
+                value: "9004a8ecf43a4fe1848f6802a6d4576f");
+
+            migrationBuilder.UpdateData(
+                table: "Set_JobItem",
+                keyColumn: "Id",
+                keyValue: new Guid("7a0dc087-a859-5863-eb6e-56f588bd779e"),
+                column: "ConcurrencyStamp",
+                value: "960ce38962e949558923f71d04f4e338");
+
+            migrationBuilder.UpdateData(
+                table: "Set_JobItem",
+                keyColumn: "Id",
+                keyValue: new Guid("8f7dc23d-e2e9-3691-cfe9-545bb958e3f2"),
+                column: "ConcurrencyStamp",
+                value: "f9c840d4749b410982c3288ce64a8691");
+
+            migrationBuilder.UpdateData(
+                table: "Set_JobItem",
+                keyColumn: "Id",
+                keyValue: new Guid("b9b9c79f-4894-474b-4f67-b1ec121c41e5"),
+                column: "ConcurrencyStamp",
+                value: "de291b54ac7e487988bb2660050b0db4");
+
+            migrationBuilder.UpdateData(
+                table: "Set_JobItem",
+                keyColumn: "Id",
+                keyValue: new Guid("c09c23ea-815f-1b43-4476-2365a8d9a60b"),
+                column: "ConcurrencyStamp",
+                value: "3ec6e8d3979a41088508d5ec64f5118a");
+
+            migrationBuilder.UpdateData(
+                table: "Set_JobItem",
+                keyColumn: "Id",
+                keyValue: new Guid("c1f71240-1b81-0107-8b23-ddc9811a3efe"),
+                column: "ConcurrencyStamp",
+                value: "e5bf812fc44e445991f4a7b6ece063db");
+
+            migrationBuilder.UpdateData(
+                table: "Set_JobItem",
+                keyColumn: "Id",
+                keyValue: new Guid("ef3d8e8a-a88e-ca1f-e615-714c6bc48824"),
+                column: "ConcurrencyStamp",
+                value: "18add54a57684dd1818440f0d5005ebb");
+
+            migrationBuilder.UpdateData(
+                table: "Set_JobItem",
+                keyColumn: "Id",
+                keyValue: new Guid("f306b380-47e5-5c01-b902-67ca4113a8f4"),
+                column: "ConcurrencyStamp",
+                value: "03899f76c20043e896f38246ccb0d037");
+        }
+    }
+}

code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Migrations/20230914021528_20230914-1.cs

@@ -0,0 +1,243 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+namespace Win.Sfs.SettleAccount.Migrations
+{
+    public partial class _202309141 : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<string>(
+                name: "Place",
+                table: "Set_PUB_SA_DETAIL",
+                type: "nvarchar(64)",
+                maxLength: 64,
+                nullable: true);
+
+            migrationBuilder.AddColumn<string>(
+                name: "Place",
+                table: "Set_PUB_SA",
+                type: "nvarchar(64)",
+                maxLength: 64,
+                nullable: true);
+
+            migrationBuilder.AddColumn<string>(
+                name: "Place",
+                table: "Set_HBPO_SA_DETAIL",
+                type: "nvarchar(64)",
+                maxLength: 64,
+                nullable: true);
+
+            migrationBuilder.AlterColumn<string>(
+                name: "Site",
+                table: "Set_HBPO_SA",
+                type: "nvarchar(64)",
+                maxLength: 64,
+                nullable: true,
+                oldClrType: typeof(string),
+                oldType: "nvarchar(max)",
+                oldNullable: true);
+
+            migrationBuilder.AddColumn<string>(
+                name: "Place",
+                table: "Set_HBPO_SA",
+                type: "nvarchar(64)",
+                maxLength: 64,
+                nullable: true);
+
+            migrationBuilder.AddColumn<string>(
+                name: "Place",
+                table: "Set_BBAC_SA_DETAIL",
+                type: "nvarchar(64)",
+                maxLength: 64,
+                nullable: true);
+
+            migrationBuilder.UpdateData(
+                table: "Set_JobItem",
+                keyColumn: "Id",
+                keyValue: new Guid("185c5968-e02b-267e-db2f-225fccfc9716"),
+                column: "ConcurrencyStamp",
+                value: "b1d31f0c8ba14fd5baf9e86a382cf23b");
+
+            migrationBuilder.UpdateData(
+                table: "Set_JobItem",
+                keyColumn: "Id",
+                keyValue: new Guid("1bb02f67-ed05-6cc1-1507-502e8f6c7a31"),
+                column: "ConcurrencyStamp",
+                value: "cb552d924aa5468c9605fc66af7f6aa2");
+
+            migrationBuilder.UpdateData(
+                table: "Set_JobItem",
+                keyColumn: "Id",
+                keyValue: new Guid("49b1da12-418c-544d-fe8b-be7e5b572452"),
+                column: "ConcurrencyStamp",
+                value: "861d9091519a403e880429b4ec92bf48");
+
+            migrationBuilder.UpdateData(
+                table: "Set_JobItem",
+                keyColumn: "Id",
+                keyValue: new Guid("6f68fc8f-b058-c3f4-e07d-722c61f3f7fa"),
+                column: "ConcurrencyStamp",
+                value: "26fc2c469b324cd38fb3ee9c1fda720d");
+
+            migrationBuilder.UpdateData(
+                table: "Set_JobItem",
+                keyColumn: "Id",
+                keyValue: new Guid("7a0dc087-a859-5863-eb6e-56f588bd779e"),
+                column: "ConcurrencyStamp",
+                value: "3b34af99b803428faad0b383080a46ef");
+
+            migrationBuilder.UpdateData(
+                table: "Set_JobItem",
+                keyColumn: "Id",
+                keyValue: new Guid("8f7dc23d-e2e9-3691-cfe9-545bb958e3f2"),
+                column: "ConcurrencyStamp",
+                value: "2120adc593a148ba95427da1eadc2073");
+
+            migrationBuilder.UpdateData(
+                table: "Set_JobItem",
+                keyColumn: "Id",
+                keyValue: new Guid("b9b9c79f-4894-474b-4f67-b1ec121c41e5"),
+                column: "ConcurrencyStamp",
+                value: "9c91f78395054248aaca3cb07018d785");
+
+            migrationBuilder.UpdateData(
+                table: "Set_JobItem",
+                keyColumn: "Id",
+                keyValue: new Guid("c09c23ea-815f-1b43-4476-2365a8d9a60b"),
+                column: "ConcurrencyStamp",
+                value: "9f5c2dac8b544424b22248e87f78051d");
+
+            migrationBuilder.UpdateData(
+                table: "Set_JobItem",
+                keyColumn: "Id",
+                keyValue: new Guid("c1f71240-1b81-0107-8b23-ddc9811a3efe"),
+                column: "ConcurrencyStamp",
+                value: "628547db204a4af09bed4562a5d4e8fd");
+
+            migrationBuilder.UpdateData(
+                table: "Set_JobItem",
+                keyColumn: "Id",
+                keyValue: new Guid("ef3d8e8a-a88e-ca1f-e615-714c6bc48824"),
+                column: "ConcurrencyStamp",
+                value: "27a58b61e45c44db907e467fb594cc66");
+
+            migrationBuilder.UpdateData(
+                table: "Set_JobItem",
+                keyColumn: "Id",
+                keyValue: new Guid("f306b380-47e5-5c01-b902-67ca4113a8f4"),
+                column: "ConcurrencyStamp",
+                value: "78bde67297b24c9eada8402d3f94d52b");
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "Place",
+                table: "Set_PUB_SA_DETAIL");
+
+            migrationBuilder.DropColumn(
+                name: "Place",
+                table: "Set_PUB_SA");
+
+            migrationBuilder.DropColumn(
+                name: "Place",
+                table: "Set_HBPO_SA_DETAIL");
+
+            migrationBuilder.DropColumn(
+                name: "Place",
+                table: "Set_HBPO_SA");
+
+            migrationBuilder.DropColumn(
+                name: "Place",
+                table: "Set_BBAC_SA_DETAIL");
+
+            migrationBuilder.AlterColumn<string>(
+                name: "Site",
+                table: "Set_HBPO_SA",
+                type: "nvarchar(max)",
+                nullable: true,
+                oldClrType: typeof(string),
+                oldType: "nvarchar(64)",
+                oldMaxLength: 64,
+                oldNullable: true);
+
+            migrationBuilder.UpdateData(
+                table: "Set_JobItem",
+                keyColumn: "Id",
+                keyValue: new Guid("185c5968-e02b-267e-db2f-225fccfc9716"),
+                column: "ConcurrencyStamp",
+                value: "b3c6a359087b41e4b586c8c172efae5d");
+
+            migrationBuilder.UpdateData(
+                table: "Set_JobItem",
+                keyColumn: "Id",
+                keyValue: new Guid("1bb02f67-ed05-6cc1-1507-502e8f6c7a31"),
+                column: "ConcurrencyStamp",
+                value: "a37556b1d5ab4bc5b0cf1c1622eefff3");
+
+            migrationBuilder.UpdateData(
+                table: "Set_JobItem",
+                keyColumn: "Id",
+                keyValue: new Guid("49b1da12-418c-544d-fe8b-be7e5b572452"),
+                column: "ConcurrencyStamp",
+                value: "b2fdf754c09d4f3f816a378f71b76b6f");
+
+            migrationBuilder.UpdateData(
+                table: "Set_JobItem",
+                keyColumn: "Id",
+                keyValue: new Guid("6f68fc8f-b058-c3f4-e07d-722c61f3f7fa"),
+                column: "ConcurrencyStamp",
+                value: "65b4aa76401a4f1ab800dc8b1702f0b9");
+
+            migrationBuilder.UpdateData(
+                table: "Set_JobItem",
+                keyColumn: "Id",
+                keyValue: new Guid("7a0dc087-a859-5863-eb6e-56f588bd779e"),
+                column: "ConcurrencyStamp",
+                value: "136aad88976d4bf9b58a6e3586ca9fe1");
+
+            migrationBuilder.UpdateData(
+                table: "Set_JobItem",
+                keyColumn: "Id",
+                keyValue: new Guid("8f7dc23d-e2e9-3691-cfe9-545bb958e3f2"),
+                column: "ConcurrencyStamp",
+                value: "017827b08deb447ab5729a69e06d31dd");
+
+            migrationBuilder.UpdateData(
+                table: "Set_JobItem",
+                keyColumn: "Id",
+                keyValue: new Guid("b9b9c79f-4894-474b-4f67-b1ec121c41e5"),
+                column: "ConcurrencyStamp",
+                value: "289386fefb924a41afcc768204745473");
+
+            migrationBuilder.UpdateData(
+                table: "Set_JobItem",
+                keyColumn: "Id",
+                keyValue: new Guid("c09c23ea-815f-1b43-4476-2365a8d9a60b"),
+                column: "ConcurrencyStamp",
+                value: "30329237998d4b458194994a3e2229e5");
+
+            migrationBuilder.UpdateData(
+                table: "Set_JobItem",
+                keyColumn: "Id",
+                keyValue: new Guid("c1f71240-1b81-0107-8b23-ddc9811a3efe"),
+                column: "ConcurrencyStamp",
+                value: "a36bef05d3324491ac31fae24d5d622a");
+
+            migrationBuilder.UpdateData(
+                table: "Set_JobItem",
+                keyColumn: "Id",
+                keyValue: new Guid("ef3d8e8a-a88e-ca1f-e615-714c6bc48824"),
+                column: "ConcurrencyStamp",
+                value: "8516c291b3ed4d5aba3a1a832535c4ae");
+
+            migrationBuilder.UpdateData(
+                table: "Set_JobItem",
+                keyColumn: "Id",
+                keyValue: new Guid("f306b380-47e5-5c01-b902-67ca4113a8f4"),
+                column: "ConcurrencyStamp",
+                value: "d2500499b42341d784f5067aa91cf66d");
+        }
+    }
+}

code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Migrations/SettleAccountDbContextModelSnapshot.cs

@@ -613,6 +613,10 @@ namespace Win.Sfs.SettleAccount.Migrations
                     b.Property<string>("PartCode")
                         .HasColumnType("nvarchar(max)");
 
+                    b.Property<string>("Place")
+                        .HasMaxLength(64)
+                        .HasColumnType("nvarchar(64)");
+
                     b.Property<decimal>("Price")
                         .HasColumnType("decimal(18,2)");
 
@@ -1760,12 +1764,17 @@ namespace Win.Sfs.SettleAccount.Migrations
                         .HasColumnType("uniqueidentifier")
                         .HasColumnName("LastModifierId");
 
+                    b.Property<string>("Place")
+                        .HasMaxLength(64)
+                        .HasColumnType("nvarchar(64)");
+
                     b.Property<string>("RecordCount")
                         .HasMaxLength(50)
                         .HasColumnType("nvarchar(50)");
 
                     b.Property<string>("Site")
-                        .HasColumnType("nvarchar(max)");
+                        .HasMaxLength(64)
+                        .HasColumnType("nvarchar(64)");
 
                     b.Property<string>("State")
                         .HasMaxLength(50)
@@ -1848,6 +1857,10 @@ namespace Win.Sfs.SettleAccount.Migrations
                     b.Property<string>("PartCode")
                         .HasColumnType("nvarchar(max)");
 
+                    b.Property<string>("Place")
+                        .HasMaxLength(64)
+                        .HasColumnType("nvarchar(64)");
+
                     b.Property<decimal>("Price")
                         .HasColumnType("decimal(18,2)");
 
@@ -3110,6 +3123,9 @@ namespace Win.Sfs.SettleAccount.Migrations
                         .HasMaxLength(50)
                         .HasColumnType("nvarchar(50)");
 
+                    b.Property<int>("IndexNum")
+                        .HasColumnType("int");
+
                     b.Property<string>("InvGroupNum")
                         .HasMaxLength(50)
                         .HasColumnType("nvarchar(50)");
@@ -3218,6 +3234,9 @@ namespace Win.Sfs.SettleAccount.Migrations
                         .HasMaxLength(50)
                         .HasColumnType("nvarchar(50)");
 
+                    b.Property<int>("IndexNum")
+                        .HasColumnType("int");
+
                     b.Property<string>("InvGroupNum")
                         .HasMaxLength(50)
                         .HasColumnType("nvarchar(50)");
@@ -3503,6 +3522,10 @@ namespace Win.Sfs.SettleAccount.Migrations
                         .HasColumnType("uniqueidentifier")
                         .HasColumnName("LastModifierId");
 
+                    b.Property<string>("Place")
+                        .HasMaxLength(64)
+                        .HasColumnType("nvarchar(64)");
+
                     b.Property<string>("Site")
                         .HasMaxLength(64)
                         .HasColumnType("nvarchar(64)");
@@ -3570,6 +3593,9 @@ namespace Win.Sfs.SettleAccount.Migrations
                         .HasMaxLength(50)
                         .HasColumnType("nvarchar(50)");
 
+                    b.Property<int>("IndexNum")
+                        .HasColumnType("int");
+
                     b.Property<string>("KeyCode")
                         .HasMaxLength(50)
                         .HasColumnType("nvarchar(50)");
@@ -3596,6 +3622,10 @@ namespace Win.Sfs.SettleAccount.Migrations
                     b.Property<string>("PartCode")
                         .HasColumnType("nvarchar(max)");
 
+                    b.Property<string>("Place")
+                        .HasMaxLength(64)
+                        .HasColumnType("nvarchar(64)");
+
                     b.Property<decimal>("Price")
                         .HasColumnType("decimal(18,2)");
 
@@ -4477,7 +4507,7 @@ namespace Win.Sfs.SettleAccount.Migrations
                         new
                         {
                             Id = new Guid("ef3d8e8a-a88e-ca1f-e615-714c6bc48824"),
-                            ConcurrencyStamp = "18add54a57684dd1818440f0d5005ebb",
+                            ConcurrencyStamp = "27a58b61e45c44db907e467fb594cc66",
                             Cron = "0 0 8 26 *",
                             IsDisabled = false,
                             IsRunning = false,
@@ -4487,7 +4517,7 @@ namespace Win.Sfs.SettleAccount.Migrations
                         new
                         {
                             Id = new Guid("185c5968-e02b-267e-db2f-225fccfc9716"),
-                            ConcurrencyStamp = "dece69c1928241df9f38feccf47d0c0a",
+                            ConcurrencyStamp = "b1d31f0c8ba14fd5baf9e86a382cf23b",
                             Cron = "0 0/1 * * * ?",
                             IsDisabled = false,
                             IsRunning = false,
@@ -4497,7 +4527,7 @@ namespace Win.Sfs.SettleAccount.Migrations
                         new
                         {
                             Id = new Guid("1bb02f67-ed05-6cc1-1507-502e8f6c7a31"),
-                            ConcurrencyStamp = "431db509a1f34bfe9fd1a4d7efcf1d4c",
+                            ConcurrencyStamp = "cb552d924aa5468c9605fc66af7f6aa2",
                             Cron = "0 0/1 * * * ?",
                             IsDisabled = false,
                             IsRunning = false,
@@ -4507,7 +4537,7 @@ namespace Win.Sfs.SettleAccount.Migrations
                         new
                         {
                             Id = new Guid("b9b9c79f-4894-474b-4f67-b1ec121c41e5"),
-                            ConcurrencyStamp = "de291b54ac7e487988bb2660050b0db4",
+                            ConcurrencyStamp = "9c91f78395054248aaca3cb07018d785",
                             Cron = "0 0/30 * * * ? ",
                             IsDisabled = false,
                             IsRunning = false,
@@ -4517,7 +4547,7 @@ namespace Win.Sfs.SettleAccount.Migrations
                         new
                         {
                             Id = new Guid("49b1da12-418c-544d-fe8b-be7e5b572452"),
-                            ConcurrencyStamp = "06df83918cbc4543a2b44a83f739dc67",
+                            ConcurrencyStamp = "861d9091519a403e880429b4ec92bf48",
                             Cron = "0 0/30 * * * ? ",
                             IsDisabled = false,
                             IsRunning = false,
@@ -4527,7 +4557,7 @@ namespace Win.Sfs.SettleAccount.Migrations
                         new
                         {
                             Id = new Guid("7a0dc087-a859-5863-eb6e-56f588bd779e"),
-                            ConcurrencyStamp = "960ce38962e949558923f71d04f4e338",
+                            ConcurrencyStamp = "3b34af99b803428faad0b383080a46ef",
                             Cron = "0 0/30 * * * ? ",
                             IsDisabled = false,
                             IsRunning = false,
@@ -4537,7 +4567,7 @@ namespace Win.Sfs.SettleAccount.Migrations
                         new
                         {
                             Id = new Guid("6f68fc8f-b058-c3f4-e07d-722c61f3f7fa"),
-                            ConcurrencyStamp = "9004a8ecf43a4fe1848f6802a6d4576f",
+                            ConcurrencyStamp = "26fc2c469b324cd38fb3ee9c1fda720d",
                             Cron = "0 0/30 * * * ? ",
                             IsDisabled = false,
                             IsRunning = false,
@@ -4547,7 +4577,7 @@ namespace Win.Sfs.SettleAccount.Migrations
                         new
                         {
                             Id = new Guid("f306b380-47e5-5c01-b902-67ca4113a8f4"),
-                            ConcurrencyStamp = "03899f76c20043e896f38246ccb0d037",
+                            ConcurrencyStamp = "78bde67297b24c9eada8402d3f94d52b",
                             Cron = "0 0/30 * * * ? ",
                             IsDisabled = false,
                             IsRunning = false,
@@ -4557,7 +4587,7 @@ namespace Win.Sfs.SettleAccount.Migrations
                         new
                         {
                             Id = new Guid("8f7dc23d-e2e9-3691-cfe9-545bb958e3f2"),
-                            ConcurrencyStamp = "f9c840d4749b410982c3288ce64a8691",
+                            ConcurrencyStamp = "2120adc593a148ba95427da1eadc2073",
                             Cron = "0 0/30 * * * ? ",
                             IsDisabled = false,
                             IsRunning = false,
@@ -4567,7 +4597,7 @@ namespace Win.Sfs.SettleAccount.Migrations
                         new
                         {
                             Id = new Guid("c1f71240-1b81-0107-8b23-ddc9811a3efe"),
-                            ConcurrencyStamp = "e5bf812fc44e445991f4a7b6ece063db",
+                            ConcurrencyStamp = "628547db204a4af09bed4562a5d4e8fd",
                             Cron = "0 0/30 * * * ? ",
                             IsDisabled = false,
                             IsRunning = false,
@@ -4577,7 +4607,7 @@ namespace Win.Sfs.SettleAccount.Migrations
                         new
                         {
                             Id = new Guid("c09c23ea-815f-1b43-4476-2365a8d9a60b"),
-                            ConcurrencyStamp = "3ec6e8d3979a41088508d5ec64f5118a",
+                            ConcurrencyStamp = "9f5c2dac8b544424b22248e87f78051d",
                             Cron = "0 0/30 * * * ? ",
                             IsDisabled = false,
                             IsRunning = false,