From 75d03da033bb63ad434d87ca25e428792f654b4d Mon Sep 17 00:00:00 2001
From: wanggang <76527413@qq.com>
Date: Mon, 3 Jul 2023 17:44:22 +0800
Subject: [PATCH 1/9] update

---
 .../src/WTA/wwwroot/components/list/index.js  | 73 +++++++++++++++++++
 docs/demo/src/WTA/wwwroot/layouts/index.js    | 12 +--
 2 files changed, 75 insertions(+), 10 deletions(-)

diff --git a/docs/demo/src/WTA/wwwroot/components/list/index.js b/docs/demo/src/WTA/wwwroot/components/list/index.js
index b5ee3988..9e08462e 100644
--- a/docs/demo/src/WTA/wwwroot/components/list/index.js
+++ b/docs/demo/src/WTA/wwwroot/components/list/index.js
@@ -44,6 +44,10 @@ export default {
             <span>{{item.meta.title}}</span>
           </el-button>
         </template>
+        <el-button @click="queryDialog=true">
+          <el-icon><ep-filter /></el-icon>
+          <span>{{$t('高级筛选')}}</span>
+        </el-button>
         <slot name="tableButtons" :rows="selectedRows"></slot>
       </el-col>
     </el-row>
@@ -143,6 +147,62 @@ export default {
         />
       </el-col>
     </el-row>
+    <el-dialog v-model="queryDialog" align-center destroy-on-close>
+      <template #header> <span class="el-dialog__title"> {{$t('高级筛选')}} </span> </template>
+      <el-row>
+        <el-col style="max-height:calc(100vh - 180px );">
+          <el-scrollbar>
+            <el-row :gutter="20" v-for="(item,index) in queryList" style="margin-top:20px;">
+              <el-col :span="6">
+                <el-select v-model="item.property" :placeholder="$t('字段')">
+                  <el-option v-for="(value, prop) in queryFromSchema.properties">{{value.title}}</el-option>
+                </el-select>
+              </el-col>
+              <el-col :span="6">
+                <el-select v-model="item.operator" :placeholder="$t('操作符')">
+                  <el-option>{{$t('等于')}}</el-option>
+                  <el-option>{{$t('不等于')}}</el-option>
+                  <el-option>{{$t('大于')}}</el-option>
+                  <el-option>{{$t('大于等于')}}</el-option>
+                  <el-option>{{$t('小于')}}</el-option>
+                  <el-option>{{$t('小于等于')}}</el-option>
+                  <el-option>{{$t('包含')}}</el-option>
+                  <el-option>{{$t('不包含')}}</el-option>
+                </el-select>
+              </el-col>
+              <el-col :span="6">
+                <el-input v-model="item.value" :placeholder="$t('值')" />
+              </el-col>
+              <el-col :span="4">
+                <el-select v-model="item.logical" :placeholder="$t('关系')">
+                  <el-option>{{$t('且')}}</el-option>
+                  <el-option>{{$t('或')}}</el-option>
+                </el-select>
+              </el-col>
+              <el-col :span="2">
+                <el-space style="height:32px">
+                  <el-icon class="cursor-pointer" @click="queryList.splice(index, 1)">
+                    <ep-close />
+                  </el-icon>
+                </el-space>
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col>
+                <el-space style="height:32px;">
+                  <el-icon class="cursor-pointer" @click="pushQueryList"><ep-plus /></el-icon>
+                </el-space>
+              </el-col>
+            </el-row>
+          </el-scrollbar>
+        </el-col>
+      </el-row>
+      <template #footer>
+        <span class="dialog-footer">
+          <el-button type="primary" @click="queryDialog=false"> {{$t('confirm')}} </el-button>
+        </span>
+      </template>
+    </el-dialog>
     <el-drawer v-model="filterDrawer" destroy-on-close @close="tableRef.doLayout()">
       <template #header> <span class="el-dialog__title"> {{$t('filter')}} </span> </template>
       <el-scrollbar>
@@ -240,6 +300,8 @@ export default {
     const sortColumns = ref(new Map());
     const schema = ref(props.schema);
     const queryFromSchema = ref(null);
+    const queryList = ref([]);
+    const queryDialog = ref(false);
     const tableSchema = ref({});
     const tableData = ref([]);
     const editFormRef = ref(null);
@@ -418,6 +480,14 @@ export default {
         subDrawer.value = true;
       }
     };
+    const pushQueryList = () => {
+      queryList.value.push({
+        property: "",
+        operator: "等于",
+        value: "",
+        logical: "且",
+      });
+    };
     onMounted(async () => {
       const vm = (await get(indexUrl)).data;
       schema.value = vm.schema;
@@ -442,6 +512,8 @@ export default {
       dialogVisible,
       selectedRows,
       queryFromSchema,
+      queryDialog,
+      queryList,
       tableSchema,
       buttons,
       data,
@@ -463,6 +535,7 @@ export default {
       submit,
       showList,
       subListQuery,
+      pushQueryList,
     };
   },
 };
diff --git a/docs/demo/src/WTA/wwwroot/layouts/index.js b/docs/demo/src/WTA/wwwroot/layouts/index.js
index 380813c3..aa823277 100644
--- a/docs/demo/src/WTA/wwwroot/layouts/index.js
+++ b/docs/demo/src/WTA/wwwroot/layouts/index.js
@@ -20,17 +20,9 @@ export default {
           <layout-tabs />
           <el-main>
             <router-view v-if="!isRefreshing" v-slot="{ Component, route }">
-              <component
-                :is="Component"
-                v-if="!appStore.isUseTabsRouter || !route.meta?.cached"
-                :key="$route.fullPath"
-              />
+              <component :is="Component" v-if="route.meta?.disableCaching" :key="$route.fullPath" />
               <keep-alive>
-                <component
-                  :is="Component"
-                  v-if="appStore.isUseTabsRouter && route.meta?.cached"
-                  :key="route.fullPath"
-                />
+                <component :is="Component" v-if="!route.meta?.disableCaching" :key="route.fullPath" />
               </keep-alive>
             </router-view>
           </el-main>

From aa7cb937544fa5c509f38de80f4acf5add11d59c Mon Sep 17 00:00:00 2001
From: wanggang <76527413@qq.com>
Date: Tue, 4 Jul 2023 17:38:35 +0800
Subject: [PATCH 2/9] update

---
 .gitignore                                    |   1 +
 .../WTA.Shared/Application/PaginationModel.cs |   1 +
 .../src/WTA.Shared/Application/QueryFilter.cs |   9 +
 .../Controllers/GenericController.cs          |  17 +-
 .../Extensions/JsonSchemaExtensions.cs        |   8 +-
 .../WTA.Shared/Extensions/StringExtensions.cs |  14 +-
 .../src/WTA/wwwroot/components/form/index.js  |   2 +-
 .../src/WTA/wwwroot/components/icon/index.js  |   2 +-
 .../src/WTA/wwwroot/components/list/index.js  | 465 +++++++++---------
 docs/demo/src/WTA/wwwroot/layouts/tabs.js     |   4 +
 docs/demo/src/WTA/wwwroot/signalr/index.js    |   2 +-
 docs/demo/src/WTA/wwwroot/styles/site.css     |   5 +-
 ...�统寄售库变动及表结构整理.xlsx | Bin 0 -> 16776 bytes
 13 files changed, 298 insertions(+), 232 deletions(-)
 create mode 100644 docs/demo/src/WTA.Shared/Application/QueryFilter.cs
 create mode 100644 docs/结算系统寄售库变动及表结构整理.xlsx

diff --git a/.gitignore b/.gitignore
index bfcbf6ee..7657db0b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,6 +8,7 @@ dist/
 .vs/
 bin/
 obj/
+[Ll]ogs/
 *.suo
 *.user
 *.db
diff --git a/docs/demo/src/WTA.Shared/Application/PaginationModel.cs b/docs/demo/src/WTA.Shared/Application/PaginationModel.cs
index f250645f..e445708b 100644
--- a/docs/demo/src/WTA.Shared/Application/PaginationModel.cs
+++ b/docs/demo/src/WTA.Shared/Application/PaginationModel.cs
@@ -21,4 +21,5 @@ public class PaginationModel<TSearchModel, TListModel>
     public List<TListModel> Items { get; set; } = new List<TListModel>();
     public bool QueryAll { get; set; }
     public TSearchModel Query { get; set; } = Activator.CreateInstance<TSearchModel>();
+    public List<QueryFilter> Filters { get; set; } = new List<QueryFilter>();
 }
diff --git a/docs/demo/src/WTA.Shared/Application/QueryFilter.cs b/docs/demo/src/WTA.Shared/Application/QueryFilter.cs
new file mode 100644
index 00000000..f5ce52cf
--- /dev/null
+++ b/docs/demo/src/WTA.Shared/Application/QueryFilter.cs
@@ -0,0 +1,9 @@
+namespace WTA.Shared.Application;
+
+public class QueryFilter
+{
+    public string Property { get; set; } = null!;
+    public string Operator { get; set; } = null!;
+    public string Value { get; set; } = null!;
+    public string Logic { get; set; } = null!;
+}
diff --git a/docs/demo/src/WTA.Shared/Controllers/GenericController.cs b/docs/demo/src/WTA.Shared/Controllers/GenericController.cs
index 12960a6a..5b50a031 100644
--- a/docs/demo/src/WTA.Shared/Controllers/GenericController.cs
+++ b/docs/demo/src/WTA.Shared/Controllers/GenericController.cs
@@ -1,3 +1,4 @@
+using System.Globalization;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
@@ -40,6 +41,10 @@ public class GenericController<TEntity, TModel, TListModel, TSearchModel, TImpor
     {
         var isTree = typeof(TEntity).IsAssignableTo(typeof(BaseTreeEntity<TEntity>));
         var query = BuildQuery(model, isTree);
+        foreach (var item in model.Filters)
+        {
+            query = query.Where(string.Format(CultureInfo.InvariantCulture, item.Operator, item.Property.ToPascalCase()), item.Value);
+        }
         model.TotalCount = query.Count();
         if (!string.IsNullOrEmpty(model.OrderBy))
         {
@@ -76,6 +81,12 @@ public class GenericController<TEntity, TModel, TListModel, TSearchModel, TImpor
         return query;
     }
 
+    [HttpGet]
+    public IActionResult Details()
+    {
+        return Json(typeof(TModel).GetMetadataForType());
+    }
+
     [HttpPost, Order(-2), HtmlClass("el-button--primary")]
     public virtual IActionResult Details(Guid id)
     {
@@ -87,7 +98,11 @@ public class GenericController<TEntity, TModel, TListModel, TSearchModel, TImpor
     [HttpGet]
     public IActionResult Create()
     {
-        return Json(typeof(TModel).GetViewModel());
+        return Json(new
+        {
+            Schema = typeof(TModel).GetMetadataForType(),
+            Model = Activator.CreateInstance<TModel>(),
+        });
     }
 
     [HttpPost, Multiple, Order(-3), HtmlClass("el-button--success")]
diff --git a/docs/demo/src/WTA.Shared/Extensions/JsonSchemaExtensions.cs b/docs/demo/src/WTA.Shared/Extensions/JsonSchemaExtensions.cs
index fe319b65..2e26f7e0 100644
--- a/docs/demo/src/WTA.Shared/Extensions/JsonSchemaExtensions.cs
+++ b/docs/demo/src/WTA.Shared/Extensions/JsonSchemaExtensions.cs
@@ -133,8 +133,8 @@ public static class JsonSchemaExtensions
         }
 
         schema.AddNotNull("description", meta.Description);
-        schema.AddNotNull("format", meta.DataTypeName?.ToLowerCamelCase());
-        schema.AddNotNull("input", meta.TemplateHint?.ToLowerCamelCase());
+        schema.AddNotNull("format", meta.DataTypeName?.ToCamelCase());
+        schema.AddNotNull("input", meta.TemplateHint?.ToCamelCase());
         if (meta.TemplateHint == "select" && meta.IsEnumerableType && modelType.IsGenericType)
         {
             schema.TryAdd("url", modelType.GetGenericArguments().First().Name.ToSlugify());
@@ -152,7 +152,7 @@ public static class JsonSchemaExtensions
                 if (defaultModelMetadata.Attributes.Attributes.FirstOrDefault(o => o.GetType() == typeof(NavigationAttribute)) is NavigationAttribute navigationAttribute)
                 {
                     var path = navigationAttribute.Property ?? $"{propertyName[..^2]}.Name";
-                    path = string.Join('.', path.Split('.').Select(o => o.ToLowerCamelCase()));
+                    path = string.Join('.', path.Split('.').Select(o => o.ToCamelCase()));
                     schema.Add("navigation", path);
                     schema.Add("input", "select");
                     schema.Add("url", defaultModelMetadata.ContainerType?.GetProperty(propertyName[..^2])?.PropertyType.Name.ToSlugify()!);
@@ -257,7 +257,7 @@ public static class JsonSchemaExtensions
                 else if (attribute is CompareAttribute compare)//??
                 {
                     rule.Add("validator", "compare");
-                    rule.Add("compare", compare.OtherProperty.ToLowerCamelCase());
+                    rule.Add("compare", compare.OtherProperty.ToCamelCase());
                 }
                 else if (attribute is MinLengthAttribute minLength)
                 {
diff --git a/docs/demo/src/WTA.Shared/Extensions/StringExtensions.cs b/docs/demo/src/WTA.Shared/Extensions/StringExtensions.cs
index ef47474f..2a6948b5 100644
--- a/docs/demo/src/WTA.Shared/Extensions/StringExtensions.cs
+++ b/docs/demo/src/WTA.Shared/Extensions/StringExtensions.cs
@@ -57,7 +57,19 @@ public static class StringExtensions
         return input.EndsWith(end) ? input[..^end.Length] : input;
     }
 
-    public static string ToLowerCamelCase(this string input)
+    public static string ToPascalCase(this string value)
+    {
+        if (!string.IsNullOrEmpty(value))
+        {
+            var sb = new StringBuilder(value);
+            sb[0] = char.ToUpperInvariant(sb[0]);
+
+            return sb.ToString();
+        }
+        return value;
+    }
+
+    public static string ToCamelCase(this string input)
     {
         if (string.IsNullOrEmpty(input) || !char.IsUpper(input[0]))
         {
diff --git a/docs/demo/src/WTA/wwwroot/components/form/index.js b/docs/demo/src/WTA/wwwroot/components/form/index.js
index 2a9ed526..01b3f465 100644
--- a/docs/demo/src/WTA/wwwroot/components/form/index.js
+++ b/docs/demo/src/WTA/wwwroot/components/form/index.js
@@ -55,7 +55,7 @@ export default {
         });
         //}
       } catch (error) {
-        console.error(error);
+        console.log(error);
       } finally {
         loading.value = false;
       }
diff --git a/docs/demo/src/WTA/wwwroot/components/icon/index.js b/docs/demo/src/WTA/wwwroot/components/icon/index.js
index f8c30689..35757c36 100644
--- a/docs/demo/src/WTA/wwwroot/components/icon/index.js
+++ b/docs/demo/src/WTA/wwwroot/components/icon/index.js
@@ -24,7 +24,7 @@ export default {
             svg.value = await response.text();
           }
         } catch (error) {
-          console.error(error);
+          console.log(error);
           if (!svg.value) {
             svg.value = `<svg viewBox="0 0 1024 1024" xmlns="http://www.w3.org/2000/svg"><path fill="currentColor" d="M764.288 214.592 512 466.88 259.712 214.592a31.936 31.936 0 0 0-45.12 45.12L466.752 512 214.528 764.224a31.936 31.936 0 1 0 45.12 45.184L512 557.184l252.288 252.288a31.936 31.936 0 0 0 45.12-45.12L557.12 512.064l252.288-252.352a31.936 31.936 0 1 0-45.12-45.184z"></path></svg>`;
           }
diff --git a/docs/demo/src/WTA/wwwroot/components/list/index.js b/docs/demo/src/WTA/wwwroot/components/list/index.js
index 9e08462e..e80ad861 100644
--- a/docs/demo/src/WTA/wwwroot/components/list/index.js
+++ b/docs/demo/src/WTA/wwwroot/components/list/index.js
@@ -17,192 +17,137 @@ export default {
     VueOfficeExcel,
   },
   template: html`
-    <el-row>
-      <el-col>
-        <app-form
-          inline
-          mode="query"
-          label-position="left"
-          :schema="queryFromSchema"
-          v-model="data.query"
-          @submit="load"
-          :hideButton="true"
-          :isQueryForm="true"
-          v-if="queryFromSchema"
-        />
-      </el-col>
-    </el-row>
-    <el-row style="padding-bottom:20px;">
-      <el-col>
-        <template v-for="item in buttons">
-          <el-button
-            :class="item.meta.htmlClass??'el-button--primary'"
-            v-if="item.meta.isTop"
-            @click="click(item,selectedRows)"
-          >
-            <el-icon v-if="item.meta.icon"><svg-icon :name="item.meta.icon" /></el-icon>
-            <span>{{item.meta.title}}</span>
+    <div v-loading="tableLoading">
+      <el-row>
+        <el-col>
+          <app-form
+            inline
+            mode="query"
+            label-position="left"
+            :schema="queryFromSchema"
+            v-model="data.query"
+            @submit="load"
+            :hideButton="true"
+            :isQueryForm="true"
+            v-if="queryFromSchema"
+          />
+        </el-col>
+      </el-row>
+      <el-row style="padding-bottom:20px;">
+        <el-col>
+          <template v-for="item in buttons">
+            <el-button
+              :class="item.meta.htmlClass??'el-button--primary'"
+              v-if="item.meta.isTop"
+              @click="click(item,selectedRows)"
+            >
+              <el-icon v-if="item.meta.icon"><svg-icon :name="item.meta.icon" /></el-icon>
+              <span>{{item.meta.title}}</span>
+            </el-button>
+          </template>
+          <el-button @click="click('filter',selectedRows)">
+            <el-icon><ep-filter /></el-icon>
+            <span>{{$t('筛选')}}</span>
           </el-button>
-        </template>
-        <el-button @click="queryDialog=true">
-          <el-icon><ep-filter /></el-icon>
-          <span>{{$t('高级筛选')}}</span>
-        </el-button>
-        <slot name="tableButtons" :rows="selectedRows"></slot>
-      </el-col>
-    </el-row>
-    <el-row>
-      <el-col>
-        <el-scrollbar>
-          <el-table
-            ref="tableRef"
-            :v-loading="tableLoading"
-            :tree-props="treeProps"
-            :data="tableData"
-            @selection-change="handleSelectionChange"
-            @sort-change="sortChange"
-            :header-cell-class-name="getClass"
-            row-key="id"
-            table-layout="auto"
-            border
-            fit
-          >
-            <el-table-column fixed="left" type="selection" />
-            <el-table-column type="index" :label="$t('rowIndex')">
-              <template #default="scope"> {{ (data.pageIndex - 1) * data.pageSize + scope.$index + 1 }} </template>
-            </el-table-column>
-            <template v-for="(item,key) in tableSchema.properties">
-              <template v-if="key==='properties'">
-                <el-table-column :label="subKey" v-for="(subItem,subKey) in item.properties">
-                  <template #default="scope">{{ scope.row[key][subKey] }} </template>
-                </el-table-column>
-              </template>
-              <template v-else-if="item.navigation">
-                <el-table-column :prop="key" :label="item.title">
-                  <template #default="scope">{{getProp(scope.row,item.navigation)}}</template>
-                </el-table-column>
-              </template>
-              <template v-else-if="item.oneToMany">
-                <el-table-column :prop="key" :label="item.title">
-                  <template #default="scope">
-                    <el-link type="primary" @click="showList(scope.row[key],item.oneToMany)">
-                      <app-form-input :isReadOnly="true" :schema="item" :prop="key" v-model="scope.row" />
-                    </el-link>
-                  </template>
-                </el-table-column>
-              </template>
-              <template v-else>
-                <template v-if="showColumn(item,key)">
-                  <el-table-column :prop="key" sortable="custom" :sort-orders="['descending', 'ascending', null]">
-                    <template #header="scope">{{item.title}}</template>
+          <slot name="tableButtons" :rows="selectedRows"></slot>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col>
+          <el-scrollbar>
+            <el-table
+              ref="tableRef"
+              :tree-props="treeProps"
+              :data="tableData"
+              @selection-change="handleSelectionChange"
+              @sort-change="sortChange"
+              :header-cell-class-name="getClass"
+              row-key="id"
+              table-layout="auto"
+              border
+              fit
+            >
+              <el-table-column fixed="left" type="selection" />
+              <el-table-column type="index" :label="$t('rowIndex')">
+                <template #default="scope"> {{ (data.pageIndex - 1) * data.pageSize + scope.$index + 1 }} </template>
+              </el-table-column>
+              <template v-for="(item,key) in tableSchema.properties">
+                <template v-if="key==='properties'">
+                  <el-table-column :label="subKey" v-for="(subItem,subKey) in item.properties">
+                    <template #default="scope">{{ scope.row[key][subKey] }} </template>
+                  </el-table-column>
+                </template>
+                <template v-else-if="item.navigation">
+                  <el-table-column :prop="key" :label="item.title">
+                    <template #default="scope">{{getProp(scope.row,item.navigation)}}</template>
+                  </el-table-column>
+                </template>
+                <template v-else-if="item.oneToMany">
+                  <el-table-column :prop="key" :label="item.title">
                     <template #default="scope">
-                      <app-form-input :isReadOnly="true" :schema="item" :prop="key" v-model="scope.row" />
+                      <el-link type="primary" @click="showList(scope.row[key],item.oneToMany)">
+                        <app-form-input :isReadOnly="true" :schema="item" :prop="key" v-model="scope.row" />
+                      </el-link>
                     </template>
                   </el-table-column>
                 </template>
-              </template>
-            </template>
-            <slot name="columns"></slot>
-            <el-table-column fixed="right">
-              <template #header>
-                <el-button @click="filterDrawer = true">
-                  {{$t('operations')}}
-                  <el-icon class="el-icon--right"><ep-filter /></el-icon>
-                </el-button>
-              </template>
-              <template #default="scope">
-                <div class="flex">
-                  <template v-for="item in buttons">
-                    <el-button
-                      :class="item.meta.htmlClass??'el-button--primary'"
-                      v-if="!item.meta.isTop"
-                      @click="click(item,[scope.row])"
-                    >
-                      <el-icon v-if="item.meta.icon"><svg-icon :name="item.meta.icon" /></el-icon>
-                      <span>{{item.meta.title}}</span>
-                    </el-button>
+                <template v-else>
+                  <template v-if="showColumn(item,key)">
+                    <el-table-column :prop="key" sortable="custom" :sort-orders="['descending', 'ascending', null]">
+                      <template #header="scope">{{item.title}}</template>
+                      <template #default="scope">
+                        <app-form-input :isReadOnly="true" :schema="item" :prop="key" v-model="scope.row" />
+                      </template>
+                    </el-table-column>
                   </template>
-                  <slot name="rowButtons" :rows="[scope.row]"></slot>
-                </div>
+                </template>
               </template>
-            </el-table-column>
-          </el-table>
-        </el-scrollbar>
-      </el-col>
-    </el-row>
-    <el-row>
-      <el-col>
-        <el-pagination
-          v-if="tableData.length&&data.pageSize<data.totalCount"
-          v-model:currentPage="data.pageIndex"
-          v-model:page-size="data.pageSize"
-          :total="data.totalCount"
-          :page-sizes="[20, 50, 100]"
-          class="justify-end"
-          :background="true"
-          layout="total, sizes, prev, pager, next, jumper"
-          @size-change="onPageSizeChange"
-          @current-change="onPageIndexChange"
-          style="margin-top:20px"
-        />
-      </el-col>
-    </el-row>
-    <el-dialog v-model="queryDialog" align-center destroy-on-close>
-      <template #header> <span class="el-dialog__title"> {{$t('高级筛选')}} </span> </template>
-      <el-row>
-        <el-col style="max-height:calc(100vh - 180px );">
-          <el-scrollbar>
-            <el-row :gutter="20" v-for="(item,index) in queryList" style="margin-top:20px;">
-              <el-col :span="6">
-                <el-select v-model="item.property" :placeholder="$t('字段')">
-                  <el-option v-for="(value, prop) in queryFromSchema.properties">{{value.title}}</el-option>
-                </el-select>
-              </el-col>
-              <el-col :span="6">
-                <el-select v-model="item.operator" :placeholder="$t('操作符')">
-                  <el-option>{{$t('等于')}}</el-option>
-                  <el-option>{{$t('不等于')}}</el-option>
-                  <el-option>{{$t('大于')}}</el-option>
-                  <el-option>{{$t('大于等于')}}</el-option>
-                  <el-option>{{$t('小于')}}</el-option>
-                  <el-option>{{$t('小于等于')}}</el-option>
-                  <el-option>{{$t('包含')}}</el-option>
-                  <el-option>{{$t('不包含')}}</el-option>
-                </el-select>
-              </el-col>
-              <el-col :span="6">
-                <el-input v-model="item.value" :placeholder="$t('值')" />
-              </el-col>
-              <el-col :span="4">
-                <el-select v-model="item.logical" :placeholder="$t('关系')">
-                  <el-option>{{$t('且')}}</el-option>
-                  <el-option>{{$t('或')}}</el-option>
-                </el-select>
-              </el-col>
-              <el-col :span="2">
-                <el-space style="height:32px">
-                  <el-icon class="cursor-pointer" @click="queryList.splice(index, 1)">
-                    <ep-close />
-                  </el-icon>
-                </el-space>
-              </el-col>
-            </el-row>
-            <el-row>
-              <el-col>
-                <el-space style="height:32px;">
-                  <el-icon class="cursor-pointer" @click="pushQueryList"><ep-plus /></el-icon>
-                </el-space>
-              </el-col>
-            </el-row>
+              <slot name="columns"></slot>
+              <el-table-column fixed="right">
+                <template #header>
+                  <el-button @click="filterDrawer = true">
+                    {{$t('operations')}}
+                    <el-icon class="el-icon--right"><ep-filter /></el-icon>
+                  </el-button>
+                </template>
+                <template #default="scope">
+                  <div class="flex">
+                    <template v-for="item in buttons">
+                      <el-button
+                        :class="item.meta.htmlClass??'el-button--primary'"
+                        v-if="!item.meta.isTop"
+                        @click="click(item,[scope.row])"
+                      >
+                        <el-icon v-if="item.meta.icon"><svg-icon :name="item.meta.icon" /></el-icon>
+                        <span>{{item.meta.title}}</span>
+                      </el-button>
+                    </template>
+                    <slot name="rowButtons" :rows="[scope.row]"></slot>
+                  </div>
+                </template>
+              </el-table-column>
+            </el-table>
           </el-scrollbar>
         </el-col>
       </el-row>
-      <template #footer>
-        <span class="dialog-footer">
-          <el-button type="primary" @click="queryDialog=false"> {{$t('confirm')}} </el-button>
-        </span>
-      </template>
-    </el-dialog>
+      <el-row>
+        <el-col>
+          <el-pagination
+            v-if="tableData.length&&data.pageSize<data.totalCount"
+            v-model:currentPage="data.pageIndex"
+            v-model:page-size="data.pageSize"
+            :total="data.totalCount"
+            :page-sizes="[20, 50, 100]"
+            class="justify-end"
+            :background="true"
+            layout="total, sizes, prev, pager, next, jumper"
+            @size-change="onPageSizeChange"
+            @current-change="onPageIndexChange"
+            style="margin-top:20px"
+          />
+        </el-col>
+      </el-row>
+    </div>
     <el-drawer v-model="filterDrawer" destroy-on-close @close="tableRef.doLayout()">
       <template #header> <span class="el-dialog__title"> {{$t('filter')}} </span> </template>
       <el-scrollbar>
@@ -245,23 +190,100 @@ export default {
         </span>
       </template>
     </el-drawer>
-    <el-dialog v-model="dialogVisible" align-center destroy-on-close width="700">
+    <el-dialog v-model="dialogVisible" align-center destroy-on-close v-loading="editFormloading">
       <template #header> <span class="el-dialog__title"> {{editFormTitle}} </span> </template>
       <el-row>
-        <el-col style="max-height:calc(100vh - 180px );">
+        <el-col style="max-height:calc(100vh - 180px );min-height:100%;">
           <el-scrollbar>
-            <app-form
-              v-loading="editFormloading"
-              :disabled="editFormMode==='details'"
-              :mode="editFormMode"
-              ref="editFormRef"
-              inline
-              label-position="left"
-              :hideButton="true"
-              :schema="editFormSchema"
-              v-model="editFormModel"
-              v-if="editFormMode!=='import'"
-            />
+            <template v-if="editFormMode==='create'||editFormMode==='update'||editFormMode==='details'">
+              <app-form
+                :disabled="editFormMode==='details'"
+                :mode="editFormMode"
+                ref="editFormRef"
+                inline
+                label-position="left"
+                :hideButton="true"
+                :schema="editFormSchema"
+                v-model="editFormModel"
+                v-if="editFormSchema&&editFormMode"
+              />
+            </template>
+            <template v-else-if="editFormMode==='export'">
+              <el-form :model="exportModel" style="height:100%;">
+                <el-form-item :label="$t('全部')">
+                  <el-switch v-model="exportModel.includeAll" />
+                </el-form-item>
+                <el-form-item :label="$t('已删除')">
+                  <el-switch v-model="exportModel.includeDeleted" />
+                </el-form-item>
+              </el-form>
+            </template>
+            <template v-else-if="editFormMode==='import'">
+              <el-form :model="exportModel" style="height:100%;">
+                <el-form-item :label="$t('部分成功')">
+                  <el-switch v-model="exportModel.includeAll" />
+                </el-form-item>
+                <el-form-item :label="$t('只更新')">
+                  <el-switch v-model="exportModel.includeDeleted" />
+                </el-form-item>
+              </el-form>
+            </template>
+            <template v-else-if="editFormMode==='filter'">
+              <el-form :model="queryList" inline>
+                <el-row v-for="(item,index) in queryList" style="padding:10px;">
+                  <el-col :span="6">
+                    <el-select v-model="item.property" :placeholder="$t('字段')">
+                      <el-option
+                        v-for="(value, prop) in queryFromSchema.properties"
+                        :value="prop"
+                        :label="value.title"
+                      />
+                    </el-select>
+                  </el-col>
+                  <el-col :span="6">
+                    <el-select v-model="item.operator" :placeholder="$t('操作符')">
+                      <el-option value="{0}=@0" :label="$t('等于')" />
+                      <el-option value="{0}!=@0" :label="$t('不等于')" />
+                      <el-option value="{0}>@0" :label="$t('大于')" />
+                      <el-option value="{0}>=@0" :label="$t('大于等于')" />
+                      <el-option value="{0}<@0" :label="$t('小于')" />
+                      <el-option value="{0}<=@0" :label="$t('小于等于')" />
+                      <el-option value="{0}.Contains(@0)" :label="$t('包含')" />
+                      <el-option value="{0}.StartsWith(@0)" :label="$t('开始于')" />
+                      <el-option value="{0}.StartsWith(@0)" :label="$t('结束于')" />
+                    </el-select>
+                  </el-col>
+                  <el-col :span="6">
+                    <el-input v-model="item.value" :placeholder="$t('值')" />
+                  </el-col>
+                  <el-col :span="4">
+                    <el-select v-model="item.logic" :placeholder="$t('关系')">
+                      <el-option value="and" :label="$t('且')" />
+                      <el-option value="or" :label="$t('或')" />
+                    </el-select>
+                  </el-col>
+                  <el-col :span="2">
+                    <el-button circle @click="queryList.splice(index, 1)" style="margin-left:10px;">
+                      <template #icon>
+                        <ep-close />
+                      </template>
+                    </el-button>
+                  </el-col>
+                </el-row>
+                <el-row>
+                  <el-col>
+                    <el-button circle @click="pushQueryList" style="margin-left:10px;">
+                      <template #icon>
+                        <ep-plus />
+                      </template>
+                    </el-button>
+                  </el-col>
+                </el-row>
+              </el-form>
+            </template>
+            <template v-else>
+              <slot :name="editFormMode"></slot>
+            </template>
           </el-scrollbar>
         </el-col>
       </el-row>
@@ -287,7 +309,7 @@ export default {
     const filterDrawer = ref(false);
     const subDrawer = ref(false);
     const subListQuery = ref({});
-    const tableLoading = ref(false);
+    const tableLoading = ref(true);
     const selectedRows = ref([]);
     const dialogVisible = ref(false);
     const route = useRoute();
@@ -301,15 +323,14 @@ export default {
     const schema = ref(props.schema);
     const queryFromSchema = ref(null);
     const queryList = ref([]);
-    const queryDialog = ref(false);
     const tableSchema = ref({});
     const tableData = ref([]);
     const editFormRef = ref(null);
     const editFormloading = ref(false);
     const editFormMode = ref(null);
     const editFormTitle = ref("");
-    const editFormSchema = reactive({});
-    const editFormModel = reactive({});
+    const editFormSchema = ref(null);
+    const editFormModel = ref(null);
     const exportModel = reactive({
       includeAll: false,
       includeDeleted: false,
@@ -363,6 +384,7 @@ export default {
       tableLoading.value = true;
       try {
         const postData = JSON.parse(JSON.stringify(data.value));
+        postData.filters = queryList.value.filter((o) => o.property && o.value);
         delete postData.query["items"];
         delete postData.query["id"];
         const listData = (await post(url, postData)).data;
@@ -380,33 +402,28 @@ export default {
     const onPageIndexChange = async () => await load(indexUrl);
     const onPageSizeChange = async () => await load(indexUrl);
     const click = async (item, rows) => {
-      editFormMode.value = item.path;
+      editFormMode.value = item.path ?? item;
       context.emit("command", item, rows);
       if (item.path === "index") {
         //list
         await load(indexUrl);
       } else if (item.path === "details") {
         //details
-        const detailsUrl = `${baseUrl}/${item.path}?${qs.stringify({ id: rows[0].id })}`;
-        Object.assign(editFormSchema, schema.value.properties.items.items);
-        Object.assign(editFormModel, (await post(detailsUrl)).data);
-        editFormTitle.value = `${t("details")}${schema.value?.title}`;
+        const url = `${baseUrl}/${item.path}?${qs.stringify({ id: rows[0].id })}`;
+        editFormSchema.value = (await get(url)).data;
+        editFormModel.value = (await post(url)).data;
+        editFormTitle.value = `${schema.value?.title}${t("details")}`;
         dialogVisible.value = true;
-      } else if (item.path === "create") {
+      } else if (item.path === "create" || item.path === "update") {
         //create
-        const url = `${baseUrl}/${item.path}`;
+        let url = `${baseUrl}/${item.path}`;
+        if (item.path === "update") {
+          url = `${url}?${qs.stringify({ id: rows[0].id })}`;
+        }
         const vm = (await get(url)).data;
-        Object.assign(editFormSchema, schema.value);
-        Object.assign(editFormModel, vm.model);
-        editFormTitle.value = `${t("create")}${schema.value?.title}`;
-        dialogVisible.value = true;
-      } else if (item.path === "update") {
-        //update
-        const url = `${baseUrl}/${item.path}`;
-        const vm = (await get(url, { id: rows[0].id })).data;
-        Object.assign(editFormSchema, schema.value);
-        Object.assign(editFormModel, vm.model);
-        editFormTitle.value = `${t("update")}${schema.value?.title}`;
+        editFormSchema.value = vm.schema;
+        editFormModel.value = vm.model;
+        editFormTitle.value = `${t(item.path)}${schema.value?.title}`;
         dialogVisible.value = true;
       } else if (item.path === "delete") {
         //delete
@@ -421,14 +438,15 @@ export default {
         await load(indexUrl);
       } else if (item.path === "export") {
         //export
-        const url = `${baseUrl}/${item.path}`;
-        const exportUrl = `${url}?${qs.stringify(exportModel)}`;
-        await load(exportUrl);
+        dialogVisible.value = true;
       } else if (item.path === "import") {
         //import
         const url = `${baseUrl}/${item.path}`;
         editFormTitle.value = `${t("import")}${schema.value?.title}`;
         dialogVisible.value = true;
+      } else if (item === "filter") {
+        editFormTitle.value = t("自定义查询");
+        dialogVisible.value = true;
       }
     };
     const submit = async () => {
@@ -448,7 +466,7 @@ export default {
             }
           }
         } catch (error) {
-          console.error(error);
+          console.log(error);
         } finally {
           editFormloading.value = false;
         }
@@ -456,6 +474,14 @@ export default {
         await load(indexUrl);
         editFormMode.value = null;
         dialogVisible.value = false;
+      } else if (editFormMode.value === "export") {
+        const url = `${baseUrl}/${item.path}?${qs.stringify(exportModel)}`;
+        // await load(exportUrl);
+      } else if (editFormMode.value === "filter") {
+        alert(JSON.stringify(queryList.value));
+        //const url = `${baseUrl}/${item.path}?${qs.stringify(exportModel)}`;
+        // await load(exportUrl);
+        dialogVisible.value = false;
       }
     };
     const showList = (value, nav) => {
@@ -483,12 +509,13 @@ export default {
     const pushQueryList = () => {
       queryList.value.push({
         property: "",
-        operator: "等于",
+        operator: "{0}=@0",
         value: "",
-        logical: "且",
+        logic: "or",
       });
     };
     onMounted(async () => {
+      pushQueryList();
       const vm = (await get(indexUrl)).data;
       schema.value = vm.schema;
       queryFromSchema.value = vm.schema.properties.query;
@@ -512,7 +539,6 @@ export default {
       dialogVisible,
       selectedRows,
       queryFromSchema,
-      queryDialog,
       queryList,
       tableSchema,
       buttons,
@@ -522,6 +548,7 @@ export default {
       sortChange,
       getProp,
       editFormRef,
+      editFormloading,
       editFormMode,
       editFormTitle,
       editFormSchema,
diff --git a/docs/demo/src/WTA/wwwroot/layouts/tabs.js b/docs/demo/src/WTA/wwwroot/layouts/tabs.js
index acfe4abd..b00302d1 100644
--- a/docs/demo/src/WTA/wwwroot/layouts/tabs.js
+++ b/docs/demo/src/WTA/wwwroot/layouts/tabs.js
@@ -65,6 +65,10 @@ export default {
       .router-tab .el-tabs__content {
         display: none;
       }
+
+      .router-tab .el-icon {
+        margin-right: 5px;
+      }
     </style>
   `,
   setup() {
diff --git a/docs/demo/src/WTA/wwwroot/signalr/index.js b/docs/demo/src/WTA/wwwroot/signalr/index.js
index 6b46131e..7259ac04 100644
--- a/docs/demo/src/WTA/wwwroot/signalr/index.js
+++ b/docs/demo/src/WTA/wwwroot/signalr/index.js
@@ -22,7 +22,7 @@ const connect = async () => {
           console.log("signalr connected");
         })
         .catch(function (error) {
-          console.error(error);
+          console.log(error);
           //setTimeout(connect, 5000);
         });
     }
diff --git a/docs/demo/src/WTA/wwwroot/styles/site.css b/docs/demo/src/WTA/wwwroot/styles/site.css
index bb320593..54873f9b 100644
--- a/docs/demo/src/WTA/wwwroot/styles/site.css
+++ b/docs/demo/src/WTA/wwwroot/styles/site.css
@@ -103,16 +103,13 @@ a.logo {
   white-space: nowrap;
 }
 
-.el-icon {
-  margin-right: 5px;
-}
-
 .el-dialog__header,
 .el-dialog__footer,
 .el-drawer__header,
 .el-drawer__footer {
   height: var(--header);
   padding: 15px;
+  margin: 0;
 }
 
 .el-dialog__header,
diff --git a/docs/结算系统寄售库变动及表结构整理.xlsx b/docs/结算系统寄售库变动及表结构整理.xlsx
new file mode 100644
index 0000000000000000000000000000000000000000..b80c17f5937e3093b1db6f51ffc8c926bec60333
GIT binary patch
literal 16776
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
S6>b2iA3sJPQGnt4HTr*{VA!bu

literal 0
HcmV?d00001


From 1e7d7e1091c3e44c2a96e696800f4d8899a5f256 Mon Sep 17 00:00:00 2001
From: wanggang <76527413@qq.com>
Date: Tue, 4 Jul 2023 21:13:26 +0800
Subject: [PATCH 3/9] update

---
 docs/demo/src/WTA/wwwroot/components/list/index.js | 6 ++++--
 docs/demo/src/WTA/wwwroot/index.html               | 9 ++++++++-
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/docs/demo/src/WTA/wwwroot/components/list/index.js b/docs/demo/src/WTA/wwwroot/components/list/index.js
index e80ad861..0e7672e9 100644
--- a/docs/demo/src/WTA/wwwroot/components/list/index.js
+++ b/docs/demo/src/WTA/wwwroot/components/list/index.js
@@ -190,9 +190,9 @@ export default {
         </span>
       </template>
     </el-drawer>
-    <el-dialog v-model="dialogVisible" align-center destroy-on-close v-loading="editFormloading">
+    <el-dialog v-model="dialogVisible" align-center destroy-on-close>
       <template #header> <span class="el-dialog__title"> {{editFormTitle}} </span> </template>
-      <el-row>
+      <el-row v-loading="editFormloading">
         <el-col style="max-height:calc(100vh - 180px );min-height:100%;">
           <el-scrollbar>
             <template v-if="editFormMode==='create'||editFormMode==='update'||editFormMode==='details'">
@@ -402,6 +402,7 @@ export default {
     const onPageIndexChange = async () => await load(indexUrl);
     const onPageSizeChange = async () => await load(indexUrl);
     const click = async (item, rows) => {
+      editFormloading.value = true;
       editFormMode.value = item.path ?? item;
       context.emit("command", item, rows);
       if (item.path === "index") {
@@ -448,6 +449,7 @@ export default {
         editFormTitle.value = t("自定义查询");
         dialogVisible.value = true;
       }
+      editFormloading.value = false;
     };
     const submit = async () => {
       if (editFormMode.value === "create" || editFormMode.value === "update") {
diff --git a/docs/demo/src/WTA/wwwroot/index.html b/docs/demo/src/WTA/wwwroot/index.html
index b0e0eda0..87d25c36 100644
--- a/docs/demo/src/WTA/wwwroot/index.html
+++ b/docs/demo/src/WTA/wwwroot/index.html
@@ -27,6 +27,7 @@
       margin: auto;
       width: 50px;
       height: 50px;
+      color: #409eff;
     }
   </style>
   <link rel="stylesheet" href="./main.css" />
@@ -35,7 +36,13 @@
 
 <body>
   <div id="app"></div>
-  <img src="./assets/icons/loading.svg" id="loading" class="loading">
+  <i id="loading" class="loading">
+    <svg viewBox="0 0 1024 1024" xmlns="http://www.w3.org/2000/svg">
+      <path fill="currentColor"
+        d="M512 64a32 32 0 0 1 32 32v192a32 32 0 0 1-64 0V96a32 32 0 0 1 32-32zm0 640a32 32 0 0 1 32 32v192a32 32 0 1 1-64 0V736a32 32 0 0 1 32-32zm448-192a32 32 0 0 1-32 32H736a32 32 0 1 1 0-64h192a32 32 0 0 1 32 32zm-640 0a32 32 0 0 1-32 32H96a32 32 0 0 1 0-64h192a32 32 0 0 1 32 32zM195.2 195.2a32 32 0 0 1 45.248 0L376.32 331.008a32 32 0 0 1-45.248 45.248L195.2 240.448a32 32 0 0 1 0-45.248zm452.544 452.544a32 32 0 0 1 45.248 0L828.8 783.552a32 32 0 0 1-45.248 45.248L647.744 692.992a32 32 0 0 1 0-45.248zM828.8 195.264a32 32 0 0 1 0 45.184L692.992 376.32a32 32 0 0 1-45.248-45.248l135.808-135.808a32 32 0 0 1 45.248 0zm-452.544 452.48a32 32 0 0 1 0 45.248L240.448 828.8a32 32 0 0 1-45.248-45.248l135.808-135.808a32 32 0 0 1 45.248 0z">
+      </path>
+    </svg>
+  </i>
   <script type="importmap">
     {
       "imports": {

From ddcda67d02749c01b35143b54872e3a72eeba2a1 Mon Sep 17 00:00:00 2001
From: wanggang <76527413@qq.com>
Date: Wed, 5 Jul 2023 16:14:38 +0800
Subject: [PATCH 4/9] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=AF=BC=E5=85=A5?=
 =?UTF-8?q?=E5=AF=BC=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/GenericController.cs          |  29 ++++--
 .../demo/src/WTA.Shared/Data/BaseDbContext.cs |   2 +-
 .../ClosedXmlExportImportService.cs           |  52 +++++++++--
 .../Resources/{calibril.ttf => font.ttf}      | Bin
 docs/demo/src/WTA.Shared/WTA.Shared.csproj    |   8 ++
 .../src/WTA/wwwroot/components/list/index.js  |  86 +++++++++++++-----
 docs/demo/src/WTA/wwwroot/request/index.js    |   9 +-
 docs/demo/src/WTA/wwwroot/utils/index.js      |   6 +-
 8 files changed, 155 insertions(+), 37 deletions(-)
 rename docs/demo/src/WTA.Shared/Resources/{calibril.ttf => font.ttf} (100%)

diff --git a/docs/demo/src/WTA.Shared/Controllers/GenericController.cs b/docs/demo/src/WTA.Shared/Controllers/GenericController.cs
index 5b50a031..44f90945 100644
--- a/docs/demo/src/WTA.Shared/Controllers/GenericController.cs
+++ b/docs/demo/src/WTA.Shared/Controllers/GenericController.cs
@@ -1,12 +1,15 @@
 using System.Globalization;
+using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using WTA.Shared.Application;
 using WTA.Shared.Attributes;
 using WTA.Shared.Data;
 using WTA.Shared.Domain;
+using WTA.Shared.ExportImport;
 using WTA.Shared.Extensions;
 using WTA.Shared.Mappers;
 
@@ -41,10 +44,6 @@ public class GenericController<TEntity, TModel, TListModel, TSearchModel, TImpor
     {
         var isTree = typeof(TEntity).IsAssignableTo(typeof(BaseTreeEntity<TEntity>));
         var query = BuildQuery(model, isTree);
-        foreach (var item in model.Filters)
-        {
-            query = query.Where(string.Format(CultureInfo.InvariantCulture, item.Operator, item.Property.ToPascalCase()), item.Value);
-        }
         model.TotalCount = query.Count();
         if (!string.IsNullOrEmpty(model.OrderBy))
         {
@@ -73,11 +72,14 @@ public class GenericController<TEntity, TModel, TListModel, TSearchModel, TImpor
         {
             query = query.Where(model: model.Query);
         }
+        foreach (var item in model.Filters)
+        {
+            query = query.Where(string.Format(CultureInfo.InvariantCulture, item.Operator, item.Property.ToPascalCase()), item.Value);
+        }
         if (isTree)
         {
             model.OrderBy ??= $"{nameof(BaseTreeEntity<TEntity>.ParentId)},{nameof(BaseEntity.Order)},{nameof(BaseEntity.CreatedOn)}";
         }
-
         return query;
     }
 
@@ -178,6 +180,20 @@ public class GenericController<TEntity, TModel, TListModel, TSearchModel, TImpor
         }
     }
 
+    [HttpGet,AllowAnonymous, Multiple, Order(-2), HtmlClass("el-button--primary")]
+    public virtual IActionResult Import()
+    {
+        try
+        {
+            var exportImportService = this.HttpContext.RequestServices.GetRequiredService<IExportImportService>();
+            return exportImportService.GetImportTemplate<TImportModel>();
+        }
+        catch (Exception ex)
+        {
+            return Problem(ex.Message);
+        }
+    }
+
     [HttpPost, Multiple, Order(-2), HtmlClass("el-button--primary")]
     public virtual IActionResult Import(IFormFile importexcelfile)
     {
@@ -206,7 +222,8 @@ public class GenericController<TEntity, TModel, TListModel, TSearchModel, TImpor
             {
                 this.Repository.DisableSoftDeleteFilter();
             }
-            return Json(query.ToList());
+            var exportImportService = this.HttpContext.RequestServices.GetRequiredService<IExportImportService>();
+            return exportImportService.Export(query.ToList().Select(o => o.ToObject<TExportModel>()).ToList());
         }
         catch (Exception ex)
         {
diff --git a/docs/demo/src/WTA.Shared/Data/BaseDbContext.cs b/docs/demo/src/WTA.Shared/Data/BaseDbContext.cs
index 291495a5..581b6d13 100644
--- a/docs/demo/src/WTA.Shared/Data/BaseDbContext.cs
+++ b/docs/demo/src/WTA.Shared/Data/BaseDbContext.cs
@@ -112,7 +112,7 @@ public abstract class BaseDbContext<T> : DbContext where T : DbContext
             if (entityType.IsAssignableTo(typeof(BaseEntity)))
             {
                 //软删除、租户过滤
-                this.GetType().GetMethod(nameof(this.CreateQueryFilter))?.MakeGenericMethod(entityType).Invoke(this, new object[] { modelBuilder });
+                //this.GetType().GetMethod(nameof(this.CreateQueryFilter))?.MakeGenericMethod(entityType).Invoke(this, new object[] { modelBuilder });
                 //
                 //基类
                 entityTypeBuilder.HasKey(nameof(BaseEntity.Id));
diff --git a/docs/demo/src/WTA.Shared/ExportImport/ClosedXmlExportImportService.cs b/docs/demo/src/WTA.Shared/ExportImport/ClosedXmlExportImportService.cs
index 02dfcfc7..c8924169 100644
--- a/docs/demo/src/WTA.Shared/ExportImport/ClosedXmlExportImportService.cs
+++ b/docs/demo/src/WTA.Shared/ExportImport/ClosedXmlExportImportService.cs
@@ -5,8 +5,8 @@ using ClosedXML.Excel;
 using ClosedXML.Graphics;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Logging;
-using Microsoft.OpenApi.Extensions;
 using WTA.Shared.Attributes;
+using WTA.Shared.Extensions;
 
 namespace WTA.Shared.ExportImport;
 
@@ -18,7 +18,7 @@ public class ClosedXmlExportImportService : IExportImportService
 
     static ClosedXmlExportImportService()
     {
-        using var fallbackFontStream = Assembly.GetExecutingAssembly().GetManifestResourceStream($"{WebApp.Current.Prefix}.Infrastructure.Resources.calibril.ttf");
+        using var fallbackFontStream = Assembly.GetExecutingAssembly().GetManifestResourceStream($"{typeof(WTA.Shared.Resources.Resource).Namespace}.font.ttf");
         LoadOptions.DefaultGraphicEngine = DefaultGraphicEngine.CreateWithFontsAndSystemFonts(fallbackFontStream);
     }
 
@@ -32,12 +32,31 @@ public class ClosedXmlExportImportService : IExportImportService
         try
         {
             using var workbook = new XLWorkbook();
-            var name = typeof(TExportModel).GetCustomAttribute<DisplayAttribute>()?.Name ?? typeof(TExportModel).Name;
+            var name = typeof(TExportModel).GetDisplayName();
             var fileName = $"{name}_导出.xlsx";
             var ws = workbook.Worksheets.Add(name);
-            ws.Style.Font.FontName = "宋体";
             //
-            //Internal
+            var type = typeof(TExportModel);
+            var propertyList = GetPropertiesForImportModel(type);
+            var rowIndex = 1;
+            for (var i = 0; i < propertyList.Length; i++)
+            {
+                var property = propertyList[i];
+                var columnIndex = i + 1;
+                var cell = ws.Cell(1, columnIndex);
+                cell.Value = property.GetDisplayName();
+            }
+            list.ForEach(model =>
+            {
+                rowIndex++;
+                for (var i = 0; i < propertyList.Length; i++)
+                {
+                    var property = propertyList[i];
+                    var columnIndex = i + 1;
+                    var cell = ws.Cell(rowIndex, columnIndex);
+                    cell.Value = property.GetValue(model)?.ToString();
+                }
+            });
             //
             var stream = new MemoryStream();
             workbook.SaveAs(stream);
@@ -57,8 +76,27 @@ public class ClosedXmlExportImportService : IExportImportService
 
     public FileContentResult GetImportTemplate<TImportModel>()
     {
-        //TModelType=>File
-        throw new NotImplementedException();
+        using var workbook = new XLWorkbook();
+        var type = typeof(TImportModel);
+        var name = type.GetDisplayName();
+        var fileName = $"{name}_导入模板.xlsx";
+        var ws = workbook.Worksheets.Add(name);
+        var properties = GetPropertiesForImportModel(type);
+        for (var i = 0; i < properties.Length; i++)
+        {
+            var property = properties[i];
+            var headerName = property.GetDisplayName();
+            var cell = ws.Cell(1, i + 1);
+            cell.Value = headerName;
+        }
+        var stream = new MemoryStream();
+        workbook.SaveAs(stream);
+        stream.Seek(0, SeekOrigin.Begin);
+        var result = new FileContentResult(stream.ToArray(), ContentType)
+        {
+            FileDownloadName = fileName
+        };
+        return result;
     }
 
     public IList<TImportModel> Import<TImportModel>(byte[] bytes)
diff --git a/docs/demo/src/WTA.Shared/Resources/calibril.ttf b/docs/demo/src/WTA.Shared/Resources/font.ttf
similarity index 100%
rename from docs/demo/src/WTA.Shared/Resources/calibril.ttf
rename to docs/demo/src/WTA.Shared/Resources/font.ttf
diff --git a/docs/demo/src/WTA.Shared/WTA.Shared.csproj b/docs/demo/src/WTA.Shared/WTA.Shared.csproj
index 35afd276..d85b278d 100644
--- a/docs/demo/src/WTA.Shared/WTA.Shared.csproj
+++ b/docs/demo/src/WTA.Shared/WTA.Shared.csproj
@@ -1,5 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
 
+  <ItemGroup>
+    <None Remove="Resources\font.ttf" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <EmbeddedResource Include="Resources\font.ttf" />
+  </ItemGroup>
+
   <ItemGroup>
     <PackageReference Include="Autofac" />
     <PackageReference Include="Autofac.Configuration" />
diff --git a/docs/demo/src/WTA/wwwroot/components/list/index.js b/docs/demo/src/WTA/wwwroot/components/list/index.js
index 0e7672e9..958a933e 100644
--- a/docs/demo/src/WTA/wwwroot/components/list/index.js
+++ b/docs/demo/src/WTA/wwwroot/components/list/index.js
@@ -190,7 +190,12 @@ export default {
         </span>
       </template>
     </el-drawer>
-    <el-dialog v-model="dialogVisible" align-center destroy-on-close>
+    <el-dialog
+      v-model="dialogVisible"
+      align-center
+      destroy-on-close
+      style="width:auto;min-width:300px;max-width:700px;"
+    >
       <template #header> <span class="el-dialog__title"> {{editFormTitle}} </span> </template>
       <el-row v-loading="editFormloading">
         <el-col style="max-height:calc(100vh - 180px );min-height:100%;">
@@ -219,18 +224,27 @@ export default {
               </el-form>
             </template>
             <template v-else-if="editFormMode==='import'">
-              <el-form :model="exportModel" style="height:100%;">
+              <el-form :model="importModel" style="height:100%;">
                 <el-form-item :label="$t('部分成功')">
-                  <el-switch v-model="exportModel.includeAll" />
+                  <el-switch v-model="importModel.partal" />
                 </el-form-item>
-                <el-form-item :label="$t('只更新')">
-                  <el-switch v-model="exportModel.includeDeleted" />
+                <el-form-item :label="$t('全部替换')">
+                  <el-switch v-model="importModel.replace" />
+                </el-form-item>
+                <el-form-item :label="$t('导入模板')">
+                  <el-link type="primary" @click="getImportTemplate">{{$t('下载')}}</el-link>
+                </el-form-item>
+                <el-form-item :label="$t('文件')">
+                  <el-upload drag v-model="importModel.file">
+                    <el-icon class="el-icon--upload"><ep-upload-filled /></el-icon>
+                    <div class="el-upload__text">{{$t('拖放文件到此处或')}} <em>{{$t('点击上传')}}</em></div>
+                  </el-upload>
                 </el-form-item>
               </el-form>
             </template>
             <template v-else-if="editFormMode==='filter'">
-              <el-form :model="queryList" inline>
-                <el-row v-for="(item,index) in queryList" style="padding:10px;">
+              <el-form :model="queryList" inline class="filter">
+                <el-row v-for="(item,index) in queryList">
                   <el-col :span="6">
                     <el-select v-model="item.property" :placeholder="$t('字段')">
                       <el-option
@@ -256,14 +270,14 @@ export default {
                   <el-col :span="6">
                     <el-input v-model="item.value" :placeholder="$t('值')" />
                   </el-col>
-                  <el-col :span="4">
+                  <!-- <el-col :span="4">
                     <el-select v-model="item.logic" :placeholder="$t('关系')">
                       <el-option value="and" :label="$t('且')" />
                       <el-option value="or" :label="$t('或')" />
                     </el-select>
-                  </el-col>
+                  </el-col> -->
                   <el-col :span="2">
-                    <el-button circle @click="queryList.splice(index, 1)" style="margin-left:10px;">
+                    <el-button circle @click="queryList.splice(index, 1)">
                       <template #icon>
                         <ep-close />
                       </template>
@@ -272,7 +286,7 @@ export default {
                 </el-row>
                 <el-row>
                   <el-col>
-                    <el-button circle @click="pushQueryList" style="margin-left:10px;">
+                    <el-button circle @click="pushQueryList">
                       <template #icon>
                         <ep-plus />
                       </template>
@@ -295,7 +309,8 @@ export default {
     </el-dialog>
   `,
   styles: html`<style>
-    .el-overlay {
+    .el-form.filter .el-col {
+      padding: 5px;
     }
   </style>`,
   props: ["modelValue", "schema", "controller", "query", "buttons"],
@@ -335,6 +350,12 @@ export default {
       includeAll: false,
       includeDeleted: false,
     });
+    const importModel = reactive({
+      partial: true,
+      replace: false,
+      template: null,
+      file: null,
+    });
     const getSortModel = (model) => {
       model.orderBy
         .split(",")
@@ -439,11 +460,12 @@ export default {
         await load(indexUrl);
       } else if (item.path === "export") {
         //export
+        editFormTitle.value = `${t(item.path)}${schema.value?.title}`;
         dialogVisible.value = true;
       } else if (item.path === "import") {
         //import
         const url = `${baseUrl}/${item.path}`;
-        editFormTitle.value = `${t("import")}${schema.value?.title}`;
+        editFormTitle.value = `${t(item.path)}${schema.value?.title}`;
         dialogVisible.value = true;
       } else if (item === "filter") {
         editFormTitle.value = t("自定义查询");
@@ -473,16 +495,25 @@ export default {
           editFormloading.value = false;
         }
       } else if (editFormMode.value === "details") {
-        await load(indexUrl);
-        editFormMode.value = null;
         dialogVisible.value = false;
+        editFormMode.value = null;
       } else if (editFormMode.value === "export") {
-        const url = `${baseUrl}/${item.path}?${qs.stringify(exportModel)}`;
-        // await load(exportUrl);
+        const postData = JSON.parse(JSON.stringify(data.value));
+        postData.filters = queryList.value.filter((o) => o.property && o.value);
+        delete postData.query["items"];
+        delete postData.query["id"];
+        const url = `${baseUrl}/${editFormMode.value}?${qs.stringify(exportModel)}`;
+        const response = await post(url, postData);
+        const downloadUrl = window.URL.createObjectURL(response.data);
+        const filename = response.filename;
+        let link = document.createElement("a");
+        link.href = downloadUrl;
+        link.download = filename;
+        link.click();
+        window.URL.revokeObjectURL(downloadUrl);
+        dialogVisible.value = false;
       } else if (editFormMode.value === "filter") {
-        alert(JSON.stringify(queryList.value));
-        //const url = `${baseUrl}/${item.path}?${qs.stringify(exportModel)}`;
-        // await load(exportUrl);
+        await load(indexUrl);
         dialogVisible.value = false;
       }
     };
@@ -513,9 +544,20 @@ export default {
         property: "",
         operator: "{0}=@0",
         value: "",
-        logic: "or",
+        logic: "and",
       });
     };
+    const getImportTemplate = async () => {
+      const url = `${baseUrl}/${editFormMode.value}`;
+      const response = await get(url);
+      const downloadUrl = window.URL.createObjectURL(response.data);
+      const filename = response.filename;
+      let link = document.createElement("a");
+      link.href = downloadUrl;
+      link.download = filename;
+      link.click();
+      window.URL.revokeObjectURL(downloadUrl);
+    };
     onMounted(async () => {
       pushQueryList();
       const vm = (await get(indexUrl)).data;
@@ -549,6 +591,7 @@ export default {
       getClass,
       sortChange,
       getProp,
+      getImportTemplate,
       editFormRef,
       editFormloading,
       editFormMode,
@@ -556,6 +599,7 @@ export default {
       editFormSchema,
       editFormModel,
       exportModel,
+      importModel,
       onPageSizeChange,
       onPageIndexChange,
       handleSelectionChange,
diff --git a/docs/demo/src/WTA/wwwroot/request/index.js b/docs/demo/src/WTA/wwwroot/request/index.js
index 6489e6c6..7ebaee4f 100644
--- a/docs/demo/src/WTA/wwwroot/request/index.js
+++ b/docs/demo/src/WTA/wwwroot/request/index.js
@@ -1,6 +1,7 @@
 import qs from "../lib/qs/shim.js";
 import { isLogin } from "../api/user.js";
 import { useAppStore } from "../store/index.js";
+import { getFileName } from "../utils/index.js";
 
 const requestSettings = {
   baseURL: "/api",
@@ -44,7 +45,13 @@ const getResult = async (response) => {
     message: messages.get(response.status),
   };
   if (response.status == 200) {
-    result.data = await response.json();
+    const contentType = response.headers.get("Content-Type");
+    if (contentType.indexOf("application/json") > -1) {
+      result.data = await response.json();
+    } else if (contentType === "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet") {
+      result.data = await response.blob();
+      result.filename = getFileName(response.headers.get("Content-Disposition"));
+    }
   } else if (response.status === 400 || response.status === 500) {
     result.errors = await response.json();
   }
diff --git a/docs/demo/src/WTA/wwwroot/utils/index.js b/docs/demo/src/WTA/wwwroot/utils/index.js
index 4fd72d29..17c53dba 100644
--- a/docs/demo/src/WTA/wwwroot/utils/index.js
+++ b/docs/demo/src/WTA/wwwroot/utils/index.js
@@ -116,5 +116,9 @@ function getProp(instance, propPath) {
   return get(instance, propPath);
 }
 
+function getFileName(contentDisposition) {
+  return decodeURIComponent(/filename\*=UTF-8''([\w%\-\.]+)(?:; ?|$)/i.exec(contentDisposition)[1]);
+}
+
 export default html;
-export { persentFormat, bytesFormat, format, schemaToModel, listToTree, treeToList, getProp };
+export { persentFormat, bytesFormat, format, schemaToModel, listToTree, treeToList, getProp, getFileName };

From cc777cd1286d1eee998938905c926581c4073247 Mon Sep 17 00:00:00 2001
From: wanggang <76527413@qq.com>
Date: Wed, 5 Jul 2023 18:42:04 +0800
Subject: [PATCH 5/9] update

---
 .../Identity/Controllers/BBAC_DNController.cs               | 2 +-
 .../Identity/Controllers/BBAC_DN_DETAILController.cs        | 2 +-
 .../Identity/Controllers/BBAC_SAController.cs               | 2 +-
 .../Identity/Controllers/BBAC_SE_DETAILController.cs        | 3 ++-
 .../WTA.Application/Identity/Controllers/BJ_DNController.cs | 2 +-
 .../Identity/Controllers/BJ_DN_DETAILController.cs          | 2 +-
 .../WTA.Application/Identity/Controllers/BJ_SAController.cs | 2 +-
 .../Identity/Controllers/BJ_SE_DETAILController.cs          | 3 ++-
 .../Identity/Controllers/HBPO_DNController.cs               | 2 +-
 .../Identity/Controllers/HBPO_DN_DETAILController.cs        | 2 +-
 .../Identity/Controllers/HBPO_SAController.cs               | 2 +-
 .../Identity/Controllers/HBPO_SE_DETAILController.cs        | 3 ++-
 .../Identity/Controllers/INVOICEController.cs               | 2 +-
 .../Identity/Controllers/INVOICE_DETAILController.cs        | 3 ++-
 .../WTA.Application/Identity/Controllers/IN_DNController.cs | 2 +-
 .../Identity/Controllers/IN_DN_DETAILController.cs          | 2 +-
 .../WTA.Application/Identity/Controllers/IN_SAController.cs | 2 +-
 .../Identity/Controllers/IN_SE_DETAILController.cs          | 3 ++-
 .../Identity/Controllers/JIT_DNController.cs                | 2 +-
 .../Identity/Controllers/JIT_DN_DETAILController.cs         | 2 +-
 .../Identity/Controllers/JIT_SAController.cs                | 2 +-
 .../Identity/Controllers/JIT_SE_DETAILController.cs         | 3 ++-
 docs/demo/src/WTA.Shared/Controllers/GenericController.cs   | 6 ++++--
 docs/demo/src/WTA/wwwroot/components/list/index.js          | 2 +-
 24 files changed, 33 insertions(+), 25 deletions(-)

diff --git a/docs/demo/src/WTA.Application/Identity/Controllers/BBAC_DNController.cs b/docs/demo/src/WTA.Application/Identity/Controllers/BBAC_DNController.cs
index 66af8b40..8aa828cf 100644
--- a/docs/demo/src/WTA.Application/Identity/Controllers/BBAC_DNController.cs
+++ b/docs/demo/src/WTA.Application/Identity/Controllers/BBAC_DNController.cs
@@ -17,7 +17,7 @@ public class BBAC_DNController : GenericController<BBAC_DN, BBAC_DN, BBAC_DN, BB
     }
 
     [NonAction]
-    public override IActionResult Import(IFormFile importexcelfile)
+    public override IActionResult Import([Required] IFormFile importexcelfile, bool partial = false, bool replace = false)
     {
         return base.Import(importexcelfile);
     }
diff --git a/docs/demo/src/WTA.Application/Identity/Controllers/BBAC_DN_DETAILController.cs b/docs/demo/src/WTA.Application/Identity/Controllers/BBAC_DN_DETAILController.cs
index 1ebf6149..2f4d8e6a 100644
--- a/docs/demo/src/WTA.Application/Identity/Controllers/BBAC_DN_DETAILController.cs
+++ b/docs/demo/src/WTA.Application/Identity/Controllers/BBAC_DN_DETAILController.cs
@@ -16,7 +16,7 @@ public class BBAC_DN_DETAILController : GenericController<BBAC_DN_DETAIL, BBAC_D
     }
 
     [NonAction]
-    public override IActionResult Import(IFormFile importexcelfile)
+    public override IActionResult Import([Required] IFormFile importexcelfile, bool partial = false, bool replace = false)
     {
         return base.Import(importexcelfile);
     }
diff --git a/docs/demo/src/WTA.Application/Identity/Controllers/BBAC_SAController.cs b/docs/demo/src/WTA.Application/Identity/Controllers/BBAC_SAController.cs
index bc5f2edb..0dfbecaa 100644
--- a/docs/demo/src/WTA.Application/Identity/Controllers/BBAC_SAController.cs
+++ b/docs/demo/src/WTA.Application/Identity/Controllers/BBAC_SAController.cs
@@ -23,7 +23,7 @@ public class BBAC_SAController : GenericController<BBAC_SA, BBAC_SA, BBAC_SA, BB
     }
 
     [NonAction]
-    public override IActionResult Import(IFormFile importexcelfile)
+    public override IActionResult Import([Required] IFormFile importexcelfile, bool partial = false, bool replace = false)
     {
         return base.Import(importexcelfile);
     }
diff --git a/docs/demo/src/WTA.Application/Identity/Controllers/BBAC_SE_DETAILController.cs b/docs/demo/src/WTA.Application/Identity/Controllers/BBAC_SE_DETAILController.cs
index 9c2d7920..b5981897 100644
--- a/docs/demo/src/WTA.Application/Identity/Controllers/BBAC_SE_DETAILController.cs
+++ b/docs/demo/src/WTA.Application/Identity/Controllers/BBAC_SE_DETAILController.cs
@@ -1,3 +1,4 @@
+using System.ComponentModel.DataAnnotations;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Logging;
@@ -14,7 +15,7 @@ public class BBAC_SE_DETAILController : GenericController<BBAC_SE_DETAIL, BBAC_S
     }
 
     [NonAction]
-    public override IActionResult Import(IFormFile importexcelfile)
+    public override IActionResult Import([Required] IFormFile importexcelfile, bool partial = false, bool replace = false)
     {
         return base.Import(importexcelfile);
     }
diff --git a/docs/demo/src/WTA.Application/Identity/Controllers/BJ_DNController.cs b/docs/demo/src/WTA.Application/Identity/Controllers/BJ_DNController.cs
index bcd674bf..836c4b27 100644
--- a/docs/demo/src/WTA.Application/Identity/Controllers/BJ_DNController.cs
+++ b/docs/demo/src/WTA.Application/Identity/Controllers/BJ_DNController.cs
@@ -17,7 +17,7 @@ public class BJ_DNController : GenericController<BJ_DN, BJ_DN, BJ_DN, BJ_DN, BJ_
     }
 
     [NonAction]
-    public override IActionResult Import(IFormFile importexcelfile)
+    public override IActionResult Import([Required] IFormFile importexcelfile, bool partial = false, bool replace = false)
     {
         return base.Import(importexcelfile);
     }
diff --git a/docs/demo/src/WTA.Application/Identity/Controllers/BJ_DN_DETAILController.cs b/docs/demo/src/WTA.Application/Identity/Controllers/BJ_DN_DETAILController.cs
index dfbb1cbe..1b2b0682 100644
--- a/docs/demo/src/WTA.Application/Identity/Controllers/BJ_DN_DETAILController.cs
+++ b/docs/demo/src/WTA.Application/Identity/Controllers/BJ_DN_DETAILController.cs
@@ -16,7 +16,7 @@ public class BJ_DN_DETAILController : GenericController<BJ_DN_DETAIL, BJ_DN_DETA
     }
 
     [NonAction]
-    public override IActionResult Import(IFormFile importexcelfile)
+    public override IActionResult Import([Required] IFormFile importexcelfile, bool partial = false, bool replace = false)
     {
         return base.Import(importexcelfile);
     }
diff --git a/docs/demo/src/WTA.Application/Identity/Controllers/BJ_SAController.cs b/docs/demo/src/WTA.Application/Identity/Controllers/BJ_SAController.cs
index dd092665..3bff1fc9 100644
--- a/docs/demo/src/WTA.Application/Identity/Controllers/BJ_SAController.cs
+++ b/docs/demo/src/WTA.Application/Identity/Controllers/BJ_SAController.cs
@@ -23,7 +23,7 @@ public class BJ_SAController : GenericController<BJ_SA, BJ_SA, BJ_SA, BJ_SA, BJ_
     }
 
     [NonAction]
-    public override IActionResult Import(IFormFile importexcelfile)
+    public override IActionResult Import([Required] IFormFile importexcelfile, bool partial = false, bool replace = false)
     {
         return base.Import(importexcelfile);
     }
diff --git a/docs/demo/src/WTA.Application/Identity/Controllers/BJ_SE_DETAILController.cs b/docs/demo/src/WTA.Application/Identity/Controllers/BJ_SE_DETAILController.cs
index a5e54cfc..78125e13 100644
--- a/docs/demo/src/WTA.Application/Identity/Controllers/BJ_SE_DETAILController.cs
+++ b/docs/demo/src/WTA.Application/Identity/Controllers/BJ_SE_DETAILController.cs
@@ -1,3 +1,4 @@
+using System.ComponentModel.DataAnnotations;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Logging;
@@ -14,7 +15,7 @@ public class BJ_SE_DETAILController : GenericController<BJ_SE_DETAIL, BJ_SE_DETA
     }
 
     [NonAction]
-    public override IActionResult Import(IFormFile importexcelfile)
+    public override IActionResult Import([Required] IFormFile importexcelfile, bool partial = false, bool replace = false)
     {
         return base.Import(importexcelfile);
     }
diff --git a/docs/demo/src/WTA.Application/Identity/Controllers/HBPO_DNController.cs b/docs/demo/src/WTA.Application/Identity/Controllers/HBPO_DNController.cs
index a93ccd32..99e994cd 100644
--- a/docs/demo/src/WTA.Application/Identity/Controllers/HBPO_DNController.cs
+++ b/docs/demo/src/WTA.Application/Identity/Controllers/HBPO_DNController.cs
@@ -17,7 +17,7 @@ public class HBPO_DNController : GenericController<HBPO_DN, HBPO_DN, HBPO_DN, HB
     }
 
     [NonAction]
-    public override IActionResult Import(IFormFile importexcelfile)
+    public override IActionResult Import([Required] IFormFile importexcelfile, bool partial = false, bool replace = false)
     {
         return base.Import(importexcelfile);
     }
diff --git a/docs/demo/src/WTA.Application/Identity/Controllers/HBPO_DN_DETAILController.cs b/docs/demo/src/WTA.Application/Identity/Controllers/HBPO_DN_DETAILController.cs
index dea3d42d..fcd0bb3f 100644
--- a/docs/demo/src/WTA.Application/Identity/Controllers/HBPO_DN_DETAILController.cs
+++ b/docs/demo/src/WTA.Application/Identity/Controllers/HBPO_DN_DETAILController.cs
@@ -16,7 +16,7 @@ public class HBPO_DN_DETAILController : GenericController<HBPO_DN_DETAIL, HBPO_D
     }
 
     [NonAction]
-    public override IActionResult Import(IFormFile importexcelfile)
+    public override IActionResult Import([Required] IFormFile importexcelfile, bool partial = false, bool replace = false)
     {
         return base.Import(importexcelfile);
     }
diff --git a/docs/demo/src/WTA.Application/Identity/Controllers/HBPO_SAController.cs b/docs/demo/src/WTA.Application/Identity/Controllers/HBPO_SAController.cs
index d6c3357a..f5fbd24d 100644
--- a/docs/demo/src/WTA.Application/Identity/Controllers/HBPO_SAController.cs
+++ b/docs/demo/src/WTA.Application/Identity/Controllers/HBPO_SAController.cs
@@ -29,7 +29,7 @@ public class HBPO_SAController : GenericController<HBPO_SA, HBPO_SA, HBPO_SA, HB
     }
 
     [NonAction]
-    public override IActionResult Import(IFormFile importexcelfile)
+    public override IActionResult Import([Required] IFormFile importexcelfile, bool partial = false, bool replace = false)
     {
         return base.Import(importexcelfile);
     }
diff --git a/docs/demo/src/WTA.Application/Identity/Controllers/HBPO_SE_DETAILController.cs b/docs/demo/src/WTA.Application/Identity/Controllers/HBPO_SE_DETAILController.cs
index e850f715..d4751b25 100644
--- a/docs/demo/src/WTA.Application/Identity/Controllers/HBPO_SE_DETAILController.cs
+++ b/docs/demo/src/WTA.Application/Identity/Controllers/HBPO_SE_DETAILController.cs
@@ -1,3 +1,4 @@
+using System.ComponentModel.DataAnnotations;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Logging;
@@ -14,7 +15,7 @@ public class HBPO_SE_DETAILController : GenericController<HBPO_SE_DETAIL, HBPO_S
     }
 
     [NonAction]
-    public override IActionResult Import(IFormFile importexcelfile)
+    public override IActionResult Import([Required] IFormFile importexcelfile, bool partial = false, bool replace = false)
     {
         return base.Import(importexcelfile);
     }
diff --git a/docs/demo/src/WTA.Application/Identity/Controllers/INVOICEController.cs b/docs/demo/src/WTA.Application/Identity/Controllers/INVOICEController.cs
index 5d660946..a3d9447e 100644
--- a/docs/demo/src/WTA.Application/Identity/Controllers/INVOICEController.cs
+++ b/docs/demo/src/WTA.Application/Identity/Controllers/INVOICEController.cs
@@ -17,7 +17,7 @@ public class INVOICEController : GenericController<INVOICE, INVOICE, INVOICE, IN
     }
 
     [NonAction]
-    public override IActionResult Import(IFormFile importexcelfile)
+    public override IActionResult Import([Required] IFormFile importexcelfile, bool partial = false, bool replace = false)
     {
         return base.Import(importexcelfile);
     }
diff --git a/docs/demo/src/WTA.Application/Identity/Controllers/INVOICE_DETAILController.cs b/docs/demo/src/WTA.Application/Identity/Controllers/INVOICE_DETAILController.cs
index 56ebeccf..17da7bad 100644
--- a/docs/demo/src/WTA.Application/Identity/Controllers/INVOICE_DETAILController.cs
+++ b/docs/demo/src/WTA.Application/Identity/Controllers/INVOICE_DETAILController.cs
@@ -1,3 +1,4 @@
+using System.ComponentModel.DataAnnotations;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Logging;
@@ -15,7 +16,7 @@ public class INVOICE_DETAILController : GenericController<INVOICE_DETAIL, INVOIC
     }
 
     [NonAction]
-    public override IActionResult Import(IFormFile importexcelfile)
+    public override IActionResult Import([Required] IFormFile importexcelfile, bool partial = false, bool replace = false)
     {
         return base.Import(importexcelfile);
     }
diff --git a/docs/demo/src/WTA.Application/Identity/Controllers/IN_DNController.cs b/docs/demo/src/WTA.Application/Identity/Controllers/IN_DNController.cs
index 0566d982..71fbff76 100644
--- a/docs/demo/src/WTA.Application/Identity/Controllers/IN_DNController.cs
+++ b/docs/demo/src/WTA.Application/Identity/Controllers/IN_DNController.cs
@@ -17,7 +17,7 @@ public class IN_DNController : GenericController<IN_DN, IN_DN, IN_DN, IN_DN, IN_
     }
 
     [NonAction]
-    public override IActionResult Import(IFormFile importexcelfile)
+    public override IActionResult Import([Required] IFormFile importexcelfile, bool partial = false, bool replace = false)
     {
         return base.Import(importexcelfile);
     }
diff --git a/docs/demo/src/WTA.Application/Identity/Controllers/IN_DN_DETAILController.cs b/docs/demo/src/WTA.Application/Identity/Controllers/IN_DN_DETAILController.cs
index 52fecf43..a3d41746 100644
--- a/docs/demo/src/WTA.Application/Identity/Controllers/IN_DN_DETAILController.cs
+++ b/docs/demo/src/WTA.Application/Identity/Controllers/IN_DN_DETAILController.cs
@@ -16,7 +16,7 @@ public class IN_DN_DETAILController : GenericController<IN_DN_DETAIL, IN_DN_DETA
     }
 
     [NonAction]
-    public override IActionResult Import(IFormFile importexcelfile)
+    public override IActionResult Import([Required] IFormFile importexcelfile, bool partial = false, bool replace = false)
     {
         return base.Import(importexcelfile);
     }
diff --git a/docs/demo/src/WTA.Application/Identity/Controllers/IN_SAController.cs b/docs/demo/src/WTA.Application/Identity/Controllers/IN_SAController.cs
index 3ddce4b8..51370924 100644
--- a/docs/demo/src/WTA.Application/Identity/Controllers/IN_SAController.cs
+++ b/docs/demo/src/WTA.Application/Identity/Controllers/IN_SAController.cs
@@ -23,7 +23,7 @@ public class IN_SAController : GenericController<IN_SA, IN_SA, IN_SA, IN_SA, IN_
     }
 
     [NonAction]
-    public override IActionResult Import(IFormFile importexcelfile)
+    public override IActionResult Import([Required] IFormFile importexcelfile, bool partial = false, bool replace = false)
     {
         return base.Import(importexcelfile);
     }
diff --git a/docs/demo/src/WTA.Application/Identity/Controllers/IN_SE_DETAILController.cs b/docs/demo/src/WTA.Application/Identity/Controllers/IN_SE_DETAILController.cs
index 5794ea57..ea07ce67 100644
--- a/docs/demo/src/WTA.Application/Identity/Controllers/IN_SE_DETAILController.cs
+++ b/docs/demo/src/WTA.Application/Identity/Controllers/IN_SE_DETAILController.cs
@@ -1,3 +1,4 @@
+using System.ComponentModel.DataAnnotations;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Logging;
@@ -14,7 +15,7 @@ public class IN_SE_DETAILController : GenericController<IN_SE_DETAIL, IN_SE_DETA
     }
 
     [NonAction]
-    public override IActionResult Import(IFormFile importexcelfile)
+    public override IActionResult Import([Required] IFormFile importexcelfile, bool partial = false, bool replace = false)
     {
         return base.Import(importexcelfile);
     }
diff --git a/docs/demo/src/WTA.Application/Identity/Controllers/JIT_DNController.cs b/docs/demo/src/WTA.Application/Identity/Controllers/JIT_DNController.cs
index c057eb0f..8378e470 100644
--- a/docs/demo/src/WTA.Application/Identity/Controllers/JIT_DNController.cs
+++ b/docs/demo/src/WTA.Application/Identity/Controllers/JIT_DNController.cs
@@ -17,7 +17,7 @@ public class JIT_DNController : GenericController<JIT_DN, JIT_DN, JIT_DN, JIT_DN
     }
 
     [NonAction]
-    public override IActionResult Import(IFormFile importexcelfile)
+    public override IActionResult Import([Required] IFormFile importexcelfile, bool partial = false, bool replace = false)
     {
         return base.Import(importexcelfile);
     }
diff --git a/docs/demo/src/WTA.Application/Identity/Controllers/JIT_DN_DETAILController.cs b/docs/demo/src/WTA.Application/Identity/Controllers/JIT_DN_DETAILController.cs
index 4c137205..9896474b 100644
--- a/docs/demo/src/WTA.Application/Identity/Controllers/JIT_DN_DETAILController.cs
+++ b/docs/demo/src/WTA.Application/Identity/Controllers/JIT_DN_DETAILController.cs
@@ -16,7 +16,7 @@ public class JIT_DN_DETAILController : GenericController<JIT_DN_DETAIL, JIT_DN_D
     }
 
     [NonAction]
-    public override IActionResult Import(IFormFile importexcelfile)
+    public override IActionResult Import([Required] IFormFile importexcelfile, bool partial = false, bool replace = false)
     {
         return base.Import(importexcelfile);
     }
diff --git a/docs/demo/src/WTA.Application/Identity/Controllers/JIT_SAController.cs b/docs/demo/src/WTA.Application/Identity/Controllers/JIT_SAController.cs
index 7f33f14f..f83c72a1 100644
--- a/docs/demo/src/WTA.Application/Identity/Controllers/JIT_SAController.cs
+++ b/docs/demo/src/WTA.Application/Identity/Controllers/JIT_SAController.cs
@@ -23,7 +23,7 @@ public class JIT_SAController : GenericController<JIT_SA, JIT_SA, JIT_SA, JIT_SA
     }
 
     [NonAction]
-    public override IActionResult Import(IFormFile importexcelfile)
+    public override IActionResult Import([Required] IFormFile importexcelfile, bool partial = false, bool replace = false)
     {
         return base.Import(importexcelfile);
     }
diff --git a/docs/demo/src/WTA.Application/Identity/Controllers/JIT_SE_DETAILController.cs b/docs/demo/src/WTA.Application/Identity/Controllers/JIT_SE_DETAILController.cs
index 1a19d77c..5eeae3d5 100644
--- a/docs/demo/src/WTA.Application/Identity/Controllers/JIT_SE_DETAILController.cs
+++ b/docs/demo/src/WTA.Application/Identity/Controllers/JIT_SE_DETAILController.cs
@@ -1,3 +1,4 @@
+using System.ComponentModel.DataAnnotations;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Logging;
@@ -14,7 +15,7 @@ public class JIT_SE_DETAILController : GenericController<JIT_SE_DETAIL, JIT_SE_D
     }
 
     [NonAction]
-    public override IActionResult Import(IFormFile importexcelfile)
+    public override IActionResult Import([Required] IFormFile importexcelfile, bool partial = false, bool replace = false)
     {
         return base.Import(importexcelfile);
     }
diff --git a/docs/demo/src/WTA.Shared/Controllers/GenericController.cs b/docs/demo/src/WTA.Shared/Controllers/GenericController.cs
index 44f90945..751810b6 100644
--- a/docs/demo/src/WTA.Shared/Controllers/GenericController.cs
+++ b/docs/demo/src/WTA.Shared/Controllers/GenericController.cs
@@ -1,3 +1,4 @@
+using System.ComponentModel.DataAnnotations;
 using System.Globalization;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Http;
@@ -180,7 +181,7 @@ public class GenericController<TEntity, TModel, TListModel, TSearchModel, TImpor
         }
     }
 
-    [HttpGet,AllowAnonymous, Multiple, Order(-2), HtmlClass("el-button--primary")]
+    [HttpGet, AllowAnonymous, Multiple, Order(-2), HtmlClass("el-button--primary")]
     public virtual IActionResult Import()
     {
         try
@@ -194,8 +195,9 @@ public class GenericController<TEntity, TModel, TListModel, TSearchModel, TImpor
         }
     }
 
+    [Consumes("multipart/form-data")]
     [HttpPost, Multiple, Order(-2), HtmlClass("el-button--primary")]
-    public virtual IActionResult Import(IFormFile importexcelfile)
+    public virtual IActionResult Import([Required] IFormFile importexcelfile, bool partial = false, bool replace = false)
     {
         try
         {
diff --git a/docs/demo/src/WTA/wwwroot/components/list/index.js b/docs/demo/src/WTA/wwwroot/components/list/index.js
index 958a933e..441f14fc 100644
--- a/docs/demo/src/WTA/wwwroot/components/list/index.js
+++ b/docs/demo/src/WTA/wwwroot/components/list/index.js
@@ -235,7 +235,7 @@ export default {
                   <el-link type="primary" @click="getImportTemplate">{{$t('下载')}}</el-link>
                 </el-form-item>
                 <el-form-item :label="$t('文件')">
-                  <el-upload drag v-model="importModel.file">
+                  <el-upload drag v-model="importModel.file" :auto-upload="false">
                     <el-icon class="el-icon--upload"><ep-upload-filled /></el-icon>
                     <div class="el-upload__text">{{$t('拖放文件到此处或')}} <em>{{$t('点击上传')}}</em></div>
                   </el-upload>

From db625422c6817db8ef4c83a4318d365749a0377c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A7=9C=E6=97=AD=E4=B9=8B?=
 <12930972+jiang-xuzhi@user.noreply.gitee.com>
Date: Thu, 6 Jul 2023 16:48:57 +0800
Subject: [PATCH 6/9] 7.5 update

---
 .../AuthServer.Host/appsettings.json          |   16 +-
 .../BaseService.Host/appsettings.json         |   24 +-
 .../SettleAccount.HttpApi.Host.csproj         |    1 +
 .../appsettings.json                          |   45 +-
 .../Entities/Boms/IBomAppService.cs           |    1 -
 .../EstimatedInventoryDetailCreateDto.cs      |   17 -
 .../EstimatedInventoryDetailDto.cs            |  120 -
 .../EstimatedInventoryDetailDtoBase.cs        |  118 -
 .../EstimatedInventoryDetailExportDto.cs      |  151 -
 .../EstimatedInventoryDetailImportDto.cs      |  169 --
 .../EstimatedInventoryDetailRequestDto.cs     |  107 -
 .../EstimatedInventoryDetailUpdateDto.cs      |   21 -
 .../EstimatedInventoryVersionDtoBase.cs       |  103 -
 .../IEstimatedInventoryDetailAppService.cs    |  138 -
 .../EstimatedSums/EsimatedSumDtoBase.cs       |  356 ---
 .../EsimatedSumVersionDtoBase.cs              |  122 -
 .../EstimatedSums/IEstimatedSumAppService.cs  |  123 -
 .../Entities/HQExtend/HQKBExtendDto.cs        |  273 --
 .../Entities/HQ_H/HQ_H_PlatformCreateDto.cs   |   15 -
 .../Entities/HQ_H/HQ_H_PlatformDto.cs         |   93 -
 .../Entities/HQ_H/HQ_H_PlatformDtoBase.cs     |   93 -
 .../Entities/HQ_H/HQ_H_PlatformExportDto.cs   |  109 -
 .../Entities/HQ_H/HQ_H_PlatformImportDto.cs   |  109 -
 .../Entities/HQ_H/HQ_H_PlatformRequestDto.cs  |  101 -
 .../HQ_H/HQ_H_PlatformVersionDtoBase.cs       |  100 -
 .../Entities/HQ_H/IHQ_H_PlatformAppService.cs |   91 -
 .../Inventories/IInventoryDetailAppService.cs |    1 -
 .../IItemInvoicePriceAppService.cs            |    1 -
 .../ISecondaryAdjustmentAppService.cs         |  137 -
 .../ISecondaryDiscountAppService.cs           |  137 -
 .../ISecondaryPriceRatioAppService.cs         |  135 -
 .../SecondaryAdjustmentDtoBase.cs             |  360 ---
 .../SecondaryAdjustmentVersionDtoBase.cs      |  124 -
 .../SecondaryDiscountDtoBase.cs               |  319 --
 .../SecondaryDiscountVersionDtoBase.cs        |  124 -
 .../SecondaryPriceRatioDtoBase.cs             |  388 ---
 .../SecondaryPriceRatioVersionDtoBase.cs      |  126 -
 .../ISettlementCrossReferenceAppService.cs    |  110 -
 .../ImportSettlementCrossReferenceDto.cs      |   85 -
 .../SettlementCrossReferenceCreateDto.cs      |   75 -
 .../SettlementCrossReferenceDto.cs            |   75 -
 .../SettlementCrossReferenceExportDto.cs      |   73 -
 .../SettlementCrossReferenceRequestDto.cs     |   85 -
 .../SettlementCrossReferenceUpdateDto.cs      |   75 -
 .../SettlementCrossReferenceVersionDto.cs     |   28 -
 ...ttlementCrossReferenceVersionRequestDto.cs |   28 -
 .../ISettlementPakAndSparePartsAppService.cs  |    1 -
 .../ISettlementPartAppService.cs              |    1 -
 .../ISettleAccountAppService.cs               |  131 -
 .../UnSettleAccountCreateDto.cs               |   15 -
 .../UnSettleAccounts/UnSettleAccountDto.cs    |   83 -
 .../UnSettleAccountDtoBase.cs                 |   73 -
 .../UnSettleAccountExportDto.cs               |   88 -
 .../UnSettleAccountImportDto.cs               |   82 -
 .../UnSettleAccountRequestDto.cs              |   81 -
 .../UnSettleAccountUpdateDto.cs               |   16 -
 .../UnSettleAccountVersionDtoBase.cs          |  103 -
 .../VWScrapClaims/IScrapClaimsAppService.cs   |   94 -
 .../VWScrapClaims/ScrapClaimsCreateDto.cs     |   15 -
 .../Entities/VWScrapClaims/ScrapClaimsDto.cs  |   59 -
 .../VWScrapClaims/ScrapClaimsDtoBase.cs       |   58 -
 .../VWScrapClaims/ScrapClaimsExportDto.cs     |   57 -
 .../VWScrapClaims/ScrapClaimsImportDto.cs     |   55 -
 .../VWScrapClaims/ScrapClaimsRequestDto.cs    |   64 -
 .../ScrapClaimsVersionDtoBase.cs              |  100 -
 .../VWSparePart/ISparePartAppService.cs       |   94 -
 .../VWSparePart/SparePartCreateDto.cs         |   15 -
 .../Entities/VWSparePart/SparePartDto.cs      |  125 -
 .../Entities/VWSparePart/SparePartDtoBase.cs  |  124 -
 .../VWSparePart/SparePartExportDto.cs         |  143 -
 .../VWSparePart/SparePartImportDto.cs         |  129 -
 .../VWSparePart/SparePartRequestDto.cs        |  129 -
 .../VWSparePart/SparePartVersionDtoBase.cs    |  100 -
 .../WMSKanBan/IWMSVWKanBanAppService.cs       |   96 -
 .../WMSKanBan/WMSVWKanBanCreateDto.cs         |   14 -
 .../Entities/WMSKanBan/WMSVWKanBanDto.cs      |  113 -
 .../Entities/WMSKanBan/WMSVWKanBanDtoBase.cs  |   85 -
 .../WMSKanBan/WMSVWKanBanExportDto.cs         |   92 -
 .../WMSKanBan/WMSVWKanBanImportDto.cs         |   93 -
 .../WMSKanBan/WMSVWKanBanRequestDto.cs        |   93 -
 .../WMSKanBan/WMSVWKanBanVersionDtoBase.cs    |  100 -
 .../WMSKanBan/WMSVWKanBantUpdateDto.cs        |   16 -
 .../WMSSparePart/IWMSSparePartAppService.cs   |   91 -
 .../WMSSparePart/WMSSparePartCreateDto.cs     |   14 -
 .../Entities/WMSSparePart/WMSSparePartDto.cs  |  137 -
 .../WMSSparePart/WMSSparePartDtoBase.cs       |  124 -
 .../WMSSparePart/WMSSparePartExportDto.cs     |  143 -
 .../WMSSparePart/WMSSparePartImportDto.cs     |  129 -
 .../WMSSparePart/WMSSparePartRequestDto.cs    |  129 -
 .../WMSSparePartVersionDtoBase.cs             |  100 -
 .../ErrorListBill/ErrorBillAppService.cs      |    2 -
 .../Entities/HQExtend/HQKBExtendAppService.cs |  347 ---
 .../HQExtend/HQKBSettleExtendAppService.cs    |  346 ---
 .../Entities/HQ_H/HQ_H_PlatformAppService.cs  |  344 ---
 .../Entities/Materials/MaterialAppService.cs  |    2 -
 .../SettleAccounts/SettleAccountAppService.cs |   14 +-
 .../SettlementCrossReferenceAppService.cs     |  468 ---
 .../SettlementPakAndSparePartsAppService.cs   |  229 --
 .../Entities/TaskJobs/JobAppService.cs        |    2 -
 .../UnSettleAccountAppService.cs              |  343 ---
 .../Entities/VWKanBan/VWKanBanAppService.cs   |  320 --
 .../VWScrapClaims/ScrapClaimsAppService.cs    |  316 --
 .../VWSparePart/SparePartAppService.cs        |  497 ----
 .../WMS-KanBan/WMSKanBanAppService.cs         |  317 --
 .../WMS-SparePart/WMSSparePartAppService.cs   |  320 --
 .../WMS/WMSCusomerKanbanAppService.cs         |  655 -----
 .../Entities/WMS/WMSHQFKanbanAppService.cs    |  569 ----
 .../WMS/WMSHQFSharePartAppService .cs         |  579 ----
 .../Entities/WMS/WMSHQHKanbanAppService.cs    |  633 ----
 .../Entities/WMS/WMSHQHSharePartAppService.cs |  635 ----
 .../Entities/WMS/WMSJitAppService.cs          |  655 -----
 .../Entities/WMS/WMSKanbanAppService.cs       |  951 ------
 .../Entities/WMS/WMSKanbanExtendAppService.cs |  668 -----
 .../Entities/WMS/WMSSharePart90AppService.cs  |  712 -----
 .../Entities/WMS/WMSSharePartAppService.cs    |  945 ------
 .../Entities/WMS/WmsDetailCancelInterface.cs  |  231 --
 .../Entities/WMS/WmsDetailUnInterface.cs      |  245 --
 .../Entities/WMS/WmsHQKBOutputAppService.cs   |  544 ----
 .../Entities/WMS/WmsHQMKanbanAppService.cs    |  490 ----
 .../Entities/WMS/WmsHQMSharePartAppService.cs |  587 ----
 .../WMS/WmsOneTimeSaleOutputAppService.cs     |  464 ---
 .../Entities/WMS/WmsOutputSumAppService.cs    |  157 -
 .../WMS/WmsOutputSumInterfaceAppService.cs    |  243 --
 .../Entities/WMS/WmsUnInterface.cs            |  426 ---
 .../Entities/WMS/WmsUnSumInterface.cs         |  217 --
 .../ImportExcelCommon/ExportImporter.cs       |    1 -
 .../ReportServices/ReportMakeService.cs       |    1 -
 .../SettleAccount.Application.csproj          |    4 +
 ...ttleAccountApplicationAutoMapperProfile.cs |  451 +--
 .../EstimatedInventoryDetail.cs               |  213 --
 .../EstimatedInventoryVersion.cs              |   63 -
 .../Entities/EstimatedSums/EstimatedSum.cs    |  107 -
 .../EstimatedSums/EstimatedSumVersion.cs      |   52 -
 .../Entities/HQExtend/HQKBExtend.cs           |   52 -
 .../Entities/HQExtend/HQKBExtendVersion.cs    |   55 -
 .../Entities/HQExtend/HQKBSettleExtend.cs     |   52 -
 .../HQExtend/HQKBSettleExtendVersion.cs       |   55 -
 .../Entities/HQ_H/HQ_H_Kanban.cs              |   86 -
 .../Entities/HQ_H/HQ_H_Platform.cs            |  172 --
 .../Entities/HQ_H/HQ_H_PlatformVersion.cs     |   47 -
 .../Entities/KanBan/KanBan.cs                 |  171 --
 .../Entities/KanBan/KanBanManager.cs          |   34 -
 .../Entities/KanBan/KanBanVersion.cs          |   51 -
 .../SecondaryMatching/SecondaryAdjustment.cs  |  129 -
 .../SecondaryAdjustmentVersion.cs             |   53 -
 .../SecondaryMatching/SecondaryDiscount.cs    |  116 -
 .../SecondaryDiscountVersion.cs               |   53 -
 .../SecondaryMatching/SecondaryPriceRatio.cs  |  140 -
 .../SecondaryPriceRatioVersion.cs             |   50 -
 .../SettledPartAndErpPartPriceDiff.cs         |   44 -
 .../SettlementCrossReference.cs               |  114 -
 .../SettlementCrossReferenceVersion.cs        |   53 -
 .../SettlementPakAndSpareParts.cs             |  227 --
 .../SettlementPakAndSparePartsVersion.cs      |   53 -
 .../UnSettleAccounts/UnSettleAccount.cs       |  128 -
 .../UnSettleAccountVersion.cs                 |   53 -
 .../Entities/VWScrapClaims/ScrapClaims.cs     |  101 -
 .../VWScrapClaims/ScrapClaimsVersion.cs       |   47 -
 .../Entities/VWSparePart/SparePart.cs         |  215 --
 .../Entities/VWSparePart/SparePartVersion.cs  |   47 -
 .../Entities/WMS-KanBan/WMSKanBanManager.cs   |   31 -
 .../Entities/WMS-KanBan/WMSKanBanSettle.cs    |  254 --
 .../Entities/WMS-KanBan/WMSKanBanVersion.cs   |   47 -
 .../Entities/WMS-KanBan/WmsKanban.cs          |   33 -
 .../Entities/WMS-SparePart/WMSSparePart.cs    |  308 --
 .../WMS-SparePart/WMSSparePartVersion.cs      |   47 -
 .../Entities/WMS/TB_BILL.cs                   |  133 -
 .../Entities/WMS/TS_SORT_DETAIL.cs            |  105 -
 .../Entities/WMS/TaskList.cs                  | 2613 -----------------
 .../Entities/WMS/WmsOutPutPercent.cs          |   28 -
 ...AccountDbContextModelCreatingExtensions.cs | 2613 +----------------
 .../SettleAccountEntityFrameworkCoreModule.cs |    7 -
 .../UnInterfaceDbContext.cs                   |    3 +-
 .../WMSDapperRepository.cs                    |  128 -
 .../EntityFrameworkCore/WMSDbContext.cs       |   48 -
 .../Report/ErpSumOutputDapperRepository.cs    |  253 --
 .../SecMatchBaseDapperReportRepository.cs     |    1 -
 ...ettledPartAndErpPartPriceDiffRepository.cs |  127 -
 .../Report/WmsDapperRepository.cs             |  116 -
 .../SettlementPakAndSparePartRepository.cs    |   71 -
 ...tlementPakAndSparePartVersionRepository.cs |   66 -
 .../UnSettleAccountRepository.cs              |   69 -
 .../UnSettleAccountVersionRepository.cs       |   81 -
 .../Repository/WMSEfCoreRepository.cs         |  162 -
 .../BlobFileController.cs                     |   24 -
 .../Base/SecRelationShipImportService.cs      |  506 +---
 ...SharePartSettledDetailDiffExportService.cs |   25 +-
 .../Report/SettleFisDiffExportService.cs      |    1 -
 .../Report/SettleSparePartExportService.cs    |   19 +-
 .../Report/SettleUnSparePartExportService.cs  |   47 +-
 ...ledPartAndErpPartPriceDiffExportService.cs |    5 -
 .../Services/Report/SyncFisService.cs         |  113 +-
 .../Services/Report/UnSettledSumService.cs    |  119 +-
 .../UnSettleAccountImportService.cs           |   36 +-
 .../SettleAccountJobModule.cs                 |    5 -
 .../Debug/netcoreapp5/Win.Abp.Snowflakes.dll  |  Bin 8192 -> 7680 bytes
 .../Debug/netcoreapp5/Win.Abp.Snowflakes.pdb  |  Bin 13328 -> 13260 bytes
 .../netcoreapp5/Win.Abp.Snowflakes.dll        |  Bin 7679 -> 7680 bytes
 .../netcoreapp5/Win.Abp.Snowflakes.pdb        |  Bin 12868 -> 12936 bytes
 ....GeneratedMSBuildEditorConfig.editorconfig |    2 +-
 .../Win.Abp.Snowflakes.assets.cache           |  Bin 28388 -> 28412 bytes
 ....Snowflakes.csproj.AssemblyReference.cache |  Bin 105262 -> 105262 bytes
 ....Snowflakes.csproj.CoreCompileInputs.cache |    2 +-
 ...Abp.Snowflakes.csproj.FileListAbsolute.txt |   12 +
 .../Debug/netcoreapp5/Win.Abp.Snowflakes.dll  |  Bin 8192 -> 7680 bytes
 .../Debug/netcoreapp5/Win.Abp.Snowflakes.pdb  |  Bin 13328 -> 13260 bytes
 .../netcoreapp5/ref/Win.Abp.Snowflakes.dll    |  Bin 5631 -> 5632 bytes
 .../netcoreapp5/refint/Win.Abp.Snowflakes.dll |  Bin 5631 -> 5632 bytes
 ....GeneratedMSBuildEditorConfig.editorconfig |    9 +-
 .../Win.Abp.Snowflakes.assets.cache           |  Bin 22517 -> 28412 bytes
 ....Snowflakes.csproj.AssemblyReference.cache |  Bin 11 -> 105262 bytes
 ....Snowflakes.csproj.CoreCompileInputs.cache |    2 +-
 ...Abp.Snowflakes.csproj.FileListAbsolute.txt |   12 +
 .../netcoreapp5/Win.Abp.Snowflakes.dll        |  Bin 7679 -> 7680 bytes
 .../netcoreapp5/Win.Abp.Snowflakes.pdb        |  Bin 12868 -> 12936 bytes
 .../netcoreapp5/ref/Win.Abp.Snowflakes.dll    |  Bin 5631 -> 5632 bytes
 ...in.Abp.Snowflakes.csproj.nuget.dgspec.json |   21 +-
 .../Win.Abp.Snowflakes.csproj.nuget.g.props   |    8 +-
 .../obj/project.assets.json                   |   21 +-
 .../obj/project.nuget.cache                   |  120 +-
 .../bin/Debug/Win.Sfs.Shared.2.0.0.nupkg      |  Bin 32598 -> 32566 bytes
 .../bin/Debug/netcoreapp5/Win.Sfs.Shared.dll  |  Bin 73728 -> 73728 bytes
 .../bin/Debug/netcoreapp5/Win.Sfs.Shared.pdb  |  Bin 48756 -> 48512 bytes
 .../bin/Debug/netcoreapp5/Win.Utils.dll       |  Bin 10752 -> 10752 bytes
 .../bin/Debug/netcoreapp5/Win.Utils.pdb       |  Bin 21840 -> 21764 bytes
 .../bin/Release/Win.Sfs.Shared.2.0.0.nupkg    |  Bin 31198 -> 31172 bytes
 .../Release/netcoreapp5/Win.Sfs.Shared.dll    |  Bin 70143 -> 70144 bytes
 .../Release/netcoreapp5/Win.Sfs.Shared.pdb    |  Bin 45716 -> 45888 bytes
 .../bin/Release/netcoreapp5/Win.Utils.dll     |  Bin 10239 -> 10240 bytes
 .../bin/Release/netcoreapp5/Win.Utils.pdb     |  Bin 21192 -> 21260 bytes
 .../obj/Debug/Win.Sfs.Shared.2.0.0.nuspec     |    2 +-
 ....GeneratedMSBuildEditorConfig.editorconfig |    2 +-
 .../netcoreapp5/Win.Sfs.Shared.assets.cache   |  Bin 138041 -> 137770 bytes
 ....Sfs.Shared.csproj.AssemblyReference.cache |  Bin 202480 -> 202272 bytes
 ....Sfs.Shared.csproj.CoreCompileInputs.cache |    2 +-
 ...Win.Sfs.Shared.csproj.FileListAbsolute.txt |   15 +
 .../obj/Debug/netcoreapp5/Win.Sfs.Shared.dll  |  Bin 73728 -> 73728 bytes
 .../obj/Debug/netcoreapp5/Win.Sfs.Shared.pdb  |  Bin 48756 -> 48512 bytes
 .../Debug/netcoreapp5/ref/Win.Sfs.Shared.dll  |  Bin 42495 -> 42496 bytes
 .../netcoreapp5/refint/Win.Sfs.Shared.dll     |  Bin 42495 -> 42496 bytes
 .../obj/Release/Win.Sfs.Shared.2.0.0.nuspec   |    2 +-
 ....GeneratedMSBuildEditorConfig.editorconfig |    9 +-
 .../netcoreapp5/Win.Sfs.Shared.assets.cache   |  Bin 111191 -> 137770 bytes
 ....Sfs.Shared.csproj.AssemblyReference.cache |  Bin 11 -> 202276 bytes
 ....Sfs.Shared.csproj.CoreCompileInputs.cache |    2 +-
 ...Win.Sfs.Shared.csproj.FileListAbsolute.txt |   15 +
 .../Release/netcoreapp5/Win.Sfs.Shared.dll    |  Bin 70143 -> 70144 bytes
 .../Release/netcoreapp5/Win.Sfs.Shared.pdb    |  Bin 45716 -> 45888 bytes
 .../netcoreapp5/ref/Win.Sfs.Shared.dll        |  Bin 42495 -> 42496 bytes
 .../Win.Sfs.Shared.csproj.nuget.dgspec.json   |   44 +-
 .../obj/Win.Sfs.Shared.csproj.nuget.g.props   |   12 +-
 .../Win.Sfs.Shared/obj/project.assets.json    |   25 +-
 .../Win.Sfs.Shared/obj/project.nuget.cache    |  462 +--
 .../Win.Utils/bin/Debug/Win.Utils.2.0.0.nupkg |  Bin 6543 -> 6503 bytes
 .../bin/Debug/netcoreapp5/Win.Utils.dll       |  Bin 10752 -> 10752 bytes
 .../bin/Debug/netcoreapp5/Win.Utils.pdb       |  Bin 21840 -> 21764 bytes
 .../bin/Release/Win.Utils.2.0.0.nupkg         |  Bin 6251 -> 6275 bytes
 .../bin/Release/netcoreapp5/Win.Utils.dll     |  Bin 10239 -> 10240 bytes
 .../bin/Release/netcoreapp5/Win.Utils.pdb     |  Bin 21192 -> 21260 bytes
 .../obj/Debug/Win.Utils.2.0.0.nuspec          |    2 +-
 ....GeneratedMSBuildEditorConfig.editorconfig |    2 +-
 .../Debug/netcoreapp5/Win.Utils.assets.cache  |  Bin 11646 -> 11670 bytes
 .../Win.Utils.csproj.AssemblyReference.cache  |  Bin 177441 -> 177441 bytes
 .../Win.Utils.csproj.CoreCompileInputs.cache  |    2 +-
 .../Win.Utils.csproj.FileListAbsolute.txt     |   12 +
 .../obj/Debug/netcoreapp5/Win.Utils.dll       |  Bin 10752 -> 10752 bytes
 .../obj/Debug/netcoreapp5/Win.Utils.pdb       |  Bin 21840 -> 21764 bytes
 .../obj/Debug/netcoreapp5/ref/Win.Utils.dll   |  Bin 7167 -> 7168 bytes
 .../Debug/netcoreapp5/refint/Win.Utils.dll    |  Bin 7167 -> 7168 bytes
 .../obj/Release/Win.Utils.2.0.0.nuspec        |    2 +-
 ....GeneratedMSBuildEditorConfig.editorconfig |    9 +-
 .../netcoreapp5/Win.Utils.assets.cache        |  Bin 9907 -> 11670 bytes
 .../Win.Utils.csproj.AssemblyReference.cache  |  Bin 11 -> 177441 bytes
 .../Win.Utils.csproj.CoreCompileInputs.cache  |    2 +-
 .../Win.Utils.csproj.FileListAbsolute.txt     |   12 +
 .../obj/Release/netcoreapp5/Win.Utils.dll     |  Bin 10239 -> 10240 bytes
 .../obj/Release/netcoreapp5/Win.Utils.pdb     |  Bin 21192 -> 21260 bytes
 .../obj/Release/netcoreapp5/ref/Win.Utils.dll |  Bin 7167 -> 7168 bytes
 .../obj/Win.Utils.csproj.nuget.dgspec.json    |   21 +-
 .../obj/Win.Utils.csproj.nuget.g.props        |    8 +-
 .../Shared/Win.Utils/obj/project.assets.json  |   21 +-
 .../Shared/Win.Utils/obj/project.nuget.cache  |   38 +-
 code/src/SmartFactorySuite.sln                |   11 +-
 283 files changed, 737 insertions(+), 34919 deletions(-)
 delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/EstimatedInventories/EstimatedInventoryDetailCreateDto.cs
 delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/EstimatedInventories/EstimatedInventoryDetailDto.cs
 delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/EstimatedInventories/EstimatedInventoryDetailDtoBase.cs
 delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/EstimatedInventories/EstimatedInventoryDetailExportDto.cs
 delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/EstimatedInventories/EstimatedInventoryDetailImportDto.cs
 delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/EstimatedInventories/EstimatedInventoryDetailRequestDto.cs
 delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/EstimatedInventories/EstimatedInventoryDetailUpdateDto.cs
 delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/EstimatedInventories/EstimatedInventoryVersionDtoBase.cs
 delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/EstimatedInventories/IEstimatedInventoryDetailAppService.cs
 delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/EstimatedSums/EsimatedSumDtoBase.cs
 delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/EstimatedSums/EsimatedSumVersionDtoBase.cs
 delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/EstimatedSums/IEstimatedSumAppService.cs
 delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/HQExtend/HQKBExtendDto.cs
 delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/HQ_H/HQ_H_PlatformCreateDto.cs
 delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/HQ_H/HQ_H_PlatformDto.cs
 delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/HQ_H/HQ_H_PlatformDtoBase.cs
 delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/HQ_H/HQ_H_PlatformExportDto.cs
 delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/HQ_H/HQ_H_PlatformImportDto.cs
 delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/HQ_H/HQ_H_PlatformRequestDto.cs
 delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/HQ_H/HQ_H_PlatformVersionDtoBase.cs
 delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/HQ_H/IHQ_H_PlatformAppService.cs
 delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/SecondaryMatching/ISecondaryAdjustmentAppService.cs
 delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/SecondaryMatching/ISecondaryDiscountAppService.cs
 delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/SecondaryMatching/ISecondaryPriceRatioAppService.cs
 delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/SecondaryMatching/SecondaryAdjustmentDtoBase.cs
 delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/SecondaryMatching/SecondaryAdjustmentVersionDtoBase.cs
 delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/SecondaryMatching/SecondaryDiscountDtoBase.cs
 delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/SecondaryMatching/SecondaryDiscountVersionDtoBase.cs
 delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/SecondaryMatching/SecondaryPriceRatioDtoBase.cs
 delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/SecondaryMatching/SecondaryPriceRatioVersionDtoBase.cs
 delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/SettlementCrossReferences/ISettlementCrossReferenceAppService.cs
 delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/SettlementCrossReferences/ImportSettlementCrossReferenceDto.cs
 delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/SettlementCrossReferences/SettlementCrossReferenceCreateDto.cs
 delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/SettlementCrossReferences/SettlementCrossReferenceDto.cs
 delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/SettlementCrossReferences/SettlementCrossReferenceExportDto.cs
 delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/SettlementCrossReferences/SettlementCrossReferenceRequestDto.cs
 delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/SettlementCrossReferences/SettlementCrossReferenceUpdateDto.cs
 delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/SettlementCrossReferences/SettlementCrossReferenceVersionDto.cs
 delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/SettlementCrossReferences/SettlementCrossReferenceVersionRequestDto.cs
 delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/UnSettleAccounts/ISettleAccountAppService.cs
 delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/UnSettleAccounts/UnSettleAccountCreateDto.cs
 delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/UnSettleAccounts/UnSettleAccountDto.cs
 delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/UnSettleAccounts/UnSettleAccountDtoBase.cs
 delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/UnSettleAccounts/UnSettleAccountExportDto.cs
 delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/UnSettleAccounts/UnSettleAccountImportDto.cs
 delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/UnSettleAccounts/UnSettleAccountRequestDto.cs
 delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/UnSettleAccounts/UnSettleAccountUpdateDto.cs
 delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/UnSettleAccounts/UnSettleAccountVersionDtoBase.cs
 delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/VWScrapClaims/IScrapClaimsAppService.cs
 delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/VWScrapClaims/ScrapClaimsCreateDto.cs
 delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/VWScrapClaims/ScrapClaimsDto.cs
 delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/VWScrapClaims/ScrapClaimsDtoBase.cs
 delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/VWScrapClaims/ScrapClaimsExportDto.cs
 delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/VWScrapClaims/ScrapClaimsImportDto.cs
 delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/VWScrapClaims/ScrapClaimsRequestDto.cs
 delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/VWScrapClaims/ScrapClaimsVersionDtoBase.cs
 delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/VWSparePart/ISparePartAppService.cs
 delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/VWSparePart/SparePartCreateDto.cs
 delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/VWSparePart/SparePartDto.cs
 delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/VWSparePart/SparePartDtoBase.cs
 delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/VWSparePart/SparePartExportDto.cs
 delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/VWSparePart/SparePartImportDto.cs
 delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/VWSparePart/SparePartRequestDto.cs
 delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/VWSparePart/SparePartVersionDtoBase.cs
 delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/WMSKanBan/IWMSVWKanBanAppService.cs
 delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/WMSKanBan/WMSVWKanBanCreateDto.cs
 delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/WMSKanBan/WMSVWKanBanDto.cs
 delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/WMSKanBan/WMSVWKanBanDtoBase.cs
 delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/WMSKanBan/WMSVWKanBanExportDto.cs
 delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/WMSKanBan/WMSVWKanBanImportDto.cs
 delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/WMSKanBan/WMSVWKanBanRequestDto.cs
 delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/WMSKanBan/WMSVWKanBanVersionDtoBase.cs
 delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/WMSKanBan/WMSVWKanBantUpdateDto.cs
 delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/WMSSparePart/IWMSSparePartAppService.cs
 delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/WMSSparePart/WMSSparePartCreateDto.cs
 delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/WMSSparePart/WMSSparePartDto.cs
 delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/WMSSparePart/WMSSparePartDtoBase.cs
 delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/WMSSparePart/WMSSparePartExportDto.cs
 delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/WMSSparePart/WMSSparePartImportDto.cs
 delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/WMSSparePart/WMSSparePartRequestDto.cs
 delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/WMSSparePart/WMSSparePartVersionDtoBase.cs
 delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/HQExtend/HQKBExtendAppService.cs
 delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/HQExtend/HQKBSettleExtendAppService.cs
 delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/HQ_H/HQ_H_PlatformAppService.cs
 delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/SettlementCrossReference/SettlementCrossReferenceAppService.cs
 delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/SettlementPakAndSparePart/SettlementPakAndSparePartsAppService.cs
 delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/UnSettleAccounts/UnSettleAccountAppService.cs
 delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/VWKanBan/VWKanBanAppService.cs
 delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/VWScrapClaims/ScrapClaimsAppService.cs
 delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/VWSparePart/SparePartAppService.cs
 delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS-KanBan/WMSKanBanAppService.cs
 delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS-SparePart/WMSSparePartAppService.cs
 delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSCusomerKanbanAppService.cs
 delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSHQFKanbanAppService.cs
 delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSHQFSharePartAppService .cs
 delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSHQHKanbanAppService.cs
 delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSHQHSharePartAppService.cs
 delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSJitAppService.cs
 delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSKanbanAppService.cs
 delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSKanbanExtendAppService.cs
 delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSSharePart90AppService.cs
 delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSSharePartAppService.cs
 delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WmsDetailCancelInterface.cs
 delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WmsDetailUnInterface.cs
 delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WmsHQKBOutputAppService.cs
 delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WmsHQMKanbanAppService.cs
 delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WmsHQMSharePartAppService.cs
 delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WmsOneTimeSaleOutputAppService.cs
 delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WmsOutputSumAppService.cs
 delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WmsOutputSumInterfaceAppService.cs
 delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WmsUnInterface.cs
 delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WmsUnSumInterface.cs
 delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/EstimatedInventories/EstimatedInventoryDetail.cs
 delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/EstimatedInventories/EstimatedInventoryVersion.cs
 delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/EstimatedSums/EstimatedSum.cs
 delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/EstimatedSums/EstimatedSumVersion.cs
 delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/HQExtend/HQKBExtend.cs
 delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/HQExtend/HQKBExtendVersion.cs
 delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/HQExtend/HQKBSettleExtend.cs
 delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/HQExtend/HQKBSettleExtendVersion.cs
 delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/HQ_H/HQ_H_Kanban.cs
 delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/HQ_H/HQ_H_Platform.cs
 delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/HQ_H/HQ_H_PlatformVersion.cs
 delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/KanBan/KanBan.cs
 delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/KanBan/KanBanManager.cs
 delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/KanBan/KanBanVersion.cs
 delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/SecondaryMatching/SecondaryAdjustment.cs
 delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/SecondaryMatching/SecondaryAdjustmentVersion.cs
 delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/SecondaryMatching/SecondaryDiscount.cs
 delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/SecondaryMatching/SecondaryDiscountVersion.cs
 delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/SecondaryMatching/SecondaryPriceRatio.cs
 delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/SecondaryMatching/SecondaryPriceRatioVersion.cs
 delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/SettledPartAndErpPartPriceDiffs/SettledPartAndErpPartPriceDiff.cs
 delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/SettlementCrossReference/SettlementCrossReference.cs
 delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/SettlementCrossReference/SettlementCrossReferenceVersion.cs
 delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/SettlementPakAndSparePartsRef/SettlementPakAndSpareParts.cs
 delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/SettlementPakAndSparePartsRef/SettlementPakAndSparePartsVersion.cs
 delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/UnSettleAccounts/UnSettleAccount.cs
 delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/UnSettleAccounts/UnSettleAccountVersion.cs
 delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/VWScrapClaims/ScrapClaims.cs
 delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/VWScrapClaims/ScrapClaimsVersion.cs
 delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/VWSparePart/SparePart.cs
 delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/VWSparePart/SparePartVersion.cs
 delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/WMS-KanBan/WMSKanBanManager.cs
 delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/WMS-KanBan/WMSKanBanSettle.cs
 delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/WMS-KanBan/WMSKanBanVersion.cs
 delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/WMS-KanBan/WmsKanban.cs
 delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/WMS-SparePart/WMSSparePart.cs
 delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/WMS-SparePart/WMSSparePartVersion.cs
 delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/WMS/TB_BILL.cs
 delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/WMS/TS_SORT_DETAIL.cs
 delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/WMS/TaskList.cs
 delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/WMS/WmsOutPutPercent.cs
 delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/EntityFrameworkCore/WMSDapperRepository.cs
 delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/EntityFrameworkCore/WMSDbContext.cs
 delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/SettlementPakAndSpareParts/SettlementPakAndSparePartRepository.cs
 delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/SettlementPakAndSpareParts/SettlementPakAndSparePartVersionRepository.cs
 delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/UnSettleAccount/UnSettleAccountRepository.cs
 delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/UnSettleAccount/UnSettleAccountVersionRepository.cs
 delete mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/WMSEfCoreRepository.cs

diff --git a/code/src/AuthServer/AuthServer.Host/appsettings.json b/code/src/AuthServer/AuthServer.Host/appsettings.json
index ffb0644f..1a4089cd 100644
--- a/code/src/AuthServer/AuthServer.Host/appsettings.json
+++ b/code/src/AuthServer/AuthServer.Host/appsettings.json
@@ -1,15 +1,25 @@
 {
   "ConnectionStrings": {
-    //    "Default": "Server=114.116.225.148,13314;Database=ABP;User ID=sa;Password=Microsoft2020;",
-    "Default": "Server=192.168.0.203;Database=ABP;User ID=sa;Password=Microsoft@2021;"
+    "Default": "Server=dev.ccwin-in.com,13319;Database=BJABP;User ID=ccwin-in;Password=Microsoft@2022;Trusted_Connection=False;TrustServerCertificate=True"
   },
+  "CorsOrigins": "http://localhost:9527,http://dev.ccwin-in.com:10588,http://localhost:44307",
   "ElasticSearch": {
     "Url": "http://localhost:9200"
   },
-  "CorsOrigins": "http://localhost:9528",
   "Redis": {
     "Configuration": "127.0.0.1"
   },
+  "RabbitMQ": {
+    "Connections": {
+      "Default": {
+        "HostName": "localhost"
+      }
+    },
+    "EventBus": {
+      "ClientName": "MsDemo_AuthServer",
+      "ExchangeName": "MsDemo"
+    }
+  },
   "Logging": {
     "LogLevel": {
       "Default": "Warning"
diff --git a/code/src/Modules/BaseService/BaseService.Host/appsettings.json b/code/src/Modules/BaseService/BaseService.Host/appsettings.json
index c45da225..c780d30f 100644
--- a/code/src/Modules/BaseService/BaseService.Host/appsettings.json
+++ b/code/src/Modules/BaseService/BaseService.Host/appsettings.json
@@ -1,15 +1,12 @@
 {
   "AuthServer": {
-    "Authority": "http://localhost:10100",
-    "ApiName": "IdentityService"
+    "Authority": "http://dev.ccwin-in.com:10580"
   },
   "App": {
-    "CorsOrigins": "http://localhost:9527,http://localhost:9528"
+    "CorsOrigins": "http://localhost:9527,http://dev.ccwin-in.com:10588,http://localhost:44307"
   },
   "ConnectionStrings": {
-    "Default": "Server=192.168.0.140;Database=ABP;user id=sa;Password=Microsoft2008"
-    // "Default": "Server=LAPTOP-V3U07C2O;Database=ABP;User ID=sa;Password=1q2w!@#;"
-    //"Default": "Server=114.116.225.148,13314;Database=ABP;User ID=sa;Password=Microsoft2020;"
+    "Default": "Server=dev.ccwin-in.com,13319;Database=BJABP;User ID=ccwin-in;Password=Microsoft@2022;Trusted_Connection=False;TrustServerCertificate=True"
   },
   "ElasticSearch": {
     "Url": "http://localhost:9200"
@@ -22,16 +19,7 @@
       "Default": "Warning"
     }
   },
-  //"Settings": {
-  //  "Abp.Localization.DefaultLanguage": "zh-Hans",
-  //  "Abp.Identity.Password.RequireNonAlphanumeric": "false", //ȥ������ĸ����
-  //  "Abp.Identity.Password.RequireUppercase": "false", //ȥ����д����
-  //  "Abp.Identity.Password.RequireLowercase": "false", //ȥ��Сд
-  //  "Abp.Identity.Password.RequiredLength": "1",
-  //  "Abp.Identity.SignIn.RequireConfirmedEmail": "true",
-  //  //�����û�����
-  //  "Abp.Identity.Lockout.AllowedForNewUsers": "true",
-  //  "Abp.Identity.Lockout.MaxFailedAccessAttempts": "3"
-  //},
-  "AllowedHosts": "*"
+  "AllowedHosts": "*",
+  "RePassword": "111111"
+
 }
diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/SettleAccount.HttpApi.Host.csproj b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/SettleAccount.HttpApi.Host.csproj
index 88fd5632..56d6ef56 100644
--- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/SettleAccount.HttpApi.Host.csproj
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/SettleAccount.HttpApi.Host.csproj
@@ -12,6 +12,7 @@
     <DockerfileContext>..\..\..\..</DockerfileContext>
     <TargetFramework>net5.0</TargetFramework>
     <GenerateDocumentationFile>True</GenerateDocumentationFile>
+	  <ErrorOnDuplicatePublishOutputFiles>false</ErrorOnDuplicatePublishOutputFiles>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/appsettings.json b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/appsettings.json
index 3e49936b..29dfea13 100644
--- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/appsettings.json
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/appsettings.json
@@ -2,26 +2,10 @@
   "App": {
     "CorsOrigins": "https://*.abc.com,http://localhost:9528,http://149.223.116.5:8088"
   },
-  //"ConnectionStrings": {
-  //  "Default": "Server=LAPTOP-V3U07C2O;Database=ABP;user id=sa;Password=1q2w!@#",
-  //  "SettleAccountService": "Server=LAPTOP-V3U07C2O;Database=SettleAccountService1;user id=sa;Password=1q2w!@#;",
-  //  "Wms": "Server=192.168.0.140;Database=CPAT_WMS_TEST;user id=sa;password=Microsoft2008;"
-  //},
   "ConnectionStrings": {
-    "Default": "Server=127.0.0.1;Database=ABP;User ID=sa;Password=asdasd1977;",
-    "SettleAccountService": "Server=127.0.0.1;Database=SettleAccountService;user id=sa;password=asdasd1977;",
-    "Wms": "Server=127.0.0.1;Database=CPAT_WMS_TEST;user id=sa;password=asdasd1977;"
+    "Default": "Server=dev.ccwin-in.com,13319;Database=BJABP;User ID=ccwin-in;Password=Microsoft@2022;Trusted_Connection=False;TrustServerCertificate=True",
+    "SettleAccountService": "Server=dev.ccwin-in.com,13319;Database=SettleAccountService;User ID=ccwin-in;Password=Microsoft@2022;Trusted_Connection=False;TrustServerCertificate=True;"
   },
-  "Logging": {
-    "LogLevel": {
-      "Default": "Information",
-      "Microsoft": "Warning",
-      "Microsoft.Hosting.Lifetime": "Information"
-    }
-  },
-
-
-
 
   "Serilog": {
     "Using": [],
@@ -84,14 +68,8 @@
   },
 
 
-
-
-
-
-
-
   "AuthServer": {
-    "Authority": "http://149.223.116.5:8066",
+    "Authority": "http://dev.ccwin-in.com:10580",
     "AlwaysAllowAuthorization": false
   },
 
@@ -104,24 +82,7 @@
 
   "ElasticSearch": {
     "Url": "http://localhost:9200"
-  },
-
-  "RemoteServices": {
-    "Default": {
-      "BaseUrl": "http://149.223.116.5:8091/",
-      "UseCurrentAccessToken": "true"
-    }
-  },
-  "IdentityClients": {
-    "Default": {
-      "GrantType": "client_credentials",
-      "ClientId": "business-app",
-      "ClientSecret": "1q2w3e*",
-      "Authority": "http://149.223.116.5:8066",
-      "Scope": "InternalGateway IdentityService SettleAccount"
-    }
   }
 
 
-
 }
\ No newline at end of file
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/Boms/IBomAppService.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/Boms/IBomAppService.cs
index c3f85f31..aa60d416 100644
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/Boms/IBomAppService.cs
+++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/Boms/IBomAppService.cs
@@ -8,7 +8,6 @@ using System.Threading.Tasks;
 using Volo.Abp.Application.Dtos;
 using Volo.Abp.Application.Services;
 using Win.Sfs.SettleAccount.Entities.Boms;
-using Win.Sfs.SettleAccount.EstimatedInventories;
 using Win.Sfs.Shared.ApplicationBase;
 namespace Win.Sfs.SettleAccount.Boms
 {
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/EstimatedInventories/EstimatedInventoryDetailCreateDto.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/EstimatedInventories/EstimatedInventoryDetailCreateDto.cs
deleted file mode 100644
index 21ec3572..00000000
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/EstimatedInventories/EstimatedInventoryDetailCreateDto.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
-using System.Linq;
-using System.Text;
-using Win.Sfs.Shared;
-using Win.Sfs.Shared.DomainBase;
-using Win.Sfs.Shared.DtoBase;
-using Win.Sfs.Shared.Enums;
-
-namespace Win.Sfs.SettleAccount.EstimatedInventories
-{
-    public class EstimatedInventoryDetailCreateDto : EstimatedInventoryDetailDtoBase, IBranch<Guid>
-    {
-        public virtual Guid BranchId { get ; set ; }
-    }
-}
\ No newline at end of file
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/EstimatedInventories/EstimatedInventoryDetailDto.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/EstimatedInventories/EstimatedInventoryDetailDto.cs
deleted file mode 100644
index f7008352..00000000
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/EstimatedInventories/EstimatedInventoryDetailDto.cs
+++ /dev/null
@@ -1,120 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
-using System.Linq;
-using System.Text;
-using Win.Sfs.Shared;
-using Win.Sfs.Shared.DomainBase;
-using Win.Sfs.Shared.DtoBase;
-using Win.Sfs.Shared.Enums;
-
-namespace Win.Sfs.SettleAccount.EstimatedInventories
-{
-    public   class EstimatedInventoryDetailDto : AuditedEntityDtoBase<Guid>, IBranch<Guid>
-    {
-
-
-        public string Version { set; get; }
-
-        /// <summary>
-        ///年度
-        /// </summary>
-        public string Year { get;set; }
-
-        /// <summary>
-        /// 期间
-        /// </summary>
-        public string Period { set; get; }
-
-        /// <summary>
-        /// 物料凭证号
-        /// </summary>
-        public virtual  string MaterialDocument { get; set;}
-
-
-
-        public virtual string MaterialDocumentLine { get; set; }
-
-        /// <summary>
-        /// 外部单号
-        /// </summary>
-        public virtual  string BillNumber { get; set;}
-
-        /// <summary>
-        /// 记账日期
-        /// </summary>
-        public virtual  DateTime PostingDate { get; set;}
-
-
-
-
-        public virtual string Factory { set; get; }
-
-
-        /// <summary>
-        /// 物料编号
-        /// </summary>
-        public virtual  string MaterialCode { get; set;}
-
-
-
-        /// <summary>
-        /// 物料描述
-        /// </summary>
-        public virtual  string MaterialDesc { get; set;}
-
-
-        /// <summary>
-        /// 存储位置
-        /// </summary>
-        public virtual  string Storagelocation { get; set;}
-
-
-        /// <summary>
-        /// 收货数量
-        /// </summary>
-        public virtual  decimal ReceiveQty { get;set;}
-
-
-        /// <summary>
-        /// 发票数量
-        /// </summary>
-        public virtual  decimal InvoiceQty { get; set;}
-
-        /// <summary>
-        /// 供应商编号
-        /// </summary>
-        public virtual  string SupplierCode { get; set;}
-
-        /// <summary>
-        /// 供应商描述
-        /// </summary>
-        public virtual  string SupplierDesc { get; set;}
-
-
-        /// <summary>
-        /// 采购凭证
-        /// </summary>
-        public virtual  string PurchaseDocument { get; set;}
-
-
-        /// <summary>
-        /// 采购行项
-        /// </summary>
-        public virtual  string PurchaseLine { get; set;}
-
-
-        /// <summary>
-        /// 来源
-        /// </summary>
-        public virtual  string Source { get; set;}
-
-
-
-        /// <summary>
-        /// 存储扩展字段
-        /// </summary>
-        public virtual  string Extend1 { get; set;}
-        public virtual  Guid BranchId { get; set; }
-    }
-}
\ No newline at end of file
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/EstimatedInventories/EstimatedInventoryDetailDtoBase.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/EstimatedInventories/EstimatedInventoryDetailDtoBase.cs
deleted file mode 100644
index d2cc349d..00000000
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/EstimatedInventories/EstimatedInventoryDetailDtoBase.cs
+++ /dev/null
@@ -1,118 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
-using System.Linq;
-using System.Text;
-using Win.Sfs.Shared.DomainBase;
-using Win.Sfs.Shared.DtoBase;
-using Win.Sfs.Shared.Enums;
-
-namespace Win.Sfs.SettleAccount.EstimatedInventories
-{
-    public   class EstimatedInventoryDetailDtoBase : CreateOrUpdateEntityDtoBase<Guid>
-    {
-
-
-
-
-        /// <summary>
-        ///年度
-        /// </summary>
-        public string Year { get; protected set; }
-
-        /// <summary>
-        /// 期间
-        /// </summary>
-        public string Period { set; get; }
-
-
-
-        /// <summary>
-        /// 物料凭证号
-        /// </summary>
-        public virtual  string MaterialDocument { get; set; }
-
-        public virtual string MaterialDocumentLine { get; set; }
-
-
-        /// <summary>
-        /// 外部单号
-        /// </summary>
-        public virtual  string BillNumber { get; set; }
-
-        /// <summary>
-        /// 记账日期
-        /// </summary>
-        public virtual  DateTime PostingDate { get; set; }
-
-
-        /// <summary>
-        /// 物料编号
-        /// </summary>
-        public virtual  string MaterialCode { get; set; }
-
-
-
-        /// <summary>
-        /// 物料描述
-        /// </summary>
-        public virtual  string MaterialDesc { get; set; }
-
-
-        /// <summary>
-        /// 存储位置
-        /// </summary>
-        public virtual  string Storagelocation { get; set; }
-
-
-        /// <summary>
-        /// 收货数量
-        /// </summary>
-        public virtual  decimal ReceiveQty { get;set; }
-
-
-        /// <summary>
-        /// 发票数量
-        /// </summary>
-        public virtual  decimal InvoiceQty { get; set; }
-
-        /// <summary>
-        /// 供应商编号
-        /// </summary>
-        public virtual  string SupplierCode { get; set; }
-
-        /// <summary>
-        /// 供应商描述
-        /// </summary>
-        public virtual  string SupplierDesc { get; set; }
-
-
-        /// <summary>
-        /// 采购凭证
-        /// </summary>
-        public virtual  string PurchaseDocument { get; set; }
-
-
-        /// <summary>
-        /// 采购行项
-        /// </summary>
-        public virtual  string PurchaseLine { get; set; }
-
-
-        /// <summary>
-        /// 来源
-        /// </summary>
-        public virtual  string Source { get; set; }
-
-
-
-        /// <summary>
-        /// 存储扩展字段
-        /// </summary>
-        public virtual  string Extend1 { get; set; }
-
-      
-
-       
-    }
-}
\ No newline at end of file
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/EstimatedInventories/EstimatedInventoryDetailExportDto.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/EstimatedInventories/EstimatedInventoryDetailExportDto.cs
deleted file mode 100644
index 6b9ca689..00000000
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/EstimatedInventories/EstimatedInventoryDetailExportDto.cs
+++ /dev/null
@@ -1,151 +0,0 @@
-using Magicodes.ExporterAndImporter.Core;
-using System;
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
-using System.Linq;
-using System.Text;
-using Win.Sfs.Shared;
-using Win.Sfs.Shared.Constant;
-using Win.Sfs.Shared.DomainBase;
-using Win.Sfs.Shared.DtoBase;
-using Win.Sfs.Shared.Enums;
-
-namespace Win.Sfs.SettleAccount.EstimatedInventories
-{
-    /// <summary>
-    /// 应付暂估收获明细
-    /// </summary>
-    public   class EstimatedInventoryDetailExportDto 
-    {
-        [ExporterHeader(DisplayName = "工厂")]
-
-        public virtual string Factory { get; set; }
-
-        [ExporterHeader(DisplayName = "期间")]
-
-        public string Version { set; get; }
-
-        /// <summary>
-        /// 物料凭证号（收获单号）
-        /// </summary>
-        [ExporterHeader(DisplayName = "物料凭证号")]
- 
-        public virtual  string MaterialDocument { get; set; }
-
-
-
-        /// <summary>
-        /// 物料凭证号（收获单号）
-        /// </summary>
-        [ExporterHeader(DisplayName = "物料凭证行项号")]
-       
-
-        public virtual string MaterialDocumentLine { get; set; }
-
-        /// <summary>
-        /// 外部单号
-        /// </summary>
-        [ExporterHeader(DisplayName = "外部单号")]
-        
-        public virtual  string BillNumber { get; set; }
-
-        /// <summary>
-        /// 记账日期（收货日期）
-        /// </summary>
-        [ExporterHeader(DisplayName = "记账日期")]
-        
-        public virtual  DateTime PostingDate { get; set; }
-
-
-        /// <summary>
-        /// 物料编号
-        /// </summary>
-        [ExporterHeader(DisplayName = "物料号")]
-     
-        public virtual  string MaterialCode { get; set; }
-
-
-
-        /// <summary>
-        /// 物料描述
-        /// </summary>
-
-        [ExporterHeader(DisplayName = "物料描述")]
-      
-        public virtual  string MaterialDesc { get; set; }
-
-
-        /// <summary>
-        /// 存储地点
-        /// </summary>
-        [ExporterHeader(DisplayName = "存储地点")]
-        
-        public virtual  string Storagelocation { get; set; }
-
-
-        /// <summary>
-        /// 收货数量
-        /// </summary>
-        [ExporterHeader(DisplayName = "收货数量")]
-      
-        public virtual  decimal ReceiveQty { get;set; }
-
-
-        /// <summary>
-        /// 发票数量
-        /// </summary>
-        ///   [ExporterHeader(Name = "描述")]
-        [ExporterHeader(DisplayName = "发票数量")]
-       
-       
-        public virtual  decimal InvoiceQty { get; set; }
-
-        /// <summary>
-        /// 供应商
-        /// </summary>
-        [ExporterHeader(DisplayName = "供应商")]
-     
-        public virtual  string SupplierCode { get; set; }
-
-        /// <summary>
-        /// 供应商描述
-        /// </summary>
-        [ExporterHeader(DisplayName = "供应商描述")]
-        
-        public virtual  string SupplierDesc { get; set; }
-
-
-        /// <summary>
-        /// 采购凭证号
-        /// </summary>
-
-        [ExporterHeader(DisplayName = "采购凭证号")]
-      
-        public virtual  string PurchaseDocument { get; set; }
-
-
-        /// <summary>
-        /// 采购凭证行
-        /// </summary>
-        [ExporterHeader(DisplayName = "采购凭证行")]
-       
-        public virtual  string PurchaseLine { get; set; }
-
-
-        /// <summary>
-        /// 来源
-        /// </summary>
-        /// 
-        [ExporterHeader(DisplayName = "来源")]
-       
-        public virtual  string Source { get; set; }
-
-       
-
-        ///// <summary>
-        ///// 存储扩展字段
-        ///// </summary>
-        //public virtual  string Extend1 { get; set; }
-        //public virtual  Guid BranchId { get; set; }
-    }
-}
\ No newline at end of file
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/EstimatedInventories/EstimatedInventoryDetailImportDto.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/EstimatedInventories/EstimatedInventoryDetailImportDto.cs
deleted file mode 100644
index 73c50b14..00000000
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/EstimatedInventories/EstimatedInventoryDetailImportDto.cs
+++ /dev/null
@@ -1,169 +0,0 @@
-using Magicodes.ExporterAndImporter.Core;
-using System;
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
-using System.Linq;
-using System.Text;
-using Win.Sfs.Shared;
-using Win.Sfs.Shared.Constant;
-using Win.Sfs.Shared.DomainBase;
-using Win.Sfs.Shared.DtoBase;
-using Win.Sfs.Shared.Enums;
-
-namespace Win.Sfs.SettleAccount.EstimatedInventories
-{
-    /// <summary>
-    /// 应付暂估收获明细
-    /// </summary>
-    public   class EstimatedInventoryDetailImportDto 
-    {
-
-
-        [ImporterHeader(Name = "年度")]
-        [Required(ErrorMessage = "{0}是必填项")]
-        /// <summary>
-        ///年度
-        /// </summary>
-        public string Year { get; set; }
-        [ImporterHeader(Name = "期间")]
-        [Required(ErrorMessage = "{0}是必填项")]
-        public string Period { set; get; }
-
-      
-      
-
-        /// <summary>
-        /// 物料凭证号（收获单号）
-        /// </summary>
-        [ImporterHeader(Name = "物料凭证号")]
-        [Required(ErrorMessage = "{0}是必填项")]
-        [MaxLength(CommonConsts.MaxNameLength, ErrorMessage = "{0}最多输入{1}个字符")]
-
-        public virtual  string MaterialDocument { get; set; }
-
-
-
-        /// <summary>
-        /// 物料凭证号（收获单号）
-        /// </summary>
-        [ImporterHeader(Name = "物料凭证行项号")]
-        [Required(ErrorMessage = "{0}是必填项")]
-        [MaxLength(CommonConsts.MaxNameLength, ErrorMessage = "{0}最多输入{1}个字符")]
-
-        public virtual string MaterialDocumentLine { get; set; }
-
-        /// <summary>
-        /// 外部单号
-        /// </summary>
-        [ImporterHeader(Name = "外部单号")]
-        [Required(ErrorMessage = "{0}是必填项")]
-        [MaxLength(CommonConsts.MaxNameLength, ErrorMessage = "{0}最多输入{1}个字符")]
-        public virtual  string BillNumber { get; set; }
-
-        /// <summary>
-        /// 记账日期（收货日期）
-        /// </summary>
-        [ImporterHeader(Name = "记账日期")]
-        [Required(ErrorMessage = "{0}是必填项")]
-        [MaxLength(CommonConsts.MaxNameLength, ErrorMessage = "{0}最多输入{1}个字符")]
-        public virtual  DateTime PostingDate { get; set; }
-
-
-        /// <summary>
-        /// 物料编号
-        /// </summary>
-        [ImporterHeader(Name = "物料号")]
-        [Required(ErrorMessage = "{0}是必填项")]
-        [MaxLength(CommonConsts.MaxNameLength, ErrorMessage = "{0}最多输入{1}个字符")]
-        public virtual  string MaterialCode { get; set; }
-
-
-
-        /// <summary>
-        /// 物料描述
-        /// </summary>
-
-        [ImporterHeader(Name = "物料描述")]
-      
-        public virtual  string MaterialDesc { get; set; }
-
-
-        /// <summary>
-        /// 存储地点
-        /// </summary>
-        [ImporterHeader(Name = "存储地点")]
-        [Required(ErrorMessage = "{0}是必填项")]
-        [MaxLength(CommonConsts.MaxNameLength, ErrorMessage = "{0}最多输入{1}个字符")]
-        public virtual  string Storagelocation { get; set; }
-
-
-        /// <summary>
-        /// 收货数量
-        /// </summary>
-        [ImporterHeader(Name = "收货数量")]
-        [Required(ErrorMessage = "{0}是必填项")]
-       
-        public virtual  decimal ReceiveQty { get;set; }
-
-
-        /// <summary>
-        /// 发票数量
-        /// </summary>
-        ///   [ImporterHeader(Name = "描述")]
-        [ImporterHeader(Name = "发票数量")]
-        [Required(ErrorMessage = "{0}是必填项")]
-       
-        public virtual  decimal InvoiceQty { get; set; }
-
-        /// <summary>
-        /// 供应商
-        /// </summary>
-        [ImporterHeader(Name = "供应商")]
-        [Required(ErrorMessage = "{0}是必填项")]
-        [MaxLength(CommonConsts.MaxNameLength, ErrorMessage = "{0}最多输入{1}个字符")]
-        public virtual  string SupplierCode { get; set; }
-
-        /// <summary>
-        /// 供应商描述
-        /// </summary>
-        [ImporterHeader(Name = "供应商描述")]
-        
-        public virtual  string SupplierDesc { get; set; }
-
-
-        /// <summary>
-        /// 采购凭证号
-        /// </summary>
-
-        [ImporterHeader(Name = "采购凭证号")]
-        [Required(ErrorMessage = "{0}是必填项")]
-        [MaxLength(CommonConsts.MaxNameLength, ErrorMessage = "{0}最多输入{1}个字符")]
-        public virtual  string PurchaseDocument { get; set; }
-
-
-        /// <summary>
-        /// 采购凭证行
-        /// </summary>
-        [ImporterHeader(Name = "采购凭证行")]
-        [Required(ErrorMessage = "{0}是必填项")]
-        [MaxLength(CommonConsts.MaxNameLength, ErrorMessage = "{0}最多输入{1}个字符")]
-        public virtual  string PurchaseLine { get; set; }
-
-
-        /// <summary>
-        /// 来源
-        /// </summary>
-        /// 
-        [ImporterHeader(Name = "来源")]
-       
-        public virtual  string Source { get; set; }
-
-
-
-        /// <summary>
-        /// 存储扩展字段
-        /// </summary>
-        public virtual  string Extend1 { get; set; }
-        public virtual  Guid BranchId { get; set; }
-    }
-}
\ No newline at end of file
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/EstimatedInventories/EstimatedInventoryDetailRequestDto.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/EstimatedInventories/EstimatedInventoryDetailRequestDto.cs
deleted file mode 100644
index 7ff01ffc..00000000
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/EstimatedInventories/EstimatedInventoryDetailRequestDto.cs
+++ /dev/null
@@ -1,107 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
-using System.Linq;
-using System.Text;
-using Win.Sfs.Shared;
-using Win.Sfs.Shared.DomainBase;
-using Win.Sfs.Shared.DtoBase;
-using Win.Sfs.Shared.Enums;
-
-namespace Win.Sfs.SettleAccount.EstimatedInventories
-{
-    public   class EstimatedInventoryDetailRequestDto : RequestDtoBase, IBranch<Guid>
-    {
-
-
-        /// <summary>
-        /// 物料凭证号
-        /// </summary>
-        public virtual  string MaterialDocument { get; set; }
-
-
-        /// <summary>
-        /// 外部单号
-        /// </summary>
-        public virtual  string BillNumber { get; set; }
-
-        /// <summary>
-        /// 记账日期
-        /// </summary>
-        public virtual  DateTime PostingDate { get; set; }
-
-
-        /// <summary>
-        /// 物料编号
-        /// </summary>
-        public virtual  string MaterialCode { get; set; }
-
-
-
-        /// <summary>
-        /// 物料描述
-        /// </summary>
-        public virtual  string MaterialDesc { get; set; }
-
-
-        /// <summary>
-        /// 存储位置
-        /// </summary>
-        public virtual  string Storagelocation { get; set; }
-
-
-        /// <summary>
-        /// 收货数量
-        /// </summary>
-        public virtual  decimal ReceiveQty { get;set; }
-
-
-        /// <summary>
-        /// 发票数量
-        /// </summary>
-        public virtual  decimal InvoiceQty { get; set; }
-
-        /// <summary>
-        /// 供应商编号
-        /// </summary>
-        public virtual  string SupplierCode { get; set; }
-
-        /// <summary>
-        /// 供应商描述
-        /// </summary>
-        public virtual  string SupplierDesc { get; set; }
-
-
-        /// <summary>
-        /// 采购凭证
-        /// </summary>
-        public virtual  string PurchaseDocument { get; set; }
-
-
-        /// <summary>
-        /// 采购行项
-        /// </summary>
-        public virtual  string PurchaseLine { get; set; }
-
-
-        /// <summary>
-        /// 来源
-        /// </summary>
-        public virtual  string Source { get; set; }
-
-
-
-        /// <summary>
-        /// 存储扩展字段
-        /// </summary>
-        public virtual  string Extend1 { get; set; }
-        public virtual  Guid BranchId { get ; set ; }
-
-
-        public virtual Guid ParentId { get; set; }
-        public virtual Guid UserId { get; set; }
-
-        public virtual int FileType { get; set; }
-
-    }
-}
\ No newline at end of file
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/EstimatedInventories/EstimatedInventoryDetailUpdateDto.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/EstimatedInventories/EstimatedInventoryDetailUpdateDto.cs
deleted file mode 100644
index 0bc4a681..00000000
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/EstimatedInventories/EstimatedInventoryDetailUpdateDto.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
-using System.Linq;
-using System.Text;
-using Win.Sfs.Shared.DomainBase;
-using Win.Sfs.Shared.DtoBase;
-using Win.Sfs.Shared.Enums;
-
-namespace Win.Sfs.SettleAccount.EstimatedInventories
-{
-    public class EstimatedInventoryDetailUpdateDto : EstimatedInventoryDetailDtoBase
-    {
-
-
-       
-      
-
-       
-    }
-}
\ No newline at end of file
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/EstimatedInventories/EstimatedInventoryVersionDtoBase.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/EstimatedInventories/EstimatedInventoryVersionDtoBase.cs
deleted file mode 100644
index 0edcb5b3..00000000
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/EstimatedInventories/EstimatedInventoryVersionDtoBase.cs
+++ /dev/null
@@ -1,103 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Win.Sfs.Shared;
-using Win.Sfs.Shared.DomainBase;
-using Win.Sfs.Shared.DtoBase;
-
-namespace Win.Sfs.SettleAccount.Entities.EstimatedInventories
-{
-    /// <summary>
-    /// EstimatedInventoryVersion
-    /// </summary>
-    public class EstimatedInventoryVersionDtoBase :CreateOrUpdateEntityDtoBase<Guid>
-    {
-
-        public string Year { get; private set; }
-        /// <summary>
-        /// 期间
-        /// </summary>
-        public string Period { get; private set; }
-        /// <summary>
-        /// 版本号
-        /// </summary>
-        public string Version { get; private set; }
-
-        /// <summary>
-        /// 客户号
-        /// </summary>
-        public string CustomerCode { private set; get; }
-
-
-    }
-
-
-
-    public class EstimatedInventoryVersionDto : AuditedEntityDtoBase<Guid>, IBranch<Guid>
-    {
-        public string Year { get; private set; }
-        /// <summary>
-        /// 期间
-        /// </summary>
-        public string Period { get; private set; }
-        /// <summary>
-        /// 版本号
-        /// </summary>
-        public string Version { get; private set; }
-
-        /// <summary>
-        /// 客户号
-        /// </summary>
-        public string CustomerCode { private set; get; }
-        public Guid BranchId { get ; set; }
-    }
-
-    public class EstimatedInventoryVersionCreateDto : EstimatedInventoryVersionDtoBase
-    { }
-    public class EstimatedInventoryVersionUpdateDto : EstimatedInventoryVersionDtoBase
-    { }
-    public class EstimatedInventoryVersionRequestDto : RequestDtoBase, IBranch<Guid>
-    {
-
-        public string Year { get; private set; }
-        /// <summary>
-        /// 期间
-        /// </summary>
-        public string Period { get; private set; }
-        /// <summary>
-        /// 版本号
-        /// </summary>
-        public string Version { get; private set; }
-
-        /// <summary>
-        /// 客户号
-        /// </summary>
-        public string CustomerCode { private set; get; }
-        public Guid BranchId { get ; set ; }
-    }
-
-    public class EstimatedInventoryVersionImportDto 
-    {
-
-        public string Year { get; private set; }
-        /// <summary>
-        /// 期间
-        /// </summary>
-        public string Period { get; private set; }
-        /// <summary>
-        /// 版本号
-        /// </summary>
-        public string Version { get; private set; }
-
-        /// <summary>
-        /// 客户号
-        /// </summary>
-        public string CustomerCode { private set; get; }
-
-
-    }
-
-
-}
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/EstimatedInventories/IEstimatedInventoryDetailAppService.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/EstimatedInventories/IEstimatedInventoryDetailAppService.cs
deleted file mode 100644
index 3557e8fc..00000000
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/EstimatedInventories/IEstimatedInventoryDetailAppService.cs
+++ /dev/null
@@ -1,138 +0,0 @@
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Mvc;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Volo.Abp.Application.Dtos;
-using Volo.Abp.Application.Services;
-
-using Win.Sfs.SettleAccount.EstimatedInventories;
-using Win.Sfs.Shared.ApplicationBase;
-
-namespace Win.Sfs.SettleAccount.Entities.EstimatedInventories
-{
-
-
-
-    public interface IEstimatedInventoryDetailAppService
-    {
-
-        /// <summary>
-        /// 导入功能
-        /// </summary>
-        /// <param name="files">上传的文件(前端已经限制只能上传一个附件)</param>
-        /// <returns></returns>
-
-        Task<string> EstimatedInventoryDetailUploadExcelImport([FromForm] IFormFileCollection files, Guid branchId, string year, string period, string version, string customerCode,string factory);
-
-
-
-
-        /// <summary>
-        /// 按ID获取唯一实体
-        /// </summary>
-        /// <remarks>
-        /// 返回实体全部属性
-        /// </remarks>
-        /// <param name="id">ID</param>
-        /// <returns>实体DTO</returns>
-
-        Task<EstimatedInventoryDetailDto> GetAsync(Guid id);
-
-        /// <summary>
-        /// 根据筛选条件获取实体列表
-        /// </summary>
-        /// <remarks>
-        /// 请求条件包括:筛选条件列表,排序条件,数据数量,页码
-        /// </remarks>
-        /// <param name="input">请求条件</param>
-        /// <returns>实体DTO列表</returns>
-
-        Task<PagedResultDto<EstimatedInventoryDetailDto>> GetListAsync(Guid parentId, EstimatedInventoryDetailRequestDto input);
-
-
-
-
-        /// <summary>
-        /// 根据筛选条件获取实体列表
-        /// </summary>
-        /// <remarks>
-        /// 请求条件包括:筛选条件列表,排序条件,数据数量,页码
-        /// </remarks>
-        /// <param name="input">请求条件</param>
-        /// <returns>实体DTO列表</returns>
-
-        Task<PagedResultDto<EstimatedInventoryVersionDto>> GetVersionListAsync(EstimatedInventoryVersionRequestDto input);
-
-
-
-
-        /// <summary>
-        /// 获取实体总数
-        /// </summary>
-        /// <returns>实体总数</returns>
-
-        Task<long> GetTotalCountAsync(Guid branchId);
-
-
-        /// <summary>
-        /// 获取全部实体列表
-        /// </summary>
-        /// <returns>实体DTO列表</returns>
-
-        Task<ListResultDto<EstimatedInventoryDetailDto>> GetAllAsync(Guid branchId);
-
-
-
-
-
-        ///// <summary>
-        ///// 新增实体
-        ///// </summary>
-        ///// <param name="input">新增实体DTO</param>
-        ///// <returns>实体DTO</returns>
-
-
-        //Task<EstimatedInventoryDetailDto> CreateAsync(EstimatedInventoryDetailCreateDto input);
-
-
-        ///// <summary>
-        ///// 修改实体
-        ///// </summary>
-        ///// <param name="id">ID</param>
-        ///// <param name="input">修改实体DTO</param>
-        ///// <returns>实体DTO</returns>
-
-        //Task<EstimatedInventoryDetailDto> UpdateAsync(Guid id, EstimatedInventoryDetailUpdateDto input);
-
-
-
-
-        ///// <summary>
-        ///// 删除实体
-        ///// </summary>
-        ///// <param name="id">ID</param>
-        ///// <returns>无</returns>
-
-        //Task DeleteAsync(Guid id);
-
-
-        /// <summary>
-        /// 按IDs删除实体列表
-        /// </summary>
-        /// <param name="ids">IDs</param>
-        /// <returns>是否执行成功</returns>
-
-        Task<bool> DeleteListAsync(List<Guid> ids);
-
-
-
-    }
-
-
-
-}
-
-
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/EstimatedSums/EsimatedSumDtoBase.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/EstimatedSums/EsimatedSumDtoBase.cs
deleted file mode 100644
index 72088bfd..00000000
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/EstimatedSums/EsimatedSumDtoBase.cs
+++ /dev/null
@@ -1,356 +0,0 @@
-using Magicodes.ExporterAndImporter.Core;
-using System;
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Win.Sfs.Shared;
-using Win.Sfs.Shared.Constant;
-using Win.Sfs.Shared.DtoBase;
-
-namespace Win.Sfs.SettleAccount.Entities.EstimatedSums
-{
-    /// <summary>
-    /// 应付暂估汇总
-    /// </summary>
-    public  class EstimatedSumDtoBase : CreateOrUpdateEntityDtoBase<Guid>
-    {
-        /// <summary>
-        /// 会计年度
-        /// </summary
-    
-        [Required(ErrorMessage = "{0}是必填项")]
-       
-
-        public virtual string Year { set; get; }
-        /// <summary>
-        /// 记账期间
-        /// </summary>
-   
-        [Required(ErrorMessage = "{0}是必填项")]
-  
-        public virtual string Postingperiod { set; get; }
-
-        /// <summary>
-        /// 物料代码（物料号）
-        /// </summary>
-       
-        [Required(ErrorMessage = "{0}是必填项")]
-      
-        public virtual string MaterialCode { set; get; }
-        /// <summary>
-        /// 物料描述
-        /// </summary>
-      
-        [Required(ErrorMessage = "{0}是必填项")]
-       
-        public virtual string MaterialDesc { set; get; }
-
-        /// <summary>
-        /// 数量
-        /// </summary>
-
-       
-        [Required(ErrorMessage = "{0}是必填项")]
-    
-
-        public virtual Decimal Qty { set; get; }
-
-        /// <summary>
-        /// 供应商
-        /// </summary>
-        
-        [Required(ErrorMessage = "{0}是必填项")]
-     
-        public virtual string SupplierCode{set;get;}
-
-
-
-        /// <summary>
-        ///采购订单号
-        /// </summary>
-        public string PurchaseDocument { get; set; }
-
-
-        /// <summary>
-        /// 采购订单行号
-        /// </summary>
-        public string PurchaseLine { get; set; }
-
-
-        /// <summary>
-        /// 供应商描述
-        /// </summary>
-        //[ImporterHeader(Name = "值")]
-        //[Required(ErrorMessage = "{0}是必填项")]
-        //[MaxLength(CommonConsts.MaxNameLength, ErrorMessage = "{0}最多输入{1}个字符")]
-
-        public virtual string SupplierDesc { set; get; }
-
-    }
-    public class EstimatedSumCreateDto : EstimatedSumDtoBase
-    {
-        public virtual Guid BranchId { get; set; }
-    }
-    public class EstimatedSumUpdateDto : EstimatedSumDtoBase
-    {
-       
-
-    }
-    public class EstimatedSumRequestDto : RequestDtoBase, IBranch<Guid>
-    {
-
-        public virtual Guid UserId { get; set; }
-
-        public virtual int FileType { get; set; }
-
-        /// <summary>
-        /// 会计年度
-        /// </summary
-        public virtual string Year { set; get; }
-        /// <summary>
-        /// 记账期间
-        /// </summary>
-        public virtual string Postingperiod { set; get; }
-
-        /// <summary>
-        /// 物料代码
-        /// </summary>
-        public virtual string MaterialCode { set; get; }
-        /// <summary>
-        /// 物料描述
-        /// </summary>
-        public virtual string MaterialDesc { set; get; }
-
-        /// <summary>
-        ///采购订单号
-        /// </summary>
-        public string PurchaseDocument { get; set; }
-
-
-        /// <summary>
-        /// 采购订单行号
-        /// </summary>
-        public string PurchaseLine { get; set; }
-
-        /// <summary>
-        /// 供应商编码
-        /// </summary>
-        public virtual string SupplierCode { set; get; }
-
-        /// <summary>
-        /// 供应商描述
-        /// </summary>
-        public virtual string SupplierDesc { set; get; }
-
-
-        public virtual Guid ParentId { get; set; }
-
-        public Guid BranchId { get ; set; }
-    }
-    public class EstimatedSumDto : AuditedEntityDtoBase<Guid>, IBranch<Guid>
-    {
-
-
-        public string Version { set; get; }
-        
-        /// <summary>
-        /// 会计年度
-        /// </summary
-        public virtual string Year { set; get; }
-        /// <summary>
-        /// 记账期间
-        /// </summary>
-        public virtual string Postingperiod { set; get; }
-
-        /// <summary>
-        /// 物料代码
-        /// </summary>
-        public virtual string MaterialCode { set; get; }
-        /// <summary>
-        /// 物料描述
-        /// </summary>
-        public virtual string MaterialDesc { set; get; }
-
-        /// <summary>
-        /// 数量
-        /// </summary>
-        public virtual Decimal Qty { set; get; }
-
-        /// <summary>
-        /// 供应商编码
-        /// </summary>
-        public virtual string SupplierCode { set; get; }
-
-        /// <summary>
-        /// 供应商描述
-        /// </summary>
-        public virtual string SupplierDesc { set; get; }
-
-
-
-
-        /// <summary>
-        ///采购订单号
-        /// </summary>
-        public string PurchaseDocument { get; set; }
-
-
-        /// <summary>
-        /// 采购订单行号
-        /// </summary>
-        public string PurchaseLine { get; set; }
-
-
-        public Guid BranchId { get ; set ; }
-    }
-    public class EstimatedSumImportDto 
-    {
-        /// <summary>
-        /// 会计年度
-        /// </summary
-        [ImporterHeader(Name = "会计年度")]
-        [Required(ErrorMessage = "{0}是必填项")]
-
-
-        public virtual string Year { set; get; }
-        /// <summary>
-        /// 记账期间
-        /// </summary>
-        [ImporterHeader(Name = "记账期间")]
-        [Required(ErrorMessage = "{0}是必填项")]
-
-        public virtual string Postingperiod { set; get; }
-
-        /// <summary>
-        /// 物料代码（物料号）
-        /// </summary>
-        [ImporterHeader(Name = "物料号")]
-        [Required(ErrorMessage = "{0}是必填项")]
-        [MaxLength(CommonConsts.MaxNameLength, ErrorMessage = "{0}最多输入{1}个字符")]
-        public virtual string MaterialCode { set; get; }
-        /// <summary>
-        /// 物料描述
-        /// </summary>
-        [ImporterHeader(Name = "物料描述")]
-        [Required(ErrorMessage = "{0}是必填项")]
-
-        public virtual string MaterialDesc { set; get; }
-
-        /// <summary>
-        /// 数量
-        /// </summary>
-
-        [ImporterHeader(Name = "数量")]
-        [Required(ErrorMessage = "{0}是必填项")]
-
-
-        public virtual Decimal Qty { set; get; }
-
-        /// <summary>
-        /// 供应商
-        /// </summary>
-        [ImporterHeader(Name = "供应商")]
-        [Required(ErrorMessage = "{0}是必填项")]
-        [MaxLength(CommonConsts.MaxNameLength, ErrorMessage = "{0}最多输入{1}个字符")]
-        public virtual string SupplierCode { set; get; }
-
-
-
-
-
-
-
-        /// <summary>
-        ///采购订单号
-        /// </summary>
-        [ImporterHeader(Name = "采购订单号")]
-        [Required(ErrorMessage = "{0}是必填项")]
-        public string PurchaseDocument { get; set; }
-        /// <summary>
-        /// 采购订单行号
-        /// </summary>
-        [ImporterHeader(Name = "采购订单行号")]
-        [Required(ErrorMessage = "{0}是必填项")]
-        public string PurchaseLine { get; set; }
-
-
-       
-    }
-
-
-
-    public class EstimatedSumExportDto
-    {
-        /// <summary>
-        /// 会计年度
-        /// </summary
-        [ExporterHeader(DisplayName = "会计年度")]
-        public virtual string Year { set; get; }
-        /// <summary>
-        /// 记账期间
-        /// </summary>
-        [ExporterHeader(DisplayName = "记账期间")]
-        public virtual string Postingperiod { set; get; }
-
-
-
-
-        /// <summary>
-        ///采购订单号
-        /// </summary>
-        [ExporterHeader(DisplayName = "采购订单号")]
-        public string PurchaseDocument { get; set; }
-        /// <summary>
-        /// 采购订单行号
-        /// </summary>
-        [ExporterHeader(DisplayName = "采购订单行号")]
-        public string PurchaseLine { get; set; }
-
-
-        /// <summary>
-        /// 物料代码（物料号）
-        /// </summary>
-        [ExporterHeader(DisplayName = "物料号")]
-        
-        public virtual string MaterialCode { set; get; }
-        /// <summary>
-        /// 物料描述
-        /// </summary>
-        [ExporterHeader(DisplayName = "物料描述")]
-        
-
-        public virtual string MaterialDesc { set; get; }
-
-        /// <summary>
-        /// 数量
-        /// </summary>
-
-        [ExporterHeader(DisplayName = "数量")]
-        public virtual Decimal Qty { set; get; }
-
-        /// <summary>
-        /// 供应商
-        /// </summary>
-        [ExporterHeader(DisplayName = "供应商")]     
-        public virtual string SupplierCode { 
-            
-            set;
-            get;
-        }
-
-        /// <summary>
-        /// 供应商描述
-        /// </summary>
-        [ExporterHeader(DisplayName = "供应商描述")]
-        public virtual string SupplierDesc { set; get; }
-
-
-
-
-
-
-
-    }
-}
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/EstimatedSums/EsimatedSumVersionDtoBase.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/EstimatedSums/EsimatedSumVersionDtoBase.cs
deleted file mode 100644
index 61d946e0..00000000
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/EstimatedSums/EsimatedSumVersionDtoBase.cs
+++ /dev/null
@@ -1,122 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Win.Sfs.Shared;
-using Win.Sfs.Shared.DomainBase;
-using Win.Sfs.Shared.DtoBase;
-
-namespace Win.Sfs.SettleAccount.Entities.EstimatedSums
-{
-    /// <summary>
-    /// EstimatedSumVersion
-    /// </summary>
-    public class EstimatedSumVersionDtoBase :CreateOrUpdateEntityDtoBase<Guid>
-    {
-
-        public string Year { get; private set; }
-        /// <summary>
-        /// 期间
-        /// </summary>
-        public string Period { get; private set; }
-        /// <summary>
-        /// 版本号
-        /// </summary>
-        public string Version { get; private set; }
-
-        /// <summary>
-        /// 客户号
-        /// </summary>
-        public string CustomerCode { private set; get; }
-
-        /// <summary>
-        /// 工厂
-        /// </summary>
-        public string Factory { private set; get; }
-
-
-    }
-
-
-
-    public class EstimatedSumVersionDto : AuditedEntityDtoBase<Guid>, IBranch<Guid>
-    {
-        public string Year { get; private set; }
-        /// <summary>
-        /// 期间
-        /// </summary>
-        public string Period { get; private set; }
-        /// <summary>
-        /// 版本号
-        /// </summary>
-        public string Version { get; private set; }
-
-        /// <summary>
-        /// 客户号
-        /// </summary>
-        public string CustomerCode { private set; get; }
-        public Guid BranchId { get ; set; }
-        /// <summary>
-        /// 工厂
-        /// </summary>
-        public string Factory { private set; get; }
-    }
-
-    public class EstimatedSumVersionCreateDto : EstimatedSumVersionDtoBase
-    { }
-    public class EstimatedSumVersionUpdateDto : EstimatedSumVersionDtoBase
-    { }
-    public class EstimatedSumVersionRequestDto : RequestDtoBase, IBranch<Guid>
-    {
-
-        public string Year { get; private set; }
-        /// <summary>
-        /// 期间
-        /// </summary>
-        public string Period { get; private set; }
-        /// <summary>
-        /// 版本号
-        /// </summary>
-        public string Version { get; private set; }
-
-        /// <summary>
-        /// 客户号
-        /// </summary>
-        public string CustomerCode { private set; get; }
-        public Guid BranchId { get ; set ; }
-        /// <summary>
-        /// 工厂
-        /// </summary>
-        public string Factory { private set; get; }
-    }
-
-    public class EstimatedSumVersionImportDto 
-    {
-
-        public string Year { get; private set; }
-        /// <summary>
-        /// 期间
-        /// </summary>
-        public string Period { get; private set; }
-        /// <summary>
-        /// 版本号
-        /// </summary>
-        public string Version { get; private set; }
-
-        /// <summary>
-        /// 客户号
-        /// </summary>
-        public string CustomerCode { private set; get; }
-
-
-        /// <summary>
-        /// 工厂
-        /// </summary>
-        public string Factory { private set; get; }
-
-
-    }
-
-
-}
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/EstimatedSums/IEstimatedSumAppService.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/EstimatedSums/IEstimatedSumAppService.cs
deleted file mode 100644
index c82155c8..00000000
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/EstimatedSums/IEstimatedSumAppService.cs
+++ /dev/null
@@ -1,123 +0,0 @@
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Mvc;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Volo.Abp.Application.Dtos;
-using Volo.Abp.Application.Services;
-
-using Win.Sfs.SettleAccount.EstimatedInventories;
-using Win.Sfs.Shared.ApplicationBase;
-
-namespace Win.Sfs.SettleAccount.Entities.EstimatedSums
-{
-   
-    public interface IEstimatedSumAppService 
-    {
-
-        /// <summary>
-        /// 导入功能
-        /// </summary>
-        /// <param name="files">上传的文件(前端已经限制只能上传一个附件)</param>
-        /// <returns></returns>
-        Task<string> EstimatedSumUploadExcelImport([FromForm] IFormFileCollection files, Guid branchId, string year, string period, string version, string customerCode,string factory);
-        /// <summary>
-        /// 按ID获取唯一实体
-        /// </summary>
-        /// <remarks>
-        /// 返回实体全部属性
-        /// </remarks>
-        /// <param name="id">ID</param>
-        /// <returns>实体DTO</returns>
-
-        Task<EstimatedSumDto> GetAsync(Guid id);
-
-        /// <summary>
-        /// 根据筛选条件获取实体列表
-        /// </summary>
-        /// <remarks>
-        /// 请求条件包括:筛选条件列表,排序条件,数据数量,页码
-        /// </remarks>
-        /// <param name="input">请求条件</param>
-        /// <returns>实体DTO列表</returns>
-
-        Task<PagedResultDto<EstimatedSumDto>> GetListAsync(Guid parentId, EstimatedSumRequestDto input);
-
-
-
-
-        /// <summary>
-        /// 根据筛选条件获取实体列表
-        /// </summary>
-        /// <remarks>
-        /// 请求条件包括:筛选条件列表,排序条件,数据数量,页码
-        /// </remarks>
-        /// <param name="input">请求条件</param>
-        /// <returns>实体DTO列表</returns>
-
-        Task<PagedResultDto<EstimatedSumVersionDto>> GetVersionListAsync(EstimatedSumVersionRequestDto input);
-
-
-
-
-        /// <summary>
-        /// 获取实体总数
-        /// </summary>
-        /// <returns>实体总数</returns>
-
-        Task<long> GetTotalCountAsync(Guid branchId);
-
-
-        ///// <summary>
-        ///// 获取全部实体列表
-        ///// </summary>
-        ///// <returns>实体DTO列表</returns>
-
-        //Task<ListResultDto<EstimatedSumDto>> GetAllAsync(Guid branchId);
-
-
-
-
-
-        ///// <summary>
-        ///// 新增实体
-        ///// </summary>
-        ///// <param name="input">新增实体DTO</param>
-        ///// <returns>实体DTO</returns>
-
-
-        //Task<EstimatedSumDto> CreateAsync(EstimatedSumCreateDto input);
-
-
-        ///// <summary>
-        ///// 修改实体
-        ///// </summary>
-        ///// <param name="id">ID</param>
-        ///// <param name="input">修改实体DTO</param>
-        ///// <returns>实体DTO</returns>
-
-        //Task<EstimatedSumDto> UpdateAsync(Guid id, EstimatedSumUpdateDto input);
-
-
-
-
-        ///// <summary>
-        ///// 删除实体
-        ///// </summary>
-        ///// <param name="id">ID</param>
-        ///// <returns>无</returns>
-
-        //Task DeleteAsync(Guid id);
-
-
-        /// <summary>
-        /// 按IDs删除实体列表
-        /// </summary>
-        /// <param name="ids">IDs</param>
-        /// <returns>是否执行成功</returns>
-
-        Task<bool> DeleteListAsync(List<Guid> ids);
-    }
-}
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/HQExtend/HQKBExtendDto.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/HQExtend/HQKBExtendDto.cs
deleted file mode 100644
index 6038f52e..00000000
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/HQExtend/HQKBExtendDto.cs
+++ /dev/null
@@ -1,273 +0,0 @@
-using Magicodes.ExporterAndImporter.Core;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Win.Sfs.Shared;
-using Win.Sfs.Shared.DtoBase;
-
-namespace Win.Sfs.SettleAccount.Entities.HQExtend
-{
-    public class HQKBExtendDto
-    {
-
-
-        [ImporterHeader(Name = "试制任务单编号")]
-
-        public string TaskBillNum { get; set; }
-        [ImporterHeader(Name = "采购申请单号")]
-        public string BillNum { get; set; }
-        [ImporterHeader(Name = "零件名称")]
-        public string MaterialDesc { get; set; }
-        [ImporterHeader(Name = "零件号")]
-        public string MaterialCode { get; set; }
-        [ImporterHeader(Name = "数量")]
-        public decimal Qty { get; set; }
-        [ImporterHeader(Name = "无税单价")]
-        public decimal Price { get; set; }
-
-        [ImporterHeader(Name = "无税金额")]
-        public decimal Amt { get; set; }
-        [ImporterHeader(Name = "税率")]
-        public decimal Tax { get; set; }
-        [ImporterHeader(Name = "税额合计")]
-        public decimal TaxAmt { get; set; }
-        [ImporterHeader(Name = "价税合计")]
-        public decimal TotalAmt { get; set; }
-        [ImporterHeader(Name = "版本号", IsIgnore = false)]
-        public string Version { get; set; }
-    }
-
-
-    public class HQKBExtendRequestDto : RequestDtoBase, IBranch<Guid>
-    {
-        [ImporterHeader(Name = "试制任务单编号")]
-
-        public string TaskBillNum { get; set; }
-        [ImporterHeader(Name = "采购申请单号")]
-        public string BillNum { get; set; }
-        [ImporterHeader(Name = "零件名称")]
-        public string MaterialDesc { get; set; }
-        [ImporterHeader(Name = "零件号")]
-        public string MaterialCode { get; set; }
-        [ImporterHeader(Name = "数量")]
-        public decimal Qty { get; set; }
-        [ImporterHeader(Name = "无税单价")]
-        public decimal Price { get; set; }
-
-        [ImporterHeader(Name = "无税金额")]
-        public decimal Amt { get; set; }
-        [ImporterHeader(Name = "税率")]
-        public decimal Tax { get; set; }
-        [ImporterHeader(Name = "税额合计")]
-        public decimal TaxAmt { get; set; }
-        [ImporterHeader(Name = "价税合计")]
-        public decimal TotalAmt { get; set; }
-        [ImporterHeader(Name = "版本号", IsIgnore = false)]
-        public string Version { get; set; }
-        public Guid BranchId { get; set; }
-    }
-
-    public class HQKBExtendExportDto
-    {
-        [ExporterHeader(DisplayName = "试制任务单编号")]
-
-        public string TaskBillNum { get; set; }
-        [ExporterHeader(DisplayName = "采购申请单号")]
-        public string BillNum { get; set; }
-        [ExporterHeader(DisplayName = "零件名称")]
-        public string MaterialDesc { get; set; }
-        [ExporterHeader(DisplayName = "零件号")]
-        public string MaterialCode { get; set; }
-        [ExporterHeader(DisplayName = "数量")]
-        public decimal Qty { get; set; }
-        [ExporterHeader(DisplayName = "无税单价")]
-        public decimal Price { get; set; }
-
-        [ExporterHeader(DisplayName = "无税金额")]
-        public decimal Amt { get; set; }
-        [ExporterHeader(DisplayName = "税率")]
-        public decimal Tax { get; set; }
-        [ExporterHeader(DisplayName = "税额合计")]
-        public decimal TaxAmt { get; set; }
-        [ExporterHeader(DisplayName = "价税合计")]
-        public decimal TotalAmt { get; set; }
-        [ExporterHeader(DisplayName = "版本号")]
-        public string Version { get; set; }
-    }
-    public class HQKBExtendVersionRequestDto : RequestDtoBase, IBranch<Guid>
-    {
-
-        public string Year { get; private set; }
-        /// <summary>
-        /// 期间
-        /// </summary>
-        public string Period { get; private set; }
-        /// <summary>
-        /// 版本号
-        /// </summary>
-        public string Version { get; private set; }
-
-        /// <summary>
-        /// 客户号
-        /// </summary>
-        public string CustomerCode { private set; get; }
-        public Guid BranchId { get; set; }
-    }
-
-
-    public class HQKBExtendVersionDto
-    {
-        public string Year { get; set; }
-        /// <summary>
-        /// 期间
-        /// </summary>
-        public string Period { get; set; }
-        /// <summary>
-        /// 版本号
-        /// </summary>
-        public string Version { get; set; }
-
-        /// <summary>
-        /// 客户号
-        /// </summary>
-        public string CustomerCode { set; get; }
-
-
-        public string Factory { set; get; }
-
-    }
-
-    public class HQKBSettleExtendDto
-    {
-
-
-        [ImporterHeader(Name = "试制任务单编号")]
-
-        public string TaskBillNum { get; set; }
-        [ImporterHeader(Name = "采购申请单号")]
-        public string BillNum { get; set; }
-        [ImporterHeader(Name = "零件名称")]
-        public string MaterialDesc { get; set; }
-        [ImporterHeader(Name = "零件号")]
-        public string MaterialCode { get; set; }
-        [ImporterHeader(Name = "数量")]
-        public decimal Qty { get; set; }
-        [ImporterHeader(Name = "无税单价")]
-        public decimal Price { get; set; }
-
-        [ImporterHeader(Name = "无税金额")]
-        public decimal Amt { get; set; }
-        [ImporterHeader(Name = "税率")]
-        public decimal Tax { get; set; }
-        [ImporterHeader(Name = "税额合计")]
-        public decimal TaxAmt { get; set; }
-        [ImporterHeader(Name = "价税合计")]
-        public decimal TotalAmt { get; set; }
-        [ImporterHeader(Name = "版本号", IsIgnore = false)]
-        public string Version { get; set; }
-    }
-
-
-    public class HQKBSettleExtendRequestDto : RequestDtoBase, IBranch<Guid>
-    {
-        [ImporterHeader(Name = "试制任务单编号")]
-
-        public string TaskBillNum { get; set; }
-        [ImporterHeader(Name = "采购申请单号")]
-        public string BillNum { get; set; }
-        [ImporterHeader(Name = "零件名称")]
-        public string MaterialDesc { get; set; }
-        [ImporterHeader(Name = "零件号")]
-        public string MaterialCode { get; set; }
-        [ImporterHeader(Name = "数量")]
-        public decimal Qty { get; set; }
-        [ImporterHeader(Name = "无税单价")]
-        public decimal Price { get; set; }
-
-        [ImporterHeader(Name = "无税金额")]
-        public decimal Amt { get; set; }
-        [ImporterHeader(Name = "税率")]
-        public decimal Tax { get; set; }
-        [ImporterHeader(Name = "税额合计")]
-        public decimal TaxAmt { get; set; }
-        [ImporterHeader(Name = "价税合计")]
-        public decimal TotalAmt { get; set; }
-        [ImporterHeader(Name = "版本号", IsIgnore = false)]
-        public string Version { get; set; }
-        public Guid BranchId { get; set; }
-    }
-
-    public class HQKBSettleExtendExportDto
-    {
-        [ExporterHeader(DisplayName = "试制任务单编号")]
-
-        public string TaskBillNum { get; set; }
-        [ExporterHeader(DisplayName = "采购申请单号")]
-        public string BillNum { get; set; }
-        [ExporterHeader(DisplayName = "零件名称")]
-        public string MaterialDesc { get; set; }
-        [ExporterHeader(DisplayName = "零件号")]
-        public string MaterialCode { get; set; }
-        [ExporterHeader(DisplayName = "数量")]
-        public decimal Qty { get; set; }
-        [ExporterHeader(DisplayName = "无税单价")]
-        public decimal Price { get; set; }
-
-        [ExporterHeader(DisplayName = "无税金额")]
-        public decimal Amt { get; set; }
-        [ExporterHeader(DisplayName = "税率")]
-        public decimal Tax { get; set; }
-        [ExporterHeader(DisplayName = "税额合计")]
-        public decimal TaxAmt { get; set; }
-        [ExporterHeader(DisplayName = "价税合计")]
-        public decimal TotalAmt { get; set; }
-        [ExporterHeader(DisplayName = "版本号")]
-        public string Version { get; set; }
-    }
-    public class HQKBSettleExtendVersionRequestDto : RequestDtoBase, IBranch<Guid>
-    {
-
-        public string Year { get; private set; }
-        /// <summary>
-        /// 期间
-        /// </summary>
-        public string Period { get; private set; }
-        /// <summary>
-        /// 版本号
-        /// </summary>
-        public string Version { get; private set; }
-
-        /// <summary>
-        /// 客户号
-        /// </summary>
-        public string CustomerCode { private set; get; }
-        public Guid BranchId { get; set; }
-    }
-
-
-    public class HQKBSettleExtendVersionDto
-    {
-        public string Year { get; set; }
-        /// <summary>
-        /// 期间
-        /// </summary>
-        public string Period { get; set; }
-        /// <summary>
-        /// 版本号
-        /// </summary>
-        public string Version { get; set; }
-
-        /// <summary>
-        /// 客户号
-        /// </summary>
-        public string CustomerCode { set; get; }
-
-
-        public string Factory { set; get; }
-
-    }
-
-
-}
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/HQ_H/HQ_H_PlatformCreateDto.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/HQ_H/HQ_H_PlatformCreateDto.cs
deleted file mode 100644
index 44655097..00000000
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/HQ_H/HQ_H_PlatformCreateDto.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Win.Sfs.SettleAccount.Entities.VWScrapClaims;
-using Win.Sfs.Shared;
-
-namespace Win.Sfs.SettleAccount.Entities.HQ_H
-{
-    public class HQ_H_PlatformCreateDto : HQ_H_PlatformDtoBase, IBranch<Guid>
-    {
-        public virtual Guid BranchId { get; set; }
-    }
-}
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/HQ_H/HQ_H_PlatformDto.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/HQ_H/HQ_H_PlatformDto.cs
deleted file mode 100644
index 9a3edca6..00000000
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/HQ_H/HQ_H_PlatformDto.cs
+++ /dev/null
@@ -1,93 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Win.Sfs.Shared.DtoBase;
-
-namespace Win.Sfs.SettleAccount.Entities.HQ_H
-{
-
-    public class HQ_H_PlatformDto : AuditedEntityDtoBase<Guid>
-    {
-        /// <summary>
-        ///工厂
-        /// </summary>
-        public string Factory { get; set; }
-        /// <summary>
-        ///外部单号
-        /// </summary>
-        public string ExternalKanbanNumber { get; set; }
-        /// <summary>
-        ///看板编号
-        /// </summary>
-        public string KanbanNumber { get; set; }
-        /// <summary>
-        ///物料凭证号
-        /// </summary>
-        public string MaterialVoucherNo { get; set; }
-
-        /// <summary>
-        ///会计年度
-        /// </summary>
-        public string Year { get; set; }
-        /// <summary>
-        /// 期间
-        /// </summary>
-        public string Period { set; get; }
-        /// <summary>
-        /// 版本号
-        /// </summary>
-        public string Version { set; get; }
-        /// <summary>
-        /// 看板号
-        /// </summary>
-        public string HQHKanBan { set; get; }
-
-
-        /// <summary>
-        /// 物料号
-        /// </summary>
-        public string MaterialCode { get; set; }
-
-        /// <summary>
-        /// 验收单日期
-        /// </summary>
-        public DateTime AcceptanceDate { get; set; }
-
-        /// <summary>
-        /// 供应商
-        /// </summary>
-        public string Supplier { get; set; }
-
-        /// <summary>
-        /// 存储地点
-        /// </summary>
-        public string StorageLocation { get; set; }
-
-        /// <summary>
-        /// 存储地点描述
-        /// </summary>
-        public string StorageLocationDesc { get; set; }
-
-        /// <summary>
-        ///验收单号
-        /// </summary>
-        public string AcceptanceNo { get; set; }
-
-        /// <summary>
-        /// 数量
-        /// </summary>
-        public decimal Qty { set; get; }
-
-        /// <summary>
-        /// 单价
-        /// </summary>
-        public decimal Price { set; get; }
-
-        /// <summary>
-        /// 金额
-        /// </summary>
-        public decimal Amt { set; get; }
-    }
-}
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/HQ_H/HQ_H_PlatformDtoBase.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/HQ_H/HQ_H_PlatformDtoBase.cs
deleted file mode 100644
index 214442b8..00000000
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/HQ_H/HQ_H_PlatformDtoBase.cs
+++ /dev/null
@@ -1,93 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Win.Sfs.Shared.DtoBase;
-
-namespace Win.Sfs.SettleAccount.Entities.HQ_H
-{
-    public class HQ_H_PlatformDtoBase : CreateOrUpdateEntityDtoBase<Guid>
-    {
-        /// <summary>
-        ///工厂
-        /// </summary>
-        public string Factory { get; set; }
-        /// <summary>
-        ///外部单号
-        /// </summary>
-        public string ExternalKanbanNumber { get; set; }
-        /// <summary>
-        ///看板编号
-        /// </summary>
-        public string KanbanNumber { get; set; }
-        /// <summary>
-        ///物料凭证号
-        /// </summary>
-        public string MaterialVoucherNo { get; set; }
-
-        /// <summary>
-        ///会计年度
-        /// </summary>
-        public string Year { get; set; }
-        /// <summary>
-        /// 期间
-        /// </summary>
-        public string Period { set; get; }
-        /// <summary>
-        /// 版本号
-        /// </summary>
-        public string Version { set; get; }
-        /// <summary>
-        /// 类型：CP7报废和索赔两种
-        /// </summary>
-        public string HQHKanBan { set; get; }
-
-
-        /// <summary>
-        /// 物料号
-        /// </summary>
-        public string MaterialCode { get; set; }
-
-        /// <summary>
-        /// 验收单日期
-        /// </summary>
-        public DateTime AcceptanceDate { get; set; }
-
-        /// <summary>
-        /// 供应商
-        /// </summary>
-        public string Supplier { get; set; }
-
-        /// <summary>
-        /// 存储地点描述
-        /// </summary>
-        public string StorageLocation { get; set; }
-
-        /// <summary>
-        /// 存储地点描述
-        /// </summary>
-        public string StorageLocationDesc { get; set; }
-
-        /// <summary>
-        ///验收单号
-        /// </summary>
-        public string AcceptanceNo { get; set; }
-
-        /// <summary>
-        /// 数量
-        /// </summary>
-        public decimal Qty { set; get; }
-
-        /// <summary>
-        /// 单价
-        /// </summary>
-        public decimal Price { set; get; }
-
-        /// <summary>
-        /// 金额
-        /// </summary>
-        public decimal Amt { set; get; }
-    }
-
-}
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/HQ_H/HQ_H_PlatformExportDto.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/HQ_H/HQ_H_PlatformExportDto.cs
deleted file mode 100644
index 213804bd..00000000
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/HQ_H/HQ_H_PlatformExportDto.cs
+++ /dev/null
@@ -1,109 +0,0 @@
-using Magicodes.ExporterAndImporter.Core;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Win.Sfs.SettleAccount.Entities.HQ_H
-{
-    public class HQ_H_PlatformExportDto
-    {
-        /// <summary>
-        ///工厂
-        /// </summary>
-        [ExporterHeader(DisplayName = "工厂")]
-        public string Factory { get; set; }
-        /// <summary>
-        ///外部单号
-        /// </summary>
-        [ExporterHeader(DisplayName = "外部单号")]
-        public string ExternalKanbanNumber { get; set; }
-        /// <summary>
-        ///看板编号
-        /// </summary>
-        [ExporterHeader(DisplayName = "看板编号")]
-        public string KanbanNumber { get; set; }
-        /// <summary>
-        ///物料凭证号
-        /// </summary>
-        [ExporterHeader(DisplayName = "物料凭证号")]
-        public string MaterialVoucherNo { get; set; }
-
-        /// <summary>
-        ///会计年度
-        /// </summary>
-        [ExporterHeader(DisplayName = "会计年度")]
-        public string Year { get; set; }
-        /// <summary>
-        /// 期间
-        /// </summary>
-        [ExporterHeader(DisplayName = "期间")]
-        public string Period { set; get; }
-        /// <summary>
-        /// 版本号
-        /// </summary>
-        [ExporterHeader(DisplayName = "版本号")]
-        public string Version { set; get; }
-        /// <summary>
-        /// 看板号
-        /// </summary>
-        [ExporterHeader(DisplayName = "看板号")]
-        public string HQHKanBan { set; get; }
-
-
-        /// <summary>
-        /// 物料号
-        /// </summary>
-        [ExporterHeader(DisplayName = "物料号")]
-        public string MaterialCode { get; set; }
-
-        /// <summary>
-        /// 验收单日期
-        /// </summary>
-        [ExporterHeader(DisplayName = "验收单日期")]
-        public DateTime AcceptanceDate { get; set; }
-
-        /// <summary>
-        /// 供应商
-        /// </summary>
-        [ExporterHeader(DisplayName = "供应商")]
-        public string Supplier { get; set; }
-
-        /// <summary>
-        /// 存储地点
-        /// </summary>
-        [ExporterHeader(DisplayName = "存储地点")]
-        public string StorageLocation { get; set; }
-
-        /// <summary>
-        /// 存储地点描述
-        /// </summary>
-        [ExporterHeader(DisplayName = "存储地点描述")]
-        public string StorageLocationDesc { get; set; }
-
-        /// <summary>
-        ///验收单号
-        /// </summary>
-        [ExporterHeader(DisplayName = "验收单号")]
-        public string AcceptanceNo { get; set; }
-
-        /// <summary>
-        /// 数量
-        /// </summary>
-        [ExporterHeader(DisplayName = "数量")]
-        public decimal Qty { set; get; }
-
-        /// <summary>
-        /// 单价
-        /// </summary>
-        [ExporterHeader(DisplayName = "单价")]
-        public decimal Price { set; get; }
-
-        /// <summary>
-        /// 金额
-        /// </summary>
-        [ExporterHeader(DisplayName = "金额")]
-        public decimal Amt { set; get; }
-    }
-}
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/HQ_H/HQ_H_PlatformImportDto.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/HQ_H/HQ_H_PlatformImportDto.cs
deleted file mode 100644
index e46caa69..00000000
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/HQ_H/HQ_H_PlatformImportDto.cs
+++ /dev/null
@@ -1,109 +0,0 @@
-using Magicodes.ExporterAndImporter.Core;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Win.Sfs.SettleAccount.Entities.HQ_H
-{
-    public class HQ_H_PlatformImportDto
-    {
-        /// <summary>
-        ///工厂
-        /// </summary>
-        [ImporterHeader(Name = "工厂")]
-        public string Factory { get; set; }
-        /// <summary>
-        ///外部单号
-        /// </summary>
-        [ImporterHeader(Name = "外部单号")]
-        public string ExternalKanbanNumber { get; set; }
-        /// <summary>
-        ///看板编号
-        /// </summary>
-        [ImporterHeader(Name = "看板编号")]
-        public string KanbanNumber { get; set; }
-        /// <summary>
-        ///物料凭证号
-        /// </summary>
-        [ImporterHeader(Name = "物料凭证号")]
-        public string MaterialVoucherNo { get; set; }
-
-        /// <summary>
-        ///会计年度
-        /// </summary>
-        [ImporterHeader(Name = "会计年度")]
-        public string Year { get; set; }
-        /// <summary>
-        /// 期间
-        /// </summary>
-        //[ImporterHeader(Name = "期间")]
-        //public string Period { set; get; }
-        /// <summary>
-        /// 版本号
-        /// </summary>
-        //[ImporterHeader(Name = "版本号")]
-        //public string Version { set; get; }
-        /// <summary>
-        /// 看板号
-        /// </summary>
-        [ImporterHeader(Name = "看板号")]
-        public string HQHKanBan { set; get; }
-
-
-        /// <summary>
-        /// 物料号
-        /// </summary>
-        [ImporterHeader(Name = "物料号")]
-        public string MaterialCode { get; set; }
-
-        /// <summary>
-        /// 验收单日期
-        /// </summary>
-        [ImporterHeader(Name = "验收单日期")]
-        public DateTime AcceptanceDate { get; set; }
-
-        /// <summary>
-        /// 供应商
-        /// </summary>
-        [ImporterHeader(Name = "供应商")]
-        public string Supplier { get; set; }
-
-        /// <summary>
-        /// 存储地点
-        /// </summary>
-        [ImporterHeader(Name = "存储地点")]
-        public string StorageLocation { get; set; }
-
-        /// <summary>
-        /// 存储地点描述
-        /// </summary>
-        [ImporterHeader(Name = "存储地点描述")]
-        public string StorageLocationDesc { get; set; }
-
-        /// <summary>
-        ///验收单号
-        /// </summary>
-        [ImporterHeader(Name = "验收单号")]
-        public string AcceptanceNo { get; set; }
-
-        /// <summary>
-        /// 数量
-        /// </summary>
-        [ImporterHeader(Name = "数量")]
-        public decimal Qty { set; get; }
-
-        /// <summary>
-        /// 单价
-        /// </summary>
-        [ImporterHeader(Name = "单价")]
-        public decimal Price { set; get; }
-
-        /// <summary>
-        /// 金额
-        /// </summary>
-        [ImporterHeader(Name = "金额")]
-        public decimal Amt { set; get; }
-    }
-}
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/HQ_H/HQ_H_PlatformRequestDto.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/HQ_H/HQ_H_PlatformRequestDto.cs
deleted file mode 100644
index 5d0ee41c..00000000
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/HQ_H/HQ_H_PlatformRequestDto.cs
+++ /dev/null
@@ -1,101 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Win.Sfs.Shared.DtoBase;
-
-namespace Win.Sfs.SettleAccount.Entities.HQ_H
-{
-    public class HQ_H_PlatformRequestDto : RequestDtoBase
-    {
-
-        /// <summary>
-        ///工厂
-        /// </summary>
-        public string Factory { get; set; }
-        /// <summary>
-        ///外部单号
-        /// </summary>
-        public string ExternalKanbanNumber { get; set; }
-        /// <summary>
-        ///看板编号
-        /// </summary>
-        public string KanbanNumber { get; set; }
-        /// <summary>
-        ///物料凭证号
-        /// </summary>
-        public string MaterialVoucherNo { get; set; }
-
-        /// <summary>
-        ///会计年度
-        /// </summary>
-        public string Year { get; set; }
-        /// <summary>
-        /// 期间
-        /// </summary>
-        public string Period { set; get; }
-        /// <summary>
-        /// 版本号
-        /// </summary>
-        public string Version { set; get; }
-        /// <summary>
-        /// 看板号
-        /// </summary>
-        public string HQHKanBan { set; get; }
-
-
-        /// <summary>
-        /// 物料号
-        /// </summary>
-        public string MaterialCode { get; set; }
-
-        /// <summary>
-        /// 验收单日期
-        /// </summary>
-        public DateTime AcceptanceDate { get; set; }
-
-        /// <summary>
-        /// 供应商
-        /// </summary>
-        public string Supplier { get; set; }
-
-        /// <summary>
-        /// 存储地点
-        /// </summary>
-        public string StorageLocation { get; set; }
-
-        /// <summary>
-        ///验收单号
-        /// </summary>
-        public string AcceptanceNo { get; set; }
-
-        /// <summary>
-        /// 数量
-        /// </summary>
-        public decimal Qty { set; get; }
-
-        /// <summary>
-        /// 单价
-        /// </summary>
-        public decimal Price { set; get; }
-
-        /// <summary>
-        /// 金额
-        /// </summary>
-        public decimal Amt { set; get; }
-
-        /// <summary>
-        /// 存储地点描述
-        /// </summary>
-        public string StorageLocationDesc { get; set; }
-
-        public virtual Guid ParentId { get; set; }
-        public virtual Guid BranchId { get; set; }
-
-        public virtual Guid UserId { get; set; }
-
-        public virtual int FileType { get; set; }
-
-    }
-}
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/HQ_H/HQ_H_PlatformVersionDtoBase.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/HQ_H/HQ_H_PlatformVersionDtoBase.cs
deleted file mode 100644
index 371dba32..00000000
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/HQ_H/HQ_H_PlatformVersionDtoBase.cs
+++ /dev/null
@@ -1,100 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Win.Sfs.Shared;
-using Win.Sfs.Shared.DtoBase;
-
-namespace Win.Sfs.SettleAccount.Entities.HQ_H
-{
-    /// <summary>
-    /// SettleAccountVersion
-    /// </summary>
-    public class HQ_H_PlatformVersionDtoBase : CreateOrUpdateEntityDtoBase<Guid>
-    {
-
-        public string Year { get; private set; }
-        /// <summary>
-        /// 期间
-        /// </summary>
-        public string Period { get; private set; }
-        /// <summary>
-        /// 版本号
-        /// </summary>
-        public string Version { get; private set; }
-
-        /// <summary>
-        /// 客户号
-        /// </summary>
-        public string CustomerCode { private set; get; }
-
-
-    }
-
-
-
-    public class HQ_H_PlatformVersionDto : AuditedEntityDtoBase<Guid>, IBranch<Guid>
-    {
-        public string Year { get; set; }
-        /// <summary>
-        /// 期间
-        /// </summary>
-        public string Period { get; set; }
-        /// <summary>
-        /// 版本号
-        /// </summary>
-        public string Version { get; set; }
-
-        /// <summary>
-        /// 客户号
-        /// </summary>
-        public string CustomerCode { set; get; }
-        public Guid BranchId { get; set; }
-    }
-
-    public class HQ_H_PlatformVersionCreateDto : HQ_H_PlatformVersionDtoBase
-    { }
-    public class HQ_H_PlatformVersionUpdateDto : HQ_H_PlatformVersionDtoBase
-    { }
-    public class HQ_H_PlatformVersionRequestDto : RequestDtoBase, IBranch<Guid>
-    {
-
-        public string Year { get; private set; }
-        /// <summary>
-        /// 期间
-        /// </summary>
-        public string Period { get; private set; }
-        /// <summary>
-        /// 版本号
-        /// </summary>
-        public string Version { get; private set; }
-
-        /// <summary>
-        /// 客户号
-        /// </summary>
-        public string CustomerCode { private set; get; }
-        public Guid BranchId { get; set; }
-    }
-
-    public class HQ_H_PlatformVersionImportDto
-    {
-
-        public string Year { get; private set; }
-        /// <summary>
-        /// 期间
-        /// </summary>
-        public string Period { get; private set; }
-        /// <summary>
-        /// 版本号
-        /// </summary>
-        public string Version { get; private set; }
-
-        /// <summary>
-        /// 客户号
-        /// </summary>
-        public string CustomerCode { private set; get; }
-
-
-    }
-}
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/HQ_H/IHQ_H_PlatformAppService.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/HQ_H/IHQ_H_PlatformAppService.cs
deleted file mode 100644
index f2f940d6..00000000
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/HQ_H/IHQ_H_PlatformAppService.cs
+++ /dev/null
@@ -1,91 +0,0 @@
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Mvc;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Volo.Abp.Application.Dtos;
-
-namespace Win.Sfs.SettleAccount.Entities.HQ_H
-{
-    public interface IHQ_H_PlatformAppService
-    {
-        /// <summary>
-        /// 导入功能
-        /// </summary>
-        /// <param name="files">上传的文件(前端已经限制只能上传一个附件)</param>
-        /// <returns></returns>
-
-        Task<string> HQ_H_PlatformUploadExcelImport([FromForm] IFormFileCollection files, Guid branchId,
-            string year, string period, string version, string customerCode);
-
-        /// <summary>
-        /// 按ID获取唯一实体
-        /// </summary>
-        /// <remarks>
-        /// 返回实体全部属性
-        /// </remarks>
-        /// <param name="id">ID</param>
-        /// <returns>实体DTO</returns>
-
-        Task<HQ_H_PlatformDto> GetAsync(Guid id);
-
-        /// <summary>
-        /// 根据筛选条件获取实体列表
-        /// </summary>
-        /// <remarks>
-        /// 请求条件包括:筛选条件列表,排序条件,数据数量,页码
-        /// </remarks>
-        /// <param name="input">请求条件</param>
-        /// <returns>实体DTO列表</returns>
-
-        Task<PagedResultDto<HQ_H_PlatformDto>> GetListAsync(HQ_H_PlatformRequestDto input);
-
-
-
-
-        /// <summary>
-        /// 根据筛选条件获取实体列表
-        /// </summary>
-        /// <remarks>
-        /// 请求条件包括:筛选条件列表,排序条件,数据数量,页码
-        /// </remarks>
-        /// <param name="input">请求条件</param>
-        /// <returns>实体DTO列表</returns>
-
-        Task<PagedResultDto<HQ_H_PlatformVersionDto>> GetVersionListAsync(HQ_H_PlatformVersionRequestDto input);
-
-
-        Task<string> ExportAsync(HQ_H_PlatformRequestDto input);
-
-        /// <summary>
-        /// 获取实体总数
-        /// </summary>
-        /// <returns>实体总数</returns>
-
-        Task<long> GetTotalCountAsync(Guid branchId);
-
-
-
-
-
-        ///// <summary>
-        ///// 删除实体
-        ///// </summary>
-        ///// <param name="id">ID</param>
-        ///// <returns>无</returns>
-
-        Task DeleteAsync(Guid id);
-
-
-        /// <summary>
-        /// 按IDs删除实体列表
-        /// </summary>
-        /// <param name="ids">IDs</param>
-        /// <returns>是否执行成功</returns>
-
-        Task<bool> DeleteListAsync(List<Guid> ids);
-
-    }
-}
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/Inventories/IInventoryDetailAppService.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/Inventories/IInventoryDetailAppService.cs
index ae7e6e21..0b2e5d47 100644
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/Inventories/IInventoryDetailAppService.cs
+++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/Inventories/IInventoryDetailAppService.cs
@@ -8,7 +8,6 @@ using System.Threading.Tasks;
 using Volo.Abp.Application.Dtos;
 using Volo.Abp.Application.Services;
 using Win.Sfs.SettleAccount.Entities.InventoryDetialVersion;
-using Win.Sfs.SettleAccount.EstimatedInventories;
 using Win.Sfs.SettleAccount.Inventories;
 using Win.Sfs.Shared.ApplicationBase;
 
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/ItemInvoicePrices/IItemInvoicePriceAppService.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/ItemInvoicePrices/IItemInvoicePriceAppService.cs
index 6cc80e46..e4c2b1c9 100644
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/ItemInvoicePrices/IItemInvoicePriceAppService.cs
+++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/ItemInvoicePrices/IItemInvoicePriceAppService.cs
@@ -8,7 +8,6 @@ using System.Threading.Tasks;
 using Volo.Abp.Application.Dtos;
 using Volo.Abp.Application.Services;
 using Win.Sfs.SettleAccount.Entities.ItemInvoicePrices;
-using Win.Sfs.SettleAccount.EstimatedInventories;
 using Win.Sfs.Shared.ApplicationBase;
 namespace Win.Sfs.SettleAccount.ItemInvoicePrices
 {
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/SecondaryMatching/ISecondaryAdjustmentAppService.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/SecondaryMatching/ISecondaryAdjustmentAppService.cs
deleted file mode 100644
index 7a19368f..00000000
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/SecondaryMatching/ISecondaryAdjustmentAppService.cs
+++ /dev/null
@@ -1,137 +0,0 @@
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Mvc;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Volo.Abp.Application.Dtos;
-using Volo.Abp.Application.Services;
-
-using Win.Sfs.SettleAccount.EstimatedInventories;
-using Win.Sfs.Shared.ApplicationBase;
-
-namespace Win.Sfs.SettleAccount.Entities.SecondaryMatching
-{
-
-
-    public interface ISecondaryAdjustmentAppService
-
-
-    {
-
-        /// <summary>
-        /// 导入功能
-        /// </summary>
-        /// <param name="files">上传的文件(前端已经限制只能上传一个附件)</param>
-        /// <returns></returns>
-
-        Task<string> SecondaryAdjustmentUploadExcelImport([FromForm] IFormFileCollection files, Guid branchId, string year, string period, string version, string customerCode, string factory);
-
-
-
-
-        /// <summary>
-        /// 按ID获取唯一实体
-        /// </summary>
-        /// <remarks>
-        /// 返回实体全部属性
-        /// </remarks>
-        /// <param name="id">ID</param>
-        /// <returns>实体DTO</returns>
-
-        Task<SecondaryAdjustmentDto> GetAsync(Guid id);
-
-        /// <summary>
-        /// 根据筛选条件获取实体列表
-        /// </summary>
-        /// <remarks>
-        /// 请求条件包括:筛选条件列表,排序条件,数据数量,页码
-        /// </remarks>
-        /// <param name="input">请求条件</param>
-        /// <returns>实体DTO列表</returns>
-
-        Task<PagedResultDto<SecondaryAdjustmentDto>> GetListAsync(Guid parentId, SecondaryAdjustmentRequestDto input);
-
-
-
-
-        /// <summary>
-        /// 根据筛选条件获取实体列表
-        /// </summary>
-        /// <remarks>
-        /// 请求条件包括:筛选条件列表,排序条件,数据数量,页码
-        /// </remarks>
-        /// <param name="input">请求条件</param>
-        /// <returns>实体DTO列表</returns>
-
-        Task<PagedResultDto<SecondaryAdjustmentVersionDto>> GetVersionListAsync(SecondaryAdjustmentVersionRequestDto input);
-
-
-
-
-        /// <summary>
-        /// 获取实体总数
-        /// </summary>
-        /// <returns>实体总数</returns>
-
-        Task<long> GetTotalCountAsync(Guid branchId);
-
-
-        /// <summary>
-        /// 获取全部实体列表
-        /// </summary>
-        /// <returns>实体DTO列表</returns>
-
-        ///Task<ListResultDto<SecondaryAdjustmentDto>> GetAllAsync(Guid branchId);
-
-
-
-
-
-        ///// <summary>
-        ///// 新增实体
-        ///// </summary>
-        ///// <param name="input">新增实体DTO</param>
-        ///// <returns>实体DTO</returns>
-
-
-        //Task<SecondaryAdjustmentDto> CreateAsync(SecondaryAdjustmentCreateDto input);
-
-
-        ///// <summary>
-        ///// 修改实体
-        ///// </summary>
-        ///// <param name="id">ID</param>
-        ///// <param name="input">修改实体DTO</param>
-        ///// <returns>实体DTO</returns>
-
-        //Task<SecondaryAdjustmentDto> UpdateAsync(Guid id, SecondaryAdjustmentUpdateDto input);
-
-
-
-
-        ///// <summary>
-        ///// 删除实体
-        ///// </summary>
-        ///// <param name="id">ID</param>
-        ///// <returns>无</returns>
-
-        //Task DeleteAsync(Guid id);
-
-
-        /// <summary>
-        /// 按IDs删除实体列表
-        /// </summary>
-        /// <param name="ids">IDs</param>
-        /// <returns>是否执行成功</returns>
-
-        Task<bool> DeleteListAsync(List<Guid> ids);
-
-
-
-    }
-
-
-
-}
\ No newline at end of file
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/SecondaryMatching/ISecondaryDiscountAppService.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/SecondaryMatching/ISecondaryDiscountAppService.cs
deleted file mode 100644
index b622ad2b..00000000
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/SecondaryMatching/ISecondaryDiscountAppService.cs
+++ /dev/null
@@ -1,137 +0,0 @@
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Mvc;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Volo.Abp.Application.Dtos;
-using Volo.Abp.Application.Services;
-
-using Win.Sfs.SettleAccount.EstimatedInventories;
-using Win.Sfs.Shared.ApplicationBase;
-
-namespace Win.Sfs.SettleAccount.Entities.SecondaryMatching
-{
-
-
-    public interface ISecondaryDiscountAppService
-
-
-    {
-
-        /// <summary>
-        /// 导入功能
-        /// </summary>
-        /// <param name="files">上传的文件(前端已经限制只能上传一个附件)</param>
-        /// <returns></returns>
-
-        Task<bool> SecondaryDiscountUploadExcelImport([FromForm] IFormFileCollection files, Guid branchId, string year, string period, string version, string customerCode, string factory);
-
-
-
-
-        /// <summary>
-        /// 按ID获取唯一实体
-        /// </summary>
-        /// <remarks>
-        /// 返回实体全部属性
-        /// </remarks>
-        /// <param name="id">ID</param>
-        /// <returns>实体DTO</returns>
-
-        Task<SecondaryDiscountDto> GetAsync(Guid id);
-
-        /// <summary>
-        /// 根据筛选条件获取实体列表
-        /// </summary>
-        /// <remarks>
-        /// 请求条件包括:筛选条件列表,排序条件,数据数量,页码
-        /// </remarks>
-        /// <param name="input">请求条件</param>
-        /// <returns>实体DTO列表</returns>
-
-        Task<PagedResultDto<SecondaryDiscountDto>> GetListAsync(Guid parentId, SecondaryDiscountRequestDto input);
-
-
-
-
-        /// <summary>
-        /// 根据筛选条件获取实体列表
-        /// </summary>
-        /// <remarks>
-        /// 请求条件包括:筛选条件列表,排序条件,数据数量,页码
-        /// </remarks>
-        /// <param name="input">请求条件</param>
-        /// <returns>实体DTO列表</returns>
-
-        Task<PagedResultDto<SecondaryDiscountVersionDto>> GetVersionListAsync(SecondaryDiscountVersionRequestDto input);
-
-
-
-
-        /// <summary>
-        /// 获取实体总数
-        /// </summary>
-        /// <returns>实体总数</returns>
-
-        Task<long> GetTotalCountAsync(Guid branchId);
-
-
-        /// <summary>
-        /// 获取全部实体列表
-        /// </summary>
-        /// <returns>实体DTO列表</returns>
-
-        ///Task<ListResultDto<SecondaryDiscountDto>> GetAllAsync(Guid branchId);
-
-
-
-
-
-        ///// <summary>
-        ///// 新增实体
-        ///// </summary>
-        ///// <param name="input">新增实体DTO</param>
-        ///// <returns>实体DTO</returns>
-
-
-        //Task<SecondaryDiscountDto> CreateAsync(SecondaryDiscountCreateDto input);
-
-
-        ///// <summary>
-        ///// 修改实体
-        ///// </summary>
-        ///// <param name="id">ID</param>
-        ///// <param name="input">修改实体DTO</param>
-        ///// <returns>实体DTO</returns>
-
-        //Task<SecondaryDiscountDto> UpdateAsync(Guid id, SecondaryDiscountUpdateDto input);
-
-
-
-
-        ///// <summary>
-        ///// 删除实体
-        ///// </summary>
-        ///// <param name="id">ID</param>
-        ///// <returns>无</returns>
-
-        //Task DeleteAsync(Guid id);
-
-
-        /// <summary>
-        /// 按IDs删除实体列表
-        /// </summary>
-        /// <param name="ids">IDs</param>
-        /// <returns>是否执行成功</returns>
-
-        Task<bool> DeleteListAsync(List<Guid> ids);
-
-
-
-    }
-
-
-
-}
\ No newline at end of file
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/SecondaryMatching/ISecondaryPriceRatioAppService.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/SecondaryMatching/ISecondaryPriceRatioAppService.cs
deleted file mode 100644
index 1e271152..00000000
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/SecondaryMatching/ISecondaryPriceRatioAppService.cs
+++ /dev/null
@@ -1,135 +0,0 @@
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Mvc;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Volo.Abp.Application.Dtos;
-using Volo.Abp.Application.Services;
-
-using Win.Sfs.SettleAccount.EstimatedInventories;
-using Win.Sfs.Shared.ApplicationBase;
-
-namespace Win.Sfs.SettleAccount.Entities.SecondaryMatching
-{
-
-    public interface ISecondaryPriceRatioAppService
-
-
-    {
-
-        /// <summary>
-        /// 导入功能
-        /// </summary>
-        /// <param name="files">上传的文件(前端已经限制只能上传一个附件)</param>
-        /// <returns></returns>
-
-        Task<string> SecondaryPriceRatioUploadExcelImport([FromForm] IFormFileCollection files, Guid branchId, string year, string period, string version, string customerCode, string factory);
-
-
-
-
-        /// <summary>
-        /// 按ID获取唯一实体
-        /// </summary>
-        /// <remarks>
-        /// 返回实体全部属性
-        /// </remarks>
-        /// <param name="id">ID</param>
-        /// <returns>实体DTO</returns>
-
-        Task<SecondaryPriceRatioDto> GetAsync(Guid id);
-
-        /// <summary>
-        /// 根据筛选条件获取实体列表
-        /// </summary>
-        /// <remarks>
-        /// 请求条件包括:筛选条件列表,排序条件,数据数量,页码
-        /// </remarks>
-        /// <param name="input">请求条件</param>
-        /// <returns>实体DTO列表</returns>
-
-        Task<PagedResultDto<SecondaryPriceRatioDto>> GetListAsync(Guid parentId, SecondaryPriceRatioRequestDto input);
-
-
-
-
-        /// <summary>
-        /// 根据筛选条件获取实体列表
-        /// </summary>
-        /// <remarks>
-        /// 请求条件包括:筛选条件列表,排序条件,数据数量,页码
-        /// </remarks>
-        /// <param name="input">请求条件</param>
-        /// <returns>实体DTO列表</returns>
-
-        Task<PagedResultDto<SecondaryPriceRatioVersionDto>> GetVersionListAsync(SecondaryPriceRatioVersionRequestDto input);
-
-
-
-
-        /// <summary>
-        /// 获取实体总数
-        /// </summary>
-        /// <returns>实体总数</returns>
-
-        Task<long> GetTotalCountAsync(Guid branchId);
-
-
-        /// <summary>
-        ///// 获取全部实体列表
-        ///// </summary>
-        ///// <returns>实体DTO列表</returns>
-
-        //Task<ListResultDto<SecondaryPriceRatioDto>> GetAllAsync(Guid branchId);
-
-
-
-
-
-        ///// <summary>
-        ///// 新增实体
-        ///// </summary>
-        ///// <param name="input">新增实体DTO</param>
-        ///// <returns>实体DTO</returns>
-
-
-        //Task<SecondaryPriceRatioDto> CreateAsync(SecondaryPriceRatioCreateDto input);
-
-
-        ///// <summary>
-        ///// 修改实体
-        ///// </summary>
-        ///// <param name="id">ID</param>
-        ///// <param name="input">修改实体DTO</param>
-        ///// <returns>实体DTO</returns>
-
-        //Task<SecondaryPriceRatioDto> UpdateAsync(Guid id, SecondaryPriceRatioUpdateDto input);
-
-
-
-
-        ///// <summary>
-        ///// 删除实体
-        ///// </summary>
-        ///// <param name="id">ID</param>
-        ///// <returns>无</returns>
-
-        //Task DeleteAsync(Guid id);
-
-
-        /// <summary>
-        /// 按IDs删除实体列表
-        /// </summary>
-        /// <param name="ids">IDs</param>
-        /// <returns>是否执行成功</returns>
-
-        Task<bool> DeleteListAsync(List<Guid> ids);
-
-
-
-    }
-
-
-}
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/SecondaryMatching/SecondaryAdjustmentDtoBase.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/SecondaryMatching/SecondaryAdjustmentDtoBase.cs
deleted file mode 100644
index 45c9059c..00000000
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/SecondaryMatching/SecondaryAdjustmentDtoBase.cs
+++ /dev/null
@@ -1,360 +0,0 @@
-using Magicodes.ExporterAndImporter.Core;
-using System;
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Win.Sfs.Shared;
-using Win.Sfs.Shared.DtoBase;
-
-namespace Win.Sfs.SettleAccount.Entities.SecondaryMatching
-{
-    
-
-    /// <summary>
-    /// SecondaryAdjustment
-    /// </summary>
-    public class SecondaryAdjustmentDtoBase : CreateOrUpdateEntityDtoBase<Guid>
-    {
-
-        /// <summary>
-        ///年度
-        /// </summary>
-        public string Year { get; protected set; }
-
-        /// <summary>
-        /// 期间
-        /// </summary>
-        public string Period { set; get; }
-
-
-        public string Version { set; get; }
-
-
-        /// <summary>
-        /// 客户总成物料号
-        /// </summary>
-        public string CustomerMaterialCode { set; get; }
-
-        /// <summary>
-        /// 客户组件物料号
-        /// </summary>
-        public string CustomerComponentCode { set; get; }
-
-
-        /// <summary>
-        /// 供应商代码
-        /// </summary>
-        public string SupplierCode { set; get; }
-
-
-        /// <summary>
-        /// 零件数量（回款）
-        /// </summary>
-        public decimal Qty { set; get; }
-
-        /// <summary>
-        /// 金额（不含税）
-        /// </summary>
-        public decimal Amt { set; get; }
-
-        /// <summary>
-        /// 金额（含税）
-        /// </summary>
-        public decimal Total { set; get; }
-
-
-
-        /// <summary>
-        /// 价格或零件号变动情况
-        /// </summary>
-
-        //[Display(Name = "价格或零件号变动情况")]
-        public string HasChanged { get; set; } = "否";
-
-
-        /// <summary>
-        /// 二配采购员
-        /// </summary>
-
-        //[Display(Name = "二配采购员")]
-        public string Buyer { get; set; }
-
-
-        public string Remark { set; get; }
-
-
-    }
-
-
-
-    public class SecondaryAdjustmentDto : AuditedEntityDtoBase<Guid>
-    {
-
-        /// <summary>
-        ///年度
-        /// </summary>
-        public string Year { get; protected set; }
-
-        /// <summary>
-        /// 期间
-        /// </summary>
-        public string Period { set; get; }
-
-
-        public string Version { set; get; }
-
-
-        /// <summary>
-        /// 客户总成物料号
-        /// </summary>
-        public string CustomerMaterialCode { set; get; }
-
-        /// <summary>
-        /// 客户组件物料号
-        /// </summary>
-        public string CustomerComponentCode { set; get; }
-
-
-        /// <summary>
-        /// 供应商代码
-        /// </summary>
-        public string SupplierCode { set; get; }
-
-
-        /// <summary>
-        /// 零件数量（回款）
-        /// </summary>
-        public decimal Qty { set; get; }
-
-        /// <summary>
-        /// 金额（不含税）
-        /// </summary>
-        public decimal Amt { set; get; }
-
-        /// <summary>
-        /// 金额（含税）
-        /// </summary>
-        public decimal Total { set; get; }
-
-
-        /// <summary>
-        /// 价格或零件号变动情况
-        /// </summary>
-
-        //[Display(Name = "价格或零件号变动情况")]
-        public string HasChanged { get; set; } = "否";
-
-
-        /// <summary>
-        /// 二配采购员
-        /// </summary>
-
-        //[Display(Name = "二配采购员")]
-        public string Buyer { get; set; }
-      
-    }
-    public class SecondaryAdjustmentCreateDto : SecondaryAdjustmentDtoBase
-    { }
-    public class SecondaryAdjustmentUpdateDto : SecondaryAdjustmentDtoBase
-    { }
-    public class SecondaryAdjustmentRequestDto : RequestDtoBase, IBranch<Guid>
-    {
-
-
-        public virtual Guid UserId { get; set; }
-
-        public virtual int FileType { get; set; }
-
-
-
-        /// <summary>
-        ///年度
-        /// </summary>
-        public string Year { get; protected set; }
-
-        /// <summary>
-        /// 期间
-        /// </summary>
-        public string Period { set; get; }
-
-
-        public string Version { set; get; }
-
-
-        /// <summary>
-        /// 客户总成物料号
-        /// </summary>
-        public string CustomerMaterialCode { set; get; }
-
-        /// <summary>
-        /// 客户组件物料号
-        /// </summary>
-        public string CustomerComponentCode { set; get; }
-
-
-        /// <summary>
-        /// 供应商代码
-        /// </summary>
-        public string SupplierCode { set; get; }
-
-
-        /// <summary>
-        /// 零件数量（回款）
-        /// </summary>
-        public decimal Qty { set; get; }
-
-        /// <summary>
-        /// 金额（不含税）
-        /// </summary>
-        public decimal Amt { set; get; }
-
-        /// <summary>
-        /// 金额（含税）
-        /// </summary>
-        public decimal Total { set; get; }
-
-
-
-
-        public Guid ParentId { set; get; }
-        public Guid BranchId { get ; set ; }
-    }
-
-
-    public class SecondaryAdjustmentImportDto
-    {
-
-        /// <summary>
-        /// 客户总成物料号
-        /// </summary>
-        [ImporterHeader(Name = "客户总成物料号")]
-        [Required(ErrorMessage = "{0}是必填项")]
-        public string CustomerMaterialCode { set; get; }
-
-        /// <summary>
-        /// 客户组件物料号
-        /// </summary>
-        [ImporterHeader(Name = "客户组件物料号")]
-        [Required(ErrorMessage = "{0}是必填项")]
-        public string CustomerComponentCode { set; get; }
-
-
-        /// <summary>
-        /// 供应商代码
-        /// </summary>
-      
-
-        [ImporterHeader(Name = "供应商代码")]
-        [Required(ErrorMessage = "{0}是必填项")]
-        public string SupplierCode { set; get; }
-
-
-        /// <summary>
-        /// 零件数量（回款）
-        /// </summary>
-        [ImporterHeader(Name = "回款零件数量")]
-        [Required(ErrorMessage = "{0}是必填项")]
-        public decimal Qty { set; get; }
-
-
-
-
-
-
-        /// <summary>
-        /// 价格或零件号变动情况
-        /// </summary>
-
-        [ImporterHeader(Name = "价格或零件号变动情况")]
-        public string HasChanged { get; set; } = "否";
-
-
-        /// <summary>
-        /// 二配采购员
-        /// </summary>
-        [ImporterHeader(Name = "二配采购员")]
-        //[Display(Name = "二配采购员")]
-        public string Buyer { get; set; }
-
-
-       
-
-
-
-
-    }
-    public class SecondaryAdjustmentExportDto
-    {
-
-        [ExporterHeader(DisplayName = "期间")]
-
-        public string Version { set; get; }
-
-
-        /// <summary>
-        /// 客户总成物料号
-        /// </summary>
-        [ExporterHeader(DisplayName = "客户总成物料号")]
-      
-        public string CustomerMaterialCode { set; get; }
-
-        /// <summary>
-        /// 客户组件物料号
-        /// </summary>
-        [ExporterHeader(DisplayName = "客户组件物料号")]
-      
-        public string CustomerComponentCode { set; get; }
-
-
-        /// <summary>
-        /// 供应商代码
-        /// </summary>
-
-
-        [ExporterHeader(DisplayName = "供应商代码")]
-        
-        public string SupplierCode { set; get; }
-
-
-        /// <summary>
-        /// 零件数量（回款）
-        /// </summary>
-        [ExporterHeader(DisplayName = "零件数量（回款）")]
-      
-        public decimal Qty { set; get; }
-
-
-
-
-
-
-        /// <summary>
-        /// 价格或零件号变动情况
-        /// </summary>
-
-        [ExporterHeader(DisplayName = "价格或零件号变动情况")]
-        public string HasChanged { get; set; } = "否";
-
-
-        /// <summary>
-        /// 二配采购员
-        /// </summary>
-        [ExporterHeader(DisplayName = "二配采购员")]
-        //[Display(Name = "二配采购员")]
-        public string Buyer { get; set; }
-
-        [ExporterHeader(DisplayName = "备注")]
-        //[Display(Name = "二配采购员")]
-        public string Remark { get; set; }
-
-
-
-
-
-    }
-
-
-
-}
\ No newline at end of file
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/SecondaryMatching/SecondaryAdjustmentVersionDtoBase.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/SecondaryMatching/SecondaryAdjustmentVersionDtoBase.cs
deleted file mode 100644
index c56b393c..00000000
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/SecondaryMatching/SecondaryAdjustmentVersionDtoBase.cs
+++ /dev/null
@@ -1,124 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Win.Sfs.Shared;
-using Win.Sfs.Shared.DomainBase;
-using Win.Sfs.Shared.DtoBase;
-
-namespace Win.Sfs.SettleAccount.Entities.SecondaryMatching
-{
-   
-
-    /// <summary>
-    /// SecondaryAdjustmentVersion
-    /// </summary>
-    public class SecondaryAdjustmentVersionDtoBase : CreateOrUpdateEntityDtoBase<Guid>
-    {
-
-        public string Year { get; private set; }
-        /// <summary>
-        /// 期间
-        /// </summary>
-        public string Period { get; private set; }
-        /// <summary>
-        /// 版本号
-        /// </summary>
-        public string Version { get; private set; }
-
-        /// <summary>
-        /// 客户号
-        /// </summary>
-        public string CustomerCode { private set; get; }
-
-        /// <summary>
-        /// 工厂
-        /// </summary>
-        public string Factory { private set; get; }
-
-
-    }
-
-
-
-    public class SecondaryAdjustmentVersionDto : AuditedEntityDtoBase<Guid>, IBranch<Guid>
-    {
-        public string Year { get; private set; }
-        /// <summary>
-        /// 期间
-        /// </summary>
-        public string Period { get; private set; }
-        /// <summary>
-        /// 版本号
-        /// </summary>
-        public string Version { get; private set; }
-
-        /// <summary>
-        /// 客户号
-        /// </summary>
-        public string CustomerCode { private set; get; }
-        public Guid BranchId { get; set; }
-        /// <summary>
-        /// 工厂
-        /// </summary>
-        public string Factory { private set; get; }
-    }
-
-    public class SecondaryAdjustmentVersionCreateDto : SecondaryAdjustmentVersionDtoBase
-    { }
-    public class SecondaryAdjustmentVersionUpdateDto : SecondaryAdjustmentVersionDtoBase
-    { }
-    public class SecondaryAdjustmentVersionRequestDto : RequestDtoBase, IBranch<Guid>
-    {
-
-        public string Year { get; private set; }
-        /// <summary>
-        /// 期间
-        /// </summary>
-        public string Period { get; private set; }
-        /// <summary>
-        /// 版本号
-        /// </summary>
-        public string Version { get; private set; }
-
-        /// <summary>
-        /// 客户号
-        /// </summary>
-        public string CustomerCode { private set; get; }
-        public Guid BranchId { get; set; }
-        /// <summary>
-        /// 工厂
-        /// </summary>
-        public string Factory { private set; get; }
-    }
-
-    public class SecondaryAdjustmentVersionImportDto
-    {
-
-        public string Year { get; private set; }
-        /// <summary>
-        /// 期间
-        /// </summary>
-        public string Period { get; private set; }
-        /// <summary>
-        /// 版本号
-        /// </summary>
-        public string Version { get; private set; }
-
-        /// <summary>
-        /// 客户号
-        /// </summary>
-        public string CustomerCode { private set; get; }
-
-
-        /// <summary>
-        /// 工厂
-        /// </summary>
-        public string Factory { private set; get; }
-
-
-    }
-
-}
-
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/SecondaryMatching/SecondaryDiscountDtoBase.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/SecondaryMatching/SecondaryDiscountDtoBase.cs
deleted file mode 100644
index 784ba67a..00000000
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/SecondaryMatching/SecondaryDiscountDtoBase.cs
+++ /dev/null
@@ -1,319 +0,0 @@
-using Magicodes.ExporterAndImporter.Core;
-using System;
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Win.Sfs.Shared;
-using Win.Sfs.Shared.DtoBase;
-
-namespace Win.Sfs.SettleAccount.Entities.SecondaryMatching
-{
-    
-
-    /// <summary>
-    /// SecondaryDiscount
-    /// </summary>
-    public class SecondaryDiscountDtoBase : CreateOrUpdateEntityDtoBase<Guid>
-    {
-
-        /// <summary>
-        ///年度
-        /// </summary>
-        public string Year { get; protected set; }
-
-        /// <summary>
-        /// 期间
-        /// </summary>
-        public string Period { set; get; }
-
-
-        public string Version { set; get; }
-
-
-        /// <summary>
-        /// 客户总成物料号
-        /// </summary>
-        public string CustomerMaterialCode { set; get; }
-
-        /// <summary>
-        /// 客户组件物料号
-        /// </summary>
-        public string CustomerComponentCode { set; get; }
-
-
-        /// <summary>
-        /// 供应商代码
-        /// </summary>
-        public string SupplierCode { set; get; }
-
-
-        /// <summary>
-        /// 零件数量（回款）
-        /// </summary>
-        public decimal Qty { set; get; }
-
-        /// <summary>
-        /// 金额（不含税）
-        /// </summary>
-        public decimal Amt { set; get; }
-
-        /// <summary>
-        /// 金额（含税）
-        /// </summary>
-        public decimal Total { set; get; }
-
-
-
-        /// <summary>
-        /// 价格或零件号变动情况
-        /// </summary>
-
-        //[Display(Name = "价格或零件号变动情况")]
-        public string HasChanged { get; set; } = "否";
-
-
-        /// <summary>
-        /// 二配采购员
-        /// </summary>
-
-        //[Display(Name = "二配采购员")]
-        public string Buyer { get; set; }
-
-
-        public string Remark { set; get; }
-
-
-    }
-
-
-
-    public class SecondaryDiscountDto : AuditedEntityDtoBase<Guid>
-    {
-
-        /// <summary>
-        ///年度
-        /// </summary>
-        public string Year { get; protected set; }
-
-        /// <summary>
-        /// 期间
-        /// </summary>
-        public string Period { set; get; }
-
-
-        public string Version { set; get; }
-
-
-        /// <summary>
-        /// 客户总成物料号
-        /// </summary>
-        public string CustomerMaterialCode { set; get; }
-
-        /// <summary>
-        /// 客户组件物料号
-        /// </summary>
-        public string CustomerComponentCode { set; get; }
-
-
-        /// <summary>
-        /// 供应商代码
-        /// </summary>
-        public string SupplierCode { set; get; }
-
-
-        /// <summary>
-        /// 零件数量（回款）
-        /// </summary>
-        public decimal Qty { set; get; }
-
-        /// <summary>
-        /// 金额（不含税）
-        /// </summary>
-        public decimal Amt { set; get; }
-
-        /// <summary>
-        /// 金额（含税）
-        /// </summary>
-        public decimal Total { set; get; }
-
-
-        /// <summary>
-        /// 价格或零件号变动情况
-        /// </summary>
-
-        //[Display(Name = "价格或零件号变动情况")]
-        public string HasChanged { get; set; } = "否";
-
-
-        /// <summary>
-        /// 二配采购员
-        /// </summary>
-
-        //[Display(Name = "二配采购员")]
-        public string Buyer { get; set; }
-      
-    }
-    public class SecondaryDiscountCreateDto : SecondaryDiscountDtoBase
-    { }
-    public class SecondaryDiscountUpdateDto : SecondaryDiscountDtoBase
-    { }
-    public class SecondaryDiscountRequestDto : RequestDtoBase, IBranch<Guid>
-    {
-        /// <summary>
-        ///年度
-        /// </summary>
-        public string Year { get; protected set; }
-
-        /// <summary>
-        /// 期间
-        /// </summary>
-        public string Period { set; get; }
-
-
-        public string Version { set; get; }
-
-
-        /// <summary>
-        /// 客户总成物料号
-        /// </summary>
-        public string CustomerMaterialCode { set; get; }
-
-        /// <summary>
-        /// 客户组件物料号
-        /// </summary>
-        public string CustomerComponentCode { set; get; }
-
-
-        /// <summary>
-        /// 供应商代码
-        /// </summary>
-        public string SupplierCode { set; get; }
-
-
-        /// <summary>
-        /// 零件数量（回款）
-        /// </summary>
-        public decimal Qty { set; get; }
-
-        /// <summary>
-        /// 金额（不含税）
-        /// </summary>
-        public decimal Amt { set; get; }
-
-        /// <summary>
-        /// 金额（含税）
-        /// </summary>
-        public decimal Total { set; get; }
-
-
-
-
-        public Guid ParentId { set; get; }
-        public Guid BranchId { get ; set ; }
-    }
-
-
-    public class SecondaryDiscountImportDto
-    {
-
-
-        /// <summary>
-        /// 供应商代码
-        /// </summary>
-      
-
-        [ImporterHeader(Name = "供应商代码")]
-        [Required(ErrorMessage = "{0}是必填项")]
-        public string SupplierCode { set; get; }
-
-        /// <summary>
-        /// 价格或零件号变动情况
-        /// </summary>
-
-        [ImporterHeader(Name = "价格或零件号变动情况")]
-        public string HasChanged { get; set; } = "否";
-
-
-        /// <summary>
-        /// 二配采购员
-        /// </summary>
-        [ImporterHeader(Name = "二配采购员")]
-        //[Display(Name = "二配采购员")]
-        public string Buyer { get; set; }
-
-
-
-        /// <summary>
-        /// 金额（不含税）
-        /// </summary>
-        [ImporterHeader(Name = "不含税金额")]
-
-        public decimal Amt { set; get; }
-
-     
-
-
-
-
-    }
-
-
-    public class SecondaryDiscountExportDto
-    {
-
-        /// <summary>
-        /// 供应商代码
-        /// </summary>
-        [ExporterHeader(DisplayName ="供应商代码")]
-        [Required(ErrorMessage = "{0}是必填项")]
-        public string SupplierCode { set; get; }
-
-
-        /// <summary>
-        /// 零件数量（回款）
-        /// </summary>
-        [ExporterHeader(DisplayName ="回款零件数量")]
-        [Required(ErrorMessage = "{0}是必填项")]
-        public decimal Qty { set; get; }
-
-
-        /// <summary>
-        /// 价格或零件号变动情况
-        /// </summary>
-        [ExporterHeader(DisplayName ="价格或零件号变动情况")]
-        public string HasChanged { get; set; } = "否";
-
-
-        /// <summary>
-        /// 二配采购员
-        /// </summary>
-        [ExporterHeader(DisplayName ="二配采购员")]
-        //[Display(Name = "二配采购员")]
-        public string Buyer { get; set; }
-
-
-        /// <summary>
-        /// 金额（不含税）
-        /// </summary>
-        [ExporterHeader(DisplayName ="不含税金额")]
-
-        public decimal Amt { set; get; }
-
-        /// <summary>
-        /// 金额（含税）
-        /// </summary>
-        [ExporterHeader(DisplayName ="含税金额")]
-        public decimal Total { set; get; }
-
-
-
-
-    }
-
-
-
-
-
-}
\ No newline at end of file
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/SecondaryMatching/SecondaryDiscountVersionDtoBase.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/SecondaryMatching/SecondaryDiscountVersionDtoBase.cs
deleted file mode 100644
index 9c40563e..00000000
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/SecondaryMatching/SecondaryDiscountVersionDtoBase.cs
+++ /dev/null
@@ -1,124 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Win.Sfs.Shared;
-using Win.Sfs.Shared.DomainBase;
-using Win.Sfs.Shared.DtoBase;
-
-namespace Win.Sfs.SettleAccount.Entities.SecondaryMatching
-{
-   
-
-    /// <summary>
-    /// SecondaryDiscountVersion
-    /// </summary>
-    public class SecondaryDiscountVersionDtoBase : CreateOrUpdateEntityDtoBase<Guid>
-    {
-
-        public string Year { get; private set; }
-        /// <summary>
-        /// 期间
-        /// </summary>
-        public string Period { get; private set; }
-        /// <summary>
-        /// 版本号
-        /// </summary>
-        public string Version { get; private set; }
-
-        /// <summary>
-        /// 客户号
-        /// </summary>
-        public string CustomerCode { private set; get; }
-
-        /// <summary>
-        /// 工厂
-        /// </summary>
-        public string Factory { private set; get; }
-
-
-    }
-
-
-
-    public class SecondaryDiscountVersionDto : AuditedEntityDtoBase<Guid>, IBranch<Guid>
-    {
-        public string Year { get; private set; }
-        /// <summary>
-        /// 期间
-        /// </summary>
-        public string Period { get; private set; }
-        /// <summary>
-        /// 版本号
-        /// </summary>
-        public string Version { get; private set; }
-
-        /// <summary>
-        /// 客户号
-        /// </summary>
-        public string CustomerCode { private set; get; }
-        public Guid BranchId { get; set; }
-        /// <summary>
-        /// 工厂
-        /// </summary>
-        public string Factory { private set; get; }
-    }
-
-    public class SecondaryDiscountVersionCreateDto : SecondaryDiscountVersionDtoBase
-    { }
-    public class SecondaryDiscountVersionUpdateDto : SecondaryDiscountVersionDtoBase
-    { }
-    public class SecondaryDiscountVersionRequestDto : RequestDtoBase, IBranch<Guid>
-    {
-
-        public string Year { get; private set; }
-        /// <summary>
-        /// 期间
-        /// </summary>
-        public string Period { get; private set; }
-        /// <summary>
-        /// 版本号
-        /// </summary>
-        public string Version { get; private set; }
-
-        /// <summary>
-        /// 客户号
-        /// </summary>
-        public string CustomerCode { private set; get; }
-        public Guid BranchId { get; set; }
-        /// <summary>
-        /// 工厂
-        /// </summary>
-        public string Factory { private set; get; }
-    }
-
-    public class SecondaryDiscountVersionImportDto
-    {
-
-        public string Year { get; private set; }
-        /// <summary>
-        /// 期间
-        /// </summary>
-        public string Period { get; private set; }
-        /// <summary>
-        /// 版本号
-        /// </summary>
-        public string Version { get; private set; }
-
-        /// <summary>
-        /// 客户号
-        /// </summary>
-        public string CustomerCode { private set; get; }
-
-
-        /// <summary>
-        /// 工厂
-        /// </summary>
-        public string Factory { private set; get; }
-
-
-    }
-
-}
-
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/SecondaryMatching/SecondaryPriceRatioDtoBase.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/SecondaryMatching/SecondaryPriceRatioDtoBase.cs
deleted file mode 100644
index 067728ba..00000000
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/SecondaryMatching/SecondaryPriceRatioDtoBase.cs
+++ /dev/null
@@ -1,388 +0,0 @@
-using Magicodes.ExporterAndImporter.Core;
-using System;
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Win.Sfs.Shared;
-using Win.Sfs.Shared.DtoBase;
-
-namespace Win.Sfs.SettleAccount.Entities.SecondaryMatching
-{
-
-    /// <summary>
-    /// SecondaryPriceRatio
-    /// </summary>
-    public class SecondaryPriceRatioDtoBase : CreateOrUpdateEntityDtoBase<Guid>
-    {
-
-        public string Year { get; set; }
-        /// <summary>
-        /// 期间
-        /// </summary>
-        public string Period { get; set; }
-
-        public string Version { set; get; }
-
-
-
-
-        /// <summary>
-        /// 客户代码
-        /// </summary>
-        public string CustomerCode { set; get; }
-
-
-
-        /// <summary>
-        /// 客户总成物料号
-        /// </summary>
-        public string CustomItemCode { set; get; }
-
-        /// <summary>
-        /// 客户物料号结算价格
-        /// </summary>
-        public decimal CustomItemPrice { set; get; }
-
-
-
-        /// <summary>
-        /// 客户组件物料号
-        /// </summary> 
-        public string CustomSubItemCode { get; set; }
-
-
-        /// <summary>
-        /// 客户物料号结算价格
-        /// </summary>
-        public decimal CustomSubItemPrice { set; get; }
-
-
-        /// <summary>
-        /// 供应商代码
-        /// </summary>
-        public string SupplierCode { get; set; }
-        /// <summary>
-        /// 供应商描述
-        /// </summary>
-        public string SupplierDesc { get; set; }
-
-        /// <summary>
-        /// 供货比例
-        /// </summary>
-        public string SupplyProportion { set; get; }
-
-        /// <summary>
-        /// 比例供货价格
-        /// </summary>
-        public decimal SupplyProportionPrice { get; set; }
-
-
-        public Guid ParentId { set; get; }
-
-    }
-
-
-
-    public class SecondaryPriceRatioDto : AuditedEntityDtoBase<Guid>, IBranch<Guid>
-    {
-        public string Year { get;  set; }
-        /// <summary>
-        /// 期间
-        /// </summary>
-        public string Period { get; set; }
-
-        public string Version { set; get; }
-
-
-
-
-        /// <summary>
-        /// 客户代码
-        /// </summary>
-        public string CustomerCode { set; get; }
-
-
-
-        /// <summary>
-        /// 客户总成物料号
-        /// </summary>
-        public string CustomItemCode { set; get; }
-
-        /// <summary>
-        /// 客户物料号结算价格
-        /// </summary>
-        public decimal CustomItemPrice { set; get; }
-
-
-
-        /// <summary>
-        /// 客户组件物料号
-        /// </summary> 
-        public string CustomSubItemCode { get; set; }
-
-
-        /// <summary>
-        /// 客户物料号结算价格
-        /// </summary>
-        public decimal CustomSubItemPrice { set; get; }
-
-
-        /// <summary>
-        /// 供应商代码
-        /// </summary>
-        public string SupplierCode { get; set; }
-        /// <summary>
-        /// 供应商描述
-        /// </summary>
-        public string SupplierDesc { get; set; }
-
-        /// <summary>
-        /// 供货比例
-        /// </summary>
-        public string SupplyProportion { set; get; }
-
-        /// <summary>
-        /// 比例供货价格
-        /// </summary>
-        public decimal SupplyProportionPrice { get; set; }
-
-
-        public Guid ParentId { set; get; }
-        public Guid BranchId { get ; set; }
-    }
-
-    public class SecondaryPriceRatioCreateDto : SecondaryPriceRatioDtoBase
-    { }
-    public class SecondaryPriceRatioUpdateDto : SecondaryPriceRatioDtoBase
-    { }
-    public class SecondaryPriceRatioRequestDto : RequestDtoBase, IBranch<Guid>
-    {
-
-
-        public virtual Guid UserId { get; set; }
-
-        public virtual int FileType { get; set; }
-
-        public string Version { set; get; }
-
-        /// <summary>
-        /// 客户代码
-        /// </summary>
-        public string CustomerCode { set; get; }
-
-        /// <summary>
-        /// 客户总成物料号
-        /// </summary>
-        public string CustomItemCode { set; get; }
-
-        /// <summary>
-        /// 客户物料号结算价格
-        /// </summary>
-        public decimal CustomItemPrice { set; get; }
-
-
-
-        /// <summary>
-        /// 客户组件物料号
-        /// </summary> 
-        public string CustomSubItemCode { get; set; }
-
-
-        /// <summary>
-        /// 客户物料号结算价格
-        /// </summary>
-        public decimal CustomSubItemPrice { set; get; }
-
-
-        /// <summary>
-        /// 供应商代码
-        /// </summary>
-        public string SupplierCode { get; set; }
-        /// <summary>
-        /// 供应商描述
-        /// </summary>
-        public string SupplierDesc { get; set; }
-
-        /// <summary>
-        /// 供货比例
-        /// </summary>
-        public string SupplyProportion { set; get; }
-
-        /// <summary>
-        /// 比例供货价格
-        /// </summary>
-        public decimal SupplyProportionPrice { get; set; }
-
-
-        public Guid ParentId { set; get; }
-        public Guid BranchId { get ; set ; }
-    }
-
-    public class SecondaryPriceRatioImportDto
-    {
-
-
-
-
-
-
-
-        /// <summary>
-        /// 客户代码
-        /// </summary>
-        [ImporterHeader(Name = "客户代码")]
-        [Required(ErrorMessage = "{0}是必填项")]
-
-        public string CustomerCode { set; get; }
-
-
-
-        /// <summary>
-        /// 客户物料号
-        /// </summary>
-        [ImporterHeader(Name = "客户总成物料号")]
-        [Required(ErrorMessage = "{0}是必填项")]
-        public string CustomItemCode { set; get; }
-
-        /// <summary>
-        /// 客户物料号结算价格
-        /// </summary>
-        [ImporterHeader(Name = "客户物料号结算价格")]
-        [Required(ErrorMessage = "{0}是必填项")]
-        public decimal CustomItemPrice { set; get; }
-
-
-
-        /// <summary>
-        /// 客户组件物料号
-        /// </summary> 
-        [ImporterHeader(Name = "客户组件")]
-        [Required(ErrorMessage = "{0}是必填项")]
-        public string CustomSubItemCode { get; set; }
-
-
-        /// <summary>
-        /// 客户物料号结算价格
-        /// </summary>
-        [ImporterHeader(Name = "客户组件结算价格")]
-        [Required(ErrorMessage = "{0}是必填项")]
-        public decimal CustomSubItemPrice { set; get; }
-
-
-        /// <summary>
-        /// 供应商代码
-        /// </summary>
-
-        [ImporterHeader(Name = "供应商代码")]
-        [Required(ErrorMessage = "{0}是必填项")]
-        public string SupplierCode { get; set; }
-        /// <summary>
-        /// 供应商描述
-        /// </summary>
-        [ImporterHeader(Name = "供应商描述")]
-     
-        public string SupplierDesc { get; set; }
-
-        /// <summary>
-        /// 供货比例
-        /// </summary>
-        [ImporterHeader(Name = "供货比例")]
-        [Required(ErrorMessage = "{0}是必填项")]
-        public string SupplyProportion { set; get; }
-
-       
-
-
-
-
-
-
-    }
-    public class SecondaryPriceRatioExportDto
-    {
-
-
-       [ExporterHeader(DisplayName = "期间")]
-        public string Version { set; get; }
-
-        /// <summary>
-        /// 客户代码
-        /// </summary>
-        [ExporterHeader(DisplayName ="客户代码")]
-      
-
-        public string CustomerCode { set; get; }
-
-
-
-        /// <summary>
-        /// 客户物料号
-        /// </summary>
-        [ExporterHeader(DisplayName ="客户总成物料号")]
-      
-        public string CustomItemCode { set; get; }
-
-        /// <summary>
-        /// 客户物料号结算价格
-        /// </summary>
-        [ExporterHeader(DisplayName ="客户物料号结算价格")]
-       
-        public decimal CustomItemPrice { set; get; }
-
-
-
-        /// <summary>
-        /// 客户组件物料号
-        /// </summary> 
-        [ExporterHeader(DisplayName ="客户组件")]
-       
-        public string CustomSubItemCode { get; set; }
-
-
-        /// <summary>
-        /// 客户物料号结算价格
-        /// </summary>
-        [ExporterHeader(DisplayName ="客户组件结算价格")]
-       
-        public decimal CustomSubItemPrice { set; get; }
-
-
-        /// <summary>
-        /// 供应商代码
-        /// </summary>
-
-        [ExporterHeader(DisplayName ="供应商代码")]
-       
-        public string SupplierCode { get; set; }
-        /// <summary>
-        /// 供应商描述
-        /// </summary>
-        [ExporterHeader(DisplayName ="供应商描述")]
-
-        public string SupplierDesc { get; set; }
-
-        /// <summary>
-        /// 供货比例
-        /// </summary>
-        [ExporterHeader(DisplayName ="供货比例")]
-      
-        public string SupplyProportion { set; get; }
-
-
-
-        /// <summary>
-        /// 比例供货价格
-        /// </summary>
-        [ExporterHeader(DisplayName = "供货比例价格")]
-        public decimal SupplyProportionPrice { get; set; }
-
-
-
-
-    }
-
-
-
-}
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/SecondaryMatching/SecondaryPriceRatioVersionDtoBase.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/SecondaryMatching/SecondaryPriceRatioVersionDtoBase.cs
deleted file mode 100644
index 6ff42fc6..00000000
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/SecondaryMatching/SecondaryPriceRatioVersionDtoBase.cs
+++ /dev/null
@@ -1,126 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Win.Sfs.Shared;
-using Win.Sfs.Shared.DtoBase;
-
-namespace Win.Sfs.SettleAccount.Entities.SecondaryMatching
-{
-  
-
-
-    /// <summary>
-    /// SecondaryPriceRatioVersion
-    /// </summary>
-    public class SecondaryPriceRatioVersionDtoBase : CreateOrUpdateEntityDtoBase<Guid>
-    {
-
-        public string Year { get; private set; }
-        /// <summary>
-        /// 期间
-        /// </summary>
-        public string Period { get; private set; }
-        /// <summary>
-        /// 版本号
-        /// </summary>
-        public string Version { get; private set; }
-
-        /// <summary>
-        /// 客户号
-        /// </summary>
-        public string CustomerCode { private set; get; }
-
-        /// <summary>
-        /// 工厂
-        /// </summary>
-        public string Factory { private set; get; }
-
-
-    }
-
-
-
-    public class SecondaryPriceRatioVersionDto : AuditedEntityDtoBase<Guid>
-    {
-        public string Year { get; set; }
-        /// <summary>
-        /// 期间
-        /// </summary>
-        public string Period { get;  set; }
-        /// <summary>
-        /// 版本号
-        /// </summary>
-        public string Version { get;  set; }
-
-        /// <summary>
-        /// 客户号
-        /// </summary>
-        public string CustomerCode {  set; get; }
-
-        /// <summary>
-        /// 工厂
-        /// </summary>
-        public string Factory {  set; get; }
-    }
-
-    public class SecondaryPriceRatioVersionCreateDto : SecondaryPriceRatioVersionDtoBase
-    { }
-    public class SecondaryPriceRatioVersionUpdateDto : SecondaryPriceRatioVersionDtoBase
-    { }
-    public class SecondaryPriceRatioVersionRequestDto : RequestDtoBase, IBranch<Guid>
-    {
-
-        public string Year { get;  set; }
-        /// <summary>
-        /// 期间
-        /// </summary>
-        public string Period { get;  set; }
-        /// <summary>
-        /// 版本号
-        /// </summary>
-        public string Version { get; set; }
-
-        /// <summary>
-        /// 客户号
-        /// </summary>
-        public string CustomerCode {  set; get; }
-        public Guid BranchId { get; set; }
-        /// <summary>
-        /// 工厂
-        /// </summary>
-        public string Factory { private set; get; }
-    }
-
-    public class SecondaryPriceRatioVersionImportDto
-    {
-
-        public string Year { get;  set; }
-        /// <summary>
-        /// 期间
-        /// </summary>
-        public string Period { get;  set; }
-        /// <summary>
-        /// 版本号
-        /// </summary>
-        public string Version { get; set; }
-
-        /// <summary>
-        /// 客户号
-        /// </summary>
-        public string CustomerCode { set; get; }
-
-
-        /// <summary>
-        /// 工厂
-        /// </summary>
-        public string Factory {  set; get; }
-
-
-    }
-
-
-
-
-}
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/SettlementCrossReferences/ISettlementCrossReferenceAppService.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/SettlementCrossReferences/ISettlementCrossReferenceAppService.cs
deleted file mode 100644
index 3dce6130..00000000
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/SettlementCrossReferences/ISettlementCrossReferenceAppService.cs
+++ /dev/null
@@ -1,110 +0,0 @@
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Mvc;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Volo.Abp.Application.Dtos;
-using Volo.Abp.Application.Services;
-using Win.Sfs.SettleAccount.Entities.ItemInvoicePrices;
-using Win.Sfs.SettleAccount.Entities.SettlementCrossReferences;
-using Win.Sfs.SettleAccount.EstimatedInventories;
-using Win.Sfs.Shared.ApplicationBase;
-namespace Win.Sfs.SettleAccount.SettlementCrossReferences
-{
-    public interface ISettlementCrossReferenceAppService
-    {
-
-        /// <summary>
-        /// ���빦��
-        /// </summary>
-        /// <param name="files">�ϴ����ļ�(ǰ���Ѿ�����ֻ���ϴ�һ������)</param>
-        /// <returns></returns>
-
-        Task<string> SettlementCrossReferenceUploadExcelImport([FromForm] IFormFileCollection files, Guid branchId, string year, string period, string version, string customerCode, string factory);
-
-
-
-
-        /// <summary>
-        /// ��ID��ȡΨһʵ��
-        /// </summary>
-        /// <remarks>
-        /// ����ʵ��ȫ������
-        /// </remarks>
-        /// <param name="id">ID</param>
-        /// <returns>ʵ��DTO</returns>
-
-
-        /// <summary>
-        /// ����ɸѡ������ȡʵ���б�
-        /// </summary>
-        /// <remarks>
-        /// ������������:ɸѡ�����б�,��������,��������,ҳ��
-        /// </remarks>
-        /// <param name="input">��������</param>
-        /// <returns>ʵ��DTO�б�</returns>
-
-        Task<PagedResultDto<SettlementCrossReferenceDto>> GetListAsync(SettlementCrossReferenceRequestDto input);
-
-
-        /// <summary>
-        /// ��ȡʵ������
-        /// </summary>
-        /// <returns>ʵ������</returns>
-
-        Task<long> GetTotalCountAsync(Guid branchId);
-
-
-        /// <summary>
-        /// ��ȡȫ��ʵ���б�
-        /// </summary>
-        /// <returns>ʵ��DTO�б�</returns>
-
-        //Task<ListResultDto<SettlementCrossReferenceDto>> GetAllAsync(Guid branchId);
-
-
-
-
-
-        /// <summary>
-        /// ����ʵ��
-        /// </summary>
-        /// <param name="input">����ʵ��DTO</param>
-        /// <returns>ʵ��DTO</returns>
-
-
-        Task<SettlementCrossReferenceDto> CreateAsync(SettlementCrossReferenceCreateDto input);
-
-
-        /// <summary>
-        /// �޸�ʵ��
-        /// </summary>
-        /// <param name="id">ID</param>
-        /// <param name="input">�޸�ʵ��DTO</param>
-        /// <returns>ʵ��DTO</returns>
-
-        Task<SettlementCrossReferenceDto> UpdateAsync(Guid id, SettlementCrossReferenceUpdateDto input);
-
-
-
-
-        ///// <summary>
-        ///// ɾ��ʵ��
-        ///// </summary>
-        ///// <param name="id">ID</param>
-        ///// <returns>��</returns>
-
-        //Task DeleteAsync(Guid id);
-
-
-        /// <summary>
-        /// ��IDsɾ��ʵ���б�
-        /// </summary>
-        /// <param name="ids">IDs</param>
-        /// <returns>�Ƿ�ִ�гɹ�</returns>
-
-        Task<bool> DeleteListAsync(List<Guid> ids);
-    }
-}
\ No newline at end of file
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/SettlementCrossReferences/ImportSettlementCrossReferenceDto.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/SettlementCrossReferences/ImportSettlementCrossReferenceDto.cs
deleted file mode 100644
index 1a1ed435..00000000
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/SettlementCrossReferences/ImportSettlementCrossReferenceDto.cs
+++ /dev/null
@@ -1,85 +0,0 @@
-// 闻荫智慧工厂管理套件
-// Copyright (c) 闻荫科技 www.ccwin-in.com
-
-using Magicodes.ExporterAndImporter.Core;
-using Magicodes.ExporterAndImporter.Excel;
-using System;
-using System.ComponentModel.DataAnnotations;
-using Win.Sfs.Shared;
-using Win.Sfs.Shared.Constant;
-using Win.Sfs.Shared.DtoBase;
-
-namespace Win.Sfs.SettleAccount.Entities.SettlementCrossReferences
-{
-
-    /// <summary>
-    /// 导入ImportSettlementCrossReferenceDto
-    /// IsLabelingError：是否标注数据错误
-    /// </summary>
-    [ImportProject(Name = SettleAccountModuleName.SettlementCrossReference)]
-    [ExcelImporter(IsLabelingError = true, MaxCount = int.MaxValue)]
-    public class ImportSettlementCrossReferenceDto
-    {
-         
-    
-        
-        /// <summary>
-        /// 车型
-        /// </summary>
-        [ImporterHeader(Name = "车型")]
-        [Display(Name = "车型")]
-        public string Model { set; get; }
-        
-
-        /// <summary>
-        /// 零件类型
-        /// </summary>
-        [ImporterHeader(Name = "零件类型")]
-        [Display(Name = "零件类型")]
-        public string PartType { get; set; }
-
-        /// <summary>
-        /// 总成结算号
-        /// </summary>
-        [ImporterHeader(Name = "总成结算号")]
-        [Display(Name = "总成结算号")]
-        public string SettlementMaterialCode { get; set; }
-
-        /// <summary>
-        /// BOM清单零件号
-        /// </summary>
-        [ImporterHeader(Name = "BOM清单零件号")]
-        [Display(Name = "BOM清单零件号")]
-        public string BomMaterialCode { get; set; }
-
-        ///// <summary>
-        ///// 零件名称
-        ///// </summary>
-        //[Display(Name = "零件名称")]
-        //public string MaterialDesc { get; set; }
-
-        /// <summary>
-        /// 供应商代码
-        /// </summary>
-        [ImporterHeader(Name = "供应商代码")]
-        [Display(Name = "供应商代码")]
-        public string SupplierCode { set; get; }
-        ///// <summary>
-        ///// 供应商名称
-        ///// </summary>
-        //[Display(Name = "供应商名称")]
-        //public string SupplierDesc { set; get; }
-        /// <summary>
-        /// 采购员
-        /// </summary>
-        [ImporterHeader(Name = "采购员")]
-        [Display(Name = "采购员")]
-        public string Buyer { set; get; }
-
-
-
-    }
- 
-
-
-}
\ No newline at end of file
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/SettlementCrossReferences/SettlementCrossReferenceCreateDto.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/SettlementCrossReferences/SettlementCrossReferenceCreateDto.cs
deleted file mode 100644
index f1845d74..00000000
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/SettlementCrossReferences/SettlementCrossReferenceCreateDto.cs
+++ /dev/null
@@ -1,75 +0,0 @@
-// 闻荫智慧工厂管理套件
-// Copyright (c) 闻荫科技 www.ccwin-in.com
-
-using System;
-using System.ComponentModel.DataAnnotations;
-using Win.Sfs.Shared;
-using Win.Sfs.Shared.Constant;
-using Win.Sfs.Shared.DtoBase;
- 
-namespace Win.Sfs.SettleAccount.Entities.SettlementCrossReferences
-{
-    public class SettlementCrossReferenceCreateDto : CreateOrUpdateEntityDtoBase<Guid>
-    {
-
-        /// <summary>
-        /// 期间
-        /// </summary>
-        [Display(Name = "期间")]
-        public string Period { set; get; }
-        /// <summary>
-        /// 车型
-        /// </summary>
-        [Display(Name = "车型")]
-        public string Model { set; get; }
-        /// <summary>
-        /// 工厂
-        /// </summary>
-        [Display(Name = "工厂")]
-        public string Factory { set; get; }
-
-
-        /// <summary>
-        /// 零件类型
-        /// </summary>
-        [Display(Name = "零件类型")]
-        public string PartType { get; set; }
-
-        /// <summary>
-        /// 总成结算号
-        /// </summary>
-        [Display(Name = "总成结算号")]
-        public string SettlementMaterialCode { get; set; }
-
-        /// <summary>
-        /// BOM清单零件号
-        /// </summary>
-        [Display(Name = "BOM清单零件号")]
-        public string BomMaterialCode { get; set; }
-
-        /// <summary>
-        /// 零件名称
-        /// </summary>
-        [Display(Name = "零件名称")]
-        public string MaterialDesc { get; set; }
-
-        /// <summary>
-        /// 供应商代码
-        /// </summary>
-        [Display(Name = "供应商代码")]
-        public string SupplierCode { set; get; }
-        /// <summary>
-        /// 供应商名称
-        /// </summary>
-        [Display(Name = "供应商名称")]
-        public string SupplierDesc { set; get; }
-        /// <summary>
-        /// 采购员
-        /// </summary>
-        [Display(Name = "采购员")]
-        public string Buyer { set; get; }
-
-
-
-    }
-}
\ No newline at end of file
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/SettlementCrossReferences/SettlementCrossReferenceDto.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/SettlementCrossReferences/SettlementCrossReferenceDto.cs
deleted file mode 100644
index 8f537f84..00000000
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/SettlementCrossReferences/SettlementCrossReferenceDto.cs
+++ /dev/null
@@ -1,75 +0,0 @@
-// 闻荫智慧工厂管理套件
-// Copyright (c) 闻荫科技 www.ccwin-in.com
-
-using System;
-using System.ComponentModel.DataAnnotations;
-using Win.Sfs.Shared;
-using Win.Sfs.Shared.Constant;
-using Win.Sfs.Shared.DtoBase;
- 
-namespace Win.Sfs.SettleAccount.Entities.SettlementCrossReferences
-{
-    public class SettlementCrossReferenceDto : AuditedEntityDtoBase<Guid>, IBranch<Guid>
-    {
-
-        /// <summary>
-        /// 期间
-        /// </summary>
-        [Display(Name = "期间")]
-        public string Period { set; get; }
-        /// <summary>
-        /// 车型
-        /// </summary>
-        [Display(Name = "车型")]
-        public string Model { set; get; }
-        /// <summary>
-        /// 工厂
-        /// </summary>
-        [Display(Name = "工厂")]
-        public string Factory { set; get; }
-
-
-        /// <summary>
-        /// 零件类型
-        /// </summary>
-        [Display(Name = "零件类型")]
-        public string PartType { get; set; }
-
-        /// <summary>
-        /// 总成结算号
-        /// </summary>
-        [Display(Name = "总成结算号")]
-        public string SettlementMaterialCode { get; set; }
-
-        /// <summary>
-        /// BOM清单零件号
-        /// </summary>
-        [Display(Name = "BOM清单零件号")]
-        public string BomMaterialCode { get; set; }
-
-        /// <summary>
-        /// 零件名称
-        /// </summary>
-        [Display(Name = "零件名称")]
-        public string MaterialDesc { get; set; }
-
-        /// <summary>
-        /// 供应商代码
-        /// </summary>
-        [Display(Name = "供应商代码")]
-        public string SupplierCode { set; get; }
-        /// <summary>
-        /// 供应商名称
-        /// </summary>
-        [Display(Name = "供应商名称")]
-        public string SupplierDesc { set; get; }
-        /// <summary>
-        /// 采购员
-        /// </summary>
-        [Display(Name = "采购员")]
-        public string Buyer { set; get; }
-        public string  Version { get; set; }
-        public string CustomerCode { get; set; }
-        public Guid BranchId { get ; set; }
-    }
-}
\ No newline at end of file
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/SettlementCrossReferences/SettlementCrossReferenceExportDto.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/SettlementCrossReferences/SettlementCrossReferenceExportDto.cs
deleted file mode 100644
index 78f353ee..00000000
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/SettlementCrossReferences/SettlementCrossReferenceExportDto.cs
+++ /dev/null
@@ -1,73 +0,0 @@
-// 闻荫智慧工厂管理套件
-// Copyright (c) 闻荫科技 www.ccwin-in.com
-
-using Magicodes.ExporterAndImporter.Core;
-using System;
-using System.ComponentModel.DataAnnotations;
-using Win.Sfs.Shared;
-using Win.Sfs.Shared.Constant;
-using Win.Sfs.Shared.DtoBase;
- 
-namespace Win.Sfs.SettleAccount.Entities.SettlementCrossReferences
-{
-    public class SettlementCrossReferenceExportDto
-    {
-
-        /// <summary>
-        /// 期间
-        /// </summary>
-        [ExporterHeader(DisplayName = "期间")]
-        public string Period { set; get; }
-        /// <summary>
-        /// 车型
-        /// </summary>
-        [ExporterHeader(DisplayName = "车型")]
-        public string Model { set; get; }
-        /// <summary>
-        /// 工厂
-        /// </summary>
-        [ExporterHeader(DisplayName = "工厂")]
-        public string Factory { set; get; }
-
-
-        /// <summary>
-        /// 零件类型
-        /// </summary>
-        [ExporterHeader(DisplayName = "零件类型")]
-        public string PartType { get; set; }
-
-        /// <summary>
-        /// 总成结算号
-        /// </summary>
-        [ExporterHeader(DisplayName = "总成结算号")]
-        public string SettlementMaterialCode { get; set; }
-
-        /// <summary>
-        /// BOM清单零件号
-        /// </summary>
-        [ExporterHeader(DisplayName = "BOM清单零件号")]
-        public string BomMaterialCode { get; set; }
-
-        /// <summary>
-        /// 零件名称
-        /// </summary>
-        [ExporterHeader(DisplayName = "零件名称")]
-        public string MaterialDesc { get; set; }
-
-        /// <summary>
-        /// 供应商代码
-        /// </summary>
-        [ExporterHeader(DisplayName = "供应商代码")]
-        public string SupplierCode { set; get; }
-        /// <summary>
-        /// 供应商名称
-        /// </summary>
-        [ExporterHeader(DisplayName = "供应商名称")]
-        public string SupplierDesc { set; get; }
-        /// <summary>
-        /// 采购员
-        /// </summary>
-        [ExporterHeader(DisplayName = "采购员")]
-        public string Buyer { set; get; }
-    }
-}
\ No newline at end of file
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/SettlementCrossReferences/SettlementCrossReferenceRequestDto.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/SettlementCrossReferences/SettlementCrossReferenceRequestDto.cs
deleted file mode 100644
index 93f9ed24..00000000
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/SettlementCrossReferences/SettlementCrossReferenceRequestDto.cs
+++ /dev/null
@@ -1,85 +0,0 @@
-// 闻荫智慧工厂管理套件
-// Copyright (c) 闻荫科技 www.ccwin-in.com
-
-using System;
-using System.ComponentModel.DataAnnotations;
-using Win.Sfs.Shared;
-using Win.Sfs.Shared.Constant;
-using Win.Sfs.Shared.DtoBase;
- 
-namespace Win.Sfs.SettleAccount.Entities.SettlementCrossReferences
-{
-    public class SettlementCrossReferenceRequestDto : RequestDtoBase, IBranch<Guid>
-    {
-
-        /// <summary>
-        /// 版本
-        /// </summary>
-        [Display(Name = "版本")]
-        public string Version { set; get; }
-        /// <summary>
-        /// 期间
-        /// </summary>
-        [Display(Name = "期间")]
-        public string Period { set; get; }
-        /// <summary>
-        /// 车型
-        /// </summary>
-        [Display(Name = "车型")]
-        public string Model { set; get; }
-        /// <summary>
-        /// 工厂
-        /// </summary>
-        [Display(Name = "工厂")]
-        public string Factory { set; get; }
-
-
-        /// <summary>
-        /// 零件类型
-        /// </summary>
-        [Display(Name = "零件类型")]
-        public string PartType { get; set; }
-
-        /// <summary>
-        /// 总成结算号
-        /// </summary>
-        [Display(Name = "总成结算号")]
-        public string SettlementMaterialCode { get; set; }
-
-        /// <summary>
-        /// BOM清单零件号
-        /// </summary>
-        [Display(Name = "BOM清单零件号")]
-        public string BomMaterialCode { get; set; }
-
-        /// <summary>
-        /// 零件名称
-        /// </summary>
-        [Display(Name = "零件名称")]
-        public string MaterialDesc { get; set; }
-
-        /// <summary>
-        /// 供应商代码
-        /// </summary>
-        [Display(Name = "供应商代码")]
-        public string SupplierCode { set; get; }
-        /// <summary>
-        /// 供应商名称
-        /// </summary>
-        [Display(Name = "供应商名称")]
-        public string SupplierDesc { set; get; }
-        /// <summary>
-        /// 采购员
-        /// </summary>
-        [Display(Name = "采购员")]
-        public string Buyer { set; get; }
-
-
-        public virtual Guid ParentId { get; set; }
-        public virtual Guid BranchId { get; set; }
-
-        public virtual Guid UserId { get; set; }
-
-        public virtual int FileType { get; set; }
-    }
-}
\ No newline at end of file
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/SettlementCrossReferences/SettlementCrossReferenceUpdateDto.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/SettlementCrossReferences/SettlementCrossReferenceUpdateDto.cs
deleted file mode 100644
index 9481e293..00000000
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/SettlementCrossReferences/SettlementCrossReferenceUpdateDto.cs
+++ /dev/null
@@ -1,75 +0,0 @@
-// 闻荫智慧工厂管理套件
-// Copyright (c) 闻荫科技 www.ccwin-in.com
-
-using System;
-using System.ComponentModel.DataAnnotations;
-using Win.Sfs.Shared;
-using Win.Sfs.Shared.Constant;
-using Win.Sfs.Shared.DtoBase;
- 
-namespace Win.Sfs.SettleAccount.Entities.SettlementCrossReferences
-{
-    public class SettlementCrossReferenceUpdateDto :  CreateOrUpdateEntityDtoBase<Guid>
-    {
-
-        /// <summary>
-        /// 期间
-        /// </summary>
-        [Display(Name = "期间")]
-        public string Period { set; get; }
-        /// <summary>
-        /// 车型
-        /// </summary>
-        [Display(Name = "车型")]
-        public string Model { set; get; }
-        /// <summary>
-        /// 工厂
-        /// </summary>
-        [Display(Name = "工厂")]
-        public string Factory { set; get; }
-
-
-        /// <summary>
-        /// 零件类型
-        /// </summary>
-        [Display(Name = "零件类型")]
-        public string PartType { get; set; }
-
-        /// <summary>
-        /// 总成结算号
-        /// </summary>
-        [Display(Name = "总成结算号")]
-        public string SettlementMaterialCode { get; set; }
-
-        /// <summary>
-        /// BOM清单零件号
-        /// </summary>
-        [Display(Name = "BOM清单零件号")]
-        public string BomMaterialCode { get; set; }
-
-        /// <summary>
-        /// 零件名称
-        /// </summary>
-        [Display(Name = "零件名称")]
-        public string MaterialDesc { get; set; }
-
-        /// <summary>
-        /// 供应商代码
-        /// </summary>
-        [Display(Name = "供应商代码")]
-        public string SupplierCode { set; get; }
-        /// <summary>
-        /// 供应商名称
-        /// </summary>
-        [Display(Name = "供应商名称")]
-        public string SupplierDesc { set; get; }
-        /// <summary>
-        /// 采购员
-        /// </summary>
-        [Display(Name = "采购员")]
-        public string Buyer { set; get; }
-
-
-
-    }
-}
\ No newline at end of file
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/SettlementCrossReferences/SettlementCrossReferenceVersionDto.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/SettlementCrossReferences/SettlementCrossReferenceVersionDto.cs
deleted file mode 100644
index c88460bc..00000000
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/SettlementCrossReferences/SettlementCrossReferenceVersionDto.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-// 闻荫智慧工厂管理套件
-// Copyright (c) 闻荫科技 www.ccwin-in.com
-
-using System;
-using System.ComponentModel.DataAnnotations;
-using Win.Sfs.Shared;
-using Win.Sfs.Shared.Constant;
-using Win.Sfs.Shared.DtoBase;
- 
-namespace Win.Sfs.SettleAccount.Entities.SettlementCrossReferences
-{
-    public class SettlementCrossReferenceVersionDto : RequestDtoBase, IBranch<Guid>
-    {
-
-        public string Year { get; private set; }
-        /// <summary>
-        /// 期间
-        /// </summary>
-        public string Period { get; private set; }
-        /// <summary>
-        /// 版本号
-        /// </summary>
-        public string Version { get; private set; }
-
-
-        public Guid BranchId { get; set; }
-    }
-}
\ No newline at end of file
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/SettlementCrossReferences/SettlementCrossReferenceVersionRequestDto.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/SettlementCrossReferences/SettlementCrossReferenceVersionRequestDto.cs
deleted file mode 100644
index cf7fc3b9..00000000
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/SettlementCrossReferences/SettlementCrossReferenceVersionRequestDto.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-// 闻荫智慧工厂管理套件
-// Copyright (c) 闻荫科技 www.ccwin-in.com
-
-using System;
-using System.ComponentModel.DataAnnotations;
-using Win.Sfs.Shared;
-using Win.Sfs.Shared.Constant;
-using Win.Sfs.Shared.DtoBase;
- 
-namespace Win.Sfs.SettleAccount.Entities.SettlementCrossReferences
-{
-    public class SettlementCrossReferenceVersionRequestDto : RequestDtoBase, IBranch<Guid>
-    {
-
-        public string Year { get; private set; }
-        /// <summary>
-        /// 期间
-        /// </summary>
-        public string Period { get; private set; }
-        /// <summary>
-        /// 版本号
-        /// </summary>
-        public string Version { get; private set; }
-
-
-        public Guid BranchId { get; set; }
-    }
-}
\ No newline at end of file
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/SettlementPakAndSparePartss/ISettlementPakAndSparePartsAppService.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/SettlementPakAndSparePartss/ISettlementPakAndSparePartsAppService.cs
index d45ad757..cd9e3e49 100644
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/SettlementPakAndSparePartss/ISettlementPakAndSparePartsAppService.cs
+++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/SettlementPakAndSparePartss/ISettlementPakAndSparePartsAppService.cs
@@ -10,7 +10,6 @@ using Volo.Abp.Application.Services;
 using Win.Sfs.SettleAccount.Entities.InventoryDetialVersion;
 using Win.Sfs.SettleAccount.Entities.SettlementParts;
 using Win.Sfs.SettleAccount.Entities.SettlementPartss;
-using Win.Sfs.SettleAccount.EstimatedInventories;
 using Win.Sfs.SettleAccount.Inventories;
 using Win.Sfs.Shared.ApplicationBase;
 
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/SettlementParts/ISettlementPartAppService.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/SettlementParts/ISettlementPartAppService.cs
index d5347226..2a26f8c3 100644
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/SettlementParts/ISettlementPartAppService.cs
+++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/SettlementParts/ISettlementPartAppService.cs
@@ -8,7 +8,6 @@ using System.Threading.Tasks;
 using Volo.Abp.Application.Dtos;
 using Volo.Abp.Application.Services;
 using Win.Sfs.SettleAccount.Entities.InventoryDetialVersion;
-using Win.Sfs.SettleAccount.EstimatedInventories;
 using Win.Sfs.SettleAccount.Inventories;
 using Win.Sfs.Shared.ApplicationBase;
 
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/UnSettleAccounts/ISettleAccountAppService.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/UnSettleAccounts/ISettleAccountAppService.cs
deleted file mode 100644
index f029f95c..00000000
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/UnSettleAccounts/ISettleAccountAppService.cs
+++ /dev/null
@@ -1,131 +0,0 @@
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Mvc;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Volo.Abp.Application.Dtos;
-using Volo.Abp.Application.Services;
-using Win.Sfs.SettleAccount.Entities.SettleAccountVersion;
-
-using Win.Sfs.Shared.ApplicationBase;
-
-namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
-{
-    public interface IUnSettleAccountAppService
-      
-    {
-
-
-
-        /// <summary>
-        /// 导入功能
-        /// </summary>
-        /// <param name="files">上传的文件(前端已经限制只能上传一个附件)</param>
-        /// <returns></returns>
-
-        Task<string> UnSettleAccountUploadExcelImport([FromForm] IFormFileCollection files, Guid branchId, string year, string period, string version, string customerCode,string factory);
-
-
-
-
-        /// <summary>
-        /// 按ID获取唯一实体
-        /// </summary>
-        /// <remarks>
-        /// 返回实体全部属性
-        /// </remarks>
-        /// <param name="id">ID</param>
-        /// <returns>实体DTO</returns>
-
-        Task<UnSettleAccountDto> GetAsync(Guid id);
-
-        /// <summary>
-        /// 根据筛选条件获取实体列表
-        /// </summary>
-        /// <remarks>
-        /// 请求条件包括:筛选条件列表,排序条件,数据数量,页码
-        /// </remarks>
-        /// <param name="input">请求条件</param>
-        /// <returns>实体DTO列表</returns>
-
-        Task<PagedResultDto<UnSettleAccountDto>> GetListAsync(Guid parentId, UnSettleAccountRequestDto input);
-
-
-
-
-        /// <summary>
-        /// 根据筛选条件获取实体列表
-        /// </summary>
-        /// <remarks>
-        /// 请求条件包括:筛选条件列表,排序条件,数据数量,页码
-        /// </remarks>
-        /// <param name="input">请求条件</param>
-        /// <returns>实体DTO列表</returns>
-
-        Task<PagedResultDto<UnSettleAccountVersionDto>> GetVersionListAsync(UnSettleAccountVersionRequestDto input);
-
-
-
-
-        /// <summary>
-        /// 获取实体总数
-        /// </summary>
-        /// <returns>实体总数</returns>
-
-        Task<long> GetTotalCountAsync(Guid branchId);
-
-
-        ///// <summary>
-        ///// 获取全部实体列表
-        ///// </summary>
-        ///// <returns>实体DTO列表</returns>
-
-        //Task<ListResultDto<SettleAccountDto>> GetAllAsync(Guid branchId);
-
-
-
-
-
-        ///// <summary>
-        ///// 新增实体
-        ///// </summary>
-        ///// <param name="input">新增实体DTO</param>
-        ///// <returns>实体DTO</returns>
-
-
-        //Task<SettleAccountDto> CreateAsync(SettleAccountCreateDto input);
-
-
-        ///// <summary>
-        ///// 修改实体
-        ///// </summary>
-        ///// <param name="id">ID</param>
-        ///// <param name="input">修改实体DTO</param>
-        ///// <returns>实体DTO</returns>
-
-        //Task<SettleAccountDto> UpdateAsync(Guid id, SettleAccountUpdateDto input);
-
-
-
-
-        ///// <summary>
-        ///// 删除实体
-        ///// </summary>
-        ///// <param name="id">ID</param>
-        ///// <returns>无</returns>
-
-        //Task DeleteAsync(Guid id);
-
-
-        /// <summary>
-        /// 按IDs删除实体列表
-        /// </summary>
-        /// <param name="ids">IDs</param>
-        /// <returns>是否执行成功</returns>
-
-        Task<bool> DeleteListAsync(List<Guid> ids);
-
-    }
-}
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/UnSettleAccounts/UnSettleAccountCreateDto.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/UnSettleAccounts/UnSettleAccountCreateDto.cs
deleted file mode 100644
index fc35422e..00000000
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/UnSettleAccounts/UnSettleAccountCreateDto.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Win.Sfs.Shared;
-using Win.Sfs.Shared.DomainBase;
-
-namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
-{
-    public class UnSettleAccountCreateDto : SettleAccountDtoBase, IBranch<Guid>
-    {
-        public virtual Guid BranchId { get ; set ; }
-    }
-}
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/UnSettleAccounts/UnSettleAccountDto.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/UnSettleAccounts/UnSettleAccountDto.cs
deleted file mode 100644
index 9223ea28..00000000
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/UnSettleAccounts/UnSettleAccountDto.cs
+++ /dev/null
@@ -1,83 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Win.Sfs.Shared;
-using Win.Sfs.Shared.DomainBase;
-using Win.Sfs.Shared.DtoBase;
-
-namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
-{
-    public  class UnSettleAccountDto:  AuditedEntityDtoBase<Guid>, IBranch<Guid>
-    {
-
-
-
-        /// <summary>
-        /// 期间
-        /// </summary>
-        public string Period { set; get; }
-
-
-
-        /// <summary>
-        /// 年份
-        /// </summary>
-        public string SettleYear { set; get; }
-
-        /// <summary>
-        /// 年份
-        /// </summary>
-        public virtual  string Year { set; get; }
-        /// <summary>
-        /// KENEN号
-        /// </summary>
-        public virtual  string KENNCode { set; get; }
-        /// <summary>
-        /// 底盘号
-        /// </summary>
-        public virtual  string ChassisNumber { set; get; }
-        /// <summary>
-        /// 车型
-        /// </summary>
-        public virtual  string Model { set; get; }
-        /// <summary>
-        /// CP5A日期
-        /// </summary>
-        public virtual  DateTime CP5A { set; get; }
-        /// <summary>
-        /// CP7
-        /// </summary>
-        public virtual  DateTime CP7 { set; get; }
-
-        /// <summary>
-        /// 零件号
-        /// </summary>
-        public virtual  string MaterialCode { get; set; }
-        /// <summary>
-        /// 数量
-        /// </summary>
-        public virtual  decimal Qty { get; set; }
-        /// <summary>
-        /// 结算标识
-        /// </summary>
-
-        public virtual  string SettlementID { get; set; }
-
-        /// <summary>
-        /// 结算供应商
-        /// </summary>
-        public virtual  string SettlementSupplier { get; set; }
-
-
-        public virtual string State { get; set; }
-
-        public virtual  Guid BranchId { get ; set ; }
-
-
-        public virtual string Version { get; set; }
-
-        public string UnsettledReason { get; set; }
-    }
-}
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/UnSettleAccounts/UnSettleAccountDtoBase.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/UnSettleAccounts/UnSettleAccountDtoBase.cs
deleted file mode 100644
index 4ee60537..00000000
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/UnSettleAccounts/UnSettleAccountDtoBase.cs
+++ /dev/null
@@ -1,73 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Win.Sfs.Shared.DomainBase;
-using Win.Sfs.Shared.DtoBase;
-
-namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
-{
-    public  class UnSettleAccountDtoBase: CreateOrUpdateEntityDtoBase<Guid>
-    {
-
-        /// <summary>
-        /// 期间
-        /// </summary>
-        public string Period { set; get; }
-
-
-
-        /// <summary>
-        /// 年份
-        /// </summary>
-        public string SettleYear { set; get; }
-        /// <summary>
-        /// 年份
-        /// </summary>
-        public virtual  string Year { set; get; }
-        /// <summary>
-        /// KENEN号
-        /// </summary>
-        public virtual string KENNCode { set; get; }
-        /// <summary>
-        /// 底盘号
-        /// </summary>
-        public virtual string ChassisNumber { set; get; }
-        /// <summary>
-        /// 车型
-        /// </summary>
-        public virtual string Model { set; get; }
-        /// <summary>
-        /// CP5A日期
-        /// </summary>
-        public virtual DateTime CP5A { set; get; }
-        /// <summary>
-        /// CP7
-        /// </summary>
-        public virtual DateTime CP7 { set; get; }
-
-        /// <summary>
-        /// 零件号
-        /// </summary>
-        public virtual string MaterialCode { get; set; }
-        /// <summary>
-        /// 数量
-        /// </summary>
-        public virtual decimal Qty { get; set; }
-        /// <summary>
-        /// 结算标识
-        /// </summary>
-
-        public virtual string SettlementID { get; set; }
-
-        /// <summary>
-        /// 结算供应商
-        /// </summary>
-        public virtual string SettlementSupplier { get; set; }
-
-        public string UnsettledReason { get; set; }
-
-
-    }
-}
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/UnSettleAccounts/UnSettleAccountExportDto.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/UnSettleAccounts/UnSettleAccountExportDto.cs
deleted file mode 100644
index 37e4eb0f..00000000
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/UnSettleAccounts/UnSettleAccountExportDto.cs
+++ /dev/null
@@ -1,88 +0,0 @@
-using Magicodes.ExporterAndImporter.Core;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Win.Sfs.Shared.DomainBase;
-
-namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
-{
-    public  class UnSettleAccountExportDto
-    {
-
-        [ExporterHeader(DisplayName = "版本")]
-        public string Version { set; get; }
-
-
-        /// <summary>
-        /// 期间
-        /// </summary>
-
-
-        //[ExporterHeader(DisplayName = "期间")]
-        //public string Period { set; get; }
-
-        ///// <summary>
-        ///// 年份
-        ///// </summary>
-        //[ExporterHeader(DisplayName = "年份")]
-        //public string SettleYear { set; get; }
-
-        /// <summary>
-        /// KENEN号
-        /// </summary>
-        [ExporterHeader(DisplayName = "KENN号")]
-        public virtual  string KENNCode { set; get; }
-        /// <summary>
-        /// 底盘号
-        /// </summary>
-        [ExporterHeader(DisplayName = "底盘号")]
-
-        public virtual  string ChassisNumber { set; get; }
-        /// <summary>
-        /// 车型
-        /// </summary>
-        [ExporterHeader(DisplayName = "车型")]
-
-        public virtual  string Model { set; get; }
-        /// <summary>
-        /// CP5A日期
-        /// </summary>
-        [ExporterHeader(DisplayName = "CP5日期")]
-        public virtual  DateTime CP5A { set; get; }
-        /// <summary>
-        /// CP7
-        /// </summary>
-        [ExporterHeader(DisplayName = "CP7日期")]
-        public virtual  DateTime CP7 { set; get; }
-
-        /// <summary>
-        /// 零件号
-        /// </summary>
-        [ExporterHeader(DisplayName = "零件号")]
-
-        public virtual  string MaterialCode { get; set; }
-        /// <summary>
-        /// 数量
-        /// </summary>
-        [ExporterHeader(DisplayName = "数量")]
-        public virtual  decimal Qty { get; set; }
-        /// <summary>
-        /// 结算标识
-        /// </summary>
-        [ExporterHeader(DisplayName = "结算标识")]
-        public virtual  string SettlementID { get; set; }
-
-        /// <summary>
-        /// 结算供应商
-        /// </summary>
-        [ExporterHeader(DisplayName = "结算供应商")]
-
-        public virtual  string SettlementSupplier { get; set; }
-
-
-        [ExporterHeader(DisplayName = "未结算原因")]
-        public string UnsettledReason { get; set; }
-    }
-}
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/UnSettleAccounts/UnSettleAccountImportDto.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/UnSettleAccounts/UnSettleAccountImportDto.cs
deleted file mode 100644
index 1b2eb0be..00000000
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/UnSettleAccounts/UnSettleAccountImportDto.cs
+++ /dev/null
@@ -1,82 +0,0 @@
-using Magicodes.ExporterAndImporter.Core;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Win.Sfs.Shared.DomainBase;
-
-namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
-{
-    public  class UnSettleAccountImportDto
-    {
-
-        /// <summary>
-        /// 期间
-        /// </summary>
-       // public string Period { set; get; }
-
-        /// <summary>
-        /// 年份
-        /// </summary>
-        [ImporterHeader(Name = "年份")]
-        public string SettleYear { set; get; }
-        /// <summary>
-        /// 年份
-        /// </summary>
-        //public virtual  string Year { set; get; }
-        /// <summary>
-        /// KENEN号
-        /// </summary>
-        [ImporterHeader(Name = "KENN号")]
-        public virtual  string KENNCode { set; get; }
-        /// <summary>
-        /// 底盘号
-        /// </summary>
-        [ImporterHeader(Name = "底盘号")]
-        public virtual  string ChassisNumber { set; get; }
-        /// <summary>
-        /// 车型
-        /// </summary>
-        [ImporterHeader(Name = "车型")]
-        public virtual  string Model { set; get; }
-        /// <summary>
-        /// CP5A日期
-        /// </summary>
-        [ImporterHeader(Name = "CP5A日期")]
-        public virtual  DateTime CP5A { set; get; }
-        /// <summary>
-        /// CP7
-        /// </summary>
-        [ImporterHeader(Name = "CP7日期")]
-        public virtual DateTime? CP7 { set; get; }
-
-        /// <summary>
-        /// 零件号
-        /// </summary>
-        [ImporterHeader(Name = "零件号",FixAllSpace =true)]
-        public virtual  string MaterialCode { get; set; }
-        /// <summary>
-        /// 数量
-        /// </summary>
-        [ImporterHeader(Name = "数量")]
-        public virtual  decimal Qty { get; set; }
-        /// <summary>
-        /// 结算标识
-        /// </summary>
-        [ImporterHeader(Name = "结算标识")]
-        public virtual  string SettlementID { get; set; }
-
-        /// <summary>
-        /// 结算供应商
-        /// </summary>
-        [ImporterHeader(Name = "结算供应商")]
-        public virtual  string SettlementSupplier { get; set; }
-
-        /// <summary>
-        /// 未结算原因
-        /// </summary>
-        [ImporterHeader(Name = "未结算原因")]
-        public string UnsettledReason { get; set; }
-    }
-}
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/UnSettleAccounts/UnSettleAccountRequestDto.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/UnSettleAccounts/UnSettleAccountRequestDto.cs
deleted file mode 100644
index e59dc781..00000000
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/UnSettleAccounts/UnSettleAccountRequestDto.cs
+++ /dev/null
@@ -1,81 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Win.Sfs.Shared;
-using Win.Sfs.Shared.DomainBase;
-using Win.Sfs.Shared.DtoBase;
-
-namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
-{
-    public   class UnSettleAccountRequestDto: RequestDtoBase, IBranch<Guid>
-    {
-
-        /// <summary>
-        /// 期间
-        /// </summary>
-        public string Period { set; get; }
-
-
-
-        /// <summary>
-        /// 年份
-        /// </summary>
-        public string SettleYear { set; get; }
-        /// <summary>
-        /// 年份
-        /// </summary>
-        public virtual  string Year { set; get; }
-        /// <summary>
-        /// KENEN号
-        /// </summary>
-        public virtual  string KENNCode { set; get; }
-        /// <summary>
-        /// 底盘号
-        /// </summary>
-        public virtual  string ChassisNumber { set; get; }
-        /// <summary>
-        /// 车型
-        /// </summary>
-        public virtual  string Model { set; get; }
-        /// <summary>
-        /// CP5A日期
-        /// </summary>
-        public virtual  DateTime CP5A { set; get; }
-        /// <summary>
-        /// CP7
-        /// </summary>
-        public virtual  DateTime CP7 { set; get; }
-
-        /// <summary>
-        /// 零件号
-        /// </summary>
-        public virtual  string MaterialCode { get; set; }
-        /// <summary>
-        /// 数量
-        /// </summary>
-        public virtual  decimal Qty { get; set; }
-        /// <summary>
-        /// 结算标识
-        /// </summary>
-
-        public virtual  string SettlementID { get; set; }
-
-        /// <summary>
-        /// 结算供应商
-        /// </summary>
-        public virtual  string SettlementSupplier { get; set; }
-
-        public string UnsettledReason { get; set; }
-        public virtual Guid ParentId { get; set; }
-        public virtual  Guid BranchId { get; set ; }
-
-        public virtual Guid UserId { get; set; }
-
-        public virtual int FileType { get; set; }
-
-        public virtual string Version { get; set; }
-
-    }
-}
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/UnSettleAccounts/UnSettleAccountUpdateDto.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/UnSettleAccounts/UnSettleAccountUpdateDto.cs
deleted file mode 100644
index 9af35ee9..00000000
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/UnSettleAccounts/UnSettleAccountUpdateDto.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Win.Sfs.Shared.DomainBase;
-
-namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
-{
-    public class UnSettleAccountUpdateDto: SettleAccountDtoBase
-    {
-       
-
-
-    }
-}
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/UnSettleAccounts/UnSettleAccountVersionDtoBase.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/UnSettleAccounts/UnSettleAccountVersionDtoBase.cs
deleted file mode 100644
index 296e0a64..00000000
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/UnSettleAccounts/UnSettleAccountVersionDtoBase.cs
+++ /dev/null
@@ -1,103 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Win.Sfs.Shared;
-using Win.Sfs.Shared.DomainBase;
-using Win.Sfs.Shared.DtoBase;
-
-namespace Win.Sfs.SettleAccount.Entities.SettleAccountVersion
-{
-    /// <summary>
-    /// SettleAccountVersion
-    /// </summary>
-    public class UnSettleAccountVersionDtoBase : CreateOrUpdateEntityDtoBase<Guid>
-    {
-
-        public string Year { get; private set; }
-        /// <summary>
-        /// 期间
-        /// </summary>
-        public string Period { get; private set; }
-        /// <summary>
-        /// 版本号
-        /// </summary>
-        public string Version { get; private set; }
-
-        /// <summary>
-        /// 客户号
-        /// </summary>
-        public string CustomerCode { private set; get; }
-
-
-    }
-
-
-
-    public class UnSettleAccountVersionDto : AuditedEntityDtoBase<Guid>, IBranch<Guid>
-    {
-        public string Year { get;  set; }
-        /// <summary>
-        /// 期间
-        /// </summary>
-        public string Period { get; set; }
-        /// <summary>
-        /// 版本号
-        /// </summary>
-        public string Version { get; set; }
-
-        /// <summary>
-        /// 客户号
-        /// </summary>
-        public string CustomerCode {  set; get; }
-        public Guid BranchId { get ; set; }
-    }
-
-    public class UnSettleAccountVersionCreateDto : SettleAccountVersionDtoBase
-    { }
-    public class UnSettleAccountVersionUpdateDto : SettleAccountVersionDtoBase
-    { }
-    public class UnSettleAccountVersionRequestDto : RequestDtoBase, IBranch<Guid>
-    {
-
-        public string Year { get; private set; }
-        /// <summary>
-        /// 期间
-        /// </summary>
-        public string Period { get; private set; }
-        /// <summary>
-        /// 版本号
-        /// </summary>
-        public string Version { get; private set; }
-
-        /// <summary>
-        /// 客户号
-        /// </summary>
-        public string CustomerCode { private set; get; }
-        public Guid BranchId { get ; set ; }
-    }
-
-    public class UnSettleAccountVersionImportDto 
-    {
-
-        public string Year { get; private set; }
-        /// <summary>
-        /// 期间
-        /// </summary>
-        public string Period { get; private set; }
-        /// <summary>
-        /// 版本号
-        /// </summary>
-        public string Version { get; private set; }
-
-        /// <summary>
-        /// 客户号
-        /// </summary>
-        public string CustomerCode { private set; get; }
-
-
-    }
-
-
-}
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/VWScrapClaims/IScrapClaimsAppService.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/VWScrapClaims/IScrapClaimsAppService.cs
deleted file mode 100644
index 28a18ca3..00000000
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/VWScrapClaims/IScrapClaimsAppService.cs
+++ /dev/null
@@ -1,94 +0,0 @@
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Mvc;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Volo.Abp.Application.Dtos;
-
-namespace Win.Sfs.SettleAccount.Entities.VWScrapClaims
-{
-    /// <summary>
-    /// 报废与索赔
-    /// </summary>
-    public interface IScrapClaimsAppService
-    {
-        /// <summary>
-        /// 导入功能
-        /// </summary>
-        /// <param name="files">上传的文件(前端已经限制只能上传一个附件)</param>
-        /// <returns></returns>
-
-        Task<string> ScrapClaimsUploadExcelImport([FromForm] IFormFileCollection files, Guid branchId,
-            string year, string period, string version, string customerCode);
-
-        /// <summary>
-        /// 按ID获取唯一实体
-        /// </summary>
-        /// <remarks>
-        /// 返回实体全部属性
-        /// </remarks>
-        /// <param name="id">ID</param>
-        /// <returns>实体DTO</returns>
-
-        Task<ScrapClaimsDto> GetAsync(Guid id);
-
-        /// <summary>
-        /// 根据筛选条件获取实体列表
-        /// </summary>
-        /// <remarks>
-        /// 请求条件包括:筛选条件列表,排序条件,数据数量,页码
-        /// </remarks>
-        /// <param name="input">请求条件</param>
-        /// <returns>实体DTO列表</returns>
-
-        Task<PagedResultDto<ScrapClaimsDto>> GetListAsync(ScrapClaimsRequestDto input);
-
-
-
-
-        /// <summary>
-        /// 根据筛选条件获取实体列表
-        /// </summary>
-        /// <remarks>
-        /// 请求条件包括:筛选条件列表,排序条件,数据数量,页码
-        /// </remarks>
-        /// <param name="input">请求条件</param>
-        /// <returns>实体DTO列表</returns>
-
-        Task<PagedResultDto<ScrapClaimsVersionDto>> GetVersionListAsync(ScrapClaimsVersionRequestDto input);
-
-
-        Task<string> ExportAsync(ScrapClaimsRequestDto input);
-
-        /// <summary>
-        /// 获取实体总数
-        /// </summary>
-        /// <returns>实体总数</returns>
-
-        Task<long> GetTotalCountAsync(Guid branchId);
-
-
-  
-
-
-        ///// <summary>
-        ///// 删除实体
-        ///// </summary>
-        ///// <param name="id">ID</param>
-        ///// <returns>无</returns>
-
-        Task DeleteAsync(Guid id);
-
-
-        /// <summary>
-        /// 按IDs删除实体列表
-        /// </summary>
-        /// <param name="ids">IDs</param>
-        /// <returns>是否执行成功</returns>
-
-        Task<bool> DeleteListAsync(List<Guid> ids);
-
-    }
-}
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/VWScrapClaims/ScrapClaimsCreateDto.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/VWScrapClaims/ScrapClaimsCreateDto.cs
deleted file mode 100644
index 45ff634c..00000000
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/VWScrapClaims/ScrapClaimsCreateDto.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Win.Sfs.Shared;
-
-namespace Win.Sfs.SettleAccount.Entities.VWScrapClaims
-{
-
-    public class ScrapClaimsCreateDto : ScrapClaimsDtoBase, IBranch<Guid>
-    {
-        public virtual Guid BranchId { get; set; }
-    }
-}
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/VWScrapClaims/ScrapClaimsDto.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/VWScrapClaims/ScrapClaimsDto.cs
deleted file mode 100644
index 363c8e11..00000000
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/VWScrapClaims/ScrapClaimsDto.cs
+++ /dev/null
@@ -1,59 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Win.Sfs.Shared.DtoBase;
-
-namespace Win.Sfs.SettleAccount.Entities.VWScrapClaims
-{
-    /// <summary>
-    /// CP7报废和索赔
-    /// </summary>
-    public class ScrapClaimsDto : AuditedEntityDtoBase<Guid>
-    {
-        /// <summary>
-        /// 期间
-        /// </summary>
-        public string Period { set; get; }
-
-        /// <summary>
-        /// 版本
-        /// </summary>
-        public virtual string Version { get; set; }
-
-        /// <summary>
-        /// 类型：CP7报废和索赔两种
-        /// </summary>
-        public string Type { set; get; }
-
-
-        /// <summary>
-        /// 零件号
-        /// </summary>
-        public string MaterialCode { get; set; }
-
-        /// <summary>
-        /// 零件名称
-        /// </summary>
-        public string MaterialDesc { get; set; }
-
-
-
-        /// <summary>
-        /// 数量
-        /// </summary>
-        public decimal Qty { set; get; }
-
-        /// <summary>
-        /// 金额
-        /// </summary>
-        public decimal Amt { set; get; }
-
-
-        /// <summary>
-        /// 备注
-        /// </summary>
-        public string Extend { set; get; }
-    }
-}
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/VWScrapClaims/ScrapClaimsDtoBase.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/VWScrapClaims/ScrapClaimsDtoBase.cs
deleted file mode 100644
index ff0db803..00000000
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/VWScrapClaims/ScrapClaimsDtoBase.cs
+++ /dev/null
@@ -1,58 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Win.Sfs.Shared.DtoBase;
-
-namespace Win.Sfs.SettleAccount.Entities.VWScrapClaims
-{
-    public class ScrapClaimsDtoBase : CreateOrUpdateEntityDtoBase<Guid>
-    {
-
-        /// <summary>
-        /// 期间
-        /// </summary>
-        public string Period { set; get; }
-
-        /// <summary>
-        /// 版本
-        /// </summary>
-        public virtual string Version { get; set; }
-
-        /// <summary>
-        /// 类型：CP7报废和索赔两种
-        /// </summary>
-        public string Type { set; get; }
-
-
-        /// <summary>
-        /// 零件号
-        /// </summary>
-        public string MaterialCode { get; set; }
-
-        /// <summary>
-        /// 零件名称
-        /// </summary>
-        public string MaterialDesc { get; set; }
-
-
-
-        /// <summary>
-        /// 数量
-        /// </summary>
-        public decimal Qty { set; get; }
-
-        /// <summary>
-        /// 金额
-        /// </summary>
-        public decimal Amt { set; get; }
-
-
-        /// <summary>
-        /// 备注
-        /// </summary>
-        public string Extend { set; get; }
-
-    }
-}
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/VWScrapClaims/ScrapClaimsExportDto.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/VWScrapClaims/ScrapClaimsExportDto.cs
deleted file mode 100644
index bae9167a..00000000
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/VWScrapClaims/ScrapClaimsExportDto.cs
+++ /dev/null
@@ -1,57 +0,0 @@
-using Magicodes.ExporterAndImporter.Core;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Win.Sfs.SettleAccount.Entities.VWScrapClaims
-{
-    public class ScrapClaimsExportDto
-    {
-
-        /// <summary>
-        /// 期间
-        /// </summary>
-        [ExporterHeader(DisplayName = "期间")]
-        public string Period { set; get; }
-
-        /// <summary>
-        /// 版本
-        /// </summary>
-        [ExporterHeader(DisplayName = "版本")]
-        public virtual string Version { get; set; }
-
-
-        /// <summary>
-        /// 类型
-        /// </summary>
-        [ExporterHeader(DisplayName = "类型")]
-        public virtual string Type { set; get; }
-
-        /// <summary>
-        /// 零件号
-        /// </summary>
-        [ExporterHeader(DisplayName = "零件号")]
-        public virtual string MaterialCode { set; get; }
-        /// <summary>
-        /// 零件类型
-        /// </summary>
-        [ExporterHeader(DisplayName = "零件名称")]
-        public virtual string MaterialDesc { set; get; }
-       
-
-        /// <summary>
-        /// 数量
-        /// </summary>
-        [ExporterHeader(DisplayName = "数量")]
-        public virtual decimal Qty { get; set; }
-        /// <summary>
-        /// 金额
-        /// </summary>
-        [ExporterHeader(DisplayName = "金额")]
-        public virtual decimal Amt { get; set; }
-
-    
-    }
-}
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/VWScrapClaims/ScrapClaimsImportDto.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/VWScrapClaims/ScrapClaimsImportDto.cs
deleted file mode 100644
index 4d2344d7..00000000
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/VWScrapClaims/ScrapClaimsImportDto.cs
+++ /dev/null
@@ -1,55 +0,0 @@
-using Magicodes.ExporterAndImporter.Core;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Win.Sfs.SettleAccount.Entities.VWScrapClaims
-{
-    public class ScrapClaimsImportDto
-    {
-        ///// <summary>
-        ///// 期间
-        ///// </summary>
-        //[ImporterHeader(Name = "期间")]
-        //public string Period { set; get; }
-
-        ///// <summary>
-        ///// 版本
-        ///// </summary>
-        //[ImporterHeader(Name = "版本")]
-        //public virtual string Version { get; set; }
-
-        /// <summary>
-        ///类型
-        /// </summary>
-        [ImporterHeader(Name = "类型")]
-        public string Type { set; get; }
-
-        /// <summary>
-        /// 零件号
-        /// </summary>
-        [ImporterHeader(Name = "零件号", FixAllSpace = true)]
-        public virtual string MaterialCode { set; get; }
-        /// <summary>
-        /// 零件类型
-        /// </summary>
-        [ImporterHeader(Name = "零件名称")]
-        public virtual string MaterialDesc { set; get; }
-       
-        /// <summary>
-        /// 数量
-        /// </summary>
-        [ImporterHeader(Name = "数量")]
-        public virtual decimal Qty { get; set; }
-        /// <summary>
-        /// 金额
-        /// </summary>
-        [ImporterHeader(Name = "金额")]
-        public virtual decimal Amt { get; set; }
-
-        
-
-    }
-}
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/VWScrapClaims/ScrapClaimsRequestDto.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/VWScrapClaims/ScrapClaimsRequestDto.cs
deleted file mode 100644
index 651b846f..00000000
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/VWScrapClaims/ScrapClaimsRequestDto.cs
+++ /dev/null
@@ -1,64 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Win.Sfs.Shared.DtoBase;
-
-namespace Win.Sfs.SettleAccount.Entities.VWScrapClaims
-{
-    public class ScrapClaimsRequestDto : RequestDtoBase
-    {
-
-        /// <summary>
-        /// 期间
-        /// </summary>
-        public string Period { set; get; }
-
-        /// <summary>
-        /// 版本
-        /// </summary>
-        public virtual string Version { get; set; }
-
-        /// <summary>
-        /// 类型：CP7报废和索赔两种
-        /// </summary>
-        public string Type { set; get; }
-
-
-        /// <summary>
-        /// 零件号
-        /// </summary>
-        public string MaterialCode { get; set; }
-
-        /// <summary>
-        /// 零件名称
-        /// </summary>
-        public string MaterialDesc { get; set; }
-
-
-
-        /// <summary>
-        /// 数量
-        /// </summary>
-        public decimal Qty { set; get; }
-
-        /// <summary>
-        /// 金额
-        /// </summary>
-        public decimal Amt { set; get; }
-
-        /// <summary>
-        /// 备注
-        /// </summary>
-        public virtual string Remark { get; set; }
-
-        public virtual Guid ParentId { get; set; }
-        public virtual Guid BranchId { get; set; }
-
-        public virtual Guid UserId { get; set; }
-
-        public virtual int FileType { get; set; }
-
-    }
-}
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/VWScrapClaims/ScrapClaimsVersionDtoBase.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/VWScrapClaims/ScrapClaimsVersionDtoBase.cs
deleted file mode 100644
index af418849..00000000
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/VWScrapClaims/ScrapClaimsVersionDtoBase.cs
+++ /dev/null
@@ -1,100 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Win.Sfs.Shared;
-using Win.Sfs.Shared.DtoBase;
-
-namespace Win.Sfs.SettleAccount.Entities.VWScrapClaims
-{
-    /// <summary>
-    /// SettleAccountVersion
-    /// </summary>
-    public class ScrapClaimsVersionDtoBase : CreateOrUpdateEntityDtoBase<Guid>
-    {
-
-        public string Year { get; private set; }
-        /// <summary>
-        /// 期间
-        /// </summary>
-        public string Period { get; private set; }
-        /// <summary>
-        /// 版本号
-        /// </summary>
-        public string Version { get; private set; }
-
-        /// <summary>
-        /// 客户号
-        /// </summary>
-        public string CustomerCode { private set; get; }
-
-
-    }
-
-
-
-    public class ScrapClaimsVersionDto : AuditedEntityDtoBase<Guid>, IBranch<Guid>
-    {
-        public string Year { get; set; }
-        /// <summary>
-        /// 期间
-        /// </summary>
-        public string Period { get; set; }
-        /// <summary>
-        /// 版本号
-        /// </summary>
-        public string Version { get; set; }
-
-        /// <summary>
-        /// 客户号
-        /// </summary>
-        public string CustomerCode { set; get; }
-        public Guid BranchId { get; set; }
-    }
-
-    public class ScrapClaimsVersionCreateDto : ScrapClaimsVersionDtoBase
-    { }
-    public class ScrapClaimsVersionUpdateDto : ScrapClaimsVersionDtoBase
-    { }
-    public class ScrapClaimsVersionRequestDto : RequestDtoBase, IBranch<Guid>
-    {
-
-        public string Year { get; private set; }
-        /// <summary>
-        /// 期间
-        /// </summary>
-        public string Period { get; private set; }
-        /// <summary>
-        /// 版本号
-        /// </summary>
-        public string Version { get; private set; }
-
-        /// <summary>
-        /// 客户号
-        /// </summary>
-        public string CustomerCode { private set; get; }
-        public Guid BranchId { get; set; }
-    }
-
-    public class ScrapClaimsVersionImportDto
-    {
-
-        public string Year { get; private set; }
-        /// <summary>
-        /// 期间
-        /// </summary>
-        public string Period { get; private set; }
-        /// <summary>
-        /// 版本号
-        /// </summary>
-        public string Version { get; private set; }
-
-        /// <summary>
-        /// 客户号
-        /// </summary>
-        public string CustomerCode { private set; get; }
-
-
-    }
-}
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/VWSparePart/ISparePartAppService.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/VWSparePart/ISparePartAppService.cs
deleted file mode 100644
index f3fec313..00000000
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/VWSparePart/ISparePartAppService.cs
+++ /dev/null
@@ -1,94 +0,0 @@
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Mvc;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Volo.Abp.Application.Dtos;
-
-namespace Win.Sfs.SettleAccount.Entities.VWSparePart
-{
-    /// <summary>
-    /// /大众备件导入功能
-    /// </summary>
-    public interface ISparePartAppService
-    {
-        /// <summary>
-        /// 导入功能
-        /// </summary>
-        /// <param name="files">上传的文件(前端已经限制只能上传一个附件)</param>
-        /// <returns></returns>
-
-        Task<string> SparePartUploadExcelImport([FromForm] IFormFileCollection files, Guid branchId,
-            string year, string period, string version, string customerCode);
-
-        /// <summary>
-        /// 按ID获取唯一实体
-        /// </summary>
-        /// <remarks>
-        /// 返回实体全部属性
-        /// </remarks>
-        /// <param name="id">ID</param>
-        /// <returns>实体DTO</returns>
-
-        Task<SparePartDto> GetAsync(Guid id);
-
-        /// <summary>
-        /// 根据筛选条件获取实体列表
-        /// </summary>
-        /// <remarks>
-        /// 请求条件包括:筛选条件列表,排序条件,数据数量,页码
-        /// </remarks>
-        /// <param name="input">请求条件</param>
-        /// <returns>实体DTO列表</returns>
-
-        Task<PagedResultDto<SparePartDto>> GetListAsync( SparePartRequestDto input);
-
-
-
-
-        /// <summary>
-        /// 根据筛选条件获取实体列表
-        /// </summary>
-        /// <remarks>
-        /// 请求条件包括:筛选条件列表,排序条件,数据数量,页码
-        /// </remarks>
-        /// <param name="input">请求条件</param>
-        /// <returns>实体DTO列表</returns>
-
-        Task<PagedResultDto<SparePartVersionDto>> GetVersionListAsync(SparePartVersionRequestDto input);
-
-
-        Task<string> ExportAsync(SparePartRequestDto input);
-
-        /// <summary>
-        /// 获取实体总数
-        /// </summary>
-        /// <returns>实体总数</returns>
-
-        Task<long> GetTotalCountAsync(Guid branchId);
-
-
-
-
-
-        ///// <summary>
-        ///// 删除实体
-        ///// </summary>
-        ///// <param name="id">ID</param>
-        ///// <returns>无</returns>
-
-        Task DeleteAsync(Guid id);
-
-
-        /// <summary>
-        /// 按IDs删除实体列表
-        /// </summary>
-        /// <param name="ids">IDs</param>
-        /// <returns>是否执行成功</returns>
-
-        Task<bool> DeleteListAsync(List<Guid> ids);
-
-    }
-}
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/VWSparePart/SparePartCreateDto.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/VWSparePart/SparePartCreateDto.cs
deleted file mode 100644
index d28ae13e..00000000
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/VWSparePart/SparePartCreateDto.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Win.Sfs.Shared;
-
-namespace Win.Sfs.SettleAccount.Entities.VWSparePart
-{
-
-    public class SparePartCreateDto : SparePartDtoBase, IBranch<Guid>
-    {
-        public virtual Guid BranchId { get; set; }
-    }
-}
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/VWSparePart/SparePartDto.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/VWSparePart/SparePartDto.cs
deleted file mode 100644
index ac77efef..00000000
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/VWSparePart/SparePartDto.cs
+++ /dev/null
@@ -1,125 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Win.Sfs.Shared.DtoBase;
-
-namespace Win.Sfs.SettleAccount.Entities.VWSparePart
-{
-    /// <summary>
-    /// 大众备件结算明细DTO
-    /// </summary>
-    public class SparePartDto : AuditedEntityDtoBase<Guid>
-    {
-        /// <summary>
-        ///年
-        /// </summary>
-        public string Year { get; set; }
-        /// <summary>
-        /// 期间
-        /// </summary>
-        public string Period { set; get; }
-        /// <summary>
-        /// 版本号
-        /// </summary>
-        public string Version { set; get; }
-
-        /// <summary>
-        /// 行号
-        /// </summary>
-        public string LineNumber { set; get; }
-
-
-        /// <summary>
-        /// 采购类型
-        /// </summary>
-        public string PurchaseType { get; set; }
-
-        /// <summary>
-        /// 采购订单号
-        /// </summary>
-        public string PurchaseOrderNo { get; set; }
-        /// <summary>
-        /// 采购订单行项目
-        /// </summary>
-        public string PurchaseOrderNoItem { get; set; }
-        /// <summary>
-        /// 采购订单文本
-        /// </summary>
-        public string PurchaseOrderNoText { get; set; }
-        /// <summary>
-        /// 收货数量
-        /// </summary>
-        public decimal ReceiptQty { get; set; }
-
-        /// <summary>
-        /// 开票数量
-        /// </summary>
-        public decimal InvoicedQty { get; set; }
-        /// <summary>
-        /// 不含税金额
-        /// </summary>
-        public decimal AmountNoTax { get; set; }
-        /// <summary>
-        /// 采购价格不含税
-        /// </summary>
-        public decimal PurchasePriceNoTax { get; set; }
-        /// <summary>
-        /// 科目号
-        /// </summary>
-        public string AccountNum { get; set; }
-        /// <summary>
-        /// 物料代码
-        /// </summary>
-        public string MaterialCode { get; set; }
-        /// <summary>
-        /// 物料描述
-        /// </summary>
-        public string MaterialDesc { get; set; }
-        /// <summary>
-        /// 日期
-        /// </summary>
-        public DateTime SpareDate { get; set; }
-        /// <summary>
-        /// 交货单号
-        /// </summary>
-        public string DeliveryOrderNo { get; set; }
-        /// <summary>
-        /// 交货行号
-        /// </summary>
-        public string DeliveryLineNum { get; set; }
-        /// <summary>
-        /// 批次号
-        /// </summary>
-        public string BatchNo { get; set; }
-        /// <summary>
-        /// 单位
-        /// </summary>
-        public string Unit { get; set; }
-        /// <summary>
-        /// 税率
-        /// </summary>
-        public decimal TaxRate { get; set; }
-        /// <summary>
-        /// 税码
-        /// </summary>
-        public string TaxCode { get; set; }
-        /// <summary>
-        /// 德国发票号
-        /// </summary>
-        public string GermanInvoiceNo { get; set; }
-        /// <summary>
-        /// 工厂
-        /// </summary>
-        public string Factory { get; set; }
-        /// <summary>
-        /// 工厂名称
-        /// </summary>
-        public string FactoryName { get; set; }
-        /// <summary>
-        /// 备注
-        /// </summary>
-        public string Extend { set; get; }
-    }
-}
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/VWSparePart/SparePartDtoBase.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/VWSparePart/SparePartDtoBase.cs
deleted file mode 100644
index 7a7f283d..00000000
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/VWSparePart/SparePartDtoBase.cs
+++ /dev/null
@@ -1,124 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Win.Sfs.Shared.DtoBase;
-
-namespace Win.Sfs.SettleAccount.Entities.VWSparePart
-{
-    public class SparePartDtoBase : CreateOrUpdateEntityDtoBase<Guid>
-    {
-
-        /// <summary>
-        ///年
-        /// </summary>
-        public string Year { get; set; }
-        /// <summary>
-        /// 期间
-        /// </summary>
-        public string Period { set; get; }
-        /// <summary>
-        /// 版本号
-        /// </summary>
-        public string Version { set; get; }
-
-        /// <summary>
-        /// 行号
-        /// </summary>
-        public string LineNumber { set; get; }
-
-
-        /// <summary>
-        /// 采购类型
-        /// </summary>
-        public string PurchaseType { get; set; }
-
-        /// <summary>
-        /// 采购订单号
-        /// </summary>
-        public string PurchaseOrderNo { get; set; }
-        /// <summary>
-        /// 采购订单行项目
-        /// </summary>
-        public string PurchaseOrderNoItem { get; set; }
-        /// <summary>
-        /// 采购订单文本
-        /// </summary>
-        public string PurchaseOrderNoText { get; set; }
-        /// <summary>
-        /// 收货数量
-        /// </summary>
-        public decimal ReceiptQty { get; set; }
-
-        /// <summary>
-        /// 开票数量
-        /// </summary>
-        public decimal InvoicedQty { get; set; }
-        /// <summary>
-        /// 不含税金额
-        /// </summary>
-        public decimal AmountNoTax { get; set; }
-        /// <summary>
-        /// 采购价格不含税
-        /// </summary>
-        public decimal PurchasePriceNoTax { get; set; }
-        /// <summary>
-        /// 科目号
-        /// </summary>
-        public string AccountNum { get; set; }
-        /// <summary>
-        /// 物料代码
-        /// </summary>
-        public string MaterialCode { get; set; }
-        /// <summary>
-        /// 物料描述
-        /// </summary>
-        public string MaterialDesc { get; set; }
-        /// <summary>
-        /// 日期
-        /// </summary>
-        public DateTime SpareDate { get; set; }
-        /// <summary>
-        /// 交货单号
-        /// </summary>
-        public string DeliveryOrderNo { get; set; }
-        /// <summary>
-        /// 交货行号
-        /// </summary>
-        public string DeliveryLineNum { get; set; }
-        /// <summary>
-        /// 批次号
-        /// </summary>
-        public string BatchNo { get; set; }
-        /// <summary>
-        /// 单位
-        /// </summary>
-        public string Unit { get; set; }
-        /// <summary>
-        /// 税率
-        /// </summary>
-        public decimal TaxRate { get; set; }
-        /// <summary>
-        /// 税码
-        /// </summary>
-        public string TaxCode { get; set; }
-        /// <summary>
-        /// 德国发票号
-        /// </summary>
-        public string GermanInvoiceNo { get; set; }
-        /// <summary>
-        /// 工厂
-        /// </summary>
-        public string Factory { get; set; }
-        /// <summary>
-        /// 工厂名称
-        /// </summary>
-        public string FactoryName { get; set; }
-        /// <summary>
-        /// 备注
-        /// </summary>
-        public string Extend { set; get; }
-
-    }
-}
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/VWSparePart/SparePartExportDto.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/VWSparePart/SparePartExportDto.cs
deleted file mode 100644
index 33c5ab3b..00000000
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/VWSparePart/SparePartExportDto.cs
+++ /dev/null
@@ -1,143 +0,0 @@
-using Magicodes.ExporterAndImporter.Core;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Win.Sfs.SettleAccount.Entities.VWSparePart
-{
-    public class SparePartExportDto
-    {
-
-        /// <summary>
-        /// 期间
-        /// </summary>
-        [ExporterHeader(DisplayName = "期间")]
-        public string Period { set; get; }
-
-        /// <summary>
-        /// 版本
-        /// </summary>
-        [ExporterHeader(DisplayName = "版本")]
-        public virtual string Version { get; set; }
-
-
-        /// <summary>
-        /// 行号
-        /// </summary>
-        [ExporterHeader(DisplayName = "行号")]
-        public string LineNumber { set; get; }
-
-
-        /// <summary>
-        /// 采购类型
-        /// </summary>
-        [ExporterHeader(DisplayName = "采购类型")]
-        public string PurchaseType { get; set; }
-
-        /// <summary>
-        /// 采购订单号
-        /// </summary>
-        [ExporterHeader(DisplayName = "采购订单号")]
-        public string PurchaseOrderNo { get; set; }
-        /// <summary>
-        /// 采购订单行项目
-        /// </summary>
-        [ExporterHeader(DisplayName = "采购订单行项目")]
-        public string PurchaseOrderNoItem { get; set; }
-        /// <summary>
-        /// 采购订单文本
-        /// </summary>
-        [ExporterHeader(DisplayName = "采购订单文本")]
-        public string PurchaseOrderNoText { get; set; }
-        /// <summary>
-        /// 收货数量
-        /// </summary>
-        [ExporterHeader(DisplayName = "收货数量")]
-        public decimal ReceiptQty { get; set; }
-
-        /// <summary>
-        /// 开票数量
-        /// </summary>
-        [ExporterHeader(DisplayName = "开票数量")]
-        public decimal InvoicedQty { get; set; }
-        /// <summary>
-        /// 不含税金额
-        /// </summary>
-        [ExporterHeader(DisplayName = "不含税金额")]
-        public decimal AmountNoTax { get; set; }
-        /// <summary>
-        /// 采购价格不含税
-        /// </summary>
-        [ExporterHeader(DisplayName = "采购价格不含税")]
-        public decimal PurchasePriceNoTax { get; set; }
-        /// <summary>
-        /// 科目号
-        /// </summary>
-        [ExporterHeader(DisplayName = "科目号")]
-        public string AccountNum { get; set; }
-        /// <summary>
-        /// 物料代码
-        /// </summary>
-        [ExporterHeader(DisplayName = "物料代码")]
-        public string MaterialCode { get; set; }
-        /// <summary>
-        /// 物料描述
-        /// </summary>
-        [ExporterHeader(DisplayName = "物料描述")]
-        public string MaterialDesc { get; set; }
-        /// <summary>
-        /// 日期
-        /// </summary>
-        [ExporterHeader(DisplayName = "日期")]
-        public DateTime SpareDate { get; set; }
-        /// <summary>
-        /// 交货单号
-        /// </summary>
-        [ExporterHeader(DisplayName = "交货单号")]
-        public string DeliveryOrderNo { get; set; }
-        /// <summary>
-        /// 交货行号
-        /// </summary>
-        [ExporterHeader(DisplayName = "交货行号")]
-        public string DeliveryLineNum { get; set; }
-        /// <summary>
-        /// 批次号
-        /// </summary>
-        [ExporterHeader(DisplayName = "批次号")]
-        public string BatchNo { get; set; }
-        /// <summary>
-        /// 单位
-        /// </summary>
-        [ExporterHeader(DisplayName = "单位")]
-        public string Unit { get; set; }
-        /// <summary>
-        /// 税率
-        /// </summary>
-        [ExporterHeader(DisplayName = "税率")]
-        public decimal TaxRate { get; set; }
-        /// <summary>
-        /// 税码
-        /// </summary>
-        [ExporterHeader(DisplayName = "税码")]
-        public string TaxCode { get; set; }
-        /// <summary>
-        /// 德国发票号
-        /// </summary>
-        [ExporterHeader(DisplayName = "德国发票号")]
-        public string GermanInvoiceNo { get; set; }
-        /// <summary>
-        /// 工厂
-        /// </summary>
-        [ExporterHeader(DisplayName = "工厂")]
-        public string Factory { get; set; }
-        /// <summary>
-        /// 工厂名称
-        /// </summary>
-        [ExporterHeader(DisplayName = "工厂名称")]
-        public string FactoryName { get; set; }
-
-
-    }
-}
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/VWSparePart/SparePartImportDto.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/VWSparePart/SparePartImportDto.cs
deleted file mode 100644
index 2ce7e0c2..00000000
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/VWSparePart/SparePartImportDto.cs
+++ /dev/null
@@ -1,129 +0,0 @@
-using Magicodes.ExporterAndImporter.Core;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Win.Sfs.SettleAccount.Entities.VWSparePart
-{
-    public class SparePartImportDto
-    {
-
-        /// <summary>
-        /// 行号
-        /// </summary>
-        [ImporterHeader(Name = "行号")]
-        public string LineNumber { set; get; }
-
-
-        /// <summary>
-        /// 采购类型
-        /// </summary>
-        [ImporterHeader(Name = "采购类型")]
-        public string PurchaseType { get; set; }
-
-        /// <summary>
-        /// 采购订单号
-        /// </summary>
-        [ImporterHeader(Name = "采购订单号", FixAllSpace = true)]
-        public string PurchaseOrderNo { get; set; }
-        /// <summary>
-        /// 采购订单行项目
-        /// </summary>
-        [ImporterHeader(Name = "采购订单行项目")]
-        public string PurchaseOrderNoItem { get; set; }
-        /// <summary>
-        /// 采购订单文本
-        /// </summary>
-        [ImporterHeader(Name = "采购订单文本")]
-        public string PurchaseOrderNoText { get; set; }
-        /// <summary>
-        /// 收货数量
-        /// </summary>
-        [ImporterHeader(Name = "收货数量")]
-        public decimal ReceiptQty { get; set; }
-
-        /// <summary>
-        /// 开票数量
-        /// </summary>
-        [ImporterHeader(Name = "开票数量")]
-        public decimal InvoicedQty { get; set; }
-        /// <summary>
-        /// 不含税金额
-        /// </summary>
-        [ImporterHeader(Name = "不含税金额")]
-        public decimal AmountNoTax { get; set; }
-        /// <summary>
-        /// 采购价格不含税
-        /// </summary>
-        [ImporterHeader(Name = "采购价格不含税")]
-        public decimal PurchasePriceNoTax { get; set; }
-        /// <summary>
-        /// 科目号
-        /// </summary>
-        [ImporterHeader(Name = "科目号", FixAllSpace = true)]
-        public string AccountNum { get; set; }
-        /// <summary>
-        /// 物料代码
-        /// </summary>
-        [ImporterHeader(Name = "物料代码", FixAllSpace = true)]
-        public string MaterialCode { get; set; }
-        /// <summary>
-        /// 物料描述
-        /// </summary>
-        [ImporterHeader(Name = "物料描述")]
-        public string MaterialDesc { get; set; }
-        /// <summary>
-        /// 日期
-        /// </summary>
-        [ImporterHeader(Name = "日期")]
-        public DateTime SpareDate { get; set; }
-        /// <summary>
-        /// 交货单号
-        /// </summary>
-        [ImporterHeader(Name = "交货单号", FixAllSpace = true)]
-        public string DeliveryOrderNo { get; set; }
-        /// <summary>
-        /// 交货行号
-        /// </summary>
-        [ImporterHeader(Name = "交货行号")]
-        public string DeliveryLineNum { get; set; }
-        /// <summary>
-        /// 批次号
-        /// </summary>
-        [ImporterHeader(Name = "批次号")]
-        public string BatchNo { get; set; }
-        /// <summary>
-        /// 单位
-        /// </summary>
-        [ImporterHeader(Name = "单位")]
-        public string Unit { get; set; }
-        /// <summary>
-        /// 税率
-        /// </summary>
-        [ImporterHeader(Name = "税率")]
-        public decimal TaxRate { get; set; }
-        /// <summary>
-        /// 税码
-        /// </summary>
-        [ImporterHeader(Name = "税码")]
-        public string TaxCode { get; set; }
-        /// <summary>
-        /// 德国发票号
-        /// </summary>
-        [ImporterHeader(Name = "德国发票号")]
-        public string GermanInvoiceNo { get; set; }
-        /// <summary>
-        /// 工厂
-        /// </summary>
-        [ImporterHeader(Name = "工厂")]
-        public string Factory { get; set; }
-        /// <summary>
-        /// 工厂名称
-        /// </summary>
-        [ImporterHeader(Name = "工厂名称")]
-        public string FactoryName { get; set; }
-
-    }
-}
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/VWSparePart/SparePartRequestDto.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/VWSparePart/SparePartRequestDto.cs
deleted file mode 100644
index 7ceb6ac2..00000000
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/VWSparePart/SparePartRequestDto.cs
+++ /dev/null
@@ -1,129 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Win.Sfs.Shared.DtoBase;
-
-namespace Win.Sfs.SettleAccount.Entities.VWSparePart
-{
-   public class SparePartRequestDto  : RequestDtoBase
-    {
-        /// <summary>
-        ///年
-        /// </summary>
-        public string Year { get; set; }
-        /// <summary>
-        /// 期间
-        /// </summary>
-        public string Period { set; get; }
-        /// <summary>
-        /// 版本号
-        /// </summary>
-        public string Version { set; get; }
-
-        /// <summary>
-        /// 行号
-        /// </summary>
-        public string LineNumber { set; get; }
-
-
-        /// <summary>
-        /// 采购类型
-        /// </summary>
-        public string PurchaseType { get; set; }
-
-        /// <summary>
-        /// 采购订单号
-        /// </summary>
-        public string PurchaseOrderNo { get; set; }
-        /// <summary>
-        /// 采购订单行项目
-        /// </summary>
-        public string PurchaseOrderNoItem { get; set; }
-        /// <summary>
-        /// 采购订单文本
-        /// </summary>
-        public string PurchaseOrderNoText { get; set; }
-        /// <summary>
-        /// 收货数量
-        /// </summary>
-        public decimal ReceiptQty { get; set; }
-
-        /// <summary>
-        /// 开票数量
-        /// </summary>
-        public decimal InvoicedQty { get; set; }
-        /// <summary>
-        /// 不含税金额
-        /// </summary>
-        public decimal AmountNoTax { get; set; }
-        /// <summary>
-        /// 采购价格不含税
-        /// </summary>
-        public decimal PurchasePriceNoTax { get; set; }
-        /// <summary>
-        /// 科目号
-        /// </summary>
-        public string AccountNum { get; set; }
-        /// <summary>
-        /// 物料代码
-        /// </summary>
-        public string MaterialCode { get; set; }
-        /// <summary>
-        /// 物料描述
-        /// </summary>
-        public string MaterialDesc { get; set; }
-        /// <summary>
-        /// 日期
-        /// </summary>
-        public DateTime SpareDate { get; set; }
-        /// <summary>
-        /// 交货单号
-        /// </summary>
-        public string DeliveryOrderNo { get; set; }
-        /// <summary>
-        /// 交货行号
-        /// </summary>
-        public string DeliveryLineNum { get; set; }
-        /// <summary>
-        /// 批次号
-        /// </summary>
-        public string BatchNo { get; set; }
-        /// <summary>
-        /// 单位
-        /// </summary>
-        public string Unit { get; set; }
-        /// <summary>
-        /// 税率
-        /// </summary>
-        public decimal TaxRate { get; set; }
-        /// <summary>
-        /// 税码
-        /// </summary>
-        public string TaxCode { get; set; }
-        /// <summary>
-        /// 德国发票号
-        /// </summary>
-        public string GermanInvoiceNo { get; set; }
-        /// <summary>
-        /// 工厂
-        /// </summary>
-        public string Factory { get; set; }
-        /// <summary>
-        /// 工厂名称
-        /// </summary>
-        public string FactoryName { get; set; }
-        /// <summary>
-        /// 备注
-        /// </summary>
-        public string Extend { set; get; }
-
-        public virtual Guid ParentId { get; set; }
-        public virtual Guid BranchId { get; set; }
-
-        public virtual Guid UserId { get; set; }
-
-        public virtual int FileType { get; set; }
-    }
-}
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/VWSparePart/SparePartVersionDtoBase.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/VWSparePart/SparePartVersionDtoBase.cs
deleted file mode 100644
index 733cbed0..00000000
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/VWSparePart/SparePartVersionDtoBase.cs
+++ /dev/null
@@ -1,100 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Win.Sfs.Shared;
-using Win.Sfs.Shared.DtoBase;
-
-namespace Win.Sfs.SettleAccount.Entities.VWSparePart
-{
-    /// <summary>
-    /// SettleAccountVersion
-    /// </summary>
-    public class SparePartVersionDtoBase : CreateOrUpdateEntityDtoBase<Guid>
-    {
-
-        public string Year { get; private set; }
-        /// <summary>
-        /// 期间
-        /// </summary>
-        public string Period { get; private set; }
-        /// <summary>
-        /// 版本号
-        /// </summary>
-        public string Version { get; private set; }
-
-        /// <summary>
-        /// 客户号
-        /// </summary>
-        public string CustomerCode { private set; get; }
-
-
-    }
-
-
-
-    public class SparePartVersionDto : AuditedEntityDtoBase<Guid>, IBranch<Guid>
-    {
-        public string Year { get; set; }
-        /// <summary>
-        /// 期间
-        /// </summary>
-        public string Period { get; set; }
-        /// <summary>
-        /// 版本号
-        /// </summary>
-        public string Version { get; set; }
-
-        /// <summary>
-        /// 客户号
-        /// </summary>
-        public string CustomerCode { set; get; }
-        public Guid BranchId { get; set; }
-    }
-
-    public class SparePartVersionCreateDto : SparePartVersionDtoBase
-    { }
-    public class SparePartVersionUpdateDto : SparePartVersionDtoBase
-    { }
-    public class SparePartVersionRequestDto : RequestDtoBase, IBranch<Guid>
-    {
-
-        public string Year { get; private set; }
-        /// <summary>
-        /// 期间
-        /// </summary>
-        public string Period { get; private set; }
-        /// <summary>
-        /// 版本号
-        /// </summary>
-        public string Version { get; private set; }
-
-        /// <summary>
-        /// 客户号
-        /// </summary>
-        public string CustomerCode { private set; get; }
-        public Guid BranchId { get; set; }
-    }
-
-    public class SparePartVersionImportDto
-    {
-
-        public string Year { get; private set; }
-        /// <summary>
-        /// 期间
-        /// </summary>
-        public string Period { get; private set; }
-        /// <summary>
-        /// 版本号
-        /// </summary>
-        public string Version { get; private set; }
-
-        /// <summary>
-        /// 客户号
-        /// </summary>
-        public string CustomerCode { private set; get; }
-
-
-    }
-}
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/WMSKanBan/IWMSVWKanBanAppService.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/WMSKanBan/IWMSVWKanBanAppService.cs
deleted file mode 100644
index 35b74168..00000000
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/WMSKanBan/IWMSVWKanBanAppService.cs
+++ /dev/null
@@ -1,96 +0,0 @@
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Mvc;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Volo.Abp.Application.Dtos;
-
-namespace Win.Sfs.SettleAccount.Entities.WMSKanBan
-{
-    public interface IWMSVWKanBanAppService
-
-    {
-
-
-
-        /// <summary>
-        /// 导入功能
-        /// </summary>
-        /// <param name="files">上传的文件(前端已经限制只能上传一个附件)</param>
-        /// <returns></returns>
-
-       // Task<string> WMSVWKanBanUploadExcelImport([FromForm] IFormFileCollection files, Guid branchId, string year, string period, string version, string customerCode);
-
-
-
-
-        /// <summary>
-        /// 按ID获取唯一实体
-        /// </summary>
-        /// <remarks>
-        /// 返回实体全部属性
-        /// </remarks>
-        /// <param name="id">ID</param>
-        /// <returns>实体DTO</returns>
-
-        Task<WMSVWKanBanDto> GetAsync(Guid id);
-
-        /// <summary>
-        /// 根据筛选条件获取实体列表
-        /// </summary>
-        /// <remarks>
-        /// 请求条件包括:筛选条件列表,排序条件,数据数量,页码
-        /// </remarks>
-        /// <param name="input">请求条件</param>
-        /// <returns>实体DTO列表</returns>
-
-        Task<PagedResultDto<WMSVWKanBanDto>> GetListAsync(WMSVWKanBanRequestDto input);
-
-
-
-
-        /// <summary>
-        /// 根据筛选条件获取实体列表
-        /// </summary>
-        /// <remarks>
-        /// 请求条件包括:筛选条件列表,排序条件,数据数量,页码
-        /// </remarks>
-        /// <param name="input">请求条件</param>
-        /// <returns>实体DTO列表</returns>
-
-        Task<PagedResultDto<WMSVWKanBanVersionDto>> GetVersionListAsync(WMSVWKanBanVersionRequestDto input);
-
-
-        Task<string> ExportAsync(WMSVWKanBanRequestDto input);
-
-        /// <summary>
-        /// 获取实体总数
-        /// </summary>
-        /// <returns>实体总数</returns>
-
-        Task<long> GetTotalCountAsync(Guid branchId);
-
-
-
-
-        ///// <summary>
-        ///// 删除实体
-        ///// </summary>
-        ///// <param name="id">ID</param>
-        ///// <returns>无</returns>
-
-        Task DeleteAsync(Guid id);
-
-
-        /// <summary>
-        /// 按IDs删除实体列表
-        /// </summary>
-        /// <param name="ids">IDs</param>
-        /// <returns>是否执行成功</returns>
-
-        Task<bool> DeleteListAsync(List<Guid> ids);
-
-    }
-}
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/WMSKanBan/WMSVWKanBanCreateDto.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/WMSKanBan/WMSVWKanBanCreateDto.cs
deleted file mode 100644
index 0824c763..00000000
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/WMSKanBan/WMSVWKanBanCreateDto.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Win.Sfs.Shared;
-
-namespace Win.Sfs.SettleAccount.Entities.WMSKanBan
-{
-    public class WMSVWKanBanCreateDto : WMSVWKanBanDtoBase, IBranch<Guid>
-    {
-        public virtual Guid BranchId { get; set; }
-    }
-}
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/WMSKanBan/WMSVWKanBanDto.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/WMSKanBan/WMSVWKanBanDto.cs
deleted file mode 100644
index a3aba35b..00000000
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/WMSKanBan/WMSVWKanBanDto.cs
+++ /dev/null
@@ -1,113 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Win.Sfs.Shared.DtoBase;
-
-namespace Win.Sfs.SettleAccount.Entities.WMSKanBan
-{
-
-    public class WMSVWKanBanDto : AuditedEntityDtoBase<Guid>
-    {
-        /// <summary>
-        /// 期间
-        /// </summary>
-        public string Period { set; get; }
-
-        /// <summary>
-        /// 版本
-        /// </summary>
-        public virtual string Version { get; set; }
-
-        /// <summary>
-        ///看板条码号
-        /// </summary>
-        public string Kanban { set; get; }
-
-        /// <summary>
-        /// 入库关联号
-        /// </summary>
-        public virtual string Relation { set; get; }
-        /// <summary>
-        /// 工厂
-        /// </summary>
-        public virtual string Factory { set; get; }
-        /// <summary>
-        /// 零件号
-        /// </summary>
-        public virtual string MaterialCode { set; get; }
-        /// <summary>
-        /// 零件类型
-        /// </summary>
-        public virtual string PartType { set; get; }
-        /// <summary>
-        /// R3入库时间
-        /// </summary>
-        public virtual DateTime SettleInputDate { set; get; }
-
-
-        /// <summary>
-        ///供应商编码
-        /// </summary>
-        public virtual string SupplierCode { get; set; }
-        /// <summary>
-        /// 数量
-        /// </summary>
-        public virtual decimal Qty { get; set; }
-        /// <summary>
-        /// 批次
-        /// </summary>
-
-        public virtual string Batch { get; set; }
-
-        /// <summary>
-        /// 入库结算标识
-        /// </summary>
-        public virtual string Flag { get; set; }
-
-        /// <summary>
-        /// 结算日期
-        /// </summary>
-        public virtual DateTime SettleDate { get; set; }
-
-
-        /// <summary>
-        /// WMS交货单
-        /// </summary>
-        public string WMSDeliveryNote { set; get; }
-
-        /// <summary>
-        /// WMS实际发货日期
-        /// </summary>
-        public string WMSActualGoodsDate { set; get; }
-
-
-        /// <summary>
-        /// WMS交货数量
-        /// </summary>
-        public decimal WMSDeliveryQty { set; get; }
-
-        /// <summary>
-        /// WMS发货状态
-        /// </summary>
-        public string WMSDeliverGoodsState { set; get; }
-
-        /// <summary>
-        /// 看板结算状态
-        /// </summary>
-        public string WMSKanBanState { set; get; }
-
-        /// <summary>
-        /// 结算状态
-        /// </summary>
-        public virtual string State { get; set; }
-
-        /// <summary>
-        /// 出库单号
-        /// </summary>
-        public string DeliveryOrderNo { set; get; }
-
-
-    }
-}
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/WMSKanBan/WMSVWKanBanDtoBase.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/WMSKanBan/WMSVWKanBanDtoBase.cs
deleted file mode 100644
index def36a38..00000000
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/WMSKanBan/WMSVWKanBanDtoBase.cs
+++ /dev/null
@@ -1,85 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Win.Sfs.Shared.DtoBase;
-
-namespace Win.Sfs.SettleAccount.Entities.WMSKanBan
-{
-    public class WMSVWKanBanDtoBase : CreateOrUpdateEntityDtoBase<Guid>
-    {
-
-        /// <summary>
-        /// 期间
-        /// </summary>
-        public string Period { set; get; }
-
-
-
-        /// <summary>
-        ///看板条码号
-        /// </summary>
-        public string Kanban { set; get; }
-
-        /// <summary>
-        /// 入库关联号
-        /// </summary>
-        public virtual string Relation { set; get; }
-        /// <summary>
-        /// 工厂
-        /// </summary>
-        public virtual string Factory { set; get; }
-        /// <summary>
-        /// 零件号
-        /// </summary>
-        public virtual string MaterialCode { set; get; }
-        /// <summary>
-        /// 零件类型
-        /// </summary>
-        public virtual string PartType { set; get; }
-        /// <summary>
-        /// R3入库时间
-        /// </summary>
-        public virtual DateTime SettleInputDate { set; get; }
-
-
-        /// <summary>
-        ///供应商编码
-        /// </summary>
-        public virtual string SupplierCode { get; set; }
-        /// <summary>
-        /// 数量
-        /// </summary>
-        public virtual decimal Qty { get; set; }
-        /// <summary>
-        /// 批次
-        /// </summary>
-
-        public virtual string Batch { get; set; }
-
-        /// <summary>
-        /// 入库结算标识
-        /// </summary>
-        public virtual string Flag { get; set; }
-
-        /// <summary>
-        /// 结算日期
-        /// </summary>
-        public virtual DateTime SettleDate { get; set; }
-
-        /// <summary>
-        /// 结算状态
-        /// </summary>
-        public virtual int State { get; set; }
-
-
-        public virtual string Version { get; set; }
-        /// <summary>
-        /// 备注
-        /// </summary>
-        public virtual string Remark { get; set; }
-
-
-    }
-}
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/WMSKanBan/WMSVWKanBanExportDto.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/WMSKanBan/WMSVWKanBanExportDto.cs
deleted file mode 100644
index 21e830f3..00000000
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/WMSKanBan/WMSVWKanBanExportDto.cs
+++ /dev/null
@@ -1,92 +0,0 @@
-using Magicodes.ExporterAndImporter.Core;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Win.Sfs.SettleAccount.Entities.WMSKanBan
-{
-    public class WMSVWKanBanExportDto
-    {
-
-        /// <summary>
-        /// 期间
-        /// </summary>
-        [ExporterHeader(DisplayName = "期间")]
-        public string Period { set; get; }
-
-        /// <summary>
-        /// 版本
-        /// </summary>
-        [ExporterHeader(DisplayName = "版本")]
-        public virtual string Version { get; set; }
-
-        /// <summary>
-        ///看板条码号
-        /// </summary>
-        [ExporterHeader(DisplayName = "看板条码号")]
-        public string Kanban { set; get; }
-
-        /// <summary>
-        /// 入库关联号
-        /// </summary>
-        [ExporterHeader(DisplayName = "入库关联号")]
-        public virtual string Relation { set; get; }
-        /// <summary>
-        /// 工厂
-        /// </summary>
-        [ExporterHeader(DisplayName = "工厂")]
-        public virtual string Factory { set; get; }
-        /// <summary>
-        /// 零件号
-        /// </summary>
-        [ExporterHeader(DisplayName = "零件号")]
-        public virtual string MaterialCode { set; get; }
-        /// <summary>
-        /// 零件类型
-        /// </summary>
-        [ExporterHeader(DisplayName = "零件类型")]
-        public virtual string PartType { set; get; }
-        /// <summary>
-        /// R3入库日期
-        /// </summary>
-        [ExporterHeader(DisplayName = "R3入库日期")]
-        public virtual DateTime SettleInputDate { set; get; }
-
-
-        /// <summary>
-        ///供应商编码
-        /// </summary>
-        [ExporterHeader(DisplayName = "供应商")]
-        public virtual string SupplierCode { get; set; }
-        /// <summary>
-        /// 数量
-        /// </summary>
-        [ExporterHeader(DisplayName = "数量")]
-        public virtual decimal Qty { get; set; }
-        /// <summary>
-        /// 批次
-        /// </summary>
-        [ExporterHeader(DisplayName = "批次")]
-        public virtual string Batch { get; set; }
-
-        /// <summary>
-        /// 入库结算标识
-        /// </summary>
-        [ExporterHeader(DisplayName = "入库结算标识")]
-        public virtual string Flag { get; set; }
-
-        /// <summary>
-        /// 结算日期
-        /// </summary>
-        [ExporterHeader(DisplayName = "R3结算时间")]
-        public virtual DateTime SettleDate { get; set; }
-
-        /// <summary>
-        /// 结算状态
-        /// </summary>
-        [ExporterHeader(DisplayName = "结算状态")]
-        public virtual string State { get; set; }
-    }
-}
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/WMSKanBan/WMSVWKanBanImportDto.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/WMSKanBan/WMSVWKanBanImportDto.cs
deleted file mode 100644
index 3bdd6acf..00000000
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/WMSKanBan/WMSVWKanBanImportDto.cs
+++ /dev/null
@@ -1,93 +0,0 @@
-using Magicodes.ExporterAndImporter.Core;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Win.Sfs.SettleAccount.Entities.WMSKanBan
-{
-    public class WMSVWKanBanImportDto
-    {
-
-        ///// <summary>
-        ///// 期间
-        ///// </summary>
-        //[ImporterHeader(Name = "期间")]
-        //public string Period { set; get; }
-
-        ///// <summary>
-        ///// 版本
-        ///// </summary>
-        //[ImporterHeader(Name = "版本")]
-        //public virtual string Version { get; set; }
-
-        /// <summary>
-        ///看板条码号
-        /// </summary>
-        [ImporterHeader(Name = "看板条码号", FixAllSpace = true)]
-        public string Kanban { set; get; }
-
-        /// <summary>
-        /// 入库关联号
-        /// </summary>
-        [ImporterHeader(Name = "入库关联号")]
-        public virtual string Relation { set; get; }
-        /// <summary>
-        /// 工厂
-        /// </summary>
-        [ImporterHeader(Name = "工厂")]
-        public virtual string Factory { set; get; }
-        /// <summary>
-        /// 零件号
-        /// </summary>
-        [ImporterHeader(Name = "零件号", FixAllSpace = true)]
-        public virtual string MaterialCode { set; get; }
-        /// <summary>
-        /// 零件类型
-        /// </summary>
-        [ImporterHeader(Name = "零件类型")]
-        public virtual string PartType { set; get; }
-        /// <summary>
-        /// R3入库日期
-        /// </summary>
-        [ImporterHeader(Name = "R3入库日期")]
-        public virtual string SettleInputDate { set; get; }
-
-
-        /// <summary>
-        ///供应商编码
-        /// </summary>
-        [ImporterHeader(Name = "供应商")]
-        public virtual string SupplierCode { get; set; }
-        /// <summary>
-        /// 数量
-        /// </summary>
-        [ImporterHeader(Name = "数量")]
-        public virtual decimal Qty { get; set; }
-        /// <summary>
-        /// 批次
-        /// </summary>
-        [ImporterHeader(Name = "批次")]
-        public virtual string Batch { get; set; }
-
-        /// <summary>
-        /// 入库结算标识
-        /// </summary>
-        [ImporterHeader(Name = "入库结算标识")]
-        public virtual string Flag { get; set; }
-
-        /// <summary>
-        /// 结算日期
-        /// </summary>
-        [ImporterHeader(Name = "R3结算时间")]
-        public virtual string SettleDate { get; set; }
-
-        /// <summary>
-        /// 结算状态
-        /// </summary>
-        [ImporterHeader(Name = "结算状态")]
-        public virtual string State { get; set; }
-
-    }
-}
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/WMSKanBan/WMSVWKanBanRequestDto.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/WMSKanBan/WMSVWKanBanRequestDto.cs
deleted file mode 100644
index 751e15f3..00000000
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/WMSKanBan/WMSVWKanBanRequestDto.cs
+++ /dev/null
@@ -1,93 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Win.Sfs.Shared.DtoBase;
-
-namespace Win.Sfs.SettleAccount.Entities.WMSKanBan
-{
-
-    public class WMSVWKanBanRequestDto : RequestDtoBase
-    {
-
-        /// <summary>
-        /// 期间
-        /// </summary>
-        public string Period { set; get; }
-
-        /// <summary>
-        /// 版本
-        /// </summary>
-        public virtual string Version { get; set; }
-
-        /// <summary>
-        ///看板条码号
-        /// </summary>
-        public string Kanban { set; get; }
-
-        /// <summary>
-        /// 入库关联号
-        /// </summary>
-        public virtual string Relation { set; get; }
-        /// <summary>
-        /// 工厂
-        /// </summary>
-        public virtual string Factory { set; get; }
-        /// <summary>
-        /// 零件号
-        /// </summary>
-        public virtual string MaterialCode { set; get; }
-        /// <summary>
-        /// 零件类型
-        /// </summary>
-        public virtual string PartType { set; get; }
-        /// <summary>
-        /// R3入库时间
-        /// </summary>
-        public virtual DateTime SettleInputDate { set; get; }
-
-
-        /// <summary>
-        ///供应商编码
-        /// </summary>
-        public virtual string SupplierCode { get; set; }
-        /// <summary>
-        /// 数量
-        /// </summary>
-        public virtual decimal Qty { get; set; }
-        /// <summary>
-        /// 批次
-        /// </summary>
-
-        public virtual string Batch { get; set; }
-
-        /// <summary>
-        /// 入库结算标识
-        /// </summary>
-        public virtual string Flag { get; set; }
-
-        /// <summary>
-        /// 结算日期
-        /// </summary>
-        public virtual DateTime SettleDate { get; set; }
-
-        /// <summary>
-        /// 结算状态
-        /// </summary>
-        public virtual string State { get; set; }
-
-        /// <summary>
-        /// 备注
-        /// </summary>
-        public virtual string Remark { get; set; }
-
-        public virtual Guid ParentId { get; set; }
-        public virtual Guid BranchId { get; set; }
-
-        public virtual Guid UserId { get; set; }
-
-        public virtual int FileType { get; set; }
-
-    }
-}
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/WMSKanBan/WMSVWKanBanVersionDtoBase.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/WMSKanBan/WMSVWKanBanVersionDtoBase.cs
deleted file mode 100644
index 2634a16e..00000000
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/WMSKanBan/WMSVWKanBanVersionDtoBase.cs
+++ /dev/null
@@ -1,100 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Win.Sfs.Shared;
-using Win.Sfs.Shared.DtoBase;
-
-namespace Win.Sfs.SettleAccount.Entities.WMSKanBan
-{
-    /// <summary>
-    /// SettleAccountVersion
-    /// </summary>
-    public class WMSVWKanBanVersionDtoBase : CreateOrUpdateEntityDtoBase<Guid>
-    {
-
-        public string Year { get; private set; }
-        /// <summary>
-        /// 期间
-        /// </summary>
-        public string Period { get; private set; }
-        /// <summary>
-        /// 版本号
-        /// </summary>
-        public string Version { get; private set; }
-
-        /// <summary>
-        /// 客户号
-        /// </summary>
-        public string CustomerCode { private set; get; }
-
-
-    }
-
-
-
-    public class WMSVWKanBanVersionDto : AuditedEntityDtoBase<Guid>, IBranch<Guid>
-    {
-        public string Year { get; set; }
-        /// <summary>
-        /// 期间
-        /// </summary>
-        public string Period { get; set; }
-        /// <summary>
-        /// 版本号
-        /// </summary>
-        public string Version { get; set; }
-
-        /// <summary>
-        /// 客户号
-        /// </summary>
-        public string CustomerCode { set; get; }
-        public Guid BranchId { get; set; }
-    }
-
-    public class WMSVWKanBanVersionCreateDto : WMSVWKanBanVersionDtoBase
-    { }
-    public class WMSVWKanBanVersionUpdateDto : WMSVWKanBanVersionDtoBase
-    { }
-    public class WMSVWKanBanVersionRequestDto : RequestDtoBase, IBranch<Guid>
-    {
-
-        public string Year { get; private set; }
-        /// <summary>
-        /// 期间
-        /// </summary>
-        public string Period { get; private set; }
-        /// <summary>
-        /// 版本号
-        /// </summary>
-        public string Version { get; private set; }
-
-        /// <summary>
-        /// 客户号
-        /// </summary>
-        public string CustomerCode { private set; get; }
-        public Guid BranchId { get; set; }
-    }
-
-    public class WMSVWKanBanVersionImportDto
-    {
-
-        public string Year { get; private set; }
-        /// <summary>
-        /// 期间
-        /// </summary>
-        public string Period { get; private set; }
-        /// <summary>
-        /// 版本号
-        /// </summary>
-        public string Version { get; private set; }
-
-        /// <summary>
-        /// 客户号
-        /// </summary>
-        public string CustomerCode { private set; get; }
-
-
-    }
-}
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/WMSKanBan/WMSVWKanBantUpdateDto.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/WMSKanBan/WMSVWKanBantUpdateDto.cs
deleted file mode 100644
index cbc4329f..00000000
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/WMSKanBan/WMSVWKanBantUpdateDto.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Win.Sfs.SettleAccount.Entities.VWKanBan;
-
-namespace Win.Sfs.SettleAccount.Entities.WMSKanBan
-{
-    public class WMSVWKanBantUpdateDto : VWKanBanDtoBase
-    {
-
-
-
-    }
-}
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/WMSSparePart/IWMSSparePartAppService.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/WMSSparePart/IWMSSparePartAppService.cs
deleted file mode 100644
index 56ee2272..00000000
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/WMSSparePart/IWMSSparePartAppService.cs
+++ /dev/null
@@ -1,91 +0,0 @@
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Mvc;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Volo.Abp.Application.Dtos;
-
-namespace Win.Sfs.SettleAccount.Entities.WMSSparePart
-{
-    public interface IWMSSparePartAppService
-    {
-        /// <summary>
-        /// 导入功能
-        /// </summary>
-        /// <param name="files">上传的文件(前端已经限制只能上传一个附件)</param>
-        /// <returns></returns>
-
-        //Task<string> WMSSparePartUploadExcelImport([FromForm] IFormFileCollection files, Guid branchId,
-        //    string year, string period, string version, string customerCode);
-
-        /// <summary>
-        /// 按ID获取唯一实体
-        /// </summary>
-        /// <remarks>
-        /// 返回实体全部属性
-        /// </remarks>
-        /// <param name="id">ID</param>
-        /// <returns>实体DTO</returns>
-
-        Task<WMSSparePartDto> GetAsync(Guid id);
-
-        /// <summary>
-        /// 根据筛选条件获取实体列表
-        /// </summary>
-        /// <remarks>
-        /// 请求条件包括:筛选条件列表,排序条件,数据数量,页码
-        /// </remarks>
-        /// <param name="input">请求条件</param>
-        /// <returns>实体DTO列表</returns>
-
-        Task<PagedResultDto<WMSSparePartDto>> GetListAsync(WMSSparePartRequestDto input);
-
-
-
-
-        /// <summary>
-        /// 根据筛选条件获取实体列表
-        /// </summary>
-        /// <remarks>
-        /// 请求条件包括:筛选条件列表,排序条件,数据数量,页码
-        /// </remarks>
-        /// <param name="input">请求条件</param>
-        /// <returns>实体DTO列表</returns>
-
-        Task<PagedResultDto<WMSSparePartVersionDto>> GetVersionListAsync(WMSSparePartVersionRequestDto input);
-
-
-        Task<string> ExportAsync(WMSSparePartRequestDto input);
-
-        /// <summary>
-        /// 获取实体总数
-        /// </summary>
-        /// <returns>实体总数</returns>
-
-        Task<long> GetTotalCountAsync(Guid branchId);
-
-
-
-
-
-        ///// <summary>
-        ///// 删除实体
-        ///// </summary>
-        ///// <param name="id">ID</param>
-        ///// <returns>无</returns>
-
-        Task DeleteAsync(Guid id);
-
-
-        /// <summary>
-        /// 按IDs删除实体列表
-        /// </summary>
-        /// <param name="ids">IDs</param>
-        /// <returns>是否执行成功</returns>
-
-        Task<bool> DeleteListAsync(List<Guid> ids);
-
-    }
-}
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/WMSSparePart/WMSSparePartCreateDto.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/WMSSparePart/WMSSparePartCreateDto.cs
deleted file mode 100644
index db4379be..00000000
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/WMSSparePart/WMSSparePartCreateDto.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Win.Sfs.Shared;
-
-namespace Win.Sfs.SettleAccount.Entities.WMSSparePart
-{
-    public class WMSSparePartCreateDto : WMSSparePartDtoBase, IBranch<Guid>
-    {
-        public virtual Guid BranchId { get; set; }
-    }
-}
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/WMSSparePart/WMSSparePartDto.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/WMSSparePart/WMSSparePartDto.cs
deleted file mode 100644
index d775ee59..00000000
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/WMSSparePart/WMSSparePartDto.cs
+++ /dev/null
@@ -1,137 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Win.Sfs.Shared.DtoBase;
-
-namespace Win.Sfs.SettleAccount.Entities.WMSSparePart
-{
-    public class WMSSparePartDto : AuditedEntityDtoBase<Guid>
-    {
-        /// <summary>
-        ///年
-        /// </summary>
-        public string Year { get; set; }
-        /// <summary>
-        /// 期间
-        /// </summary>
-        public string Period { set; get; }
-        /// <summary>
-        /// 版本号
-        /// </summary>
-        public string Version { set; get; }
-
-        /// <summary>
-        /// 行号
-        /// </summary>
-        public string LineNumber { set; get; }
-
-
-        /// <summary>
-        /// 采购类型
-        /// </summary>
-        public string PurchaseType { get; set; }
-
-        /// <summary>
-        /// 采购订单号
-        /// </summary>
-        public string PurchaseOrderNo { get; set; }
-        /// <summary>
-        /// 采购订单行项目
-        /// </summary>
-        public string PurchaseOrderNoItem { get; set; }
-        /// <summary>
-        /// 采购订单文本
-        /// </summary>
-        public string PurchaseOrderNoText { get; set; }
-        /// <summary>
-        /// 收货数量
-        /// </summary>
-        public decimal ReceiptQty { get; set; }
-
-        /// <summary>
-        /// 开票数量
-        /// </summary>
-        public decimal InvoicedQty { get; set; }
-        /// <summary>
-        /// 不含税金额
-        /// </summary>
-        public decimal AmountNoTax { get; set; }
-        /// <summary>
-        /// 采购价格不含税
-        /// </summary>
-        public decimal PurchasePriceNoTax { get; set; }
-        /// <summary>
-        /// 科目号
-        /// </summary>
-        public string AccountNum { get; set; }
-        /// <summary>
-        /// 物料代码
-        /// </summary>
-        public string MaterialCode { get; set; }
-        /// <summary>
-        /// 物料描述
-        /// </summary>
-        public string MaterialDesc { get; set; }
-        /// <summary>
-        /// 日期
-        /// </summary>
-        public DateTime SpareDate { get; set; }
-        /// <summary>
-        /// 交货单号
-        /// </summary>
-        public string DeliveryOrderNo { get; set; }
-        /// <summary>
-        /// 交货行号
-        /// </summary>
-        public string DeliveryLineNum { get; set; }
-        /// <summary>
-        /// 批次号
-        /// </summary>
-        public string BatchNo { get; set; }
-        /// <summary>
-        /// 单位
-        /// </summary>
-        public string Unit { get; set; }
-        /// <summary>
-        /// 税率
-        /// </summary>
-        public decimal TaxRate { get; set; }
-        /// <summary>
-        /// 税码
-        /// </summary>
-        public string TaxCode { get; set; }
-        /// <summary>
-        /// 德国发票号
-        /// </summary>
-        public string GermanInvoiceNo { get; set; }
-        /// <summary>
-        /// 工厂
-        /// </summary>
-        public string Factory { get; set; }
-        /// <summary>
-        /// 工厂名称
-        /// </summary>
-        public string FactoryName { get; set; }
-        /// <summary>
-        /// 备注
-        /// </summary>
-        public string Extend { set; get; }
-
-        /// <summary>
-        /// WMS交货单
-        /// </summary>
-        public string WMSDeliveryNote { set; get; }
-
-        /// <summary>
-        /// WMS发货状态
-        /// </summary>
-        public string WMSDeliverGoodsState { set; get; }
-
-        /// <summary>
-        /// 看板结算状态
-        /// </summary>
-        public string WMSSparePartState { set; get; }
-    }
-}
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/WMSSparePart/WMSSparePartDtoBase.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/WMSSparePart/WMSSparePartDtoBase.cs
deleted file mode 100644
index ff78ca70..00000000
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/WMSSparePart/WMSSparePartDtoBase.cs
+++ /dev/null
@@ -1,124 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Win.Sfs.Shared.DtoBase;
-
-namespace Win.Sfs.SettleAccount.Entities.WMSSparePart
-{
-    public class WMSSparePartDtoBase : CreateOrUpdateEntityDtoBase<Guid>
-    {
-
-        /// <summary>
-        ///年
-        /// </summary>
-        public string Year { get; set; }
-        /// <summary>
-        /// 期间
-        /// </summary>
-        public string Period { set; get; }
-        /// <summary>
-        /// 版本号
-        /// </summary>
-        public string Version { set; get; }
-
-        /// <summary>
-        /// 行号
-        /// </summary>
-        public string LineNumber { set; get; }
-
-
-        /// <summary>
-        /// 采购类型
-        /// </summary>
-        public string PurchaseType { get; set; }
-
-        /// <summary>
-        /// 采购订单号
-        /// </summary>
-        public string PurchaseOrderNo { get; set; }
-        /// <summary>
-        /// 采购订单行项目
-        /// </summary>
-        public string PurchaseOrderNoItem { get; set; }
-        /// <summary>
-        /// 采购订单文本
-        /// </summary>
-        public string PurchaseOrderNoText { get; set; }
-        /// <summary>
-        /// 收货数量
-        /// </summary>
-        public decimal ReceiptQty { get; set; }
-
-        /// <summary>
-        /// 开票数量
-        /// </summary>
-        public decimal InvoicedQty { get; set; }
-        /// <summary>
-        /// 不含税金额
-        /// </summary>
-        public decimal AmountNoTax { get; set; }
-        /// <summary>
-        /// 采购价格不含税
-        /// </summary>
-        public decimal PurchasePriceNoTax { get; set; }
-        /// <summary>
-        /// 科目号
-        /// </summary>
-        public string AccountNum { get; set; }
-        /// <summary>
-        /// 物料代码
-        /// </summary>
-        public string MaterialCode { get; set; }
-        /// <summary>
-        /// 物料描述
-        /// </summary>
-        public string MaterialDesc { get; set; }
-        /// <summary>
-        /// 日期
-        /// </summary>
-        public DateTime SpareDate { get; set; }
-        /// <summary>
-        /// 交货单号
-        /// </summary>
-        public string DeliveryOrderNo { get; set; }
-        /// <summary>
-        /// 交货行号
-        /// </summary>
-        public string DeliveryLineNum { get; set; }
-        /// <summary>
-        /// 批次号
-        /// </summary>
-        public string BatchNo { get; set; }
-        /// <summary>
-        /// 单位
-        /// </summary>
-        public string Unit { get; set; }
-        /// <summary>
-        /// 税率
-        /// </summary>
-        public decimal TaxRate { get; set; }
-        /// <summary>
-        /// 税码
-        /// </summary>
-        public string TaxCode { get; set; }
-        /// <summary>
-        /// 德国发票号
-        /// </summary>
-        public string GermanInvoiceNo { get; set; }
-        /// <summary>
-        /// 工厂
-        /// </summary>
-        public string Factory { get; set; }
-        /// <summary>
-        /// 工厂名称
-        /// </summary>
-        public string FactoryName { get; set; }
-        /// <summary>
-        /// 备注
-        /// </summary>
-        public string Extend { set; get; }
-
-    }
-}
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/WMSSparePart/WMSSparePartExportDto.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/WMSSparePart/WMSSparePartExportDto.cs
deleted file mode 100644
index 888e2dd8..00000000
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/WMSSparePart/WMSSparePartExportDto.cs
+++ /dev/null
@@ -1,143 +0,0 @@
-using Magicodes.ExporterAndImporter.Core;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Win.Sfs.SettleAccount.Entities.WMSSparePart
-{
-    public class WMSSparePartExportDto
-    {
-
-        /// <summary>
-        /// 期间
-        /// </summary>
-        [ExporterHeader(DisplayName = "期间")]
-        public string Period { set; get; }
-
-        /// <summary>
-        /// 版本
-        /// </summary>
-        [ExporterHeader(DisplayName = "版本")]
-        public virtual string Version { get; set; }
-
-
-        /// <summary>
-        /// 行号
-        /// </summary>
-        [ExporterHeader(DisplayName = "行号")]
-        public string LineNumber { set; get; }
-
-
-        /// <summary>
-        /// 采购类型
-        /// </summary>
-        [ExporterHeader(DisplayName = "采购类型")]
-        public string PurchaseType { get; set; }
-
-        /// <summary>
-        /// 采购订单号
-        /// </summary>
-        [ExporterHeader(DisplayName = "采购订单号")]
-        public string PurchaseOrderNo { get; set; }
-        /// <summary>
-        /// 采购订单行项目
-        /// </summary>
-        [ExporterHeader(DisplayName = "采购订单行项目")]
-        public string PurchaseOrderNoItem { get; set; }
-        /// <summary>
-        /// 采购订单文本
-        /// </summary>
-        [ExporterHeader(DisplayName = "采购订单文本")]
-        public string PurchaseOrderNoText { get; set; }
-        /// <summary>
-        /// 收货数量
-        /// </summary>
-        [ExporterHeader(DisplayName = "收货数量")]
-        public decimal ReceiptQty { get; set; }
-
-        /// <summary>
-        /// 开票数量
-        /// </summary>
-        [ExporterHeader(DisplayName = "开票数量")]
-        public decimal InvoicedQty { get; set; }
-        /// <summary>
-        /// 不含税金额
-        /// </summary>
-        [ExporterHeader(DisplayName = "不含税金额")]
-        public decimal AmountNoTax { get; set; }
-        /// <summary>
-        /// 采购价格不含税
-        /// </summary>
-        [ExporterHeader(DisplayName = "采购价格不含税")]
-        public decimal PurchasePriceNoTax { get; set; }
-        /// <summary>
-        /// 科目号
-        /// </summary>
-        [ExporterHeader(DisplayName = "科目号")]
-        public string AccountNum { get; set; }
-        /// <summary>
-        /// 物料代码
-        /// </summary>
-        [ExporterHeader(DisplayName = "物料代码")]
-        public string MaterialCode { get; set; }
-        /// <summary>
-        /// 物料描述
-        /// </summary>
-        [ExporterHeader(DisplayName = "物料描述")]
-        public string MaterialDesc { get; set; }
-        /// <summary>
-        /// 日期
-        /// </summary>
-        [ExporterHeader(DisplayName = "日期")]
-        public DateTime SpareDate { get; set; }
-        /// <summary>
-        /// 交货单号
-        /// </summary>
-        [ExporterHeader(DisplayName = "交货单号")]
-        public string DeliveryOrderNo { get; set; }
-        /// <summary>
-        /// 交货行号
-        /// </summary>
-        [ExporterHeader(DisplayName = "交货行号")]
-        public string DeliveryLineNum { get; set; }
-        /// <summary>
-        /// 批次号
-        /// </summary>
-        [ExporterHeader(DisplayName = "批次号")]
-        public string BatchNo { get; set; }
-        /// <summary>
-        /// 单位
-        /// </summary>
-        [ExporterHeader(DisplayName = "单位")]
-        public string Unit { get; set; }
-        /// <summary>
-        /// 税率
-        /// </summary>
-        [ExporterHeader(DisplayName = "税率")]
-        public decimal TaxRate { get; set; }
-        /// <summary>
-        /// 税码
-        /// </summary>
-        [ExporterHeader(DisplayName = "税码")]
-        public string TaxCode { get; set; }
-        /// <summary>
-        /// 德国发票号
-        /// </summary>
-        [ExporterHeader(DisplayName = "德国发票号")]
-        public string GermanInvoiceNo { get; set; }
-        /// <summary>
-        /// 工厂
-        /// </summary>
-        [ExporterHeader(DisplayName = "工厂")]
-        public string Factory { get; set; }
-        /// <summary>
-        /// 工厂名称
-        /// </summary>
-        [ExporterHeader(DisplayName = "工厂名称")]
-        public string FactoryName { get; set; }
-
-
-    }
-}
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/WMSSparePart/WMSSparePartImportDto.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/WMSSparePart/WMSSparePartImportDto.cs
deleted file mode 100644
index cd8af4fc..00000000
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/WMSSparePart/WMSSparePartImportDto.cs
+++ /dev/null
@@ -1,129 +0,0 @@
-using Magicodes.ExporterAndImporter.Core;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Win.Sfs.SettleAccount.Entities.WMSSparePart
-{
-    public class WMSSparePartImportDto
-    {
-
-        /// <summary>
-        /// 行号
-        /// </summary>
-        [ImporterHeader(Name = "行号")]
-        public string LineNumber { set; get; }
-
-
-        /// <summary>
-        /// 采购类型
-        /// </summary>
-        [ImporterHeader(Name = "采购类型")]
-        public string PurchaseType { get; set; }
-
-        /// <summary>
-        /// 采购订单号
-        /// </summary>
-        [ImporterHeader(Name = "采购订单号", FixAllSpace = true)]
-        public string PurchaseOrderNo { get; set; }
-        /// <summary>
-        /// 采购订单行项目
-        /// </summary>
-        [ImporterHeader(Name = "采购订单行项目")]
-        public string PurchaseOrderNoItem { get; set; }
-        /// <summary>
-        /// 采购订单文本
-        /// </summary>
-        [ImporterHeader(Name = "采购订单文本")]
-        public string PurchaseOrderNoText { get; set; }
-        /// <summary>
-        /// 收货数量
-        /// </summary>
-        [ImporterHeader(Name = "收货数量")]
-        public decimal ReceiptQty { get; set; }
-
-        /// <summary>
-        /// 开票数量
-        /// </summary>
-        [ImporterHeader(Name = "开票数量")]
-        public decimal InvoicedQty { get; set; }
-        /// <summary>
-        /// 不含税金额
-        /// </summary>
-        [ImporterHeader(Name = "不含税金额")]
-        public decimal AmountNoTax { get; set; }
-        /// <summary>
-        /// 采购价格不含税
-        /// </summary>
-        [ImporterHeader(Name = "采购价格不含税")]
-        public decimal PurchasePriceNoTax { get; set; }
-        /// <summary>
-        /// 科目号
-        /// </summary>
-        [ImporterHeader(Name = "科目号", FixAllSpace = true)]
-        public string AccountNum { get; set; }
-        /// <summary>
-        /// 物料代码
-        /// </summary>
-        [ImporterHeader(Name = "物料代码", FixAllSpace = true)]
-        public string MaterialCode { get; set; }
-        /// <summary>
-        /// 物料描述
-        /// </summary>
-        [ImporterHeader(Name = "物料描述")]
-        public string MaterialDesc { get; set; }
-        /// <summary>
-        /// 日期
-        /// </summary>
-        [ImporterHeader(Name = "日期")]
-        public DateTime SpareDate { get; set; }
-        /// <summary>
-        /// 交货单号
-        /// </summary>
-        [ImporterHeader(Name = "交货单号", FixAllSpace = true)]
-        public string DeliveryOrderNo { get; set; }
-        /// <summary>
-        /// 交货行号
-        /// </summary>
-        [ImporterHeader(Name = "交货行号")]
-        public string DeliveryLineNum { get; set; }
-        /// <summary>
-        /// 批次号
-        /// </summary>
-        [ImporterHeader(Name = "批次号")]
-        public string BatchNo { get; set; }
-        /// <summary>
-        /// 单位
-        /// </summary>
-        [ImporterHeader(Name = "单位")]
-        public string Unit { get; set; }
-        /// <summary>
-        /// 税率
-        /// </summary>
-        [ImporterHeader(Name = "税率")]
-        public decimal TaxRate { get; set; }
-        /// <summary>
-        /// 税码
-        /// </summary>
-        [ImporterHeader(Name = "税码")]
-        public string TaxCode { get; set; }
-        /// <summary>
-        /// 德国发票号
-        /// </summary>
-        [ImporterHeader(Name = "德国发票号")]
-        public string GermanInvoiceNo { get; set; }
-        /// <summary>
-        /// 工厂
-        /// </summary>
-        [ImporterHeader(Name = "工厂")]
-        public string Factory { get; set; }
-        /// <summary>
-        /// 工厂名称
-        /// </summary>
-        [ImporterHeader(Name = "工厂名称")]
-        public string FactoryName { get; set; }
-
-    }
-}
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/WMSSparePart/WMSSparePartRequestDto.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/WMSSparePart/WMSSparePartRequestDto.cs
deleted file mode 100644
index bc090dda..00000000
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/WMSSparePart/WMSSparePartRequestDto.cs
+++ /dev/null
@@ -1,129 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Win.Sfs.Shared.DtoBase;
-
-namespace Win.Sfs.SettleAccount.Entities.WMSSparePart
-{
-    public class WMSSparePartRequestDto : RequestDtoBase
-    {
-        /// <summary>
-        ///年
-        /// </summary>
-        public string Year { get; set; }
-        /// <summary>
-        /// 期间
-        /// </summary>
-        public string Period { set; get; }
-        /// <summary>
-        /// 版本号
-        /// </summary>
-        public string Version { set; get; }
-
-        /// <summary>
-        /// 行号
-        /// </summary>
-        public string LineNumber { set; get; }
-
-
-        /// <summary>
-        /// 采购类型
-        /// </summary>
-        public string PurchaseType { get; set; }
-
-        /// <summary>
-        /// 采购订单号
-        /// </summary>
-        public string PurchaseOrderNo { get; set; }
-        /// <summary>
-        /// 采购订单行项目
-        /// </summary>
-        public string PurchaseOrderNoItem { get; set; }
-        /// <summary>
-        /// 采购订单文本
-        /// </summary>
-        public string PurchaseOrderNoText { get; set; }
-        /// <summary>
-        /// 收货数量
-        /// </summary>
-        public decimal ReceiptQty { get; set; }
-
-        /// <summary>
-        /// 开票数量
-        /// </summary>
-        public decimal InvoicedQty { get; set; }
-        /// <summary>
-        /// 不含税金额
-        /// </summary>
-        public decimal AmountNoTax { get; set; }
-        /// <summary>
-        /// 采购价格不含税
-        /// </summary>
-        public decimal PurchasePriceNoTax { get; set; }
-        /// <summary>
-        /// 科目号
-        /// </summary>
-        public string AccountNum { get; set; }
-        /// <summary>
-        /// 物料代码
-        /// </summary>
-        public string MaterialCode { get; set; }
-        /// <summary>
-        /// 物料描述
-        /// </summary>
-        public string MaterialDesc { get; set; }
-        /// <summary>
-        /// 日期
-        /// </summary>
-        public DateTime SpareDate { get; set; }
-        /// <summary>
-        /// 交货单号
-        /// </summary>
-        public string DeliveryOrderNo { get; set; }
-        /// <summary>
-        /// 交货行号
-        /// </summary>
-        public string DeliveryLineNum { get; set; }
-        /// <summary>
-        /// 批次号
-        /// </summary>
-        public string BatchNo { get; set; }
-        /// <summary>
-        /// 单位
-        /// </summary>
-        public string Unit { get; set; }
-        /// <summary>
-        /// 税率
-        /// </summary>
-        public decimal TaxRate { get; set; }
-        /// <summary>
-        /// 税码
-        /// </summary>
-        public string TaxCode { get; set; }
-        /// <summary>
-        /// 德国发票号
-        /// </summary>
-        public string GermanInvoiceNo { get; set; }
-        /// <summary>
-        /// 工厂
-        /// </summary>
-        public string Factory { get; set; }
-        /// <summary>
-        /// 工厂名称
-        /// </summary>
-        public string FactoryName { get; set; }
-        /// <summary>
-        /// 备注
-        /// </summary>
-        public string Extend { set; get; }
-
-        public virtual Guid ParentId { get; set; }
-        public virtual Guid BranchId { get; set; }
-
-        public virtual Guid UserId { get; set; }
-
-        public virtual int FileType { get; set; }
-    }
-}
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/WMSSparePart/WMSSparePartVersionDtoBase.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/WMSSparePart/WMSSparePartVersionDtoBase.cs
deleted file mode 100644
index b2d78b86..00000000
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/WMSSparePart/WMSSparePartVersionDtoBase.cs
+++ /dev/null
@@ -1,100 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Win.Sfs.Shared;
-using Win.Sfs.Shared.DtoBase;
-
-namespace Win.Sfs.SettleAccount.Entities.WMSSparePart
-{
-    /// <summary>
-    /// SettleAccountVersion
-    /// </summary>
-    public class WMSSparePartVersionDtoBase : CreateOrUpdateEntityDtoBase<Guid>
-    {
-
-        public string Year { get; private set; }
-        /// <summary>
-        /// 期间
-        /// </summary>
-        public string Period { get; private set; }
-        /// <summary>
-        /// 版本号
-        /// </summary>
-        public string Version { get; private set; }
-
-        /// <summary>
-        /// 客户号
-        /// </summary>
-        public string CustomerCode { private set; get; }
-
-
-    }
-
-
-
-    public class WMSSparePartVersionDto : AuditedEntityDtoBase<Guid>, IBranch<Guid>
-    {
-        public string Year { get; set; }
-        /// <summary>
-        /// 期间
-        /// </summary>
-        public string Period { get; set; }
-        /// <summary>
-        /// 版本号
-        /// </summary>
-        public string Version { get; set; }
-
-        /// <summary>
-        /// 客户号
-        /// </summary>
-        public string CustomerCode { set; get; }
-        public Guid BranchId { get; set; }
-    }
-
-    public class WMSSparePartVersionCreateDto : WMSSparePartVersionDtoBase
-    { }
-    public class WMSSparePartVersionUpdateDto : WMSSparePartVersionDtoBase
-    { }
-    public class WMSSparePartVersionRequestDto : RequestDtoBase, IBranch<Guid>
-    {
-
-        public string Year { get; private set; }
-        /// <summary>
-        /// 期间
-        /// </summary>
-        public string Period { get; private set; }
-        /// <summary>
-        /// 版本号
-        /// </summary>
-        public string Version { get; private set; }
-
-        /// <summary>
-        /// 客户号
-        /// </summary>
-        public string CustomerCode { private set; get; }
-        public Guid BranchId { get; set; }
-    }
-
-    public class WMSSparePartVersionImportDto
-    {
-
-        public string Year { get; private set; }
-        /// <summary>
-        /// 期间
-        /// </summary>
-        public string Period { get; private set; }
-        /// <summary>
-        /// 版本号
-        /// </summary>
-        public string Version { get; private set; }
-
-        /// <summary>
-        /// 客户号
-        /// </summary>
-        public string CustomerCode { private set; get; }
-
-
-    }
-}
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/ErrorListBill/ErrorBillAppService.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/ErrorListBill/ErrorBillAppService.cs
index a33b8cef..74fdd97a 100644
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/ErrorListBill/ErrorBillAppService.cs
+++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/ErrorListBill/ErrorBillAppService.cs
@@ -27,12 +27,10 @@ using Win.Sfs.SettleAccount.CommonManagers;
 using Win.Sfs.SettleAccount.Constant;
 using Win.Sfs.SettleAccount.Entities.Boms;
 using Win.Sfs.SettleAccount.Entities.Errors;
-using Win.Sfs.SettleAccount.Entities.EstimatedInventories;
 using Win.Sfs.SettleAccount.Entities.ImportMap;
 using Win.Sfs.SettleAccount.Entities.Prices;
 using Win.Sfs.SettleAccount.Entities.TaskJobs;
 using Win.Sfs.SettleAccount.Errors;
-using Win.Sfs.SettleAccount.EstimatedInventories;
 using Win.Sfs.SettleAccount.ExcelImporter;
 using Win.Sfs.SettleAccount.ExportReports;
 using Win.Sfs.SettleAccount.Reports;
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/HQExtend/HQKBExtendAppService.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/HQExtend/HQKBExtendAppService.cs
deleted file mode 100644
index 3548daed..00000000
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/HQExtend/HQKBExtendAppService.cs
+++ /dev/null
@@ -1,347 +0,0 @@
-
-
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Linq;
-using System.Threading.Tasks;
-using EFCore.BulkExtensions;
-using Magicodes.ExporterAndImporter.Core;
-using Magicodes.ExporterAndImporter.Csv;
-using Magicodes.ExporterAndImporter.Excel;
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.Extensions.Caching.Distributed;
-using Shouldly;
-using Volo.Abp;
-using Volo.Abp.Application.Dtos;
-using Volo.Abp.Application.Services;
-using Volo.Abp.Caching;
-using Volo.Abp.Domain.Repositories;
-using Volo.Abp.Guids;
-using Volo.Abp.ObjectMapping;
-using Volo.Abp.Uow;
-using Win.Abp.Snowflakes;
-using Win.Sfs.BaseData.ImportExcelCommon;
-using Win.Sfs.SettleAccount.CommonManagers;
-using Win.Sfs.SettleAccount.Constant;
-using Win.Sfs.SettleAccount.Entities.ERPShipping;
-using Win.Sfs.SettleAccount.Entities.ERPShpping;
-using Win.Sfs.SettleAccount.Entities.HQExtend;
-using Win.Sfs.SettleAccount.Entities.ImportMap;
-using Win.Sfs.SettleAccount.Entities.Materials;
-using Win.Sfs.SettleAccount.ExcelImporter;
-using Win.Sfs.SettleAccount.ExportReports;
-using Win.Sfs.Shared.CacheBase;
-using Win.Sfs.Shared.Filter;
-using Win.Utils;
-
-namespace Win.Sfs.SettleAccount.HQKBExtends
-{
-
-    /// <summary>
-    /// �������Ӧ�÷���
-    /// </summary>
-    [Authorize(SettleAccountPermissions.Boms.Default)]
-    //[AllowAnonymous]
-    [Route("api/settleaccount/ErpShipping")]
-    public class HQKBExtendAppService : SettleAccountApplicationBase<HQKBExtend>
-    {
-        private readonly IGuidGenerator _guidGenerator;
-
-        private readonly IObjectMapper _objectMapper;
-
-        private readonly IExcelImportAppService _excelImportService;
-
-
-        private readonly ISettleAccountBranchEfCoreRepository<HQKBExtend, Guid> _repository;
-
-
-        private readonly ISettleAccountBranchEfCoreRepository<Material, Guid> _materialRepository;
-
-        private readonly ISettleAccountBranchEfCoreRepository<ImportColumnMap, Guid> _importColumnMapRepository;
-
-        private readonly ISettleAccountBranchEfCoreRepository<HQKBExtendVersion, Guid> _versionRepository;
-        /// <summary>
-        /// ��������
-        /// </summary>
-        /// <param name="guidGenerator">����UID</param>
-        /// <param name="objectMapper">�Զ�map</param>
-        /// <param name="repository">�ִ��ӿ�</param>
-        /// <param name="cache">����</param>
-        public HQKBExtendAppService(IGuidGenerator guidGenerator,
-           IObjectMapper objectMapper,
-           IExcelImportAppService excelImportService,
-           ISnowflakeIdGenerator snowflakeIdGenerator,
-           ICommonManager commonManager,
-           ISettleAccountBranchEfCoreRepository<HQKBExtend, Guid> repository,
-           ISettleAccountBranchEfCoreRepository<HQKBExtendVersion, Guid> versionRepository,
-           ISettleAccountBranchEfCoreRepository<Material, Guid> materialRepository,
-           ISettleAccountBranchEfCoreRepository<ImportColumnMap, Guid> importColumnMapRepository,
-           IDistributedCache<HQKBExtend> cache
-        ) : base(cache,excelImportService,snowflakeIdGenerator,commonManager)
-        {
-            _guidGenerator = guidGenerator;
-            _objectMapper = objectMapper;
-            _repository = repository;
-            _excelImportService = excelImportService;
-            _versionRepository = versionRepository;
-            _materialRepository = materialRepository;
-            _importColumnMapRepository = importColumnMapRepository;
-        }
-
-        #region ���뵼������
-
-       
-
-
-
-        /// <summary>
-        /// ���빦��
-        /// </summary>
-        /// <param name="files">�ϴ����ļ�(ǰ���Ѿ�����ֻ���ϴ�һ������)</param>
-        /// <returns></returns>
-        [HttpPost]
-        [Route("ExcelImport")]
-        [DisableRequestSizeLimit]
- 
-
-        public async Task<string> HQKBExtendUploadExcelImport([FromForm] IFormFileCollection files, Guid branchId, string year, string period, string version, string customerCode,string factory)
-        {
-          
-            ExportImporter _exportImporter = new ExportImporter();
-            var result = await _exportImporter.UploadExcelImport<HQKBExtendDto>(files, _excelImportService);
-            var entityList = ObjectMapper.Map<List<HQKBExtendDto>, List<HQKBExtend>>(result);
-            var _versionQuery = _versionRepository.Where(p => p.Version == version  );
-            await _versionQuery.BatchDeleteAsync();
-            var _query = _repository.Where(p => p.Version == version );
-            await _query.BatchDeleteAsync();
-            //var checkList = new List<ErrorExportDto>();
-            //var _matList =await _materialRepository.GetAllAsync(GuidGenerator.Create());
-            // var _group =  entityList.GroupBy(x => new { x.ParentItemCode, x.ChildItemCode, x.Version }).Select(p => new { Count = p.Count(),ParentItmeCode=p.Key.ParentItemCode, ChildItemCode=p.Key.ChildItemCode });
-            //foreach (var itm in _group)
-            //{
-            //    if (itm.Count > 1)
-            //    {
-            //        checkList.Add(new ErrorExportDto(version, customerCode, string.Empty, string.Empty, string.Empty, string.Empty, string.Format("���ܵ��븸����{0},�ӱ���{1}���ظ�����", itm.ParentItmeCode, itm.ChildItemCode), string.Empty));
-            //    }
-            //}
-            //var _id = GuidGenerator.Create();
-            //var _HQKBExtendList = new List<HQKBExtendVersion>();     
-            //_HQKBExtendList.Add(new HQKBExtendVersion(_id, branchId, year, period, version, customerCode,factory));
-            //foreach (var itm in entityList)
-            //{
-            //    if (!_matList.Any(p => p.MaterialCode == itm.ParentItemCode))
-            //    {
-            //        checkList.Add(new ErrorExportDto(version, customerCode, string.Empty, string.Empty, itm.ParentItemCode, string.Empty, string.Format("���������ݲ��������Ϻ�{0}��", itm.ParentItemCode), string.Empty));
-            //        continue;
-            //    }
-            //    itm.SetValue(GuidGenerator.Create(),branchId,year,period,version,_id,factory);
-            //}
-            //if (checkList.Count > 0)
-            //{
-            //    return await ExportErrorReportAsync(checkList);
-            //}
-            await _repository.GetDbContext().BulkInsertAsync<HQKBExtend>(entityList);
-        
-             await _versionRepository.GetDbContext().BulkInsertAsync(new List<HQKBExtendVersion> { new HQKBExtendVersion(Guid.NewGuid(), branchId, year, period, version, customerCode, factory) });
-        
-            //st.Stop();
-            return ApplicationConsts.SuccessStr;
-        }
-        /// <summary>
-        /// �����ļ�
-        /// </summary>
-        /// <param name="input"></param>
-        /// <returns></returns>
-        [HttpPost]
-        [Route("Export")]
-
-        virtual public async Task<string> ExportAsync(HQKBExtendRequestDto input)
-        {
-            IExporter _csv = new CsvExporter();
-            IExporter _excel = new ExcelExporter();
-            //�������ϰ汾��������������ȫ����
-            if (!string.IsNullOrEmpty(input.Version ))
-            {
-                input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "Version", Logic = EnumFilterLogic.And, Value = input.Version.ToString() });
-            }
-            //else
-            //{
-            //    return new PagedResultDto<HQKBExtendDto>(0, new List<HQKBExtendDto>());
-            //}
-            var entities = await _repository.GetListByFilterAsync(input.BranchId, input.Filters, input.Sorting, int.MaxValue,
-               0, true);
-            var dtoDetails = ObjectMapper.Map<List<HQKBExtend>, List<HQKBExtendExportDto>>(entities);
-            string _fileName = string.Empty;
-            //������������
-
-            byte[] result = null;
-          
-
-  
-                    _fileName = string.Format("ERP����_{0}.xlsx", Guid.NewGuid().ToString("N"));
-                    result = await _excel.ExportAsByteArray(dtoDetails);
-
-     
-            result.ShouldNotBeNull();
-
-            //���浼���ļ�����������ɶ�����
-            await _excelImportService.SaveBlobAsync(
-                     new SaveExcelImportInputDto
-                     {
-                         Name = _fileName,
-                         Content = result
-                     }
-                 );
-            return _fileName;
-        }
-        #endregion
-
-        /// <summary>
-        /// ��ID��ȡΨһʵ��
-        /// </summary>
-        /// <remarks>
-        /// ����ʵ��ȫ������
-        /// </remarks>
-        /// <param name="id">ID</param>
-        /// <returns>ʵ��DTO</returns>
-        [HttpGet]
-        [Route("{id}")]
- 
-        virtual public async Task<HQKBExtendDto> GetAsync(Guid id)
-        {
-            var result = await _repository.GetAsync(id);
-            var dto = _objectMapper.Map<HQKBExtend, HQKBExtendDto>(result);
-            return dto;
-        }
-
-
-        private async Task<HQKBExtend> GetFromCacheAsync(Guid id)
-        {
-            var result =  await _repository.GetAsync(id);
-            return result;
-        }
-
-
-        private async Task<long> GetCountAsync(HQKBExtendRequestDto input)
-        {
-            return await _repository.GetCountByFilterAsync(input.BranchId, input.Filters);
-        }
-
-
-        private async Task<long> GetCountAsync(HQKBExtendVersionRequestDto input)
-        {
-            return await _versionRepository.GetCountByFilterAsync(input.BranchId, input.Filters);
-        }
-
-        /// <summary>
-        /// ��ȡʵ������
-        /// </summary>
-        /// <returns>ʵ������</returns>
-        [HttpGet]
-        [Route("count")]
-   
-        virtual public async Task<long> GetTotalCountAsync(Guid branchId)
-        {
-            return await _repository.GetCountAsync(branchId);
-        }
-
-   
-
-        /// <summary>
-        /// ɾ��ʵ��
-        /// </summary>
-        /// <param name="id">ID</param>
-        /// <returns>��</returns>
-        [HttpDelete]
-        [Route("{id}")]
-   
-        virtual public async Task DeleteAsync(Guid id)
-        {
-            //var entity = await GetFromCacheAsync(id);
-            //await Cache.DeleteAsync<HQKBExtend>(id.ToString());
-            await _repository.DeleteAsync(id);
-        }
-
-        /// <summary>
-        /// ��IDsɾ��ʵ���б�
-        /// </summary>
-        /// <param name="ids">IDs</param>
-        /// <returns>�Ƿ�ִ�гɹ�</returns>
-        [HttpPost]
-        [Route("delete")]
-  
-        virtual public async Task<bool> DeleteListAsync(List<Guid> ids)
-        {
-            //foreach (var id in ids)
-            //{
-            //    var entity = await GetFromCacheAsync(id);
-              
-            //}
-
-            return await _repository.DeleteListAsync(ids);
-        }
-
-      
-        ///// <summary>
-
-        /// <summary>
-        /// ����ɸѡ������ȡʵ���б�
-        /// </summary>
-        /// <remarks>
-        /// ������������:ɸѡ�����б�,��������,��������,ҳ��
-        /// </remarks>
-        /// <param name="input">��������</param>
-        /// <returns>ʵ��DTO�б�</returns>
-        [HttpPost]
-        [Route("list")]
-
-        public async Task<PagedResultDto<HQKBExtendDto>> GetListAsync(Guid parentId, HQKBExtendRequestDto input)
-        {
-            if (!string.IsNullOrEmpty(input.Version) )
-            {
-                input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "Version", Logic = EnumFilterLogic.And, Value = input.Version });
-            }
-            else
-            {
-               return new PagedResultDto<HQKBExtendDto>(0,new  List<HQKBExtendDto>());
-            }
-            var entities = await _repository.GetListByFilterAsync(input.BranchId, input.Filters, input.Sorting, input.MaxResultCount,
-                 input.SkipCount, true);
-            var totalCount = await GetCountAsync(input);
-            var dtos = _objectMapper.Map<List<HQKBExtend>, List<HQKBExtendDto>>(entities);
-            return new PagedResultDto<HQKBExtendDto>(totalCount, dtos);
-        }
-
-        ///// <summary>
-
-        /// <summary>
-        /// ����ɸѡ������ȡʵ���б�
-        /// </summary>
-        /// <remarks>
-        /// ������������:ɸѡ�����б�,��������,��������,ҳ��
-        /// </remarks>
-        /// <param name="input">��������</param>
-        /// <returns>ʵ��DTO�б�</returns>
-        [HttpPost]
-        [Route("listVersion")]
-
-        public async Task<PagedResultDto<HQKBExtendVersionDto>> GetVersionListAsync(HQKBExtendVersionRequestDto input)
-        {
-            var entities = await _versionRepository.GetListByFilterAsync(input.BranchId, input.Filters, input.Sorting, int.MaxValue,
-               input.SkipCount, true);
-
-            var totalCount = await GetCountAsync(input);
-            var dtos = _objectMapper.Map<List<HQKBExtendVersion>, List<HQKBExtendVersionDto>>(entities);
-            //foreach (var itm in dtos)
-            //{
-            //    itm.Version = itm.Version + string.Format("({0})", itm.Factory);
-            //}
-            return new PagedResultDto<HQKBExtendVersionDto>(totalCount, dtos);
-        } 
-    }
-}
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/HQExtend/HQKBSettleExtendAppService.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/HQExtend/HQKBSettleExtendAppService.cs
deleted file mode 100644
index 9b3f16f6..00000000
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/HQExtend/HQKBSettleExtendAppService.cs
+++ /dev/null
@@ -1,346 +0,0 @@
-
-
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Linq;
-using System.Threading.Tasks;
-using EFCore.BulkExtensions;
-using Magicodes.ExporterAndImporter.Core;
-using Magicodes.ExporterAndImporter.Csv;
-using Magicodes.ExporterAndImporter.Excel;
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.Extensions.Caching.Distributed;
-using Shouldly;
-using Volo.Abp;
-using Volo.Abp.Application.Dtos;
-using Volo.Abp.Application.Services;
-using Volo.Abp.Caching;
-using Volo.Abp.Domain.Repositories;
-using Volo.Abp.Guids;
-using Volo.Abp.ObjectMapping;
-using Volo.Abp.Uow;
-using Win.Abp.Snowflakes;
-using Win.Sfs.BaseData.ImportExcelCommon;
-using Win.Sfs.SettleAccount.CommonManagers;
-using Win.Sfs.SettleAccount.Constant;
-using Win.Sfs.SettleAccount.Entities.ERPShipping;
-using Win.Sfs.SettleAccount.Entities.ERPShpping;
-using Win.Sfs.SettleAccount.Entities.HQExtend;
-using Win.Sfs.SettleAccount.Entities.ImportMap;
-using Win.Sfs.SettleAccount.Entities.Materials;
-using Win.Sfs.SettleAccount.ExcelImporter;
-using Win.Sfs.SettleAccount.ExportReports;
-using Win.Sfs.Shared.CacheBase;
-using Win.Sfs.Shared.Filter;
-using Win.Utils;
-
-namespace Win.Sfs.SettleAccount.HQKBExtends
-{
-
-    /// <summary>
-    /// �������Ӧ�÷���
-    /// </summary>
-    [Authorize(SettleAccountPermissions.Boms.Default)]
-    //[AllowAnonymous]
-    [Route("api/settleaccount/ErpShipping")]
-    public class HQKBSettleExtendAppService : SettleAccountApplicationBase<HQKBSettleExtend>
-    {
-        private readonly IGuidGenerator _guidGenerator;
-
-        private readonly IObjectMapper _objectMapper;
-
-        private readonly IExcelImportAppService _excelImportService;
-
-
-        private readonly ISettleAccountBranchEfCoreRepository<HQKBSettleExtend, Guid> _repository;
-
-
-        private readonly ISettleAccountBranchEfCoreRepository<Material, Guid> _materialRepository;
-
-        private readonly ISettleAccountBranchEfCoreRepository<ImportColumnMap, Guid> _importColumnMapRepository;
-
-        private readonly ISettleAccountBranchEfCoreRepository<HQKBSettleExtendVersion, Guid> _versionRepository;
-        /// <summary>
-        /// ��������
-        /// </summary>
-        /// <param name="guidGenerator">����UID</param>
-        /// <param name="objectMapper">�Զ�map</param>
-        /// <param name="repository">�ִ��ӿ�</param>
-        /// <param name="cache">����</param>
-        public HQKBSettleExtendAppService(IGuidGenerator guidGenerator,
-           IObjectMapper objectMapper,
-           IExcelImportAppService excelImportService,
-           ISnowflakeIdGenerator snowflakeIdGenerator,
-           ICommonManager commonManager,
-           ISettleAccountBranchEfCoreRepository<HQKBSettleExtend, Guid> repository,
-           ISettleAccountBranchEfCoreRepository<HQKBSettleExtendVersion, Guid> versionRepository,
-           ISettleAccountBranchEfCoreRepository<Material, Guid> materialRepository,
-           ISettleAccountBranchEfCoreRepository<ImportColumnMap, Guid> importColumnMapRepository,
-           IDistributedCache<HQKBSettleExtend> cache
-        ) : base(cache,excelImportService,snowflakeIdGenerator,commonManager)
-        {
-            _guidGenerator = guidGenerator;
-            _objectMapper = objectMapper;
-            _repository = repository;
-            _excelImportService = excelImportService;
-            _versionRepository = versionRepository;
-            _materialRepository = materialRepository;
-            _importColumnMapRepository = importColumnMapRepository;
-        }
-
-        #region ���뵼������
-
-       
-
-
-        /// <summary>
-        /// ���빦��
-        /// </summary>
-        /// <param name="files">�ϴ����ļ�(ǰ���Ѿ�����ֻ���ϴ�һ������)</param>
-        /// <returns></returns>
-        [HttpPost]
-        [Route("ExcelImport")]
-        [DisableRequestSizeLimit]
- 
-
-        public async Task<string> HQKBSettleExtendUploadExcelImport([FromForm] IFormFileCollection files, Guid branchId, string year, string period, string version, string customerCode,string factory)
-        {
-          
-            ExportImporter _exportImporter = new ExportImporter();
-            var result = await _exportImporter.UploadExcelImport<HQKBSettleExtendDto>(files, _excelImportService);
-            var entityList = ObjectMapper.Map<List<HQKBSettleExtendDto>, List<HQKBSettleExtend>>(result);
-            var _versionQuery = _versionRepository.Where(p => p.Version == version  );
-            await _versionQuery.BatchDeleteAsync();
-            var _query = _repository.Where(p => p.Version == version );
-            await _query.BatchDeleteAsync();
-            //var checkList = new List<ErrorExportDto>();
-            //var _matList =await _materialRepository.GetAllAsync(GuidGenerator.Create());
-            // var _group =  entityList.GroupBy(x => new { x.ParentItemCode, x.ChildItemCode, x.Version }).Select(p => new { Count = p.Count(),ParentItmeCode=p.Key.ParentItemCode, ChildItemCode=p.Key.ChildItemCode });
-            //foreach (var itm in _group)
-            //{
-            //    if (itm.Count > 1)
-            //    {
-            //        checkList.Add(new ErrorExportDto(version, customerCode, string.Empty, string.Empty, string.Empty, string.Empty, string.Format("���ܵ��븸����{0},�ӱ���{1}���ظ�����", itm.ParentItmeCode, itm.ChildItemCode), string.Empty));
-            //    }
-            //}
-            //var _id = GuidGenerator.Create();
-            //var _HQKBSettleExtendList = new List<HQKBSettleExtendVersion>();     
-            //_HQKBSettleExtendList.Add(new HQKBSettleExtendVersion(_id, branchId, year, period, version, customerCode,factory));
-            //foreach (var itm in entityList)
-            //{
-            //    if (!_matList.Any(p => p.MaterialCode == itm.ParentItemCode))
-            //    {
-            //        checkList.Add(new ErrorExportDto(version, customerCode, string.Empty, string.Empty, itm.ParentItemCode, string.Empty, string.Format("���������ݲ��������Ϻ�{0}��", itm.ParentItemCode), string.Empty));
-            //        continue;
-            //    }
-            //    itm.SetValue(GuidGenerator.Create(),branchId,year,period,version,_id,factory);
-            //}
-            //if (checkList.Count > 0)
-            //{
-            //    return await ExportErrorReportAsync(checkList);
-            //}
-            await _repository.GetDbContext().BulkInsertAsync<HQKBSettleExtend>(entityList);
-        
-             await _versionRepository.GetDbContext().BulkInsertAsync(new List<HQKBSettleExtendVersion> { new HQKBSettleExtendVersion(Guid.NewGuid(), branchId, year, period, version, customerCode, factory) });
-        
-            //st.Stop();
-            return ApplicationConsts.SuccessStr;
-        }
-        /// <summary>
-        /// �����ļ�
-        /// </summary>
-        /// <param name="input"></param>
-        /// <returns></returns>
-        [HttpPost]
-        [Route("Export")]
-
-        virtual public async Task<string> ExportAsync(HQKBSettleExtendRequestDto input)
-        {
-            IExporter _csv = new CsvExporter();
-            IExporter _excel = new ExcelExporter();
-            //�������ϰ汾��������������ȫ����
-            if (!string.IsNullOrEmpty(input.Version ))
-            {
-                input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "Version", Logic = EnumFilterLogic.And, Value = input.Version.ToString() });
-            }
-            //else
-            //{
-            //    return new PagedResultDto<HQKBSettleExtendDto>(0, new List<HQKBSettleExtendDto>());
-            //}
-            var entities = await _repository.GetListByFilterAsync(input.BranchId, input.Filters, input.Sorting, int.MaxValue,
-               0, true);
-            var dtoDetails = ObjectMapper.Map<List<HQKBSettleExtend>, List<HQKBSettleExtendExportDto>>(entities);
-            string _fileName = string.Empty;
-            //������������
-
-            byte[] result = null;
-          
-
-  
-                    _fileName = string.Format("ERP����_{0}.xlsx", Guid.NewGuid().ToString("N"));
-                    result = await _excel.ExportAsByteArray(dtoDetails);
-
-     
-            result.ShouldNotBeNull();
-
-            //���浼���ļ�����������ɶ�����
-            await _excelImportService.SaveBlobAsync(
-                     new SaveExcelImportInputDto
-                     {
-                         Name = _fileName,
-                         Content = result
-                     }
-                 );
-            return _fileName;
-        }
-        #endregion
-
-        /// <summary>
-        /// ��ID��ȡΨһʵ��
-        /// </summary>
-        /// <remarks>
-        /// ����ʵ��ȫ������
-        /// </remarks>
-        /// <param name="id">ID</param>
-        /// <returns>ʵ��DTO</returns>
-        [HttpGet]
-        [Route("{id}")]
- 
-        virtual public async Task<HQKBSettleExtendDto> GetAsync(Guid id)
-        {
-            var result = await _repository.GetAsync(id);
-            var dto = _objectMapper.Map<HQKBSettleExtend, HQKBSettleExtendDto>(result);
-            return dto;
-        }
-
-
-        private async Task<HQKBSettleExtend> GetFromCacheAsync(Guid id)
-        {
-            var result =  await _repository.GetAsync(id);
-            return result;
-        }
-
-
-        private async Task<long> GetCountAsync(HQKBSettleExtendRequestDto input)
-        {
-            return await _repository.GetCountByFilterAsync(input.BranchId, input.Filters);
-        }
-
-
-        private async Task<long> GetCountAsync(HQKBSettleExtendVersionRequestDto input)
-        {
-            return await _versionRepository.GetCountByFilterAsync(input.BranchId, input.Filters);
-        }
-
-        /// <summary>
-        /// ��ȡʵ������
-        /// </summary>
-        /// <returns>ʵ������</returns>
-        [HttpGet]
-        [Route("count")]
-   
-        virtual public async Task<long> GetTotalCountAsync(Guid branchId)
-        {
-            return await _repository.GetCountAsync(branchId);
-        }
-
-   
-
-        /// <summary>
-        /// ɾ��ʵ��
-        /// </summary>
-        /// <param name="id">ID</param>
-        /// <returns>��</returns>
-        [HttpDelete]
-        [Route("{id}")]
-   
-        virtual public async Task DeleteAsync(Guid id)
-        {
-            //var entity = await GetFromCacheAsync(id);
-            //await Cache.DeleteAsync<HQKBSettleExtend>(id.ToString());
-            await _repository.DeleteAsync(id);
-        }
-
-        /// <summary>
-        /// ��IDsɾ��ʵ���б�
-        /// </summary>
-        /// <param name="ids">IDs</param>
-        /// <returns>�Ƿ�ִ�гɹ�</returns>
-        [HttpPost]
-        [Route("delete")]
-  
-        virtual public async Task<bool> DeleteListAsync(List<Guid> ids)
-        {
-            //foreach (var id in ids)
-            //{
-            //    var entity = await GetFromCacheAsync(id);
-              
-            //}
-
-            return await _repository.DeleteListAsync(ids);
-        }
-
-      
-        ///// <summary>
-
-        /// <summary>
-        /// ����ɸѡ������ȡʵ���б�
-        /// </summary>
-        /// <remarks>
-        /// ������������:ɸѡ�����б�,��������,��������,ҳ��
-        /// </remarks>
-        /// <param name="input">��������</param>
-        /// <returns>ʵ��DTO�б�</returns>
-        [HttpPost]
-        [Route("list")]
-
-        public async Task<PagedResultDto<HQKBSettleExtendDto>> GetListAsync(Guid parentId, HQKBSettleExtendRequestDto input)
-        {
-            if (!string.IsNullOrEmpty(input.Version) )
-            {
-                input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "Version", Logic = EnumFilterLogic.And, Value = input.Version });
-            }
-            else
-            {
-               return new PagedResultDto<HQKBSettleExtendDto>(0,new  List<HQKBSettleExtendDto>());
-            }
-            var entities = await _repository.GetListByFilterAsync(input.BranchId, input.Filters, input.Sorting, input.MaxResultCount,
-                 input.SkipCount, true);
-            var totalCount = await GetCountAsync(input);
-            var dtos = _objectMapper.Map<List<HQKBSettleExtend>, List<HQKBSettleExtendDto>>(entities);
-            return new PagedResultDto<HQKBSettleExtendDto>(totalCount, dtos);
-        }
-
-        ///// <summary>
-
-        /// <summary>
-        /// ����ɸѡ������ȡʵ���б�
-        /// </summary>
-        /// <remarks>
-        /// ������������:ɸѡ�����б�,��������,��������,ҳ��
-        /// </remarks>
-        /// <param name="input">��������</param>
-        /// <returns>ʵ��DTO�б�</returns>
-        [HttpPost]
-        [Route("listVersion")]
-
-        public async Task<PagedResultDto<HQKBSettleExtendVersionDto>> GetVersionListAsync(HQKBSettleExtendVersionRequestDto input)
-        {
-            var entities = await _versionRepository.GetListByFilterAsync(input.BranchId, input.Filters, input.Sorting, int.MaxValue,
-               input.SkipCount, true);
-
-            var totalCount = await GetCountAsync(input);
-            var dtos = _objectMapper.Map<List<HQKBSettleExtendVersion>, List<HQKBSettleExtendVersionDto>>(entities);
-            //foreach (var itm in dtos)
-            //{
-            //    itm.Version = itm.Version + string.Format("({0})", itm.Factory);
-            //}
-            return new PagedResultDto<HQKBSettleExtendVersionDto>(totalCount, dtos);
-        } 
-    }
-}
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/HQ_H/HQ_H_PlatformAppService.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/HQ_H/HQ_H_PlatformAppService.cs
deleted file mode 100644
index 76a5e094..00000000
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/HQ_H/HQ_H_PlatformAppService.cs
+++ /dev/null
@@ -1,344 +0,0 @@
-using EFCore.BulkExtensions;
-using Magicodes.ExporterAndImporter.Core;
-using Magicodes.ExporterAndImporter.Csv;
-using Magicodes.ExporterAndImporter.Excel;
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Mvc;
-using Shouldly;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Volo.Abp;
-using Volo.Abp.Application.Dtos;
-using Volo.Abp.Caching;
-using Volo.Abp.Domain.Repositories;
-using Volo.Abp.Guids;
-using Volo.Abp.Uow;
-using Win.Abp.Snowflakes;
-using Win.Sfs.BaseData.ImportExcelCommon;
-using Win.Sfs.SettleAccount.CommonManagers;
-using Win.Sfs.SettleAccount.Constant;
-using Win.Sfs.SettleAccount.ExcelImporter;
-using Win.Sfs.SettleAccount.ExportReports;
-using Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report;
-using Win.Sfs.Shared.Filter;
-
-namespace Win.Sfs.SettleAccount.Entities.HQ_H
-{
-    /// <summary>
-    /// 红旗H平台导入
-    /// </summary>
-    [Authorize(SettleAccountPermissions.HQ_HPlatform.Default)]
-    //[AllowAnonymous]
-    [Route("api/settleaccount/HQHPlatform")]
-    public class HQ_H_PlatformAppService : SettleAccountApplicationBase<HQ_H_Platform>, IHQ_H_PlatformAppService
-    {
-        private readonly IGuidGenerator _guidGenerator;
-
-        private readonly IExcelImportAppService _excelImportService;
-
-        private readonly ISettleAccountBranchEfCoreRepository<HQ_H_PlatformVersion, Guid> _versionRepository;
-
-        private readonly ISettleAccountBranchEfCoreRepository<HQ_H_Platform, Guid> _repository;
-
-
-        private readonly ErpPartDapperRepository _erpdapperRepository;
-        /// <summary>
-        /// 构建方法
-        /// </summary>
-        /// <param name="guidGenerator">构建UID</param>
-        /// <param name="repository">仓储接口</param>
-        /// <param name="cache">缓存</param>
-        public HQ_H_PlatformAppService(IGuidGenerator guidGenerator,
-         ISettleAccountBranchEfCoreRepository<HQ_H_PlatformVersion, Guid> versionRepository,
-           ISettleAccountBranchEfCoreRepository<HQ_H_Platform, Guid> repository,
-            IDistributedCache<HQ_H_Platform> cache,
-            IExcelImportAppService excelImportService,
-            ISnowflakeIdGenerator snowflakeIdGenerator,
-                ErpPartDapperRepository erpdapperRepository,
-            ICommonManager commonManager
-        ) : base(cache, excelImportService, snowflakeIdGenerator, commonManager)
-        {
-            _versionRepository = versionRepository;
-            _guidGenerator = guidGenerator;
-            _excelImportService = excelImportService;
-            _repository = repository;
-            _erpdapperRepository = erpdapperRepository;
-        }
-
-        /// <summary>
-        /// 统一导入红旗平台数据，包括H、M、F平台
-        /// </summary>
-        /// <param name="files"></param>
-        /// <param name="branchId"></param>
-        /// <param name="year"></param>
-        /// <param name="period"></param>
-        /// <param name="version"></param>
-        /// <param name="customerCode"></param>
-        /// <returns></returns>
-        [HttpPost]
-        [Route("ExcelImport")]
-        [DisableRequestSizeLimit]
-        [UnitOfWork(false)]
-        [Authorize(SettleAccountPermissions.HQ_HPlatform.Create)]
-        public async Task<string> HQ_H_PlatformUploadExcelImport([FromForm] IFormFileCollection files, Guid branchId, string year, string period, string version, string customerCode)
-        {
-            ExportImporter _exportImporter = new ExportImporter();
-            var checkList = new List<ErrorExportDto>();
-            var result = await _exportImporter.UploadExcelImport<HQ_H_PlatformImportDto>(files, _excelImportService);
-
-            if (result == null || result.Count == 0)
-            {
-                throw new BusinessException("导入模板数据不能为空！");
-            }
-
-            var entityList = ObjectMapper.Map<List<HQ_H_PlatformImportDto>, List<HQ_H_Platform>>(result);
-
-            //和物料主数据中SAP物料号检验是否存在
-            foreach (var itm in entityList)
-            {
-                if (!_erpdapperRepository.GetMaterialList().Any(p => p.CustomerPartCode == itm.MaterialCode))
-                {
-                    checkList.Add(new ErrorExportDto(version, "红旗结算导入", string.Empty, string.Empty, itm.MaterialCode, string.Empty, string.Format("物料主数据不存在当前导入的物料号{0}！", itm.MaterialCode), string.Empty));
-                }
-            }
-
-            if (checkList.Count > 0)
-            {
-                return await ExportErrorReportAsync(checkList);
-            }
-
-            //删除版本
-            var _versionQuery = _versionRepository.Where(p => p.Version == version);
-            await _versionQuery.BatchDeleteAsync();
-            //删除明细
-            var _query = _repository.Where(p => p.Version == version);
-            await _query.BatchDeleteAsync();
-
-            var _id = GuidGenerator.Create();
-            var _bomList = new List<HQ_H_PlatformVersion>();
-            _bomList.Add(new HQ_H_PlatformVersion(_id, branchId, year, period, version, customerCode));
-            foreach (var itm in entityList)
-            {
-                if (string.IsNullOrEmpty(itm.HQHKanBan) && itm.StorageLocationDesc.Contains("备品"))
-                {
-                    //赋值上主键ID
-                    itm.SetValue(GuidGenerator.Create(), branchId, year, period, version, "BJ");//备品库没有看板号，需要特殊标识一下BJ,已经和客户确认
-                }
-                else
-                {
-                    itm.SetValue(GuidGenerator.Create(), branchId, year, period, version);
-                }
-            }
-        
-            await _repository.GetDbContext().BulkInsertAsync<HQ_H_Platform>(entityList);
-            await _versionRepository.GetDbContext().BulkInsertAsync(_bomList);
-
-            return ApplicationConsts.SuccessStr;
-        }
-
-
-        /// <summary>
-        /// 按ID获取唯一实体
-        /// </summary>
-        /// <remarks>
-        /// 返回实体全部属性
-        /// </remarks>
-        /// <param name="id">ID</param>
-        /// <returns>实体DTO</returns>
-        [HttpGet]
-        [Route("{id}")]
-        virtual public async Task<HQ_H_PlatformDto> GetAsync(Guid id)
-        {
-            var result = await GetFromCacheAsync(id);
-            var dto = ObjectMapper.Map<HQ_H_Platform, HQ_H_PlatformDto>(result);
-            return dto;
-        }
-
-
-        private async Task<HQ_H_Platform> GetFromCacheAsync(Guid id)
-        {
-            var result = await _repository.GetAsync(id);
-            return result;
-        }
-
-
-        private async Task<long> GetCountAsync(HQ_H_PlatformRequestDto input)
-        {
-            return await _repository.GetCountByFilterAsync(input.BranchId, input.Filters);
-        }
-
-        private async Task<long> GetCountAsync(HQ_H_PlatformVersionRequestDto input)
-        {
-            return await _versionRepository.GetCountByFilterAsync(input.BranchId, input.Filters);
-        }
-
-
-        /// <summary>
-        /// 导出文件
-        /// </summary>
-        /// <param name="input"></param>
-        /// <returns></returns>
-        [HttpPost]
-        [Route("Export")]
-        virtual public async Task<string> ExportAsync(HQ_H_PlatformRequestDto input)
-        {
-
-            IExporter _csv = new CsvExporter();
-            IExporter _excel = new ExcelExporter();
-            if (!string.IsNullOrEmpty(input.Version))
-            {
-                input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "Version", Logic = EnumFilterLogic.And, Value = input.Version });
-            }
-            var entities = await _repository.GetListByFilterAsync(input.BranchId, input.Filters, input.Sorting, int.MaxValue,
-               0, true);
-
-            var dtoDetails = ObjectMapper.Map<List<HQ_H_Platform>, List<HQ_H_PlatformExportDto>>(entities);
-
-            string _fileName = string.Empty;
-            //声明导出容器
-
-            byte[] result = null;
-            switch (input.FileType)
-            {
-                case 0:
-                    _fileName = string.Format("红旗工厂结算明细_{0}.csv", input.UserId.ToString());
-                    result = await _csv.ExportAsByteArray(dtoDetails);
-                    break;
-                case 1:
-                    _fileName = string.Format("红旗工厂结算明细_{0}.xlsx", input.UserId.ToString());
-                    result = await _excel.ExportAsByteArray(dtoDetails);
-                    break;
-            }
-            result.ShouldNotBeNull();
-
-            //保存导出文件到服务器存成二进制
-            await _excelImportService.SaveBlobAsync(
-                     new SaveExcelImportInputDto
-                     {
-                         Name = _fileName,
-                         Content = result
-                     }
-                 );
-            return _fileName;
-        }
-
-
-        /// <summary>
-        /// 根据筛选条件获取实体列表
-        /// </summary>
-        /// <remarks>
-        /// 请求条件包括:筛选条件列表,排序条件,数据数量,页码
-        /// </remarks>
-        /// <param name="input">请求条件</param>
-        /// <returns>实体DTO列表</returns>
-        [HttpPost]
-        [Route("list")]
-        virtual public async Task<PagedResultDto<HQ_H_PlatformDto>> GetListAsync(HQ_H_PlatformRequestDto input)
-        {
-            if (!string.IsNullOrEmpty(input.Version))
-            {
-                input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "Version", Logic = EnumFilterLogic.And, Value = input.Version });
-            }
-            else
-            {
-                return new PagedResultDto<HQ_H_PlatformDto>(0, new List<HQ_H_PlatformDto>());
-            }
-            var entities = await _repository.GetListByFilterAsync(input.BranchId, input.Filters, input.Sorting, input.MaxResultCount,
-                 input.SkipCount, true);
-
-            var totalCount = await GetCountAsync(input);
-            var dtos = ObjectMapper.Map<List<HQ_H_Platform>, List<HQ_H_PlatformDto>>(entities);
-
-            return new PagedResultDto<HQ_H_PlatformDto>(totalCount, dtos);
-        }
-
-
-        /// <summary>
-        /// 获取实体总数
-        /// </summary>
-        /// <returns>实体总数</returns>
-        [HttpGet]
-        [Route("count")]
-        [Authorize(SettleAccountPermissions.SettleAccounts.Default)]
-        virtual public async Task<long> GetTotalCountAsync(Guid branchId)
-        {
-            return await _repository.GetCountAsync(branchId);
-        }
-
-        /// <summary>
-        /// 获取全部实体列表
-        /// </summary>
-        /// <returns>实体DTO列表</returns>
-        [HttpGet]
-        [Route("all")]
-        virtual public async Task<ListResultDto<HQ_H_PlatformDto>> GetAllAsync(Guid branchId)
-        {
-            var entities = await _repository.GetAllAsync(branchId, true);
-
-
-            var dtos = ObjectMapper.Map<List<HQ_H_Platform>, List<HQ_H_PlatformDto>>(entities);
-
-
-            return new ListResultDto<HQ_H_PlatformDto>(dtos);
-        }
-
-
-
-        /// <summary>
-        /// 删除实体
-        /// </summary>
-        /// <param name="id">ID</param>
-        /// <returns>无</returns>
-        [HttpDelete]
-        [Route("{id}")]
-        /// [Authorize(SettleAccountPermissions.SettleAccounts.Delete)]
-        virtual public async Task DeleteAsync(Guid id)
-        {
-            await _repository.DeleteAsync(id);
-        }
-
-        /// <summary>
-        /// 按IDs删除实体列表
-        /// </summary>
-        /// <param name="ids">IDs</param>
-        /// <returns>是否执行成功</returns>
-        [HttpPost]
-        [Route("delete")]
-        // [Authorize(SettleAccountPermissions.SettleAccounts.Delete)]
-        virtual public async Task<bool> DeleteListAsync(List<Guid> ids)
-        {
-            foreach (var id in ids)
-            {
-                var entity = await GetFromCacheAsync(id);
-                //await Cache.DeleteAsync<SettleAccount>(id.ToString());
-            }
-
-            return await _repository.DeleteListAsync(ids);
-        }
-
-
-
-        /// <summary>
-        /// 版本列表查询
-        /// </summary>
-        /// <param name="input"></param>
-        /// <returns></returns>
-        [HttpPost]
-        [Route("listversion")]
-        public async Task<PagedResultDto<HQ_H_PlatformVersionDto>> GetVersionListAsync(HQ_H_PlatformVersionRequestDto input)
-        {
-            var entities = await _versionRepository.GetListByFilterAsync(input.BranchId, input.Filters, input.Sorting, int.MaxValue,
-               input.SkipCount, true);
-
-            var totalCount = await GetCountAsync(input);
-            var dtos = ObjectMapper.Map<List<HQ_H_PlatformVersion>, List<HQ_H_PlatformVersionDto>>(entities);
-
-            return new PagedResultDto<HQ_H_PlatformVersionDto>(totalCount, dtos);
-        }
-
-    }
-}
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/Materials/MaterialAppService.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/Materials/MaterialAppService.cs
index 9f6825b7..9aa8e504 100644
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/Materials/MaterialAppService.cs
+++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/Materials/MaterialAppService.cs
@@ -26,11 +26,9 @@ using Win.Sfs.SettleAccount.Boms;
 using Win.Sfs.SettleAccount.CommonManagers;
 using Win.Sfs.SettleAccount.Constant;
 using Win.Sfs.SettleAccount.Entities.Boms;
-using Win.Sfs.SettleAccount.Entities.EstimatedInventories;
 using Win.Sfs.SettleAccount.Entities.ImportMap;
 using Win.Sfs.SettleAccount.Entities.Prices;
 using Win.Sfs.SettleAccount.Entities.TaskJobs;
-using Win.Sfs.SettleAccount.EstimatedInventories;
 using Win.Sfs.SettleAccount.ExcelImporter;
 using Win.Sfs.SettleAccount.ExportReports;
 
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/SettleAccounts/SettleAccountAppService.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/SettleAccounts/SettleAccountAppService.cs
index c3de3f3d..0d087b65 100644
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/SettleAccounts/SettleAccountAppService.cs
+++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/SettleAccounts/SettleAccountAppService.cs
@@ -43,7 +43,6 @@ using Magicodes.ExporterAndImporter.Core.Models;
 
 using TaskJob.Services;
 using TaskJob.EventArgs;
-using Win.Sfs.SettleAccount.Entities.WMS;
 using Win.Sfs.SettleAccount.Entities.Wms;
 using Win.Sfs.SettleAccount.Repository;
 
@@ -62,14 +61,11 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
         private readonly IExcelImportAppService _excelImportService;
 
         private readonly ISettleAccountBranchEfCoreRepository<Prebatches.Prebatch, Guid> _preBatchRepository;
-        private readonly ISettleAccountBranchEfCoreRepository<WmsJitOutPutDetial, Guid> _wmsRepository;
-        private readonly ISettleAccountBranchEfCoreRepository<WmsJitOutPut, Guid> _wmsVersionRepository;
+
         private readonly ISettleAccountBranchEfCoreRepository<SettleAccount, Guid> _repository;
         private readonly ISettleAccountBranchEfCoreRepository<SettleAccountVersion, Guid> _versionRepository;
         private readonly ISettleAccountBranchEfCoreRepository<FIS, Guid> _fisRepository;
         private readonly ISettleAccountBranchEfCoreRepository<MaterialRelationship, Guid> _relrepository;
-
-        private readonly WMSEfCoreRepository<WmsJitOutPutDetial> _wmsefRespository;
         private readonly TaskJobService _service;
         /// <summary>
         /// 构建方法
@@ -88,10 +84,7 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
             TaskJobService service,
             ISettleAccountBranchEfCoreRepository<FIS, Guid> fisRepository,
             ISettleAccountBranchEfCoreRepository<Prebatches.Prebatch, Guid> preBatchRepository,
-            ISettleAccountBranchEfCoreRepository<MaterialRelationship, Guid> relrepository,
-            ISettleAccountBranchEfCoreRepository<WmsJitOutPutDetial, Guid> wmsRepository,
-            ISettleAccountBranchEfCoreRepository<WmsJitOutPut, Guid> wmsVersionRepository,
-            WMSEfCoreRepository<WmsJitOutPutDetial> wmsefRespository
+            ISettleAccountBranchEfCoreRepository<MaterialRelationship, Guid> relrepository
         ) : base(cache, excelImportService, snowflakeIdGenerator, commonManager)
         {
             _service = service;
@@ -102,9 +95,6 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
             _repository = repository;
             _preBatchRepository = preBatchRepository;
             _relrepository = relrepository;
-            _wmsRepository = wmsRepository;
-            _wmsVersionRepository = wmsVersionRepository;
-            _wmsefRespository = wmsefRespository;
         }
 
 
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/SettlementCrossReference/SettlementCrossReferenceAppService.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/SettlementCrossReference/SettlementCrossReferenceAppService.cs
deleted file mode 100644
index de2463a5..00000000
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/SettlementCrossReference/SettlementCrossReferenceAppService.cs
+++ /dev/null
@@ -1,468 +0,0 @@
-
-
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Linq;
-using System.Threading.Tasks;
-using EFCore.BulkExtensions;
-using Magicodes.ExporterAndImporter.Core;
-using Magicodes.ExporterAndImporter.Csv;
-using Magicodes.ExporterAndImporter.Excel;
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.Extensions.Caching.Distributed;
-using Shouldly;
-using Volo.Abp;
-using Volo.Abp.Application.Dtos;
-using Volo.Abp.Application.Services;
-using Volo.Abp.Caching;
-using Volo.Abp.Domain.Repositories;
-using Volo.Abp.Guids;
-using Volo.Abp.ObjectMapping;
-using Volo.Abp.Uow;
-using Win.Abp.Snowflakes;
-using Win.Sfs.BaseData.ImportExcelCommon;
-using Win.Sfs.SettleAccount.CommonManagers;
-using Win.Sfs.SettleAccount.Constant;
-using Win.Sfs.SettleAccount.Entities.ItemInvoicePrices;
-using Win.Sfs.SettleAccount.Entities.ImportMap;
-using Win.Sfs.SettleAccount.Entities.Materials;
-using Win.Sfs.SettleAccount.ExcelImporter;
-using Win.Sfs.SettleAccount.ExportReports;
-using Win.Sfs.Shared.CacheBase;
-using Win.Sfs.Shared.Filter;
-using Win.Utils;
-using Win.Sfs.SettleAccount.MaterialRelationships;
-using Win.Sfs.SettleAccount.Entities.MaterialRelationships;
-using Win.Sfs.SettleAccount.Entities.SettlementParts;
-using Win.Sfs.SettleAccount.Entities.SettlementCrossReferences;
-using Win.Sfs.SettleAccount.Entities.SettlementCrossReference;
-using System.IO;
-
-namespace Win.Sfs.SettleAccount.SettlementCrossReferences
-{
-
-    /// <summary>
-    /// ��������չ�ϵ����
-    /// </summary>
-    //[AllowAnonymous]
-    [Route("api/settleaccount/SettlementCrossReference")]
-    [Authorize(SettleAccountPermissions.Boms.Default)]
-    public class SettlementCrossReferenceAppService : SettleAccountApplicationBase<SettlementCrossReference>, ISettlementCrossReferenceAppService
-    {
-
-        private readonly IObjectMapper _objectMapper;
-
-        private readonly ISettleAccountBranchEfCoreRepository<SettlementCrossReference, Guid> _repository;
-
-        private readonly ISettleAccountBranchEfCoreRepository<SettlementCrossReferenceVersion, Guid> _versionRepository;
-        private readonly ISettleAccountBranchEfCoreRepository<Prebatches.Prebatch, Guid> _preBatchRepository;
-        private readonly ISettleAccountBranchEfCoreRepository<MaterialRelationship, Guid> _relrepository;
-
-
-
-        /// <summary>
-        /// ��������
-        /// </summary>
-        /// <param name="guidGenerator">����UID</param>
-        /// <param name="objectMapper">�Զ�map</param>
-        /// <param name="repository">�ִ��ӿ�</param>
-        /// <param name="cache">����</param>
-        public SettlementCrossReferenceAppService(IGuidGenerator guidGenerator,
-           IObjectMapper objectMapper,
-           IExcelImportAppService excelImportService,
-           ISnowflakeIdGenerator snowflakeIdGenerator,
-           ICommonManager commonManager,
-           ISettleAccountBranchEfCoreRepository<SettlementCrossReference, Guid> repository,
-           ISettleAccountBranchEfCoreRepository<SettlementCrossReferenceVersion, Guid> versionRepository,
-           ISettleAccountBranchEfCoreRepository<Material, Guid> materialRepository,
-           ISettleAccountBranchEfCoreRepository<ImportColumnMap, Guid> importColumnMapRepository,
-           ISettleAccountBranchEfCoreRepository<MaterialRelationshipDetail, Guid> relationRepository,
-           ISettleAccountBranchEfCoreRepository<SettlementPart, Guid> priceRepository,
-           ISettleAccountBranchEfCoreRepository<Prebatches.Prebatch, Guid> preBatchRepository,
-           ISettleAccountBranchEfCoreRepository<MaterialRelationship, Guid> relrepository,
-
-        IDistributedCache<SettlementCrossReference> cache
-        ) : base(cache, excelImportService, snowflakeIdGenerator, commonManager)
-        {
-            //_guidGenerator = guidGenerator;
-            _objectMapper = objectMapper;
-            _repository = repository;
-            //_excelImportService = excelImportService;
-            _versionRepository = versionRepository;
-            _relrepository = relrepository;
-            _preBatchRepository = preBatchRepository;
-            //_materialRepository = materialRepository;
-            //_importColumnMapRepository = importColumnMapRepository;
-            //_relationRepository = relationRepository;
-            //_priceRepository = priceRepository;
-        }
-
-
-        ///// <summary>
-        /// <summary>
-        /// ����ɸѡ������ȡʵ���б�
-        /// </summary>
-        /// <remarks>
-        /// ������������:ɸѡ�����б�,��������,��������,ҳ��
-        /// </remarks>
-        /// <param name="input">��������</param>
-        /// <returns>ʵ��DTO�б�</returns>
-        [HttpPost]
-        [Route("list")]
-        //[Authorize(SettleAccountPermissions.SettlementCrossReference.Default)]
-        public async Task<PagedResultDto<SettlementCrossReferenceDto>> GetListAsync(SettlementCrossReferenceRequestDto input)
-        {
-
-            input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "Version", Logic = EnumFilterLogic.And, Value = input.Version });
-
-
-            var entities = await _repository.GetListByFilterAsync(input.BranchId, input.Filters, input.Sorting, input.MaxResultCount,
-                 input.SkipCount, true);
-            var totalCount = await GetCountAsync(input);
-            var dtos = _objectMapper.Map<List<SettlementCrossReference>, List<SettlementCrossReferenceDto>>(entities);
-           // var dtos = _objectMapper.Map<SettlementCrossReference, SettlementCrossReferenceDto>(entities);
-            return new PagedResultDto<SettlementCrossReferenceDto>(totalCount, dtos);
-        }
-
-
-        private async Task<long> GetCountAsync(SettlementCrossReferenceRequestDto input)
-        {
-            return await _repository.GetCountByFilterAsync(input.BranchId, input.Filters);
-        }
-
-
-        private async Task<long> GetCountAsync(SettlementCrossReferenceVersionRequestDto input)
-        {
-            return await _versionRepository.GetCountByFilterAsync(input.BranchId, input.Filters);
-        }
-
-        ///// <summary>
-        /// <summary>
-        /// ����ɸѡ������ȡʵ���б�
-        /// </summary>
-        /// <remarks>
-        /// ������������:ɸѡ�����б�,��������,��������,ҳ��
-        /// </remarks>
-        /// <param name="input">��������</param>
-        /// <returns>ʵ��DTO�б�</returns>
-        [HttpPost]
-        [Route("versionlist")]
-        //[Authorize(SettleAccountPermissions.SettlementCrossReference.Default)]
-        public async Task<PagedResultDto<SettlementCrossReferenceVersionDto>> GetVersionListAsync(SettlementCrossReferenceVersionRequestDto input)
-        {
-            var entities = await _versionRepository.GetListByFilterAsync(input.BranchId, input.Filters, input.Sorting, int.MaxValue,
-               input.SkipCount, true);
-
-            var totalCount = await GetCountAsync(input);
-            var dtos = _objectMapper.Map<List<SettlementCrossReferenceVersion>, List<SettlementCrossReferenceVersionDto>>(entities);
-            //foreach (var itm in dtos)
-            //{
-            //    itm.Version = itm.Version + string.Format("({0})", itm.Factory);
-            //}
-            return new PagedResultDto<SettlementCrossReferenceVersionDto>(totalCount, dtos);
-        }
-
-
-
-        /////// <summary>
-        ///// <summary>
-        ///// ����
-        ///// </summary>
-        ///// <returns></returns>
-        //[HttpPost]
-        //[Route("ExcelImport")]
-        //[DisableRequestSizeLimit]
-        ////[Authorize(SettleAccountPermissions.SettlementCrossReference.Default)]
-        //public async Task<string> SettlementCrossReferenceUploadCSVImport([FromForm] IFormFileCollection files, Guid branchId, string year, string period, string version, string customerCode, string factory)
-        //{
-        //    List<SettlementCrossReference> _setls = new List<SettlementCrossReference>();
-        //    List<string> _errorList = new List<string>();
-        //    var _id = GuidGenerator.Create();
-        //    var checkList = new List<ErrorExportDto>();
-        //    //var _chList = await _relrepository.GetAllAsync(GuidGenerator.Create(), true);
-        //    //var _chls = _chList.Select(p => p.SettleMaterialCode).Distinct();
-
-
-
-        //    var _VersionList = new List<SettlementCrossReferenceVersion>();
-        //    _VersionList.Add(new SettlementCrossReferenceVersion(_id, branchId, year, period, version, customerCode, factory));
-
-
-        //    List<string> _precodeList = new List<string>();//
-        //    using (TextReader textReader = new StreamReader(files[0].OpenReadStream()))
-        //    {
-        //        //var _preList = _preBatchRepository.Where(p => p.State == 3).ToList();
-        //        var _versionQuery = _versionRepository.Where(p => p.Version == version);
-        //        await _versionQuery.BatchDeleteAsync();
-        //        var _query = _repository.Where(p => p.Version == version);
-        //        await _query.BatchDeleteAsync();
-        //        int i = 0;
-        //        //var _userId = CurrentUser.Id.Value;
-        //        while (true)
-        //        {
-        //            string str = await textReader.ReadLineAsync();
-        //            if (string.IsNullOrEmpty(str))
-        //            {
-        //                break;
-        //            }
-        //            else
-        //            {
-        //                //if (i > headerNumber)
-        //                //{
-        //                try
-        //                {
-        //                    var _lst = str.Split(new char[] { ',' }).ToList();
-        //                    //string _period = _lst[1].Trim();
-        //                    string _factory = "";
-        //                    //_lst[0].Trim();
-        //                    string _model = _lst[0].Trim();
-        //                    string _partType = _lst[1].Trim();
-        //                    string _settlementMaterialCode = _lst[2].Trim();
-        //                    if (string.IsNullOrEmpty(_settlementMaterialCode))
-        //                    {
-        //                        continue;
-        //                    }
-        //                    string _bomMaterialCode = _lst[3].Trim();
-        //                    string _materialDesc = _lst[3].Trim();
-        //                    string _supplierCode = _lst[4].Trim();
-        //                    string _supplierDesc = _lst[4].Trim();
-        //                    string _buyer = _lst[5].Trim();
-        //                    //string _customerCode = _lst[10].Trim();
-
-        //                    //if (_preList.Any(p => p.KENNCode == _kENNCode))
-        //                    //{
-        //                    //    _precodeList.Add(_kENNCode);
-
-        //                    //}
-        //                    _setls.Add(new SettlementCrossReference(
-        //                        GuidGenerator.Create(),
-        //                        year,
-        //                        period,
-        //                        _factory,
-        //                        _model,
-        //                        _partType,
-        //                        _settlementMaterialCode,
-        //                        _bomMaterialCode,
-        //                        _materialDesc,
-        //                        _supplierCode,
-        //                        _supplierDesc,
-        //                        _buyer,
-        //                        customerCode,
-        //                        version
-        //                        ));
-        //                }
-        //                catch
-        //                {
-        //                }
-        //                //}
-        //            }
-        //            i++;
-        //        }
-        //        textReader.Close();
-        //    }
-
-        //    var _ls = _setls;
-
-        //    var query = from arc in _ls
-        //                group arc by new { arc.Version, arc.SettlementMaterialCode, arc.BomMaterialCode }
-        //         into g
-        //                where g.Count() > 1
-        //                select g;
-
-        //    var _l = _setls.Select(p => p.SettlementMaterialCode).Distinct();
-
-        //    //var _notls = _l.Where(p => !_chls.Contains(p)).ToList();
-
-        //    //foreach (var itm in _notls)
-        //    //{
-        //    //    checkList.Add(new ErrorExportDto(version, customerCode, string.Empty, string.Empty, itm, string.Empty, string.Format("��ϵ���в����ڽ������Ϻ�{0}��", itm), string.Empty));
-        //    //}
-
-        //    foreach (var itm in query)
-        //    {
-        //        checkList.Add(new ErrorExportDto(version, customerCode, string.Empty, string.Empty, string.Empty, string.Empty, string.Format("�ڼ�{0} �ܳɽ���� {1} Bom�嵥�����{2} ���ظ�", itm.Key.SettlementMaterialCode, itm.Key.BomMaterialCode, itm.Key.Version), string.Empty));
-        //    }
-
-        //    if (checkList.Count > 0)
-        //    {
-        //        return await ExportErrorReportAsync(checkList);
-        //    }
-
-        //    //var _existls = _preBatchRepository.Where(p => _precodeList.Contains(p.KENNCode)).ToList();
-        //    //if (_existls.Count > 0)
-        //    //{
-        //    //    foreach (var itm in _existls)
-        //    //    {
-        //    //        itm.Update(string.Format("�����޸�Ԥ����{0}", DateTime.Now.ToString("yyyyMMdd")), 0, string.Empty, string.Empty, string.Empty);
-        //    //    }
-        //    //}
-        //    //await _preBatchRepository.GetDbContext().BulkUpdateAsync(_existls);
-        //    await _repository.GetDbContext().BulkInsertAsync(_setls);
-
-        //    await _versionRepository.GetDbContext().BulkInsertAsync(_VersionList);
-
-        //    //await _versionRepository.InsertAsync(new SettlementCrossReferenceVersion(_id, branchId, year, period, version, customerCode, factory));
-
-        //    return ApplicationConsts.SuccessStr;
-        //}
-
-
-        /// <summary>
-        /// <summary>
-        /// ����
-        /// </summary>
-        /// <returns></returns>
-        [HttpPost]
-        [Route("ExcelImport")]
-        [DisableRequestSizeLimit]
-        public async Task<string> SettlementCrossReferenceUploadExcelImport([FromForm] IFormFileCollection files, Guid branchId, string year, string period, string version, string customerCode, string factory)
-        {
-
-            ExportImporter _exportImporter = new ExportImporter();
-            var result = await _exportImporter.UploadExcelImport<ImportSettlementCrossReferenceDto>(files, _excelImportService);
-            var entityList = ObjectMapper.Map<List<ImportSettlementCrossReferenceDto>, List<SettlementCrossReference>>(result);
-            var _versionQuery = _versionRepository.Where(p => p.Version == version && p.CustomerCode == customerCode);
-            await _versionQuery.BatchDeleteAsync();
-            var _query = _repository.Where(p => p.Version == version && p.CustomerCode == customerCode);
-            await _query.BatchDeleteAsync();
-
-            List<string> _errorList = new List<string>();
-            var _id = GuidGenerator.Create();
-            var checkList = new List<ErrorExportDto>();
-
-
-            var _VersionList = new List<SettlementCrossReferenceVersion>();
-            _VersionList.Add(new SettlementCrossReferenceVersion(_id, branchId, year, period, version, customerCode, factory));
-
-
-            foreach (var itm in entityList)
-            {
-
-                if (itm.SettlementMaterialCode.StartsWith("preser"))
-                {
-
-                }
-                itm.SetValue(GuidGenerator.Create(), branchId, year, period, version, customerCode, factory);
-            }
-
-
-            //foreach (var itm in entityList)
-            //{
-
-            //    checkList.Add(new ErrorExportDto(version, customerCode, string.Empty, string.Empty, string.Empty, string.Empty, string.Format("�ڼ�{0} �ܳɽ���� {1} Bom�嵥�����{2} ���ظ�", itm.Key.SettlementMaterialCode, itm.Key.BomMaterialCode, itm.Key.Version), string.Empty));
-            //}
-
-
-            if (checkList.Count > 0)
-            {
-                return await ExportErrorReportAsync(checkList);
-            }
-
-            await _repository.GetDbContext().BulkInsertAsync<SettlementCrossReference>(entityList);
-
-            await _versionRepository.GetDbContext().BulkInsertAsync(_VersionList);
-
-
-            return ApplicationConsts.SuccessStr;
-        }
-
-        /// <summary>
-        /// �����ļ�
-        /// </summary>
-        /// <param name="input"></param>
-        /// <returns></returns>
-        [HttpPost]
-        [Route("Export")]
-        virtual public async Task<string> ExportAsync(SettlementCrossReferenceRequestDto input)
-        {
-
-            IExporter _csv = new CsvExporter();
-            IExporter _excel = new ExcelExporter();
-            if (input.ParentId != Guid.Empty)
-            {
-                input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "ParentId", Logic = EnumFilterLogic.And, Value = input.ParentId.ToString() });
-            }
-            var entities = await _repository.GetListByFilterAsync(input.BranchId, input.Filters, input.Sorting, int.MaxValue,
-               0, true);
-
-            var dtoDetails = ObjectMapper.Map<List<SettlementCrossReference>, List<SettlementCrossReferenceExportDto>>(entities);
-
-            string _fileName = string.Empty;
-            //������������
-
-            byte[] result = null;
-            switch (input.FileType)
-            {
-                case 0:
-                    _fileName = string.Format("��������չ�ϵ_{0}.csv", input.UserId.ToString());
-                    result = await _csv.ExportAsByteArray(dtoDetails);
-                    break;
-                case 1:
-                    _fileName = string.Format("��������չ�ϵ__{0}.xlsx", input.UserId.ToString());
-                    result = await _excel.ExportAsByteArray(dtoDetails);
-                    break;
-            }
-            result.ShouldNotBeNull();
-
-            //���浼���ļ�����������ɶ�����
-            await _excelImportService.SaveBlobAsync(
-                     new SaveExcelImportInputDto
-                     {
-                         Name = _fileName,
-                         Content = result
-                     }
-                 );
-            return _fileName;
-        }
-
-
-
-        [HttpGet]
-        [Route("Create")]
-
-        public Task<SettlementCrossReferenceDto> CreateAsync(SettlementCrossReferenceCreateDto input)
-        {
-            throw new NotImplementedException();
-        }
-
-        [HttpGet]
-        [Route("DeleteList")]
-
-        public Task<bool> DeleteListAsync(List<Guid> ids)
-        {
-            throw new NotImplementedException();
-        }
-
-        [HttpGet]
-        [Route("{id}")]
-
-        public Task<SettlementCrossReferenceDto> GetAsync(Guid id)
-        {
-            throw new NotImplementedException();
-        }
-
-
-        [HttpGet]
-        [Route("GetTotalCountAsync")]
-
-        public Task<long> GetTotalCountAsync(Guid branchId)
-        {
-            throw new NotImplementedException();
-        }
-
-
-
-        [HttpGet]
-        [Route("Update")]
-
-        public Task<SettlementCrossReferenceDto> UpdateAsync(Guid id, SettlementCrossReferenceUpdateDto input)
-        {
-            throw new NotImplementedException();
-        }
-    }
-}
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/SettlementPakAndSparePart/SettlementPakAndSparePartsAppService.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/SettlementPakAndSparePart/SettlementPakAndSparePartsAppService.cs
deleted file mode 100644
index dda77030..00000000
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/SettlementPakAndSparePart/SettlementPakAndSparePartsAppService.cs
+++ /dev/null
@@ -1,229 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using EFCore.BulkExtensions;
-using Magicodes.ExporterAndImporter.Core;
-using Magicodes.ExporterAndImporter.Csv;
-using Magicodes.ExporterAndImporter.Excel;
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.Extensions.Caching.Distributed;
-using Shouldly;
-using Volo.Abp;
-using Volo.Abp.Application.Dtos;
-using Volo.Abp.Application.Services;
-using Volo.Abp.Caching;
-using Volo.Abp.Domain.Repositories;
-using Volo.Abp.Guids;
-using Volo.Abp.ObjectMapping;
-using Win.Abp.Snowflakes;
-using Win.Sfs.BaseData.ImportExcelCommon;
-using Win.Sfs.SettleAccount.CommonManagers;
-using Win.Sfs.SettleAccount.Constant;
-using Win.Sfs.SettleAccount.Entities.Inventories;
-using Win.Sfs.SettleAccount.Entities.InventoryDetialVersion;
-using Win.Sfs.SettleAccount.Entities.Materials;
-using Win.Sfs.SettleAccount.Entities.SettlementPakAndSparePartsRef;
-using Win.Sfs.SettleAccount.Entities.SettlementPakAndSparePartss;
-using Win.Sfs.SettleAccount.Entities.SettlementParts;
-using Win.Sfs.SettleAccount.Entities.SettlementPartss;
-using Win.Sfs.SettleAccount.ExcelImporter;
-using Win.Sfs.SettleAccount.ExportReports;
-using Win.Sfs.SettleAccount.Inventories;
-using Win.Sfs.Shared.CacheBase;
-using Win.Sfs.Shared.Filter;
-using Win.Utils;
-
-namespace Win.Sfs.SettleAccount.Entities.SettlementPakAndSparePart
-{
-
-    /// <summary>
-    /// �������ɢ����Ӧ��ϵ����
-    /// </summary>
-    [Authorize(SettleAccountPermissions.Boms.Default)]
-    //[AllowAnonymous]
-    [Route("api/settleaccount/SettlementPakAndSpareParts")]
-    public class SettlementPakAndSparePartsAppService : SettleAccountApplicationBase<SettlementPakAndSpareParts>, ISettlementPakAndSparePartsAppService
-    {
-        private readonly IObjectMapper _objectMapper;
-        private readonly IExcelImportAppService _excelImportService;
-        private readonly ISettleAccountBranchEfCoreRepository<SettlementPakAndSpareParts, Guid> _repository;
-        private readonly ISettleAccountBranchEfCoreRepository<SettlementPakAndSparePartsVersion, Guid> _versionRepository;
-        /// <summary>
-        /// ��������
-        /// </summary>
-        /// <param name="repository">�ִ��ӿ�</param>
-        /// <param name="cache">����</param>
-        public SettlementPakAndSparePartsAppService(
-
-            ISettleAccountBranchEfCoreRepository<SettlementPakAndSpareParts, Guid> repository,
-            ISettleAccountBranchEfCoreRepository<SettlementPakAndSparePartsVersion, Guid> versionRepository,
-            IDistributedCache<SettlementPakAndSpareParts> cache,
-            IExcelImportAppService excelImportService,
-            ISnowflakeIdGenerator snowflakeIdGenerator,
-            ICommonManager commonManager
-        ) : base(cache, excelImportService, snowflakeIdGenerator, commonManager)
-        {
-
-            _versionRepository = versionRepository;
-            _excelImportService = excelImportService;
-            _repository = repository;
-        }
-
-        /// <summary>
-        /// ��ID��ȡΨһʵ��
-        /// </summary>
-        /// <remarks>
-        /// ����ʵ��ȫ������
-        /// </remarks>
-        /// <param name="id">ID</param>
-        /// <returns>ʵ��DTO</returns>
-        //[HttpGet]
-        //[Route("{id}")]
-        //[Authorize(SettleAccountPermissions.SettlementPakAndSpareParts.Default)]
-        //virtual public async Task<SettlementPakAndSparePartsDto> GetAsync(Guid id)
-        //{
-        //    var result = await GetFromCacheAsync(id);
-        //    var dto = ObjectMapper.Map<SettlementPakAndSpareParts, SettlementPakAndSparePartsDto>(result);
-        //    return dto;
-        //}
-
-        //private async Task<SettlementPart> GetFromCacheAsync(Guid id)
-        //{
-        //    var result = await _repository.GetAsync(id);
-
-
-        //    return result;
-        //}
-
-        private async Task<long> GetCountAsync(SettlementPakAndSparePartsRequestDto input)
-        {
-            return await _repository.GetCountByFilterAsync(input.BranchId, input.Filters);
-        }
-
-
-        private async Task<long> GetCountAsync(SettlementPakAndSparePartsVersionRequestDto input)
-        {
-            return await _versionRepository.GetCountByFilterAsync(input.BranchId, input.Filters);
-        }
-
-        ///// <summary>
-        /// <summary>
-        /// ����ɸѡ������ȡʵ���б�
-        /// </summary>
-        /// <remarks>
-        /// ������������:ɸѡ�����б�,��������,��������,ҳ��
-        /// </remarks>
-        /// <param name="input">��������</param>
-        /// <returns>ʵ��DTO�б�</returns>
-        [HttpPost]
-        [Route("list")]
-        //[Authorize(SettleAccountPermissions.SettlementPakAndSpareParts.Default)]
-        public async Task<PagedResultDto<SettlementPakAndSparePartsDto>> GetListAsync(SettlementPakAndSparePartsRequestDto input)
-        {
-            input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "Version", Logic = EnumFilterLogic.And, Value = input.Version });
-            if (!string.IsNullOrEmpty(input.CustomerCode))
-            {
-                input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "CustomerCode", Logic = EnumFilterLogic.And, Value = input.CustomerCode });
-            }
-            var entities = await _repository.GetListByFilterAsync(input.BranchId, input.Filters, input.Sorting, input.MaxResultCount,
-                 input.SkipCount, true);
-            var totalCount = await GetCountAsync(input);
-            var dtos = ObjectMapper.Map<List<SettlementPakAndSpareParts>, List<SettlementPakAndSparePartsDto>>(entities);
-            // var dtos = _objectMapper.Map<SettlementCrossReference, SettlementCrossReferenceDto>(entities);
-            return new PagedResultDto<SettlementPakAndSparePartsDto>(totalCount, dtos);
-        }
-
-        [HttpPost]
-        [Route("versionList")]
-        //[Authorize(SettleAccountPermissions.SettlementPakAndSpareParts.Default)]
-        public async Task<PagedResultDto<SettlementPakAndSparePartsVersionDto>> GetVersionListAsync(SettlementPakAndSparePartsVersionRequestDto input)
-        {
-            var entities = await _versionRepository.GetListByFilterAsync(input.BranchId, input.Filters, input.Sorting, int.MaxValue,
-               input.SkipCount, true);
-
-            var totalCount = await GetCountAsync(input);
-            var dtos = ObjectMapper.Map<List<SettlementPakAndSparePartsVersion>, List<SettlementPakAndSparePartsVersionDto>>(entities);
-            //foreach (var itm in dtos)
-            //{
-            //    itm.Version = itm.Version + string.Format("({0})", itm.Factory);
-            //}
-            return new PagedResultDto<SettlementPakAndSparePartsVersionDto>(totalCount, dtos);
-        }
-
-        [HttpGet]
-        [Route("delete")]
-        //[Authorize(SettleAccountPermissions.SettlementPakAndSpareParts.Default)]
-        public Task<bool> DeleteListAsync(List<Guid> ids)
-        {
-            throw new NotImplementedException();
-        }
-
-        [HttpGet]
-        [Route("GetBy")]
-        //[Authorize(SettleAccountPermissions.SettlementPakAndSpareParts.Default)]
-        public Task<SettlementPakAndSparePartsDto> GetAsync(Guid id)
-        {
-            throw new NotImplementedException();
-        }
-
-
-        /// <summary>
-        /// �����ļ�
-        /// </summary>
-        /// <param name="input"></param>
-        /// <returns></returns>
-        [HttpPost]
-        [Route("Export")]
-        //[Authorize(SettleAccountPermissions.SettlementParts.Default)]
-        virtual public async Task<string> ExportAsync(SettlementPakAndSparePartsDto input)
-        {
-            IExporter _csv = new CsvExporter();
-            IExporter _excel = new ExcelExporter();
-            //���Ϲ�����������-20210927
-            if (!string.IsNullOrEmpty(input.Version))
-            {
-                input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "Version", Logic = EnumFilterLogic.And, Value = input.Version });
-            }
-
-            if (!string.IsNullOrEmpty(input.CustomerCode))
-            {
-                input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "CustomerCode", Logic = EnumFilterLogic.And, Value = input.CustomerCode });
-            }
-
-            var entities = await _repository.GetListByFilterAsync(input.BranchId, input.Filters, input.Sorting, int.MaxValue,
-               0, true);
-
-            var dtoDetails = ObjectMapper.Map<List<SettlementPakAndSpareParts>, List<SettlementPakAndSparePartsDto>>(entities);
-
-            string _fileName = string.Empty;
-            //������������
-
-            byte[] result = null;
-            switch (input.FileType)
-            {
-                case 0:
-                    _fileName = string.Format("�������ɢ����Ӧ��ϵ_{0}.csv", _snowflakeIdGenerator.Create().ToString());
-                    result = await _csv.ExportAsByteArray(dtoDetails);
-                    break;
-                case 1:
-                    _fileName = string.Format("�������ɢ����Ӧ��ϵ_{0}.xlsx", _snowflakeIdGenerator.Create().ToString());
-                    result = await _excel.ExportAsByteArray(dtoDetails);
-                    break;
-            }
-            result.ShouldNotBeNull();
-
-            //���浼���ļ�����������ɶ�����
-            await _excelImportService.SaveBlobAsync(
-                     new SaveExcelImportInputDto
-                     {
-                         Name = _fileName,
-                         Content = result
-                     }
-                 );
-            return _fileName;
-        }
-    }
-}
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/TaskJobs/JobAppService.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/TaskJobs/JobAppService.cs
index bb0a728c..484d33b4 100644
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/TaskJobs/JobAppService.cs
+++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/TaskJobs/JobAppService.cs
@@ -27,9 +27,7 @@ using Win.Abp.Snowflakes;
 using Win.Sfs.BaseData.ImportExcelCommon;
 using Win.Sfs.SettleAccount.CommonManagers;
 using Win.Sfs.SettleAccount.Constant;
-using Win.Sfs.SettleAccount.Entities.EstimatedInventories;
 using Win.Sfs.SettleAccount.Entities.TaskJobs;
-using Win.Sfs.SettleAccount.EstimatedInventories;
 using Win.Sfs.SettleAccount.ExcelImporter;
 using Win.Sfs.SettleAccount.ExportReports;
 
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/UnSettleAccounts/UnSettleAccountAppService.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/UnSettleAccounts/UnSettleAccountAppService.cs
deleted file mode 100644
index aebf1c07..00000000
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/UnSettleAccounts/UnSettleAccountAppService.cs
+++ /dev/null
@@ -1,343 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.Extensions.Caching.Distributed;
-using AutoMapper;
-using System.Linq;
-using System.Text;
-using Volo.Abp.Guids;
-using Volo.Abp.Application.Services;
-using Volo.Abp.Caching;
-
-using Volo.Abp.ObjectMapping;
-using Win.Sfs.SettleAccount.ExcelImporter;
-using Win.Sfs.Shared.CacheBase;
-using Win.Utils;
-using Volo.Abp.Application.Dtos;
-using Win.Sfs.BaseData.ImportExcelCommon;
-using Volo.Abp.Domain.Repositories;
-using EFCore.BulkExtensions;
-using System.IO;
-using Microsoft.EntityFrameworkCore;
-using Win.Sfs.SettleAccount.Entities.SettleAccountVersion;
-using Win.Sfs.SettleAccount.FISes;
-using Win.Sfs.Shared.Enums.SettleAccount;
-using Win.Sfs.Shared.Filter;
-using Shouldly;
-using Magicodes.ExporterAndImporter.Csv;
-using Magicodes.ExporterAndImporter.Core;
-using Magicodes.ExporterAndImporter.Excel;
-using System.Data.Common;
-using Volo.Abp.Uow;
-using Volo.Abp;
-using Win.Abp.Snowflakes;
-using Win.Sfs.SettleAccount.CommonManagers;
-using Win.Sfs.SettleAccount.ExportReports;
-using Win.Sfs.SettleAccount.Constant;
-using Win.Sfs.SettleAccount.MaterialRelationships;
-using Win.Sfs.SettleAccount.Entities.TaskJobs;
-using Magicodes.ExporterAndImporter.Core.Models;
-
-using TaskJob.Services;
-using TaskJob.EventArgs;
-
-namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
-{
-    /// <summary>
-    ///大众FIS未结算明细导入功能
-    /// </summary>
-   [Authorize(SettleAccountPermissions.UnSettleAccount.Default)]
-   //[AllowAnonymous]
-    [Route("api/settleaccount/UnSettleAccount")]
-    public class UnSettleAccountAppService : SettleAccountApplicationBase<UnSettleAccount>, IUnSettleAccountAppService
-    {
-
-        private readonly IExcelImportAppService _excelImportService;
-
-        private readonly ISettleAccountBranchEfCoreRepository<Prebatches.Prebatch, Guid> _preBatchRepository;
-        private readonly ISettleAccountBranchEfCoreRepository<UnSettleAccount, Guid> _repository;
-        private readonly ISettleAccountBranchEfCoreRepository<UnSettleAccountVersion, Guid> _versionRepository;
-        private readonly ISettleAccountBranchEfCoreRepository<FIS, Guid> _fisRepository;
-        private readonly ISettleAccountBranchEfCoreRepository<MaterialRelationship, Guid> _relrepository;
-        private readonly TaskJobService _service;
-        /// <summary>
-        /// 构建方法
-        /// </summary>
-        /// <param name="guidGenerator">构建UID</param>
-
-        /// <param name="repository">仓储接口</param>
-        /// <param name="cache">缓存</param>
-        public UnSettleAccountAppService(IGuidGenerator guidGenerator,
-         ISettleAccountBranchEfCoreRepository<UnSettleAccountVersion, Guid> versionRepository,
-           ISettleAccountBranchEfCoreRepository<UnSettleAccount, Guid> repository,
-            IDistributedCache<UnSettleAccount> cache,
-            IExcelImportAppService excelImportService,
-            ISnowflakeIdGenerator snowflakeIdGenerator,
-            ICommonManager commonManager,
-            TaskJobService service,
-            ISettleAccountBranchEfCoreRepository<FIS, Guid> fisRepository,
-            ISettleAccountBranchEfCoreRepository<Prebatches.Prebatch, Guid> preBatchRepository,
-            ISettleAccountBranchEfCoreRepository<MaterialRelationship, Guid> relrepository
-        ) : base(cache, excelImportService, snowflakeIdGenerator, commonManager)
-        {
-            _service = service;
-            _fisRepository = fisRepository;
-            _versionRepository = versionRepository;
-         
-            _excelImportService = excelImportService;
-            _repository = repository;
-            _preBatchRepository = preBatchRepository;
-            _relrepository = relrepository;
-        }
-        /// <summary>
-        /// 导入功能,做成任务下载
-        /// </summary>
-        /// <param name="files">上传的文件(前端已经限制只能上传一个附件)</param>
-        /// <returns></returns>
-        [HttpPost]
-        [Route("ExcelImport")]
-        [DisableRequestSizeLimit]
-        [Authorize(SettleAccountPermissions.UnSettleAccount.Create)]
-        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 = "Year", Value = year });
-            customConditionList.Add(new CustomCondition() { Name = "Factory", Value = factory });
-            var _taskid = await _service.ImportEnqueueAsync<ImportTaskArgs>(files, "大众FIS未结算明细", CurrentUser, typeof(UnSettleAccountImportService), customConditionList, (rs) => {
-
-            });
-            return _taskid;
-        }
-
-        /// <summary>
-        /// 按ID获取唯一实体
-        /// </summary>
-        /// <remarks>
-        /// 返回实体全部属性
-        /// </remarks>
-        /// <param name="id">ID</param>
-        /// <returns>实体DTO</returns>
-        [HttpGet]
-        [Route("{id}")]
-        virtual public async Task<UnSettleAccountDto> GetAsync(Guid id)
-        {
-            var result = await GetFromCacheAsync(id);
-            var dto = ObjectMapper.Map<UnSettleAccount, UnSettleAccountDto>(result);
-            return dto;
-        }
-
-
-        private async Task<UnSettleAccount> GetFromCacheAsync(Guid id)
-        {
-            var result = await _repository.GetAsync(id);
-
-
-            return result;
-        }
-
-
-        private async Task<long> GetCountAsync(UnSettleAccountRequestDto input)
-        {
-            return await _repository.GetCountByFilterAsync(input.BranchId, input.Filters);
-        }
-
-        private async Task<long> GetCountAsync(UnSettleAccountVersionRequestDto input)
-        {
-            return await _versionRepository.GetCountByFilterAsync(input.BranchId, input.Filters);
-        }
-
-
-
-        /// <summary>
-        /// 导出文件
-        /// </summary>
-        /// <param name="input"></param>
-        /// <returns></returns>
-        [HttpPost]
-        [Route("Export")]
-        virtual public async Task<string> ExportAsync(UnSettleAccountRequestDto input)
-        {
-
-            IExporter _csv = new CsvExporter();
-
-            IExporter _excel = new ExcelExporter();
-
-            //if (input.ParentId != Guid.Empty)
-            //{
-            //    input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "ParentId", Logic = EnumFilterLogic.And, Value = input.ParentId.ToString() });
-            //}
-            if (input.Version != string.Empty)
-            {
-                input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "Version", Logic = EnumFilterLogic.And, Value = input.Version.ToString() });
-            }
-            var entities = await _repository.GetListByFilterAsync(input.BranchId, input.Filters, input.Sorting, int.MaxValue,
-               0, true);
-
-            var dtoDetails = ObjectMapper.Map<List<UnSettleAccount>, List<UnSettleAccountExportDto>>(entities);
-
-            string _fileName = string.Empty;
-            //声明导出容器
-
-            byte[] result = null;
-            switch (input.FileType)
-            {
-                case 0:
-                    _fileName = string.Format("大众FIS未结算明细_{0}.csv", input.UserId.ToString());
-                    result = await _csv.ExportAsByteArray(dtoDetails);
-                    break;
-                case 1:
-                    _fileName = string.Format("大众FIS未结算明细_{0}.xlsx", input.UserId.ToString());
-                    result = await _excel.ExportAsByteArray(dtoDetails);
-                    break;
-            }
-            result.ShouldNotBeNull();
-
-            //保存导出文件到服务器存成二进制
-            await _excelImportService.SaveBlobAsync(
-                     new SaveExcelImportInputDto
-                     {
-                         Name = _fileName,
-                         Content = result
-                     }
-                 );
-            return _fileName;
-        }
-
-
-
-
-
-
-
-        ///// <summary>
-
-        /// <summary>
-        /// 根据筛选条件获取实体列表
-        /// </summary>
-        /// <remarks>
-        /// 请求条件包括:筛选条件列表,排序条件,数据数量,页码
-        /// </remarks>
-        /// <param name="input">请求条件</param>
-        /// <returns>实体DTO列表</returns>
-        [HttpPost]
-        [Route("list")]
-        virtual public async Task<PagedResultDto<UnSettleAccountDto>> GetListAsync(Guid id, UnSettleAccountRequestDto input)
-        {
-            if (input.Version != string.Empty)
-            {
-                //  var _entity = await _versionRepository.GetAsync(input.ParentId);
-                input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "Version", Logic = EnumFilterLogic.And, Value = input.Version.ToString() });
-                //input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "ParentId", Logic = EnumFilterLogic.And, Value = input.ParentId.ToString() });
-            }
-            else
-            {
-                return new PagedResultDto<UnSettleAccountDto>(0, new List<UnSettleAccountDto>());
-            }
-            var entities = await _repository.GetListByFilterAsync(input.BranchId, input.Filters, input.Sorting, input.MaxResultCount,
-                 input.SkipCount, true);
-
-            var totalCount = await GetCountAsync(input);
-            var dtos = ObjectMapper.Map<List<UnSettleAccount>, List<UnSettleAccountDto>>(entities);
-
-            return new PagedResultDto<UnSettleAccountDto>(totalCount, dtos);
-        }
-
-
-        /// <summary>
-        /// 获取实体总数
-        /// </summary>
-        /// <returns>实体总数</returns>
-        [HttpGet]
-        [Route("count")]
-        virtual public async Task<long> GetTotalCountAsync(Guid branchId)
-        {
-            return await _repository.GetCountAsync(branchId);
-        }
-
-        /// <summary>
-        /// 获取全部实体列表
-        /// </summary>
-        /// <returns>实体DTO列表</returns>
-        [HttpGet]
-        [Route("all")]
-        virtual public async Task<ListResultDto<UnSettleAccountDto>> GetAllAsync(Guid branchId)
-        {
-            var entities = await _repository.GetAllAsync(branchId, true);
-            var dtos = ObjectMapper.Map<List<UnSettleAccount>, List<UnSettleAccountDto>>(entities);
-            return new ListResultDto<UnSettleAccountDto>(dtos);
-        }
-
-
-       
-
-        /// <summary>
-        /// 删除实体
-        /// </summary>
-        /// <param name="id">ID</param>
-        /// <returns>无</returns>
-        [HttpDelete]
-        [Route("{id}")]
-        //[Authorize(SettleAccountPermissions.SettleAccounts.Delete)]
-        virtual public async Task DeleteAsync(Guid id)
-        {
-            var entity = await GetFromCacheAsync(id);
-       
-            await _repository.DeleteAsync(id);
-        }
-
-        /// <summary>
-        /// 按IDs删除实体列表
-        /// </summary>
-        /// <param name="ids">IDs</param>
-        /// <returns>是否执行成功</returns>
-        [HttpPost]
-        [Route("delete")]
-        //[Authorize(SettleAccountPermissions.SettleAccounts.Delete)]
-        virtual public async Task<bool> DeleteListAsync(List<Guid> ids)
-        {
-            foreach (var id in ids)
-            {
-                var entity = await GetFromCacheAsync(id);
-                //await Cache.DeleteAsync<SettleAccount>(id.ToString());
-            }
-
-            return await _repository.DeleteListAsync(ids);
-        }
-
-
-
-        /// <summary>
-        ///调用存储
-        /// </summary>
-        /// <remarks>
-        /// 请求条件包括:筛选条件列表,排序条件,数据数量,页码
-        /// </remarks>
-        /// <param name="input">请求条件</param>
-        /// <returns>实体DTO列表</returns>
-        [HttpPost]
-        [Route("listversion")]
-
-
-        public async Task<PagedResultDto<UnSettleAccountVersionDto>> GetVersionListAsync(UnSettleAccountVersionRequestDto input)
-        {
-            var entities = await _versionRepository.GetListByFilterAsync(input.BranchId, input.Filters, input.Sorting, int.MaxValue,
-               input.SkipCount, true);
-
-            var totalCount = await GetCountAsync(input);
-            var dtos = ObjectMapper.Map<List<UnSettleAccountVersion>, List<UnSettleAccountVersionDto>>(entities);
-
-
-
-
-            return new PagedResultDto<UnSettleAccountVersionDto>(totalCount, dtos);
-        }
-
-    }
-}
\ No newline at end of file
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/VWKanBan/VWKanBanAppService.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/VWKanBan/VWKanBanAppService.cs
deleted file mode 100644
index 7a570e4d..00000000
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/VWKanBan/VWKanBanAppService.cs
+++ /dev/null
@@ -1,320 +0,0 @@
-using Magicodes.ExporterAndImporter.Core;
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Mvc;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Volo.Abp.Caching;
-using Volo.Abp.Domain.Repositories;
-using Volo.Abp.Guids;
-using Win.Abp.Snowflakes;
-using Win.Sfs.BaseData.ImportExcelCommon;
-using Win.Sfs.SettleAccount.CommonManagers;
-using Win.Sfs.SettleAccount.ExcelImporter;
-using Win.Sfs.SettleAccount.ExportReports;
-using Win.Sfs.Shared.Filter;
-using EFCore.BulkExtensions;
-using Win.Sfs.SettleAccount.Constant;
-using Volo.Abp.Application.Dtos;
-using Win.Sfs.SettleAccount.Entities.VWKanBanVersion;
-using Magicodes.ExporterAndImporter.Csv;
-using Magicodes.ExporterAndImporter.Excel;
-using Shouldly;
-using Volo.Abp;
-
-namespace Win.Sfs.SettleAccount.Entities.VWKanBan
-{
-    /// <summary>
-    /// 大众看板结算明细导入
-    /// </summary>
-    [Authorize(SettleAccountPermissions.VWKanBan.Default)]
-    [Route("api/settleaccount/VWKanBan")]
-    public class VWKanBanAppService : SettleAccountApplicationBase<KanBanSettle>, IVWKanBanAppService
-    {
-        private readonly IGuidGenerator _guidGenerator;
-
-        private readonly IExcelImportAppService _excelImportService;
-
-        private readonly ISettleAccountBranchEfCoreRepository<KanBanVersion, Guid> _versionRepository;
-
-        private readonly ISettleAccountBranchEfCoreRepository<KanBanSettle, Guid> _repository;
-        /// <summary>
-        /// 构建方法
-        /// </summary>
-        /// <param name="guidGenerator">构建UID</param>
-        /// <param name="repository">仓储接口</param>
-        /// <param name="cache">缓存</param>
-        public VWKanBanAppService(IGuidGenerator guidGenerator,
-         ISettleAccountBranchEfCoreRepository<KanBanVersion, Guid> versionRepository,
-           ISettleAccountBranchEfCoreRepository<KanBanSettle, Guid> repository,
-            IDistributedCache<KanBanSettle> cache,
-            IExcelImportAppService excelImportService,
-            ISnowflakeIdGenerator snowflakeIdGenerator,
-            ICommonManager commonManager
-        ) : base(cache, excelImportService, snowflakeIdGenerator, commonManager)
-        {
-            _versionRepository = versionRepository;
-            _guidGenerator = guidGenerator;
-            _excelImportService = excelImportService;
-            _repository = repository;
-        }
-
-
-        /// <summary>
-        /// 导入功能
-        /// </summary>
-        /// <param name="files">上传的文件(前端已经限制只能上传一个附件)</param>
-        /// <returns></returns>
-        [HttpPost]
-        [Route("ExcelImport")]
-        [DisableRequestSizeLimit]
-        [Authorize(SettleAccountPermissions.VWKanBan.Create)]
-        public async Task<string> VWKanBanUploadExcelImport([FromForm] IFormFileCollection files, Guid branchId, string year, string period, string version, string customerCode)
-        {
-            if(string.IsNullOrEmpty(version))
-            {
-                throw new BusinessException("版本不能空，必须传入！");
-            }
-            List<VWKanBanImportDto> listImport = new List<VWKanBanImportDto>();
-            ExportImporter _exportImporter = new ExportImporter();
-            var result = await _exportImporter.UploadExcelImport<VWKanBanImportDto>(files, _excelImportService);
-            var entityList = ObjectMapper.Map<List<VWKanBanImportDto>, List<KanBanSettle>>(result);
-            //删除版本
-            var _versionQuery = _versionRepository.Where(p => p.Version == version);
-            await _versionQuery.BatchDeleteAsync();
-            //删除明细
-            var _query = _repository.Where(p => p.Version == version);
-            await _query.BatchDeleteAsync();
-            //插入数据前检验
-            var checkList = new List<ErrorExportDto>();
-            var _group = entityList.GroupBy(x => new { x.Kanban, x.MaterialCode, x.Version }).Select(p => new { Count = p.Count(), Kanban = p.Key.Kanban, MaterialCode = p.Key.MaterialCode });
-            foreach (var itm in _group)
-            {
-                if (itm.Count > 1)
-                {
-                    checkList.Add(new ErrorExportDto(version, customerCode, string.Empty, string.Empty, string.Empty, string.Empty, string.Format("导入的零件号{0},其看板条码号{1}有重复数据，请检查！", itm.MaterialCode, itm.Kanban), string.Empty));
-                }
-            }
-            var _id = GuidGenerator.Create();
-            var _bomList = new List<KanBanVersion>();
-            _bomList.Add(new KanBanVersion(_id, branchId, year, period, version, customerCode));
-            foreach (var itm in entityList)
-            {
-                itm.SetValue(GuidGenerator.Create(), branchId, year, period, version, _id);
-            }
-            if (checkList.Count > 0)
-            {
-                return await ExportErrorReportAsync(checkList);
-            }
-            await _repository.GetDbContext().BulkInsertAsync<KanBanSettle>(entityList);
-            await _versionRepository.GetDbContext().BulkInsertAsync(_bomList);
-            return ApplicationConsts.SuccessStr;
-        }
-
-        /// <summary>
-        /// 按ID获取唯一实体
-        /// </summary>
-        /// <remarks>
-        /// 返回实体全部属性
-        /// </remarks>
-        /// <param name="id">ID</param>
-        /// <returns>实体DTO</returns>
-        [HttpGet]
-        [Route("{id}")]
-        virtual public async Task<VWKanBanDto> GetAsync(Guid id)
-        {
-            var result = await GetFromCacheAsync(id);
-            var dto = ObjectMapper.Map<KanBanSettle, VWKanBanDto>(result);
-            return dto;
-        }
-
-
-        private async Task<KanBanSettle> GetFromCacheAsync(Guid id)
-        {
-            var result = await _repository.GetAsync(id);
-            return result;
-        }
-
-
-        private async Task<long> GetCountAsync(VWKanBanRequestDto input)
-        {
-            return await _repository.GetCountByFilterAsync(input.BranchId, input.Filters);
-        }
-
-        private async Task<long> GetCountAsync(VWKanBanVersionRequestDto input)
-        {
-            return await _versionRepository.GetCountByFilterAsync(input.BranchId, input.Filters);
-        }
-
-
-        /// <summary>
-        /// 导出文件
-        /// </summary>
-        /// <param name="input"></param>
-        /// <returns></returns>
-        [HttpPost]
-        [Route("Export")]
-        virtual public async Task<string> ExportAsync(VWKanBanRequestDto input)
-        {
-
-            IExporter _csv = new CsvExporter();
-            IExporter _excel = new ExcelExporter();
-
-            if (!string.IsNullOrEmpty(input.Version))
-            {
-                input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "Version", Logic = EnumFilterLogic.And, Value = input.Version });
-            }
-            var entities = await _repository.GetListByFilterAsync(GuidGenerator.Create(), input.Filters, input.Sorting, int.MaxValue,
-               0, true);
-
-            var dtoDetails = ObjectMapper.Map<List<KanBanSettle>, List<VWKanBanExportDto>>(entities);
-
-            string _fileName = string.Empty;
-            //声明导出容器
-
-            byte[] result = null;
-            switch (input.FileType)
-            {
-                case 0:
-                    _fileName = string.Format("大众看板结算明细_{0}.csv", input.UserId.ToString());
-                    result = await _csv.ExportAsByteArray(dtoDetails);
-                    break;
-                case 1:
-                    _fileName = string.Format("大众看板结算明细_{0}.xlsx", input.UserId.ToString());
-                    result = await _excel.ExportAsByteArray(dtoDetails);
-                    break;
-            }
-            result.ShouldNotBeNull();
-
-            //保存导出文件到服务器存成二进制
-            await _excelImportService.SaveBlobAsync(
-                     new SaveExcelImportInputDto
-                     {
-                         Name = _fileName,
-                         Content = result
-                     }
-                 );
-            return _fileName;
-        }
-
-
-        /// <summary>
-        /// 根据筛选条件获取实体列表
-        /// </summary>
-        /// <remarks>
-        /// 请求条件包括:筛选条件列表,排序条件,数据数量,页码
-        /// </remarks>
-        /// <param name="input">请求条件</param>
-        /// <returns>实体DTO列表</returns>
-        [HttpPost]
-        [Route("list")]
-     
-        virtual public async Task<PagedResultDto<VWKanBanDto>> GetListAsync(VWKanBanRequestDto input)
-        {
-
-            if (!string.IsNullOrEmpty(input.Version))
-            {
-                input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "Version", Logic = EnumFilterLogic.And, Value = input.Version });
-            }
-            else
-            {
-                return new PagedResultDto<VWKanBanDto>(0, new List<VWKanBanDto>());
-            }
-            var entities = await _repository.GetListByFilterAsync(GuidGenerator.Create(), input.Filters, input.Sorting, input.MaxResultCount,
-                 input.SkipCount, true);
-            var totalCount = await GetCountAsync(input);
-            var dtos = ObjectMapper.Map<List<KanBanSettle>, List<VWKanBanDto>>(entities);
-            return new PagedResultDto<VWKanBanDto>(totalCount, dtos);
-        }
-
-
-        /// <summary>
-        /// 获取实体总数
-        /// </summary>
-        /// <returns>实体总数</returns>
-        [HttpGet]
-        [Route("count")]
-
-        virtual public async Task<long> GetTotalCountAsync(Guid branchId)
-        {
-            return await _repository.GetCountAsync(branchId);
-        }
-
-        /// <summary>
-        /// 获取全部实体列表
-        /// </summary>
-        /// <returns>实体DTO列表</returns>
-        [HttpGet]
-        [Route("all")]
-        //[Authorize(SettleAccountPermissions.SettleAccounts.Default)]
-        virtual public async Task<ListResultDto<VWKanBanDto>> GetAllAsync(Guid branchId)
-        {
-            var entities = await _repository.GetAllAsync(branchId, true);
-
-
-            var dtos = ObjectMapper.Map<List<KanBanSettle>, List<VWKanBanDto>>(entities);
-
-
-            return new ListResultDto<VWKanBanDto>(dtos);
-        }
-
-
-
-        /// <summary>
-        /// 删除实体
-        /// </summary>
-        /// <param name="id">ID</param>
-        /// <returns>无</returns>
-        [HttpDelete]
-        [Route("{id}")]
-        /// [Authorize(SettleAccountPermissions.SettleAccounts.Delete)]
-        virtual public async Task DeleteAsync(Guid id)
-        {
-            await _repository.DeleteAsync(id);
-        }
-
-        /// <summary>
-        /// 按IDs删除实体列表
-        /// </summary>
-        /// <param name="ids">IDs</param>
-        /// <returns>是否执行成功</returns>
-        [HttpPost]
-        [Route("delete")]
-      
-        virtual public async Task<bool> DeleteListAsync(List<Guid> ids)
-        {
-            foreach (var id in ids)
-            {
-                var entity = await GetFromCacheAsync(id);
-                //await Cache.DeleteAsync<SettleAccount>(id.ToString());
-            }
-
-            return await _repository.DeleteListAsync(ids);
-        }
-
-
-
-        /// <summary>
-        /// 版本列表查询
-        /// </summary>
-        /// <param name="input"></param>
-        /// <returns></returns>
-        [HttpPost]
-        [Route("listversion")]
-        [Authorize(SettleAccountPermissions.VWKanBan.Default)]
-        public async Task<PagedResultDto<VWKanBanVersionDto>> GetVersionListAsync(VWKanBanVersionRequestDto input)
-        {
-            var entities = await _versionRepository.GetListByFilterAsync(input.BranchId, input.Filters, input.Sorting, int.MaxValue,
-               input.SkipCount, true);
-
-            var totalCount = await GetCountAsync(input);
-            var dtos = ObjectMapper.Map<List<KanBanVersion>, List<VWKanBanVersionDto>>(entities);
-
-            return new PagedResultDto<VWKanBanVersionDto>(totalCount, dtos);
-        }
-
-    }
-}
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/VWScrapClaims/ScrapClaimsAppService.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/VWScrapClaims/ScrapClaimsAppService.cs
deleted file mode 100644
index 4f8ae907..00000000
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/VWScrapClaims/ScrapClaimsAppService.cs
+++ /dev/null
@@ -1,316 +0,0 @@
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Mvc;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Volo.Abp.Application.Dtos;
-using Volo.Abp.Caching;
-using Volo.Abp.Guids;
-using Win.Abp.Snowflakes;
-using Win.Sfs.BaseData.ImportExcelCommon;
-using Win.Sfs.SettleAccount.CommonManagers;
-using Win.Sfs.SettleAccount.ExcelImporter;
-using Win.Sfs.Shared.Filter;
-using EFCore.BulkExtensions;
-using Win.Sfs.SettleAccount.ExportReports;
-using Win.Sfs.SettleAccount.Constant;
-using Volo.Abp.Domain.Repositories;
-using Magicodes.ExporterAndImporter.Core;
-using Shouldly;
-using Magicodes.ExporterAndImporter.Csv;
-using Magicodes.ExporterAndImporter.Excel;
-
-namespace Win.Sfs.SettleAccount.Entities.VWScrapClaims
-{
-    /// <summary>
-    /// 大众CP7报废和索赔导入
-    /// </summary>
-    [Authorize(SettleAccountPermissions.ScrapClaims.Default)]
-    //[AllowAnonymous]
-    [Route("api/settleaccount/ScrapClaims")]
-    public class ScrapClaimsAppService : SettleAccountApplicationBase<ScrapClaims>, IScrapClaimsAppService
-    {
-        private readonly IGuidGenerator _guidGenerator;
-
-        private readonly IExcelImportAppService _excelImportService;
-
-        private readonly ISettleAccountBranchEfCoreRepository<ScrapClaimsVersion, Guid> _versionRepository;
-
-        private readonly ISettleAccountBranchEfCoreRepository<ScrapClaims, Guid> _repository;
-        /// <summary>
-        /// 构建方法
-        /// </summary>
-        /// <param name="guidGenerator">构建UID</param>
-        /// <param name="repository">仓储接口</param>
-        /// <param name="cache">缓存</param>
-        public ScrapClaimsAppService(IGuidGenerator guidGenerator,
-         ISettleAccountBranchEfCoreRepository<ScrapClaimsVersion, Guid> versionRepository,
-           ISettleAccountBranchEfCoreRepository<ScrapClaims, Guid> repository,
-            IDistributedCache<ScrapClaims> cache,
-            IExcelImportAppService excelImportService,
-            ISnowflakeIdGenerator snowflakeIdGenerator,
-            ICommonManager commonManager
-        ) : base(cache, excelImportService, snowflakeIdGenerator, commonManager)
-        {
-            _versionRepository = versionRepository;
-            _guidGenerator = guidGenerator;
-            _excelImportService = excelImportService;
-            _repository = repository;
-        }
-
-
-        /// <summary>
-        /// 导入功能
-        /// </summary>
-        /// <param name="files">上传的文件(前端已经限制只能上传一个附件)</param>
-        /// <returns></returns>
-        [HttpPost]
-        [Route("ExcelImport")]
-        [DisableRequestSizeLimit]
-        [Authorize(SettleAccountPermissions.ScrapClaims.Create)]
-        public async Task<string> ScrapClaimsUploadExcelImport([FromForm] IFormFileCollection files, Guid branchId, string year, string period, string version, string customerCode)
-        {
-            ExportImporter _exportImporter = new ExportImporter();
-            var result = await _exportImporter.UploadExcelImport<ScrapClaimsImportDto>(files, _excelImportService);
-            var entityList = ObjectMapper.Map<List<ScrapClaimsImportDto>, List<ScrapClaims>>(result);
-            //删除版本
-            var _versionQuery = _versionRepository.Where(p => p.Version == version);
-            await _versionQuery.BatchDeleteAsync();
-            //删除明细
-            var _query = _repository.Where(p => p.Version == version);
-            await _query.BatchDeleteAsync();
-            //插入数据前检验
-            var checkList = new List<ErrorExportDto>();
-            var _group = entityList.GroupBy(x => new { x.Type, x.MaterialCode, x.Version }).Select(p => new { Count = p.Count(), Type = p.Key.Type, MaterialCode = p.Key.MaterialCode });
-            foreach (var itm in _group)
-            {
-                if (string.IsNullOrEmpty(itm.Type))
-                {
-                    checkList.Add(new ErrorExportDto(version, customerCode, string.Empty, string.Empty, string.Empty, string.Empty, string.Format("导入的零件号{0},其类型标识{1}有空，请检查！", itm.MaterialCode, itm.Type), string.Empty));
-                }
-            }
-            var _id = GuidGenerator.Create();
-            var _bomList = new List<ScrapClaimsVersion>();
-            _bomList.Add(new ScrapClaimsVersion(_id, branchId, year, period, version, customerCode));
-            foreach (var itm in entityList)
-            {
-                //赋值上主键ID
-                itm.SetValue(GuidGenerator.Create(), branchId, year, period, version);
-            }
-            if (checkList.Count > 0)
-            {
-                return await ExportErrorReportAsync(checkList);
-            }
-            await _repository.GetDbContext().BulkInsertAsync<ScrapClaims>(entityList);
-            await _versionRepository.GetDbContext().BulkInsertAsync(_bomList);
-            return ApplicationConsts.SuccessStr;
-        }
-
-        /// <summary>
-        /// 按ID获取唯一实体
-        /// </summary>
-        /// <remarks>
-        /// 返回实体全部属性
-        /// </remarks>
-        /// <param name="id">ID</param>
-        /// <returns>实体DTO</returns>
-        [HttpGet]
-        [Route("{id}")]
-        //[Authorize(SettleAccountPermissions.SettleAccounts.Default)]
-        virtual public async Task<ScrapClaimsDto> GetAsync(Guid id)
-        {
-            var result = await GetFromCacheAsync(id);
-            var dto = ObjectMapper.Map<ScrapClaims, ScrapClaimsDto>(result);
-            return dto;
-        }
-
-
-        private async Task<ScrapClaims> GetFromCacheAsync(Guid id)
-        {
-            var result = await _repository.GetAsync(id);
-            return result;
-        }
-
-
-        private async Task<long> GetCountAsync(ScrapClaimsRequestDto input)
-        {
-            return await _repository.GetCountByFilterAsync(input.BranchId, input.Filters);
-        }
-
-        private async Task<long> GetCountAsync(ScrapClaimsVersionRequestDto input)
-        {
-            return await _versionRepository.GetCountByFilterAsync(input.BranchId, input.Filters);
-        }
-
-
-        /// <summary>
-        /// 导出文件
-        /// </summary>
-        /// <param name="input"></param>
-        /// <returns></returns>
-        [HttpPost]
-        [Route("Export")]
-        //[Authorize(SettleAccountPermissions.SettleAccounts.Default)]
-        virtual public async Task<string> ExportAsync(ScrapClaimsRequestDto input)
-        {
-
-            IExporter _csv = new CsvExporter();
-            IExporter _excel = new ExcelExporter();
-            if (!string.IsNullOrEmpty(input.Version))
-            {
-                input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "Version", Logic = EnumFilterLogic.And, Value = input.Version });
-            }
-            var entities = await _repository.GetListByFilterAsync(input.BranchId, input.Filters, input.Sorting, int.MaxValue,
-               0, true);
-
-            var dtoDetails = ObjectMapper.Map<List<ScrapClaims>, List<ScrapClaimsExportDto>>(entities);
-
-            string _fileName = string.Empty;
-            //声明导出容器
-
-            byte[] result = null;
-            switch (input.FileType)
-            {
-                case 0:
-                    _fileName = string.Format("CP7报废和索赔明细_{0}.csv", input.UserId.ToString());
-                    result = await _csv.ExportAsByteArray(dtoDetails);
-                    break;
-                case 1:
-                    _fileName = string.Format("CP7报废和索赔明细_{0}.xlsx", input.UserId.ToString());
-                    result = await _excel.ExportAsByteArray(dtoDetails);
-                    break;
-            }
-            result.ShouldNotBeNull();
-
-            //保存导出文件到服务器存成二进制
-            await _excelImportService.SaveBlobAsync(
-                     new SaveExcelImportInputDto
-                     {
-                         Name = _fileName,
-                         Content = result
-                     }
-                 );
-            return _fileName;
-        }
-
-
-        /// <summary>
-        /// 根据筛选条件获取实体列表
-        /// </summary>
-        /// <remarks>
-        /// 请求条件包括:筛选条件列表,排序条件,数据数量,页码
-        /// </remarks>
-        /// <param name="input">请求条件</param>
-        /// <returns>实体DTO列表</returns>
-        [HttpPost]
-        [Route("list")]
-
-        virtual public async Task<PagedResultDto<ScrapClaimsDto>> GetListAsync(ScrapClaimsRequestDto input)
-        {
-            if (!string.IsNullOrEmpty(input.Version))
-            {
-                input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "Version", Logic = EnumFilterLogic.And, Value = input.Version });
-            }
-            else
-            {
-                return new PagedResultDto<ScrapClaimsDto>(0, new List<ScrapClaimsDto>());
-            }
-            var entities = await _repository.GetListByFilterAsync(input.BranchId, input.Filters, input.Sorting, input.MaxResultCount,
-                 input.SkipCount, true);
-
-            var totalCount = await GetCountAsync(input);
-            var dtos = ObjectMapper.Map<List<ScrapClaims>, List<ScrapClaimsDto>>(entities);
-
-            return new PagedResultDto<ScrapClaimsDto>(totalCount, dtos);
-        }
-
-
-        /// <summary>
-        /// 获取实体总数
-        /// </summary>
-        /// <returns>实体总数</returns>
-        [HttpGet]
-        [Route("count")]
-        [Authorize(SettleAccountPermissions.SettleAccounts.Default)]
-        virtual public async Task<long> GetTotalCountAsync(Guid branchId)
-        {
-            return await _repository.GetCountAsync(branchId);
-        }
-
-        /// <summary>
-        /// 获取全部实体列表
-        /// </summary>
-        /// <returns>实体DTO列表</returns>
-        [HttpGet]
-        [Route("all")]
-        //[Authorize(SettleAccountPermissions.SettleAccounts.Default)]
-        virtual public async Task<ListResultDto<ScrapClaimsDto>> GetAllAsync(Guid branchId)
-        {
-            var entities = await _repository.GetAllAsync(branchId, true);
-
-
-            var dtos = ObjectMapper.Map<List<ScrapClaims>, List<ScrapClaimsDto>>(entities);
-
-
-            return new ListResultDto<ScrapClaimsDto>(dtos);
-        }
-
-
-
-        /// <summary>
-        /// 删除实体
-        /// </summary>
-        /// <param name="id">ID</param>
-        /// <returns>无</returns>
-        [HttpDelete]
-        [Route("{id}")]
-        /// [Authorize(SettleAccountPermissions.SettleAccounts.Delete)]
-        virtual public async Task DeleteAsync(Guid id)
-        {
-            await _repository.DeleteAsync(id);
-        }
-
-        /// <summary>
-        /// 按IDs删除实体列表
-        /// </summary>
-        /// <param name="ids">IDs</param>
-        /// <returns>是否执行成功</returns>
-        [HttpPost]
-        [Route("delete")]
-        // [Authorize(SettleAccountPermissions.SettleAccounts.Delete)]
-        virtual public async Task<bool> DeleteListAsync(List<Guid> ids)
-        {
-            foreach (var id in ids)
-            {
-                var entity = await GetFromCacheAsync(id);
-                //await Cache.DeleteAsync<SettleAccount>(id.ToString());
-            }
-
-            return await _repository.DeleteListAsync(ids);
-        }
-
-
-
-        /// <summary>
-        /// 版本列表查询
-        /// </summary>
-        /// <param name="input"></param>
-        /// <returns></returns>
-        [HttpPost]
-        [Route("listversion")]
-        public async Task<PagedResultDto<ScrapClaimsVersionDto>> GetVersionListAsync(ScrapClaimsVersionRequestDto input)
-        {
-            var entities = await _versionRepository.GetListByFilterAsync(input.BranchId, input.Filters, input.Sorting, int.MaxValue,
-               input.SkipCount, true);
-
-            var totalCount = await GetCountAsync(input);
-            var dtos = ObjectMapper.Map<List<ScrapClaimsVersion>, List<ScrapClaimsVersionDto>>(entities);
-
-            return new PagedResultDto<ScrapClaimsVersionDto>(totalCount, dtos);
-        }
-
-    }
-}
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/VWSparePart/SparePartAppService.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/VWSparePart/SparePartAppService.cs
deleted file mode 100644
index aa3dc008..00000000
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/VWSparePart/SparePartAppService.cs
+++ /dev/null
@@ -1,497 +0,0 @@
-using EFCore.BulkExtensions;
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Mvc;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Volo.Abp.Application.Dtos;
-using Volo.Abp.Caching;
-using Volo.Abp.Domain.Repositories;
-using Volo.Abp.Guids;
-using Win.Abp.Snowflakes;
-using Win.Sfs.BaseData.ImportExcelCommon;
-using Win.Sfs.SettleAccount.CommonManagers;
-using Win.Sfs.SettleAccount.Constant;
-using Win.Sfs.SettleAccount.ExcelImporter;
-using Win.Sfs.SettleAccount.ExportReports;
-using Shouldly;
-using Magicodes.ExporterAndImporter.Core;
-using Magicodes.ExporterAndImporter.Csv;
-using Magicodes.ExporterAndImporter.Excel;
-using Win.Sfs.Shared.Filter;
-using Volo.Abp;
-
-namespace Win.Sfs.SettleAccount.Entities.VWSparePart
-{
-    /// <summary>
-    /// 大众备件服务
-    /// </summary>
-    [Route("api/settleaccount/SparePart")]
-    [Authorize(SettleAccountPermissions.SparePart.Default)]
-    public class SparePartAppService : SettleAccountApplicationBase<SparePart>, ISparePartAppService
-    {
-        private readonly IGuidGenerator _guidGenerator;
-
-        private readonly IExcelImportAppService _excelImportService;
-
-        private readonly ISettleAccountBranchEfCoreRepository<SparePartVersion, Guid> _versionRepository;
-
-        private readonly ISettleAccountBranchEfCoreRepository<SparePart, Guid> _repository;
-        /// <summary>
-        /// 构建方法
-        /// </summary>
-        /// <param name="guidGenerator">构建UID</param>
-        /// <param name="repository">仓储接口</param>
-        /// <param name="cache">缓存</param>
-        public SparePartAppService(IGuidGenerator guidGenerator,
-         ISettleAccountBranchEfCoreRepository<SparePartVersion, Guid> versionRepository,
-           ISettleAccountBranchEfCoreRepository<SparePart, Guid> repository,
-            IDistributedCache<SparePart> cache,
-            IExcelImportAppService excelImportService,
-            ISnowflakeIdGenerator snowflakeIdGenerator,
-            ICommonManager commonManager
-        ) : base(cache, excelImportService, snowflakeIdGenerator, commonManager)
-        {
-            _versionRepository = versionRepository;
-            _guidGenerator = guidGenerator;
-            _excelImportService = excelImportService;
-            _repository = repository;
-        }
-
-
-        /// <summary>
-        /// 大众备件明细数据导入功能（以后正常使用的功能），包含导入有空的订单号
-        /// </summary>
-        /// <param name="files">上传的文件(前端已经限制只能上传一个附件)</param>
-        /// <returns></returns>
-        [HttpPost]
-        [Route("ExcelImport")]
-        [DisableRequestSizeLimit]
-        [Authorize(SettleAccountPermissions.SparePart.Create)]
-        public async Task<string> SparePartUploadExcelImport([FromForm] IFormFileCollection files, Guid branchId, string year, string period, string version, string customerCode)
-        {
-            if (string.IsNullOrEmpty(version))
-            {
-                throw new BusinessException("版本不能空，必须传入！");
-            }
-            ExportImporter _exportImporter = new ExportImporter();
-            var result = await _exportImporter.UploadExcelImport<SparePartImportDto>(files, _excelImportService);
-            var entityList = ObjectMapper.Map<List<SparePartImportDto>, List<SparePart>>(result);
-            //删除版本
-            var _versionQuery = _versionRepository.Where(p => p.Version == version);
-            await _versionQuery.BatchDeleteAsync();
-            //删除明细
-            var _query = _repository.Where(p => p.Version == version && p.Extend != "is90");
-            await _query.BatchDeleteAsync();
-            //插入数据前检验
-            var checkList = new List<ErrorExportDto>();
-            var _group = entityList.GroupBy(x => new { x.LineNumber, x.MaterialCode, x.Version }).Select(p => new { Count = p.Count(), LineNumber = p.Key.LineNumber, MaterialCode = p.Key.MaterialCode });
-            foreach (var itm in _group)
-            {
-                if (string.IsNullOrEmpty(itm.MaterialCode))
-                {
-                    checkList.Add(new ErrorExportDto(version, customerCode, string.Empty, string.Empty, string.Empty, string.Empty, string.Format("导入的行号为{0}的物料代码为空，请检查！", itm.LineNumber), string.Empty));
-                }
-            }
-            var _id = GuidGenerator.Create();
-            var _bomList = new List<SparePartVersion>();
-            _bomList.Add(new SparePartVersion(_id, branchId, year, period, version, customerCode));
-            foreach (var itm in entityList)
-            {
-                if (string.IsNullOrEmpty(itm.PurchaseOrderNo))
-                {
-                    //订单号不空
-                    itm.SetValue(GuidGenerator.Create(), branchId, year, period, version, "not90", "NoOrder");
-                }
-                else
-                {
-                    //赋值上主键ID
-                    itm.SetValue(GuidGenerator.Create(), branchId, year, period, version, "not90");
-                }
-                
-            }
-            if (checkList.Count > 0)
-            {
-                return await ExportErrorReportAsync(checkList);
-            }
-            await _repository.GetDbContext().BulkInsertAsync<SparePart>(entityList);
-            await _versionRepository.GetDbContext().BulkInsertAsync(_bomList);
-            return ApplicationConsts.SuccessStr;
-        }
-
-        /// <summary>
-        /// 大众备件调整导入（财务期初时用的功能）,订单号+物料号能一对一匹配
-        /// </summary>
-        /// <param name="files"></param>
-        /// <param name="branchId"></param>
-        /// <param name="year"></param>
-        /// <param name="period"></param>
-        /// <param name="version"></param>
-        /// <param name="customerCode"></param>
-        /// <returns></returns>
-        [HttpPost]
-        [Route("ExcelImport90")]
-        [DisableRequestSizeLimit]
-
-        public async Task<string> SparePartUploadExcelImport90([FromForm] IFormFileCollection files, Guid branchId, string year, string period, string version, string customerCode)
-        {
-            if (string.IsNullOrEmpty(version))
-            {
-                throw new BusinessException("版本不能空，必须传入！");
-            }
-            ExportImporter _exportImporter = new ExportImporter();
-            var result = await _exportImporter.UploadExcelImport<SparePartImportDto>(files, _excelImportService);
-            var entityList = ObjectMapper.Map<List<SparePartImportDto>, List<SparePart>>(result);
-            //删除版本
-            var _versionQuery = _versionRepository.Where(p => p.Version == version);
-            await _versionQuery.BatchDeleteAsync();
-            //删除明细
-            var _query = _repository.Where(p => p.Version == version && p.Extend == "is90");
-            await _query.BatchDeleteAsync();
-            //插入数据前检验
-            var checkList = new List<ErrorExportDto>();
-            var _group = entityList.GroupBy(x => new { x.LineNumber, x.MaterialCode, x.Version }).Select(p => new { Count = p.Count(), LineNumber = p.Key.LineNumber, MaterialCode = p.Key.MaterialCode });
-            foreach (var itm in _group)
-            {
-                if (string.IsNullOrEmpty(itm.MaterialCode))
-                {
-                    checkList.Add(new ErrorExportDto(version, customerCode, string.Empty, string.Empty, string.Empty, string.Empty, string.Format("导入的行号为{0}的物料代码为空，请检查！", itm.LineNumber), string.Empty));
-                }
-            }
-            var _id = GuidGenerator.Create();
-            var _bomList = new List<SparePartVersion>();
-            _bomList.Add(new SparePartVersion(_id, branchId, year, period, version, customerCode));
-            foreach (var itm in entityList)
-            {
-                itm.SetValue(GuidGenerator.Create(), branchId, year, period, version, "is90");
-            }
-            if (checkList.Count > 0)
-            {
-                return await ExportErrorReportAsync(checkList);
-            }
-            await _repository.GetDbContext().BulkInsertAsync<SparePart>(entityList);
-            await _versionRepository.GetDbContext().BulkInsertAsync(_bomList);
-            return ApplicationConsts.SuccessStr;
-        }
-
-        /// <summary>
-        /// 按ID获取唯一实体
-        /// </summary>
-        /// <remarks>
-        /// 返回实体全部属性
-        /// </remarks>
-        /// <param name="id">ID</param>
-        /// <returns>实体DTO</returns>
-        [HttpGet]
-        [Route("{id}")]
-
-        virtual public async Task<SparePartDto> GetAsync(Guid id)
-        {
-            var result = await GetFromCacheAsync(id);
-            var dto = ObjectMapper.Map<SparePart, SparePartDto>(result);
-            return dto;
-        }
-
-
-        private async Task<SparePart> GetFromCacheAsync(Guid id)
-        {
-            var result = await _repository.GetAsync(id);
-            return result;
-        }
-
-
-        private async Task<long> GetCountAsync(SparePartRequestDto input)
-        {
-            return await _repository.GetCountByFilterAsync(input.BranchId, input.Filters);
-        }
-
-        private async Task<long> GetCountAsync(SparePartVersionRequestDto input)
-        {
-            return await _versionRepository.GetCountByFilterAsync(input.BranchId, input.Filters);
-        }
-
-
-        /// <summary>
-        /// 导出文件
-        /// </summary>
-        /// <param name="input"></param>
-        /// <returns></returns>
-        [HttpPost]
-        [Route("Export")]
-    
-        virtual public async Task<string> ExportAsync(SparePartRequestDto input)
-        {
-            if (string.IsNullOrEmpty(input.Version))
-            {
-                throw new BusinessException("版本不能空，必须传入！");
-            }
-            IExporter _csv = new CsvExporter();
-            IExporter _excel = new ExcelExporter();
-            if (!string.IsNullOrEmpty(input.Version))
-            {
-                input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "Version", Logic = EnumFilterLogic.And, Value = input.Version });
-            }
-            var entities = await _repository.GetListByFilterAsync(input.BranchId, input.Filters, input.Sorting, int.MaxValue,
-               0, true);
-
-            var dtoDetails = ObjectMapper.Map<List<SparePart>, List<SparePartExportDto>>(entities.Where(p => p.Extend == "not90").ToList());
-
-            string _fileName = string.Empty;
-            //声明导出容器
-
-            byte[] result = null;
-            switch (input.FileType)
-            {
-                case 0:
-                    _fileName = string.Format("大众备件结算调整_{0}.csv", input.UserId.ToString());
-                    result = await _csv.ExportAsByteArray(dtoDetails);
-                    break;
-                case 1:
-                    _fileName = string.Format("大众备件结算调整_{0}.xlsx", input.UserId.ToString());
-                    result = await _excel.ExportAsByteArray(dtoDetails);
-                    break;
-            }
-            result.ShouldNotBeNull();
-
-            //保存导出文件到服务器存成二进制
-            await _excelImportService.SaveBlobAsync(
-                     new SaveExcelImportInputDto
-                     {
-                         Name = _fileName,
-                         Content = result
-                     }
-                 );
-            return _fileName;
-        }
-
-
-        [HttpPost]
-        [Route("Export90")]
-       
-        virtual public async Task<string> Export90Async(SparePartRequestDto input)
-        {
-            if (string.IsNullOrEmpty(input.Version))
-            {
-                throw new BusinessException("版本不能空，必须传入！");
-            }
-            IExporter _csv = new CsvExporter();
-            IExporter _excel = new ExcelExporter();
-            if (!string.IsNullOrEmpty(input.Version))
-            {
-                input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "Version", Logic = EnumFilterLogic.And, Value = input.Version });
-            }
-            var entities = await _repository.GetListByFilterAsync(input.BranchId, input.Filters, input.Sorting, int.MaxValue,
-               0, true);
-
-            var dtoDetails = ObjectMapper.Map<List<SparePart>, List<SparePartExportDto>>(entities.Where(p => p.Extend == "is90").ToList());
-
-            string _fileName = string.Empty;
-            //声明导出容器
-
-            byte[] result = null;
-            switch (input.FileType)
-            {
-                case 0:
-                    _fileName = string.Format("大众备件结算明细_{0}.csv", input.UserId.ToString());
-                    result = await _csv.ExportAsByteArray(dtoDetails);
-                    break;
-                case 1:
-                    _fileName = string.Format("大众备件结算明细_{0}.xlsx", input.UserId.ToString());
-                    result = await _excel.ExportAsByteArray(dtoDetails);
-                    break;
-            }
-            result.ShouldNotBeNull();
-
-            //保存导出文件到服务器存成二进制
-            await _excelImportService.SaveBlobAsync(
-                     new SaveExcelImportInputDto
-                     {
-                         Name = _fileName,
-                         Content = result
-                     }
-                 );
-            return _fileName;
-        }
-
-
-        /// <summary>
-        /// 根据筛选条件获取实体列表
-        /// </summary>
-        /// <remarks>
-        /// 请求条件包括:筛选条件列表,排序条件,数据数量,页码
-        /// </remarks>
-        /// <param name="input">请求条件</param>
-        /// <returns>实体DTO列表</returns>
-        //[HttpPost]
-        //[Route("list")]
-        ////[Authorize(SettleAccountPermissions.SettleAccounts.Default)]
-        //virtual public async Task<PagedResultDto<SparePartDto>> GetListAsync(SparePartRequestDto input)
-        //{
-        //    if (!string.IsNullOrEmpty(input.Version))
-        //    {
-        //        input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "Version", Logic = EnumFilterLogic.And, Value = input.Version });
-        //    }
-        //    else
-        //    {
-        //        return new PagedResultDto<SparePartDto>(0, new List<SparePartDto>());
-        //    }
-
-        //    var entities = await _repository.GetListByFilterAsync(input.BranchId, input.Filters, input.Sorting, input.MaxResultCount,
-        //         input.SkipCount, true);
-        //    if (entities == null || entities.Count == 0)
-        //    {
-        //        return new PagedResultDto<SparePartDto>(0, null);
-        //    }
-        //    else
-        //    {
-        //        input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "Extend", Logic = EnumFilterLogic.And, Value = "not90"});
-        //    }
-        //    var totalCount = await GetCountAsync(input);
-        //    var dtos = ObjectMapper.Map<List<SparePart>, List<SparePartDto>>(entities.Where(p => p.Extend == "not90").ToList());
-
-        //    return new PagedResultDto<SparePartDto>(totalCount, dtos);
-        //}
-
-        [HttpPost]
-        [Route("list")]
-  
-        virtual public async Task<PagedResultDto<SparePartDto>> GetListAsync(SparePartRequestDto input)
-        {
-            if (!string.IsNullOrEmpty(input.Version))
-            {
-                input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "Version", Logic = EnumFilterLogic.And, Value = input.Version });
-            }
-            else
-            {
-                return new PagedResultDto<SparePartDto>(0, new List<SparePartDto>());
-            }
-
-            var entities = await _repository.GetListByFilterAsync(input.BranchId, input.Filters, input.Sorting, input.MaxResultCount,
-                 input.SkipCount, true);
-
-            var totalCount = await GetCountAsync(input);
-            var dtos = ObjectMapper.Map<List<SparePart>, List<SparePartDto>>(entities);
-
-            return new PagedResultDto<SparePartDto>(totalCount, dtos);
-        }
-
-        [HttpPost]
-        [Route("list90")]
- 
-        virtual public async Task<PagedResultDto<SparePartDto>> GetList90Async(SparePartRequestDto input)
-        {
-            if (!string.IsNullOrEmpty(input.Version))
-            {
-                input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "Version", Logic = EnumFilterLogic.And, Value = input.Version });
-            }
-            else
-            {
-                return new PagedResultDto<SparePartDto>(0, new List<SparePartDto>());
-            }
-
-            var entities = await _repository.GetListByFilterAsync(input.BranchId, input.Filters, input.Sorting, input.MaxResultCount,
-                 input.SkipCount, true);
-            if (entities == null || entities.Count==0)
-            {
-                return new PagedResultDto<SparePartDto>(0, null);
-            }
-            else
-            {
-                input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "Extend", Logic = EnumFilterLogic.And, Value = "is90" });
-            }
-            var totalCount = await GetCountAsync(input);
-            var dtos = ObjectMapper.Map<List<SparePart>, List<SparePartDto>>(entities.Where(p=>p.Extend=="is90").ToList());
-
-            return new PagedResultDto<SparePartDto>(totalCount, dtos);
-        }
-
-
-        /// <summary>
-        /// 获取实体总数
-        /// </summary>
-        /// <returns>实体总数</returns>
-        [HttpGet]
-        [Route("count")]
-
-        virtual public async Task<long> GetTotalCountAsync(Guid branchId)
-        {
-            return await _repository.GetCountAsync(branchId);
-        }
-
-        /// <summary>
-        /// 获取全部实体列表
-        /// </summary>
-        /// <returns>实体DTO列表</returns>
-        [HttpGet]
-        [Route("all")]
- 
-        virtual public async Task<ListResultDto<SparePartDto>> GetAllAsync(Guid branchId)
-        {
-            var entities = await _repository.GetAllAsync(branchId, true);
-
-
-            var dtos = ObjectMapper.Map<List<SparePart>, List<SparePartDto>>(entities);
-
-
-            return new ListResultDto<SparePartDto>(dtos);
-        }
-
-
-
-        /// <summary>
-        /// 删除实体
-        /// </summary>
-        /// <param name="id">ID</param>
-        /// <returns>无</returns>
-        [HttpDelete]
-        [Route("{id}")]
-  
-        virtual public async Task DeleteAsync(Guid id)
-        {
-            await _repository.DeleteAsync(id);
-        }
-
-        /// <summary>
-        /// 按IDs删除实体列表
-        /// </summary>
-        /// <param name="ids">IDs</param>
-        /// <returns>是否执行成功</returns>
-        [HttpPost]
-        [Route("delete")]
-
-        virtual public async Task<bool> DeleteListAsync(List<Guid> ids)
-        {
-            foreach (var id in ids)
-            {
-                var entity = await GetFromCacheAsync(id);
-                //await Cache.DeleteAsync<SettleAccount>(id.ToString());
-            }
-
-            return await _repository.DeleteListAsync(ids);
-        }
-
-
-
-        /// <summary>
-        /// 版本列表查询
-        /// </summary>
-        /// <param name="input"></param>
-        /// <returns></returns>
-        [HttpPost]
-        [Route("listversion")]
-        public async Task<PagedResultDto<SparePartVersionDto>> GetVersionListAsync(SparePartVersionRequestDto input)
-        {
-            var entities = await _versionRepository.GetListByFilterAsync(input.BranchId, input.Filters, input.Sorting, int.MaxValue,
-               input.SkipCount, true);
-
-            var totalCount = await GetCountAsync(input);
-            var dtos = ObjectMapper.Map<List< SparePartVersion>, List<SparePartVersionDto>>(entities);
-
-            return new PagedResultDto<SparePartVersionDto>(totalCount, dtos);
-        }
-
-    }
-}
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS-KanBan/WMSKanBanAppService.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS-KanBan/WMSKanBanAppService.cs
deleted file mode 100644
index b009082e..00000000
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS-KanBan/WMSKanBanAppService.cs
+++ /dev/null
@@ -1,317 +0,0 @@
-using Magicodes.ExporterAndImporter.Core;
-using Magicodes.ExporterAndImporter.Csv;
-using Magicodes.ExporterAndImporter.Excel;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Volo.Abp.Guids;
-using Win.Sfs.BaseData.ImportExcelCommon;
-using Win.Sfs.SettleAccount.Entities.WMSKanBan;
-using Win.Sfs.Shared.Filter;
-using Shouldly;
-using Microsoft.AspNetCore.Mvc;
-using Volo.Abp.Caching;
-using Win.Abp.Snowflakes;
-using Win.Sfs.SettleAccount.CommonManagers;
-using Volo.Abp;
-using Microsoft.AspNetCore.Http;
-using Win.Sfs.SettleAccount.ExcelImporter;
-using EFCore.BulkExtensions;
-using Win.Sfs.SettleAccount.ExportReports;
-using Volo.Abp.Domain.Repositories;
-using Win.Sfs.SettleAccount.Constant;
-using Microsoft.AspNetCore.Authorization;
-using Volo.Abp.Application.Dtos;
-
-namespace Win.Sfs.SettleAccount.Entities.WMS_KanBan
-{
-    /// <summary>
-    /// 大众看板发货明细
-    /// </summary>
-    [Authorize(SettleAccountPermissions.WMSJIT.Default)]
-    //[AllowAnonymous]
-    [Route("api/settleaccount/WMSVWKanBan")]
-    public class WMSKanBanAppService : SettleAccountApplicationBase<WMSKanBanSettle>, IWMSVWKanBanAppService
-    {
-        private readonly IGuidGenerator _guidGenerator;
-
-        private readonly IExcelImportAppService _excelImportService;
-
-        private readonly ISettleAccountBranchEfCoreRepository<WMSKanBanVersion, Guid> _versionRepository;
-
-        private readonly ISettleAccountBranchEfCoreRepository<WMSKanBanSettle, Guid> _repository;
-        /// <summary>
-        /// 构建方法
-        /// </summary>
-        /// <param name="guidGenerator">构建UID</param>
-        /// <param name="repository">仓储接口</param>
-        /// <param name="cache">缓存</param>
-        public WMSKanBanAppService(IGuidGenerator guidGenerator,
-         ISettleAccountBranchEfCoreRepository<WMSKanBanVersion, Guid> versionRepository,
-           ISettleAccountBranchEfCoreRepository<WMSKanBanSettle, Guid> repository,
-            IDistributedCache<WMSKanBanSettle> cache,
-            IExcelImportAppService excelImportService,
-            ISnowflakeIdGenerator snowflakeIdGenerator,
-            ICommonManager commonManager
-        ) : base(cache, excelImportService, snowflakeIdGenerator, commonManager)
-        {
-            _versionRepository = versionRepository;
-            _guidGenerator = guidGenerator;
-            _excelImportService = excelImportService;
-            _repository = repository;
-        }
-
-
-        /// <summary>
-        /// 导入功能
-        /// </summary>
-        /// <param name="files">上传的文件(前端已经限制只能上传一个附件)</param>
-        /// <returns></returns>
-        [HttpPost]
-        [Route("ExcelImport")]
-        [DisableRequestSizeLimit]
-        //[Authorize(SettleAccountPermissions.SettleAccounts.Default)]
-        public async Task<string> WMSVWKanBanUploadExcelImport([FromForm] IFormFileCollection files, Guid branchId, string year, string period, string version, string customerCode)
-        {
-            if (string.IsNullOrEmpty(version))
-            {
-                throw new BusinessException("版本不能空，必须传入！");
-            }
-            List<WMSVWKanBanImportDto> listImport = new List<WMSVWKanBanImportDto>();
-            ExportImporter _exportImporter = new ExportImporter();
-            var result = await _exportImporter.UploadExcelImport<WMSVWKanBanImportDto>(files, _excelImportService);
-            var entityList = ObjectMapper.Map<List<WMSVWKanBanImportDto>, List<WMSKanBanSettle>>(result);
-            //删除版本
-            var _versionQuery = _versionRepository.Where(p => p.Version == version);
-            await _versionQuery.BatchDeleteAsync();
-            //删除明细
-            var _query = _repository.Where(p => p.Version == version);
-            await _query.BatchDeleteAsync();
-            //插入数据前检验
-            var checkList = new List<ErrorExportDto>();
-            var _group = entityList.GroupBy(x => new { x.Kanban, x.MaterialCode, x.Version }).Select(p => new { Count = p.Count(), Kanban = p.Key.Kanban, MaterialCode = p.Key.MaterialCode });
-            foreach (var itm in _group)
-            {
-                if (itm.Count > 1)
-                {
-                    checkList.Add(new ErrorExportDto(version, customerCode, string.Empty, string.Empty, string.Empty, string.Empty, string.Format("导入的零件号{0},其看板条码号{1}有重复数据，请检查！", itm.MaterialCode, itm.Kanban), string.Empty));
-                }
-            }
-            var _id = GuidGenerator.Create();
-            var _bomList = new List<WMSKanBanVersion>();
-            _bomList.Add(new WMSKanBanVersion(_id, branchId, year, period, version, customerCode));
-            foreach (var itm in entityList)
-            {
-                //itm.SetValue(GuidGenerator.Create(), year, period, version);
-                itm.SetValue(GuidGenerator.Create(), version);
-            }
-            if (checkList.Count > 0)
-            {
-                return await ExportErrorReportAsync(checkList);
-            }
-            await _repository.GetDbContext().BulkInsertAsync<WMSKanBanSettle>(entityList);
-            await _versionRepository.GetDbContext().BulkInsertAsync(_bomList);
-            return ApplicationConsts.SuccessStr;
-        }
-
-        /// <summary>
-        /// 按ID获取唯一实体
-        /// </summary>
-        /// <remarks>
-        /// 返回实体全部属性
-        /// </remarks>
-        /// <param name="id">ID</param>
-        /// <returns>实体DTO</returns>
-        [HttpGet]
-        [Route("{id}")]
-        virtual public async Task<WMSVWKanBanDto> GetAsync(Guid id)
-        {
-            var result = await GetFromCacheAsync(id);
-            var dto = ObjectMapper.Map<WMSKanBanSettle, WMSVWKanBanDto>(result);
-            return dto;
-        }
-
-
-        private async Task<WMSKanBanSettle> GetFromCacheAsync(Guid id)
-        {
-            var result = await _repository.GetAsync(id);
-            return result;
-        }
-
-
-        private async Task<long> GetCountAsync(WMSVWKanBanRequestDto input)
-        {
-            return await _repository.GetCountByFilterAsync(input.BranchId, input.Filters);
-        }
-
-        private async Task<long> GetCountAsync(WMSVWKanBanVersionRequestDto input)
-        {
-            return await _versionRepository.GetCountByFilterAsync(input.BranchId, input.Filters);
-        }
-
-
-        /// <summary>
-        /// 导出文件
-        /// </summary>
-        /// <param name="input"></param>
-        /// <returns></returns>
-        [HttpPost]
-        [Route("Export")]
-        virtual public async Task<string> ExportAsync(WMSVWKanBanRequestDto input)
-        {
-
-            IExporter _csv = new CsvExporter();
-            IExporter _excel = new ExcelExporter();
-
-            if (!string.IsNullOrEmpty(input.Version))
-            {
-                input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "Version", Logic = EnumFilterLogic.And, Value = input.Version });
-            }
-            var entities = await _repository.GetListByFilterAsync(GuidGenerator.Create(), input.Filters, input.Sorting, int.MaxValue,
-               0, true);
-
-            var dtoDetails = ObjectMapper.Map<List<WMSKanBanSettle>, List<WMSVWKanBanExportDto>>(entities);
-
-            string _fileName = string.Empty;
-            //声明导出容器
-
-            byte[] result = null;
-            switch (input.FileType)
-            {
-                case 0:
-                    _fileName = string.Format("大众看板发货明细_{0}.csv", input.UserId.ToString());
-                    result = await _csv.ExportAsByteArray(dtoDetails);
-                    break;
-                case 1:
-                    _fileName = string.Format("大众看板发货明细_{0}.xlsx", input.UserId.ToString());
-                    result = await _excel.ExportAsByteArray(dtoDetails);
-                    break;
-            }
-            result.ShouldNotBeNull();
-
-            //保存导出文件到服务器存成二进制
-            await _excelImportService.SaveBlobAsync(
-                     new SaveExcelImportInputDto
-                     {
-                         Name = _fileName,
-                         Content = result
-                     }
-                 );
-            return _fileName;
-        }
-
-
-        /// <summary>
-        /// 根据筛选条件获取实体列表
-        /// </summary>
-        /// <remarks>
-        /// 请求条件包括:筛选条件列表,排序条件,数据数量,页码
-        /// </remarks>
-        /// <param name="input">请求条件</param>
-        /// <returns>实体DTO列表</returns>
-        [HttpPost]
-        [Route("list")]
-        virtual public async Task<PagedResultDto<WMSVWKanBanDto>> GetListAsync(WMSVWKanBanRequestDto input)
-        {
-
-            if (!string.IsNullOrEmpty(input.Version))
-            {
-                input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "Version", Logic = EnumFilterLogic.And, Value = input.Version });
-            }
-            else
-            {
-                return new PagedResultDto<WMSVWKanBanDto>(0, new List<WMSVWKanBanDto>());
-            }
-            var entities = await _repository.GetListByFilterAsync(GuidGenerator.Create(), input.Filters, input.Sorting, input.MaxResultCount,
-                 input.SkipCount, true);
-            var totalCount = await GetCountAsync(input);
-            var dtos = ObjectMapper.Map<List<WMSKanBanSettle>, List<WMSVWKanBanDto>>(entities);
-            return new PagedResultDto<WMSVWKanBanDto>(totalCount, dtos);
-        }
-
-
-        /// <summary>
-        /// 获取实体总数
-        /// </summary>
-        /// <returns>实体总数</returns>
-        [HttpGet]
-        [Route("count")]
-        virtual public async Task<long> GetTotalCountAsync(Guid branchId)
-        {
-            return await _repository.GetCountAsync(branchId);
-        }
-
-        /// <summary>
-        /// 获取全部实体列表
-        /// </summary>
-        /// <returns>实体DTO列表</returns>
-        [HttpGet]
-        [Route("all")]
-        virtual public async Task<ListResultDto<WMSVWKanBanDto>> GetAllAsync(Guid branchId)
-        {
-            var entities = await _repository.GetAllAsync(branchId, true);
-
-
-            var dtos = ObjectMapper.Map<List<WMSKanBanSettle>, List<WMSVWKanBanDto>>(entities);
-
-
-            return new ListResultDto<WMSVWKanBanDto>(dtos);
-        }
-
-
-
-        /// <summary>
-        /// 删除实体
-        /// </summary>
-        /// <param name="id">ID</param>
-        /// <returns>无</returns>
-        [HttpDelete]
-        [Route("{id}")]
-        /// [Authorize(SettleAccountPermissions.SettleAccounts.Delete)]
-        virtual public async Task DeleteAsync(Guid id)
-        {
-            await _repository.DeleteAsync(id);
-        }
-
-        /// <summary>
-        /// 按IDs删除实体列表
-        /// </summary>
-        /// <param name="ids">IDs</param>
-        /// <returns>是否执行成功</returns>
-        [HttpPost]
-        [Route("delete")]
-        virtual public async Task<bool> DeleteListAsync(List<Guid> ids)
-        {
-            foreach (var id in ids)
-            {
-                var entity = await GetFromCacheAsync(id);
-                //await Cache.DeleteAsync<SettleAccount>(id.ToString());
-            }
-
-            return await _repository.DeleteListAsync(ids);
-        }
-
-
-
-        /// <summary>
-        /// 版本列表查询
-        /// </summary>
-        /// <param name="input"></param>
-        /// <returns></returns>
-        [HttpPost]
-        [Route("listversion")]
-        public async Task<PagedResultDto<WMSVWKanBanVersionDto>> GetVersionListAsync(WMSVWKanBanVersionRequestDto input)
-        {
-            var entities = await _versionRepository.GetListByFilterAsync(input.BranchId, input.Filters, input.Sorting, int.MaxValue,
-               input.SkipCount, true);
-
-            var totalCount = await GetCountAsync(input);
-            var dtos = ObjectMapper.Map<List<WMSKanBanVersion>, List<WMSVWKanBanVersionDto>>(entities);
-
-            return new PagedResultDto<WMSVWKanBanVersionDto>(totalCount, dtos);
-        }
-
-    }
-}
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS-SparePart/WMSSparePartAppService.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS-SparePart/WMSSparePartAppService.cs
deleted file mode 100644
index 975862ec..00000000
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS-SparePart/WMSSparePartAppService.cs
+++ /dev/null
@@ -1,320 +0,0 @@
-using EFCore.BulkExtensions;
-using Magicodes.ExporterAndImporter.Core;
-using Magicodes.ExporterAndImporter.Csv;
-using Magicodes.ExporterAndImporter.Excel;
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Mvc;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Volo.Abp;
-using Volo.Abp.Application.Dtos;
-using Volo.Abp.Caching;
-using Volo.Abp.Domain.Repositories;
-using Volo.Abp.Guids;
-using Win.Abp.Snowflakes;
-using Win.Sfs.BaseData.ImportExcelCommon;
-using Win.Sfs.SettleAccount.CommonManagers;
-using Win.Sfs.SettleAccount.Constant;
-using Win.Sfs.SettleAccount.Entities.WMSSparePart;
-using Win.Sfs.SettleAccount.ExcelImporter;
-using Win.Sfs.SettleAccount.ExportReports;
-using Win.Sfs.Shared.Filter;
-using Shouldly;
-
-
-
-
-namespace Win.Sfs.SettleAccount.Entities.WMS_SparePart
-{
-    /// <summary>
-    /// 大众备件服务
-    /// </summary>
-    [Authorize(SettleAccountPermissions.WMSJIT.Default)]
-    [Route("api/settleaccount/WMSSparePart")]
-    public class WMSSparePartAppService : SettleAccountApplicationBase<WMSSparePart>, IWMSSparePartAppService
-    {
-        private readonly IGuidGenerator _guidGenerator;
-
-        private readonly IExcelImportAppService _excelImportService;
-
-        private readonly ISettleAccountBranchEfCoreRepository<WMSSparePartVersion, Guid> _versionRepository;
-
-        private readonly ISettleAccountBranchEfCoreRepository<WMSSparePart, Guid> _repository;
-        /// <summary>
-        /// 构建方法
-        /// </summary>
-        /// <param name="guidGenerator">构建UID</param>
-        /// <param name="repository">仓储接口</param>
-        /// <param name="cache">缓存</param>
-        public WMSSparePartAppService(IGuidGenerator guidGenerator,
-         ISettleAccountBranchEfCoreRepository<WMSSparePartVersion, Guid> versionRepository,
-           ISettleAccountBranchEfCoreRepository<WMSSparePart, Guid> repository,
-            IDistributedCache<WMSSparePart> cache,
-            IExcelImportAppService excelImportService,
-            ISnowflakeIdGenerator snowflakeIdGenerator,
-            ICommonManager commonManager
-        ) : base(cache, excelImportService, snowflakeIdGenerator, commonManager)
-        {
-            _versionRepository = versionRepository;
-            _guidGenerator = guidGenerator;
-            _excelImportService = excelImportService;
-            _repository = repository;
-        }
-
-
-        /// <summary>
-        /// 导入功能
-        /// </summary>
-        /// <param name="files">上传的文件(前端已经限制只能上传一个附件)</param>
-        /// <returns></returns>
-        [HttpPost]
-        [Route("ExcelImport")]
-        [DisableRequestSizeLimit]
-        public async Task<string> WMSSparePartUploadExcelImport([FromForm] IFormFileCollection files, Guid branchId, string year, string period, string version, string customerCode)
-        {
-            if (string.IsNullOrEmpty(version))
-            {
-                throw new BusinessException("版本不能空，必须传入！");
-            }
-            ExportImporter _exportImporter = new ExportImporter();
-            var result = await _exportImporter.UploadExcelImport<WMSSparePartImportDto>(files, _excelImportService);
-            var entityList = ObjectMapper.Map<List<WMSSparePartImportDto>, List<WMSSparePart>>(result);
-            //删除版本
-            var _versionQuery = _versionRepository.Where(p => p.Version == version);
-            await _versionQuery.BatchDeleteAsync();
-            //删除明细
-            var _query = _repository.Where(p => p.Version == version);
-            await _query.BatchDeleteAsync();
-            //插入数据前检验
-            var checkList = new List<ErrorExportDto>();
-            var _group = entityList.GroupBy(x => new { x.MaterialCode, x.Version }).Select(p => new { Count = p.Count(), MaterialCode = p.Key.MaterialCode });
-            foreach (var itm in _group)
-            {
-                if (string.IsNullOrEmpty(itm.MaterialCode))
-                {
-                    checkList.Add(new ErrorExportDto(version, customerCode, string.Empty, string.Empty, string.Empty, string.Empty, string.Format("导入的行号为{0}的物料代码为空，请检查！", itm.MaterialCode), string.Empty));
-                }
-            }
-            var _id = GuidGenerator.Create();
-            var _bomList = new List<WMSSparePartVersion>();
-            _bomList.Add(new WMSSparePartVersion(_id, branchId, year, period, version, customerCode));
-            foreach (var itm in entityList)
-            {
-                itm.SetValue(GuidGenerator.Create(), branchId, year, period, version);
-            }
-            if (checkList.Count > 0)
-            {
-                return await ExportErrorReportAsync(checkList);
-            }
-            await _repository.GetDbContext().BulkInsertAsync<WMSSparePart>(entityList);
-            await _versionRepository.GetDbContext().BulkInsertAsync(_bomList);
-            return ApplicationConsts.SuccessStr;
-        }
-
-        /// <summary>
-        /// 按ID获取唯一实体
-        /// </summary>
-        /// <remarks>
-        /// 返回实体全部属性
-        /// </remarks>
-        /// <param name="id">ID</param>
-        /// <returns>实体DTO</returns>
-        [HttpGet]
-        [Route("{id}")]
-        virtual public async Task<WMSSparePartDto> GetAsync(Guid id)
-        {
-            var result = await GetFromCacheAsync(id);
-            var dto = ObjectMapper.Map<WMSSparePart, WMSSparePartDto>(result);
-            return dto;
-        }
-
-
-        private async Task<WMSSparePart> GetFromCacheAsync(Guid id)
-        {
-            var result = await _repository.GetAsync(id);
-            return result;
-        }
-
-
-        private async Task<long> GetCountAsync(WMSSparePartRequestDto input)
-        {
-            return await _repository.GetCountByFilterAsync(input.BranchId, input.Filters);
-        }
-
-        private async Task<long> GetCountAsync(WMSSparePartVersionRequestDto input)
-        {
-            return await _versionRepository.GetCountByFilterAsync(input.BranchId, input.Filters);
-        }
-
-
-        /// <summary>
-        /// 导出文件
-        /// </summary>
-        /// <param name="input"></param>
-        /// <returns></returns>
-        [HttpPost]
-        [Route("Export")]
-        virtual public async Task<string> ExportAsync(WMSSparePartRequestDto input)
-        {
-            if (string.IsNullOrEmpty(input.Version))
-            {
-                throw new BusinessException("版本不能空，必须传入！");
-            }
-            IExporter _csv = new CsvExporter();
-            IExporter _excel = new ExcelExporter();
-            if (!string.IsNullOrEmpty(input.Version))
-            {
-                input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "Version", Logic = EnumFilterLogic.And, Value = input.Version });
-            }
-            var entities = await _repository.GetListByFilterAsync(input.BranchId, input.Filters, input.Sorting, int.MaxValue,
-               0, true);
-
-            var dtoDetails = ObjectMapper.Map<List<WMSSparePart>, List<WMSSparePartExportDto>>(entities);
-
-            string _fileName = string.Empty;
-            //声明导出容器
-
-            byte[] result = null;
-            switch (input.FileType)
-            {
-                case 0:
-                    _fileName = string.Format("大众备件发货明细_{0}.csv", input.UserId.ToString());
-                    result = await _csv.ExportAsByteArray(dtoDetails);
-                    break;
-                case 1:
-                    _fileName = string.Format("大众备件发货明细_{0}.xlsx", input.UserId.ToString());
-                    result = await _excel.ExportAsByteArray(dtoDetails);
-                    break;
-            }
-            result.ShouldNotBeNull();
-
-            //保存导出文件到服务器存成二进制
-            await _excelImportService.SaveBlobAsync(
-                     new SaveExcelImportInputDto
-                     {
-                         Name = _fileName,
-                         Content = result
-                     }
-                 );
-            return _fileName;
-        }
-
-
-        /// <summary>
-        /// 根据筛选条件获取实体列表
-        /// </summary>
-        /// <remarks>
-        /// 请求条件包括:筛选条件列表,排序条件,数据数量,页码
-        /// </remarks>
-        /// <param name="input">请求条件</param>
-        /// <returns>实体DTO列表</returns>
-        [HttpPost]
-        [Route("list")]
-        virtual public async Task<PagedResultDto<WMSSparePartDto>> GetListAsync(WMSSparePartRequestDto input)
-        {
-            if (!string.IsNullOrEmpty(input.Version))
-            {
-                input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "Version", Logic = EnumFilterLogic.And, Value = input.Version });
-            }
-            else
-            {
-                return new PagedResultDto<WMSSparePartDto>(0, new List<WMSSparePartDto>());
-            }
-
-            var entities = await _repository.GetListByFilterAsync(input.BranchId, input.Filters, input.Sorting, input.MaxResultCount,
-                 input.SkipCount, true);
-
-            var totalCount = await GetCountAsync(input);
-            var dtos = ObjectMapper.Map<List<WMSSparePart>, List<WMSSparePartDto>>(entities);
-
-            return new PagedResultDto<WMSSparePartDto>(totalCount, dtos);
-        }
-
-
-        /// <summary>
-        /// 获取实体总数
-        /// </summary>
-        /// <returns>实体总数</returns>
-        [HttpGet]
-        [Route("count")]
-        virtual public async Task<long> GetTotalCountAsync(Guid branchId)
-        {
-            return await _repository.GetCountAsync(branchId);
-        }
-
-        /// <summary>
-        /// 获取全部实体列表
-        /// </summary>
-        /// <returns>实体DTO列表</returns>
-        [HttpGet]
-        [Route("all")]
-        virtual public async Task<ListResultDto<WMSSparePartDto>> GetAllAsync(Guid branchId)
-        {
-            var entities = await _repository.GetAllAsync(branchId, true);
-
-
-            var dtos = ObjectMapper.Map<List<WMSSparePart>, List<WMSSparePartDto>>(entities);
-
-
-            return new ListResultDto<WMSSparePartDto>(dtos);
-        }
-
-
-
-        /// <summary>
-        /// 删除实体
-        /// </summary>
-        /// <param name="id">ID</param>
-        /// <returns>无</returns>
-        [HttpDelete]
-        [Route("{id}")]
-        virtual public async Task DeleteAsync(Guid id)
-        {
-            await _repository.DeleteAsync(id);
-        }
-
-        /// <summary>
-        /// 按IDs删除实体列表
-        /// </summary>
-        /// <param name="ids">IDs</param>
-        /// <returns>是否执行成功</returns>
-        [HttpPost]
-        [Route("delete")]
-        // [Authorize(SettleAccountPermissions.SettleAccounts.Delete)]
-        virtual public async Task<bool> DeleteListAsync(List<Guid> ids)
-        {
-            foreach (var id in ids)
-            {
-                var entity = await GetFromCacheAsync(id);
-                //await Cache.DeleteAsync<SettleAccount>(id.ToString());
-            }
-
-            return await _repository.DeleteListAsync(ids);
-        }
-
-
-
-        /// <summary>
-        /// 版本列表查询
-        /// </summary>
-        /// <param name="input"></param>
-        /// <returns></returns>
-        [HttpPost]
-        [Route("listversion")]
-        public async Task<PagedResultDto<WMSSparePartVersionDto>> GetVersionListAsync(WMSSparePartVersionRequestDto input)
-        {
-            var entities = await _versionRepository.GetListByFilterAsync(input.BranchId, input.Filters, input.Sorting, int.MaxValue,
-               input.SkipCount, true);
-
-            var totalCount = await GetCountAsync(input);
-            var dtos = ObjectMapper.Map<List<WMSSparePartVersion>, List<WMSSparePartVersionDto>>(entities);
-
-            return new PagedResultDto<WMSSparePartVersionDto>(totalCount, dtos);
-        }
-
-    }
-}
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSCusomerKanbanAppService.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSCusomerKanbanAppService.cs
deleted file mode 100644
index f6516f4a..00000000
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSCusomerKanbanAppService.cs
+++ /dev/null
@@ -1,655 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.Extensions.Caching.Distributed;
-using AutoMapper;
-using System.Linq;
-using System.Text;
-using Volo.Abp.Guids;
-using Volo.Abp.Application.Services;
-using Volo.Abp.Caching;
-
-using Volo.Abp.ObjectMapping;
-using Win.Sfs.SettleAccount.ExcelImporter;
-using Win.Sfs.Shared.CacheBase;
-using Win.Utils;
-using Volo.Abp.Application.Dtos;
-using Win.Sfs.BaseData.ImportExcelCommon;
-using Volo.Abp.Domain.Repositories;
-using EFCore.BulkExtensions;
-using System.IO;
-using Microsoft.EntityFrameworkCore;
-using Win.Sfs.SettleAccount.Entities.SettleAccountVersion;
-using Win.Sfs.SettleAccount.FISes;
-using Win.Sfs.Shared.Enums.SettleAccount;
-using Win.Sfs.Shared.Filter;
-using Shouldly;
-using Magicodes.ExporterAndImporter.Csv;
-using Magicodes.ExporterAndImporter.Core;
-using Magicodes.ExporterAndImporter.Excel;
-using System.Data.Common;
-using Volo.Abp.Uow;
-using Volo.Abp;
-using Win.Abp.Snowflakes;
-using Win.Sfs.SettleAccount.CommonManagers;
-using Win.Sfs.SettleAccount.ExportReports;
-using Win.Sfs.SettleAccount.Constant;
-using Win.Sfs.SettleAccount.MaterialRelationships;
-using Win.Sfs.SettleAccount.Entities.TaskJobs;
-using Magicodes.ExporterAndImporter.Core.Models;
-
-using TaskJob.Services;
-using TaskJob.EventArgs;
-using Win.Sfs.SettleAccount.Entities.WMS;
-using Win.Sfs.SettleAccount.Entities.Wms;
-using Win.Sfs.SettleAccount.Repository;
-using WY.NewJit.Extends.PaiGe.WMS;
-using Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report;
-
-namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
-{
-    /// <summary>
-    /// 红旗H平台准时化-出库
-    /// </summary>
-
-
-    [Authorize(SettleAccountPermissions.WMSHQ.Default)]
-    [Route("api/settleaccount/WMSCusomerKanbanoutput")]
-    public class WMSCusomerKanbanAppService :
-        SettleAccountApplicationBase<WmsCustomerKanbanOutPutDetial>
-    {
-  
-        private readonly ISettleAccountBranchEfCoreRepository<WmsCustomerKanbanOutPutDetial, Guid> _wmsRepository;
-        private readonly ISettleAccountBranchEfCoreRepository<WmsCustomerKanbanOutPut, Guid> _wmsVersionRepository;
-        private readonly WMSEfCoreRepository<WmsCustomerKanbanOutPutDetial> _wmsefRespository;
-
-        private readonly WMSEfCoreRepository<TB_BILL> _wmstbRespository;
-        private readonly ISettleAccountBranchEfCoreRepository<TaskJob, Guid> _job;
-        private readonly IExcelImportAppService _excelImportService;
-        private readonly ErpPartDapperRepository _erpdapperRepository;
-
-
-        private readonly TaskJobService _service;
-       /// <summary>
-       /// 
-       /// </summary>
-       /// <param name="wmsRepository"></param>
-       /// <param name="job"></param>
-       /// <param name="wmsVersionRepository"></param>
-       /// <param name="wmsefRespository"></param>
-       /// <param name="wmstbRespository"></param>
-        public WMSCusomerKanbanAppService(
-
-
-            IExcelImportAppService excelImportService,
-
-        ISettleAccountBranchEfCoreRepository<WmsCustomerKanbanOutPutDetial, Guid> wmsRepository,
-            ISettleAccountBranchEfCoreRepository<TaskJob, Guid> job,
-            ISettleAccountBranchEfCoreRepository<WmsCustomerKanbanOutPut, Guid> wmsVersionRepository,
-            WMSEfCoreRepository<WmsCustomerKanbanOutPutDetial> wmsefRespository,
-            WMSEfCoreRepository<TB_BILL> wmstbRespository,
-             IDistributedCache<WmsCustomerKanbanOutPutDetial> cache,
-             ISnowflakeIdGenerator snowflakeIdGenerator,
-             ErpPartDapperRepository erpdapperRepository,
-           ICommonManager commonManager
-        ) : base(cache, excelImportService, snowflakeIdGenerator, commonManager)
-        {
-            _job = job;
-            _wmstbRespository = wmstbRespository;
-            _wmsRepository = wmsRepository;
-            _wmsVersionRepository = wmsVersionRepository;
-            _wmsefRespository = wmsefRespository;
-            _excelImportService = excelImportService;
-            _erpdapperRepository = erpdapperRepository;
-        }
-
-        private async Task<long> GetCountAsync(WmsKanbanOutPutDetialRequestDto input)
-        {
-            return await _wmsRepository.GetCountByFilterAsync(GuidGenerator.Create(), input.Filters);
-        }
-
-        private async Task<long> GetCountAsync(WmsKanbanOutPutRequestDto input)
-        {
-            return await _wmsVersionRepository.GetCountByFilterAsync(GuidGenerator.Create(), input.Filters);
-        }
-
-       /// <summary>
-       /// 准时化出库主表
-       /// </summary>
-       /// <param name="input"></param>
-       /// <returns></returns>
-        [HttpPost]
-        [Route("WmsCustomerKanbanList")]
-        //[Authorize(SettleAccountPermissions.SettleAccounts.Default)]
-        virtual public async Task<PagedResultDto<WmsCustomerKanbanOutPut>> GetListAsync( WmsKanbanOutPutRequestDto input)
-        {
-     
-            var entities = await _wmsVersionRepository.GetListByFilterAsync(GuidGenerator.Create(), input.Filters, input.Sorting, input.MaxResultCount,
-                 input.SkipCount, true);
-
-            var totalCount = await GetCountAsync(input);
-          
-
-            return new PagedResultDto<WmsCustomerKanbanOutPut>(totalCount, entities);
-        }
-
-        /// <summary>
-        /// 准时化出库明细
-        /// </summary>
-        /// <param name="input"></param>
-        /// <returns></returns>
-        [HttpPost]
-        [Route("WmsCustomerKanbanDetailList")]
-        //[Authorize(SettleAccountPermissions.SettleAccounts.Default)]
-        virtual public async Task<PagedResultDto<WmsCustomerKanbanOutPutDetial>> GetListAsync(WmsKanbanOutPutDetialRequestDto input)
-        {
-            //不用传version 单号能保证唯一
-            input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "BillNum", Logic = EnumFilterLogic.And, Value = input.BillNum });
-            //input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "State", Logic = EnumFilterLogic.And, Value = input.State.ToString() });
-      
-            var entities = await _wmsRepository.GetListByFilterAsync(GuidGenerator.Create(), input.Filters, input.Sorting, input.MaxResultCount,
-                 input.SkipCount, true);
-
-            var totalCount = await GetCountAsync(input);
-            return new PagedResultDto<WmsCustomerKanbanOutPutDetial>(totalCount, entities);
-        }
-        /// <summary>
-        ///  任务明细标记已确认
-        /// </summary>
-        /// <param name="files">上传的文件(前端已经限制只能上传一个附件)</param>
-        /// <returns></returns>
-        [HttpPost]
-        [Route("WmsCustomerKanbanOutPutAudit")]
-        [DisableRequestSizeLimit]
-
-        public async Task<bool> WmsHQHKanbanAudit(List<Guid> ids)
-        {
-            var _joblist =await _job.Where(p => ids.Contains(p.Id)).ToListAsync();
-            foreach (var itm in _joblist)
-            {
-                itm.FileName = "已确认";
-                await _job.UpdateAsync(itm);
-            }
-            
-            return true;
-        }
-        /// <summary>
-        ///更新备注
-        /// </summary>
-        /// <param name="input"></param>
-        /// <returns></returns>
-        [HttpGet]
-        [Route("UpdateRemark")]
-
-        public async Task<bool> UpdateRemark(Guid id, string remark)
-        {
-            var entity = _wmsVersionRepository.FirstOrDefault(p => p.Id == id);
-            if (entity != null)
-            {
-                entity.Remark = remark;
-                await _wmsVersionRepository.UpdateAsync(entity);
-
-            }
-            return true;
-        }
-
-
-
-        ///// <summary>
-        ///// 选择任务，生成出库单，只包含已确认的单据
-        ///// </summary>
-        ///// <param name="ids"></param>
-        ///// <param name="version"></param>
-        ///// <returns></returns>
-        //[HttpPost]
-        //[Route("WmsWithOutKanbanOutPut")]
-        //public async Task<string> WmsWithOutKanbanOutPut(WmsJitRequestDto input)
-        //{
-        //    var _billNum = "KA" + DateTime.Now.ToString("yyyyMMddhhmmss");
-
-        //    var _joblist = _job.Where(p => input.Guids.Contains(p.Id) && p.FileName == "已确认").ToList();
-        //    if (_joblist.Count() > 0)
-        //    {
-        //        var fileList = _joblist.Select(p => p.RealDownFileName).ToList();
-        //        List<WmsCustomerKanbanOutPutDetial> _lst = new List<WmsCustomerKanbanOutPutDetial>();
-        //        foreach (var filename in fileList)
-        //        {
-        //            string fileSavePath = Environment.CurrentDirectory + @"\wwwroot\files\host\my-file-container\" + filename;
-        //            ExcelHelper _excelHelper = new ExcelHelper(fileSavePath);
-        //            var _list = _excelHelper.ExcelToList<SettleKBWithOutCode>();
-        //            foreach (var itm in _list)
-        //            {
-
-        //              var _entity=  new WmsCustomerKanbanOutPutDetial(GuidGenerator.Create(), string.Empty, string.Empty, itm.MaterialCode, itm.MaterialDesc
-        //                    , itm.SapMaterialGroup, string.Empty, string.Empty, 0, string.Empty, string.Empty, itm.Version, itm.SapMaterialCode,
-        //                    _billNum, Guid.Empty, string.Empty, itm.InvoiceQty,itm.
-        //                    );
-
-        //                _lst.Add(_entity);
-        //            }
-
-        //        }
-
-        //        var outPutDetail = await _wmsRepository.Where(p => p.Version == input.Version && p.Kanban==string.Empty).ToListAsync();
-
-
-        //            await _wmsRepository.GetDbContext().BulkInsertAsync(_lst, new BulkConfig() { BulkCopyTimeout = 0, BatchSize = 10000 });
-        //            int _count = _wmsVersionRepository.Count(p => p.Version == input.Version && p.BillNum == _billNum);
-        //            if (_count == 0)
-        //            {
-        //                var _version = new WmsCustomerKanbanOutPut(GuidGenerator.Create(), input.Version, _billNum, CurrentUser.Email);
-
-        //                await _wmsVersionRepository.InsertAsync(_version, true);
-        //            }
-
-        //            foreach (var job in _joblist)
-        //            {
-        //                job.FileName = _billNum;
-        //                await _job.UpdateAsync(job);
-        //            }
-        //        }
-
-        //    return ApplicationConsts.SuccessStr; ;
-        //}
-
-
-        /// <summary>
-        /// 选择任务，生成出库单，只包含已确认的单据
-        /// </summary>
-        /// <param name="ids"></param>
-        /// <param name="version"></param>
-        /// <returns></returns>
-        [HttpPost]
-        [Route("WmsCustomerKanbanOutPut")]
-        public async Task<string> WmsCustomerKanbanOutPut(WmsJitRequestDto input)
-        {
-            var _billNum = "CKB" + DateTime.Now.ToString("yyyyMMddhhmmss");
-
-            var _joblist = _job.Where(p => input.Guids.Contains(p.Id) && p.FileName == "已确认").ToList();
-            if (_joblist.Count() > 0)
-            {
-                var fileList = _joblist.Select(p => p.RealDownFileName).ToList();
-                List<WmsCustomerKanbanOutPutDetial> _lst = new List<WmsCustomerKanbanOutPutDetial>();
-                foreach (var filename in fileList)
-                {
-                    string fileSavePath = Environment.CurrentDirectory + @"\wwwroot\files\host\my-file-container\" + filename;
-                    ExcelHelper _excelHelper = new ExcelHelper(fileSavePath);
-                    var _list = _excelHelper.ExcelToList<WmsCustomerKanbanOutPutDetial>();
-                    foreach (var itm in _list)
-                    {
-                        itm.SetData(GuidGenerator.Create(),string.Empty,!string.IsNullOrEmpty(itm.WmsBillNum)? itm.WmsBillNum:string.Empty,input.Version,GuidGenerator.Create(),itm.CustomerCode);
-                    }
-                    _lst.AddRange(_list.ToArray());
-                }
-
-                foreach (var itm in _lst)
-                {
-                    if (string.IsNullOrEmpty(itm.Kanban))
-                    {
-                        itm.Kanban = "WMSDBoardNum";
-                    }
-                }
-
-                var outPutDetail = await _wmsRepository.Where(p => p.Version == input.Version && p.State != 4 ).ToListAsync();
-
-                var error = from itm1 in outPutDetail
-                            join itm2 in _lst on
-                            new { itm1.SapMaterialCode, itm1.Kanban }
-                            equals
-                            new { itm2.SapMaterialCode, itm2.Kanban }
-                            select itm1;
-                var errList = error.GroupBy(p => new { p.BillNum }).Select(p => new { BillNum = p.Key.BillNum, Number = p.Sum(itm => itm.Qty) });
-                if (errList.Count() == 0)
-                {
-
-                    var query = from itm1 in _lst
-                                join itm2 in outPutDetail on
-                                new { itm1.SapMaterialCode, itm1.Kanban }
-                                equals
-                                new { itm2.SapMaterialCode, itm2.Kanban } into temp1
-                                from tm1 in temp1.DefaultIfEmpty()
-                                where tm1 == null
-                                select itm1;
-                    var _wmslst = query.ToList();
-                    foreach (var itm in _wmslst)
-                    {
-                        itm.BillNum = _billNum;
-                    }
-                    await _wmsRepository.GetDbContext().BulkInsertAsync(_wmslst, new BulkConfig() { BulkCopyTimeout = 0, BatchSize = 10000 });
-                    int _count = _wmsVersionRepository.Count(p => p.Version == input.Version && p.BillNum == _billNum);
-                    if (_count == 0)
-                    {
-                        var _version = new WmsCustomerKanbanOutPut(GuidGenerator.Create(), input.Version, _billNum, CurrentUser.Email,"",string.Empty);
-                        _version.Remark = !string.IsNullOrEmpty(_joblist.FirstOrDefault().Remark) ? _joblist.FirstOrDefault().Remark : string.Empty;
-                        await _wmsVersionRepository.InsertAsync(_version, true);
-                    }
-
-                    foreach (var job in _joblist)
-                    {
-                        job.FileName = _billNum;
-                        await _job.UpdateAsync(job);
-                    }
-                }
-                else
-                {
-                    StringBuilder _buffer = new StringBuilder();
-                    foreach (var itm in errList)
-                    {
-                        _buffer.AppendFormat("出库单号:{0}重复记录数:{1}条", itm.BillNum, itm.Number);
-                    }
-                    var _errinfo = _buffer.ToString();
-
-                    foreach (var job in _joblist)
-                    {
-                        job.FileName = _errinfo;
-                        await _job.UpdateAsync(job);
-                    }
-                }
-            }
-            else
-            {
-                _billNum = string.Empty;
-            }
-               return ApplicationConsts.SuccessStr; ;
-        }
-        /// <summary>
-        /// 出库界面功能，核准出库功能
-        /// </summary>
-        /// <param name="version"></param>
-        /// <param name="p_list"></param>
-        /// <returns></returns>
-        [HttpPost]
-        [Route("WmsCustomerKanbanOutPut-Pass")]
-        [UnitOfWork(false)]
-        public async Task<bool> WmsCustomerKanbanOutPutPass(WmsJitRequestDto input)
-        {
-            //if (DateTime.Now.ToString("yyyyMM") != input.AccountDate.ToString("yyyyMM"))
-            //{
-            //    throw new BusinessException("8989", "填写过账日期应该为当月！");
-
-            //}
-
-
-
-            var sql = "DECLARE	@return_value int\n" +
-                      "EXEC	@return_value = [dbo].[p_wms_output]\n" +
-                      "		@billnum = N'{0}',\n" +
-                      "		@type = 23,\n" +
-                      "     @date = N'{1}'\n" +
-                      "SELECT	'Return Value' = @return_value";
-            await _wmsRepository.GetDbContext().Database.ExecuteSqlRawAsync(
-               string.Format(sql, input.BillNum, input.AccountDate.ToShortDateString())
-             );
-
-
-
-            return true;
-         
-        }
-        /// <summary>
-        ///出库界面功能， 撤销核准出库
-        /// </summary>
-        /// <param name="ids"></param>
-        /// <param name="version"></param>
-        /// <returns></returns>
-        [HttpPost]
-        [Route("WmsCustomerKanbanOutPut-Cancel")]
-        [UnitOfWork(false)]
-        public async Task<bool> WmsCustomerKanbanOutPutCancel(WmsJitRequestDto input)
-        {
-            //if (DateTime.Now.ToString("yyyyMM") != input.AccountDate.ToString("yyyyMM"))
-            //{
-            //    throw new BusinessException("8989", "填写过账日期应该为当月！");
-
-            //}
-
-
-            if (input.Guids != null && input.Guids.Count() > 0)
-            {
-                List<string> _ls = new List<string>();
-                foreach (var itm in input.Guids)
-                {
-                    _ls.Add(string.Format("{0}", itm));
-                }
-
-                string str = string.Join(",", _ls.ToArray());
-
-                var sql = "DECLARE	@return_value int\n" +
-                          "EXEC	@return_value = [dbo].[p_wms_output_cancel]\n" +
-                          "     @Guids ='{0}', \n" +
-                          "		@billnum = N'{1}',\n" +
-                          "		@type = 23,\n" +
-                          "     @accountdate = N'{2}'\n" +
-                          "SELECT	'Return Value' = @return_value";
-
-                sql = string.Format(sql, str, input.BillNum, input.AccountDate.ToShortDateString());
-
-                await _wmsRepository.GetDbContext().Database.ExecuteSqlRawAsync(
-                   sql
-                 );
-
-            }
-
-            return true;
-        }
-        /// <summary>
-        /// 出库界面功能删除
-        /// </summary>
-        /// <param name="version"></param>
-        /// <param name="p_list"></param>
-        /// <returns></returns>
-        [HttpPost]
-        [Route("WmsOutPutDelete")]
-        [UnitOfWork(false)]
-        public async Task<bool> WmsOutPutDelete(WmsJitRequestDto input)
-        {
-            var count = _wmsRepository.Count(p => p.BillNum == input.BillNum && p.State != 0);
-
-            if (count > 0)
-            {
-                return false;
-            }
-            var sql = "DECLARE	@return_value int\n" +
-                      "EXEC	@return_value = [dbo].[p_wms_output_cancel_all]\n" +
-                      "		@billnum = N'{0}',\n" +
-                      "		@type = 23\n" +
-                      "SELECT	'Return Value' = @return_value";
-            await _wmsRepository.GetDbContext().Database.ExecuteSqlRawAsync(
-               string.Format(sql, input.BillNum)
-             );
-
-
-
-            return true;
-        }
-        [HttpPost]
-        [Route("ExcelImport")]
-        [DisableRequestSizeLimit]
-        [UnitOfWork(false)]
-        //[Authorize(SettleAccountPermissions.SettleAccounts.Default)]
-        public async Task<string> ExcelImport([FromForm] IFormFileCollection files, string version,string customerCode)
-        {
-            var _billNum = "CKB(" +customerCode+")"+ DateTime.Now.ToString("yyyyMMddhhmmss");
-            var checkList = new List<ErrorExportDto>();
-            ExportImporter _exportImporter = new ExportImporter();
-            var result = await _exportImporter.ExtendExcelOfSheetOneImport<WmsCustomerKanbanOutPutDetial>(files, _excelImportService);
-
-            //检验1:导入模板中的第一页签数据不能为空
-            if (result == null || result.Count() == 0)
-            {
-                checkList.Add(new ErrorExportDto(version, "自定义出库单导入", string.Empty, string.Empty, string.Empty, string.Empty, "导入模板中第一页签没有数据，请检查！", string.Empty));
-            }
-           
-            var filteResult = result.Where(p =>!string.IsNullOrEmpty(p.SapMaterialCode));//过滤掉物料号为空的数据
-
-            //和物料主数据中SAP物料号检验是否存在
-            foreach (var itm in filteResult)
-            {
-                if (!_erpdapperRepository.GetMaterialList().Any(p => p.MaterialCode == itm.SapMaterialCode))
-                {
-                    checkList.Add(new ErrorExportDto(version, "自定义出库单导入", string.Empty, string.Empty, itm.SapMaterialCode, string.Empty, string.Format("物料主数据不存在当前导入的物料号{0}！", itm.SapMaterialCode), string.Empty));
-                }
-            }
-
-            //检验2:导入模板中的结算数据是否为0
-            foreach (var itm in filteResult)
-            {
-                if (itm.Qty == 0)
-                {
-                    checkList.Add(new ErrorExportDto(version, "自定义出库单导入", string.Empty, string.Empty, string.Empty, string.Empty, string.Format("导入模板中物料号{0}的结算数量为０，影响出库请检查！", itm.SapMaterialCode), string.Empty));
-                }
-            }
-
-            if (checkList.Count > 0)
-            {
-                return await ExportErrorReportAsync(checkList);
-            }
-
-
-            List<WmsCustomerKanbanOutPutDetial> _lst = new List<WmsCustomerKanbanOutPutDetial>();
-            var _lsCopy = new List<WmsCustomerKanbanOutPutDetial>();
-            foreach (var itm in filteResult)
-            {
-                WmsCustomerKanbanOutPutDetial _detail = new WmsCustomerKanbanOutPutDetial(
-                GuidGenerator.Create(),
-                !string.IsNullOrEmpty(itm.WmsBillNum) ? itm.WmsBillNum : string.Empty,
-                itm.Kanban,
-                itm.SapMaterialCode,
-                itm.MaterialDesc,
-                itm.MaterialGroup,
-                string.Empty,
-                string.Empty,
-                0,
-               !string.IsNullOrEmpty(itm.Extend1)?itm.Extend1: string.Empty,
-               !string.IsNullOrEmpty(itm.Extend2) ? itm.Extend2 : string.Empty,
-                version,
-                itm.MaterialCode,
-                itm.BillNum,
-                GuidGenerator.Create()
-                , string.Empty
-                ,itm.Qty
-            
-               ,itm.Price
-               ,itm.Amt
-               ,itm.CustomerCode
-                );
-                _lsCopy.Add(_detail);
-            }
-            _lst.AddRange(_lsCopy.ToArray());
-            //看板编号为空，加个默认值
-            foreach (var itm in _lst)
-            {
-                if (string.IsNullOrEmpty(itm.Kanban))
-                {
-                    itm.Kanban = "WMSDBoardNum";
-                }
-            }
-
-            //检验3：导入模板中物料号，不能重复
-            var _isRepeatOfReportList = from arc in _lst
-                                        group arc by new { arc.Kanban, arc.SapMaterialCode, arc.Version }
-                                        into g
-                                        where g.Count() > 1
-                                        select g;
-            foreach (var itm in _isRepeatOfReportList)
-            {
-                checkList.Add(new ErrorExportDto(version, "自定义出库单", string.Empty, string.Empty, string.Empty, string.Empty, string.Format("导入模板中物料号{0}有重复，请检查！", itm.Key.SapMaterialCode), string.Empty));
-            }
-            if (checkList.Count > 0)
-            {
-                return await ExportErrorReportAsync(checkList);
-            }
-
-
-
-            var outPutDetail = await _wmsRepository.Where(p => p.Version == version && p.State != 4 ).ToListAsync();
-
-
-            var error = from itm1 in outPutDetail
-                        join itm2 in _lst on
-                        new { itm1.SapMaterialCode, itm1.Kanban }
-                        equals
-                        new { itm2.SapMaterialCode, itm2.Kanban}
-                        select itm1;
-            var errList = error.GroupBy(p => new { p.BillNum }).Select(p => new { BillNum = p.Key.BillNum, Number = p.Count() });
-
-           
-            foreach (var itm in errList)
-            {
-                checkList.Add(new ErrorExportDto() { Message = string.Format("出库单号:{0}重复记录数:{1}条", itm.BillNum, itm.Number) });
-            }
-
-            if (checkList.Count > 0)
-            {
-
-                return await ExportErrorReportAsync(checkList);
-            }
-
-            var query = from itm1 in _lst
-                        join itm2 in outPutDetail on
-                        new { itm1.SapMaterialCode, itm1.Kanban }
-                        equals
-                        new { itm2.SapMaterialCode, itm2.Kanban } into temp1
-                        from tm1 in temp1.DefaultIfEmpty()
-                        where tm1 == null
-                        select itm1;
-            var _wmslst = query.ToList();
-            foreach (var itm in _wmslst)
-            {
-                itm.BillNum = _billNum;
-            }
-            await _wmsRepository.GetDbContext().BulkInsertAsync(_wmslst, new BulkConfig() { BulkCopyTimeout = 0, BatchSize = 10000 });
-            int _count = _wmsVersionRepository.Count(p => p.Version == version && p.BillNum == _billNum);
-            if (_count == 0)
-            {
-                var _version = new WmsCustomerKanbanOutPut(GuidGenerator.Create(), version, _billNum, CurrentUser.Email,customerCode,string.Empty);
-             
-                await _wmsVersionRepository.InsertAsync(_version, true);
-            }
-            return ApplicationConsts.SuccessStr;
-        }
-        /// <summary>
-        /// 导出
-        /// </summary>
-        /// <param name="input"></param>
-        /// <returns></returns>
-        [HttpPost]
-        [Route("Export")]
-        //[Authorize(SettleAccountPermissions.SettleAccounts.Default)]
-        virtual public async Task<string> ExportAsync(WmsKanbanOutPutDetialRequestDto input)
-        {
-            input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "BillNum", Logic = EnumFilterLogic.And, Value = input.BillNum });
-            var entities = await _wmsRepository.GetListByFilterAsync(GuidGenerator.Create(), input.Filters, input.Sorting, int.MaxValue,
-                 0, true);
-
-            var dtos = ObjectMapper.Map<List<WmsCustomerKanbanOutPutDetial>, List<WmsCustomerKanbanOutPutDetialDTO>>(entities);
-
-            IExporter _excel = new ExcelExporter();
-            byte[] result = null;
-
-            var _fileName = string.Format("自定义客户出库单_{0}.xlsx", Guid.NewGuid().ToString());
-            result = await _excel.ExportAsByteArray(dtos);
-
-
-            result.ShouldNotBeNull();
-
-            //保存导出文件到服务器存成二进制
-            await _excelImportService.SaveBlobAsync(
-                     new SaveExcelImportInputDto
-                     {
-                         Name = _fileName,
-                         Content = result
-                     }
-                 );
-            return _fileName;
-
-
-
-        }
-
-
-    }
-}
\ No newline at end of file
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSHQFKanbanAppService.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSHQFKanbanAppService.cs
deleted file mode 100644
index d69d9c5e..00000000
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSHQFKanbanAppService.cs
+++ /dev/null
@@ -1,569 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.Extensions.Caching.Distributed;
-using AutoMapper;
-using System.Linq;
-using System.Text;
-using Volo.Abp.Guids;
-using Volo.Abp.Application.Services;
-using Volo.Abp.Caching;
-
-using Volo.Abp.ObjectMapping;
-using Win.Sfs.SettleAccount.ExcelImporter;
-using Win.Sfs.Shared.CacheBase;
-using Win.Utils;
-using Volo.Abp.Application.Dtos;
-using Win.Sfs.BaseData.ImportExcelCommon;
-using Volo.Abp.Domain.Repositories;
-using EFCore.BulkExtensions;
-using System.IO;
-using Microsoft.EntityFrameworkCore;
-using Win.Sfs.SettleAccount.Entities.SettleAccountVersion;
-using Win.Sfs.SettleAccount.FISes;
-using Win.Sfs.Shared.Enums.SettleAccount;
-using Win.Sfs.Shared.Filter;
-using Shouldly;
-using Magicodes.ExporterAndImporter.Csv;
-using Magicodes.ExporterAndImporter.Core;
-using Magicodes.ExporterAndImporter.Excel;
-using System.Data.Common;
-using Volo.Abp.Uow;
-using Volo.Abp;
-using Win.Abp.Snowflakes;
-using Win.Sfs.SettleAccount.CommonManagers;
-using Win.Sfs.SettleAccount.ExportReports;
-using Win.Sfs.SettleAccount.Constant;
-using Win.Sfs.SettleAccount.MaterialRelationships;
-using Win.Sfs.SettleAccount.Entities.TaskJobs;
-using Magicodes.ExporterAndImporter.Core.Models;
-
-using TaskJob.Services;
-using TaskJob.EventArgs;
-using Win.Sfs.SettleAccount.Entities.WMS;
-using Win.Sfs.SettleAccount.Entities.Wms;
-using Win.Sfs.SettleAccount.Repository;
-using WY.NewJit.Extends.PaiGe.WMS;
-using Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report;
-
-namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
-{
-    /// <summary>
-    /// 红旗F平台准时化-出库
-    /// </summary>
-
-    //[AllowAnonymous]
-    [Authorize(SettleAccountPermissions.WMSHQ.Default)]
-    [Route("api/settleaccount/WMSHQFKanbanoutput")]
-    public class WmsHQFKanbanAppService :
-        SettleAccountApplicationBase<WmsHQFKanbanOutPutDetial>
-    {
-  
-        private readonly ISettleAccountBranchEfCoreRepository<WmsHQFKanbanOutPutDetial, Guid> _wmsRepository;
-        private readonly ISettleAccountBranchEfCoreRepository<WmsHQFKanbanOutPut, Guid> _wmsVersionRepository;
-        private readonly WMSEfCoreRepository<WmsHQFKanbanOutPutDetial> _wmsefRespository;
-
-        private readonly WMSEfCoreRepository<TB_BILL> _wmstbRespository;
-        private readonly ISettleAccountBranchEfCoreRepository<TaskJob, Guid> _job;
-        private readonly IExcelImportAppService _excelImportService;
-
-
-        private readonly TaskJobService _service;
-       /// <summary>
-       /// 
-       /// </summary>
-       /// <param name="wmsRepository"></param>
-       /// <param name="job"></param>
-       /// <param name="wmsVersionRepository"></param>
-       /// <param name="wmsefRespository"></param>
-       /// <param name="wmstbRespository"></param>
-        public WmsHQFKanbanAppService(
-
-
-            IExcelImportAppService excelImportService,
-
-        ISettleAccountBranchEfCoreRepository<WmsHQFKanbanOutPutDetial, Guid> wmsRepository,
-            ISettleAccountBranchEfCoreRepository<TaskJob, Guid> job,
-            ISettleAccountBranchEfCoreRepository<WmsHQFKanbanOutPut, Guid> wmsVersionRepository,
-            WMSEfCoreRepository<WmsHQFKanbanOutPutDetial> wmsefRespository,
-            WMSEfCoreRepository<TB_BILL> wmstbRespository,
-             IDistributedCache<WmsHQFKanbanOutPutDetial> cache,
-             ISnowflakeIdGenerator snowflakeIdGenerator,
-           ICommonManager commonManager
-        ) : base(cache, excelImportService, snowflakeIdGenerator, commonManager)
-        {
-            _job = job;
-            _wmstbRespository = wmstbRespository;
-            _wmsRepository = wmsRepository;
-            _wmsVersionRepository = wmsVersionRepository;
-            _wmsefRespository = wmsefRespository;
-            _excelImportService = excelImportService;
-        }
-
-        private async Task<long> GetCountAsync(WmsKanbanOutPutDetialRequestDto input)
-        {
-            return await _wmsRepository.GetCountByFilterAsync(GuidGenerator.Create(), input.Filters);
-        }
-
-        private async Task<long> GetCountAsync(WmsKanbanOutPutRequestDto input)
-        {
-            return await _wmsVersionRepository.GetCountByFilterAsync(GuidGenerator.Create(), input.Filters);
-        }
-
-       /// <summary>
-       /// 准时化出库主表
-       /// </summary>
-       /// <param name="input"></param>
-       /// <returns></returns>
-        [HttpPost]
-        [Route("WmsHQFKanbanList")]
-        //[Authorize(SettleAccountPermissions.SettleAccounts.Default)]
-        virtual public async Task<PagedResultDto<WmsHQFKanbanOutPut>> GetListAsync( WmsKanbanOutPutRequestDto input)
-        {
-     
-            var entities = await _wmsVersionRepository.GetListByFilterAsync(GuidGenerator.Create(), input.Filters, input.Sorting, input.MaxResultCount,
-                 input.SkipCount, true);
-
-            var totalCount = await GetCountAsync(input);
-          
-
-            return new PagedResultDto<WmsHQFKanbanOutPut>(totalCount, entities);
-        }
-
-        /// <summary>
-        /// 准时化出库主表
-        /// </summary>
-        /// <param name="input"></param>
-        /// <returns></returns>
-        [HttpGet]
-        [Route("UpdateRemark")]
-
-        public  async Task<bool> UpdateRemark(Guid id, string remark)
-        {
-            var entity = _wmsVersionRepository.FirstOrDefault(p => p.Id == id);
-            if (entity != null)
-            {
-                entity.Remark = remark;
-                await _wmsVersionRepository.UpdateAsync(entity);
-
-            }
-            return true;
-        }
-
-
-
-
-
-        /// <summary>
-        /// 准时化出库明细
-        /// </summary>
-        /// <param name="input"></param>
-        /// <returns></returns>
-        [HttpPost]
-        [Route("WmsHQFKanbanDetailList")]
-        //[Authorize(SettleAccountPermissions.SettleAccounts.Default)]
-        virtual public async Task<PagedResultDto<WmsHQFKanbanOutPutDetial>> GetListAsync(WmsKanbanOutPutDetialRequestDto input)
-        {
-            //不用传version 单号能保证唯一
-            input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "BillNum", Logic = EnumFilterLogic.And, Value = input.BillNum });
-            var entities = await _wmsRepository.GetListByFilterAsync(GuidGenerator.Create(), input.Filters, input.Sorting, input.MaxResultCount,
-                 input.SkipCount, true);
-
-            var totalCount = await GetCountAsync(input);
-            return new PagedResultDto<WmsHQFKanbanOutPutDetial>(totalCount, entities);
-        }
-        /// <summary>
-        ///  任务明细标记已确认
-        /// </summary>
-        /// <param name="files">上传的文件(前端已经限制只能上传一个附件)</param>
-        /// <returns></returns>
-        [HttpPost]
-        [Route("WmsHQFKanbanOutPutAudit")]
-        [DisableRequestSizeLimit]
-
-        public async Task<bool> WmsHQFKanbanAudit(List<Guid> ids)
-        {
-            var _joblist =await _job.Where(p => ids.Contains(p.Id)).ToListAsync();
-            foreach (var itm in _joblist)
-            {
-                itm.FileName = "已确认";
-                await _job.UpdateAsync(itm);
-            }
-            
-            return true;
-        }
-
-        ///// <summary>
-        ///// 选择任务，生成出库单，只包含已确认的单据
-        ///// </summary>
-        ///// <param name="ids"></param>
-        ///// <param name="version"></param>
-        ///// <returns></returns>
-        //[HttpPost]
-        //[Route("WmsWithOutKanbanOutPut")]
-        //public async Task<string> WmsWithOutKanbanOutPut(WmsJitRequestDto input)
-        //{
-        //    var _billNum = "KA" + DateTime.Now.ToString("yyyyMMddhhmmss");
-
-        //    var _joblist = _job.Where(p => input.Guids.Contains(p.Id) && p.FileName == "已确认").ToList();
-        //    if (_joblist.Count() > 0)
-        //    {
-        //        var fileList = _joblist.Select(p => p.RealDownFileName).ToList();
-        //        List<WmsHQFKanbanOutPutDetial> _lst = new List<WmsHQFKanbanOutPutDetial>();
-        //        foreach (var filename in fileList)
-        //        {
-        //            string fileSavePath = Environment.CurrentDirectory + @"\wwwroot\files\host\my-file-container\" + filename;
-        //            ExcelHelper _excelHelper = new ExcelHelper(fileSavePath);
-        //            var _list = _excelHelper.ExcelToList<SettleKBWithOutCode>();
-        //            foreach (var itm in _list)
-        //            {
-
-        //              var _entity=  new WmsHQFKanbanOutPutDetial(GuidGenerator.Create(), string.Empty, string.Empty, itm.MaterialCode, itm.MaterialDesc
-        //                    , itm.SapMaterialGroup, string.Empty, string.Empty, 0, string.Empty, string.Empty, itm.Version, itm.SapMaterialCode,
-        //                    _billNum, Guid.Empty, string.Empty, itm.InvoiceQty,itm.
-        //                    );
-
-        //                _lst.Add(_entity);
-        //            }
-
-        //        }
-
-        //        var outPutDetail = await _wmsRepository.Where(p => p.Version == input.Version && p.Kanban==string.Empty).ToListAsync();
-
-
-        //            await _wmsRepository.GetDbContext().BulkInsertAsync(_lst, new BulkConfig() { BulkCopyTimeout = 0, BatchSize = 10000 });
-        //            int _count = _wmsVersionRepository.Count(p => p.Version == input.Version && p.BillNum == _billNum);
-        //            if (_count == 0)
-        //            {
-        //                var _version = new WmsHQFKanbanOutPut(GuidGenerator.Create(), input.Version, _billNum, CurrentUser.Email);
-
-        //                await _wmsVersionRepository.InsertAsync(_version, true);
-        //            }
-
-        //            foreach (var job in _joblist)
-        //            {
-        //                job.FileName = _billNum;
-        //                await _job.UpdateAsync(job);
-        //            }
-        //        }
-
-        //    return ApplicationConsts.SuccessStr; ;
-        //}
-
-
-        /// <summary>
-        /// 选择任务，生成出库单，只包含已确认的单据
-        /// </summary>
-        /// <param name="ids"></param>
-        /// <param name="version"></param>
-        /// <returns></returns>
-        [HttpPost]
-        [Route("WmsHQFKanbanOutPut")]
-        public async Task<string> WmsHQFKanbanOutPut(WmsJitRequestDto input)
-        {
-            var _billNum = "HQFKB" + DateTime.Now.ToString("yyyyMMddhhmmss");
-
-            var _joblist = _job.Where(p => input.Guids.Contains(p.Id) && p.FileName == "已确认").ToList();
-            if (_joblist.Count() > 0)
-            {
-                var fileList = _joblist.Select(p => p.RealDownFileName).ToList();
-                List<WmsHQFKanbanOutPutDetial> _lst = new List<WmsHQFKanbanOutPutDetial>();
-                foreach (var filename in fileList)
-                {
-                    string fileSavePath = Environment.CurrentDirectory + @"\wwwroot\files\host\my-file-container\" + filename;
-                    ExcelHelper _excelHelper = new ExcelHelper(fileSavePath);
-                    var _list = _excelHelper.ExcelToList<WmsHQFKanbanOutPutDetial>();
-                    foreach (var itm in _list)
-                    {
-                        itm.SetData(GuidGenerator.Create(), string.Empty, !string.IsNullOrEmpty(itm.WmsBillNum) ? itm.WmsBillNum : string.Empty, input.Version, GuidGenerator.Create());
-                    }
-                    _lst.AddRange(_list.ToArray());
-                }
-
-                var outPutDetail = await _wmsRepository.Where(p => p.Version == input.Version).ToListAsync();
-
-                var error = from itm1 in outPutDetail
-                            join itm2 in _lst on
-                            new { itm1.MaterialCode, itm1.Kanban, itm1.PoLine }
-                            equals
-                            new { itm2.MaterialCode, itm2.Kanban, itm2.PoLine }
-                            select itm1;
-                var errList = error.GroupBy(p => new { p.BillNum }).Select(p => new { BillNum = p.Key.BillNum, Number = p.Sum(itm => itm.Qty) });
-                if (errList.Count() == 0)
-                {
-
-                    var query = from itm1 in _lst
-                                join itm2 in outPutDetail on
-                                new { itm1.MaterialCode, itm1.Kanban }
-                                equals
-                                new { itm2.MaterialCode, itm2.Kanban } into temp1
-                                from tm1 in temp1.DefaultIfEmpty()
-                                where tm1 == null
-                                select itm1;
-                    var _wmslst = query.ToList();
-                    foreach (var itm in _wmslst)
-                    {
-                        itm.BillNum = _billNum;
-                    }
-                    await _wmsRepository.GetDbContext().BulkInsertAsync(_wmslst, new BulkConfig() { BulkCopyTimeout = 0, BatchSize = 10000 });
-                    int _count = _wmsVersionRepository.Count(p => p.Version == input.Version && p.BillNum == _billNum);
-                    if (_count == 0)
-                    {
-                        var _version = new WmsHQFKanbanOutPut(GuidGenerator.Create(), input.Version, _billNum, CurrentUser.Email,string.Empty);
-                        _version.Remark = !string.IsNullOrEmpty(_joblist.FirstOrDefault().Remark) ? _joblist.FirstOrDefault().Remark : string.Empty;
-                        await _wmsVersionRepository.InsertAsync(_version, true);
-                    }
-
-                    foreach (var job in _joblist)
-                    {
-                        job.FileName = _billNum;
-                        await _job.UpdateAsync(job);
-                    }
-                }
-                else
-                {
-                    StringBuilder _buffer = new StringBuilder();
-                    foreach (var itm in errList)
-                    {
-                        _buffer.AppendFormat("出库单号:{0}重复记录数:{1}条", itm.BillNum, itm.Number);
-                    }
-                    var _errinfo = _buffer.ToString();
-
-                    foreach (var job in _joblist)
-                    {
-                        job.FileName = _errinfo;
-                        await _job.UpdateAsync(job);
-                    }
-                }
-            }
-            else
-            {
-                _billNum = string.Empty;
-            }
-            return ApplicationConsts.SuccessStr; ;
-        }
-        /// <summary>
-        /// 出库界面功能，核准出库功能
-        /// </summary>
-        /// <param name="version"></param>
-        /// <param name="p_list"></param>
-        /// <returns></returns>
-        [HttpPost]
-        [Route("WmsHQFKanbanOutPut-Pass")]
-        [UnitOfWork(false)]
-        public async Task<bool> WmsHQFKanbanOutPutPass(WmsJitRequestDto input)
-        {
-            if (DateTime.Now.ToString("yyyyMM") != input.AccountDate.ToString("yyyyMM"))
-            {
-                throw new BusinessException("8989", "填写过账日期应该为当月！");
-               
-            }
-
-
-            var sql = "DECLARE	@return_value int\n" +
-                      "EXEC	@return_value = [dbo].[p_wms_output]\n" +
-                      "		@billnum = N'{0}',\n" +
-                      "		@type = 5,\n" +
-                      "     @date = N'{1}'\n" +
-                      "SELECT	'Return Value' = @return_value";
-            await _wmsRepository.GetDbContext().Database.ExecuteSqlRawAsync(
-               string.Format(sql, input.BillNum, input.AccountDate.ToShortDateString())
-             );
-
-
-
-            return true;
-         
-        }
-        /// <summary>
-        /// 出库界面功能删除
-        /// </summary>
-        /// <param name="version"></param>
-        /// <param name="p_list"></param>
-        /// <returns></returns>
-        [HttpPost]
-        [Route("WmsOutPutDelete")]
-        [UnitOfWork(false)]
-        public async Task<bool> WmsOutPutDelete(WmsJitRequestDto input)
-        {
-            var count = _wmsRepository.Count(p => p.BillNum == input.BillNum && p.State != 0);
-
-            if (count > 0)
-            {
-                return false;
-            }
-            var sql = "DECLARE	@return_value int\n" +
-                      "EXEC	@return_value = [dbo].[p_wms_output_cancel_all]\n" +
-                      "		@billnum = N'{0}',\n" +
-                      "		@type = 5\n" +
-                      "SELECT	'Return Value' = @return_value";
-            await _wmsRepository.GetDbContext().Database.ExecuteSqlRawAsync(
-               string.Format(sql, input.BillNum)
-             );
-
-
-
-            return true;
-        }
-        /// <summary>
-        ///出库界面功能， 撤销核准出库
-        /// </summary>
-        /// <param name="ids"></param>
-        /// <param name="version"></param>
-        /// <returns></returns>
-        [HttpPost]
-        [Route("WmsHQFKanbanOutPut-Cancel")]
-        public async Task<bool> WmsHQFKanbanOutPutCancel(WmsJitRequestDto input)
-        {
-            if (input.Guids != null && input.Guids.Count() > 0)
-            {
-                List<string> _ls = new List<string>();
-                foreach (var itm in input.Guids)
-                {
-                    _ls.Add(string.Format("{0}", itm));
-                }
-
-                string str = string.Join(",", _ls.ToArray());
-
-                var sql = "DECLARE	@return_value int\n" +
-                          "EXEC	@return_value = [dbo].[p_wms_output_cancel]\n" +
-                          "     @Guids ='{0}', \n" +
-                          "		@billnum = N'{1}',\n" +
-                          "		@type = 5,\n" +
-                          "     @accountdate = N'{2}'\n" +
-                          "SELECT	'Return Value' = @return_value";
-
-                sql = string.Format(sql, str, input.BillNum, input.AccountDate);
-
-                await _wmsRepository.GetDbContext().Database.ExecuteSqlRawAsync(
-                   sql
-                 );
-            }
-
-            return true;
-        }
-        [HttpPost]
-        [Route("ExcelImport")]
-        [DisableRequestSizeLimit]
-        //[Authorize(SettleAccountPermissions.SettleAccounts.Default)]
-        public async Task<string> ExcelImport([FromForm] IFormFileCollection files, string version)
-        {
-            var _billNum = "HQFKB" + DateTime.Now.ToString("yyyyMMddhhmmss");
-            ExportImporter _exportImporter = new ExportImporter();
-            var result = await _exportImporter.ExtendExcelImport<WmsHQFKanbanOutPutDetial>(files, _excelImportService);
-            List<WmsHQFKanbanOutPutDetial> _lst = new List<WmsHQFKanbanOutPutDetial>();
-            var _lsCopy = new List<WmsHQFKanbanOutPutDetial>();
-            foreach (var itm in result)
-            {
-                WmsHQFKanbanOutPutDetial _detail = new WmsHQFKanbanOutPutDetial(
-                GuidGenerator.Create(),
-                !string.IsNullOrEmpty(itm.WmsBillNum) ? itm.WmsBillNum : string.Empty,
-                itm.Kanban,
-                itm.MaterialCode,
-                itm.MaterialDesc,
-                itm.MaterialGroup,
-                string.Empty,
-                string.Empty,
-                0,
-               !string.IsNullOrEmpty(itm.Extend1) ? itm.Extend1 : string.Empty,
-               !string.IsNullOrEmpty(itm.Extend2) ? itm.Extend2 : string.Empty,
-                version,
-                itm.ParentMaterialCode,
-                itm.BillNum,
-                GuidGenerator.Create()
-                , string.Empty
-                , itm.Qty,
-               itm.PoLine
-                );
-                _lsCopy.Add(_detail);
-            }
-            _lst.AddRange(_lsCopy.ToArray());
-
-    
-            var outPutDetail = await _wmsRepository.Where(p => p.Version == version).ToListAsync();
-
-
-            var error = from itm1 in outPutDetail
-                        join itm2 in _lst on
-                        new { itm1.MaterialCode, itm1.Kanban,itm1.PoLine }
-                        equals
-                        new { itm2.MaterialCode, itm2.Kanban,itm2.PoLine }
-                        select itm1;
-            var errList = error.GroupBy(p => new { p.BillNum }).Select(p => new { BillNum = p.Key.BillNum, Number = p.Count() });
-
-            var checkList = new List<ErrorExportDto>();
-            foreach (var itm in errList)
-            {
-                checkList.Add(new ErrorExportDto() { Message = string.Format("出库单号:{0}重复记录数:{1}条", itm.BillNum, itm.Number) });
-            }
-            if (checkList.Count > 0)
-            {
-
-                return await ExportErrorReportAsync(checkList);
-            }
-
-            var query = from itm1 in _lst
-                        join itm2 in outPutDetail on
-                        new { itm1.MaterialCode, itm1.Kanban,itm1.PoLine }
-                        equals
-                        new { itm2.MaterialCode, itm2.Kanban,itm2.PoLine } into temp1
-                        from tm1 in temp1.DefaultIfEmpty()
-                        where tm1 == null
-                        select itm1;
-            var _wmslst = query.ToList();
-            foreach (var itm in _wmslst)
-            {
-                itm.BillNum = _billNum;
-            }
-            await _wmsRepository.GetDbContext().BulkInsertAsync(_wmslst, new BulkConfig() { BulkCopyTimeout = 0, BatchSize = 10000 });
-            int _count = _wmsVersionRepository.Count(p => p.Version == version && p.BillNum == _billNum);
-            if (_count == 0)
-            {
-                var _version = new WmsHQFKanbanOutPut(GuidGenerator.Create(), version, _billNum, CurrentUser.Email,string.Empty);
-                await _wmsVersionRepository.InsertAsync(_version, true);
-            }
-            return ApplicationConsts.SuccessStr;
-        }
-        /// <summary>
-        /// 导出
-        /// </summary>
-        /// <param name="input"></param>
-        /// <returns></returns>
-        [HttpPost]
-        [Route("Export")]
-        //[Authorize(SettleAccountPermissions.SettleAccounts.Default)]
-        virtual public async Task<string> ExportAsync(WmsKanbanOutPutDetialRequestDto input)
-        {
-            input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "BillNum", Logic = EnumFilterLogic.And, Value = input.BillNum });
-            var entities = await _wmsRepository.GetListByFilterAsync(GuidGenerator.Create(), input.Filters, input.Sorting, int.MaxValue,
-                 0, true);
-
-            IExporter _excel = new ExcelExporter();
-            byte[] result = null;
-
-            var _fileName = string.Format("出库单_{0}.xlsx", Guid.NewGuid().ToString());
-            result = await _excel.ExportAsByteArray(entities);
-
-
-            result.ShouldNotBeNull();
-
-            //保存导出文件到服务器存成二进制
-            await _excelImportService.SaveBlobAsync(
-                     new SaveExcelImportInputDto
-                     {
-                         Name = _fileName,
-                         Content = result
-                     }
-                 );
-            return _fileName;
-
-
-
-        }
-
-
-    }
-}
\ No newline at end of file
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSHQFSharePartAppService .cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSHQFSharePartAppService .cs
deleted file mode 100644
index 693d4b59..00000000
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSHQFSharePartAppService .cs	
+++ /dev/null
@@ -1,579 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.Extensions.Caching.Distributed;
-using AutoMapper;
-using System.Linq;
-using System.Text;
-using Volo.Abp.Guids;
-using Volo.Abp.Application.Services;
-using Volo.Abp.Caching;
-
-using Volo.Abp.ObjectMapping;
-using Win.Sfs.SettleAccount.ExcelImporter;
-using Win.Sfs.Shared.CacheBase;
-using Win.Utils;
-using Volo.Abp.Application.Dtos;
-using Win.Sfs.BaseData.ImportExcelCommon;
-using Volo.Abp.Domain.Repositories;
-using EFCore.BulkExtensions;
-using System.IO;
-using Microsoft.EntityFrameworkCore;
-using Win.Sfs.SettleAccount.Entities.SettleAccountVersion;
-using Win.Sfs.SettleAccount.FISes;
-using Win.Sfs.Shared.Enums.SettleAccount;
-using Win.Sfs.Shared.Filter;
-using Shouldly;
-using Magicodes.ExporterAndImporter.Csv;
-using Magicodes.ExporterAndImporter.Core;
-using Magicodes.ExporterAndImporter.Excel;
-using System.Data.Common;
-using Volo.Abp.Uow;
-using Volo.Abp;
-using Win.Abp.Snowflakes;
-using Win.Sfs.SettleAccount.CommonManagers;
-using Win.Sfs.SettleAccount.ExportReports;
-using Win.Sfs.SettleAccount.Constant;
-using Win.Sfs.SettleAccount.MaterialRelationships;
-using Win.Sfs.SettleAccount.Entities.TaskJobs;
-using Magicodes.ExporterAndImporter.Core.Models;
-
-using TaskJob.Services;
-using TaskJob.EventArgs;
-using Win.Sfs.SettleAccount.Entities.WMS;
-using Win.Sfs.SettleAccount.Entities.Wms;
-using Win.Sfs.SettleAccount.Repository;
-using WY.NewJit.Extends.PaiGe.WMS;
-using Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report;
-
-namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
-{
-    /// <summary>
-    /// 红旗F平台备件-出库
-    /// </summary>
-
-    [AllowAnonymous]
-    //[Authorize(SettleAccountPermissions.WMSHQ.Default)]
-    [Route("api/settleaccount/wmsHQFSharePartoutput")]
-    public class WMSHQFSharePartAppService :
-         SettleAccountApplicationBase<WmsHQFSharePartOutPutDetial>
-    {
-        private readonly ISettleAccountBranchEfCoreRepository<WmsHQFSharePartOutPutDetial, Guid> _wmsRepository;
-        private readonly ISettleAccountBranchEfCoreRepository<WmsHQFSharePartOutPut, Guid> _wmsVersionRepository;
-        private readonly WMSEfCoreRepository<WmsHQFSharePartOutPutDetial> _wmsefRespository;
-        private readonly WmsDapperRepository _wmsDapper;
-        private readonly WMSEfCoreRepository<TB_BILL> _wmstbRespository;
-        private readonly ISettleAccountBranchEfCoreRepository<TaskJob, Guid> _job;
-        private readonly IExcelImportAppService _excelImportService;
-
-        private readonly TaskJobService _service;
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="wmsRepository"></param>
-        /// <param name="job"></param>
-        /// <param name="wmsVersionRepository"></param>
-        /// <param name="wmsefRespository"></param>
-        /// <param name="wmstbRespository"></param>
-        public WMSHQFSharePartAppService(
-              WmsDapperRepository wmsDapper,
-        ISettleAccountBranchEfCoreRepository<WmsHQFSharePartOutPutDetial, Guid> wmsRepository,
-            ISettleAccountBranchEfCoreRepository<TaskJob, Guid> job,
-            ISettleAccountBranchEfCoreRepository<WmsHQFSharePartOutPut, Guid> wmsVersionRepository,
-            WMSEfCoreRepository<WmsHQFSharePartOutPutDetial> wmsefRespository,
-            WMSEfCoreRepository<TB_BILL> wmstbRespository,
-            IExcelImportAppService excelImportService,
-             IDistributedCache<WmsHQFSharePartOutPutDetial> cache,
-             ISnowflakeIdGenerator snowflakeIdGenerator,
-           ICommonManager commonManager
-        ) : base(cache, excelImportService, snowflakeIdGenerator, commonManager)
-        {
-            _excelImportService = excelImportService;
-            _job = job;
-            _wmstbRespository = wmstbRespository;
-            _wmsRepository = wmsRepository;
-            _wmsVersionRepository = wmsVersionRepository;
-            _wmsefRespository = wmsefRespository;
-            _wmsDapper = wmsDapper;
-        }
-
-        private async Task<long> GetCountAsync(WmsSharePartOutPutDetialRequestDto input)
-        {
-            return await _wmsRepository.GetCountByFilterAsync(GuidGenerator.Create(), input.Filters);
-        }
-
-        private async Task<long> GetCountAsync(WmsSharePartOutPutRequestDto input)
-        {
-            return await _wmsVersionRepository.GetCountByFilterAsync(GuidGenerator.Create(), input.Filters);
-        }
-
-        /// <summary>
-        /// 准时化出库主表
-        /// </summary>
-        /// <param name="input"></param>
-        /// <returns></returns>
-        [HttpPost]
-        [Route("WmsSharePartList")]
-        //[Authorize(SettleAccountPermissions.SettleAccounts.Default)]
-        virtual public async Task<PagedResultDto<WmsHQFSharePartOutPut>> GetListAsync(WmsSharePartOutPutRequestDto input)
-        {
-
-            var entities = await _wmsVersionRepository.GetListByFilterAsync(GuidGenerator.Create(), input.Filters, input.Sorting, input.MaxResultCount,
-                 input.SkipCount, true);
-
-            var totalCount = await GetCountAsync(input);
-
-
-            return new PagedResultDto<WmsHQFSharePartOutPut>(totalCount, entities);
-        }
-
-        /// <summary>
-        /// 准时化出库明细
-        /// </summary>
-        /// <param name="input"></param>
-        /// <returns></returns>
-        [HttpPost]
-        [Route("WmsSharePartDetailList")]
-        [UnitOfWork(false)]
-        //[Authorize(SettleAccountPermissions.SettleAccounts.Default)]
-        virtual public async Task<PagedResultDto<WmsHQFSharePartOutPutDetial>> GetListAsync(WmsSharePartOutPutDetialRequestDto input)
-        {
-            //不用传version 单号能保证唯一
-            input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "BillNum", Logic = EnumFilterLogic.And, Value = input.BillNum });
-            var entities = await _wmsRepository.GetListByFilterAsync(GuidGenerator.Create(), input.Filters, input.Sorting, input.MaxResultCount,
-                 input.SkipCount, true);
-
-            var totalCount = await GetCountAsync(input);
-            var stockList = _wmsDapper.GetSalesStock();
-            var query = from itm in entities
-                        join itm1 in stockList on itm.MaterialCode equals itm1.SapCode
-            into temp1
-                        from tm1 in temp1.DefaultIfEmpty()
-                        select new WmsHQHSharePartOutPutDetial(
-                            itm.Id,
-                        itm.WmsBillNum,
-                        itm.OrderBillNum,
-                        itm.MaterialCode,
-                        itm.MaterialDesc,
-                        itm.MaterialGroup,
-                        itm.OutPut,
-                        itm.InPut,
-                        itm.State,
-                        itm.Extend1,
-                        itm.Extend2,
-                        itm.Version,
-                        itm.ParentMaterialCode,
-                        itm.BillNum,
-                        itm.TaskId,
-                        itm.Remark,
-                        itm.Qty,
-                        tm1 == null ? 0 : tm1.Qty,
-                        itm.OutPutQty
-                        );
-            return new PagedResultDto<WmsHQFSharePartOutPutDetial>(totalCount, entities);
-        }
-        /// <summary>
-        ///  任务明细标记已确认
-        /// </summary>
-        /// <param name="files">上传的文件(前端已经限制只能上传一个附件)</param>
-        /// <returns></returns>
-        [HttpPost]
-        [Route("WmsSharePartOutPutAudit")]
-        [DisableRequestSizeLimit]
-
-        public async Task<bool> WmsSharePartAudit(List<Guid> ids)
-        {
-            var _joblist = await _job.Where(p => ids.Contains(p.Id)).ToListAsync();
-            foreach (var itm in _joblist)
-            {
-                itm.FileName = "已确认";
-                await _job.UpdateAsync(itm);
-            }
-
-            return true;
-        }
-        /// <summary>
-        ///更新备注
-        /// </summary>
-        /// <param name="input"></param>
-        /// <returns></returns>
-        [HttpGet]
-        [Route("UpdateRemark")]
-
-        public async Task<bool> UpdateRemark(Guid id, string remark)
-        {
-            var entity = _wmsVersionRepository.FirstOrDefault(p => p.Id == id);
-            if (entity != null)
-            {
-                entity.Remark = remark;
-                await _wmsVersionRepository.UpdateAsync(entity);
-
-            }
-            return true;
-        }
-
-
-
-
-        /// <summary>
-        /// 选择任务，生成出库单，只包含已确认的单据
-        /// </summary>
-        /// <param name="ids"></param>
-        /// <param name="version"></param>
-        /// <returns></returns>
-        [HttpPost]
-        [Route("WmsSharePartOutPut")]
-        public async Task<string> WmsSharePartOutPut(WmsJitRequestDto input)
-        {
-            var _billNum = "BHQF" + DateTime.Now.ToString("yyyyMMddhhmmss");
-            var _joblist = _job.Where(p => input.Guids.Contains(p.Id) && p.FileName == "已确认").ToList();
-            if (_joblist.Count() > 0)
-            {
-                var fileList = _joblist.Select(p => p.RealDownFileName).ToList();
-                List<WmsHQFSharePartOutPutDetial> _lst = new List<WmsHQFSharePartOutPutDetial>();
-                foreach (var filename in fileList)
-                {
-                    string fileSavePath = Environment.CurrentDirectory + @"\wwwroot\files\host\my-file-container\" + filename;
-                    ExcelHelper _excelHelper = new ExcelHelper(fileSavePath);
-                    var _list = _excelHelper.ExcelToList<WmsHQFSharePartOutPutDetial>();
-                    if (_list.Count() > 0)
-                    {
-                        var _lsAry = _list.Select(p => new
-                           WmsHQFSharePartOutPutDetial(
-                                GuidGenerator.Create(),
-                                  "",
-                                  string.Empty,
-                                  p.MaterialCode,
-                                  p.MaterialDesc,
-                                  p.MaterialGroup,
-                                  string.Empty,
-                                  string.Empty,
-                                  0,
-                                  p.Extend1,
-                                  p.Extend2,
-                                  input.Version,
-                                   string.Empty,
-                                  _billNum,
-                                  GuidGenerator.Create(),
-                                  string.Empty,
-                                  p.Qty,
-                                  p.StockQty,
-                                  p.Qty
-                           ));
-                        _lst.AddRange(_lsAry.ToArray());
-                    }
-                }
-                var outPutDetail = await _wmsRepository.Where(p => p.Version == input.Version).ToListAsync();
-
-                var error = from itm1 in outPutDetail
-                            join itm2 in _lst on
-                            new { itm1.MaterialCode}
-                            equals
-                            new { itm2.MaterialCode}
-                            select itm1;
-                var errList = error.GroupBy(p => new { p.BillNum }).Select(p => new { BillNum = p.Key.BillNum, Number = p.Sum(itm => itm.Qty) });
-                if (errList.Count() == 0)
-                {
-                    foreach (var itm in _lst)
-                    {
-                        itm.BillNum = _billNum;
-                    }
-                    await _wmsRepository.GetDbContext().BulkInsertAsync(_lst, new BulkConfig() { BulkCopyTimeout = 0, BatchSize = 10000 });
-                    int _count = _wmsVersionRepository.Count(p => p.Version == input.Version && p.BillNum == _billNum);
-                    if (_count == 0)
-                    {
-                        var _version = new WmsHQFSharePartOutPut(GuidGenerator.Create(), input.Version, _billNum, CurrentUser.Email);
-
-                        await _wmsVersionRepository.InsertAsync(_version, true);
-                    }
-                    foreach (var job in _joblist)
-                    {
-                        job.FileName = _billNum;
-                        await _job.UpdateAsync(job);
-                    }
-                }
-                else
-                {
-                    StringBuilder _buffer = new StringBuilder();
-                    foreach (var itm in errList)
-                    {
-                        _buffer.AppendFormat("出库单号:{0}重复记录数:{1}条", itm.BillNum, itm.Number);
-                    }
-                    var _errinfo = _buffer.ToString();
-
-                    foreach (var job in _joblist)
-                    {
-                        job.FileName = _errinfo;
-                        await _job.UpdateAsync(job);
-                    }
-                }
-            }
-            
-            return ApplicationConsts.SuccessStr;
-        }
-        /// <summary>
-        /// 出库界面功能，核准出库功能
-        /// </summary>
-        /// <param name="version"></param>
-        /// <param name="p_list"></param>
-        /// <returns></returns>
-        [HttpPost]
-        [Route("WmsSharePartOutPut-Pass")]
-        [UnitOfWork(false)]
-        public async Task<bool> WmsSharePartOutPutPass(WmsJitRequestDto input)
-        {
-            if (DateTime.Now.ToString("yyyyMM") != input.AccountDate.ToString("yyyyMM"))
-            {
-                throw new BusinessException("8989", "填写过账日期应该为当月！");
-
-            }
-            if (input.Guids != null)
-            {
-                List<WmsHQFSharePartOutPutDetial> _ls = new List<WmsHQFSharePartOutPutDetial>();
-                if (input.Guids.Count() > 0)
-                {
-                    _ls = await _wmsRepository.Where(p => input.Guids.Contains(p.Id) && p.Version == input.Version && p.BillNum == input.BillNum && p.State != 2).ToListAsync();
-                }
-                else
-                {
-                    _ls = await _wmsRepository.Where(p => p.Version == input.Version && p.BillNum == input.BillNum && p.State != 2).ToListAsync();
-                }
-                if (_ls.Count() > 0)
-                {
-                    var sql = "DECLARE	@return_value int\n" +
-                         "EXEC	@return_value = [dbo].[p_wms_output]\n" +
-                         "		@billnum = N'{0}',\n" +
-                         "		@type = 6,\n" +
-                         "      @date = N'{1}'\n" +
-                         "SELECT	'Return Value' = @return_value";
-                   
-                    await _wmsRepository.GetDbContext().Database.ExecuteSqlRawAsync(
-                       string.Format(sql, input.BillNum,input.AccountDate.ToShortDateString()));
-
-                }
-            }
-            return true;
-        }
-
-        /// <summary>
-        /// 出库界面功能删除
-        /// </summary>
-        /// <param name="version"></param>
-        /// <param name="p_list"></param>
-        /// <returns></returns>
-        [HttpPost]
-        [Route("WmsOutPutDelete")]
-        [UnitOfWork(false)]
-        public async Task<bool> WmsOutPutDelete(WmsJitRequestDto input)
-        {
-            if (DateTime.Now.ToString("yyyyMM") != input.AccountDate.ToString("yyyyMM"))
-            {
-                throw new BusinessException("8989", "填写过账日期应该为当月！");
-
-            }
-            var count = _wmsRepository.Count(p => p.BillNum == input.BillNum && p.State != 0);
-
-            if (count > 0)
-            {
-                return false;
-            }
-            var sql = "DECLARE	@return_value int\n" +
-                      "EXEC	@return_value = [dbo].[p_wms_output_cancel_all]\n" +
-                      "		@billnum = N'{0}',\n" +
-                      "		@type = 6\n" +
-                      "SELECT	'Return Value' = @return_value";
-            await _wmsRepository.GetDbContext().Database.ExecuteSqlRawAsync(
-               string.Format(sql, input.BillNum)
-             );
-
-
-
-            return true;
-        }
-
-
-
-        /// <summary>
-        ///出库界面功能， 撤销核准出库
-        /// </summary>
-        /// <param name="ids"></param>
-        /// <param name="version"></param>
-        /// <returns></returns>
-        [HttpPost]
-        [Route("WmsSharePartOutPut-Cancel")]
-        public async Task<bool> WmsSharePartOutPutCancel(WmsJitRequestDto input)
-        {
-            if (input.Guids != null && input.Guids.Count() > 0)
-            {
-                List<string> _ls = new List<string>();
-                foreach (var itm in input.Guids)
-                {
-                    _ls.Add(string.Format("{0}", itm));
-                }
-                string str = string.Join(",", _ls.ToArray());
-
-                var sql = "DECLARE	@return_value int\n" +
-                          "EXEC	@return_value = [dbo].[p_wms_output_cancel]\n" +
-                          "     @Guids ='{0}', \n" +
-                          "		@billnum = N'{1}',\n" +
-                          "		@type = 6,\n" +
-                          "     @accountdate = N'{2}'\n" +
-                          "SELECT	'Return Value' = @return_value";
-
-                sql = string.Format(sql, str, input.BillNum, input.AccountDate.ToShortDateString());
-
-                await _wmsRepository.GetDbContext().Database.ExecuteSqlRawAsync(
-                   sql
-                 );
-            }
-            return true;
-        }
-
-        /// <summary>
-        ///  任务明细标记已确认
-        /// </summary>
-        /// <param name="files">上传的文件(前端已经限制只能上传一个附件)</param>
-        /// <returns></returns>
-        [HttpPost]
-        [Route("WmsSharePartOutPutModify")]
-        [DisableRequestSizeLimit]
-
-        public async Task<bool> WmsSharePartUpdate(WmsHQHSharePartOutPutDetial detial)
-        {
-            var _entityList = _wmsRepository.Where(p => p.Id == detial.Id).ToList();
-            if (_entityList.Count() > 0)
-            {
-                foreach (var itm in _entityList)
-                {
-                    itm.OutPutQty = detial.OutPutQty;
-                    await _wmsRepository.UpdateAsync(itm);
-                }
-            }
-            return true;
-
-        }
-
-
-        [HttpPost]
-        [Route("ExcelImport")]
-        [DisableRequestSizeLimit]
-        //[Authorize(SettleAccountPermissions.SettleAccounts.Default)]
-        public async Task<string> ExcelImport([FromForm] IFormFileCollection files, string version)
-        {
-            var _billNum = "BHQF" + DateTime.Now.ToString("yyyyMMddhhmmss");
-            ExportImporter _exportImporter = new ExportImporter();
-            var result = await _exportImporter.ExtendExcelImport<WmsHQFSharePartOutPutDetial>(files, _excelImportService);
-            List<WmsHQFSharePartOutPutDetial> _lst = new List<WmsHQFSharePartOutPutDetial>();
-
-            var _lsCopy = new List<WmsHQFSharePartOutPutDetial>();
-            foreach (var itm in result)
-            {
-                WmsHQFSharePartOutPutDetial _detail = new WmsHQFSharePartOutPutDetial(
-                GuidGenerator.Create(),
-               string.Empty,
-                string.Empty,
-                itm.MaterialCode,
-                itm.MaterialDesc,
-                itm.MaterialGroup,
-                string.Empty,
-                string.Empty,
-                0,
-               !string.IsNullOrEmpty(itm.Extend1) ? itm.Extend1 : string.Empty,
-               !string.IsNullOrEmpty(itm.Extend2) ? itm.Extend2 : string.Empty,
-                version,
-                itm.MaterialCode,
-                itm.BillNum,
-                GuidGenerator.Create()
-                , string.Empty
-                , itm.Qty
-                ,0
-                ,itm.Qty
-                );
-                _lsCopy.Add(_detail);
-            }
-            _lst.AddRange(_lsCopy.ToArray());
-
-
-            var outPutDetail = await _wmsRepository.Where(p => p.Version == version).ToListAsync();
-
-            var error = from itm1 in outPutDetail
-                        join itm2 in _lst on
-                        new { itm1.MaterialCode }
-                        equals
-                        new { itm2.MaterialCode}
-                        select itm1;
-            var errList = error.GroupBy(p => new { p.BillNum }).Select(p => new { BillNum = p.Key.BillNum, Number = p.Count() });
-
-            var checkList = new List<ErrorExportDto>();
-            foreach (var itm in errList)
-            {
-                checkList.Add(new ErrorExportDto() { Message = string.Format("出库单号:{0}重复记录数:{1}条", itm.BillNum, itm.Number) });
-            }
-            if (checkList.Count > 0)
-            {
-                return await ExportErrorReportAsync(checkList);
-            }
-            var query = from itm1 in _lst
-                        join itm2 in outPutDetail on
-                        new { itm1.MaterialCode }
-                        equals
-                        new { itm2.MaterialCode  } into temp1
-                        from tm1 in temp1.DefaultIfEmpty()
-                        where tm1 == null
-                        select itm1;
-            var _wmslst = query.ToList();
-            foreach (var itm in _wmslst)
-            {
-                itm.BillNum = _billNum;
-            }
-            await _wmsRepository.GetDbContext().BulkInsertAsync(_wmslst, new BulkConfig() { BulkCopyTimeout = 0, BatchSize = 10000 });
-            int _count = _wmsVersionRepository.Count(p => p.Version == version && p.BillNum == _billNum);
-            if (_count == 0)
-            {
-                var _version = new WmsHQFSharePartOutPut(GuidGenerator.Create(), version, _billNum, CurrentUser.Email);
-                await _wmsVersionRepository.InsertAsync(_version, true);
-            }
-            return ApplicationConsts.SuccessStr;
-        }
-        /// <summary>
-        /// 导出
-        /// </summary>
-        /// <param name="input"></param>
-        /// <returns></returns>
-        [HttpPost]
-        [Route("Export")]
-        //[Authorize(SettleAccountPermissions.SettleAccounts.Default)]
-        virtual public async Task<string> ExportAsync(WmsKanbanOutPutDetialRequestDto input)
-        {
-            input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "BillNum", Logic = EnumFilterLogic.And, Value = input.BillNum });
-            var entities = await _wmsRepository.GetListByFilterAsync(GuidGenerator.Create(), input.Filters, input.Sorting, int.MaxValue,
-                 0, true);
-
-            IExporter _excel = new ExcelExporter();
-            byte[] result = null;
-
-            var _fileName = string.Format("出库单_{0}.xlsx", Guid.NewGuid().ToString());
-            result = await _excel.ExportAsByteArray(entities);
-
-
-            result.ShouldNotBeNull();
-
-            //保存导出文件到服务器存成二进制
-            await _excelImportService.SaveBlobAsync(
-                     new SaveExcelImportInputDto
-                     {
-                         Name = _fileName,
-                         Content = result
-                     }
-                 );
-            return _fileName;
-
-
-
-        }
-    }
-
-}
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSHQHKanbanAppService.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSHQHKanbanAppService.cs
deleted file mode 100644
index 99eca55d..00000000
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSHQHKanbanAppService.cs
+++ /dev/null
@@ -1,633 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.Extensions.Caching.Distributed;
-using AutoMapper;
-using System.Linq;
-using System.Text;
-using Volo.Abp.Guids;
-using Volo.Abp.Application.Services;
-using Volo.Abp.Caching;
-
-using Volo.Abp.ObjectMapping;
-using Win.Sfs.SettleAccount.ExcelImporter;
-using Win.Sfs.Shared.CacheBase;
-using Win.Utils;
-using Volo.Abp.Application.Dtos;
-using Win.Sfs.BaseData.ImportExcelCommon;
-using Volo.Abp.Domain.Repositories;
-using EFCore.BulkExtensions;
-using System.IO;
-using Microsoft.EntityFrameworkCore;
-using Win.Sfs.SettleAccount.Entities.SettleAccountVersion;
-using Win.Sfs.SettleAccount.FISes;
-using Win.Sfs.Shared.Enums.SettleAccount;
-using Win.Sfs.Shared.Filter;
-using Shouldly;
-using Magicodes.ExporterAndImporter.Csv;
-using Magicodes.ExporterAndImporter.Core;
-using Magicodes.ExporterAndImporter.Excel;
-using System.Data.Common;
-using Volo.Abp.Uow;
-using Volo.Abp;
-using Win.Abp.Snowflakes;
-using Win.Sfs.SettleAccount.CommonManagers;
-using Win.Sfs.SettleAccount.ExportReports;
-using Win.Sfs.SettleAccount.Constant;
-using Win.Sfs.SettleAccount.MaterialRelationships;
-using Win.Sfs.SettleAccount.Entities.TaskJobs;
-using Magicodes.ExporterAndImporter.Core.Models;
-
-using TaskJob.Services;
-using TaskJob.EventArgs;
-using Win.Sfs.SettleAccount.Entities.WMS;
-using Win.Sfs.SettleAccount.Entities.Wms;
-using Win.Sfs.SettleAccount.Repository;
-using WY.NewJit.Extends.PaiGe.WMS;
-using Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report;
-
-namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
-{
-    /// <summary>
-    /// 红旗H平台准时化-出库
-    /// </summary>
-
-    //[AllowAnonymous]
-    [Authorize(SettleAccountPermissions.WMSHQ.Default)]
-    [Route("api/settleaccount/WmsHQHKanbanoutput")]
-    public class WmsHQHKanbanAppService :
-        SettleAccountApplicationBase<WmsHQHKanbanOutPutDetial>
-    {
-  
-        private readonly ISettleAccountBranchEfCoreRepository<WmsHQHKanbanOutPutDetial, Guid> _wmsRepository;
-        private readonly ISettleAccountBranchEfCoreRepository<WmsHQHKanbanOutPut, Guid> _wmsVersionRepository;
-        private readonly WMSEfCoreRepository<WmsHQHKanbanOutPutDetial> _wmsefRespository;
-
-        private readonly WMSEfCoreRepository<TB_BILL> _wmstbRespository;
-        private readonly ISettleAccountBranchEfCoreRepository<TaskJob, Guid> _job;
-        private readonly IExcelImportAppService _excelImportService;
-        //private readonly ErpPartDapperRepository _erpdapperRepository;
-
-
-        private readonly TaskJobService _service;
-       /// <summary>
-       /// 
-       /// </summary>
-       /// <param name="wmsRepository"></param>
-       /// <param name="job"></param>
-       /// <param name="wmsVersionRepository"></param>
-       /// <param name="wmsefRespository"></param>
-       /// <param name="wmstbRespository"></param>
-        public WmsHQHKanbanAppService(
-
-
-            IExcelImportAppService excelImportService,
-
-        ISettleAccountBranchEfCoreRepository<WmsHQHKanbanOutPutDetial, Guid> wmsRepository,
-            ISettleAccountBranchEfCoreRepository<TaskJob, Guid> job,
-            ISettleAccountBranchEfCoreRepository<WmsHQHKanbanOutPut, Guid> wmsVersionRepository,
-            WMSEfCoreRepository<WmsHQHKanbanOutPutDetial> wmsefRespository,
-            WMSEfCoreRepository<TB_BILL> wmstbRespository,
-             IDistributedCache<WmsHQHKanbanOutPutDetial> cache,
-             ISnowflakeIdGenerator snowflakeIdGenerator,
-               //ErpPartDapperRepository erpdapperRepository,
-           ICommonManager commonManager
-        ) : base(cache, excelImportService, snowflakeIdGenerator, commonManager)
-        {
-            _job = job;
-            _wmstbRespository = wmstbRespository;
-            _wmsRepository = wmsRepository;
-            _wmsVersionRepository = wmsVersionRepository;
-            _wmsefRespository = wmsefRespository;
-            _excelImportService = excelImportService;
-            //_erpdapperRepository = erpdapperRepository;
-        }
-
-        private async Task<long> GetCountAsync(WmsKanbanOutPutDetialRequestDto input)
-        {
-            return await _wmsRepository.GetCountByFilterAsync(GuidGenerator.Create(), input.Filters);
-        }
-
-        private async Task<long> GetCountAsync(WmsKanbanOutPutRequestDto input)
-        {
-            return await _wmsVersionRepository.GetCountByFilterAsync(GuidGenerator.Create(), input.Filters);
-        }
-
-       /// <summary>
-       /// 准时化出库主表
-       /// </summary>
-       /// <param name="input"></param>
-       /// <returns></returns>
-        [HttpPost]
-        [Route("WmsHQHKanbanList")]
-        //[Authorize(SettleAccountPermissions.SettleAccounts.Default)]
-        virtual public async Task<PagedResultDto<WmsHQHKanbanOutPut>> GetListAsync( WmsKanbanOutPutRequestDto input)
-        {
-     
-            var entities = await _wmsVersionRepository.GetListByFilterAsync(GuidGenerator.Create(), input.Filters, input.Sorting, input.MaxResultCount,
-                 input.SkipCount, true);
-
-            var totalCount = await GetCountAsync(input);
-          
-
-            return new PagedResultDto<WmsHQHKanbanOutPut>(totalCount, entities);
-        }
-
-        /// <summary>
-        /// 准时化出库明细
-        /// </summary>
-        /// <param name="input"></param>
-        /// <returns></returns>
-        [HttpPost]
-        [Route("WmsHQHKanbanDetailList")]
-        //[Authorize(SettleAccountPermissions.SettleAccounts.Default)]
-        virtual public async Task<PagedResultDto<WmsHQHKanbanOutPutDetial>> GetListAsync(WmsKanbanOutPutDetialRequestDto input)
-        {
-            //不用传version 单号能保证唯一
-            input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "BillNum", Logic = EnumFilterLogic.And, Value = input.BillNum });
-            //input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "State", Logic = EnumFilterLogic.And, Value = input.State.ToString() });
-            var entities = await _wmsRepository.GetListByFilterAsync(GuidGenerator.Create(), input.Filters, input.Sorting, input.MaxResultCount,
-                 input.SkipCount, true);
-
-            var totalCount = await GetCountAsync(input);
-            return new PagedResultDto<WmsHQHKanbanOutPutDetial>(totalCount, entities);
-        }
-        /// <summary>
-        ///  任务明细标记已确认
-        /// </summary>
-        /// <param name="files">上传的文件(前端已经限制只能上传一个附件)</param>
-        /// <returns></returns>
-        [HttpPost]
-        [Route("WmsHQHKanbanOutPutAudit")]
-        [DisableRequestSizeLimit]
-
-        public async Task<bool> WmsHQHKanbanAudit(List<Guid> ids)
-        {
-            var _joblist =await _job.Where(p => ids.Contains(p.Id)).ToListAsync();
-            foreach (var itm in _joblist)
-            {
-                itm.FileName = "已确认";
-                await _job.UpdateAsync(itm);
-            }
-            
-            return true;
-        }
-        /// <summary>
-        ///更新备注
-        /// </summary>
-        /// <param name="input"></param>
-        /// <returns></returns>
-        [HttpGet]
-        [Route("UpdateRemark")]
-
-        public async Task<bool> UpdateRemark(Guid id, string remark)
-        {
-            var entity = _wmsVersionRepository.FirstOrDefault(p => p.Id == id);
-            if (entity != null)
-            {
-                entity.Remark = remark;
-                await _wmsVersionRepository.UpdateAsync(entity);
-
-            }
-            return true;
-        }
-
-
-
-        ///// <summary>
-        ///// 选择任务，生成出库单，只包含已确认的单据
-        ///// </summary>
-        ///// <param name="ids"></param>
-        ///// <param name="version"></param>
-        ///// <returns></returns>
-        //[HttpPost]
-        //[Route("WmsWithOutKanbanOutPut")]
-        //public async Task<string> WmsWithOutKanbanOutPut(WmsJitRequestDto input)
-        //{
-        //    var _billNum = "KA" + DateTime.Now.ToString("yyyyMMddhhmmss");
-
-        //    var _joblist = _job.Where(p => input.Guids.Contains(p.Id) && p.FileName == "已确认").ToList();
-        //    if (_joblist.Count() > 0)
-        //    {
-        //        var fileList = _joblist.Select(p => p.RealDownFileName).ToList();
-        //        List<WmsHQHKanbanOutPutDetial> _lst = new List<WmsHQHKanbanOutPutDetial>();
-        //        foreach (var filename in fileList)
-        //        {
-        //            string fileSavePath = Environment.CurrentDirectory + @"\wwwroot\files\host\my-file-container\" + filename;
-        //            ExcelHelper _excelHelper = new ExcelHelper(fileSavePath);
-        //            var _list = _excelHelper.ExcelToList<SettleKBWithOutCode>();
-        //            foreach (var itm in _list)
-        //            {
-
-        //              var _entity=  new WmsHQHKanbanOutPutDetial(GuidGenerator.Create(), string.Empty, string.Empty, itm.MaterialCode, itm.MaterialDesc
-        //                    , itm.SapMaterialGroup, string.Empty, string.Empty, 0, string.Empty, string.Empty, itm.Version, itm.SapMaterialCode,
-        //                    _billNum, Guid.Empty, string.Empty, itm.InvoiceQty,itm.
-        //                    );
-
-        //                _lst.Add(_entity);
-        //            }
-
-        //        }
-
-        //        var outPutDetail = await _wmsRepository.Where(p => p.Version == input.Version && p.Kanban==string.Empty).ToListAsync();
-
-
-        //            await _wmsRepository.GetDbContext().BulkInsertAsync(_lst, new BulkConfig() { BulkCopyTimeout = 0, BatchSize = 10000 });
-        //            int _count = _wmsVersionRepository.Count(p => p.Version == input.Version && p.BillNum == _billNum);
-        //            if (_count == 0)
-        //            {
-        //                var _version = new WmsHQHKanbanOutPut(GuidGenerator.Create(), input.Version, _billNum, CurrentUser.Email);
-
-        //                await _wmsVersionRepository.InsertAsync(_version, true);
-        //            }
-
-        //            foreach (var job in _joblist)
-        //            {
-        //                job.FileName = _billNum;
-        //                await _job.UpdateAsync(job);
-        //            }
-        //        }
-
-        //    return ApplicationConsts.SuccessStr; ;
-        //}
-
-
-        /// <summary>
-        /// 选择任务，生成出库单，只包含已确认的单据
-        /// </summary>
-        /// <param name="ids"></param>
-        /// <param name="version"></param>
-        /// <returns></returns>
-        [HttpPost]
-        [Route("WmsHQHKanbanOutPut")]
-        public async Task<string> WmsHQHKanbanOutPut(WmsJitRequestDto input)
-        {
-            var _billNum = "HQHKB" + DateTime.Now.ToString("yyyyMMddhhmmss");
-
-            var _joblist = _job.Where(p => input.Guids.Contains(p.Id) && p.FileName == "已确认").ToList();
-            if (_joblist.Count() > 0)
-            {
-                var fileList = _joblist.Select(p => p.RealDownFileName).ToList();
-                List<WmsHQHKanbanOutPutDetial> _lst = new List<WmsHQHKanbanOutPutDetial>();
-                foreach (var filename in fileList)
-                {
-                    string fileSavePath = Environment.CurrentDirectory + @"\wwwroot\files\host\my-file-container\" + filename;
-                    ExcelHelper _excelHelper = new ExcelHelper(fileSavePath);
-                    var _list = _excelHelper.ExcelToList<WmsHQHKanbanOutPutDetial>();
-                    foreach (var itm in _list)
-                    {
-                        itm.SetData(GuidGenerator.Create(),string.Empty,!string.IsNullOrEmpty(itm.WmsBillNum)? itm.WmsBillNum:string.Empty,input.Version,GuidGenerator.Create());
-                    }
-                    _lst.AddRange(_list.ToArray());
-                }
-          
-                var outPutDetail = await _wmsRepository.Where(p => p.Version == input.Version && p.State != 4 ).ToListAsync();
-
-                var error = from itm1 in outPutDetail
-                            join itm2 in _lst on
-                            new { itm1.MaterialCode, itm1.Kanban,itm1.PoLine }
-                            equals
-                            new { itm2.MaterialCode, itm2.Kanban,itm2.PoLine }
-                            select itm1;
-                var errList = error.GroupBy(p => new { p.BillNum }).Select(p => new { BillNum = p.Key.BillNum, Number = p.Sum(itm => itm.Qty) });
-                if (errList.Count() == 0)
-                {
-
-                    var query = from itm1 in _lst
-                                join itm2 in outPutDetail on
-                                new { itm1.MaterialCode, itm1.Kanban }
-                                equals
-                                new { itm2.MaterialCode, itm2.Kanban } into temp1
-                                from tm1 in temp1.DefaultIfEmpty()
-                                where tm1 == null
-                                select itm1;
-                    var _wmslst = query.ToList();
-                    foreach (var itm in _wmslst)
-                    {
-                        itm.BillNum = _billNum;
-                    }
-                    await _wmsRepository.GetDbContext().BulkInsertAsync(_wmslst, new BulkConfig() { BulkCopyTimeout = 0, BatchSize = 10000 });
-                    int _count = _wmsVersionRepository.Count(p => p.Version == input.Version && p.BillNum == _billNum);
-                    if (_count == 0)
-                    {
-                        var _version = new WmsHQHKanbanOutPut(GuidGenerator.Create(), input.Version, _billNum, CurrentUser.Email,string.Empty);
-                        _version.Remark = !string.IsNullOrEmpty(_joblist.FirstOrDefault().Remark) ? _joblist.FirstOrDefault().Remark : string.Empty;
-                        await _wmsVersionRepository.InsertAsync(_version, true);
-                    }
-
-                    foreach (var job in _joblist)
-                    {
-                        job.FileName = _billNum;
-                        await _job.UpdateAsync(job);
-                    }
-                }
-                else
-                {
-                    StringBuilder _buffer = new StringBuilder();
-                    foreach (var itm in errList)
-                    {
-                        _buffer.AppendFormat("出库单号:{0}重复记录数:{1}条", itm.BillNum, itm.Number);
-                    }
-                    var _errinfo = _buffer.ToString();
-
-                    foreach (var job in _joblist)
-                    {
-                        job.FileName = _errinfo;
-                        await _job.UpdateAsync(job);
-                    }
-                }
-            }
-            else
-            {
-                _billNum = string.Empty;
-            }
-               return ApplicationConsts.SuccessStr; ;
-        }
-        /// <summary>
-        /// 出库界面功能，核准出库功能
-        /// </summary>
-        /// <param name="version"></param>
-        /// <param name="p_list"></param>
-        /// <returns></returns>
-        [HttpPost]
-        [Route("WmsHQHKanbanOutPut-Pass")]
-        [UnitOfWork(false)]
-        public async Task<bool> WmsHQHKanbanOutPutPass(WmsJitRequestDto input)
-        {
-            //if (DateTime.Now.ToString("yyyyMM") != input.AccountDate.ToString("yyyyMM"))
-            //{
-            //    throw new BusinessException("8989", "填写过账日期应该为当月！");
-
-            //}
-            var sql = "DECLARE	@return_value int\n" +
-                      "EXEC	@return_value = [dbo].[p_wms_output]\n" +
-                      "		@billnum = N'{0}',\n" +
-                      "		@type = 3,\n" +
-                      "     @date = N'{1}'\n" +
-                      "SELECT	'Return Value' = @return_value";
-            await _wmsRepository.GetDbContext().Database.ExecuteSqlRawAsync(
-               string.Format(sql, input.BillNum, input.AccountDate.ToShortDateString())
-             );
-
-
-
-            return true;
-         
-        }
-        /// <summary>
-        ///出库界面功能， 撤销核准出库
-        /// </summary>
-        /// <param name="ids"></param>
-        /// <param name="version"></param>
-        /// <returns></returns>
-        [HttpPost]
-        [Route("WmsHQHKanbanOutPut-Cancel")]
-        [UnitOfWork(false)]
-        public async Task<bool> WmsHQHKanbanOutPutCancel(WmsJitRequestDto input)
-        {
-            if (input.Guids != null && input.Guids.Count() > 0)
-            {
-                List<string> _ls = new List<string>();
-                foreach (var itm in input.Guids)
-                {
-                    _ls.Add(string.Format("{0}", itm));
-                }
-
-                string str = string.Join(",", _ls.ToArray());
-
-                var sql = "DECLARE	@return_value int\n" +
-                          "EXEC	@return_value = [dbo].[p_wms_output_cancel]\n" +
-                          "     @Guids ='{0}', \n" +
-                          "		@billnum = N'{1}',\n" +
-                          "		@type = 3,\n" +
-                          "     @accountdate = N'{2}'\n" +
-                          "SELECT	'Return Value' = @return_value";
-
-                sql = string.Format(sql, str, input.BillNum, input.AccountDate.ToShortDateString());
-
-                await _wmsRepository.GetDbContext().Database.ExecuteSqlRawAsync(
-                   sql
-                 );
-
-            }
-
-            return true;
-        }
-        /// <summary>
-        /// 出库界面功能删除
-        /// </summary>
-        /// <param name="version"></param>
-        /// <param name="p_list"></param>
-        /// <returns></returns>
-        [HttpPost]
-        [Route("WmsOutPutDelete")]
-        [UnitOfWork(false)]
-        public async Task<bool> WmsOutPutDelete(WmsJitRequestDto input)
-        {
-            var count = _wmsRepository.Count(p => p.BillNum == input.BillNum && p.State != 0);
-
-            if (count > 0)
-            {
-                return false;
-            }
-            var sql = "DECLARE	@return_value int\n" +
-                      "EXEC	@return_value = [dbo].[p_wms_output_cancel_all]\n" +
-                      "		@billnum = N'{0}',\n" +
-                      "		@type = 3\n" +
-                      "SELECT	'Return Value' = @return_value";
-            await _wmsRepository.GetDbContext().Database.ExecuteSqlRawAsync(
-               string.Format(sql, input.BillNum)
-             );
-
-
-
-            return true;
-        }
-        [HttpPost]
-        [Route("ExcelImport")]
-        [DisableRequestSizeLimit]
-        //[UnitOfWork(false)]
-        //[Authorize(SettleAccountPermissions.SettleAccounts.Default)]
-        public async Task<string> ExcelImport([FromForm] IFormFileCollection files, string version)
-        {
-            var _billNum = "HQHKB" + DateTime.Now.ToString("yyyyMMddhhmmss");
-            var checkList = new List<ErrorExportDto>();
-            ExportImporter _exportImporter = new ExportImporter();
-            var result = await _exportImporter.ExtendExcelOfSheetOneImport<WmsHQHKanbanOutPutDetial>(files, _excelImportService);
-
-            //检验1:导入模板中的第一页签数据不能为空
-            if (result == null || result.Count() == 0)
-            {
-                checkList.Add(new ErrorExportDto(version, "红旗批量出库单导入", string.Empty, string.Empty, string.Empty, string.Empty, "导入模板中第一页签没有数据，请检查！", string.Empty));
-            }
-            if (checkList.Count > 0)
-            {
-                return await ExportErrorReportAsync(checkList);
-            }
-
-
-            var filteResult = result.Where(p =>!string.IsNullOrEmpty(p.Kanban));//过滤掉看板号为空的数据
-
-            //检验2:导入模板中的结算数据是否为0
-            foreach (var itm in filteResult)
-            {
-                if (itm.Qty == 0)
-                {
-                    checkList.Add(new ErrorExportDto(version, "红旗批量出库单导入", string.Empty, string.Empty, string.Empty, string.Empty, string.Format("导入模板中看板号{0}的结算数量为０，影响出库请检查！", itm.Kanban), string.Empty));
-                }
-                if(string.IsNullOrEmpty(itm.WmsBillNum))
-                {
-                    checkList.Add(new ErrorExportDto(version, "红旗批量出库单导入", string.Empty, string.Empty, string.Empty, string.Empty, string.Format("导入模板中看板号{0}的交货单号为空，影响出库请检查！", itm.Kanban), string.Empty));
-                }
-            }
-
-            ////和物料主数据中SAP物料号检验是否存在
-            //foreach (var itm in filteResult)
-            //{
-            //    if (!_erpdapperRepository.GetMaterialList().Any(p => p.MaterialCode == itm.MaterialCode))
-            //    {
-            //        checkList.Add(new ErrorExportDto(version, "自定义出库单导入", string.Empty, string.Empty, itm.MaterialCode, string.Empty, string.Format("物料主数据不存在当前导入的物料号{0}！", itm.MaterialCode), string.Empty));
-            //    }
-            //}
-
-
-            if (checkList.Count > 0)
-            {
-                return await ExportErrorReportAsync(checkList);
-            }
-
-            List<WmsHQHKanbanOutPutDetial> _lst = new List<WmsHQHKanbanOutPutDetial>();
-            var _lsCopy = new List<WmsHQHKanbanOutPutDetial>();
-            foreach (var itm in filteResult)
-            {
-                WmsHQHKanbanOutPutDetial _detail = new WmsHQHKanbanOutPutDetial(
-                GuidGenerator.Create(),
-                !string.IsNullOrEmpty(itm.WmsBillNum) ? itm.WmsBillNum : string.Empty,
-                itm.Kanban,
-                itm.MaterialCode,
-                itm.MaterialDesc,
-                itm.MaterialGroup,
-                string.Empty,
-                string.Empty,
-                0,
-               !string.IsNullOrEmpty(itm.Extend1)?itm.Extend1: string.Empty,
-               !string.IsNullOrEmpty(itm.Extend2) ? itm.Extend2 : string.Empty,
-                version,
-                itm.ParentMaterialCode,
-                itm.BillNum,
-                GuidGenerator.Create()
-                , string.Empty
-                , itm.Qty,
-               itm.PoLine
-               ,itm.Price
-               ,itm.Amt
-                );
-                _lsCopy.Add(_detail);
-            }
-            _lst.AddRange(_lsCopy.ToArray());
-
-            //检验3：导入模板中看板号+物料号，不能重复
-            var _isRepeatOfReportList = from arc in _lst
-                                        group arc by new { arc.Kanban, arc.MaterialCode, arc.Version }
-                                        into g
-                                        where g.Count() > 1
-                                        select g;
-            foreach (var itm in _isRepeatOfReportList)
-            {
-                checkList.Add(new ErrorExportDto(version, "红旗批量出库单", string.Empty, string.Empty, string.Empty, string.Empty, string.Format("导入模板中看板号{0}组合物料号{1}有重复，请检查！", itm.Key.Kanban, itm.Key.MaterialCode), string.Empty));
-            }
-            if (checkList.Count > 0)
-            {
-                return await ExportErrorReportAsync(checkList);
-            }
-
-
-
-            var outPutDetail = await _wmsRepository.Where(p => p.Version == version && p.State != 4 ).ToListAsync();
-
-
-            var error = from itm1 in outPutDetail
-                        join itm2 in _lst on
-                        new { itm1.MaterialCode, itm1.Kanban,itm1.PoLine }
-                        equals
-                        new { itm2.MaterialCode, itm2.Kanban,itm2.PoLine }
-                        select itm1;
-            var errList = error.GroupBy(p => new { p.BillNum }).Select(p => new { BillNum = p.Key.BillNum, Number = p.Count() });
-
-           
-            foreach (var itm in errList)
-            {
-                checkList.Add(new ErrorExportDto() { Message = string.Format("出库单号:{0}重复记录数:{1}条", itm.BillNum, itm.Number) });
-            }
-            if (checkList.Count > 0)
-            {
-
-                return await ExportErrorReportAsync(checkList);
-            }
-
-            var query = from itm1 in _lst
-                        join itm2 in outPutDetail on
-                        new { itm1.MaterialCode, itm1.Kanban,itm1.PoLine }
-                        equals
-                        new { itm2.MaterialCode, itm2.Kanban,itm2.PoLine } into temp1
-                        from tm1 in temp1.DefaultIfEmpty()
-                        where tm1 == null
-                        select itm1;
-            var _wmslst = query.ToList();
-            foreach (var itm in _wmslst)
-            {
-                itm.BillNum = _billNum;
-            }
-            await _wmsRepository.GetDbContext().BulkInsertAsync(_wmslst, new BulkConfig() { BulkCopyTimeout = 0, BatchSize = 10000 });
-            int _count = _wmsVersionRepository.Count(p => p.Version == version && p.BillNum == _billNum);
-            if (_count == 0)
-            {
-                var _version = new WmsHQHKanbanOutPut(GuidGenerator.Create(), version, _billNum, CurrentUser.Email,string.Empty);
-             
-                await _wmsVersionRepository.InsertAsync(_version, true);
-            }
-            return ApplicationConsts.SuccessStr;
-        }
-        /// <summary>
-        /// 导出
-        /// </summary>
-        /// <param name="input"></param>
-        /// <returns></returns>
-        [HttpPost]
-        [Route("Export")]
-        //[Authorize(SettleAccountPermissions.SettleAccounts.Default)]
-        virtual public async Task<string> ExportAsync(WmsKanbanOutPutDetialRequestDto input)
-        {
-            input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "BillNum", Logic = EnumFilterLogic.And, Value = input.BillNum });
-            var entities = await _wmsRepository.GetListByFilterAsync(GuidGenerator.Create(), input.Filters, input.Sorting, int.MaxValue,
-                 0, true);
-
-            IExporter _excel = new ExcelExporter();
-            byte[] result = null;
-
-            var _fileName = string.Format("红旗批量出库单_{0}.xlsx", Guid.NewGuid().ToString());
-            result = await _excel.ExportAsByteArray(entities);
-
-
-            result.ShouldNotBeNull();
-
-            //保存导出文件到服务器存成二进制
-            await _excelImportService.SaveBlobAsync(
-                     new SaveExcelImportInputDto
-                     {
-                         Name = _fileName,
-                         Content = result
-                     }
-                 );
-            return _fileName;
-
-
-
-        }
-
-
-    }
-}
\ No newline at end of file
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSHQHSharePartAppService.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSHQHSharePartAppService.cs
deleted file mode 100644
index 8bd8e1b6..00000000
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSHQHSharePartAppService.cs
+++ /dev/null
@@ -1,635 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.Extensions.Caching.Distributed;
-using AutoMapper;
-using System.Linq;
-using System.Text;
-using Volo.Abp.Guids;
-using Volo.Abp.Application.Services;
-using Volo.Abp.Caching;
-
-using Volo.Abp.ObjectMapping;
-using Win.Sfs.SettleAccount.ExcelImporter;
-using Win.Sfs.Shared.CacheBase;
-using Win.Utils;
-using Volo.Abp.Application.Dtos;
-using Win.Sfs.BaseData.ImportExcelCommon;
-using Volo.Abp.Domain.Repositories;
-using EFCore.BulkExtensions;
-using System.IO;
-using Microsoft.EntityFrameworkCore;
-using Win.Sfs.SettleAccount.Entities.SettleAccountVersion;
-using Win.Sfs.SettleAccount.FISes;
-using Win.Sfs.Shared.Enums.SettleAccount;
-using Win.Sfs.Shared.Filter;
-using Shouldly;
-using Magicodes.ExporterAndImporter.Csv;
-using Magicodes.ExporterAndImporter.Core;
-using Magicodes.ExporterAndImporter.Excel;
-using System.Data.Common;
-using Volo.Abp.Uow;
-using Volo.Abp;
-using Win.Abp.Snowflakes;
-using Win.Sfs.SettleAccount.CommonManagers;
-using Win.Sfs.SettleAccount.ExportReports;
-using Win.Sfs.SettleAccount.Constant;
-using Win.Sfs.SettleAccount.MaterialRelationships;
-using Win.Sfs.SettleAccount.Entities.TaskJobs;
-using Magicodes.ExporterAndImporter.Core.Models;
-
-using TaskJob.Services;
-using TaskJob.EventArgs;
-using Win.Sfs.SettleAccount.Entities.WMS;
-using Win.Sfs.SettleAccount.Entities.Wms;
-using Win.Sfs.SettleAccount.Repository;
-using WY.NewJit.Extends.PaiGe.WMS;
-using Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report;
-
-namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
-{
-    /// <summary>
-    /// 红旗M平台备件-出库
-    /// </summary>
-
-    //[AllowAnonymous]
-    [Authorize(SettleAccountPermissions.WMSHQ.Default)]
-    [Route("api/settleaccount/WmsHQHSharePartoutput")]
-    public class WmsHQHSharePartAppService :
-         SettleAccountApplicationBase<WmsHQHSharePartOutPutDetial>
-    {
-        private readonly ISettleAccountBranchEfCoreRepository<WmsHQHSharePartOutPutDetial, Guid> _wmsRepository;
-        private readonly ISettleAccountBranchEfCoreRepository<WmsHQHSharePartOutPut, Guid> _wmsVersionRepository;
-        private readonly WMSEfCoreRepository<WmsHQHSharePartOutPutDetial> _wmsefRespository;
-        private readonly WmsDapperRepository _wmsDapper;
-        private readonly WMSEfCoreRepository<TB_BILL> _wmstbRespository;
-        private readonly ISettleAccountBranchEfCoreRepository<TaskJob, Guid> _job;
-        private readonly IExcelImportAppService _excelImportService;
-
-        private readonly TaskJobService _service;
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="wmsRepository"></param>
-        /// <param name="job"></param>
-        /// <param name="wmsVersionRepository"></param>
-        /// <param name="wmsefRespository"></param>
-        /// <param name="wmstbRespository"></param>
-        public WmsHQHSharePartAppService(
-
-            ISettleAccountBranchEfCoreRepository<WmsHQHSharePartOutPutDetial, Guid> wmsRepository,
-            ISettleAccountBranchEfCoreRepository<TaskJob, Guid> job,
-            ISettleAccountBranchEfCoreRepository<WmsHQHSharePartOutPut, Guid> wmsVersionRepository,
-            WMSEfCoreRepository<WmsHQHSharePartOutPutDetial> wmsefRespository,
-            WMSEfCoreRepository<TB_BILL> wmstbRespository,
-            IExcelImportAppService excelImportService,
-             IDistributedCache<WmsHQHSharePartOutPutDetial> cache,
-             ISnowflakeIdGenerator snowflakeIdGenerator,
-           ICommonManager commonManager,
-            WmsDapperRepository wmsDapper
-        ) : base(cache, excelImportService, snowflakeIdGenerator, commonManager)
-        {
-            _excelImportService = excelImportService;
-            _job = job;
-            _wmstbRespository = wmstbRespository;
-            _wmsRepository = wmsRepository;
-            _wmsVersionRepository = wmsVersionRepository;
-            _wmsefRespository = wmsefRespository;
-            _wmsDapper = wmsDapper;
-        }
-
-        private async Task<long> GetCountAsync(WmsSharePartOutPutDetialRequestDto input)
-        {
-            return await _wmsRepository.GetCountByFilterAsync(GuidGenerator.Create(), input.Filters);
-        }
-
-        private async Task<long> GetCountAsync(WmsSharePartOutPutRequestDto input)
-        {
-            return await _wmsVersionRepository.GetCountByFilterAsync(GuidGenerator.Create(), input.Filters);
-        }
-
-        /// <summary>
-        /// 准时化出库主表
-        /// </summary>
-        /// <param name="input"></param>
-        /// <returns></returns>
-        [HttpPost]
-        [Route("WmsSharePartList")]
-        //[Authorize(SettleAccountPermissions.SettleAccounts.Default)]
-        virtual public async Task<PagedResultDto<WmsHQHSharePartOutPut>> GetListAsync(WmsSharePartOutPutRequestDto input)
-        {
-
-            var entities = await _wmsVersionRepository.GetListByFilterAsync(GuidGenerator.Create(), input.Filters, input.Sorting, input.MaxResultCount,
-                 input.SkipCount, true);
-
-            var totalCount = await GetCountAsync(input);
-
-
-            return new PagedResultDto<WmsHQHSharePartOutPut>(totalCount, entities);
-        }
-        /// <summary>
-        ///更新备注
-        /// </summary>
-        /// <param name="input"></param>
-        /// <returns></returns>
-        [HttpGet]
-        [Route("UpdateRemark")]
-
-        public async Task<bool> UpdateRemark(Guid id, string remark)
-        {
-            var entity = _wmsVersionRepository.FirstOrDefault(p => p.Id == id);
-            if (entity != null)
-            {
-                entity.Remark = remark;
-                await _wmsVersionRepository.UpdateAsync(entity);
-
-            }
-            return true;
-        }
-
-        /// <summary>
-        /// 准时化出库明细
-        /// </summary>
-        /// <param name="input"></param>
-        /// <returns></returns>
-        [HttpPost]
-        [Route("WmsSharePartDetailList")]
-        [UnitOfWork(false)]
-        //[Authorize(SettleAccountPermissions.SettleAccounts.Default)]
-        virtual public async Task<PagedResultDto<WmsHQHSharePartOutPutDetial>> GetListAsync(WmsSharePartOutPutDetialRequestDto input)
-        {
-            //不用传version 单号能保证唯一
-            input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "BillNum", Logic = EnumFilterLogic.And, Value = input.BillNum });
-            var entities = await _wmsRepository.GetListByFilterAsync(GuidGenerator.Create(), input.Filters, input.Sorting, input.MaxResultCount,
-                 input.SkipCount, true);
-            var totalCount = await GetCountAsync(input);
-            var stockList = _wmsDapper.GetSalesStock("BJ");
-           var query= from itm in entities
-            join itm1 in stockList on itm.MaterialCode equals itm1.SapCode
-into temp1
-            from tm1 in temp1.DefaultIfEmpty()
-            select new WmsHQHSharePartOutPutDetial(//少加个发货，由于零件有重复
-            itm.Id,
-            itm.WmsBillNum,
-            itm.OrderBillNum,
-            itm.MaterialCode,
-            itm.MaterialDesc,
-            itm.MaterialGroup,
-            itm.OutPut,
-            itm.InPut,
-            itm.State,
-            itm.Extend1,
-            itm.Extend2,
-            itm.Version,
-            itm.ParentMaterialCode,
-            itm.BillNum,
-            itm.TaskId,
-            itm.Remark,
-            itm.Qty,
-            tm1==null?0:tm1.Qty,
-            itm.OutPutQty
-            );
-
-
-
-
-            return new PagedResultDto<WmsHQHSharePartOutPutDetial>(totalCount, query.ToList());
-        }
-        /// <summary>
-        ///  任务明细标记已确认
-        /// </summary>
-        /// <param name="files">上传的文件(前端已经限制只能上传一个附件)</param>
-        /// <returns></returns>
-        [HttpPost]
-        [Route("WmsSharePartOutPutAudit")]
-        [DisableRequestSizeLimit]
-
-        public async Task<bool> WmsSharePartAudit(List<Guid> ids)
-        {
-            var _joblist = await _job.Where(p => ids.Contains(p.Id)).ToListAsync();
-            foreach (var itm in _joblist)
-            {
-                itm.FileName = "已确认";
-                await _job.UpdateAsync(itm);
-            }
-
-            return true;
-        }
-
-        /// <summary>
-        ///  任务明细标记已确认
-        /// </summary>
-        /// <param name="files">上传的文件(前端已经限制只能上传一个附件)</param>
-        /// <returns></returns>
-        [HttpPost]
-        [Route("WmsSharePartOutPutModify")]
-        [DisableRequestSizeLimit]
-
-        public async Task<bool> WmsSharePartUpdate(WmsHQHSharePartOutPutDetial detial)
-        {
-           var _entityList= _wmsRepository.Where(p => p.Id == detial.BranchId).ToList();
-            if (_entityList.Count() > 0)
-            {
-                foreach (var itm in _entityList)
-                {
-                    itm.OutPutQty = detial.OutPutQty;
-                   await _wmsRepository.UpdateAsync(itm);
-                }
-            }
-            return true;
-           
-        }
-
-
-
-
-
-        /// <summary>
-        /// 选择任务，生成出库单，只包含已确认的单据
-        /// </summary>
-        /// <param name="ids"></param>
-        /// <param name="version"></param>
-        /// <returns></returns>
-        [HttpPost]
-        [Route("WmsSharePartOutPut")]
-        public async Task<string> WmsSharePartOutPut(WmsJitRequestDto input)
-        {
-            var _billNum = "BHQH" + DateTime.Now.ToString("yyyyMMddhhmmss");
-            var _joblist = _job.Where(p => input.Guids.Contains(p.Id) && p.FileName == "已确认").ToList();
-            if (_joblist.Count() > 0)
-            {
-                var fileList = _joblist.Select(p => p.RealDownFileName).ToList();
-                List<WmsHQHSharePartOutPutDetial> _lst = new List<WmsHQHSharePartOutPutDetial>();
-                foreach (var filename in fileList)
-                {
-                    string fileSavePath = Environment.CurrentDirectory + @"\wwwroot\files\host\my-file-container\" + filename;
-                    ExcelHelper _excelHelper = new ExcelHelper(fileSavePath);
-                    var _list = _excelHelper.ExcelToList<WmsHQHSharePartOutPutDetial>();
-                    if (_list.Count() > 0)
-                    {
-                        var _lsAry = _list.Select(p => new
-                           WmsHQHSharePartOutPutDetial(
-                                  GuidGenerator.Create(),
-                                  "",
-                                  string.Empty,
-                                  p.MaterialCode,
-                                  p.MaterialDesc,
-                                  p.MaterialGroup,
-                                  string.Empty,
-                                  string.Empty,
-                                  0,
-                                  p.Extend1,
-                                  p.Extend2,
-                                  input.Version,
-                                   string.Empty,
-                                  _billNum,
-                                  GuidGenerator.Create(),
-                                  string.Empty,
-                                  p.Qty,
-                                  p.StockQty,
-                                  p.Qty
-                           ));
-                        _lst.AddRange(_lsAry.ToArray());
-                    }
-                }
-                var outPutDetail = await _wmsRepository.Where(p => p.Version == input.Version).ToListAsync();
-
-                var error = from itm1 in outPutDetail
-                            join itm2 in _lst on
-                            new { itm1.MaterialCode }
-                            equals
-                            new { itm2.MaterialCode }
-                            select itm1;
-                var errList = error.GroupBy(p => new { p.BillNum }).Select(p => new { BillNum = p.Key.BillNum, Number = p.Sum(itm => itm.Qty) });
-                if (errList.Count() == 0)
-                {
-                    foreach (var itm in _lst)
-                    {
-                        itm.BillNum = _billNum;
-                    }
-                    await _wmsRepository.GetDbContext().BulkInsertAsync(_lst, new BulkConfig() { BulkCopyTimeout = 0, BatchSize = 10000 });
-                    int _count = _wmsVersionRepository.Count(p => p.Version == input.Version && p.BillNum == _billNum);
-                    if (_count == 0)
-                    {
-                        var _version = new WmsHQHSharePartOutPut(GuidGenerator.Create(), input.Version, _billNum, CurrentUser.Email);
-                       _version.Remark= !string.IsNullOrEmpty(_joblist.FirstOrDefault().Remark) ? _joblist.FirstOrDefault().Remark : string.Empty;
-
-                        await _wmsVersionRepository.InsertAsync(_version, true);
-
-                    }
-                    foreach (var job in _joblist)
-                    {
-                        job.FileName = _billNum;
-                        await _job.UpdateAsync(job);
-                    }
-                }
-                else
-                {
-                    StringBuilder _buffer = new StringBuilder();
-                    foreach (var itm in errList)
-                    {
-                        _buffer.AppendFormat("出库单号:{0}重复记录数:{1}条", itm.BillNum, itm.Number);
-                    }
-                    var _errinfo = _buffer.ToString();
-
-                    foreach (var job in _joblist)
-                    {
-                        job.FileName = _errinfo;
-                        await _job.UpdateAsync(job);
-                    }
-                }
-
-
-
-
-               
-            }
-            //return _billNum;
-            //else
-            //{
-            //    StringBuilder _buffer = new StringBuilder();
-            //    foreach (var itm in errList)
-            //    {
-            //        _buffer.AppendFormat("出库单号:{0}重复记录数:{1}条", itm.BillNum, itm.Number);
-            //    }
-            //    var _errinfo = _buffer.ToString();
-            //    foreach (var job in _joblist)
-            //    {
-            //        job.FileName = _errinfo;
-            //        await _job.UpdateAsync(job);
-            //    }
-
-            //    //}
-            //}
-            //else
-            //{
-            //    _billNum = string.Empty;
-            //}
-            return ApplicationConsts.SuccessStr;
-        }
-        /// <summary>
-        /// 出库界面功能，核准出库功能
-        /// </summary>
-        /// <param name="version"></param>
-        /// <param name="p_list"></param>
-        /// <returns></returns>
-        [HttpPost]
-        [Route("WmsSharePartOutPut-Pass")]
-        [UnitOfWork(false)]
-        public async Task<bool> WmsSharePartOutPutPass(WmsJitRequestDto input)
-        {
-            if (DateTime.Now.ToString("yyyyMM") != input.AccountDate.ToString("yyyyMM"))
-            {
-                throw new BusinessException("8989", "填写过账日期应该为当月！");
-
-            }
-            if (input.Guids != null)
-            {
-                List<WmsHQHSharePartOutPutDetial> _ls = new List<WmsHQHSharePartOutPutDetial>();
-                if (input.Guids.Count() > 0)
-                {
-                    _ls = await _wmsRepository.Where(p => input.Guids.Contains(p.Id) && p.Version == input.Version && p.BillNum == input.BillNum && p.State != 2).ToListAsync();
-                }
-                else
-                {
-                    _ls = await _wmsRepository.Where(p => p.Version == input.Version && p.BillNum == input.BillNum && p.State != 2).ToListAsync();
-                }
-                if (_ls.Count() > 0)
-                {
-                    var sql = "DECLARE	@return_value int\n" +
-                         "EXEC	@return_value = [dbo].[p_wms_output]\n" +
-                         "		@billnum = N'{0}',\n" +
-                         "		@type = 4 ,\n" +
-                         "      @date = N'{1}'\n"+
-                         "SELECT	'Return Value' = @return_value";
-                    await _wmsRepository.GetDbContext().Database.ExecuteSqlRawAsync(
-                       string.Format(sql, input.BillNum,input.AccountDate.ToShortDateString()));
-                }
-            }
-            return true;
-        }
-        /// <summary>
-        /// 出库界面功能删除
-        /// </summary>
-        /// <param name="version"></param>
-        /// <param name="p_list"></param>
-        /// <returns></returns>
-        [HttpPost]
-        [Route("WmsOutPutDelete")]
-        [UnitOfWork(false)]
-        public async Task<bool> WmsOutPutDelete(WmsJitRequestDto input)
-        {
-            var count = _wmsRepository.Count(p => p.BillNum == input.BillNum && p.State != 0);
-
-            if (count > 0)
-            {
-                return false;
-            }
-            var sql = "DECLARE	@return_value int\n" +
-                      "EXEC	@return_value = [dbo].[p_wms_output_cancel_all]\n" +
-                      "		@billnum = N'{0}',\n" +
-                      "		@type = 4\n" +
-                      "SELECT	'Return Value' = @return_value";
-            await _wmsRepository.GetDbContext().Database.ExecuteSqlRawAsync(
-               string.Format(sql, input.BillNum)
-             );
-
-
-
-            return true;
-        }
-        /// <summary>
-        ///出库界面功能， 撤销核准出库
-        /// </summary>
-        /// <param name="ids"></param>
-        /// <param name="version"></param>
-        /// <returns></returns>
-        [HttpPost]
-        [Route("WmsSharePartOutPut-Cancel")]
-        [UnitOfWork(false)]
-        public async Task<bool> WmsSharePartOutPutCancel(WmsJitRequestDto input)
-        {
-            if (input.Guids != null && input.Guids.Count() > 0)
-            {
-                List<string> _ls = new List<string>();
-                foreach (var itm in input.Guids)
-                {
-                    _ls.Add(string.Format("{0}", itm));
-                }
-                string str = string.Join(",", _ls.ToArray());
-
-                var sql = "DECLARE	@return_value int\n" +
-                          "EXEC	@return_value = [dbo].[p_wms_output_cancel]\n" +
-                          "     @Guids ='{0}', \n" +
-                          "		@billnum = N'{1}',\n" +
-                          "		@type = 4,\n" +
-                          "     @accountdate = N'{2}'\n" +
-                          "SELECT	'Return Value' = @return_value";
-
-                sql = string.Format(sql, str, input.BillNum, input.AccountDate.ToShortDateString());
-
-                await _wmsRepository.GetDbContext().Database.ExecuteSqlRawAsync(
-                   sql
-                 );
-            }
-            return true;
-        }
-        [HttpPost]
-        [Route("ExcelImport")]
-        [DisableRequestSizeLimit]
-        //[Authorize(SettleAccountPermissions.SettleAccounts.Default)]
-        public async Task<string> ExcelImport([FromForm] IFormFileCollection files, string version)
-        {
-            var _billNum = "BHQH" + DateTime.Now.ToString("yyyyMMddhhmmss");
-            var checkList = new List<ErrorExportDto>();
-            ExportImporter _exportImporter = new ExportImporter();
-            var result = await _exportImporter.ExtendExcelOfSheetOneImport<WmsHQHSharePartOutPutDetial>(files, _excelImportService);
-
-            //检验1:导入模板中的第一页签数据不能为空
-            if (result == null || result.Count == 0)
-            {
-                checkList.Add(new ErrorExportDto(version, "红旗备件出库单导入", string.Empty, string.Empty, string.Empty, string.Empty, "导入模板中第一页签没有数据，请检查！", string.Empty));
-            }
-            if (checkList.Count > 0)
-            {
-                return await ExportErrorReportAsync(checkList);
-            }
-            //检验2:导入模板中的结算数据是否为0
-            foreach (var itm in result)
-            {
-                if (itm.Qty == 0)
-                {
-                    checkList.Add(new ErrorExportDto(version, "红旗备件出库单导入", string.Empty, string.Empty, string.Empty, string.Empty, string.Format("导入模板中SAP编码{0}结算数量为０，影响出库请检查！", itm.MaterialCode), string.Empty));
-                }
-            }
-
-            List<WmsHQHSharePartOutPutDetial> _lst = new List<WmsHQHSharePartOutPutDetial>();
-
-            var _lsCopy = new List<WmsHQHSharePartOutPutDetial>();
-            foreach (var itm in result)
-            {
-                WmsHQHSharePartOutPutDetial _detail = new WmsHQHSharePartOutPutDetial(
-                GuidGenerator.Create(),
-                string.Empty,
-                string.Empty,
-                itm.MaterialCode,
-                itm.MaterialDesc,
-                itm.MaterialGroup,
-                string.Empty,
-                string.Empty,
-                0,
-               !string.IsNullOrEmpty(itm.Extend1) ? itm.Extend1 : string.Empty,
-               !string.IsNullOrEmpty(itm.Extend2) ? itm.Extend2 : string.Empty,
-                version,
-                itm.MaterialCode,
-                itm.BillNum,
-                GuidGenerator.Create()
-                , string.Empty
-                , itm.Qty
-                ,0
-                ,itm.Qty
-                );
-                _lsCopy.Add(_detail);
-            }
-            _lst.AddRange(_lsCopy.ToArray());
-
-            //检验3:导入模板中的SAP编号不能重复，按其汇总出库
-            var _isRepeatOfReportList = _lst.GroupBy(x => new { x.MaterialCode, x.Version }).Select(p => new { Count = p.Count(), MaterialCode = p.Key.MaterialCode });
-            foreach (var itm in _isRepeatOfReportList)
-            {
-                if (itm.Count > 1)
-                {
-                    checkList.Add(new ErrorExportDto(version, "红旗备件出库单导入", string.Empty, string.Empty, string.Empty, string.Empty, string.Format("导入模板中的SAP编码{0}有重复！", itm.MaterialCode), string.Empty));
-                }
-            }
-            if (checkList.Count > 0)
-            {
-                return await ExportErrorReportAsync(checkList);
-            }
-
-            var outPutDetail = await _wmsRepository.Where(p => p.Version == version).ToListAsync();
-
-            var error = from itm1 in outPutDetail
-                        join itm2 in _lst on
-                        new { itm1.MaterialCode }
-                        equals
-                        new { itm2.MaterialCode }
-                        select itm1;
-            var errList = error.GroupBy(p => new { p.BillNum }).Select(p => new { BillNum = p.Key.BillNum, Number = p.Count() });
-
-           
-            foreach (var itm in errList)
-            {
-                checkList.Add(new ErrorExportDto() { Message = string.Format("出库单号:{0}重复记录数:{1}条", itm.BillNum, itm.Number) });
-            }
-            if (checkList.Count > 0)
-            {
-                return await ExportErrorReportAsync(checkList);
-            }
-            var query = from itm1 in _lst
-                        join itm2 in outPutDetail on
-                        new { itm1.MaterialCode}
-                        equals
-                        new { itm2.MaterialCode} into temp1
-                        from tm1 in temp1.DefaultIfEmpty()
-                        where tm1 == null
-                        select itm1;
-            var _wmslst = query.ToList();
-            foreach (var itm in _wmslst)
-            {
-                itm.BillNum = _billNum;
-            }
-            await _wmsRepository.GetDbContext().BulkInsertAsync(_wmslst, new BulkConfig() { BulkCopyTimeout = 0, BatchSize = 10000 });
-            int _count = _wmsVersionRepository.Count(p => p.Version == version && p.BillNum == _billNum);
-            if (_count == 0)
-            {
-                var _version = new WmsHQHSharePartOutPut(GuidGenerator.Create(), version, _billNum, CurrentUser.Email);
-                await _wmsVersionRepository.InsertAsync(_version, true);
-            }
-            return ApplicationConsts.SuccessStr;
-        }
-
-        /// <summary>
-        /// 导出
-        /// </summary>
-        /// <param name="input"></param>
-        /// <returns></returns>
-        [HttpPost]
-        [Route("Export")]
-        //[Authorize(SettleAccountPermissions.SettleAccounts.Default)]
-        virtual public async Task<string> ExportAsync(WmsKanbanOutPutDetialRequestDto input)
-        {
-            input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "BillNum", Logic = EnumFilterLogic.And, Value = input.BillNum });
-            var entities = await _wmsRepository.GetListByFilterAsync(GuidGenerator.Create(), input.Filters, input.Sorting, int.MaxValue,
-                 0, true);
-
-            IExporter _excel = new ExcelExporter();
-            byte[] result = null;
-
-            var _fileName = string.Format("H平台备件出库单_{0}.xlsx", Guid.NewGuid().ToString());
-            result = await _excel.ExportAsByteArray(entities);
-
-
-            result.ShouldNotBeNull();
-
-            //保存导出文件到服务器存成二进制
-            await _excelImportService.SaveBlobAsync(
-                     new SaveExcelImportInputDto
-                     {
-                         Name = _fileName,
-                         Content = result
-                     }
-                 );
-            return _fileName;
-
-
-
-        }
-
-
-    }
-
-}
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSJitAppService.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSJitAppService.cs
deleted file mode 100644
index 81c5750b..00000000
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSJitAppService.cs
+++ /dev/null
@@ -1,655 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.Extensions.Caching.Distributed;
-using AutoMapper;
-using System.Linq;
-using System.Text;
-using Volo.Abp.Guids;
-using Volo.Abp.Application.Services;
-using Volo.Abp.Caching;
-
-using Volo.Abp.ObjectMapping;
-using Win.Sfs.SettleAccount.ExcelImporter;
-using Win.Sfs.Shared.CacheBase;
-using Win.Utils;
-using Volo.Abp.Application.Dtos;
-using Win.Sfs.BaseData.ImportExcelCommon;
-using Volo.Abp.Domain.Repositories;
-using EFCore.BulkExtensions;
-using System.IO;
-using Microsoft.EntityFrameworkCore;
-using Win.Sfs.SettleAccount.Entities.SettleAccountVersion;
-using Win.Sfs.SettleAccount.FISes;
-using Win.Sfs.Shared.Enums.SettleAccount;
-using Win.Sfs.Shared.Filter;
-using Shouldly;
-using Magicodes.ExporterAndImporter.Csv;
-using Magicodes.ExporterAndImporter.Core;
-using Magicodes.ExporterAndImporter.Excel;
-using System.Data.Common;
-using Volo.Abp.Uow;
-using Volo.Abp;
-using Win.Abp.Snowflakes;
-using Win.Sfs.SettleAccount.CommonManagers;
-using Win.Sfs.SettleAccount.ExportReports;
-using Win.Sfs.SettleAccount.Constant;
-using Win.Sfs.SettleAccount.MaterialRelationships;
-using Win.Sfs.SettleAccount.Entities.TaskJobs;
-using Magicodes.ExporterAndImporter.Core.Models;
-
-using TaskJob.Services;
-using TaskJob.EventArgs;
-using Win.Sfs.SettleAccount.Entities.WMS;
-using Win.Sfs.SettleAccount.Entities.Wms;
-using Win.Sfs.SettleAccount.Repository;
-using WY.NewJit.Extends.PaiGe.WMS;
-using Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report;
-using SettleAccount.Job.Services;
-
-namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
-{
-    /// <summary>
-    /// wms出库
-    /// </summary>
-    //[Authorize(SettleAccountPermissions.WMSJIT.Default)]
-    [AllowAnonymous]
-    [Route("api/settleaccount/wmsjitoutput")]
-
-    public class WMSJitAppService :
-        SettleAccountApplicationBase<WmsJitOutPutDetial>
-    {
-        private readonly ISettleAccountBranchEfCoreRepository<WmsJitOutPutDetial, Guid> _wmsRepository;
-        private readonly ISettleAccountBranchEfCoreRepository<WmsJitOutPut, Guid> _wmsVersionRepository;
-        private readonly WMSEfCoreRepository<WmsJitOutPutDetial> _wmsefRespository;
-        private readonly WMSEfCoreRepository<TB_BILL> _wmstbRespository;
-        private readonly ISettleAccountBranchEfCoreRepository<TaskJob, Guid> _job;
-        private readonly IExcelImportAppService _excelImportService;
-        private readonly TaskJobService _service;
-        private readonly ErpPartDapperRepository _repository;
-
-
-
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="wmsRepository"></param>
-        /// <param name="job"></param>
-        /// <param name="wmsVersionRepository"></param>
-        /// <param name="wmsefRespository"></param>
-        /// <param name="wmstbRespository"></param>
-        public WMSJitAppService(
-            IExcelImportAppService excelImportService,
-            ISettleAccountBranchEfCoreRepository<WmsJitOutPutDetial, Guid> wmsRepository,
-            ISettleAccountBranchEfCoreRepository<TaskJob, Guid> job,
-            ISettleAccountBranchEfCoreRepository<WmsJitOutPut, Guid> wmsVersionRepository,
-            WMSEfCoreRepository<WmsJitOutPutDetial> wmsefRespository,
-            WMSEfCoreRepository<TB_BILL> wmstbRespository,
-            IDistributedCache<WmsJitOutPutDetial> cache,
-             ISnowflakeIdGenerator snowflakeIdGenerator,
-           ICommonManager commonManager,
-
-            ErpPartDapperRepository repository,
-            TaskJobService service
-
-        ) : base(cache, excelImportService, snowflakeIdGenerator, commonManager)
-        {
-            _job = job;
-            _wmstbRespository = wmstbRespository;
-            _wmsRepository = wmsRepository;
-            _wmsVersionRepository = wmsVersionRepository;
-            _wmsefRespository = wmsefRespository;
-            _excelImportService = excelImportService;
-            _repository = repository;
-            _service = service;
-        }
-
-
-        [HttpPost]
-        [Route("ExcelImport")]
-        [DisableRequestSizeLimit]
-        [Authorize(SettleAccountPermissions.WMSJIT.Create)]
-        public async Task<string> ExcelImport([FromForm] IFormFileCollection files, string version)
-        {
-            var _billNum = "T" + DateTime.Now.ToString("yyyyMMddhhmmss");
-            ExportImporter _exportImporter = new ExportImporter();
-            var result = await _exportImporter.ExtendExcelImport<WmsJitOutPutDetial>(files, _excelImportService);
-            List<WmsJitOutPutDetial> _lst = new List<WmsJitOutPutDetial>();
-            var _lsCopy = new List<WmsJitOutPutDetial>();
-            foreach (var itm in result)
-            {
-                WmsJitOutPutDetial _detail = new WmsJitOutPutDetial(
-                GuidGenerator.Create(),
-                itm.WmsBillNum,
-                itm.KennCode,
-                itm.ChassisNumber,
-                itm.MaterialCode,
-                itm.MaterialDesc,
-                itm.MaterialGroup,
-                string.Empty,
-                string.Empty,
-                0,
-               !string.IsNullOrEmpty(itm.Extend1) ? itm.Extend1 : string.Empty,
-               !string.IsNullOrEmpty(itm.Extend2) ? itm.Extend2 : string.Empty,
-                version,
-                itm.ParentMaterialCode,
-                itm.BillNum,
-                GuidGenerator.Create()
-                , string.Empty
-                , itm.Qty
-                ,itm.Price
-                ,itm.Amt
-                );
-                _lsCopy.Add(_detail);
-            }
-            _lst.AddRange(_lsCopy.ToArray());
-
-          
-
-
-
-
-            var _ls1 = _lst.Where(p => p.ParentMaterialCode == p.MaterialCode).ToList();
-            var outPutDetail = await _wmsRepository.Where(p => p.Version == version  && p.State!=4).Select(p=>new {MaterialCode=p.MaterialCode,KennCode=p.KennCode,ChassisNumber=p.ChassisNumber,BillNum=p.BillNum ,Qty=p.Qty})
-                .ToListAsync();
-
-
-            var error = from itm1 in outPutDetail
-                        join itm2 in _ls1 on
-                        new { itm1.MaterialCode, itm1.KennCode, itm1.ChassisNumber }
-                        equals
-                        new { itm2.MaterialCode, itm2.KennCode, itm2.ChassisNumber }
-                        select itm1;
-            var errList = error.GroupBy(p => new { p.BillNum }).Select(p => new { BillNum = p.Key.BillNum, Number = p.Sum(itm => itm.Qty) });
-
-            var checkList = new List<ErrorExportDto>();
-            foreach (var itm in errList)
-            {
-              checkList.Add( new ErrorExportDto() { Message = string.Format("出库单号:{0}重复记录数:{1}条", itm.BillNum, itm.Number) });
-            }
-           
-
-            if (checkList.Count > 0)
-            {
-               
-                return await ExportErrorReportAsync(checkList);
-            }
-
-
-
-            var query = from itm1 in _ls1
-                        join itm2 in outPutDetail on
-                        new { itm1.MaterialCode, itm1.KennCode, itm1.ChassisNumber }
-                        equals
-                        new { itm2.MaterialCode, itm2.KennCode, itm2.ChassisNumber } into temp1
-                        from tm1 in temp1.DefaultIfEmpty()
-                        where tm1 == null
-                        select itm1;
-            var _wmslst = query.ToList();
-            foreach (var itm in _wmslst)
-            {
-                itm.BillNum = _billNum;
-            }
-            await _wmsRepository.GetDbContext().BulkInsertAsync(_wmslst, new BulkConfig() { BulkCopyTimeout = 0, BatchSize = 10000 });
-            int _count = _wmsVersionRepository.Count(p => p.Version == version && p.BillNum == _billNum);
-            if (_count == 0 && _wmslst.Count()>0)
-            {
-                var _version = new WmsJitOutPut(GuidGenerator.Create(), version, _billNum, CurrentUser.Email,string.Empty);
-                await _wmsVersionRepository.InsertAsync(_version, true);
-            }
-            return ApplicationConsts.SuccessStr;
-        }
-
-
-
-
-
-
-
-
-        private async Task<long> GetCountAsync(WmsJitOutPutDetialRequestDto input)
-        {
-            input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "BillNum", Logic = EnumFilterLogic.And, Value = input.BillNum });
-            return await _wmsRepository.GetCountByFilterAsync(GuidGenerator.Create(), input.Filters);
-        }
-
-        private async Task<long> GetCountAsync(WmsJitOutPutRequestDto input)
-        {
-            return await _wmsVersionRepository.GetCountByFilterAsync(GuidGenerator.Create(), input.Filters);
-        }
-
-        /// <summary>
-        /// 准时化出库主表
-        /// </summary>
-        /// <param name="input"></param>
-        /// <returns></returns>
-        [HttpPost]
-        [Route("WmsJitList")]
-        //[Authorize(SettleAccountPermissions.SettleAccounts.Default)]
-        virtual public async Task<PagedResultDto<WmsJitOutPut>> GetListAsync(WmsJitOutPutRequestDto input)
-        {
-
-            var entities = await _wmsVersionRepository.GetListByFilterAsync(GuidGenerator.Create(), input.Filters, input.Sorting, input.MaxResultCount,
-                 input.SkipCount, true);
-
-            var totalCount = await GetCountAsync(input);
-            //var _ls = _repository.GetDic("WmsJitOutPut");
-            //foreach (var itm in entities)
-            //{
-            //    var _first = _ls.FirstOrDefault(p => p.BillNum == itm.BillNum);
-            //    if (_first != null)
-            //    {
-            //       itm.Extend = _first.OutputInfo;
-                
-            //    }
-            //}
-                
-
-            return new PagedResultDto<WmsJitOutPut>(totalCount, entities);
-        }
-
-
-
-        ///// <summary>
-        ///// 准时化出库明细
-        ///// </summary>
-        ///// <param name="input"></param>
-        ///// <returns></returns>
-        //[HttpPost]
-        //[Route("Export")]
-        ////[Authorize(SettleAccountPermissions.SettleAccounts.Default)]
-        //virtual public  async Task<string> ExportAsync(WmsJitOutPutDetialRequestDto input)
-        //{
-
-        //    input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "BillNum", Logic = EnumFilterLogic.And, Value = input.BillNum });
-        //    var entities = await _wmsRepository.GetListByFilterAsync(GuidGenerator.Create(), input.Filters, input.Sorting, input.MaxResultCount,
-        //         input.SkipCount, true);
-
-        //    IExporter _csv = new CsvExporter();
-        //    IExporter _excel = new ExcelExporter();
-        //    string _fileName = string.Empty;
-        //    //声明导出容器
-
-        //    byte[] result = null;
-           
-        //    _fileName = string.Format("准时化出库单_{0}.xlsx", Guid.NewGuid().ToString());
-        //    result = await _csv.ExportAsByteArray(entities);
-           
-        //    result.ShouldNotBeNull();
-
-        //    //保存导出文件到服务器存成二进制
-        //    await _excelImportService.SaveBlobAsync(
-        //             new SaveExcelImportInputDto
-        //             {
-        //                 Name = _fileName,
-        //                 Content = result
-        //             }
-        //         );
-        //    return _fileName;
-
-        //}
-
-
-
-
-
-
-
-
-
-
-
-
-        /// <summary>
-        /// 准时化出库明细
-        /// </summary>
-        /// <param name="input"></param>
-        /// <returns></returns>
-        [HttpPost]
-        [Route("WmsJitDetailList")]
-        //[Authorize(SettleAccountPermissions.SettleAccounts.Default)]
-        virtual public async Task<PagedResultDto<WmsJitOutPutDetial>> GetListAsync(WmsJitOutPutDetialRequestDto input)
-        {
-
-            input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "BillNum", Logic = EnumFilterLogic.And, Value = input.BillNum });
-            var entities = await _wmsRepository.GetListByFilterAsync(GuidGenerator.Create(), input.Filters, input.Sorting, input.MaxResultCount,
-                 input.SkipCount, true);
-
-            var totalCount = await GetCountAsync(input);
-            //var dtoDetails = ObjectMapper.Map<List<WmsJitOutPutDetial>, List<WmsJitOutPutDetialDto>>(entities);
-
-            return new PagedResultDto<WmsJitOutPutDetial>(totalCount, entities);
-        }
-        /// <summary>
-        ///  任务明细标记已确认
-        /// </summary>
-        /// <param name="files">上传的文件(前端已经限制只能上传一个附件)</param>
-        /// <returns></returns>
-        [HttpPost]
-        [Route("WmsJitOutPutAudit")]
-        [DisableRequestSizeLimit]
-
-        public async Task<bool> WmsJitAudit(List<Guid> ids)
-        {
-            var _joblist = await _job.Where(p => ids.Contains(p.Id)).ToListAsync();
-            foreach (var itm in _joblist)
-            {
-                itm.FileName = "已确认";
-                await _job.UpdateAsync(itm);
-            }
-
-            return true;
-        }
-
-        /// <summary>
-        ///  任务明细标记已确认
-        /// </summary>
-        /// <param name="files">上传的文件(前端已经限制只能上传一个附件)</param>
-        /// <returns></returns>
-        [HttpPost]
-        [Route("WmsJitOutPutCancel")]
-        [DisableRequestSizeLimit]
-        [UnitOfWork(false)]
-        public async Task<bool> WmsJitCancel(List<Guid> ids)
-        {
-            var _joblist = await _job.Where(p => ids.Contains(p.Id) && p.FileName == "已确认").ToListAsync();
-            foreach (var itm in _joblist)
-            {
-                itm.FileName = "取消确认";
-                await _job.UpdateAsync(itm);
-            }
-
-            return true;
-        }
-
-        /// <summary>
-        ///更新备注
-        /// </summary>
-        /// <param name="input"></param>
-        /// <returns></returns>
-        [HttpGet]
-        [Route("UpdateRemark")]
-
-        public async Task<bool> UpdateRemark(Guid id, string remark)
-        {
-            var entity = _wmsVersionRepository.FirstOrDefault(p => p.Id == id);
-            if (entity != null)
-            {
-                entity.Remark = remark;
-                await _wmsVersionRepository.UpdateAsync(entity);
-
-            }
-            return true;
-        }
-
-
-        /// <summary>
-        /// 选择任务，生成出库单，只包含已确认的单据
-        /// </summary>
-        /// <param name="ids"></param>
-        /// <param name="version"></param>
-        /// <returns></returns>
-        [HttpPost]
-        [Route("WmsJitOutPut")]
-        public async Task<string> WmsJitOutPut(WmsJitRequestDto input)
-        {
-            var _billNum = "T" + DateTime.Now.ToString("yyyyMMddhhmmss");
-            var _joblist = _job.Where(p => input.Guids.Contains(p.Id) && p.FileName == "已确认").ToList();
-            if (_joblist.Count() > 0)
-            {
-                var fileList = _joblist.Select(p => p.RealDownFileName).ToList();
-                List<WmsJitOutPutDetial> _lst = new List<WmsJitOutPutDetial>();
-                foreach (var filename in fileList)
-                {
-                    string fileSavePath = Environment.CurrentDirectory + @"\wwwroot\files\host\my-file-container\" + filename;
-                    ExcelHelper _excelHelper = new ExcelHelper(fileSavePath);
-                    var _list = _excelHelper.ExcelToList<WmsJitOutPutDetial>();
-                    var _lsCopy = new List<WmsJitOutPutDetial>();
-                    foreach (var itm in _list)
-                    {
-                        WmsJitOutPutDetial _detail = new WmsJitOutPutDetial(
-                        GuidGenerator.Create(),
-                        itm.WmsBillNum,
-                        itm.KennCode,
-                        itm.ChassisNumber,
-                        itm.MaterialCode,
-                        itm.MaterialDesc,
-                        itm.MaterialGroup,
-                        string.Empty,
-                        string.Empty,
-                        0,
-                        itm.Extend1,
-                        itm.Extend2,
-                        input.Version,
-                        itm.ParentMaterialCode,
-                        itm.BillNum,
-                        GuidGenerator.Create()
-                        ,string.Empty
-                        ,itm.Qty
-                        ,itm.Price
-                        ,Math.Round(itm.Qty*itm.Price,2)
-                       
-                        );
-                        _lsCopy.Add(_detail);
-                    }
-                    _lst.AddRange(_lsCopy.ToArray());
-                }
-                var _ls1 = _lst.Where(p => p.ParentMaterialCode == p.MaterialCode).ToList();
-                var outPutDetail = await _wmsRepository.Where(p => p.Version == input.Version && p.State != 4 ).Select(p => new { MaterialCode = p.MaterialCode, KennCode = p.KennCode, ChassisNumber = p.ChassisNumber, BillNum = p.BillNum, Qty = p.Qty })
-                    .ToListAsync();
-
-                var error = from itm1 in outPutDetail
-                            join itm2 in _ls1 on
-                            new { itm1.MaterialCode, itm1.KennCode, itm1.ChassisNumber }
-                            equals
-                            new { itm2.MaterialCode, itm2.KennCode, itm2.ChassisNumber } 
-                            select itm1;
-               var errList=  error.GroupBy(p => new { p.BillNum }).Select(p => new {BillNum=p.Key.BillNum,Number=p.Sum(itm=>itm.Qty)   });
-                if (errList.Count() == 0)
-                {
-                    var query = from itm1 in _ls1
-                                join itm2 in outPutDetail on
-                                new { itm1.MaterialCode, itm1.KennCode, itm1.ChassisNumber }
-                                equals
-                                new { itm2.MaterialCode, itm2.KennCode, itm2.ChassisNumber } into temp1
-                                from tm1 in temp1.DefaultIfEmpty()
-                                where tm1 == null
-                                select itm1;
-                    var _wmslst = query.ToList();
-                    foreach (var itm in _wmslst)
-                    {
-                        itm.BillNum = _billNum;
-                    }
-                    await _wmsRepository.GetDbContext().BulkInsertAsync(_wmslst, new BulkConfig() { BulkCopyTimeout = 0, BatchSize = 10000 });
-                    int _count = _wmsVersionRepository.Count(p => p.Version == input.Version && p.BillNum == _billNum);
-                    if (_count == 0 && _wmslst.Count()>0)
-                    {
-                        var _version = new WmsJitOutPut(GuidGenerator.Create(), input.Version, _billNum, CurrentUser.Email,string.Empty);
-                        _version.Remark = !string.IsNullOrEmpty(_joblist.FirstOrDefault().Remark) ? _joblist.FirstOrDefault().Remark : string.Empty;
-                        //var _ls = new List<WmsJitOutPut>();
-                        //_ls.Add(_version);
-                        await _wmsVersionRepository.InsertAsync(_version, true);
-                    }
-                    foreach (var job in _joblist)
-                    {
-                        job.FileName = _billNum;
-                        await _job.UpdateAsync(job);
-                    }
-                }
-                else
-                {
-                    StringBuilder _buffer = new StringBuilder();
-                    foreach (var itm in errList)
-                    {
-                        _buffer.AppendFormat("出库单号:{0}重复记录数:{1}条", itm.BillNum, itm.Number);       
-                    }
-                    var _errinfo= _buffer.ToString();
-
-                    foreach (var job in _joblist)
-                    {
-                        job.FileName =_errinfo;
-                        await _job.UpdateAsync(job);
-                    }
-                }
-            }
-            else
-            {
-                _billNum = string.Empty;
-            }
-            return ApplicationConsts.SuccessStr;
-        }
-        /// <summary>
-        /// 出库界面功能，核准出库功能
-        /// </summary>
-        /// <param name="version"></param>
-        /// <param name="p_list"></param>
-        /// <returns></returns>
-        [HttpPost]
-        [Route("WmsJitOutPut-Pass")]
-        [UnitOfWork(false)]
-
-        public async Task<bool> WmsJitOutPutPass(WmsJitRequestDto input)
-        {
-            List<CustomCondition> customConditionList = new List<CustomCondition>();
-            customConditionList.Add(new CustomCondition() { Name = "BillNum", Value = input.BillNum ?? string.Empty });
-            customConditionList.Add(new CustomCondition() { Name = "Date", Value = input.AccountDate.ToString() });
-            var _taskid = await _service.ExportEnqueueAsync("准时化出库服务"+input.BillNum, ExportExtentsion.Excel, input.Version, string.Empty, CurrentUser, typeof(FisOutputService), customConditionList, (rs) =>
-            {
-
-            });
-            //var sql =     "DECLARE	@return_value int\n" +
-            //              "EXEC	@return_value = [dbo].[p_wms_output]\n" +
-            //              "		@billnum = N'{0}',\n" +
-            //              "		@type = 0,\n" +
-            //              "     @date = N'{1}'\n"+
-            //              "SELECT	'Return Value' = @return_value";
-            //    await _wmsRepository.GetDbContext().Database.ExecuteSqlRawAsync(
-            //       string.Format(sql,input.BillNum,input.AccountDate.ToShortDateString())
-            //     );
-
-
-
-
-            return true;
-        }
-
-        /// <summary>
-        /// 出库界面功能删除
-        /// </summary>
-        /// <param name="version"></param>
-        /// <param name="p_list"></param>
-        /// <returns></returns>
-        [HttpPost]
-        [Route("WmsOutPutDelete")]
-        [UnitOfWork(false)]
-        public async Task<bool> WmsOutPutDelete(WmsJitRequestDto input)
-        {
-            var count = _wmsRepository.Count(p => p.BillNum == input.BillNum && p.State != 0);
-
-            if (count > 0)
-            {
-                return false;
-            }
-            var sql = "DECLARE	@return_value int\n" +
-                      "EXEC	@return_value = [dbo].[p_wms_output_cancel_all]\n" +
-                      "		@billnum = N'{0}',\n" +
-                      "		@type =0\n" +
-                      "SELECT	'Return Value' = @return_value";
-            await _wmsRepository.GetDbContext().Database.ExecuteSqlRawAsync(
-               string.Format(sql, input.BillNum)
-             );
-
-
-
-            return true;
-        }
-
-        /// <summary>
-        ///出库界面功能， 撤销核准出库
-        /// </summary>
-        /// <param name="ids"></param>
-        /// <param name="version"></param>
-        /// <returns></returns>
-        [HttpPost]
-        [Route("WmsJitOutPut-Cancel")]
-        [UnitOfWork(false)]
-        [Authorize(SettleAccountPermissions.WMSJIT.Delete)]
-        public async Task<bool> WmsJitOutPutCancel(WmsJitRequestDto input)
-        {
-
-
-            if (input.Guids != null && input.Guids.Count() > 0)
-            {
-                List<string> _ls = new List<string>();
-                foreach (var itm in input.Guids)
-                {
-                    _ls.Add(string.Format("{0}",itm));
-                }
-
-               string str= string.Join(",",_ls.ToArray());
-
-               var sql = "DECLARE	@return_value int\n" +
-                          "EXEC	@return_value = [dbo].[p_wms_output_cancel]\n" +
-                          "     @Guids ='{0}', \n" +
-                          "		@billnum = N'{1}',\n" +
-                          "		@type = 0,\n" +
-                          "     @accountdate = N'{2}'\n" +
-                          "SELECT	'Return Value' = @return_value";
-
-                sql= string.Format(sql, str, input.BillNum, input.AccountDate.ToShortDateString());
-
-                await _wmsRepository.GetDbContext().Database.ExecuteSqlRawAsync(
-                   sql
-                 );
-
-            } 
-              
-            return true;
-        }
-
-
-        /// <summary>
-        /// 导出
-        /// </summary>
-        /// <param name="input"></param>
-        /// <returns></returns>
-        [HttpPost]
-        [Route("Export")]
-        //[Authorize(SettleAccountPermissions.SettleAccounts.Default)]
-        virtual public async Task<string> ExportAsync(WmsKanbanOutPutDetialRequestDto input)
-        {
-            input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "BillNum", Logic = EnumFilterLogic.And, Value = input.BillNum });
-            var entities = await _wmsRepository.GetListByFilterAsync(GuidGenerator.Create(), input.Filters, input.Sorting, int.MaxValue,
-                 0, true);
-            var dtos = ObjectMapper.Map<List<WmsJitOutPutDetial>, List<WmsJitOutPutDetialDto>>(entities);
-
-
-            IExporter _excel = new ExcelExporter();
-            byte[] result = null;
-
-            var _fileName = string.Format("准时化出库单_{0}.xlsx", Guid.NewGuid().ToString());
-            result = await _excel.ExportAsByteArray(dtos);
-
-
-            result.ShouldNotBeNull();
-
-            //保存导出文件到服务器存成二进制
-            await _excelImportService.SaveBlobAsync(
-                     new SaveExcelImportInputDto
-                     {
-                         Name = _fileName,
-                         Content = result
-                     }
-                 );
-            return _fileName;
-
-
-
-        }
-
-
-    }
-}
\ No newline at end of file
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSKanbanAppService.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSKanbanAppService.cs
deleted file mode 100644
index 03d56af2..00000000
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSKanbanAppService.cs
+++ /dev/null
@@ -1,951 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.Extensions.Caching.Distributed;
-using AutoMapper;
-using System.Linq;
-using System.Text;
-using Volo.Abp.Guids;
-using Volo.Abp.Application.Services;
-using Volo.Abp.Caching;
-
-using Volo.Abp.ObjectMapping;
-using Win.Sfs.SettleAccount.ExcelImporter;
-using Win.Sfs.Shared.CacheBase;
-using Win.Utils;
-using Volo.Abp.Application.Dtos;
-using Win.Sfs.BaseData.ImportExcelCommon;
-using Volo.Abp.Domain.Repositories;
-using EFCore.BulkExtensions;
-using System.IO;
-using Microsoft.EntityFrameworkCore;
-using Win.Sfs.SettleAccount.Entities.SettleAccountVersion;
-using Win.Sfs.SettleAccount.FISes;
-using Win.Sfs.Shared.Enums.SettleAccount;
-using Win.Sfs.Shared.Filter;
-using Shouldly;
-using Magicodes.ExporterAndImporter.Csv;
-using Magicodes.ExporterAndImporter.Core;
-using Magicodes.ExporterAndImporter.Excel;
-using System.Data.Common;
-using Volo.Abp.Uow;
-using Volo.Abp;
-using Win.Abp.Snowflakes;
-using Win.Sfs.SettleAccount.CommonManagers;
-using Win.Sfs.SettleAccount.ExportReports;
-using Win.Sfs.SettleAccount.Constant;
-using Win.Sfs.SettleAccount.MaterialRelationships;
-using Win.Sfs.SettleAccount.Entities.TaskJobs;
-using Magicodes.ExporterAndImporter.Core.Models;
-
-using TaskJob.Services;
-using TaskJob.EventArgs;
-using Win.Sfs.SettleAccount.Entities.WMS;
-using Win.Sfs.SettleAccount.Entities.Wms;
-using Win.Sfs.SettleAccount.Repository;
-using WY.NewJit.Extends.PaiGe.WMS;
-using Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report;
-
-namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
-{
-    /// <summary>
-    /// 大众看板-出库
-    /// </summary>
-
-
-    [Route("api/settleaccount/wmskanbanoutput")]
-    [Authorize(SettleAccountPermissions.WMSJIT.Default)]
-    public class WMSKanbanAppService :
-        SettleAccountApplicationBase<WmsKanbanOutPutDetial>
-    {
-  
-        private readonly ISettleAccountBranchEfCoreRepository<WmsKanbanOutPutDetial, Guid> _wmsRepository;
-        private readonly ISettleAccountBranchEfCoreRepository<WmsKanbanOutPut, Guid> _wmsVersionRepository;
-
-        private readonly ISettleAccountBranchEfCoreRepository<WmsWithOutKanbanOutPutDetial, Guid> _wmsRepository1;
-        private readonly ISettleAccountBranchEfCoreRepository<WmsWithOutKanbanOutPut, Guid> _wmsVersionRepository1;
-
-        private readonly KanbanUnSettledDapperRepository _dapper;
-        private readonly WMSEfCoreRepository<WmsKanbanOutPutDetial> _wmsefRespository;
-
-        private readonly WMSEfCoreRepository<TB_BILL> _wmstbRespository;
-        private readonly ISettleAccountBranchEfCoreRepository<TaskJob, Guid> _job;
-        private readonly IExcelImportAppService _excelImportService;
-
-
-        private readonly TaskJobService _service;
-        private readonly WmsDapperRepository _wmsDapper;
-
-       // private readonly ErpPartDapperRepository _erpdapperRepository;
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="wmsRepository"></param>
-        /// <param name="job"></param>
-        /// <param name="wmsVersionRepository"></param>
-        /// <param name="wmsefRespository"></param>
-        /// <param name="wmstbRespository"></param>
-        public WMSKanbanAppService(
-
-
-            IExcelImportAppService excelImportService,
-
-            ISettleAccountBranchEfCoreRepository<WmsKanbanOutPutDetial, Guid> wmsRepository,
-            ISettleAccountBranchEfCoreRepository<TaskJob, Guid> job,
-            ISettleAccountBranchEfCoreRepository<WmsKanbanOutPut, Guid> wmsVersionRepository,
-            WMSEfCoreRepository<WmsKanbanOutPutDetial> wmsefRespository,
-            KanbanUnSettledDapperRepository dapper,
-            WMSEfCoreRepository<TB_BILL> wmstbRespository,
-             IDistributedCache<WmsKanbanOutPutDetial> cache,
-             ISnowflakeIdGenerator snowflakeIdGenerator,
-              // ErpPartDapperRepository erpdapperRepository,
-           ICommonManager commonManager,
-           WmsDapperRepository wmsDapper
-        ) : base(cache, excelImportService, snowflakeIdGenerator, commonManager)
-        {
-            _job = job;
-            _wmstbRespository = wmstbRespository;
-            _wmsRepository = wmsRepository;
-            _wmsVersionRepository = wmsVersionRepository;
-            _wmsefRespository = wmsefRespository;
-            _excelImportService = excelImportService;
-            _dapper = dapper;
-           // _erpdapperRepository = erpdapperRepository;
-            _wmsDapper = wmsDapper;
-        }
-
-        private async Task<long> GetCountAsync(WmsKanbanOutPutDetialRequestDto input)
-        {
-            input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "BillNum", Logic = EnumFilterLogic.And, Value = input.BillNum });
-            return await _wmsRepository.GetCountByFilterAsync(GuidGenerator.Create(), input.Filters);
-        }
-
-        private async Task<long> GetCountAsync(WmsKanbanOutPutRequestDto input)
-        {
-            return await _wmsVersionRepository.GetCountByFilterAsync(GuidGenerator.Create(), input.Filters);
-        }
-
-       /// <summary>
-       /// 准时化出库主表
-       /// </summary>
-       /// <param name="input"></param>
-       /// <returns></returns>
-        [HttpPost]
-        [Route("WmsKanbanList")]
-        //[Authorize(SettleAccountPermissions.SettleAccounts.Default)]
-        virtual public async Task<PagedResultDto<WmsKanbanOutPut>> GetListAsync( WmsKanbanOutPutRequestDto input)
-        {
-            //input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "BillNum", Logic = EnumFilterLogic.And, Value = input.BillNum });
-            var entities = await _wmsVersionRepository.GetListByFilterAsync(GuidGenerator.Create(), input.Filters, input.Sorting, input.MaxResultCount,
-                 input.SkipCount, true);
-            var totalCount = await GetCountAsync(input);
-            return new PagedResultDto<WmsKanbanOutPut>(totalCount, entities);
-        }
-
-        /// <summary>
-        /// 准时化出库明细
-        /// </summary>
-        /// <param name="input"></param>
-        /// <returns></returns>
-        [HttpPost]
-        [Route("WmsKanbanDetailList")]
-        //[Authorize(SettleAccountPermissions.SettleAccounts.Default)]
-        virtual public async Task<PagedResultDto<WmsKanbanOutPutDetial>> GetListAsync(WmsKanbanOutPutDetialRequestDto input)
-        {
-            input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "BillNum", Logic = EnumFilterLogic.And, Value = input.BillNum });
-            var entities = await _wmsRepository.GetListByFilterAsync(GuidGenerator.Create(), input.Filters, input.Sorting, input.MaxResultCount,
-                 input.SkipCount, true);
-
-            var totalCount = await GetCountAsync(input);
-            return new PagedResultDto<WmsKanbanOutPutDetial>(totalCount, entities);
-        }
-        /// <summary>
-        ///  任务明细标记已确认
-        /// </summary>
-        /// <param name="files">上传的文件(前端已经限制只能上传一个附件)</param>
-        /// <returns></returns>
-        [HttpPost]
-        [Route("WmsKanbanOutPutAudit")]
-        [DisableRequestSizeLimit]
-
-        public async Task<bool> WmsKanbanAudit(List<Guid> ids)
-        {
-            var _joblist =await _job.Where(p => ids.Contains(p.Id)).ToListAsync();
-            foreach (var itm in _joblist)
-            {
-                itm.FileName = "已确认";
-                await _job.UpdateAsync(itm);
-            }
-            
-            return true;
-        }
-
-        ///// <summary>
-        ///// 选择任务，生成出库单，只包含已确认的单据
-        ///// </summary>
-        ///// <param name="ids"></param>
-        ///// <param name="version"></param>
-        ///// <returns></returns>
-        //[HttpPost]
-        //[Route("WmsWithOutKanbanOutPut")]
-        //public async Task<string> WmsWithOutKanbanOutPut(WmsJitRequestDto input)
-        //{
-
-        //    var _billNum = "KA" + DateTime.Now.ToString("yyyyMMddhhmmss");
-
-        //    var _joblist = _job.Where(p => input.Guids.Contains(p.Id) && p.FileName == "已确认").ToList();
-        //    if (_joblist.Count() > 0)
-        //    {
-        //        var fileList = _joblist.Select(p => p.RealDownFileName).ToList();
-        //        List<WmsWithOutKanbanOutPutDetial> _lst = new List<WmsWithOutKanbanOutPutDetial>();
-        //        foreach (var filename in fileList)
-        //        {
-        //            string fileSavePath = Environment.CurrentDirectory + @"\wwwroot\files\host\my-file-container\" + filename;
-        //            ExcelHelper _excelHelper = new ExcelHelper(fileSavePath);
-        //            var _list = _excelHelper.ExcelToList<SettleKBWithOutCode>();
-        //            foreach (var itm in _list)
-        //            {
-        //              var _entity=  new WmsWithOutKanbanOutPutDetial(
-        //                  GuidGenerator.Create(),
-        //                  string.Empty, 
-        //                  string.Empty,
-        //                  itm.MaterialCode,
-        //                  itm.MaterialDesc, 
-        //                  itm.SapMaterialGroup, 
-        //                  string.Empty, 
-        //                  string.Empty, 
-        //                  0, 
-        //                  string.Empty, 
-        //                  string.Empty, 
-        //                  input.Version, 
-        //                  itm.SapMaterialCode,
-        //                  _billNum,
-        //                  Guid.Empty, 
-        //                  string.Empty, 
-        //                  itm.InvoiceQty
-        //                    );
-        //                _lst.Add(_entity);
-        //            } 
-        //        }
-            
-        //        var outPutDetail = await _wmsRepository1.Where(p => p.Version == input.Version && p.Kanban==string.Empty).ToListAsync();
-
-        //        var error = from itm1 in outPutDetail
-        //                    join itm2 in _lst on
-        //                    new { itm1.MaterialCode }
-        //                    equals
-        //                    new { itm2.MaterialCode }
-        //                    select itm1;
-        //        var errList = error.GroupBy(p => new { p.BillNum }).Select(p => new { BillNum = p.Key.BillNum, Number = p.Sum(itm => itm.Qty) });
-        //        if (errList.Count() == 0)
-        //        {
-
-        //            var query = from itm1 in _lst
-        //                        join itm2 in outPutDetail on
-        //                        new { itm1.MaterialCode}
-        //                        equals
-        //                        new { itm2.MaterialCode } into temp1
-        //                        from tm1 in temp1.DefaultIfEmpty()
-        //                        where tm1 == null
-        //                        select itm1;
-        //            var _wmslst = query.ToList();
-        //            foreach (var itm in _lst)
-        //            {
-        //                itm.BillNum = _billNum;
-        //            }
-        //            await _wmsRepository1.GetDbContext().BulkInsertAsync(_lst, new BulkConfig() { BulkCopyTimeout = 0, BatchSize = 10000 });
-        //            int _count = _wmsVersionRepository1.Count(p => p.Version == input.Version && p.BillNum == _billNum);
-        //            if (_count == 0)
-        //            {
-        //                var _version = new WmsWithOutKanbanOutPut(GuidGenerator.Create(), input.Version, _billNum, CurrentUser.Email);
-
-        //                await _wmsVersionRepository1.InsertAsync(_version, true);
-        //            }
-
-        //            foreach (var job in _joblist)
-        //            {
-        //                job.FileName = _billNum;
-        //                await _job.UpdateAsync(job);
-        //            }
-        //        }
-        //        else
-        //        {
-        //            StringBuilder _buffer = new StringBuilder();
-        //            foreach (var itm in errList)
-        //            {
-        //                _buffer.AppendFormat("出库单号:{0}重复记录数:{1}条", itm.BillNum, itm.Number);
-        //            }
-        //            var _errinfo = _buffer.ToString();
-
-        //            foreach (var job in _joblist)
-        //            {
-        //                job.FileName = _errinfo;
-        //                await _job.UpdateAsync(job);
-        //            }
-        //        }
-        //    }
-        //    else
-        //    {
-        //        _billNum = string.Empty;
-        //    }
-        //    return ApplicationConsts.SuccessStr; ;
-        //}
-
-
-        /// <summary>
-        /// 选择任务，生成出库单，只包含已确认的单据
-        /// </summary>
-        /// <param name="ids"></param>
-        /// <param name="version"></param>
-        /// <returns></returns>
-        [HttpPost]
-        [Route("WmsKanbanOutPut")]
-        public async Task<string> WmsKanbanOutPut(WmsJitRequestDto input)
-        {
-            var _billNum = "K" + DateTime.Now.ToString("yyyyMMddhhmmss");
-
-            var _joblist = _job.Where(p => input.Guids.Contains(p.Id) && p.FileName == "已确认").ToList();
-            if (_joblist.Count() > 0)
-            {
-                var fileList = _joblist.Select(p => p.RealDownFileName).ToList();
-                List<WmsKanbanOutPutDetial> _lst = new List<WmsKanbanOutPutDetial>();
-                foreach (var filename in fileList)
-                {
-                    string fileSavePath = Environment.CurrentDirectory + @"\wwwroot\files\host\my-file-container\" + filename;
-                    ExcelHelper _excelHelper = new ExcelHelper(fileSavePath);
-                    var _list = _excelHelper.ExcelToList<WmsKanbanOutPutDetial>();
-                    foreach (var itm in _list)
-                    {
-                        itm.SetData(GuidGenerator.Create(),string.Empty,!string.IsNullOrEmpty(itm.WmsBillNum)? itm.WmsBillNum:string.Empty,input.Version,GuidGenerator.Create());
-                    }
-                    _lst.AddRange(_list.ToArray());
-                }
-              //  var _ls1 = _lst.Where(p => p.ParentMaterialCode == p.MaterialCode).ToList();
-                var outPutDetail = await _wmsRepository.Where(p => p.Version == input.Version && p.State!=4).ToListAsync();
-
-                var error = from itm1 in outPutDetail
-                            join itm2 in _lst on
-                            new { itm1.MaterialCode, itm1.Kanban}
-                            equals
-                            new { itm2.MaterialCode, itm2.Kanban }
-                            select itm1;
-                var errList = error.GroupBy(p => new { p.BillNum }).Select(p => new { BillNum = p.Key.BillNum, Number = p.Sum(itm => itm.Qty) });
-                if (errList.Count() == 0)
-                {
-
-                    var query = from itm1 in _lst
-                                join itm2 in outPutDetail on
-                                new { itm1.MaterialCode, itm1.Kanban }
-                                equals
-                                new { itm2.MaterialCode, itm2.Kanban } into temp1
-                                from tm1 in temp1.DefaultIfEmpty()
-                                where tm1 == null
-                                select itm1;
-                    var _wmslst = query.ToList();
-                    foreach (var itm in _wmslst)
-                    {
-                        itm.BillNum = _billNum;
-                        itm.WmsBillNum = !string.IsNullOrEmpty(itm.WmsBillNum) ? itm.WmsBillNum : "PF";
-                       
-                    }
-                    await _wmsRepository.GetDbContext().BulkInsertAsync(_wmslst, new BulkConfig() { BulkCopyTimeout = 0, BatchSize = 10000 });
-                    int _count = _wmsVersionRepository.Count(p => p.Version == input.Version && p.BillNum == _billNum);
-                    if (_count == 0  && _wmslst.Count()>0)
-                    {
-                        var _version = new WmsKanbanOutPut(GuidGenerator.Create(), input.Version, _billNum, CurrentUser.Email,string.Empty);
-                        _version.Remark = !string.IsNullOrEmpty(_joblist.FirstOrDefault().Remark)  ? _joblist.FirstOrDefault().Remark : string.Empty;
-                        await _wmsVersionRepository.InsertAsync(_version, true);
-                    }
-
-                    foreach (var job in _joblist)
-                    {
-                        job.FileName = _billNum;
-                        await _job.UpdateAsync(job);
-                    }
-                }
-                else
-                {
-                    StringBuilder _buffer = new StringBuilder();
-                    foreach (var itm in errList)
-                    {
-                        _buffer.AppendFormat("出库单号:{0}重复记录数:{1}条", itm.BillNum, itm.Number);
-                    }
-                    var _errinfo = _buffer.ToString();
-
-                    foreach (var job in _joblist)
-                    {
-                        job.FileName = _errinfo;
-                        await _job.UpdateAsync(job);
-                    }
-                }
-            }
-            else
-            {
-                _billNum = string.Empty;
-            }
-               return ApplicationConsts.SuccessStr; ;
-        }
-        /// <summary>
-        /// 出库界面功能，核准出库功能
-        /// </summary>
-        /// <param name="version"></param>
-        /// <param name="p_list"></param>
-        /// <returns></returns>
-        [HttpPost]
-        [Route("WmsKanbanOutPut-Pass")]
-        [UnitOfWork(false)]
-        public async Task<bool> WmsKanbanOutPutPass(WmsJitRequestDto input)
-        {
-            //if (DateTime.Now.ToString("yyyyMM") != input.AccountDate.ToString("yyyyMM"))
-            //{
-            //    throw new BusinessException("8989", "填写过账日期应该为当月！");
-
-            //}
-            if (input.Guids != null)
-            {
-                List<WmsKanbanOutPutDetial> _ls = new List<WmsKanbanOutPutDetial>();
-                if (input.Guids.Count() > 0)
-                {
-                    _ls = await _wmsRepository.Where(p => input.Guids.Contains(p.Id) && p.Version == input.Version && p.BillNum == input.BillNum && p.State != 2 && p.State != 4).ToListAsync();
-                }
-                else
-                {
-                    _ls = await _wmsRepository.Where(p =>  p.Version == input.Version && p.BillNum == input.BillNum && p.State != 2 && p.State!=4).ToListAsync();
-                }
-                if (_ls.Count() > 0)
-                {
-                    var sql = "DECLARE	@return_value int\n" +
-                         "EXEC	@return_value = [dbo].[p_wms_output]\n" +
-                         "		@billnum = N'{0}',\n" +
-                         "		@type = 1,\n" +
-                         "      @date = N'{1}'\n" +
-                         "SELECT	'Return Value' = @return_value";
-                    await _wmsRepository.GetDbContext().Database.ExecuteSqlRawAsync(
-                       string.Format(sql, input.BillNum,input.AccountDate.ToShortDateString()));
-                  
-                }
-            }
-            return true;
-        }
-        /// <summary>
-        ///出库界面功能， 撤销核准出库
-        /// </summary>
-        /// <param name="ids"></param>
-        /// <param name="version"></param>
-        /// <returns></returns>
-        [HttpPost]
-        [Route("WmsKanbanOutPut-Cancel")]
-        [UnitOfWork(false)]
-        public async Task<bool> WmsKanbanOutPutCancel(WmsJitRequestDto input)
-        {
-            if (input.Guids != null && input.Guids.Count() > 0)
-            {
-                List<string> _ls = new List<string>();
-                foreach (var itm in input.Guids)
-                {
-                    _ls.Add(string.Format("{0}", itm));
-                }
-
-                string str = string.Join(",", _ls.ToArray());
-
-                var sql = "DECLARE	@return_value int\n" +
-                          "EXEC	@return_value = [dbo].[p_wms_output_cancel]\n" +
-                          "     @Guids ='{0}', \n" +
-                          "		@billnum = N'{1}',\n" +
-                          "		@type = 1,\n" +
-                          "     @accountdate = N'{2}'\n" +
-                          "SELECT	'Return Value' = @return_value";
-
-                sql = string.Format(sql, str, input.BillNum, input.AccountDate.ToShortDateString());
-
-                await _wmsRepository.GetDbContext().Database.ExecuteSqlRawAsync(
-                   sql
-                 );
-
-            }
-            return true;
-        }
-
-        /// <summary>
-        ///出库界面功能， 撤销核准出库
-        /// </summary>
-        /// <param name="ids"></param>
-        /// <param name="version"></param>
-        /// <returns></returns>
-        [HttpPost]
-        [Route("Regenerate")]
-        public async Task<bool> WmsKanbanOutPutRegenerate(WmsJitRequestDto input)
-        {
-            if (input.Guids != null && input.Guids.Count() > 0)
-            {
-                List<string> _ls = new List<string>();
-
-                var _lst = _wmsRepository.Where(p => input.Guids.Contains(p.Id) && p.State == 4);
-
-
-                List<WmsKanbanOutPutDetial> _detail = new List<WmsKanbanOutPutDetial>();
-                foreach (var itm in _lst.ToList())
-                {
-                    
-                    
-                }
-
-
-
-
-                await _wmsRepository.BatchDeleteAsync();
-
-
-
-
-                //foreach (var itm in input.Guids)
-                //{
-                //    _ls.Add(string.Format("{0}", itm));
-                //}
-
-                //string str = string.Join(",", _ls.ToArray());
-
-                //var sql = "DECLARE	@return_value int\n" +
-                //          "EXEC	@return_value = [dbo].[p_wms_output_cancel]\n" +
-                //          "     @Guids ='{0}', \n" +
-                //          "		@billnum = N'{1}',\n" +
-                //          "		@type = 1,\n" +
-                //          "     @accountdate = N'{2}'\n" +
-                //          "SELECT	'Return Value' = @return_value";
-
-                //sql = string.Format(sql, str, input.BillNum, input.AccountDate.ToShortDateString());
-
-                //await _wmsRepository.GetDbContext().Database.ExecuteSqlRawAsync(
-                //   sql
-                // );
-
-            }
-            return true;
-        }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-        /// <summary>
-        /// 出库界面功能删除
-        /// </summary>
-        /// <param name="version"></param>
-        /// <param name="p_list"></param>
-        /// <returns></returns>
-        [HttpPost]
-        [Route("WmsOutPutDelete")]
-        [UnitOfWork(false)]
-        public async Task<bool> WmsOutPutDelete(WmsJitRequestDto input)
-        {
-            var count = _wmsRepository.Count(p => p.BillNum == input.BillNum && p.State != 0);
-
-            if (count > 0)
-            {
-                return false;
-            }
-            var sql = "DECLARE	@return_value int\n" +
-                      "EXEC	@return_value = [dbo].[p_wms_output_cancel_all]\n" +
-                      "		@billnum = N'{0}',\n" +
-                      "		@type = 1\n" +
-                      "SELECT	'Return Value' = @return_value";
-            await _wmsRepository.GetDbContext().Database.ExecuteSqlRawAsync(
-               string.Format(sql, input.BillNum)
-             );
-
-
-
-            return true;
-        }
-
-
-        /// <summary>
-        ///更新备注
-        /// </summary>
-        /// <param name="input"></param>
-        /// <returns></returns>
-        [HttpGet]
-        [Route("UpdateRemark")]
-
-        public async Task<bool> UpdateRemark(Guid id, string remark)
-        {
-            var entity = _wmsVersionRepository.FirstOrDefault(p => p.Id == id);
-            if (entity != null)
-            {
-                entity.Remark = remark;
-                await _wmsVersionRepository.UpdateAsync(entity);
-
-            }
-            return true;
-        }
-
-
-        // 物料 物料组 物料描述 物料号 开始日期 结束日期    单位 出库数量    结算数量 寄售库存数量
-
-
-
-        //[HttpPost]
-        //[Route("ExcelImportWithOutKanban")]
-        //[DisableRequestSizeLimit]
-        ////[Authorize(SettleAccountPermissions.SettleAccounts.Default)]
-        //public async Task<string> ExcelImportWithOutKanban([FromForm] IFormFileCollection files, string version)
-        //{
-            //var _billNum = "KA" + DateTime.Now.ToString("yyyyMMddhhmmss");
-
-
-
-            //var _list= _dapper.GetNoKanbanSettleDetail(version);
-
-
-            //var stockList = _wmsDapper.GetSalesStock();
-            //var query = from itm in _list
-            //            join itm1 in stockList on itm.MaterialCode equals itm1.SapCode
-            //into temp1
-            //            from tm1 in temp1.DefaultIfEmpty()
-            //            select new WmsWithOutKanbanOutPutDetial(
-            //    GuidGenerator.Create(),
-            //    "无看板",
-            //    itm.SapMaterialCode,
-            //    itm.MaterialDesc,
-            //    itm.Version,
-            //    string.Empty,
-            //    string.Empty,
-            //    itm.Qty,
-            //    tm1.Qty,
-            //    itm.Qty,
-            //    string.Empty,
-            //    _billNum,
-            //    0,
-            //    0,
-            //    itm.InvoicePrice
-            //    ,itm.InvoiceAmt
-            //    );
-
-
-            //await _wmsRepository.GetDbContext().BulkInsertAsync(query.ToList(), new BulkConfig() { BulkCopyTimeout = 0, BatchSize = 10000 });
-            //int _count = _wmsVersionRepository.Count(p => p.Version == version && p.BillNum == _billNum);
-            //if (_count == 0)
-            //{
-            //    var _version = new WmsWithOutKanbanOutPut(GuidGenerator.Create(), version, _billNum, CurrentUser.Email);
-            //    await _wmsVersionRepository.InsertAsync(_version, true);
-            //}
-
-
-
-
-
-
-
-
-            //var _lsCopy = new List<WmsWithOutKanbanOutPutDetial>();
-            //foreach (var itm in query.ToList())
-            //{
-
-
-            //    WmsWithOutKanbanOutPutDetial _detail = new WmsWithOutKanbanOutPutDetial(
-            //   GuidGenerator.Create(),
-            //    "无看板",
-            //    itm.SapMaterialCode,
-            //    itm.MaterialDesc,
-            //    itm.Version,
-            //    string.Empty,
-            //    string.Empty,
-            //    itm.Qty,
-            //    itm.,
-            //    itm.Qty,
-            //    string.Empty,
-            //    _billNum
-            //    );
-            //    _lsCopy.Add(_detail);
-            //}
-            //_lst.AddRange(_lsCopy.ToArray());
-            //ExportImporter _exportImporter = new ExportImporter();
-            //var result = await _exportImporter.ExtendExcelImport<WmsWithOutKanbanOutPutDetial>(files, _excelImportService);
-            //List<WmsWithOutKanbanOutPutDetial> _lst = new List<WmsWithOutKanbanOutPutDetial>();
-            //var _lsCopy = new List<WmsWithOutKanbanOutPutDetial>();
-            //foreach (var itm in result)
-            //{
-            //    WmsWithOutKanbanOutPutDetial _detail = new WmsWithOutKanbanOutPutDetial(
-            //    GuidGenerator.Create(),
-            //    !string.IsNullOrEmpty(itm.Type) ? itm.Type : string.Empty,
-            //    itm.SapMaterialCode,
-            //    itm.MaterialDesc,
-            //    itm.Version,
-            //    itm.IsBack,
-            //    itm.Remark,
-            //    itm.Qty,
-            //    itm.SockQty,
-            //    itm.OutputQty,
-            //    itm.Extend,
-            //    itm.BillNum
-            //    );
-            //    _lsCopy.Add(_detail);
-            //}
-            //_lst.AddRange(_lsCopy.ToArray());
-
-
-            //var outPutDetail = await _wmsRepository1.Where(p => p.Version == version).ToListAsync();
-
-
-            //var error = from itm1 in outPutDetail
-            //            join itm2 in _lst on
-            //            new { itm1.SapMaterialCode  }
-            //            equals
-            //            new { itm2.SapMaterialCode }
-            //            select itm1;
-            //var errList = error.GroupBy(p => new { p.BillNum }).Select(p => new { BillNum = p.Key.BillNum, Number = p.Sum(itm => itm.Qty) });
-
-            //var checkList = new List<ErrorExportDto>();
-            //foreach (var itm in errList)
-            //{
-            //    checkList.Add(new ErrorExportDto() { Message = string.Format("出库单号:{0}重复记录数:{1}条", itm.BillNum, itm.Number) });
-            //}
-            //if (checkList.Count > 0)
-            //{
-
-            //    return await ExportErrorReportAsync(checkList);
-            //}
-
-
-
-            //var query = from itm1 in _lst
-            //            join itm2 in outPutDetail on
-            //            new { itm1.SapMaterialCode }
-            //            equals
-            //            new { itm2.SapMaterialCode } into temp1
-            //            from tm1 in temp1.DefaultIfEmpty()
-            //            where tm1 == null
-            //            select itm1;
-            //var _wmslst = query.ToList();
-            //foreach (var itm in _wmslst)
-            //{
-            //    itm.BillNum = _billNum;
-            //}
-            //await _wmsRepository.GetDbContext().BulkInsertAsync(_wmslst, new BulkConfig() { BulkCopyTimeout = 0, BatchSize = 10000 });
-            //int _count = _wmsVersionRepository.Count(p => p.Version == version && p.BillNum == _billNum);
-            //if (_count == 0)
-            //{
-            //    var _version = new WmsKanbanOutPut(GuidGenerator.Create(), version, _billNum, CurrentUser.Email);
-            //    await _wmsVersionRepository.InsertAsync(_version, true);
-            //}
-            //return _billNum;
-
-
-
-        //}
-
-
-
-
-
-
-
-        [HttpPost]
-        [Route("ExcelImport")]
-        [DisableRequestSizeLimit]
-        //[UnitOfWork(false)]
-        //[Authorize(SettleAccountPermissions.SettleAccounts.Default)]
-        public async Task<string> ExcelImport([FromForm] IFormFileCollection files, string version)
-        {
-            var checkList = new List<ErrorExportDto>();
-            var _billNum = "K" + DateTime.Now.ToString("yyyyMMddhhmmss");
-            ExportImporter _exportImporter = new ExportImporter();
-            var result = await _exportImporter.ExtendExcelOfSheetOneImport<WmsKanbanOutPutDetial>(files, _excelImportService);
-            //检验1:导入模板中的第一页签数据不能为空
-            if (result == null || result.Count == 0)
-            {
-                checkList.Add(new ErrorExportDto(version, "大众看板出库单导入", string.Empty, string.Empty, string.Empty, string.Empty, "导入模板中第一页签没有数据，请检查！", string.Empty));
-            }
-            if (checkList.Count > 0)
-            {
-                return await ExportErrorReportAsync(checkList);
-            }
-            //检验2:导入模板中的结算数据是否为0
-            foreach (var itm in result)
-            {
-                if (itm.Qty == 0)
-                {
-                    checkList.Add(new ErrorExportDto(version, "大众看板出库单导入", string.Empty, string.Empty, string.Empty, string.Empty, string.Format("导入模板中看板号{0}的结算数量为０，影响出库请检查！", itm.Kanban), string.Empty));
-                }
-            }
-
-            ////和物料主数据中SAP物料号检验是否存在
-            //foreach (var itm in filteResult)
-            //{
-            //    if (!_erpdapperRepository.GetMaterialList().Any(p => p.MaterialCode == itm.MaterialCode))
-            //    {
-            //        checkList.Add(new ErrorExportDto(version, "自定义出库单导入", string.Empty, string.Empty, itm.MaterialCode, string.Empty, string.Format("物料主数据不存在当前导入的物料号{0}！", itm.MaterialCode), string.Empty));
-            //    }
-            //}
-
-            if (checkList.Count > 0)
-            {
-                return await ExportErrorReportAsync(checkList);
-            }
-
-
-            //发现导入模板中存在空行，直接过滤掉
-            var filteResult = result.Where(p =>!string.IsNullOrEmpty(p.Kanban));
-
-            List<WmsKanbanOutPutDetial> _lst = new List<WmsKanbanOutPutDetial>();
-            var _lsCopy = new List<WmsKanbanOutPutDetial>();
-            foreach (var itm in filteResult)
-            {
-                WmsKanbanOutPutDetial _detail = new WmsKanbanOutPutDetial(
-                GuidGenerator.Create(),
-                !string.IsNullOrEmpty(itm.WmsBillNum) ? itm.WmsBillNum : string.Empty,
-                itm.Kanban,
-
-                itm.MaterialCode,
-                itm.MaterialDesc,
-                itm.MaterialGroup,
-                string.Empty,
-                string.Empty,
-                0,
-               !string.IsNullOrEmpty(itm.Extend1) ? itm.Extend1 : string.Empty,
-               !string.IsNullOrEmpty(itm.Extend2) ? itm.Extend2 : string.Empty,
-                version,
-                itm.MaterialCode,
-                itm.BillNum,
-                GuidGenerator.Create()
-                , string.Empty
-                , itm.Qty,
-                itm.Price,
-                itm.Amt
-                );
-                _lsCopy.Add(_detail);
-            }
-            _lst.AddRange(_lsCopy.ToArray());
-
-            //检验3：导入模板中看板号+物料号，不能重复
-            var _isRepeatOfReportList = from arc in _lst
-                                        group arc by new { arc.Kanban, arc.MaterialCode,arc.Version }
-                                        into g
-                                        where g.Count() > 1
-                                        select g;
-            foreach (var itm in _isRepeatOfReportList)
-            {
-                checkList.Add(new ErrorExportDto(version, "大众看板出库单导入", string.Empty, string.Empty, string.Empty, string.Empty, string.Format("导入模板中看板号{0}组合物料号{1}有重复，请检查！", itm.Key.Kanban, itm.Key.MaterialCode), string.Empty));
-            }
-            if (checkList.Count > 0)
-            {
-                return await ExportErrorReportAsync(checkList);
-            }
-
-
-            var outPutDetail = await _wmsRepository.Where(p => p.Version == version).ToListAsync();
-
-
-            var error = from itm1 in outPutDetail
-                        join itm2 in _lst on
-                        new { itm1.MaterialCode, itm1.Kanban }
-                        equals
-                        new { itm2.MaterialCode, itm2.Kanban }
-                        select itm1;
-            var errList = error.GroupBy(p => new { p.BillNum }).Select(p => new { BillNum = p.Key.BillNum, Number = p.Sum(itm => itm.Qty) });
-
-
-            foreach (var itm in errList)
-            {
-                checkList.Add(new ErrorExportDto() { Message = string.Format("出库单号:{0}重复记录数:{1}条", itm.BillNum, itm.Number) });
-            }
-            if (checkList.Count > 0)
-            {
-
-                return await ExportErrorReportAsync(checkList);
-            }
-
-
-
-            var query = from itm1 in _lst
-                        join itm2 in outPutDetail on
-                        new { itm1.MaterialCode, itm1.Kanban }
-                        equals
-                        new { itm2.MaterialCode, itm2.Kanban } into temp1
-                        from tm1 in temp1.DefaultIfEmpty()
-                        where tm1 == null
-                        select itm1;
-            var _wmslst = query.ToList();
-            foreach (var itm in _wmslst)
-            {
-                itm.BillNum = _billNum;
-            }
-            await _wmsRepository.GetDbContext().BulkInsertAsync(_wmslst, new BulkConfig() { BulkCopyTimeout = 0, BatchSize = 10000 });
-            int _count = _wmsVersionRepository.Count(p => p.Version == version && p.BillNum == _billNum);
-            if (_count == 0)
-            {
-                var _version = new WmsKanbanOutPut(GuidGenerator.Create(), version, _billNum, CurrentUser.Email,string.Empty);
-                await _wmsVersionRepository.InsertAsync(_version, true);
-            }
-            //return _billNum;
-            return ApplicationConsts.SuccessStr;
-        }
-
-
-        /// <summary>
-        /// 导出
-        /// </summary>
-        /// <param name="input"></param>
-        /// <returns></returns>
-        [HttpPost]
-        [Route("Export")]
-        //[Authorize(SettleAccountPermissions.SettleAccounts.Default)]
-        virtual public async Task<string> ExportAsync(WmsKanbanOutPutDetialRequestDto input)
-        {
-            input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "BillNum", Logic = EnumFilterLogic.And, Value = input.BillNum });
-            var entities = await _wmsRepository.GetListByFilterAsync(GuidGenerator.Create(), input.Filters, input.Sorting, int.MaxValue,
-                 0, true);
-
-            var dtos = ObjectMapper.Map<List<WmsKanbanOutPutDetial>, List<WmsKanbanOutPutDetialDto>>(entities);
-
-            IExporter _excel = new ExcelExporter();
-            byte[] result = null;
-
-            var _fileName = string.Format("大众看板出库单_{0}.xlsx", Guid.NewGuid().ToString());
-            result = await _excel.ExportAsByteArray(dtos);
-
-
-            result.ShouldNotBeNull();
-
-            //保存导出文件到服务器存成二进制
-            await _excelImportService.SaveBlobAsync(
-                     new SaveExcelImportInputDto
-                     {
-                         Name = _fileName,
-                         Content = result
-                     }
-                 );
-            return _fileName;
-
-
-
-        }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-    }
-}
\ No newline at end of file
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSKanbanExtendAppService.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSKanbanExtendAppService.cs
deleted file mode 100644
index ac754f8e..00000000
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSKanbanExtendAppService.cs
+++ /dev/null
@@ -1,668 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.Extensions.Caching.Distributed;
-using AutoMapper;
-using System.Linq;
-using System.Text;
-using Volo.Abp.Guids;
-using Volo.Abp.Application.Services;
-using Volo.Abp.Caching;
-
-using Volo.Abp.ObjectMapping;
-using Win.Sfs.SettleAccount.ExcelImporter;
-using Win.Sfs.Shared.CacheBase;
-using Win.Utils;
-using Volo.Abp.Application.Dtos;
-using Win.Sfs.BaseData.ImportExcelCommon;
-using Volo.Abp.Domain.Repositories;
-using EFCore.BulkExtensions;
-using System.IO;
-using Microsoft.EntityFrameworkCore;
-using Win.Sfs.SettleAccount.Entities.SettleAccountVersion;
-using Win.Sfs.SettleAccount.FISes;
-using Win.Sfs.Shared.Enums.SettleAccount;
-using Win.Sfs.Shared.Filter;
-using Shouldly;
-using Magicodes.ExporterAndImporter.Csv;
-using Magicodes.ExporterAndImporter.Core;
-using Magicodes.ExporterAndImporter.Excel;
-using System.Data.Common;
-using Volo.Abp.Uow;
-using Volo.Abp;
-using Win.Abp.Snowflakes;
-using Win.Sfs.SettleAccount.CommonManagers;
-using Win.Sfs.SettleAccount.ExportReports;
-using Win.Sfs.SettleAccount.Constant;
-using Win.Sfs.SettleAccount.MaterialRelationships;
-using Win.Sfs.SettleAccount.Entities.TaskJobs;
-using Magicodes.ExporterAndImporter.Core.Models;
-
-using TaskJob.Services;
-using TaskJob.EventArgs;
-using Win.Sfs.SettleAccount.Entities.WMS;
-using Win.Sfs.SettleAccount.Entities.Wms;
-using Win.Sfs.SettleAccount.Repository;
-using WY.NewJit.Extends.PaiGe.WMS;
-using Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report;
-
-namespace Win.Sfs.SettleAccount.Entities.WMS
-{
-    /// <summary>
-    /// 大众无条码看板出库单
-    /// </summary>
-    [Route("api/settleaccount/wmskanbanoutputextend")]
-    //[AllowAnonymous]
-    [Authorize(SettleAccountPermissions.WMSJIT.Default)]
-    public class WMSKanbanExtendAppService : SettleAccountApplicationBase<WmsWithOutKanbanOutPutDetial>
-    {
-        /// <summary>
-        /// 大众看板-出库
-        /// </summary>
-      
-        private readonly ISettleAccountBranchEfCoreRepository<WmsWithOutKanbanOutPutDetial, Guid> _wmsRepository;
-        private readonly ISettleAccountBranchEfCoreRepository<WmsWithOutKanbanOutPut, Guid> _wmsVersionRepository;
-
-        private readonly KanbanUnSettledDapperRepository _dapper;
-        private readonly WMSEfCoreRepository<WmsKanbanOutPutDetial> _wmsefRespository;
-
-        private readonly WMSEfCoreRepository<TB_BILL> _wmstbRespository;
-        private readonly ISettleAccountBranchEfCoreRepository<TaskJob, Guid> _job;
-        private readonly IExcelImportAppService _excelImportService;
-        private readonly ErpPartDapperRepository _erpdapperRepository;
-
-
-        private readonly TaskJobService _service;
-        private readonly WmsDapperRepository _wmsDapper;
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="wmsRepository"></param>
-        /// <param name="job"></param>
-        /// <param name="wmsVersionRepository"></param>
-        /// <param name="wmsefRespository"></param>
-        /// <param name="wmstbRespository"></param>
-        public WMSKanbanExtendAppService(
-
-
-            IExcelImportAppService excelImportService,
-
-            ISettleAccountBranchEfCoreRepository<WmsWithOutKanbanOutPutDetial, Guid> wmsRepository,
-            ISettleAccountBranchEfCoreRepository<TaskJob, Guid> job,
-            ISettleAccountBranchEfCoreRepository<WmsWithOutKanbanOutPut, Guid> wmsVersionRepository,
-            WMSEfCoreRepository<WmsKanbanOutPutDetial> wmsefRespository,
-            KanbanUnSettledDapperRepository dapper,
-            WMSEfCoreRepository<TB_BILL> wmstbRespository,
-             IDistributedCache<WmsWithOutKanbanOutPutDetial> cache,
-              //ErpPartDapperRepository erpdapperRepository,
-             ISnowflakeIdGenerator snowflakeIdGenerator,
-           ICommonManager commonManager,
-           WmsDapperRepository wmsDapper
-        ) : base(cache, excelImportService, snowflakeIdGenerator, commonManager)
-        {
-            _job = job;
-            _wmstbRespository = wmstbRespository;
-            _wmsRepository = wmsRepository;
-            _wmsVersionRepository = wmsVersionRepository;
-            _wmsefRespository = wmsefRespository;
-            _excelImportService = excelImportService;
-            _dapper = dapper;
-            _wmsDapper = wmsDapper;
-           // _erpdapperRepository = erpdapperRepository;
-        }
-
-        private async Task<long> GetCountAsync(WmsKanbanOutPutDetialRequestDto input)
-        {
-            input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "BillNum", Logic = EnumFilterLogic.And, Value = input.BillNum });
-            return await _wmsRepository.GetCountByFilterAsync(GuidGenerator.Create(), input.Filters);
-        }
-
-        private async Task<long> GetCountAsync(WmsKanbanOutPutRequestDto input)
-        {
-            return await _wmsVersionRepository.GetCountByFilterAsync(GuidGenerator.Create(), input.Filters);
-        }
-
-        /// <summary>
-        /// 准时化出库主表
-        /// </summary>
-        /// <param name="input"></param>
-        /// <returns></returns>
-        [HttpPost]
-        [Route("WmsKanbanList")]
-        //[Authorize(SettleAccountPermissions.SettleAccounts.Default)]
-        virtual public async Task<PagedResultDto<WmsWithOutKanbanOutPut>> GetListAsync(WmsKanbanOutPutRequestDto input)
-        {
-
-
-
-            //input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "BillNum", Logic = EnumFilterLogic.And, Value = input.BillNum });
-            var entities = await _wmsVersionRepository.GetListByFilterAsync(GuidGenerator.Create(), input.Filters, input.Sorting, input.MaxResultCount,
-                 input.SkipCount, true);
-
-            var totalCount = await GetCountAsync(input);
-
-            return new PagedResultDto<WmsWithOutKanbanOutPut>(totalCount, entities);
-        }
-
-        /// <summary>
-        /// 准时化出库明细
-        /// </summary>
-        /// <param name="input"></param>
-        /// <returns></returns>
-        [HttpPost]
-        [Route("WmsKanbanDetailList")]
-        [UnitOfWork(false)]
-        //[Authorize(SettleAccountPermissions.SettleAccounts.Default)]
-        virtual public async Task<PagedResultDto<WmsWithOutKanbanOutPutDetial>> GetListAsync(WmsKanbanOutPutDetialRequestDto input)
-        {
-
-             input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "BillNum", Logic = EnumFilterLogic.And, Value = input.BillNum });
-            var entities = await _wmsRepository.GetListByFilterAsync(GuidGenerator.Create(), input.Filters, input.Sorting, input.MaxResultCount,
-                 input.SkipCount, true);
-
-            var totalCount = await GetCountAsync(input);
-            var stockList = _wmsDapper.GetSalesStock("PLJS");
-            var query = from itm in entities
-                        join itm1 in stockList on itm.SapMaterialCode equals itm1.SapCode
-            into temp1
-                        from tm1 in temp1.DefaultIfEmpty()
-                        select new WmsWithOutKanbanOutPutDetial(
-                GuidGenerator.Create(),
-                "无看板发货",
-                itm.SapMaterialCode,
-                itm.MaterialDesc,
-                itm.Version,
-                string.Empty,
-                string.Empty,
-                itm.Qty,
-                tm1==null?0: tm1.Qty,
-                itm.OutputQty,
-                string.Empty,
-                itm.BillNum,
-                itm.State,
-                itm.RealityNumber,
-                itm.Price,
-                itm.Amt
-                );
-
-            return new PagedResultDto<WmsWithOutKanbanOutPutDetial>(totalCount, entities);
-        }
-
-
-
-
-        /// <summary>
-        ///  任务明细标记已确认
-        /// </summary>
-        /// <param name="files">上传的文件(前端已经限制只能上传一个附件)</param>
-        /// <returns></returns>
-        [HttpPost]
-        [Route("WmsSharePartOutPutModify")]
-        [DisableRequestSizeLimit]
-
-        public async Task<bool> WmsSharePartUpdate(WmsWithOutKanbanOutPutDetial detial)
-        {
-            var _entityList = _wmsRepository.Where(p => p.Id == detial.BranchId && p.State != 4 ).ToList();
-            if (_entityList.Count() > 0)
-            {
-                foreach (var itm in _entityList)
-                {
-                    itm.OutputQty = detial.OutputQty;
-                    await _wmsRepository.UpdateAsync(itm);
-                }
-            }
-            return true;
-
-        }
-        /// <summary>
-        ///更新备注
-        /// </summary>
-        /// <param name="input"></param>
-        /// <returns></returns>
-        [HttpGet]
-        [Route("UpdateRemark")]
-
-        public async Task<bool> UpdateRemark(Guid id, string remark)
-        {
-            var entity = _wmsVersionRepository.FirstOrDefault(p => p.Id == id);
-            if (entity != null)
-            {
-                entity.Remark = remark;
-                await _wmsVersionRepository.UpdateAsync(entity);
-
-            }
-            return true;
-        }
-
-
-
-        [HttpPost]
-        [Route("ExcelImportWithOutKanban")]
-        [DisableRequestSizeLimit]
-        //[UnitOfWork(false)]
-        //[Authorize(SettleAccountPermissions.SettleAccounts.Default)]
-        public async Task<string> ExcelImportWithOutKanban([FromForm] IFormFileCollection files, string version)
-        {
-            var _billNum = "KA" + DateTime.Now.ToString("yyyyMMddhhmmss");
-
-
-
-            //var _list = _dapper.GetNoKanbanSettleDetail(version);
-
-
-            //var stockList = _wmsDapper.GetSalesStock();
-            //var query = from itm in _list
-            //            join itm1 in stockList on itm.MaterialCode equals itm1.SapCode
-            //into temp1
-            //            from tm1 in temp1.DefaultIfEmpty()
-            //            select new WmsWithOutKanbanOutPutDetial(
-            //    GuidGenerator.Create(),
-            //    "无看板",
-            //    itm.SapMaterialCode,
-            //    itm.MaterialDesc,
-            //    itm.Version,
-            //    string.Empty,
-            //    string.Empty,
-            //    itm.Qty,
-            //    tm1.Qty,
-            //    itm.Qty,
-            //    string.Empty,
-            //    _billNum,
-            //    0,
-            //    0,
-            //    itm.InvoicePrice
-            //    , itm.InvoiceAmt
-            //    );
-
-
-            //await _wmsRepository.GetDbContext().BulkInsertAsync(query.ToList(), new BulkConfig() { BulkCopyTimeout = 0, BatchSize = 10000 });
-            //int _count = _wmsVersionRepository.Count(p => p.Version == version && p.BillNum == _billNum);
-            //if (_count == 0)
-            //{
-            //    var _version = new WmsWithOutKanbanOutPut(GuidGenerator.Create(), version, _billNum, CurrentUser.Email);
-            //    await _wmsVersionRepository.InsertAsync(_version, true);
-            //}
-
-
-
-            //return _billNum;
-
-
-
-
-
-
-
-            //var _lsCopy = new List<WmsWithOutKanbanOutPutDetial>();
-            //foreach (var itm in query.ToList())
-            //{
-
-
-            //    WmsWithOutKanbanOutPutDetial _detail = new WmsWithOutKanbanOutPutDetial(
-            //   GuidGenerator.Create(),
-            //    "无看板",
-            //    itm.SapMaterialCode,
-            //    itm.MaterialDesc,
-            //    itm.Version,
-            //    string.Empty,
-            //    string.Empty,
-            //    itm.Qty,
-            //    0,
-            //    itm.Qty,
-            //    string.Empty,
-            //    _billNum,
-            //    0,
-            //    itm.
-
-            //    );
-            //    _lsCopy.Add(_detail);
-            //}
-            //_lst.AddRange(_lsCopy.ToArray());
-            var checkList = new List<ErrorExportDto>();
-            ExportImporter _exportImporter = new ExportImporter();
-            var result = await _exportImporter.ExtendExcelImport<WmsWithOutKanbanOutPutDetial>(files, _excelImportService);
-            ////和物料主数据中SAP物料号检验是否存在
-            //foreach (var itm in result)
-            //{
-            //    if (!_erpdapperRepository.GetMaterialList().Any(p => p.MaterialCode == itm.SapMaterialCode))
-            //    {
-            //        checkList.Add(new ErrorExportDto(version, "大众无条码看板出库单导入", string.Empty, string.Empty, itm.SapMaterialCode, string.Empty, string.Format("物料主数据不存在当前导入的物料号{0}！", itm.SapMaterialCode), string.Empty));
-            //    }
-            //}
-            //if (checkList.Count > 0)
-            //{
-            //    return await ExportErrorReportAsync(checkList);
-            //}
-            List<WmsWithOutKanbanOutPutDetial> _lst = new List<WmsWithOutKanbanOutPutDetial>();
-            var _lsCopy = new List<WmsWithOutKanbanOutPutDetial>();
-            foreach (var itm in result)
-            {
-                WmsWithOutKanbanOutPutDetial _detail = new WmsWithOutKanbanOutPutDetial(
-                GuidGenerator.Create(),
-                !string.IsNullOrEmpty(itm.Type) ? itm.Type : string.Empty,
-                itm.SapMaterialCode,
-                itm.MaterialDesc,
-                itm.Version,
-                itm.IsBack,
-                itm.Remark,
-                itm.Qty,
-                itm.SockQty,
-                 itm.Qty,
-                itm.Extend,
-                itm.BillNum,0
-                ,0,
-                itm.Price,
-                itm.Amt
-                );
-                _lsCopy.Add(_detail);
-            }
-            _lst.AddRange(_lsCopy.ToArray());
-
-
-            var outPutDetail = await _wmsRepository.Where(p => p.Version == version && p.State!=4).ToListAsync();
-
-
-            var error = from itm1 in outPutDetail
-                        join itm2 in _lst on
-                        new { itm1.SapMaterialCode }
-                        equals
-                        new { itm2.SapMaterialCode }
-                        select itm1;
-            var errList = error.GroupBy(p => new { p.BillNum }).Select(p => new { BillNum = p.Key.BillNum, Number = p.Sum(itm => itm.Qty) });
-
-           
-            foreach (var itm in errList)
-            {
-                checkList.Add(new ErrorExportDto() { Message = string.Format("出库单号:{0}重复记录数:{1}条", itm.BillNum, itm.Number) });
-            }
-            if (checkList.Count > 0)
-            {
-
-                return await ExportErrorReportAsync(checkList);
-            }
-
-
-
-            var query = from itm1 in _lst
-                        join itm2 in outPutDetail on
-                        new { itm1.SapMaterialCode }
-                        equals
-                        new { itm2.SapMaterialCode } into temp1
-                        from tm1 in temp1.DefaultIfEmpty()
-                        where tm1 == null
-                        select itm1;
-            var _wmslst = query.ToList();
-            foreach (var itm in _wmslst)
-            {
-                itm.BillNum = _billNum;
-            }
-            await _wmsRepository.GetDbContext().BulkInsertAsync(_wmslst, new BulkConfig() { BulkCopyTimeout = 0, BatchSize = 10000 });
-            int _count = _wmsVersionRepository.Count(p => p.Version == version && p.BillNum == _billNum);
-            if (_count == 0 && _wmslst.Count()>0)
-            {
-                var _version = new WmsWithOutKanbanOutPut(GuidGenerator.Create(), version, _billNum, CurrentUser.Email,string.Empty);
-                await _wmsVersionRepository.InsertAsync(_version, true);
-            }
-            return ApplicationConsts.SuccessStr;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-        }
-
-
-
-
-        /// <summary>
-        /// 选择任务，生成出库单，只包含已确认的单据
-        /// </summary>
-        /// <param name="ids"></param>
-        /// <param name="version"></param>
-        /// <returns></returns>
-        [HttpPost]
-        [Route("WmsKanbanOutPutExtend")]
-        [UnitOfWork(false)]
-        public async Task<string> WmsKanbanOutPut(WmsJitRequestDto input)
-        {
-
-            //var _count1 = _wmsVersionRepository.Count(p => p.Version == input.Version );
-            //if (_count1 > 0)
-            //{
-            //    var checkList = new List<ErrorExportDto>();
-               
-            //    checkList.Add(new ErrorExportDto() { Message = "有重复期间数据" });
-                
-            //    if (checkList.Count > 0)
-            //    {
-
-            //        return await ExportErrorReportAsync(checkList);
-            //    }
-            //}
-            var _billNum = "KA" + DateTime.Now.ToString("yyyyMMddhhmmss");
-            var _list = _dapper.GetNoKanbanSettleDetail(input.Version);
-            var stockList = _wmsDapper.GetSalesStock("PLJS");
-            var query = from itm in _list
-                        join itm1 in stockList on itm.SapMaterialCode equals itm1.SapCode
-            into temp1
-                        from tm1 in temp1.DefaultIfEmpty()
-                        select new WmsWithOutKanbanOutPutDetial(
-                GuidGenerator.Create(),
-                "无看板发货",
-                itm.SapMaterialCode,
-                itm.MaterialDesc,
-                itm.Version,
-                string.Empty,
-                string.Empty,
-                itm.InvoiceQty-itm.ClaimQty+itm.CP7ScrapQty,
-                tm1==null?0:tm1.Qty,
-                itm.InvoiceQty - itm.ClaimQty + itm.CP7ScrapQty,
-                string.Empty,
-                _billNum,
-                0,
-                0,
-                itm.InvoicePrice,
-                Math.Round(((itm.InvoiceQty - itm.ClaimQty + itm.CP7ScrapQty) * itm.InvoicePrice), 2)
-                );
-
-
-            var _list1 = query.ToList().Where(p => p.Qty != 0).ToList();
-
-
-            await _wmsRepository.GetDbContext().BulkInsertAsync(_list1, new BulkConfig() { BulkCopyTimeout = 0, BatchSize = 10000 });
-            int _count = _wmsVersionRepository.Count(p => p.Version == input.Version && p.BillNum == _billNum);
-            if (_count == 0)
-            {
-                var _version = new WmsWithOutKanbanOutPut(GuidGenerator.Create(), input.Version, _billNum, CurrentUser.Email,string.Empty);
-               
-                await _wmsVersionRepository.InsertAsync(_version, true);
-            }
-            return ApplicationConsts.SuccessStr; ;
-        }
-        /// <summary>
-        /// 出库界面功能，核准出库功能
-        /// </summary>
-        /// <param name="version"></param>
-        /// <param name="p_list"></param>
-        /// <returns></returns>
-        [HttpPost]
-        [Route("WmsKanbanOutPut-Pass")]
-        [UnitOfWork(false)]
-        public async Task<string> WmsKanbanOutPutPass(WmsJitRequestDto input)
-        {
-            if (input.Guids != null)
-            {
-                List<WmsWithOutKanbanOutPutDetial> _ls = new List<WmsWithOutKanbanOutPutDetial>();
-                if (input.Guids.Count() > 0)
-                {
-                    _ls = await _wmsRepository.Where(p => input.Guids.Contains(p.Id) && p.Version == input.Version && p.BillNum == input.BillNum && p.State != 2).ToListAsync();
-                }
-                else
-                {
-                    _ls = await _wmsRepository.Where(p => p.Version == input.Version && p.BillNum == input.BillNum && p.State != 2).ToListAsync();
-                }
-                // var _errorls = _ls.Where(p => p.SockQty < p.OutputQty  || p.Qty<p.OutputQty).ToList();
-
-
-                //var checkList = new List<ErrorExportDto>();
-
-
-                //foreach (var itm in _errorls)
-                //{
-                //    checkList.Add(new ErrorExportDto() { Message = string.Format("物料号:{0}出库数量大于结算数量或寄售库存数量!",itm.SapMaterialCode) });
-                //}
-
-
-
-                //if (checkList.Count > 0)
-                //{
-
-                //    return await ExportErrorReportAsync(checkList, "校验失败.xlsx");
-                //}
-
-                //if (DateTime.Now.ToString("yyyyMM") != input.AccountDate.ToString("yyyyMM"))
-                //{
-                //    throw new BusinessException("8989", "填写过账日期应该为当月！");
-
-                //}
-
-
-
-                if (_ls.Count() > 0)
-                {
-                    var sql = "DECLARE	@return_value int\n" +
-                         "     EXEC	@return_value = [dbo].[p_wms_output]\n" +
-                         "	   @billnum = N'{0}',\n" +
-                         "	   @type = 11,\n" +
-                         "     @date = N'{1}'\n" +
-                         "SELECT	'Return Value' = @return_value";
-                    await _wmsRepository.GetDbContext().Database.ExecuteSqlRawAsync(
-                       string.Format(sql, input.BillNum, input.AccountDate.ToShortDateString()));
-
-                }
-            }
-           return ApplicationConsts.SuccessStr; ;
-        }
-        /// <summary>
-        ///出库界面功能， 撤销核准出库
-        /// </summary>
-        /// <param name="ids"></param>
-        /// <param name="version"></param>
-        /// <returns></returns>
-        [HttpPost]
-        [Route("WmsKanbanOutPut-Cancel")]
-        [UnitOfWork(false)]
-        public async Task<bool> WmsKanbanOutPutCancel(WmsJitRequestDto input)
-        {
-            if (input.Guids != null && input.Guids.Count() > 0)
-            {
-                List<string> _ls = new List<string>();
-                foreach (var itm in input.Guids)
-                {
-                    _ls.Add(string.Format("{0}", itm));
-                }
-
-                string str = string.Join(",", _ls.ToArray());
-
-                var sql = "DECLARE	@return_value int\n" +
-                          "EXEC	@return_value = [dbo].[p_wms_output_cancel]\n" +
-                          "     @Guids ='{0}', \n" +
-                          "		@billnum = N'{1}',\n" +
-                          "		@type = 11,\n" +
-                          "     @accountdate = N'{2}'\n" +
-                          "SELECT	'Return Value' = @return_value";
-
-                sql = string.Format(sql, str, input.BillNum, input.AccountDate.ToShortDateString());
-
-                await _wmsRepository.GetDbContext().Database.ExecuteSqlRawAsync(
-                   sql
-                 );
-
-            }
-            return true;
-        }
-        /// <summary>
-        /// 出库界面功能删除
-        /// </summary>
-        /// <param name="version"></param>
-        /// <param name="p_list"></param>
-        /// <returns></returns>
-        [HttpPost]
-        [Route("WmsOutPutDelete")]
-        [UnitOfWork(false)]
-        public async Task<bool> WmsOutPutDelete(WmsJitRequestDto input)
-        {
-            var count = _wmsRepository.Count(p => p.BillNum == input.BillNum && p.State != 0);
-
-            if (count > 0)
-            {
-                return false;
-            }
-            var sql = "DECLARE	@return_value int\n" +
-                      "EXEC	@return_value = [dbo].[p_wms_output_cancel_all]\n" +
-                      "		@billnum = N'{0}',\n" +
-                      "		@type = 11\n" +
-                      "SELECT	'Return Value' = @return_value";
-            await _wmsRepository.GetDbContext().Database.ExecuteSqlRawAsync(
-               string.Format(sql, input.BillNum)
-             );
-
-            return true;
-        }
-        /// <summary>
-        /// 导出
-        /// </summary>
-        /// <param name="input"></param>
-        /// <returns></returns>
-        [HttpPost]
-        [Route("Export")]
-        //[Authorize(SettleAccountPermissions.SettleAccounts.Default)]
-        virtual public async Task<string> ExportAsync(WmsKanbanOutPutDetialRequestDto input)
-        {
-            input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "BillNum", Logic = EnumFilterLogic.And, Value = input.BillNum });
-            var entities = await _wmsRepository.GetListByFilterAsync(GuidGenerator.Create(), input.Filters, input.Sorting, int.MaxValue,
-                 0, true);
-
-            var dtos = ObjectMapper.Map<List<WmsWithOutKanbanOutPutDetial>, List<WmsWithOutKanbanOutPutDetialDto>>(entities);
-
-            IExporter _excel = new ExcelExporter();
-            byte[] result = null;
-
-            var _fileName = string.Format("大众无条码看板出库单_{0}.xlsx", Guid.NewGuid().ToString());
-            result = await _excel.ExportAsByteArray(dtos);
-
-
-            result.ShouldNotBeNull();
-
-            //保存导出文件到服务器存成二进制
-            await _excelImportService.SaveBlobAsync(
-                     new SaveExcelImportInputDto
-                     {
-                         Name = _fileName,
-                         Content = result
-                     }
-                 );
-            return _fileName;
-        }
-    }
-
-        
-}
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSSharePart90AppService.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSSharePart90AppService.cs
deleted file mode 100644
index 79ac8e05..00000000
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSSharePart90AppService.cs
+++ /dev/null
@@ -1,712 +0,0 @@
-using EFCore.BulkExtensions;
-using Magicodes.ExporterAndImporter.Core;
-using Magicodes.ExporterAndImporter.Excel;
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.EntityFrameworkCore;
-using Shouldly;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Volo.Abp;
-using Volo.Abp.Application.Dtos;
-using Volo.Abp.Caching;
-using Volo.Abp.Domain.Repositories;
-using Volo.Abp.Uow;
-using Win.Abp.Snowflakes;
-using Win.Sfs.BaseData.ImportExcelCommon;
-using Win.Sfs.SettleAccount.CommonManagers;
-using Win.Sfs.SettleAccount.Constant;
-using Win.Sfs.SettleAccount.Entities.TaskJobs;
-using Win.Sfs.SettleAccount.Entities.Wms;
-using Win.Sfs.SettleAccount.ExcelImporter;
-using Win.Sfs.SettleAccount.ExportReports;
-using Win.Sfs.SettleAccount.Repository;
-using Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report;
-using Win.Sfs.Shared.Filter;
-using WY.NewJit.Extends.PaiGe.WMS;
-
-namespace Win.Sfs.SettleAccount.Entities.WMS
-{
-    [Route("api/settleaccount/wmsSharePart90output")]
-    [Authorize(SettleAccountPermissions.WMSJIT.Default)]
-    public class WMSSharePart90AppService :
-        SettleAccountApplicationBase<WmsSharePart90OutPutDetial>
-    {
-        private readonly ISettleAccountBranchEfCoreRepository<WmsSharePart90OutPutDetial, Guid> _wmsRepository;
-        private readonly ISettleAccountBranchEfCoreRepository<WmsSharePart90OutPut, Guid> _wmsVersionRepository;
-        private readonly WMSEfCoreRepository<WmsSharePart90OutPutDetial> _wmsefRespository;
-        private readonly WmsDapperRepository _wmsDapper;
-
-        private readonly WMSEfCoreRepository<TB_BILL> _wmstbRespository;
-        private readonly ISettleAccountBranchEfCoreRepository<TaskJob, Guid> _job;
-        private readonly IExcelImportAppService _excelImportService;
-        //private readonly ErpPartDapperRepository _erpdapperRepository;
-
-        private readonly TaskJobService _service;
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="wmsRepository"></param>
-        /// <param name="job"></param>
-        /// <param name="wmsVersionRepository"></param>
-        /// <param name="wmsefRespository"></param>
-        /// <param name="wmstbRespository"></param>
-        /// <param name="excelImportService"></param>
-        /// <param name="cache"></param>
-        /// <param name="snowflakeIdGenerator"></param>
-        /// <param name="wmsDapper"></param>
-        /// <param name="commonManager"></param>
-        public WMSSharePart90AppService(
-
-            ISettleAccountBranchEfCoreRepository<WmsSharePart90OutPutDetial, Guid> wmsRepository,
-            ISettleAccountBranchEfCoreRepository<TaskJob, Guid> job,
-            ISettleAccountBranchEfCoreRepository<WmsSharePart90OutPut, Guid> wmsVersionRepository,
-            WMSEfCoreRepository<WmsSharePart90OutPutDetial> wmsefRespository,
-            WMSEfCoreRepository<TB_BILL> wmstbRespository,
-            IExcelImportAppService excelImportService,
-             IDistributedCache<WmsSharePart90OutPutDetial> cache,
-             ISnowflakeIdGenerator snowflakeIdGenerator,
-              // ErpPartDapperRepository erpdapperRepository,
-               WmsDapperRepository wmsDapper,
-           ICommonManager commonManager
-        ) : base(cache, excelImportService, snowflakeIdGenerator, commonManager)
-        {
-            _excelImportService = excelImportService;
-            _job = job;
-            _wmstbRespository = wmstbRespository;
-            _wmsRepository = wmsRepository;
-            _wmsVersionRepository = wmsVersionRepository;
-            _wmsefRespository = wmsefRespository;
-            _wmsDapper = wmsDapper;
-           // _erpdapperRepository = erpdapperRepository;
-        }
-
-        private async Task<long> GetCountAsync(WmsSharePartOutPutDetialRequestDto input)
-        {
-            input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "BillNum", Logic = EnumFilterLogic.And, Value = input.BillNum });
-            return await _wmsRepository.GetCountByFilterAsync(GuidGenerator.Create(), input.Filters);
-        }
-        /// <summary>
-        ///更新备注
-        /// </summary>
-        /// <param name="input"></param>
-        /// <returns></returns>
-        [HttpGet]
-        [Route("UpdateRemark")]
-
-        public async Task<bool> UpdateRemark(Guid id, string remark)
-        {
-            var entity = _wmsVersionRepository.FirstOrDefault(p => p.Id == id);
-            if (entity != null)
-            {
-                entity.Remark = remark;
-                await _wmsVersionRepository.UpdateAsync(entity);
-
-            }
-            return true;
-        }
-
-
-        private async Task<long> GetCountAsync(WmsSharePartOutPutRequestDto input)
-        {
-            return await _wmsVersionRepository.GetCountByFilterAsync(GuidGenerator.Create(), input.Filters);
-        }
-
-        /// <summary>
-        /// 准时化出库主表
-        /// </summary>
-        /// <param name="input"></param>
-        /// <returns></returns>
-        [HttpPost]
-        [Route("WmsSharePartList")]
-        //[Authorize(SettleAccountPermissions.SettleAccounts.Default)]
-        virtual public async Task<PagedResultDto<WmsSharePart90OutPut>> GetListAsync(WmsSharePartOutPutRequestDto input)
-        {
-
-            var entities = await _wmsVersionRepository.GetListByFilterAsync(GuidGenerator.Create(), input.Filters, input.Sorting, input.MaxResultCount,
-                 input.SkipCount, true);
-
-            var totalCount = await GetCountAsync(input);
-
-
-            return new PagedResultDto<WmsSharePart90OutPut>(totalCount, entities);
-        }
-
-        /// <summary>
-        ///  修改出库数量
-        /// </summary>
-        /// <param name="files">上传的文件(前端已经限制只能上传一个附件)</param>
-        /// <returns></returns>
-        [HttpPost]
-        [Route("WmsSharePartOutPutModify")]
-        [DisableRequestSizeLimit]
-
-        public async Task<bool> WmsSharePartUpdate(WmsSharePart90OutPutDetial detial)
-        {
-            var _entityList = _wmsRepository.Where(p => p.Id == detial.BranchId).ToList();
-            if (_entityList.Count() > 0)
-            {
-                foreach (var itm in _entityList)
-                {
-                    itm.OutPutQty = detial.OutPutQty;
-                    await _wmsRepository.UpdateAsync(itm);
-                }
-            }
-            return true;
-
-        }
-
-        /// <summary>
-        /// 准时化出库明细
-        /// </summary>
-        /// <param name="input"></param>
-        /// <returns></returns>
-        [HttpPost]
-        [Route("WmsSharePartDetailList")]
-        [UnitOfWork(false)]
-        //[Authorize(SettleAccountPermissions.SettleAccounts.Default)]
-        virtual public async Task<PagedResultDto<WmsSharePart90OutPutDetial>> GetListAsync(WmsSharePartOutPutDetialRequestDto input)
-        {
-            input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "BillNum", Logic = EnumFilterLogic.And, Value = input.BillNum });
-            var entities = await _wmsRepository.GetListByFilterAsync(GuidGenerator.Create(), input.Filters, input.Sorting, input.MaxResultCount,
-                 input.SkipCount, true);
-
-            var totalCount = await GetCountAsync(input);
-
-
-            var stockList = _wmsDapper.GetSalesStock("BJJS");
-            var query = from itm in entities
-                        join itm1 in stockList on itm.MaterialCode equals itm1.SapCode
-            into temp1
-                        from tm1 in temp1.DefaultIfEmpty()
-                        select new WmsSharePart90OutPutDetial(//少加个发货，由于零件有重复
-                        itm.Id,
-                        itm.WmsBillNum,
-                        itm.OrderBillNum,
-                        itm.MaterialCode,
-                        itm.MaterialDesc,
-                        itm.MaterialGroup,
-                        itm.OutPut,
-                        itm.InPut,
-                        itm.State,
-                        itm.Extend1,
-                        itm.Extend2,
-                        itm.Version,
-                        itm.ParentMaterialCode,
-                        itm.BillNum,
-                        itm.TaskId,
-                        itm.Remark,
-                        itm.Qty,
-                        tm1 == null ? 0 : tm1.Qty,
-                        itm.OutPutQty != 0 ? itm.OutPutQty : itm.Qty,
-                        itm.Price,
-                        itm.Amt
-                        );
-
-
-
-            return new PagedResultDto<WmsSharePart90OutPutDetial>(totalCount, entities);
-        }
-        /// <summary>
-        ///  任务明细标记已确认
-        /// </summary>
-        /// <param name="files">上传的文件(前端已经限制只能上传一个附件)</param>
-        /// <returns></returns>
-        [HttpPost]
-        [Route("WmsSharePartOutPutAudit")]
-        [DisableRequestSizeLimit]
-
-        public async Task<bool> WmsSharePartAudit(List<Guid> ids)
-        {
-            var _joblist = await _job.Where(p => ids.Contains(p.Id)).ToListAsync();
-            foreach (var itm in _joblist)
-            {
-                itm.FileName = "已确认";
-                await _job.UpdateAsync(itm);
-            }
-            return false;
-        }
-        /// <summary>
-        /// 选择任务，生成出库单，只包含已确认的单据
-        /// </summary>
-        /// <param name="ids"></param>
-        /// <param name="version"></param>
-        /// <returns></returns>
-        [HttpPost]
-        [Route("WmsSharePartOutPut")]
-        public async Task<string> WmsSharePartOutPut(WmsJitRequestDto input)
-        {
-            var _billNum = "B" + DateTime.Now.ToString("yyyyMMddhhmmss");
-            var _joblist = _job.Where(p => input.Guids.Contains(p.Id) && p.FileName == "已确认").ToList();
-            if (_joblist.Count() > 0)
-            {
-                var fileList = _joblist.Select(p => p.RealDownFileName).ToList();
-                List<WmsSharePart90OutPutDetial> _lst = new List<WmsSharePart90OutPutDetial>();
-                foreach (var filename in fileList)
-                {
-                    string fileSavePath = Environment.CurrentDirectory + @"\wwwroot\files\host\my-file-container\" + filename;
-                    ExcelHelper _excelHelper = new ExcelHelper(fileSavePath);
-                    var _list = _excelHelper.ExcelToListOne<WmsSharePart90OutPutDetial>();
-
-                    //var _list_withbillNo = _list.Select(p => p.BillNum != string.Empty);
-                    //var _list_withNoBillNo= _list.Select(p => p.BillNum == string.Empty);
-
-
-                    if (_list.Count() > 0)
-                    {
-                        var _lsAry = _list.Select(p => new
-                        WmsSharePart90OutPutDetial(
-                               GuidGenerator.Create(),
-                               p.WmsBillNum,
-                               p.OrderBillNum,
-                               p.MaterialCode,
-                               p.MaterialDesc,
-                               p.MaterialGroup,
-                               string.Empty,
-                               string.Empty,
-                               0,
-                               !string.IsNullOrEmpty(p.Extend1) ? p.Extend1 : string.Empty,
-                               string.Empty,
-                               p.Version,
-                               p.MaterialCode,
-                               _billNum,
-                               GuidGenerator.Create(),
-                               string.Empty,
-                               p.Qty,
-                               p.StockQty,
-                               p.Qty,
-                                 p.Price,
-                        p.Amt
-                        ));
-                        _lst.AddRange(_list.ToArray());
-                    }
-                }
-
-                var outPutDetail = await _wmsRepository.Where(p => p.Version == input.Version && p.State!=4).ToListAsync();
-
-                var error = from itm1 in outPutDetail
-                            join itm2 in _lst on
-                            new { itm1.MaterialCode, itm1.OrderBillNum, itm1.WmsBillNum }
-                            equals
-                            new { itm2.MaterialCode, itm2.OrderBillNum, itm2.WmsBillNum }
-                            select itm1;
-
-                var errList = error.GroupBy(p => new { p.BillNum }).Select(p => new { BillNum = p.Key.BillNum, Number = p.Sum(itm => itm.Qty) });
-                if (errList.Count() == 0)
-                {
-                    var query = from itm1 in _lst
-                                join itm2 in outPutDetail on
-                                new { itm1.MaterialCode, itm1.OrderBillNum, itm1.WmsBillNum }
-                                equals
-                                new { itm2.MaterialCode, itm2.OrderBillNum, itm2.WmsBillNum } into temp1
-                                from tm1 in temp1.DefaultIfEmpty()
-                                where tm1 == null
-                                select itm1;
-                    var _wmslst = query.ToList();
-                    _wmslst = _wmslst.Select(p => new
-                       WmsSharePart90OutPutDetial(
-                              GuidGenerator.Create(),
-                              p.WmsBillNum,
-                              p.OrderBillNum,
-                              p.MaterialCode,
-                              p.MaterialDesc,
-                              p.MaterialGroup,
-                              string.Empty,
-                              string.Empty,
-                              0,
-                              string.Empty,
-                               string.Empty,
-                              input.Version,
-                              p.MaterialCode,
-                              _billNum,
-                              GuidGenerator.Create(),
-                              string.Empty,
-                              p.Qty,
-                                  p.StockQty,
-                                  p.Qty,
-                                  p.Price,
-                        p.Amt
-                       )).ToList();
-                    await _wmsRepository.GetDbContext().BulkInsertAsync(_wmslst, new BulkConfig() { BulkCopyTimeout = 0, BatchSize = 10000 });
-                    int _count = _wmsVersionRepository.Count(p => p.Version == input.Version && p.BillNum == _billNum);
-                    if (_wmslst.Count() > 0 && _count == 0)
-                    {
-                        var _version = new WmsSharePart90OutPut(GuidGenerator.Create(), input.Version, _billNum, CurrentUser.Email,string.Empty);
-                        await _wmsVersionRepository.InsertAsync(_version, true);
-                    }
-                    foreach (var job in _joblist)
-                    {
-                        job.FileName = _billNum;
-                        await _job.UpdateAsync(job);
-                    }
-                }
-                else
-                {
-                    StringBuilder _buffer = new StringBuilder();
-                    foreach (var itm in errList)
-                    {
-                        _buffer.AppendFormat("出库单号:{0}重复记录数:{1}条", itm.BillNum, itm.Number);
-                    }
-                    var _errinfo = _buffer.ToString();
-
-                    foreach (var job in _joblist)
-                    {
-                        job.FileName = _errinfo;
-                        await _job.UpdateAsync(job);
-                    }
-                }
-            }
-            else
-            {
-                _billNum = string.Empty;
-            }
-            return ApplicationConsts.SuccessStr;
-        }
-        /// <summary>
-        /// 出库界面功能，核准出库功能
-        /// </summary>
-        /// <param name="version"></param>
-        /// <param name="p_list"></param>
-        /// <returns></returns>
-        [HttpPost]
-        [Route("WmsSharePartOutPut-Pass")]
-        [UnitOfWork(false)]
-        public async Task<bool> WmsSharePartOutPutPass(WmsJitRequestDto input)
-        {
-            //if (DateTime.Now.ToString("yyyyMM") != input.AccountDate.ToString("yyyyMM"))
-            //{
-            //    throw new BusinessException("8989", "填写过账日期应该为当月！");
-
-            //}
-            if (input.Guids != null)
-            {
-                List<WmsSharePart90OutPutDetial> _ls = new List<WmsSharePart90OutPutDetial>();
-                if (input.Guids.Count() > 0)
-                {
-                    _ls = await _wmsRepository.Where(p => input.Guids.Contains(p.Id) && p.Version == input.Version && p.BillNum == input.BillNum && p.State != 2 && p.State!=4).ToListAsync();
-                }
-                else
-                {
-                    _ls = await _wmsRepository.Where(p => p.Version == input.Version && p.BillNum == input.BillNum && p.State != 2 && p.State != 4).ToListAsync();
-                }
-                if (_ls.Count() > 0)
-                {
-                    var sql = "DECLARE	@return_value int\n" +
-                         "EXEC	@return_value = [dbo].[p_wms_output]\n" +
-                         "		@billnum = N'{0}',\n" +
-                         "		@type = 10,\n" +
-                         "      @date = N'{1}'\n" +
-                         "SELECT	'Return Value' = @return_value";
-                    await _wmsRepository.GetDbContext().Database.ExecuteSqlRawAsync(
-                       string.Format(sql, input.BillNum, input.AccountDate.ToShortDateString()));
-
-                }
-            }
-            return true;
-        }
-        /// <summary>
-        ///出库界面功能， 撤销核准出库
-        /// </summary>
-        /// <param name="ids"></param>
-        /// <param name="version"></param>
-        /// <returns></returns>
-        [HttpPost]
-        [Route("WmsSharePartOutPut-Cancel")]
-        [UnitOfWork(false)]
-        public async Task<bool> WmsSharePartOutPutCancel(WmsJitRequestDto input)
-        {
-            if (input.Guids != null && input.Guids.Count() > 0)
-            {
-                List<string> _ls = new List<string>();
-                foreach (var itm in input.Guids)
-                {
-                    _ls.Add(string.Format("{0}", itm));
-                }
-
-                string str = string.Join(",", _ls.ToArray());
-
-                var sql = "DECLARE	@return_value int\n" +
-                          "EXEC	@return_value = [dbo].[p_wms_output_cancel]\n" +
-                          "     @Guids ='{0}', \n" +
-                          "		@billnum = N'{1}',\n" +
-                          "		@type = 10,\n" +
-                          "     @accountdate = N'{2}'\n" +
-                          "SELECT	'Return Value' = @return_value";
-
-                sql = string.Format(sql, str, input.BillNum, input.AccountDate.ToShortDateString());
-
-                await _wmsRepository.GetDbContext().Database.ExecuteSqlRawAsync(
-                   sql
-                 );
-
-            }
-            return true;
-        }
-
-        /// <summary>
-        /// 出库界面功能删除
-        /// </summary>
-        /// <param name="version"></param>
-        /// <param name="p_list"></param>
-        /// <returns></returns>
-        [HttpPost]
-        [Route("WmsOutPutDelete")]
-        [UnitOfWork(false)]
-        public async Task<bool> WmsOutPutDelete(WmsJitRequestDto input)
-        {
-            var count = _wmsRepository.Count(p => p.BillNum == input.BillNum && p.State != 0);
-
-            if (count > 0)
-            {
-                return false;
-            }
-            var sql = "DECLARE	@return_value int\n" +
-                      "EXEC	@return_value = [dbo].[p_wms_output_cancel_all]\n" +
-                      "		@billnum = N'{0}',\n" +
-                      "		@type = 10\n" +
-                      "SELECT	'Return Value' = @return_value";
-            await _wmsRepository.GetDbContext().Database.ExecuteSqlRawAsync(
-               string.Format(sql, input.BillNum)
-             );
-
-
-
-            return true;
-        }
-
-
-
-        [HttpPost]
-        [Route("ExcelImport")]
-        [DisableRequestSizeLimit]
-        //[UnitOfWork(false)]
-        //[Authorize(SettleAccountPermissions.SettleAccounts.Default)]
-        public async Task<string> ExcelImport([FromForm] IFormFileCollection files, string version)
-        {
-            var _billNum = "B" + DateTime.Now.ToString("yyyyMMddhhmmss");
-            var checkList = new List<ErrorExportDto>();
-            ExportImporter _exportImporter = new ExportImporter();
-            var result = await _exportImporter.ExtendExcelOfSheetOneImport<WmsSharePart90OutPutDetial>(files, _excelImportService);
-            //检验1:导入模板中的第一页签数据不能为空
-            if (result == null || result.Count == 0)
-            {
-                checkList.Add(new ErrorExportDto(version, "大众备件出库单导入", string.Empty, string.Empty, string.Empty, string.Empty, "导入模板中第一页签没有数据，请检查！", string.Empty));
-            }
-            if (checkList.Count > 0)
-            {
-                return await ExportErrorReportAsync(checkList);
-            }
-
-
-            var filteResult = result.Where(p =>!string.IsNullOrEmpty(p.OrderBillNum));//过滤掉订单号为空的数据，限制这样数据导入
-            //检验2:导入模板中的结算数据是否为0
-            foreach (var itm in filteResult)
-            {
-                if (itm.Qty == 0)
-                {
-                    checkList.Add(new ErrorExportDto(version, "大众备件出库单导入", string.Empty, string.Empty, string.Empty, string.Empty, string.Format("导入模板中订单号{0}结算数量为０，影响出库请检查！", itm.OrderBillNum), string.Empty));
-                }
-            }
-
-            //和物料主数据中SAP物料号检验是否存在
-            //foreach (var itm in filteResult)
-            //{
-            //    if (!_erpdapperRepository.GetMaterialList().Any(p => p.MaterialCode == itm.MaterialCode))
-            //    {
-            //        checkList.Add(new ErrorExportDto(version, "大众备件出库单导入", string.Empty, string.Empty, itm.MaterialCode, string.Empty, string.Format("物料主数据不存在当前导入的物料号{0}！", itm.MaterialCode), string.Empty));
-            //    }
-            //}
-
-            if (checkList.Count > 0)
-            {
-                return await ExportErrorReportAsync(checkList);
-            }
-            List<WmsSharePart90OutPutDetial> _lst = new List<WmsSharePart90OutPutDetial>();
-
-            var _lsCopy = new List<WmsSharePart90OutPutDetial>();
-            foreach (var itm in filteResult)
-            {
-                WmsSharePart90OutPutDetial _detail = new WmsSharePart90OutPutDetial(
-                GuidGenerator.Create(),
-                //itm.WmsBillNum,
-                string.Empty,
-                itm.OrderBillNum,
-
-                itm.MaterialCode,
-                itm.MaterialDesc,
-                itm.MaterialGroup,
-                string.Empty,
-                string.Empty,
-                0,
-                string.Empty,
-                string.Empty,
-                version,
-                itm.ParentMaterialCode,
-                itm.BillNum,
-                GuidGenerator.Create()
-                , string.Empty
-                , itm.Qty
-                , 0
-                , itm.Qty,
-                  itm.Price,
-                  itm.Amt
-                );
-                _lsCopy.Add(_detail);
-            }
-            _lst.AddRange(_lsCopy.ToArray());
-
-            //检验3：导入模板中订单号+物料号，不能重复
-            var _isRepeatOfReportList = from arc in _lst
-                                        group arc by new { arc.OrderBillNum, arc.MaterialCode }
-                                        into g
-                                        where g.Count() > 1
-                                        select g;
-            foreach (var itm in _isRepeatOfReportList)
-            {
-                checkList.Add(new ErrorExportDto(version, "大众备件出库单", string.Empty, string.Empty, string.Empty, string.Empty, string.Format("导入模板中订单号{0}组合物料号{1}有重复，请检查！", itm.Key.OrderBillNum, itm.Key.MaterialCode), string.Empty));
-            }
-            if (checkList.Count > 0)
-            {
-                return await ExportErrorReportAsync(checkList);
-            }
-
-
-            var outPutDetail = await _wmsRepository.Where(p => p.Version == version).ToListAsync();
-
-            var error = from itm1 in outPutDetail
-                        join itm2 in _lst on
-                        new { itm1.OrderBillNum, itm1.MaterialCode }
-                        equals
-                        new {itm2.OrderBillNum, itm2.MaterialCode }
-                        select itm1;
-            var errList = error.GroupBy(p => new { p.BillNum }).Select(p => new { BillNum = p.Key.BillNum, Number = p.Sum(itm => itm.Qty) });
-
-            
-            foreach (var itm in errList)
-            {
-                checkList.Add(new ErrorExportDto() { Message = string.Format("出库单号:{0}重复记录数:{1}条", itm.BillNum, itm.Number) });
-            }
-            if (checkList.Count > 0)
-            {
-
-                return await ExportErrorReportAsync(checkList);
-            }
-
-            var query = from itm1 in _lst
-                        join itm2 in outPutDetail on
-                        new { itm1.MaterialCode }
-                        equals
-                        new { itm2.MaterialCode } into temp1
-                        from tm1 in temp1.DefaultIfEmpty()
-                        where tm1 == null
-                        select itm1;
-            var _wmslst = query.ToList();
-            foreach (var itm in _wmslst)
-            {
-                itm.BillNum = _billNum;
-            }
-            await _wmsRepository.GetDbContext().BulkInsertAsync(_wmslst, new BulkConfig() { BulkCopyTimeout = 0, BatchSize = 10000 });
-            int _count = _wmsVersionRepository.Count(p => p.Version == version && p.BillNum == _billNum);
-            if (_count == 0 && _wmslst.Count() > 0)
-            {
-                var _version = new WmsSharePart90OutPut(GuidGenerator.Create(), version, _billNum, CurrentUser.Email,string.Empty);
-                await _wmsVersionRepository.InsertAsync(_version, true);
-            }
-            return ApplicationConsts.SuccessStr;
-        }
-
-        private async Task<bool> CheckIsOutPut(List<WmsSharePart90OutPutDetial> p_list)
-        {
-            if (p_list.Count() > 0)
-            {
-              var entity=  p_list.FirstOrDefault();
-              var day = entity.OrderBillNum.Right(3);
-                int _count = 0;
-                if (day == "D60")
-                {
-                    _count= _wmsRepository.Count(p => p.Version == entity.Version && p.OrderBillNum.Contains("D30") && p.State!=2);
-                }
-                if (day == "D90")
-                {
-                   _count = _wmsRepository.Count(p => p.Version == entity.Version && p.State != 2 && (p.OrderBillNum.Contains("D60") || p.OrderBillNum.Contains("D30")));
-                }
-                if (_count > 0)
-                {
-                    return false;
-                }
-            }
-            return true;
-         
-        }
-
-        /// <summary>
-        ///单据列表
-        /// </summary>
-        /// <param name="version"></param>
-        /// <param name="p_list"></param>
-        /// <returns></returns>
-        [HttpPost]
-        [Route("GetBillList")]
-        [UnitOfWork(false)]
-
-
-        public async Task<List<string>> GetBillList(string version)
-        {
-            var _query=_wmsRepository.Where(p => p.Version == version 
-            && (p.OrderBillNum.Contains("D60") 
-            || p.OrderBillNum.Contains("D30") 
-            || p.OrderBillNum.Contains("D90"))).Select(p=>p.OrderBillNum).Distinct();
-            return _query.ToList();
-
-        }
-
-        /// <summary>
-        /// 导出
-        /// </summary>
-        /// <param name="input"></param>
-        /// <returns></returns>
-        [HttpPost]
-        [Route("Export")]
-        //[Authorize(SettleAccountPermissions.SettleAccounts.Default)]
-        virtual public async Task<string> ExportAsync(WmsKanbanOutPutDetialRequestDto input)
-        {
-            input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "BillNum", Logic = EnumFilterLogic.And, Value = input.BillNum });
-            var entities = await _wmsRepository.GetListByFilterAsync(GuidGenerator.Create(), input.Filters, input.Sorting, int.MaxValue,
-                 0, true);
-
-            var dtos = ObjectMapper.Map<List<WmsSharePart90OutPutDetial>, List<WmsSharePart90OutPutDetialDto>>(entities);
-
-            IExporter _excel = new ExcelExporter();
-            byte[] result = null;
-
-            var _fileName = string.Format("大众备件手工出库单_{0}.xlsx", Guid.NewGuid().ToString());
-            result = await _excel.ExportAsByteArray(dtos);
-
-
-            result.ShouldNotBeNull();
-
-            //保存导出文件到服务器存成二进制
-            await _excelImportService.SaveBlobAsync(
-                     new SaveExcelImportInputDto
-                     {
-                         Name = _fileName,
-                         Content = result
-                     }
-                 );
-            return _fileName;
-
-
-
-        }
-
-
-
-
-
-
-    }
-}
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSSharePartAppService.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSSharePartAppService.cs
deleted file mode 100644
index cfd1c9e6..00000000
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSSharePartAppService.cs
+++ /dev/null
@@ -1,945 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.Extensions.Caching.Distributed;
-using AutoMapper;
-using System.Linq;
-using System.Text;
-using Volo.Abp.Guids;
-using Volo.Abp.Application.Services;
-using Volo.Abp.Caching;
-
-using Volo.Abp.ObjectMapping;
-using Win.Sfs.SettleAccount.ExcelImporter;
-using Win.Sfs.Shared.CacheBase;
-using Win.Utils;
-using Volo.Abp.Application.Dtos;
-using Win.Sfs.BaseData.ImportExcelCommon;
-using Volo.Abp.Domain.Repositories;
-using EFCore.BulkExtensions;
-using System.IO;
-using Microsoft.EntityFrameworkCore;
-using Win.Sfs.SettleAccount.Entities.SettleAccountVersion;
-using Win.Sfs.SettleAccount.FISes;
-using Win.Sfs.Shared.Enums.SettleAccount;
-using Win.Sfs.Shared.Filter;
-using Shouldly;
-using Magicodes.ExporterAndImporter.Csv;
-using Magicodes.ExporterAndImporter.Core;
-using Magicodes.ExporterAndImporter.Excel;
-using System.Data.Common;
-using Volo.Abp.Uow;
-using Volo.Abp;
-using Win.Abp.Snowflakes;
-using Win.Sfs.SettleAccount.CommonManagers;
-using Win.Sfs.SettleAccount.ExportReports;
-using Win.Sfs.SettleAccount.Constant;
-using Win.Sfs.SettleAccount.MaterialRelationships;
-using Win.Sfs.SettleAccount.Entities.TaskJobs;
-using Magicodes.ExporterAndImporter.Core.Models;
-
-using TaskJob.Services;
-using TaskJob.EventArgs;
-using Win.Sfs.SettleAccount.Entities.WMS;
-using Win.Sfs.SettleAccount.Entities.Wms;
-using Win.Sfs.SettleAccount.Repository;
-using WY.NewJit.Extends.PaiGe.WMS;
-using Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report;
-
-namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
-{
-    /// <summary>
-    /// 大众备件无单号出库单
-    /// </summary>
-
-    //[AllowAnonymous]
-    [Route("api/settleaccount/wmsSharePartoutput")]
-    [Authorize(SettleAccountPermissions.WMSJIT.Default)]
-    public class WMSSharePartAppService :
-         SettleAccountApplicationBase<WmsSharePartOutPutDetial>
-    {
-        private readonly ISettleAccountBranchEfCoreRepository<WmsSharePartOutPutDetial, Guid> _wmsRepository;
-        private readonly ISettleAccountBranchEfCoreRepository<WmsSharePartOutPut, Guid> _wmsVersionRepository;
-
-        private readonly ISettleAccountBranchEfCoreRepository<WmsSharePart90OutPutDetial, Guid> _wmsRepository90;
-        private readonly ISettleAccountBranchEfCoreRepository<WmsSharePart90OutPut, Guid> _wmsVersionRepository90;
-
-
-        private readonly WMSEfCoreRepository<WmsSharePartOutPutDetial> _wmsefRespository
-            ;
-        private readonly WmsDapperRepository _wmsDapper;
-        private readonly WMSEfCoreRepository<TB_BILL> _wmstbRespository;
-        private readonly ISettleAccountBranchEfCoreRepository<TaskJob, Guid> _job;
-        private readonly IExcelImportAppService _excelImportService;
-
-        private readonly TaskJobService _service;
-        private readonly ErpPartDapperRepository _erpdapperRepository;
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="wmsRepository"></param>
-        /// <param name="job"></param>
-        /// <param name="wmsVersionRepository"></param>
-        /// <param name="wmsefRespository"></param>
-        /// <param name="wmstbRespository"></param>
-        public WMSSharePartAppService(
-
-            ISettleAccountBranchEfCoreRepository<WmsSharePartOutPutDetial, Guid> wmsRepository,
-            ISettleAccountBranchEfCoreRepository<TaskJob, Guid> job,
-            ISettleAccountBranchEfCoreRepository<WmsSharePartOutPut, Guid> wmsVersionRepository,
-            WMSEfCoreRepository<WmsSharePartOutPutDetial> wmsefRespository,
-            WMSEfCoreRepository<TB_BILL> wmstbRespository,
-            IExcelImportAppService excelImportService,
-             IDistributedCache<WmsSharePartOutPutDetial> cache,
-             ISnowflakeIdGenerator snowflakeIdGenerator,
-           ICommonManager commonManager,
-            ErpPartDapperRepository erpdapperRepository,
-             ISettleAccountBranchEfCoreRepository<WmsSharePart90OutPutDetial, Guid> wmsRepository90,
-            ISettleAccountBranchEfCoreRepository<WmsSharePart90OutPut, Guid> wmsVersionRepository90,
-              WmsDapperRepository wmsDapper
-        ) : base(cache, excelImportService, snowflakeIdGenerator, commonManager)
-        {
-            _excelImportService = excelImportService;
-            _job = job;
-            _wmstbRespository = wmstbRespository;
-            _wmsRepository = wmsRepository;
-            _wmsVersionRepository = wmsVersionRepository;
-            _wmsDapper = wmsDapper;
-            _wmsefRespository = wmsefRespository;
-
-            _wmsRepository90 = wmsRepository90;
-            _wmsVersionRepository90 = wmsVersionRepository90;
-            _erpdapperRepository = erpdapperRepository;
-        }
-
-        private async Task<long> GetCountAsync(WmsSharePartOutPutDetialRequestDto input)
-        {
-            input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "BillNum", Logic = EnumFilterLogic.And, Value = input.BillNum });
-            return await _wmsRepository.GetCountByFilterAsync(GuidGenerator.Create(), input.Filters);
-        }
-
-        private async Task<long> GetCountAsync(WmsSharePartOutPutRequestDto input)
-        {
-            return await _wmsVersionRepository.GetCountByFilterAsync(GuidGenerator.Create(), input.Filters);
-        }
-
-       /// <summary>
-       /// 准时化出库主表
-       /// </summary>
-       /// <param name="input"></param>
-       /// <returns></returns>
-        [HttpPost]
-        [Route("WmsSharePartList")]
-        //[Authorize(SettleAccountPermissions.SettleAccounts.Default)]
-        virtual public async Task<PagedResultDto<WmsSharePartOutPut>> GetListAsync( WmsSharePartOutPutRequestDto input)
-        {
-     
-            var entities = await _wmsVersionRepository.GetListByFilterAsync(GuidGenerator.Create(), input.Filters, input.Sorting, input.MaxResultCount,
-                 input.SkipCount, true);
-
-            var totalCount = await GetCountAsync(input);
-          
-
-            return new PagedResultDto<WmsSharePartOutPut>(totalCount, entities);
-        }
-        /// <summary>
-        ///更新备注
-        /// </summary>
-        /// <param name="input"></param>
-        /// <returns></returns>
-        [HttpGet]
-        [Route("UpdateRemark")]
-
-        public async Task<bool> UpdateRemark(Guid id, string remark)
-        {
-            var entity = _wmsVersionRepository.FirstOrDefault(p => p.Id == id);
-            if (entity != null)
-            {
-                entity.Remark = remark;
-                await _wmsVersionRepository.UpdateAsync(entity);
-
-            }
-            return true;
-        }
-        /// <summary>
-        /// 准时化出库明细
-        /// </summary>
-        /// <param name="input"></param>
-        /// <returns></returns>
-        [HttpPost]
-        [Route("WmsSharePartDetailList")]
-        [UnitOfWork(false)]
-        //[Authorize(SettleAccountPermissions.SettleAccounts.Default)]
-        virtual public async Task<PagedResultDto<WmsSharePartOutPutDetial>> GetListAsync(WmsSharePartOutPutDetialRequestDto input)
-        {
-            input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "BillNum", Logic = EnumFilterLogic.And, Value = input.BillNum });
-            var entities = await _wmsRepository.GetListByFilterAsync(GuidGenerator.Create(), input.Filters, input.Sorting, input.MaxResultCount,
-                 input.SkipCount, true);
-            var stockList = _wmsDapper.GetSalesStock("BJJS");
-            var query = from itm in entities
-                        join itm1 in stockList on itm.MaterialCode equals itm1.SapCode
-            into temp1
-                        from tm1 in temp1.DefaultIfEmpty()
-                        select new WmsSharePartOutPutDetial(//少加个发货，由于零件有重复
-                        itm.Id,
-                        itm.WmsBillNum,
-                        itm.OrderBillNum,
-                        itm.MaterialCode,
-                        itm.MaterialDesc,
-                        itm.MaterialGroup,
-                        itm.OutPut,
-                        itm.InPut,
-                        itm.State,
-                        itm.Extend1,
-                        itm.Extend2,
-                        itm.Version,
-                        itm.ParentMaterialCode,
-                        itm.BillNum,
-                        itm.TaskId,
-                        itm.Remark,
-                        itm.Qty,
-                        tm1 == null ? 0 : tm1.Qty,
-                        itm.OutPutQty,
-                        itm.Price,
-                        itm.Amt,
-                        itm.RealityNumber
-                        );
-
-
-            var totalCount = await GetCountAsync(input);
-            return new PagedResultDto<WmsSharePartOutPutDetial>(totalCount, query.ToList());
-        }
-        /// <summary>
-        ///  任务明细标记已确认
-        /// </summary>
-        /// <param name="files">上传的文件(前端已经限制只能上传一个附件)</param>
-        /// <returns></returns>
-        [HttpPost]
-        [Route("WmsSharePartOutPutAudit")]
-        [DisableRequestSizeLimit]
-
-        public async Task<bool> WmsSharePartAudit(List<Guid> ids)
-        {
-            var _joblist = await _job.Where(p => ids.Contains(p.Id)).ToListAsync();
-            foreach (var itm in _joblist)
-            {
-                itm.FileName = "已确认";
-                await _job.UpdateAsync(itm);
-            }
-            return false;
-        }
-
-
-       
-        /// <summary>
-        /// 选择任务，生成出库单，只包含已确认的单据
-        /// </summary>
-        /// <param name="ids"></param>
-        /// <param name="version"></param>
-        /// <returns></returns>
-        [HttpPost]
-        [Route("WmsSharePartOutPut")]
-        public async Task<string> WmsSharePartOutPut(WmsJitRequestDto input)
-        {
-            var _billNum = "B" + DateTime.Now.ToString("yyyyMMddhhmmss");
-            var _billNoNum = "BNoBill" + DateTime.Now.ToString("yyyyMMddhhmmss");
-            var _joblist = _job.Where(p => input.Guids.Contains(p.Id) && p.FileName == "已确认").ToList();
-            if (_joblist.Count() > 0)
-            {
-                var fileList = _joblist.Select(p => p.RealDownFileName).ToList();
-                List<WmsSharePartOutPutDetial> _lst = new List<WmsSharePartOutPutDetial>();//无订单
-                List<WmsSharePart90OutPutDetial> _lst90Bill = new List<WmsSharePart90OutPutDetial>();//有订单
-                foreach (var filename in fileList)
-                {
-                    string fileSavePath = Environment.CurrentDirectory + @"\wwwroot\files\host\my-file-container\" + filename;
-                    ExcelHelper _excelHelper = new ExcelHelper(fileSavePath);
-
-                    var _listSummary = _excelHelper.ExcelToListOne<WmsSharePartOutPutDetial>();//无单号
-
-                    var _list90Summary = _excelHelper.ExcelToListOne<WmsSharePart90OutPutDetial>();//有单号
-
-                    //NoOrder用来标识采购订单号为空的数据
-                    var _list = _listSummary.Where(p => p.OrderBillNum == "NoOrder").ToList();//没有采购订单号的集合
-                    var _list90Bill = _list90Summary.Where(p => !string.IsNullOrEmpty(p.OrderBillNum) && p.OrderBillNum != "NoOrder").ToList();//有采购订单号的集合
-
-
-                    //var _list = _excelHelper.ExcelToList<WmsSharePartOutPutDetial>();
-                    //没有 采购订单号
-                    if (_list != null && _list.Count > 0)
-                    {
-                        var _lsAry = _list.Select(p => new
-                        WmsSharePartOutPutDetial(
-                               GuidGenerator.Create(),
-                               string.Empty,
-                               string.Empty,
-                               p.MaterialCode,
-                               p.MaterialDesc,
-                               p.MaterialGroup,
-                               string.Empty,
-                               string.Empty,
-                               0,
-                               !string.IsNullOrEmpty(p.Extend1) ? p.Extend1 : string.Empty,
-
-                               string.Empty,
-                               string.Empty,
-                               p.MaterialCode,
-                               _billNoNum,
-                               GuidGenerator.Create(),
-                               string.Empty,
-                               p.Qty,
-                                  p.StockQty,
-                                  p.Qty,
-                                  p.Price,
-                                  p.Amt,
-                                  p.RealityNumber
-                        ));
-                        _lst.AddRange(_list.ToArray());
-                    }
-
-                    if (_list90Bill != null && _list90Bill.Count() > 0)
-                    {
-                        var _lsAry = _list90Bill.Select(p => new
-                        WmsSharePart90OutPutDetial(
-                               GuidGenerator.Create(),
-                               p.WmsBillNum,
-                               p.OrderBillNum,
-                               p.MaterialCode,
-                               p.MaterialDesc,
-                               p.MaterialGroup,
-                               string.Empty,
-                               string.Empty,
-                               0,
-                               !string.IsNullOrEmpty(p.Extend1) ? p.Extend1 : string.Empty,
-
-                               string.Empty,
-                               string.Empty,
-                               p.MaterialCode,
-                               _billNum,
-                               GuidGenerator.Create(),
-                               string.Empty,
-                               p.Qty,
-                                  p.StockQty,
-                                  p.Qty,
-                                  p.Price,
-                                  p.Amt
-                        ));
-                        _lst90Bill.AddRange(_list90Bill.ToArray());
-                    }
-                }
-
-
-                if (_lst != null && _lst.Count>0)
-                {
-                    //没有采购订单号
-                    var outPutDetail = await _wmsRepository.Where(p => p.Version == input.Version && string.IsNullOrEmpty(p.OrderBillNum)).ToListAsync();
-
-                    var error = from itm1 in outPutDetail
-                                join itm2 in _lst on
-                                new { itm1.MaterialCode }
-                                equals
-                                new { itm2.MaterialCode }
-                                select itm1;
-
-                    var errList = error.GroupBy(p => new { p.BillNum }).Select(p => new { BillNum = p.Key.BillNum, Number = p.Sum(itm => itm.Qty) });
-                    if (errList.Count() == 0)
-                    {
-                        var query = from itm1 in _lst
-                                    join itm2 in outPutDetail on
-                                    new { itm1.MaterialCode }
-                                    equals
-                                    new { itm2.MaterialCode } into temp1
-                                    from tm1 in temp1.DefaultIfEmpty()
-                                    where tm1 == null
-                                    select itm1;
-                        var _wmslst = query.ToList();
-                        _wmslst = _wmslst.Select(p => new
-                           WmsSharePartOutPutDetial(
-                                  GuidGenerator.Create(),
-                                  string.Empty,
-                                  string.Empty,
-                                  p.MaterialCode,
-                                  p.MaterialDesc,
-                                  p.MaterialGroup,
-                                  string.Empty,
-                                  string.Empty,
-                                  0,
-                                  !string.IsNullOrEmpty(p.Extend1) ? p.Extend1 : string.Empty,
-                                  string.Empty,
-                                  input.Version,
-                                  p.MaterialCode,
-                                  _billNoNum,
-                                  GuidGenerator.Create(),
-                                  string.Empty,
-                                  p.Qty,
-                                       p.StockQty,
-                                       p.Qty,
-                                       p.Price,
-                                       p.Amt,p.RealityNumber
-                           )).ToList();
-                        await _wmsRepository.GetDbContext().BulkInsertAsync(_wmslst, new BulkConfig() { BulkCopyTimeout = 0, BatchSize = 10000 });
-                        int _count = _wmsVersionRepository.Count(p => p.Version == input.Version && p.BillNum == _billNoNum);
-                        if (_wmslst.Count() > 0 && _count == 0)
-                        {
-                            var _version = new WmsSharePartOutPut(GuidGenerator.Create(), input.Version, _billNoNum, CurrentUser.Email,string.Empty);
-                            _version.Remark= !string.IsNullOrEmpty(_joblist.FirstOrDefault().Remark) ? _joblist.FirstOrDefault().Remark : string.Empty;
-
-
-                            await _wmsVersionRepository.InsertAsync(_version, true);
-                        }
-                        foreach (var job in _joblist)
-                        {
-                            job.FileName = _billNoNum;
-                            await _job.UpdateAsync(job);
-                        }
-                    }
-                    else
-                    {
-                        StringBuilder _buffer = new StringBuilder();
-                        foreach (var itm in errList)
-                        {
-                            _buffer.AppendFormat("出库单号:{0}重复记录数:{1}条", itm.BillNum, itm.Number);
-                        }
-                        var _errinfo = _buffer.ToString();
-
-                        foreach (var job in _joblist)
-                        {
-                            job.FileName = _errinfo;
-                            await _job.UpdateAsync(job);
-                        }
-                    }
-                }
-
-
-                //有采购订单号
-                //往Set_WmsSharePart90OutPutDetial表中存储
-                if (_lst90Bill != null && _lst90Bill.Count>0)
-                {
-                    //有采购订单号
-                    var outPutDetailBill = await _wmsRepository90.Where(p => p.Version == input.Version && !string.IsNullOrEmpty(p.OrderBillNum)).ToListAsync();
-
-                    var error = from itm1 in outPutDetailBill
-                                join itm2 in _lst90Bill on
-                                new { itm1.MaterialCode, itm1.OrderBillNum }
-                                equals
-                                new { itm2.MaterialCode, itm2.OrderBillNum }
-                                select itm1;
-
-                    var errList = error.GroupBy(p => new { p.BillNum }).Select(p => new { BillNum = p.Key.BillNum, Number = p.Sum(itm => itm.Qty) });
-                    if (errList.Count() == 0)
-                    {
-                        var queryBill = from itm1 in _lst90Bill
-                                        join itm2 in outPutDetailBill on
-                                        new { itm1.MaterialCode, itm1.OrderBillNum }
-                                        equals
-                                        new { itm2.MaterialCode, itm2.OrderBillNum } into temp1
-                                        from tm1 in temp1.DefaultIfEmpty()
-                                        where tm1 == null
-                                        select itm1;
-                        var _wmslstBill = queryBill.ToList();
-                        _wmslstBill = _wmslstBill.Select(p => new
-                           WmsSharePart90OutPutDetial(
-                                  GuidGenerator.Create(),
-                                  p.WmsBillNum,
-                                  p.OrderBillNum,
-                                  p.MaterialCode,
-                                  p.MaterialDesc,
-                                  p.MaterialGroup,
-                                  string.Empty,
-                                  string.Empty,
-                                  0,
-                                  !string.IsNullOrEmpty(p.Extend1) ? p.Extend1 : string.Empty,
-                                  string.Empty,
-                                  input.Version,
-                                  p.MaterialCode,
-                                  _billNum,
-                                  GuidGenerator.Create(),
-                                  string.Empty,
-                                  p.Qty,
-                                       p.StockQty,
-                                       p.Qty,
-                                       p.Price,
-                                       p.Amt
-                           )).ToList();
-
-                        await _wmsRepository90.GetDbContext().BulkInsertAsync(_wmslstBill, new BulkConfig() { BulkCopyTimeout = 0, BatchSize = 10000 });
-                        int _count = _wmsVersionRepository90.Count(p => p.Version == input.Version && p.BillNum == _billNum);
-                        if (_wmslstBill.Count() > 0 && _count == 0)
-                        {
-                            var _version = new WmsSharePart90OutPut(GuidGenerator.Create(), input.Version, _billNum, CurrentUser.Email,string.Empty);
-
-                            _version.Remark=  !string.IsNullOrEmpty(_joblist.FirstOrDefault().Remark) ? _joblist.FirstOrDefault().Remark : string.Empty;
-
-                            await _wmsVersionRepository90.InsertAsync(_version, true);
-                        }
-                        foreach (var job in _joblist)
-                        {
-                            job.FileName = _billNum;
-                            await _job.UpdateAsync(job);
-                        }
-                    }
-                    else
-                    {
-                        StringBuilder _buffer = new StringBuilder();
-                        foreach (var itm in errList)
-                        {
-                            _buffer.AppendFormat("出库单号:{0}重复记录数:{1}条", itm.BillNum, itm.Number);
-                        }
-                        var _errinfo = _buffer.ToString();
-
-                        foreach (var job in _joblist)
-                        {
-                            job.FileName = _errinfo;
-                            await _job.UpdateAsync(job);
-                        }
-                    }
-                }
-
-
-            }
-            else
-            {
-                _billNum = string.Empty;
-                _billNoNum = string.Empty;
-            }
-            return ApplicationConsts.SuccessStr;
-        }
-
-
-
-        /// <summary>
-        /// 出库界面功能，核准出库功能
-        /// </summary>
-        /// <param name="version"></param>
-        /// <param name="p_list"></param>
-        /// <returns></returns>
-        [HttpPost]
-        [Route("WmsSharePartOutPut-Pass")]
-        [UnitOfWork(false)]
-        public async Task<bool> WmsSharePartOutPutPass(WmsJitRequestDto input)
-        {
-            //if (DateTime.Now.ToString("yyyyMM") != input.AccountDate.ToString("yyyyMM"))
-            //{
-            //    throw new BusinessException("8989", "填写过账日期应该为当月！");
-
-            //}
-            if (input.Guids != null)
-            {
-                List<WmsSharePartOutPutDetial> _ls = new List<WmsSharePartOutPutDetial>();
-                if (input.Guids.Count() > 0)
-                {
-                    _ls = await _wmsRepository.Where(p => input.Guids.Contains(p.Id) && p.Version == input.Version && p.BillNum == input.BillNum && p.State != 2 && p.State!=4).ToListAsync();
-                }
-                else
-                {
-                    _ls = await _wmsRepository.Where(p => p.Version == input.Version && p.BillNum == input.BillNum && p.State != 2 && p.State!=4).ToListAsync();
-                }
-                if (_ls.Count() > 0)
-                {
-                    var sql = "DECLARE	@return_value int\n" +
-                         "EXEC	@return_value = [dbo].[p_wms_output]\n" +
-                         "		@billnum = N'{0}',\n" +
-                         "		@type = 2,\n" +
-                         "      @date = N'{1}'\n" +
-                         "SELECT	'Return Value' = @return_value";
-                    await _wmsRepository.GetDbContext().Database.ExecuteSqlRawAsync(
-                       string.Format(sql, input.BillNum, input.AccountDate.ToShortDateString()));
-
-                }
-            }
-
-            return true;
-        }
-
-
-
-        [HttpPost]
-        [Route("WmsSharePartOutPutModify")]
-        [DisableRequestSizeLimit]
-        public async Task<bool> WmsSharePartUpdate(WmsSharePartOutPutDetial detial)
-        {
-            var _entityList = _wmsRepository.Where(p => p.Id == detial.BranchId).ToList();
-            if (_entityList.Count() > 0)
-            {
-                foreach (var itm in _entityList)
-                {
-                    itm.OutPutQty = detial.OutPutQty;
-                    await _wmsRepository.UpdateAsync(itm);
-                }
-            }
-            return true;
-
-        }
-        /// <summary>
-        ///出库界面功能， 撤销核准出库
-        /// </summary>
-        /// <param name="ids"></param>
-        /// <param name="version"></param>
-        /// <returns></returns>
-        [HttpPost]
-        [Route("WmsSharePartOutPut-Cancel")]
-        [UnitOfWork(false)]
-        public async Task<bool> WmsSharePartOutPutCancel(WmsJitRequestDto input)
-        {
-            //没有有采购单据号的单子
-            if (input.Guids != null && input.Guids.Count() > 0)
-            {
-                List<string> _ls = new List<string>();
-                foreach (var itm in input.Guids)
-                {
-                    _ls.Add(string.Format("{0}", itm));
-                }
-
-                string str = string.Join(",", _ls.ToArray());
-
-                var sql = "DECLARE	@return_value int\n" +
-                          "EXEC	@return_value = [dbo].[p_wms_output_cancel]\n" +
-                          "     @Guids ='{0}', \n" +
-                          "		@billnum = N'{1}',\n" +
-                          "		@type = 2,\n" +
-                          "     @accountdate = N'{2}'\n" +
-                          "SELECT	'Return Value' = @return_value";
-
-                sql = string.Format(sql, str, input.BillNum, input.AccountDate.ToShortDateString());
-
-                await _wmsRepository.GetDbContext().Database.ExecuteSqlRawAsync(
-                   sql
-                 );
-
-            }
-
-            return true;
-        }
-
-        /// <summary>
-        /// 出库界面功能删除
-        /// </summary>
-        /// <param name="version"></param>
-        /// <param name="p_list"></param>
-        /// <returns></returns>
-        [HttpPost]
-        [Route("WmsOutPutDelete")]
-        [UnitOfWork(false)]
-        public async Task<bool> WmsOutPutDelete(WmsJitRequestDto input)
-        {
-            //没有采购单据号的单子
-            var count = _wmsRepository.Count(p => p.BillNum == input.BillNum && p.State != 0);
-
-            if (count > 0)
-            {
-                return false;
-            }
-            var sql = "DECLARE	@return_value int\n" +
-                      "EXEC	@return_value = [dbo].[p_wms_output_cancel_all]\n" +
-                      "		@billnum = N'{0}',\n" +
-                      "		@type = 2\n" +
-                      "SELECT	'Return Value' = @return_value";
-            await _wmsRepository.GetDbContext().Database.ExecuteSqlRawAsync(
-               string.Format(sql, input.BillNum)
-             );
-
-            return true;
-        }
-
-        /// <summary>
-        /// 出库单导入功能
-        /// </summary>
-        /// <param name="files"></param>
-        /// <param name="version"></param>
-        /// <returns></returns>
-        [HttpPost]
-        [Route("ExcelImport")]
-        [DisableRequestSizeLimit]
-        [UnitOfWork(false)]
-        //[Authorize(SettleAccountPermissions.SettleAccounts.Default)]
-        public async Task<string> ExcelImport([FromForm] IFormFileCollection files, string version)
-        {
-            var checkList = new List<ErrorExportDto>();
-            ExportImporter _exportImporter = new ExportImporter();
-            var result_org = await _exportImporter.ExtendExcelOfSheetOneImport<WmsSharePartOutPutDetial>(files, _excelImportService);
-            //过滤掉隐藏的空白行20220527
-            var result = result_org.Where(p => !string.IsNullOrEmpty(p.MaterialCode)).ToList();
-            //检验1:导入模板中的第一页签数据不能为空
-            if (result == null || result.Count == 0)
-            {
-                checkList.Add(new ErrorExportDto(version, "大众备件出库单导入", string.Empty, string.Empty, string.Empty, string.Empty, "导入模板中第一页签没有数据，请检查！", string.Empty));
-            }
-            if (checkList.Count > 0)
-            {
-                return await ExportErrorReportAsync(checkList);
-            }
-
-            //检验2:导入模板中的结算数据是否为0
-            foreach (var itm in result)
-            {
-                if (itm.Qty == 0)
-                {
-                    checkList.Add(new ErrorExportDto(version, "大众备件出库单导入", string.Empty, string.Empty, string.Empty, string.Empty, string.Format("导入模板中物料号{0}结算数量为０，影响出库请检查！", itm.MaterialCode), string.Empty));
-                }
-            }
-
-            //和物料主数据中SAP物料号检验是否存在
-            foreach (var itm in result)
-            {
-                if (!_erpdapperRepository.GetMaterialList().Any(p => p.MaterialCode == itm.MaterialCode))
-                {
-                    checkList.Add(new ErrorExportDto(version, "大众备件出库单导入", string.Empty, string.Empty, itm.MaterialCode, string.Empty, string.Format("物料主数据不存在当前导入的物料号{0}！", itm.MaterialCode), string.Empty));
-                }
-
-            }
-
-            if (checkList.Count > 0)
-            {
-                return await ExportErrorReportAsync(checkList);
-            }
-
-            var result90 = await _exportImporter.ExtendExcelOfSheetOneImport<WmsSharePart90OutPutDetial>(files, _excelImportService);
-
-            var result_nobill = result.Where(p =>string.IsNullOrEmpty(p.OrderBillNum)).ToList();//没有采购单号集合
-            var result_withbill = result90.Where(p =>!string.IsNullOrEmpty(p.OrderBillNum)).ToList();//有采购单号集合
-            
-
-            //没有采购单号
-            if (result_nobill != null)
-            {
-                var _billNoNum = "BNoBill" + DateTime.Now.ToString("yyyyMMddhhmmss");
-                List<WmsSharePartOutPutDetial> _lst = new List<WmsSharePartOutPutDetial>();
-
-                var _lsCopy = new List<WmsSharePartOutPutDetial>();
-                var result_nobill_filter = result_nobill.Where(p => string.IsNullOrEmpty(p.OrderBillNum) && !string.IsNullOrEmpty(p.MaterialCode));
-                foreach (var itm in result_nobill_filter)
-                {
-                    WmsSharePartOutPutDetial _detail = new WmsSharePartOutPutDetial(
-                    GuidGenerator.Create(),
-                    string.Empty,
-                    string.Empty,
-                    itm.MaterialCode,
-                    itm.MaterialDesc,
-                    itm.MaterialGroup,
-                    string.Empty,
-                    string.Empty,
-                    0,
-                    !string.IsNullOrEmpty(itm.Extend1) ? itm.Extend1 : string.Empty,
-                    string.Empty,
-                    version,
-                    itm.ParentMaterialCode,
-                    itm.BillNum,
-                    GuidGenerator.Create()
-                    , string.Empty
-                    , itm.Qty
-                    , 0
-                    , itm.Qty
-                    , itm.Price
-                    , itm.Amt,itm.RealityNumber
-                    );
-                    _lsCopy.Add(_detail);
-                }
-                _lst.AddRange(_lsCopy.ToArray());
-
-                //检验3:导入模板中的SAP编号不能重复，按其汇总出库
-                var _isRepeatOfReportList = _lst.GroupBy(x => new { x.MaterialCode, x.Version }).Select(p => new { Count = p.Count(), MaterialCode = p.Key.MaterialCode });
-                foreach (var itm in _isRepeatOfReportList)
-                {
-                    if (itm.Count > 1)
-                    {
-                        checkList.Add(new ErrorExportDto(version, "大众备件出库单导入", string.Empty, string.Empty, string.Empty, string.Empty, string.Format("导入模板中的物料编码{0}有重复！", itm.MaterialCode), string.Empty));
-                    }
-                }
-                if (checkList.Count > 0)
-                {
-                    return await ExportErrorReportAsync(checkList);
-                }
-
-                //var _ls1 = _lst.Where(p => p.ParentMaterialCode == p.MaterialCode).ToList();
-                var outPutDetail = await _wmsRepository.Where(p => p.Version == version).ToListAsync();
-
-                var error = from itm1 in outPutDetail
-                            join itm2 in _lst on
-                            new { itm1.MaterialCode }
-                            equals
-                            new { itm2.MaterialCode }
-                            select itm1;
-
-                var errList = error.GroupBy(p => new { p.BillNum }).Select(p => new { BillNum = p.Key.BillNum, Number = p.Sum(itm => itm.Qty) });
-
-               
-                foreach (var itm in errList)
-                {
-                    checkList.Add(new ErrorExportDto() { Message = string.Format("出库单号:{0}重复记录数:{1}条", itm.BillNum, itm.Number) });
-                }
-                if (checkList.Count > 0)
-                {
-
-                    return await ExportErrorReportAsync(checkList);
-                }
-
-                var query = from itm1 in _lst
-                            join itm2 in outPutDetail on
-                            new { itm1.MaterialCode }
-                            equals
-                            new { itm2.MaterialCode } into temp1
-                            from tm1 in temp1.DefaultIfEmpty()
-                            where tm1 == null
-                            select itm1;
-                var _wmslst = query.ToList();
-                foreach (var itm in _wmslst)
-                {
-                    itm.BillNum = _billNoNum;
-                }
-                await _wmsRepository.GetDbContext().BulkInsertAsync(_wmslst, new BulkConfig() { BulkCopyTimeout = 0, BatchSize = 10000 });
-                int _count = _wmsVersionRepository.Count(p => p.Version == version && p.BillNum == _billNoNum);
-                if (_count == 0 && _wmslst.Count() > 0)
-                {
-                    var _version = new WmsSharePartOutPut(GuidGenerator.Create(), version, _billNoNum, CurrentUser.Email,string.Empty);
-                    await _wmsVersionRepository.InsertAsync(_version, true);
-                }
-            }
-
-            //有采购单号
-            if (result_withbill != null)
-            {
-               
-                var _billNum = "B" + DateTime.Now.ToString("yyyyMMddhhmmss");
-                List<WmsSharePart90OutPutDetial> _lst = new List<WmsSharePart90OutPutDetial>();
-
-                var _lsCopy = new List<WmsSharePart90OutPutDetial>();
-                var filte_result_withbill = result_withbill.Where(p =>!string.IsNullOrEmpty(p.OrderBillNum));//采购单号为空的过滤掉
-                foreach (var itm in filte_result_withbill)
-                {
-                    WmsSharePart90OutPutDetial _detail = new WmsSharePart90OutPutDetial(
-                    GuidGenerator.Create(),
-                    itm.WmsBillNum,
-                    itm.OrderBillNum,
-                    itm.MaterialCode,
-                    itm.MaterialDesc,
-                    itm.MaterialGroup,
-                    string.Empty,
-                    string.Empty,
-                    0,
-                    !string.IsNullOrEmpty(itm.Extend1) ? itm.Extend1 : string.Empty,
-                    string.Empty,
-                    version,
-                    itm.ParentMaterialCode,
-                    itm.BillNum,
-                    GuidGenerator.Create()
-                    , string.Empty
-                    , itm.Qty
-                    , 0
-                    , itm.Qty
-                    , itm.Price
-                    , itm.Amt
-                    );
-                    _lsCopy.Add(_detail);
-                }
-                _lst.AddRange(_lsCopy.ToArray());
-
-                //检验3:导入模板中的订单号+物料号不能重复
-                var _isRepeatOfReportList = _lst.GroupBy(x => new { x.MaterialCode,x.OrderBillNum, x.Version }).Select(p => new { Count = p.Count(), MaterialCode = p.Key.MaterialCode, OrderBillNum =p.Key.OrderBillNum});
-                foreach (var itm in _isRepeatOfReportList)
-                {
-                    if (itm.Count > 1)
-                    {
-                        checkList.Add(new ErrorExportDto(version, "大众备件出库单导入", string.Empty, string.Empty, string.Empty, string.Empty, string.Format("导入模板中订单号{0}组合物料号{1}有重复，请检查！！",itm.OrderBillNum, itm.MaterialCode), string.Empty));
-                    }
-                }
-                if (checkList.Count > 0)
-                {
-                    return await ExportErrorReportAsync(checkList);
-                }
-
-
-                var outPutDetail = await _wmsRepository90.Where(p => p.Version == version).ToListAsync();
-
-
-                var error = from itm1 in outPutDetail
-                            join itm2 in _lst on
-                            new { itm1.MaterialCode, itm1.OrderBillNum, itm1.WmsBillNum }
-                            equals
-                            new { itm2.MaterialCode, itm2.OrderBillNum, itm2.WmsBillNum }
-                            select itm1;
-
-
-                var errList = error.GroupBy(p => new { p.BillNum }).Select(p => new { BillNum = p.Key.BillNum, Number = p.Sum(itm => itm.Qty) });
-
-                foreach (var itm in errList)
-                {
-                    checkList.Add(new ErrorExportDto() { Message = string.Format("出库单号:{0}重复记录数:{1}条", itm.BillNum, itm.Number) });
-                }
-                if (checkList.Count > 0)
-                {
-
-                    return await ExportErrorReportAsync(checkList);
-                }
-
-                var query = from itm1 in _lst
-                            join itm2 in outPutDetail on
-                            new { itm1.MaterialCode, itm1.OrderBillNum }
-                            equals
-                            new { itm2.MaterialCode, itm2.OrderBillNum } into temp1
-                            from tm1 in temp1.DefaultIfEmpty()
-                            where tm1 == null
-                            select itm1;
-                var _wmslst = query.ToList();
-                foreach (var itm in _wmslst)
-                {
-                    itm.BillNum = _billNum;
-                }
-                await _wmsRepository90.GetDbContext().BulkInsertAsync(_wmslst, new BulkConfig() { BulkCopyTimeout = 0, BatchSize = 10000 });
-                int _count = _wmsVersionRepository90.Count(p => p.Version == version && p.BillNum == _billNum);
-                if (_count == 0 && _wmslst.Count() > 0)
-                {
-                    var _version = new WmsSharePart90OutPut(GuidGenerator.Create(), version, _billNum, CurrentUser.Email,string.Empty);
-                    await _wmsVersionRepository90.InsertAsync(_version, true);
-                }
-            }
-
-            return ApplicationConsts.SuccessStr;
-        }
-
-
-    
-
-        /// <summary>
-        /// 出库单导出
-        /// </summary>
-        /// <param name="input"></param>
-        /// <returns></returns>
-        [HttpPost]
-        [Route("Export")]
-        //[Authorize(SettleAccountPermissions.SettleAccounts.Default)]
-        virtual public async Task<string> ExportAsync(WmsKanbanOutPutDetialRequestDto input)
-        {
-            input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "BillNum", Logic = EnumFilterLogic.And, Value = input.BillNum });
-            var entities = await _wmsRepository.GetListByFilterAsync(GuidGenerator.Create(), input.Filters, input.Sorting, int.MaxValue,
-                 0, true);
-
-            var dtos = ObjectMapper.Map<List<WmsSharePartOutPutDetial>, List<WmsSharePartOutPutDetialDto>>(entities);
-
-            IExporter _excel = new ExcelExporter();
-            byte[] result = null;
-
-            var _fileName = string.Format("大众备件出库单_{0}.xlsx", Guid.NewGuid().ToString());
-            result = await _excel.ExportAsByteArray(dtos);
-
-
-            result.ShouldNotBeNull();
-
-            //保存导出文件到服务器存成二进制
-            await _excelImportService.SaveBlobAsync(
-                     new SaveExcelImportInputDto
-                     {
-                         Name = _fileName,
-                         Content = result
-                     }
-                 );
-            return _fileName;
-
-
-
-        }
-
-
-    }
-}
\ No newline at end of file
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WmsDetailCancelInterface.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WmsDetailCancelInterface.cs
deleted file mode 100644
index efd4ac40..00000000
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WmsDetailCancelInterface.cs
+++ /dev/null
@@ -1,231 +0,0 @@
-
-using EFCore.BulkExtensions;
-using Magicodes.ExporterAndImporter.Core;
-using Magicodes.ExporterAndImporter.Excel;
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.EntityFrameworkCore;
-using Shouldly;
-using System;
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Volo.Abp;
-using Volo.Abp.Application.Dtos;
-using Volo.Abp.Caching;
-using Volo.Abp.Domain.Repositories;
-using Volo.Abp.Uow;
-using Win.Abp.Snowflakes;
-using Win.Sfs.BaseData.ImportExcelCommon;
-using Win.Sfs.SettleAccount.CommonManagers;
-using Win.Sfs.SettleAccount.Constant;
-using Win.Sfs.SettleAccount.Entities.Wms;
-using Win.Sfs.SettleAccount.Entities.Wms.WmsSumOutput;
-using Win.Sfs.SettleAccount.Reports;
-using Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report;
-using Win.Sfs.Shared.DomainBase;
-using Win.Sfs.Shared.Filter;
-
-namespace Win.Sfs.SettleAccount.Entities.WMS
-{
-    /// <summary>
-    /// 撤销出库清单
-    /// </summary>
-    [Authorize(SettleAccountPermissions.WMSJIT.Default)]
-    [Route("api/settleaccount/WMSOutputDetailCancelDiffReport")]
-    public class WMSOutputDetailCancelDiffReportAppService :
-        SettleAccountApplicationBase<WmsDetailCancelReport>
-    {
-        private readonly ISettleAccountBranchEfCoreRepository<WmsDetailCancelReport, Guid> _wmsRepository;
-        private readonly WmsOutputSumDapperRepository _dapper;
-        private readonly IExcelImportAppService _excelImportService;
-
-        private readonly ErpSumOutputDapperRepository _erpDapper;
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="wmsRepository"></param>
-        /// <param name="job"></param>
-
-        public WMSOutputDetailCancelDiffReportAppService(
-            WmsOutputSumDapperRepository dapper,
-            ISettleAccountBranchEfCoreRepository<WmsDetailCancelReport, Guid> wmsRepository,
-            ISettleAccountBranchEfCoreRepository<TaskJob, Guid> job,
-            IExcelImportAppService excelImportService,
-            IDistributedCache<WmsDetailCancelReport> cache,
-            ISnowflakeIdGenerator snowflakeIdGenerator,
-            ICommonManager commonManager,
-            ErpSumOutputDapperRepository erpDapper
-        ) : base(cache, excelImportService, snowflakeIdGenerator, commonManager)
-        {
-            _erpDapper = erpDapper;
-            _wmsRepository = wmsRepository;
-            _dapper = dapper;
-            _excelImportService = excelImportService;
-
-        }
-
-        [HttpGet]
-        [Route("Make")]
-        [UnitOfWork(false)]
-        public async Task<string> ReportMake(string version, DateTime accountDate)
-        {
-            var _ls = _dapper.GetWmsSumCancelReportList(version, "0");//报表
-
-            var _count = _wmsRepository.Count(p => p.Version == version && p.State > 0);
-            if (_count > 0)
-            {
-                throw new BusinessException("8899", "不能重新生成此版本!");
-            }
-            else
-            {
-                var query = _wmsRepository.Where(p => p.Version == version);
-                await query.BatchDeleteAsync();
-            }
-            List<WmsDetailCancelReport> _lst = new List<WmsDetailCancelReport>();
-            if (_ls != null && _ls.Count() > 0)
-            {
-                foreach (var itm in _ls)
-                {
-                    _lst.Add(new WmsDetailCancelReport(
-                        Guid.NewGuid(),
-                        itm.客户,
-                        itm.出库类型,
-                        version,
-                        itm.结算单,
-                        itm.通用代码号,
-                        itm.物料号,
-                        itm.结算数量,
-                        itm.实际出库数量,
-                        itm.差异数量,
-                        itm.物料组编码,
-                        itm.物料组车型,
-                        itm.物料描述,
-                        itm.备注,
-                        0));
-                }
-            }
-            await _wmsRepository.GetDbContext().BulkInsertAsync(_lst);
-            return ApplicationConsts.SuccessStr;
-        }
-        /// <summary>
-        /// Wms汇总合计明细
-        /// </summary>
-        /// <param name="input"></param>
-        /// <returns></returns>
-        [HttpPost]
-        [Route("WmsDetailReport")]
-
-        virtual public async Task<PagedResultDto<WmsDetailCancelReport>> GetListAsync(WmsRequestDetailReportDto input)
-        {
-            input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "Version", Logic = EnumFilterLogic.And, Value = input.Version });
-            //客户过滤
-            if (!string.IsNullOrEmpty(input.Client))
-            {
-                input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "Client", Logic = EnumFilterLogic.And, Value = input.Client });
-            }
-            //出库类型
-            if (!string.IsNullOrEmpty(input.Type))
-            {
-                input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "Type", Logic = EnumFilterLogic.And, Value = input.Type });
-            }
-            var entities = await _wmsRepository.GetListByFilterAsync(GuidGenerator.Create(), input.Filters, input.Sorting, input.MaxResultCount,
-                 input.SkipCount, true);
-            var totalCount = await GetCountAsync(input);
-            return new PagedResultDto<WmsDetailCancelReport>(totalCount, entities);
-        }
-
-
-        private async Task<long> GetCountAsync(WmsRequestDetailReportDto input)
-        {
-            input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "Version", Logic = EnumFilterLogic.And, Value = input.Version });
-            return await _wmsRepository.GetCountByFilterAsync(GuidGenerator.Create(), input.Filters);
-        }
-        [HttpPost]
-        [Route("ModifyTaskState")]
-
-        public virtual async Task<bool> ModifyTaskState(List<Guid> guids)
-        {
-            if (guids != null && guids.Count() > 0)
-            {
-                var str = "DECLARE @return_value int \n" +
-                "EXEC    @return_value = [dbo].[p_wms_interface_cancel]\n" +
-                "@billnum = N'{0}',                                   \n" +
-                "@type = {1},                                         \n" +
-                "@date = N'{2}',                                      \n" +
-                "@switchcode = N'{3}',                                \n" +
-                "@partcode = N'{4}'                                   \n" +
-                "SELECT  'Return Value' = @return_value ";
-
-                var _ls = _wmsRepository.Where(p => guids.Contains(p.Id));
-                foreach (var itm in _ls)
-                {
-                    var sql = string.Format(str, itm.BillNum, itm.Type, DateTime.Now, itm.SwitchCode, itm.MaterialCode);
-                    _wmsRepository.GetDbContext().Database.SetCommandTimeout(300);
-                    await _wmsRepository.GetDbContext().Database.ExecuteSqlRawAsync(
-                       sql
-                   );
-                }
-            }
-            //_wmsRepository.Where(p => p.BillNum ==)
-            return true;
-        }
-        //[HttpPost]
-        //[Route("Output")]
-
-        //virtual public async Task<bool> OutputAsync(WmsRequestDetailReportDto input)
-        //{
-        //    var entities = await _wmsRepository.GetListByFilterAsync(GuidGenerator.Create(), input.Filters, input.Sorting, int.MaxValue,
-        //         0, true);
-        //    List<WmsDetailCancelReport> _ls = new List<WmsDetailCancelReport>();
-        //    if (entities.Count() > 0)
-        //    {
-        //        var _entity = entities.FirstOrDefault();
-        //        if (_entity != null)
-        //        {
-        //            var _version = _entity.Version;
-        //            var _accountDate = _entity.AccountDate;
-        //            _erpDapper.InsertWmsSum(_ls, _version, _accountDate);
-        //        }
-        //    }
-        //    return true;
-        //}
-        [HttpPost]
-        [Route("Export")]
-        virtual public async Task<string> ExportAsync(WmsRequestDetailReportDto input)
-        {
-            input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "Version", Logic = EnumFilterLogic.And, Value = input.Version });
-            //客户过滤
-            if (!string.IsNullOrEmpty(input.Client))
-            {
-                input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "Client", Logic = EnumFilterLogic.And, Value = input.Client });
-            }
-            //出库类型
-            if (!string.IsNullOrEmpty(input.Type))
-            {
-                input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "Type", Logic = EnumFilterLogic.And, Value = input.Type });
-            }
-            var entities = await _wmsRepository.GetListByFilterAsync(GuidGenerator.Create(), input.Filters, input.Sorting, int.MaxValue,
-                 0, true);
-            var dtoDetails = ObjectMapper.Map<List<WmsDetailCancelReport>, List<WmsDetailCancelReportDto>>(entities);
-            IExporter _excel = new ExcelExporter();
-            byte[] result = null;
-            var _fileName = string.Format("撤销清单报表_{0}.xlsx", Guid.NewGuid().ToString());
-            result = await _excel.ExportAsByteArray(dtoDetails);
-            result.ShouldNotBeNull();
-            //保存导出文件到服务器存成二进制
-            await _excelImportService.SaveBlobAsync(
-                     new SaveExcelImportInputDto
-                     {
-                         Name = _fileName,
-                         Content = result
-                     }
-                 );
-            return _fileName;
-        }
-
-
-    }
-}
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WmsDetailUnInterface.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WmsDetailUnInterface.cs
deleted file mode 100644
index 4699d824..00000000
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WmsDetailUnInterface.cs
+++ /dev/null
@@ -1,245 +0,0 @@
-
-using EFCore.BulkExtensions;
-using Magicodes.ExporterAndImporter.Core;
-using Magicodes.ExporterAndImporter.Excel;
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.EntityFrameworkCore;
-using Shouldly;
-using System;
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Volo.Abp;
-using Volo.Abp.Application.Dtos;
-using Volo.Abp.Caching;
-using Volo.Abp.Domain.Repositories;
-using Volo.Abp.Uow;
-using Win.Abp.Snowflakes;
-using Win.Sfs.BaseData.ImportExcelCommon;
-using Win.Sfs.SettleAccount.CommonManagers;
-using Win.Sfs.SettleAccount.Constant;
-using Win.Sfs.SettleAccount.Entities.Wms;
-using Win.Sfs.SettleAccount.Entities.Wms.WmsSumOutput;
-using Win.Sfs.SettleAccount.Reports;
-using Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report;
-using Win.Sfs.Shared.DomainBase;
-using Win.Sfs.Shared.Filter;
-
-namespace Win.Sfs.SettleAccount.Entities.WMS
-{
-    /// <summary>
-    /// 出库差异清单
-    /// </summary>
-    [Authorize(SettleAccountPermissions.WMSJIT.Default)]
-    [Route("api/settleaccount/WMSOutputDetailDiffReport")]
-    public class WMSOutputDetailDiffReportAppService :
-        SettleAccountApplicationBase<WmsDetailDiffReport>
-    {
-        private readonly ISettleAccountBranchEfCoreRepository<WmsDetailDiffReport, Guid> _wmsRepository;
-        private readonly WmsOutputSumDapperRepository _dapper;
-        private readonly IExcelImportAppService _excelImportService;
-
-        private readonly ErpSumOutputDapperRepository _erpDapper;
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="wmsRepository"></param>
-        /// <param name="job"></param>
-
-        public WMSOutputDetailDiffReportAppService(
-            WmsOutputSumDapperRepository dapper,
-            ISettleAccountBranchEfCoreRepository<WmsDetailDiffReport, Guid> wmsRepository,
-            ISettleAccountBranchEfCoreRepository<TaskJob, Guid> job,
-            IExcelImportAppService excelImportService,
-            IDistributedCache<WmsDetailDiffReport> cache,
-            ISnowflakeIdGenerator snowflakeIdGenerator,
-            ICommonManager commonManager,
-            ErpSumOutputDapperRepository erpDapper
-        ) : base(cache, excelImportService, snowflakeIdGenerator, commonManager)
-        {
-            _erpDapper = erpDapper;
-            _wmsRepository = wmsRepository;
-            _dapper = dapper;
-            _excelImportService = excelImportService;
-
-        }
-
-        [HttpGet]
-        [Route("Make")]
-        [UnitOfWork(false)]
-        public async Task<string> ReportMake(string version,DateTime accountDate)
-        {
-           var _ls= _dapper.GetWmsSumReportList(version,"0");//报表
-
-            var _count= _wmsRepository.Count(p => p.Version == version && p.State>0);
-            if (_count > 0)
-            {
-                throw new BusinessException("8899", "不能重新生成此版本!");
-            }
-            else
-            {
-                var query = _wmsRepository.Where(p => p.Version == version);
-                await query.BatchDeleteAsync();
-            } 
-            List<WmsDetailDiffReport> _lst = new List<WmsDetailDiffReport>();
-            if (_ls != null && _ls.Count() > 0)
-            {
-                foreach (var itm in _ls)
-                {
-                    _lst.Add(new WmsDetailDiffReport(
-                        Guid.NewGuid(),
-                        itm.客户,
-                        itm.出库类型,
-                        version,
-                        itm.结算单,
-                        itm.通用代码号,
-                        itm.物料号,
-                        itm.结算数量,
-                        itm.实际出库数量,
-                        itm.差异数量,
-                        itm.物料组编码,
-                        itm.物料组车型,
-                        itm.物料描述,
-                        itm.备注,
-                        0));
-                }
-            }
-            await _wmsRepository.GetDbContext().BulkInsertAsync(_lst);
-            return ApplicationConsts.SuccessStr;
-        }
-        /// <summary>
-        /// Wms汇总合计明细
-        /// </summary>
-        /// <param name="input"></param>
-        /// <returns></returns>
-        [HttpPost]
-        [Route("WmsDetailReport")]
-
-        virtual public async Task<PagedResultDto<WmsDetailDiffReport>> GetListAsync(WmsRequestDetailReportDto input)
-        {
-            input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "Version", Logic = EnumFilterLogic.And, Value = input.Version });
-            //客户过滤
-            if (!string.IsNullOrEmpty(input.Client))
-            {
-                input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "Client", Logic = EnumFilterLogic.And, Value = input.Client });
-            }
-            //出库类型
-            if (!string.IsNullOrEmpty(input.Type))
-            {
-                input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "Type", Logic = EnumFilterLogic.And, Value = input.Type });
-            }
-            var entities = await _wmsRepository.GetListByFilterAsync(GuidGenerator.Create(), input.Filters, input.Sorting, input.MaxResultCount,
-                 input.SkipCount, true);
-            var totalCount = await GetCountAsync(input);
-            return new PagedResultDto<WmsDetailDiffReport>(totalCount, entities);
-        }
-
-
-        private async Task<long> GetCountAsync(WmsRequestDetailReportDto input)
-        {
-            input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "Version", Logic = EnumFilterLogic.And, Value = input.Version });
-            return await _wmsRepository.GetCountByFilterAsync(GuidGenerator.Create(), input.Filters);
-        }
-        [HttpPost]
-        [Route("ModifyTaskState")]
-
-        public virtual async Task<bool> ModifyTaskState(List<Guid> guids)
-        {
-            if (guids != null && guids.Count() > 0)
-            {
-                var str = "DECLARE @return_value int \n" +
-                "EXEC    @return_value = [dbo].[p_wms_interface_modify]\n" +
-                "@billnum = N'{0}',                                   \n" +
-                "@type = {1},                                         \n" +
-                "@date = N'{2}',                                      \n" +
-                "@switchcode = N'{3}',                                \n" +
-                "@partcode = N'{4}'                                   \n" +
-                "SELECT  'Return Value' = @return_value ";
-
-                var _ls=  _wmsRepository.Where(p => guids.Contains(p.Id));
-                foreach (var itm in _ls)
-                {
-                    var sql = string.Format(str, itm.BillNum, itm.Type, DateTime.Now, itm.SwitchCode, itm.MaterialCode);
-                    _wmsRepository.GetDbContext().Database.SetCommandTimeout(300);
-                    await _wmsRepository.GetDbContext().Database.ExecuteSqlRawAsync(
-                       sql
-                   );
-                }
-            }
-            //_wmsRepository.Where(p => p.BillNum ==)
-            return true;
-        }
-        //[HttpPost]
-        //[Route("Output")]
-
-        //virtual public async Task<bool> OutputAsync(WmsRequestDetailReportDto input)
-        //{
-        //    var entities = await _wmsRepository.GetListByFilterAsync(GuidGenerator.Create(), input.Filters, input.Sorting, int.MaxValue,
-        //         0, true);
-        //    List<WmsDetailDiffReport> _ls = new List<WmsDetailDiffReport>();
-        //    if (entities.Count() > 0)
-        //    {
-        //        var _entity = entities.FirstOrDefault();
-        //        if (_entity != null)
-        //        {
-        //            var _version = _entity.Version;
-        //            var _accountDate = _entity.AccountDate;
-        //            _erpDapper.InsertWmsSum(_ls, _version, _accountDate);
-        //        }
-        //    }
-        //    return true;
-        //}
-        [HttpPost]
-        [Route("Export")]
-        virtual public async Task<string> ExportAsync(WmsRequestDetailReportDto input)
-        {
-            input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "Version", Logic = EnumFilterLogic.And, Value = input.Version });
-            //客户过滤
-            if (!string.IsNullOrEmpty(input.Client))
-            {
-                input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "Client", Logic = EnumFilterLogic.And, Value = input.Client });
-            }
-            //出库类型
-            if (!string.IsNullOrEmpty(input.Type))
-            {
-                input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "Type", Logic = EnumFilterLogic.And, Value = input.Type });
-            }
-            var entities = await _wmsRepository.GetListByFilterAsync(GuidGenerator.Create(), input.Filters, input.Sorting, int.MaxValue,
-                 0, true);
-            var dtoDetails = ObjectMapper.Map<List<WmsDetailDiffReport>, List<WmsDetailDiffReportDto>>(entities);
-            IExporter _excel = new ExcelExporter();
-            byte[] result = null;
-            var _fileName = string.Format("差异清单报表_{0}.xlsx", Guid.NewGuid().ToString());
-            result = await _excel.ExportAsByteArray(dtoDetails);
-            result.ShouldNotBeNull();
-            //保存导出文件到服务器存成二进制
-            await _excelImportService.SaveBlobAsync(
-                     new SaveExcelImportInputDto
-                     {
-                         Name = _fileName,
-                         Content = result
-                     }
-                 );
-            return _fileName;
-        }
-
-
-    }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-}
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WmsHQKBOutputAppService.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WmsHQKBOutputAppService.cs
deleted file mode 100644
index fefbdb45..00000000
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WmsHQKBOutputAppService.cs
+++ /dev/null
@@ -1,544 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.Extensions.Caching.Distributed;
-using AutoMapper;
-using System.Linq;
-using System.Text;
-using Volo.Abp.Guids;
-using Volo.Abp.Application.Services;
-using Volo.Abp.Caching;
-
-using Volo.Abp.ObjectMapping;
-using Win.Sfs.SettleAccount.ExcelImporter;
-using Win.Sfs.Shared.CacheBase;
-using Win.Utils;
-using Volo.Abp.Application.Dtos;
-using Win.Sfs.BaseData.ImportExcelCommon;
-using Volo.Abp.Domain.Repositories;
-using EFCore.BulkExtensions;
-using System.IO;
-using Microsoft.EntityFrameworkCore;
-using Win.Sfs.SettleAccount.Entities.SettleAccountVersion;
-using Win.Sfs.SettleAccount.FISes;
-using Win.Sfs.Shared.Enums.SettleAccount;
-using Win.Sfs.Shared.Filter;
-using Shouldly;
-using Magicodes.ExporterAndImporter.Csv;
-using Magicodes.ExporterAndImporter.Core;
-using Magicodes.ExporterAndImporter.Excel;
-using System.Data.Common;
-using Volo.Abp.Uow;
-using Volo.Abp;
-using Win.Abp.Snowflakes;
-using Win.Sfs.SettleAccount.CommonManagers;
-using Win.Sfs.SettleAccount.ExportReports;
-using Win.Sfs.SettleAccount.Constant;
-using Win.Sfs.SettleAccount.MaterialRelationships;
-using Win.Sfs.SettleAccount.Entities.TaskJobs;
-using Magicodes.ExporterAndImporter.Core.Models;
-
-using TaskJob.Services;
-using TaskJob.EventArgs;
-using Win.Sfs.SettleAccount.Entities.WMS;
-using Win.Sfs.SettleAccount.Entities.Wms;
-using Win.Sfs.SettleAccount.Repository;
-using WY.NewJit.Extends.PaiGe.WMS;
-using Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report;
-
-namespace Win.Sfs.SettleAccount.Entities.WMS
-{
-   /// <summary>
-   /// 红旗一轿手工出库单
-   /// </summary>
-    [Route("api/settleaccount/WmsHQKBOutput")]
-    //[AllowAnonymous]
-    [Authorize(SettleAccountPermissions.WMSHQ.Default)]
-    public class WmsHQKBOutputAppService : SettleAccountApplicationBase<WmsHQWithOutKanbanOutPutDetial>
-    {
-        /// <summary>
-        /// 大众看板-出库
-        /// </summary>
-        //private readonly ISettleAccountBranchEfCoreRepository<WmsKanbanOutPutDetial, Guid> _wmsRepository;
-        //private readonly ISettleAccountBranchEfCoreRepository<WmsKanbanOutPut, Guid> _wmsVersionRepository;
-
-        private readonly ISettleAccountBranchEfCoreRepository<WmsHQWithOutKanbanOutPutDetial, Guid> _wmsRepository;
-        private readonly ISettleAccountBranchEfCoreRepository<WmsHQWithOutKanbanOutPut, Guid> _wmsVersionRepository;
-
-        private readonly KanbanUnSettledDapperRepository _dapper;
-        private readonly WMSEfCoreRepository<WmsKanbanOutPutDetial> _wmsefRespository;
-
-        private readonly WMSEfCoreRepository<TB_BILL> _wmstbRespository;
-        private readonly ISettleAccountBranchEfCoreRepository<TaskJob, Guid> _job;
-        private readonly IExcelImportAppService _excelImportService;
-
-
-        private readonly TaskJobService _service;
-        private readonly WmsDapperRepository _wmsDapper;
-
-        private readonly ErpPartDapperRepository _erpdapperRepository;
-
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="wmsRepository"></param>
-        /// <param name="job"></param>
-        /// <param name="wmsVersionRepository"></param>
-        /// <param name="wmsefRespository"></param>
-        /// <param name="wmstbRespository"></param>
-        public WmsHQKBOutputAppService(
-
-            IExcelImportAppService excelImportService,
-            ISettleAccountBranchEfCoreRepository<WmsHQWithOutKanbanOutPutDetial, Guid> wmsRepository,
-            ISettleAccountBranchEfCoreRepository<TaskJob, Guid> job,
-            ISettleAccountBranchEfCoreRepository<WmsHQWithOutKanbanOutPut, Guid> wmsVersionRepository,
-            WMSEfCoreRepository<WmsKanbanOutPutDetial> wmsefRespository,
-            KanbanUnSettledDapperRepository dapper,
-            WMSEfCoreRepository<TB_BILL> wmstbRespository,
-            IDistributedCache<WmsHQWithOutKanbanOutPutDetial> cache,
-            ISnowflakeIdGenerator snowflakeIdGenerator,
-            ICommonManager commonManager,
-             ErpPartDapperRepository erpdapperRepository,
-            WmsDapperRepository wmsDapper
-        ) : base(cache, excelImportService, snowflakeIdGenerator, commonManager)
-        {
-            _job = job;
-            _wmstbRespository = wmstbRespository;
-            _wmsRepository = wmsRepository;
-            _wmsVersionRepository = wmsVersionRepository;
-            _wmsefRespository = wmsefRespository;
-            _excelImportService = excelImportService;
-            _dapper = dapper;
-            _wmsDapper = wmsDapper;
-            _erpdapperRepository = erpdapperRepository;
-        }
-
-        private async Task<long> GetCountAsync(WmsKanbanOutPutDetialRequestDto input)
-        {
-            input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "BillNum", Logic = EnumFilterLogic.And, Value = input.BillNum });
-            return await _wmsRepository.GetCountByFilterAsync(GuidGenerator.Create(), input.Filters);
-        }
-
-        private async Task<long> GetCountAsync(WmsKanbanOutPutRequestDto input)
-        {
-            return await _wmsVersionRepository.GetCountByFilterAsync(GuidGenerator.Create(), input.Filters);
-        }
-
-        /// <summary>
-        /// 准时化出库主表
-        /// </summary>
-        /// <param name="input"></param>
-        /// <returns></returns>
-        [HttpPost]
-        [Route("WmsKanbanList")]
-        //[Authorize(SettleAccountPermissions.SettleAccounts.Default)]
-        virtual public async Task<PagedResultDto<WmsHQWithOutKanbanOutPut>> GetListAsync(WmsKanbanOutPutRequestDto input)
-        {
-            //input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "BillNum", Logic = EnumFilterLogic.And, Value = input.BillNum });
-            var entities = await _wmsVersionRepository.GetListByFilterAsync(GuidGenerator.Create(), input.Filters, input.Sorting, input.MaxResultCount,
-                 input.SkipCount, true);
-
-            var totalCount = await GetCountAsync(input);
-
-            return new PagedResultDto<WmsHQWithOutKanbanOutPut>(totalCount, entities);
-        }
-
-        /// <summary>
-        /// 准时化出库明细
-        /// </summary>
-        /// <param name="input"></param>
-        /// <returns></returns>
-        [HttpPost]
-        [Route("WmsKanbanDetailList")]
-        [UnitOfWork(false)]
-        //[Authorize(SettleAccountPermissions.SettleAccounts.Default)]
-        virtual public async Task<PagedResultDto<WmsHQWithOutKanbanOutPutDetial>> GetListAsync(WmsKanbanOutPutDetialRequestDto input)
-        {
-            input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "BillNum", Logic = EnumFilterLogic.And, Value = input.BillNum });
-            var entities = await _wmsRepository.GetListByFilterAsync(GuidGenerator.Create(), input.Filters, input.Sorting, input.MaxResultCount,
-                 input.SkipCount, true);
-            var totalCount = await GetCountAsync(input);
-            var stockList = _wmsDapper.GetSalesStock();
-            var query = from itm in entities
-                        join itm1 in stockList on itm.SapMaterialCode equals itm1.SapCode
-            into temp1
-                        from tm1 in temp1.DefaultIfEmpty()
-                        select new WmsHQWithOutKanbanOutPutDetial(
-                GuidGenerator.Create(),
-                "无看板发货",
-                itm.SapMaterialCode,
-                itm.MaterialDesc,
-                itm.Version,
-                itm.IsBack,
-                string.Empty,
-                itm.Qty,
-                tm1 == null ? 0 : tm1.Qty,
-                itm.Qty,
-                itm.Extend,
-                itm.BillNum,
-                itm.State,
-                itm.RealityNumber,
-                itm.Price,
-                itm.Amt
-                );
-
-            return new PagedResultDto<WmsHQWithOutKanbanOutPutDetial>(totalCount, entities);
-        }
-
-        /// <summary>
-        ///更新备注
-        /// </summary>
-        /// <param name="input"></param>
-        /// <returns></returns>
-        [HttpGet]
-        [Route("UpdateRemark")]
-
-        public async Task<bool> UpdateRemark(Guid id, string remark)
-        {
-            var entity = _wmsVersionRepository.FirstOrDefault(p => p.Id == id);
-            if (entity != null)
-            {
-                entity.Remark = remark;
-                await _wmsVersionRepository.UpdateAsync(entity);
-
-            }
-            return true;
-        }
-
-
-        /// <summary>
-        ///  任务明细标记已确认
-        /// </summary>
-        /// <param name="files">上传的文件(前端已经限制只能上传一个附件)</param>
-        /// <returns></returns>
-        [HttpPost]
-        [Route("WmsSharePartOutPutModify")]
-        [DisableRequestSizeLimit]
-
-        public async Task<bool> WmsSharePartUpdate(WmsHQWithOutKanbanOutPutDetial detial)
-        {
-            var _entityList = _wmsRepository.Where(p => p.Id == detial.BranchId).ToList();
-            if (_entityList.Count() > 0)
-            {
-                foreach (var itm in _entityList)
-                {
-                    itm.OutputQty = detial.OutputQty;
-                    await _wmsRepository.UpdateAsync(itm);
-                }
-            }
-            return true;
-
-        }
-
-
-        /// <summary>
-        /// 选择任务，生成出库单，只包含已确认的单据
-        /// </summary>
-        /// <param name="ids"></param>
-        /// <param name="version"></param>
-        /// <returns></returns>
-        [HttpPost]
-        [Route("ExcelImport")]
-        [UnitOfWork(false)]
-        public async Task<string> WmsKanbanOutPut([FromForm] IFormFileCollection files, string version)
-        {
-            var checkList = new List<ErrorExportDto>();
-            //var _count1 = _wmsVersionRepository.Count(p => p.Version == version);
-            //if (_count1 > 0)
-            //{
-            //    var checkList = new List<ErrorExportDto>();
-            //    checkList.Add(new ErrorExportDto() { Message = "有重复期间数据" });
-            //    if (checkList.Count > 0)
-            //    {
-
-            //        return await ExportErrorReportAsync(checkList);
-            //    }
-            //}
-
-
-            //var _list = _dapper.GetNoKanbanSettleDetail(input.Version);
-
-            ExportImporter _exportImporter = new ExportImporter();
-            var _listOrgin = await _exportImporter.ExtendExcelOfSheetOneImport<WmsHQWithOutKanbanOutPutDetial>(files, _excelImportService);
-
-            if (_listOrgin == null || _listOrgin.Count == 0)
-            {
-                throw new BusinessException("导入模板数据不能为空！");
-            }
-            //物料号不能为空,直接过滤掉,模板的中看不到有空行的情况，但是通过个IE这个插件发现有空行数据导入
-            var _list = _listOrgin.Where(p =>!string.IsNullOrEmpty(p.SapMaterialCode));
-
-            foreach (var itm in _list)
-            {
-                if (string.IsNullOrEmpty(itm.IsBack) || string.IsNullOrEmpty(itm.Extend))
-                {
-                    checkList.Add(new ErrorExportDto(version, "红旗一轿出库单导入", string.Empty, string.Empty, string.Empty, string.Empty, string.Format("导入模板中SAP编码{0}的是否备件及客户号不能为空，影响出库请检查！", itm.SapMaterialCode), string.Empty));
-                }
-            }
-  
-            foreach (var itm in _list)
-            {
-                if (itm.IsBack != "是" && itm.IsBack != "否")
-                {
-                    checkList.Add(new ErrorExportDto(version, "红旗一轿出库单导入", string.Empty, string.Empty, string.Empty, string.Empty, string.Format("导入模板中SAP编码{0}的是否备件请填写是或否，影响出库请检查！", itm.SapMaterialCode), string.Empty));
-                }
-            }
-            //和物料主数据中SAP物料号检验是否存在
-            foreach (var itm in _list)
-            {
-                if (!_erpdapperRepository.GetMaterialList().Any(p => p.MaterialCode == itm.SapMaterialCode))
-                {
-                    checkList.Add(new ErrorExportDto(version, "红旗一轿出库单导入", string.Empty, string.Empty, itm.SapMaterialCode, string.Empty, string.Format("物料主数据不存在当前导入的物料号{0}！", itm.SapMaterialCode), string.Empty));
-                }
-              
-            }
-
-            if (checkList.Count > 0)
-            {
-                return await ExportErrorReportAsync(checkList);
-            }
-
-            //翻译一下是否备件
-            foreach (var itm in _list)
-            {
-                if (itm.IsBack.Trim() == "是")
-                {
-                    itm.IsBack = "1";
-                }
-                else
-                {
-                    itm.IsBack = "0";
-                }
-            }
-            var getbillName = "HQVSBT";//混合数据
-            if(_list.FirstOrDefault().Extend== "100113")
-            {
-                getbillName = "BT";//一轿
-            }
-            else if(_list.FirstOrDefault().Extend == "100053")
-            {
-                getbillName = "HQKB";//红旗
-            }
-
-            var _billNum = getbillName + DateTime.Now.ToString("yyyyMMddhhmmss");
-
-            var stockList = _wmsDapper.GetSalesStock("PLJS");
-            var query = from itm in _list
-                        join itm1 in stockList on itm.SapMaterialCode equals itm1.SapCode
-            into temp1
-                        from tm1 in temp1.DefaultIfEmpty()
-                        select new WmsHQWithOutKanbanOutPutDetial(
-                GuidGenerator.Create(),
-                "红旗一轿手工出库",
-                itm.SapMaterialCode,
-                itm.MaterialDesc,
-                version,
-                itm.IsBack,//是否备件
-                string.Empty,
-                itm.Qty,
-                tm1 == null ? 0 : tm1.Qty,
-                itm.Qty,
-                itm.Extend,//存储客户信息
-                _billNum,
-                0,
-                0,
-                itm.Price,
-                Math.Round((itm.Price * itm.Qty),2)
-                );
-
-            await _wmsRepository.GetDbContext().BulkInsertAsync(query.ToList(), new BulkConfig() { BulkCopyTimeout = 0, BatchSize = 10000 });
-            int _count = _wmsVersionRepository.Count(p => p.Version == version && p.BillNum == _billNum);
-            if (_count == 0)
-            {
-                var _version = new WmsHQWithOutKanbanOutPut(GuidGenerator.Create(), version, _billNum, CurrentUser.Email,string.Empty);
-                await _wmsVersionRepository.InsertAsync(_version, true);
-            }
-            return ApplicationConsts.SuccessStr; ;
-        }
-        /// <summary>
-        /// 出库界面功能，核准出库功能
-        /// </summary>
-        /// <param name="version"></param>
-        /// <param name="p_list"></param>
-        /// <returns></returns>
-        [HttpPost]
-        [Route("WmsKanbanOutPut-Pass")]
-        [UnitOfWork(false)]
-        public async Task<string> WmsKanbanOutPutPass(WmsJitRequestDto input)
-        {
-            if (input.Guids != null)
-            {
-                List<WmsHQWithOutKanbanOutPutDetial> _ls = new List<WmsHQWithOutKanbanOutPutDetial>();
-                if (input.Guids.Count() > 0)
-                {
-                    _ls = await _wmsRepository.Where(p => input.Guids.Contains(p.Id) && p.Version == input.Version && p.BillNum == input.BillNum && p.State != 2  && p.State!=4).ToListAsync();
-                }
-                else
-                {
-                    _ls = await _wmsRepository.Where(p => p.Version == input.Version && p.BillNum == input.BillNum && p.State != 2 &&  p.State!=4).ToListAsync();
-                }
-                //_ls = _ls.Where(p => p.SockQty < p.OutputQty || p.Qty < p.OutputQty).ToList();
-                //var checkList = new List<ErrorExportDto>();
-
-                //foreach (var itm in _ls)
-                //{
-                //    checkList.Add(new ErrorExportDto() { Message = string.Format("物料号:{0}出库数量大于结算数量或寄售库存数量!",itm.SapMaterialCode) });
-                //}
-                //if (checkList.Count > 0)
-                //{
-
-                //    return await ExportErrorReportAsync(checkList,"校验失败.xlsx");
-                //}
-                //if (DateTime.Now.ToString("yyyyMM") != input.AccountDate.ToString("yyyyMM"))
-                //{
-                //    throw new BusinessException("8989", "填写过账日期应该为当月！");
-
-                //}
-
-                if (_ls.Count() > 0)
-                {
-                    var sql = "DECLARE	@return_value int\n" +
-                         "EXEC	@return_value = [dbo].[p_wms_ou" +
-                         "tput]\n" +
-                         "		@billnum = N'{0}',\n" +
-                         "		@type = 21,\n" +
-                         "      @date = N'{1}'\n" +
-                         "SELECT	'Return Value' = @return_value";
-                    await _wmsRepository.GetDbContext().Database.ExecuteSqlRawAsync(
-                       string.Format(sql, input.BillNum, input.AccountDate.ToShortDateString()));
-
-                }
-            }
-            return ApplicationConsts.SuccessStr;
-        }
-        /// <summary>
-        ///出库界面功能， 撤销核准出库
-        /// </summary>
-        /// <param name="ids"></param>
-        /// <param name="version"></param>
-        /// <returns></returns>
-        [HttpPost]
-        [Route("WmsKanbanOutPut-Cancel")]
-        [UnitOfWork(false)]
-        public async Task<bool> WmsKanbanOutPutCancel(WmsJitRequestDto input)
-        {
-
-            //if (DateTime.Now.ToString("yyyyMM") != input.AccountDate.ToString("yyyyMM"))
-            //{
-            //    throw new BusinessException("8989", "填写过账日期应该为当月！");
-
-            //}
-
-            if (input.Guids != null && input.Guids.Count() > 0)
-            {
-                List<string> _ls = new List<string>();
-                foreach (var itm in input.Guids)
-                {
-                    _ls.Add(string.Format("{0}", itm));
-                }
-
-                string str = string.Join(",", _ls.ToArray());
-
-                var sql = "DECLARE	@return_value int\n" +
-                          "EXEC	@return_value = [dbo].[p_wms_output_cancel]\n" +
-                          "     @Guids ='{0}', \n" +
-                          "		@billnum = N'{1}',\n" +
-                          "		@type = 21,\n" +
-                          "     @accountdate = N'{2}'\n" +
-                          "SELECT	'Return Value' = @return_value";
-
-                sql = string.Format(sql, str, input.BillNum, input.AccountDate.ToShortDateString());
-
-                await _wmsRepository.GetDbContext().Database.ExecuteSqlRawAsync(
-                   sql
-                 );
-
-            }
-            return true;
-        }
-        /// <summary>
-        /// 出库界面功能删除
-        /// </summary>
-        /// <param name="version"></param>
-        /// <param name="p_list"></param>
-        /// <returns></returns>
-        [HttpPost]
-        [Route("WmsOutPutDelete")]
-        [UnitOfWork(false)]
-        public async Task<bool> WmsOutPutDelete(WmsJitRequestDto input)
-        {
-            var count = _wmsRepository.Count(p => p.BillNum == input.BillNum && p.State != 0);
-
-            if (count > 0)
-            {
-                return false;
-            }
-            var sql = "DECLARE	@return_value int\n" +
-                      "EXEC	@return_value = [dbo].[p_wms_output_cancel_all]\n" +
-                      "		@billnum = N'{0}',\n" +
-                      "		@type = 21\n" +
-                      "SELECT	'Return Value' = @return_value";
-            await _wmsRepository.GetDbContext().Database.ExecuteSqlRawAsync(
-               string.Format(sql, input.BillNum)
-             );
-
-            return true;
-        }
-
-
-        /// <summary>
-        /// 导出
-        /// </summary>
-        /// <param name="input"></param>
-        /// <returns></returns>7
-        [HttpPost]
-        [Route("Export")]
-        //[Authorize(SettleAccountPermissions.SettleAccounts.Default)]
-        virtual public async Task<string> ExportAsync(WmsKanbanOutPutDetialRequestDto input)
-        {
-            input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "BillNum", Logic = EnumFilterLogic.And, Value = input.BillNum });
-
-            var entities = await _wmsRepository.GetListByFilterAsync(GuidGenerator.Create(), input.Filters, input.Sorting, int.MaxValue,
-                 0, true);
-
-            var dtos = ObjectMapper.Map<List<WmsHQWithOutKanbanOutPutDetial>, List<WmsHQWithOutKanbanOutPutDetialDto>>(entities);
-
-            IExporter _excel = new ExcelExporter();
-            byte[] result = null;
-
-            var _fileName = string.Format("红旗数据手工出库单_{0}.xlsx", Guid.NewGuid().ToString());
-            result = await _excel.ExportAsByteArray(dtos);
-
-
-            result.ShouldNotBeNull();
-
-            //保存导出文件到服务器存成二进制
-            await _excelImportService.SaveBlobAsync(
-                     new SaveExcelImportInputDto
-                     {
-                         Name = _fileName,
-                         Content = result
-                     }
-                 );
-            return _fileName;
-
-
-
-        }
-
-
-        // 物料 物料组 物料描述 物料号 期间  单位 出库数量 结算数量 
-
-
-
-
-
-
-
-    }
-
-
-}
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WmsHQMKanbanAppService.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WmsHQMKanbanAppService.cs
deleted file mode 100644
index e05fcb17..00000000
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WmsHQMKanbanAppService.cs
+++ /dev/null
@@ -1,490 +0,0 @@
-using EFCore.BulkExtensions;
-using Magicodes.ExporterAndImporter.Core;
-using Magicodes.ExporterAndImporter.Excel;
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.EntityFrameworkCore;
-using Shouldly;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Volo.Abp;
-using Volo.Abp.Application.Dtos;
-using Volo.Abp.Caching;
-using Volo.Abp.Domain.Repositories;
-using Volo.Abp.Uow;
-using Win.Abp.Snowflakes;
-using Win.Sfs.BaseData.ImportExcelCommon;
-using Win.Sfs.SettleAccount.CommonManagers;
-using Win.Sfs.SettleAccount.Constant;
-using Win.Sfs.SettleAccount.Entities.TaskJobs;
-using Win.Sfs.SettleAccount.Entities.Wms;
-using Win.Sfs.SettleAccount.ExcelImporter;
-using Win.Sfs.SettleAccount.ExportReports;
-using Win.Sfs.SettleAccount.Repository;
-using Win.Sfs.Shared.Filter;
-using WY.NewJit.Extends.PaiGe.WMS;
-
-namespace Win.Sfs.SettleAccount.Entities.WMS
-{
-    /// <summary>
-    /// wms出库-M平台
-    /// </summary>
-
-    //[AllowAnonymous]
-    [Authorize(SettleAccountPermissions.WMSHQ.Default)]
-    [Route("api/settleaccount/WMSHQMKanbanoutput")]
-    public class WmsHQMKanbanAppService :
-        SettleAccountApplicationBase<WmsHQMKanbanOutPutDetial>
-    {
-
-        private readonly ISettleAccountBranchEfCoreRepository<WmsHQMKanbanOutPutDetial, Guid> _wmsRepository;
-        private readonly ISettleAccountBranchEfCoreRepository<WmsHQMKanbanOutPut, Guid> _wmsVersionRepository;
-        private readonly WMSEfCoreRepository<WmsHQMKanbanOutPutDetial> _wmsefRespository;
-
-        private readonly WMSEfCoreRepository<TB_BILL> _wmstbRespository;
-        private readonly ISettleAccountBranchEfCoreRepository<TaskJob, Guid> _job;
-        private readonly IExcelImportAppService _excelImportService;
-
-
-        private readonly TaskJobService _service;
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="wmsRepository"></param>
-        /// <param name="job"></param>
-        /// <param name="wmsVersionRepository"></param>
-        /// <param name="wmsefRespository"></param>
-        /// <param name="wmstbRespository"></param>
-        public WmsHQMKanbanAppService(
-
-
-            IExcelImportAppService excelImportService,
-
-        ISettleAccountBranchEfCoreRepository<WmsHQMKanbanOutPutDetial, Guid> wmsRepository,
-            ISettleAccountBranchEfCoreRepository<TaskJob, Guid> job,
-            ISettleAccountBranchEfCoreRepository<WmsHQMKanbanOutPut, Guid> wmsVersionRepository,
-            WMSEfCoreRepository<WmsHQMKanbanOutPutDetial> wmsefRespository,
-            WMSEfCoreRepository<TB_BILL> wmstbRespository,
-             IDistributedCache<WmsHQMKanbanOutPutDetial> cache,
-             ISnowflakeIdGenerator snowflakeIdGenerator,
-           ICommonManager commonManager
-        ) : base(cache, excelImportService, snowflakeIdGenerator, commonManager)
-        {
-            _job = job;
-            _wmstbRespository = wmstbRespository;
-            _wmsRepository = wmsRepository;
-            _wmsVersionRepository = wmsVersionRepository;
-            _wmsefRespository = wmsefRespository;
-            _excelImportService = excelImportService;
-        }
-
-        private async Task<long> GetCountAsync(WmsKanbanOutPutDetialRequestDto input)
-        {
-            return await _wmsRepository.GetCountByFilterAsync(GuidGenerator.Create(), input.Filters);
-        }
-
-        private async Task<long> GetCountAsync(WmsKanbanOutPutRequestDto input)
-        {
-            return await _wmsVersionRepository.GetCountByFilterAsync(GuidGenerator.Create(), input.Filters);
-        }
-
-        /// <summary>
-        /// 准时化出库主表
-        /// </summary>
-        /// <param name="input"></param>
-        /// <returns></returns>
-        [HttpPost]
-        [Route("WmsHQMKanbanList")]
-        //[Authorize(SettleAccountPermissions.SettleAccounts.Default)]
-        virtual public async Task<PagedResultDto<WmsHQMKanbanOutPut>> GetListAsync(WmsKanbanOutPutRequestDto input)
-        {
-
-            var entities = await _wmsVersionRepository.GetListByFilterAsync(GuidGenerator.Create(), input.Filters, input.Sorting, input.MaxResultCount,
-                 input.SkipCount, true);
-
-            var totalCount = await GetCountAsync(input);
-
-
-            return new PagedResultDto<WmsHQMKanbanOutPut>(totalCount, entities);
-        }
-
-        /// <summary>
-        /// 准时化出库明细
-        /// </summary>
-        /// <param name="input"></param>
-        /// <returns></returns>
-        [HttpPost]
-        [Route("WmsHQMKanbanDetailList")]
-        //[Authorize(SettleAccountPermissions.SettleAccounts.Default)]
-        virtual public async Task<PagedResultDto<WmsHQMKanbanOutPutDetial>> GetListAsync(WmsKanbanOutPutDetialRequestDto input)
-        {
-            //不用传version 单号能保证唯一
-            input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "BillNum", Logic = EnumFilterLogic.And, Value = input.BillNum });
-            var entities = await _wmsRepository.GetListByFilterAsync(GuidGenerator.Create(), input.Filters, input.Sorting, input.MaxResultCount,
-                 input.SkipCount, true);
-
-            var totalCount = await GetCountAsync(input);
-            return new PagedResultDto<WmsHQMKanbanOutPutDetial>(totalCount, entities);
-        }
-        /// <summary>
-        ///  任务明细标记已确认
-        /// </summary>
-        /// <param name="files">上传的文件(前端已经限制只能上传一个附件)</param>
-        /// <returns></returns>
-        [HttpPost]
-        [Route("WmsHQMKanbanOutPutAudit")]
-        [DisableRequestSizeLimit]
-
-        public async Task<bool> WmsHQMKanbanAudit(List<Guid> ids)
-        {
-            var _joblist = await _job.Where(p => ids.Contains(p.Id)).ToListAsync();
-            foreach (var itm in _joblist)
-            {
-                itm.FileName = "已确认";
-                await _job.UpdateAsync(itm);
-            }
-
-            return true;
-        }
-
-
-        /// <summary>
-        /// 选择任务，生成出库单，只包含已确认的单据
-        /// </summary>
-        /// <param name="ids"></param>
-        /// <param name="version"></param>
-        /// <returns></returns>
-        [HttpPost]
-        [Route("WmsHQMKanbanOutPut")]
-        public async Task<string> WmsHQMKanbanOutPut(WmsJitRequestDto input)
-        {
-            var _billNum = "HQKBM" + DateTime.Now.ToString("yyyyMMddhhmmss");
-
-            var _joblist = _job.Where(p => input.Guids.Contains(p.Id) && p.FileName == "已确认").ToList();
-            if (_joblist.Count() > 0)
-            {
-                var fileList = _joblist.Select(p => p.RealDownFileName).ToList();
-                List<WmsHQMKanbanOutPutDetial> _lst = new List<WmsHQMKanbanOutPutDetial>();
-                foreach (var filename in fileList)
-                {
-                    string fileSavePath = Environment.CurrentDirectory + @"\wwwroot\files\host\my-file-container\" + filename;
-                    ExcelHelper _excelHelper = new ExcelHelper(fileSavePath);
-                    var _list = _excelHelper.ExcelToList<WmsHQMKanbanOutPutDetial>();
-                    foreach (var itm in _list)
-                    {
-                        itm.SetData(GuidGenerator.Create(), string.Empty, !string.IsNullOrEmpty(itm.WmsBillNum) ? itm.WmsBillNum : string.Empty, input.Version, GuidGenerator.Create());
-                    }
-                    _lst.AddRange(_list.ToArray());
-                }
-
-                var outPutDetail = await _wmsRepository.Where(p => p.Version == input.Version).ToListAsync();
-
-                var error = from itm1 in outPutDetail
-                            join itm2 in _lst on
-                            new { itm1.MaterialCode, itm1.Kanban, itm1.PoLine }
-                            equals
-                            new { itm2.MaterialCode, itm2.Kanban, itm2.PoLine }
-                            select itm1;
-                var errList = error.GroupBy(p => new { p.BillNum }).Select(p => new { BillNum = p.Key.BillNum, Number = p.Sum(itm => itm.Qty) });
-                if (errList.Count() == 0)
-                {
-
-                    var query = from itm1 in _lst
-                                join itm2 in outPutDetail on
-                                new { itm1.MaterialCode, itm1.Kanban }
-                                equals
-                                new { itm2.MaterialCode, itm2.Kanban } into temp1
-                                from tm1 in temp1.DefaultIfEmpty()
-                                where tm1 == null
-                                select itm1;
-                    var _wmslst = query.ToList();
-                    foreach (var itm in _wmslst)
-                    {
-                        itm.BillNum = _billNum;
-                    }
-                    await _wmsRepository.GetDbContext().BulkInsertAsync(_wmslst, new BulkConfig() { BulkCopyTimeout = 0, BatchSize = 10000 });
-                    int _count = _wmsVersionRepository.Count(p => p.Version == input.Version && p.BillNum == _billNum);
-                    if (_count == 0)
-                    {
-                        var _version = new WmsHQMKanbanOutPut(GuidGenerator.Create(), input.Version, _billNum, CurrentUser.Email);
-
-                        await _wmsVersionRepository.InsertAsync(_version, true);
-                    }
-
-                    foreach (var job in _joblist)
-                    {
-                        job.FileName = _billNum;
-                        await _job.UpdateAsync(job);
-                    }
-                }
-                else
-                {
-                    StringBuilder _buffer = new StringBuilder();
-                    foreach (var itm in errList)
-                    {
-                        _buffer.AppendFormat("出库单号:{0}重复记录数:{1}条", itm.BillNum, itm.Number);
-                    }
-                    var _errinfo = _buffer.ToString();
-
-                    foreach (var job in _joblist)
-                    {
-                        job.FileName = _errinfo;
-                        await _job.UpdateAsync(job);
-                    }
-                }
-            }
-            else
-            {
-                _billNum = string.Empty;
-            }
-            return ApplicationConsts.SuccessStr; ;
-        }
-        /// <summary>
-        ///更新备注
-        /// </summary>
-        /// <param name="input"></param>
-        /// <returns></returns>
-        [HttpGet]
-        [Route("UpdateRemark")]
-
-        public async Task<bool> UpdateRemark(Guid id, string remark)
-        {
-            var entity = _wmsVersionRepository.FirstOrDefault(p => p.Id == id);
-            if (entity != null)
-            {
-                entity.Remark = remark;
-                await _wmsVersionRepository.UpdateAsync(entity);
-
-            }
-            return true;
-        }
-        /// <summary>
-        /// 出库界面功能，核准出库功能
-        /// </summary>
-        /// <param name="version"></param>
-        /// <param name="p_list"></param>
-        /// <returns></returns>
-        [HttpPost]
-        [Route("WmsHQMKanbanOutPut-Pass")]
-        [UnitOfWork(false)]
-        public async Task<bool> WmsHQMKanbanOutPutPass(WmsJitRequestDto input)
-        {
-            if (DateTime.Now.ToString("yyyyMM") != input.AccountDate.ToString("yyyyMM"))
-            {
-                throw new BusinessException("8989", "填写过账日期应该为当月！");
-
-            }
-            var sql = "DECLARE	@return_value int\n" +
-                      "EXEC	@return_value = [dbo].[p_wms_output]\n" +
-                      "		@billnum = N'{0}',\n" +
-                      "		@type = 7,\n" +
-                      "     @date = N'{1}'\n" +
-                      "SELECT	'Return Value' = @return_value";
-            await _wmsRepository.GetDbContext().Database.ExecuteSqlRawAsync(
-               string.Format(sql, input.BillNum, input.AccountDate.ToShortDateString())
-             );
-
-
-
-            return true;
-
-        }
-        /// <summary>
-        ///出库界面功能， 撤销核准出库
-        /// </summary>
-        /// <param name="ids"></param>
-        /// <param name="version"></param>
-        /// <returns></returns>
-        [HttpPost]
-        [Route("WmsHQMKanbanOutPut-Cancel")]
-        public async Task<bool> WmsHQMKanbanOutPutCancel(WmsJitRequestDto input)
-        {
-            if (DateTime.Now.ToString("yyyyMM") != input.AccountDate.ToString("yyyyMM"))
-            {
-                throw new BusinessException("8989", "填写过账日期应该为当月！");
-
-            }
-            if (input.Guids != null && input.Guids.Count() > 0)
-            {
-                List<string> _ls = new List<string>();
-                foreach (var itm in input.Guids)
-                {
-                    _ls.Add(string.Format("{0}", itm));
-                }
-
-                string str = string.Join(",", _ls.ToArray());
-
-                var sql = "DECLARE	@return_value int\n" +
-                          "EXEC	@return_value = [dbo].[p_wms_output_cancel]\n" +
-                          "     @Guids ='{0}', \n" +
-                          "		@billnum = N'{1}',\n" +
-                          "		@type = 7,\n" +
-                          "     @accountdate = N'{2}'\n" +
-                          "SELECT	'Return Value' = @return_value";
-
-                sql = string.Format(sql, str, input.BillNum, input.AccountDate.ToShortDateString());
-
-                await _wmsRepository.GetDbContext().Database.ExecuteSqlRawAsync(
-                   sql
-                 );
-
-            }
-
-            return true;
-        }
-        /// <summary>
-        /// 出库界面功能删除
-        /// </summary>
-        /// <param name="version"></param>
-        /// <param name="p_list"></param>
-        /// <returns></returns>
-        [HttpPost]
-        [Route("WmsOutPutDelete")]
-        [UnitOfWork(false)]
-        public async Task<bool> WmsOutPutDelete(WmsJitRequestDto input)
-        {
-            var count = _wmsRepository.Count(p => p.BillNum == input.BillNum && p.State != 0);
-
-            if (count > 0)
-            {
-                return false;
-            }
-            var sql = "DECLARE	@return_value int\n" +
-                      "EXEC	@return_value = [dbo].[p_wms_output_cancel_all]\n" +
-                      "		@billnum = N'{0}',\n" +
-                      "		@type = 7\n" +
-                      "SELECT	'Return Value' = @return_value";
-            await _wmsRepository.GetDbContext().Database.ExecuteSqlRawAsync(
-               string.Format(sql, input.BillNum)
-             );
-
-
-
-            return true;
-        }
-        [HttpPost]
-        [Route("ExcelImport")]
-        [DisableRequestSizeLimit]
-        //[Authorize(SettleAccountPermissions.SettleAccounts.Default)]
-        public async Task<string> ExcelImport([FromForm] IFormFileCollection files, string version)
-        {
-            var _billNum = "HQKBM" + DateTime.Now.ToString("yyyyMMddhhmmss");
-            ExportImporter _exportImporter = new ExportImporter();
-            var result = await _exportImporter.ExtendExcelImport<WmsHQMKanbanOutPutDetial>(files, _excelImportService);
-            List<WmsHQMKanbanOutPutDetial> _lst = new List<WmsHQMKanbanOutPutDetial>();
-            var _lsCopy = new List<WmsHQMKanbanOutPutDetial>();
-            foreach (var itm in result)
-            {
-                WmsHQMKanbanOutPutDetial _detail = new WmsHQMKanbanOutPutDetial(
-                GuidGenerator.Create(),
-                !string.IsNullOrEmpty(itm.WmsBillNum) ? itm.WmsBillNum : string.Empty,
-                itm.Kanban,
-                itm.MaterialCode,
-                itm.MaterialDesc,
-                itm.MaterialGroup,
-                string.Empty,
-                string.Empty,
-                0,
-               !string.IsNullOrEmpty(itm.Extend1) ? itm.Extend1 : string.Empty,
-               !string.IsNullOrEmpty(itm.Extend2) ? itm.Extend2 : string.Empty,
-                version,
-                itm.MaterialCode,
-                itm.BillNum,
-                GuidGenerator.Create()
-                , string.Empty
-                , itm.Qty,
-               itm.PoLine
-                );
-                _lsCopy.Add(_detail);
-            }
-            _lst.AddRange(_lsCopy.ToArray());
-
-
-            var outPutDetail = await _wmsRepository.Where(p => p.Version == version).ToListAsync();
-
-
-            var error = from itm1 in outPutDetail
-                        join itm2 in _lst on
-                        new { itm1.MaterialCode, itm1.Kanban, itm1.PoLine }
-                        equals
-                        new { itm2.MaterialCode, itm2.Kanban, itm2.PoLine }
-                        select itm1;
-            var errList = error.GroupBy(p => new { p.BillNum }).Select(p => new { BillNum = p.Key.BillNum, Number = p.Count() });
-
-            var checkList = new List<ErrorExportDto>();
-            foreach (var itm in errList)
-            {
-                checkList.Add(new ErrorExportDto() { Message = string.Format("出库单号:{0}重复记录数:{1}条", itm.BillNum, itm.Number) });
-            }
-            if (checkList.Count > 0)
-            {
-
-                return await ExportErrorReportAsync(checkList);
-            }
-
-            var query = from itm1 in _lst
-                        join itm2 in outPutDetail on
-                        new { itm1.MaterialCode, itm1.Kanban, itm1.PoLine }
-                        equals
-                        new { itm2.MaterialCode, itm2.Kanban, itm2.PoLine } into temp1
-                        from tm1 in temp1.DefaultIfEmpty()
-                        where tm1 == null
-                        select itm1;
-            var _wmslst = query.ToList();
-            foreach (var itm in _wmslst)
-            {
-                itm.BillNum = _billNum;
-            }
-            await _wmsRepository.GetDbContext().BulkInsertAsync(_wmslst, new BulkConfig() { BulkCopyTimeout = 0, BatchSize = 10000 });
-            int _count = _wmsVersionRepository.Count(p => p.Version == version && p.BillNum == _billNum);
-            if (_count == 0)
-            {
-                var _version = new WmsHQMKanbanOutPut(GuidGenerator.Create(), version, _billNum, CurrentUser.Email);
-                await _wmsVersionRepository.InsertAsync(_version, true);
-            }
-            return ApplicationConsts.SuccessStr;
-        }
-
-        /// <summary>
-        /// 导出
-        /// </summary>
-        /// <param name="input"></param>
-        /// <returns></returns>
-        [HttpPost]
-        [Route("Export")]
-        //[Authorize(SettleAccountPermissions.SettleAccounts.Default)]
-        virtual public async Task<string> ExportAsync(WmsKanbanOutPutDetialRequestDto input)
-        {
-            input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "BillNum", Logic = EnumFilterLogic.And, Value = input.BillNum });
-            var entities = await _wmsRepository.GetListByFilterAsync(GuidGenerator.Create(), input.Filters, input.Sorting, int.MaxValue,
-                 0, true);
-
-            IExporter _excel = new ExcelExporter();
-            byte[] result = null;
-
-            var _fileName = string.Format("出库单_{0}.xlsx", Guid.NewGuid().ToString());
-            result = await _excel.ExportAsByteArray(entities);
-
-
-            result.ShouldNotBeNull();
-
-            //保存导出文件到服务器存成二进制
-            await _excelImportService.SaveBlobAsync(
-                     new SaveExcelImportInputDto
-                     {
-                         Name = _fileName,
-                         Content = result
-                     }
-                 );
-            return _fileName;
-
-
-
-        }
-
-    }
-}
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WmsHQMSharePartAppService.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WmsHQMSharePartAppService.cs
deleted file mode 100644
index 361baef4..00000000
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WmsHQMSharePartAppService.cs
+++ /dev/null
@@ -1,587 +0,0 @@
-using EFCore.BulkExtensions;
-using Magicodes.ExporterAndImporter.Core;
-using Magicodes.ExporterAndImporter.Excel;
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.EntityFrameworkCore;
-using Shouldly;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Volo.Abp;
-using Volo.Abp.Application.Dtos;
-using Volo.Abp.Caching;
-using Volo.Abp.Domain.Repositories;
-using Volo.Abp.Uow;
-using Win.Abp.Snowflakes;
-using Win.Sfs.BaseData.ImportExcelCommon;
-using Win.Sfs.SettleAccount.CommonManagers;
-using Win.Sfs.SettleAccount.Constant;
-using Win.Sfs.SettleAccount.Entities.TaskJobs;
-using Win.Sfs.SettleAccount.Entities.Wms;
-using Win.Sfs.SettleAccount.ExcelImporter;
-using Win.Sfs.SettleAccount.ExportReports;
-using Win.Sfs.SettleAccount.Repository;
-using Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report;
-using Win.Sfs.Shared.Filter;
-using WY.NewJit.Extends.PaiGe.WMS;
-
-namespace Win.Sfs.SettleAccount.Entities.WMS
-{
-    /// <summary>
-    /// 红旗H平台备件-出库
-    /// </summary>
-
-    [Authorize(SettleAccountPermissions.WMSHQ.Default)]
-    [Route("api/settleaccount/WmsHQMSharePartoutput")]
-    public class WmsHQMSharePartAppService :
-         SettleAccountApplicationBase<WmsHQMSharePartOutPutDetial>
-    {
-        private readonly ISettleAccountBranchEfCoreRepository<WmsHQMSharePartOutPutDetial, Guid> _wmsRepository;
-        private readonly ISettleAccountBranchEfCoreRepository<WmsHQMSharePartOutPut, Guid> _wmsVersionRepository;
-        private readonly WMSEfCoreRepository<WmsHQMSharePartOutPutDetial> _wmsefRespository;
-        private readonly WmsDapperRepository _wmsDapper;
-        private readonly WMSEfCoreRepository<TB_BILL> _wmstbRespository;
-        private readonly ISettleAccountBranchEfCoreRepository<TaskJob, Guid> _job;
-        private readonly IExcelImportAppService _excelImportService;
-
-        private readonly TaskJobService _service;
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="wmsRepository"></param>
-        /// <param name="job"></param>
-        /// <param name="wmsVersionRepository"></param>
-        /// <param name="wmsefRespository"></param>
-        /// <param name="wmstbRespository"></param>
-        public WmsHQMSharePartAppService(
-
-            ISettleAccountBranchEfCoreRepository<WmsHQMSharePartOutPutDetial, Guid> wmsRepository,
-            ISettleAccountBranchEfCoreRepository<TaskJob, Guid> job,
-            ISettleAccountBranchEfCoreRepository<WmsHQMSharePartOutPut, Guid> wmsVersionRepository,
-            WMSEfCoreRepository<WmsHQMSharePartOutPutDetial> wmsefRespository,
-            WMSEfCoreRepository<TB_BILL> wmstbRespository,
-            IExcelImportAppService excelImportService,
-             IDistributedCache<WmsHQMSharePartOutPutDetial> cache,
-             ISnowflakeIdGenerator snowflakeIdGenerator,
-           ICommonManager commonManager,
-            WmsDapperRepository wmsDapper
-        ) : base(cache, excelImportService, snowflakeIdGenerator, commonManager)
-        {
-            _excelImportService = excelImportService;
-            _job = job;
-            _wmstbRespository = wmstbRespository;
-            _wmsRepository = wmsRepository;
-            _wmsVersionRepository = wmsVersionRepository;
-            _wmsefRespository = wmsefRespository;
-            _wmsDapper = wmsDapper;
-        }
-
-        private async Task<long> GetCountAsync(WmsSharePartOutPutDetialRequestDto input)
-        {
-            return await _wmsRepository.GetCountByFilterAsync(GuidGenerator.Create(), input.Filters);
-        }
-
-        private async Task<long> GetCountAsync(WmsSharePartOutPutRequestDto input)
-        {
-            return await _wmsVersionRepository.GetCountByFilterAsync(GuidGenerator.Create(), input.Filters);
-        }
-
-        /// <summary>
-        /// 准时化出库主表
-        /// </summary>
-        /// <param name="input"></param>
-        /// <returns></returns>
-        [HttpPost]
-        [Route("WmsSharePartList")]
-        //[Authorize(SettleAccountPermissions.SettleAccounts.Default)]
-        virtual public async Task<PagedResultDto<WmsHQMSharePartOutPut>> GetListAsync(WmsSharePartOutPutRequestDto input)
-        {
-
-            var entities = await _wmsVersionRepository.GetListByFilterAsync(GuidGenerator.Create(), input.Filters, input.Sorting, input.MaxResultCount,
-                 input.SkipCount, true);
-
-            var totalCount = await GetCountAsync(input);
-
-
-            return new PagedResultDto<WmsHQMSharePartOutPut>(totalCount, entities);
-        }
-
-        /// <summary>
-        /// 准时化出库明细
-        /// </summary>
-        /// <param name="input"></param>
-        /// <returns></returns>
-        [HttpPost]
-        [Route("WmsSharePartDetailList")]
-        [UnitOfWork(false)]
-        //[Authorize(SettleAccountPermissions.SettleAccounts.Default)]
-        virtual public async Task<PagedResultDto<WmsHQMSharePartOutPutDetial>> GetListAsync(WmsSharePartOutPutDetialRequestDto input)
-        {
-            //不用传version 单号能保证唯一
-            input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "BillNum", Logic = EnumFilterLogic.And, Value = input.BillNum });
-            var entities = await _wmsRepository.GetListByFilterAsync(GuidGenerator.Create(), input.Filters, input.Sorting, input.MaxResultCount,
-                 input.SkipCount, true);
-
-            var totalCount = await GetCountAsync(input);
-            var stockList = _wmsDapper.GetSalesStock("BJJS");
-
-
-
-            var query = from itm in entities
-                        join itm1 in stockList on itm.MaterialCode equals itm1.SapCode
-            into temp1
-                        from tm1 in temp1.DefaultIfEmpty()
-                        select new WmsHQMSharePartOutPutDetial(
-                            itm.Id,
-                        itm.WmsBillNum,
-                        itm.OrderBillNum,
-                        itm.MaterialCode,
-                        itm.MaterialDesc,
-                        itm.MaterialGroup,
-                        itm.OutPut,
-                        itm.InPut,
-                        itm.State,
-                        itm.Extend1,
-                        itm.Extend2,
-                        itm.Version,
-                        itm.ParentMaterialCode,
-                        itm.BillNum,
-                        itm.TaskId,
-                        itm.Remark,
-                        itm.Qty,
-                        tm1 == null ? 0 : tm1.Qty
-                        ,itm.OutPutQty
-                        );
-
-
-
-
-            return new PagedResultDto<WmsHQMSharePartOutPutDetial>(totalCount, query.ToList());
-        }
-        /// <summary>
-        ///  任务明细标记已确认
-        /// </summary>
-        /// <param name="files">上传的文件(前端已经限制只能上传一个附件)</param>
-        /// <returns></returns>
-        [HttpPost]
-        [Route("WmsSharePartOutPutAudit")]
-        [DisableRequestSizeLimit]
-
-        public async Task<bool> WmsSharePartAudit(List<Guid> ids)
-        {
-            var _joblist = await _job.Where(p => ids.Contains(p.Id)).ToListAsync();
-            foreach (var itm in _joblist)
-            {
-                itm.FileName = "已确认";
-                await _job.UpdateAsync(itm);
-            }
-
-            return true;
-        }
-        /// <summary>
-        /// 选择任务，生成出库单，只包含已确认的单据
-        /// </summary>
-        /// <param name="ids"></param>
-        /// <param name="version"></param>
-        /// <returns></returns>
-        [HttpPost]
-        [Route("WmsSharePartOutPut")]
-        public async Task<string> WmsSharePartOutPut(WmsJitRequestDto input)
-        {
-            var _billNum = "BHQM" + DateTime.Now.ToString("yyyyMMddhhmmss");
-            var _joblist = _job.Where(p => input.Guids.Contains(p.Id) && p.FileName == "已确认").ToList();
-            if (_joblist.Count() > 0)
-            {
-                var fileList = _joblist.Select(p => p.RealDownFileName).ToList();
-                List<WmsHQMSharePartOutPutDetial> _lst = new List<WmsHQMSharePartOutPutDetial>();
-                foreach (var filename in fileList)
-                {
-                    string fileSavePath = Environment.CurrentDirectory + @"\wwwroot\files\host\my-file-container\" + filename;
-                    ExcelHelper _excelHelper = new ExcelHelper(fileSavePath);
-                    var _list = _excelHelper.ExcelToList<WmsHQMSharePartOutPutDetial>();
-                    if (_list.Count() > 0)
-                    {
-                        var _lsAry = _list.Select(p => new
-                           WmsHQMSharePartOutPutDetial(
-                                  GuidGenerator.Create(),
-                                  "",
-                                  string.Empty,
-                                  p.MaterialCode,
-                                  p.MaterialDesc,
-                                  p.MaterialGroup,
-                                  string.Empty,
-                                  string.Empty,
-                                  0,
-                                  p.Extend1,
-                                  p.Extend2,
-                                  input.Version,
-                                   string.Empty,
-                                  _billNum,
-                                  GuidGenerator.Create(),
-                                  string.Empty,
-                                  p.Qty,
-                                  p.StockQty,
-                                  p.Qty
-                                  
-                           ));
-                        _lst.AddRange(_lsAry.ToArray());
-                    }
-                }
-                var outPutDetail = await _wmsRepository.Where(p => p.Version == input.Version).ToListAsync();
-
-                var error = from itm1 in outPutDetail
-                            join itm2 in _lst on
-                            new { itm1.MaterialCode }
-                            equals
-                            new { itm2.MaterialCode }
-                            select itm1;
-                var errList = error.GroupBy(p => new { p.BillNum }).Select(p => new { BillNum = p.Key.BillNum, Number = p.Sum(itm => itm.Qty) });
-
-
-                if (errList.Count() == 0)
-                {
-                    foreach (var itm in _lst)
-                    {
-                        itm.BillNum = _billNum;
-                    }
-                    await _wmsRepository.GetDbContext().BulkInsertAsync(_lst, new BulkConfig() { BulkCopyTimeout = 0, BatchSize = 10000 });
-                    int _count = _wmsVersionRepository.Count(p => p.Version == input.Version && p.BillNum == _billNum);
-                    if (_count == 0)
-                    {
-                        var _version = new WmsHQMSharePartOutPut(GuidGenerator.Create(), input.Version, _billNum, CurrentUser.Email);
-
-                        await _wmsVersionRepository.InsertAsync(_version, true);
-
-                    }
-
-                    foreach (var job in _joblist)
-                    {
-                        job.FileName = _billNum;
-                        await _job.UpdateAsync(job);
-                    }
-                }
-                else
-                {
-                    StringBuilder _buffer = new StringBuilder();
-                    foreach (var itm in errList)
-                    {
-                        _buffer.AppendFormat("出库单号:{0}重复记录数:{1}条", itm.BillNum, itm.Number);
-                    }
-                    var _errinfo = _buffer.ToString();
-
-                    foreach (var job in _joblist)
-                    {
-                        job.FileName = _errinfo;
-                        await _job.UpdateAsync(job);
-                    }
-                }
-            }
-            //return _billNum;
-            //else
-            //{
-            //    StringBuilder _buffer = new StringBuilder();
-            //    foreach (var itm in errList)
-            //    {
-            //        _buffer.AppendFormat("出库单号:{0}重复记录数:{1}条", itm.BillNum, itm.Number);
-            //    }
-            //    var _errinfo = _buffer.ToString();
-            //    foreach (var job in _joblist)
-            //    {
-            //        job.FileName = _errinfo;
-            //        await _job.UpdateAsync(job);
-            //    }
-
-            //    //}
-            //}
-            //else
-            //{
-            //    _billNum = string.Empty;
-            //}
-            return ApplicationConsts.SuccessStr;
-        }
-        /// <summary>
-        /// 出库界面功能，核准出库功能
-        /// </summary>
-        /// <param name="version"></param>
-        /// <param name="p_list"></param>
-        /// <returns></returns>
-        [HttpPost]
-        [Route("WmsSharePartOutPut-Pass")]
-        [UnitOfWork(false)]
-        public async Task<bool> WmsSharePartOutPutPass(WmsJitRequestDto input)
-        {
-            if (DateTime.Now.ToString("yyyyMM") != input.AccountDate.ToString("yyyyMM"))
-            {
-                throw new BusinessException("8989", "填写过账日期应该为当月！");
-
-            }
-            if (input.Guids != null)
-            {
-                List<WmsHQMSharePartOutPutDetial> _ls = new List<WmsHQMSharePartOutPutDetial>();
-                if (input.Guids.Count() > 0)
-                {
-                    _ls = await _wmsRepository.Where(p => input.Guids.Contains(p.Id) && p.Version == input.Version && p.BillNum == input.BillNum && p.State != 2).ToListAsync();
-                }
-                else
-                {
-                    _ls = await _wmsRepository.Where(p => p.Version == input.Version && p.BillNum == input.BillNum && p.State != 2).ToListAsync();
-                }
-                if (_ls.Count() > 0)
-                {
-                    var sql = "DECLARE	@return_value int\n" +
-                         "EXEC	@return_value = [dbo].[p_wms_output]\n" +
-                         "		@billnum = N'{0}',\n" +
-                         "		@type = 8,\n" +
-                         "      @date = N'{1}'\n" +
-                         "SELECT	'Return Value' = @return_value";
-                    await _wmsRepository.GetDbContext().Database.ExecuteSqlRawAsync(
-                       string.Format(sql, input.BillNum,input.AccountDate.ToShortDateString()));
-
-                }
-            }
-            return true;
-        }
-
-        /// <summary>
-        ///  任务明细标记已确认
-        /// </summary>
-        /// <param name="files">上传的文件(前端已经限制只能上传一个附件)</param>
-        /// <returns></returns>
-        [HttpPost]
-        [Route("WmsSharePartOutPutModify")]
-        [DisableRequestSizeLimit]
-
-        public async Task<bool> WmsSharePartUpdate(WmsHQHSharePartOutPutDetial detial)
-        {
-            var _entityList = _wmsRepository.Where(p => p.Id == detial.BranchId).ToList();
-            if (_entityList.Count() > 0)
-            {
-                foreach (var itm in _entityList)
-                {
-                    itm.OutPutQty = detial.OutPutQty;
-                    await _wmsRepository.UpdateAsync(itm);
-                }
-            }
-            return true;
-
-        }
-
-
-        /// <summary>
-        ///出库界面功能， 撤销核准出库
-        /// </summary>
-        /// <param name="ids"></param>
-        /// <param name="version"></param>
-        /// <returns></returns>
-        [HttpPost]
-        [Route("WmsSharePartOutPut-Cancel")]
-        public async Task<bool> WmsSharePartOutPutCancel(WmsJitRequestDto input)
-        {
-
-          
-
-
-
-            if (input.Guids != null && input.Guids.Count() > 0)
-            {
-                List<string> _ls = new List<string>();
-                foreach (var itm in input.Guids)
-                {
-                    _ls.Add(string.Format("{0}", itm));
-                }
-                string str = string.Join(",", _ls.ToArray());
-
-                var sql = "DECLARE	@return_value int\n" +
-                          "EXEC	@return_value = [dbo].[p_wms_output_cancel]\n" +
-                          "     @Guids ='{0}', \n" +
-                          "		@billnum = N'{1}',\n" +
-                          "		@type = 8,\n" +
-                          "     @accountdate = N'{2}'\n" +
-                          "SELECT	'Return Value' = @return_value";
-
-                sql = string.Format(sql, str, input.BillNum, input.AccountDate.ToShortDateString());
-
-                await _wmsRepository.GetDbContext().Database.ExecuteSqlRawAsync(
-                   sql
-                 );
-            }
-            return true;
-        }
-        /// <summary>
-        /// 出库界面功能删除
-        /// </summary>
-        /// <param name="version"></param>
-        /// <param name="p_list"></param>
-        /// <returns></returns>
-        [HttpPost]
-        [Route("WmsOutPutDelete")]
-        [UnitOfWork(false)]
-        public async Task<bool> WmsOutPutDelete(WmsJitRequestDto input)
-        {
-            var count = _wmsRepository.Count(p => p.BillNum == input.BillNum && p.State != 0);
-
-            if (count > 0)
-            {
-                return false;
-            }
-            var sql = "DECLARE	@return_value int\n" +
-                      "EXEC	@return_value = [dbo].[p_wms_output_cancel_all]\n" +
-                      "		@billnum = N'{0}',\n" +
-                      "		@type = 8\n" +
-                      "SELECT	'Return Value' = @return_value";
-            await _wmsRepository.GetDbContext().Database.ExecuteSqlRawAsync(
-               string.Format(sql, input.BillNum)
-             );
-
-
-
-            return true;
-        }
-        /// <summary>
-        ///更新备注
-        /// </summary>
-        /// <param name="input"></param>
-        /// <returns></returns>
-        [HttpGet]
-        [Route("UpdateRemark")]
-
-        public async Task<bool> UpdateRemark(Guid id, string remark)
-        {
-            var entity = _wmsVersionRepository.FirstOrDefault(p => p.Id == id);
-            if (entity != null)
-            {
-                entity.Remark = remark;
-                await _wmsVersionRepository.UpdateAsync(entity);
-
-            }
-            return true;
-        }
-
-
-
-
-
-        [HttpPost]
-        [Route("ExcelImport")]
-        [DisableRequestSizeLimit]
-        //[Authorize(SettleAccountPermissions.SettleAccounts.Default)]
-        public async Task<string> ExcelImport([FromForm] IFormFileCollection files, string version)
-        {
-            var _billNum = "BHQM" + DateTime.Now.ToString("yyyyMMddhhmmss");
-            ExportImporter _exportImporter = new ExportImporter();
-            var result = await _exportImporter.ExtendExcelImport<WmsHQMSharePartOutPutDetial>(files, _excelImportService);
-            List<WmsHQMSharePartOutPutDetial> _lst = new List<WmsHQMSharePartOutPutDetial>();
-
-            var _lsCopy = new List<WmsHQMSharePartOutPutDetial>();
-            foreach (var itm in result)
-            {
-                WmsHQMSharePartOutPutDetial _detail = new WmsHQMSharePartOutPutDetial(
-                GuidGenerator.Create(),
-                string.Empty,
-                string.Empty,
-                itm.MaterialCode,
-                itm.MaterialDesc,
-                itm.MaterialGroup,
-                string.Empty,
-                string.Empty,
-                0,
-               !string.IsNullOrEmpty(itm.Extend1) ? itm.Extend1 : string.Empty,
-               !string.IsNullOrEmpty(itm.Extend2) ? itm.Extend2 : string.Empty,
-                version,
-                itm.MaterialCode,
-                itm.BillNum,
-                GuidGenerator.Create()
-                , string.Empty
-                , itm.Qty
-                , 0
-                ,itm.Qty
-                );
-                _lsCopy.Add(_detail);
-            }
-            _lst.AddRange(_lsCopy.ToArray());
-
-
-            var outPutDetail = await _wmsRepository.Where(p => p.Version == version).ToListAsync();
-
-            var error = from itm1 in outPutDetail
-                        join itm2 in _lst on
-                        new { itm1.MaterialCode }
-                        equals
-                        new { itm2.MaterialCode }
-                        select itm1;
-            var errList = error.GroupBy(p => new { p.BillNum }).Select(p => new { BillNum = p.Key.BillNum, Number = p.Count() });
-
-            var checkList = new List<ErrorExportDto>();
-            foreach (var itm in errList)
-            {
-                checkList.Add(new ErrorExportDto() { Message = string.Format("出库单号:{0}重复记录数:{1}条", itm.BillNum, itm.Number) });
-            }
-            if (checkList.Count > 0)
-            {
-                return await ExportErrorReportAsync(checkList);
-            }
-            var query = from itm1 in _lst
-                        join itm2 in outPutDetail on
-                        new { itm1.MaterialCode }
-                        equals
-                        new { itm2.MaterialCode } into temp1
-                        from tm1 in temp1.DefaultIfEmpty()
-                        where tm1 == null
-                        select itm1;
-            var _wmslst = query.ToList();
-            foreach (var itm in _wmslst)
-            {
-                itm.BillNum = _billNum;
-            }
-            await _wmsRepository.GetDbContext().BulkInsertAsync(_wmslst, new BulkConfig() { BulkCopyTimeout = 0, BatchSize = 10000 });
-            int _count = _wmsVersionRepository.Count(p => p.Version == version && p.BillNum == _billNum);
-            if (_count == 0)
-            {
-                var _version = new WmsHQMSharePartOutPut(GuidGenerator.Create(), version, _billNum, CurrentUser.Email);
-                await _wmsVersionRepository.InsertAsync(_version, true);
-            }
-            return ApplicationConsts.SuccessStr;
-        }
-
-        /// <summary>
-        /// 导出
-        /// </summary>
-        /// <param name="input"></param>
-        /// <returns></returns>
-        [HttpPost]
-        [Route("Export")]
-        //[Authorize(SettleAccountPermissions.SettleAccounts.Default)]
-        virtual public async Task<string> ExportAsync(WmsKanbanOutPutDetialRequestDto input)
-        {
-            input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "BillNum", Logic = EnumFilterLogic.And, Value = input.BillNum });
-            var entities = await _wmsRepository.GetListByFilterAsync(GuidGenerator.Create(), input.Filters, input.Sorting, int.MaxValue,
-                 0, true);
-
-            IExporter _excel = new ExcelExporter();
-            byte[] result = null;
-
-            var _fileName = string.Format("出库单_{0}.xlsx", Guid.NewGuid().ToString());
-            result = await _excel.ExportAsByteArray(entities);
-
-
-            result.ShouldNotBeNull();
-
-            //保存导出文件到服务器存成二进制
-            await _excelImportService.SaveBlobAsync(
-                     new SaveExcelImportInputDto
-                     {
-                         Name = _fileName,
-                         Content = result
-                     }
-                 );
-            return _fileName;
-
-
-
-        }
-    }
-}
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WmsOneTimeSaleOutputAppService.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WmsOneTimeSaleOutputAppService.cs
deleted file mode 100644
index 29e2440e..00000000
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WmsOneTimeSaleOutputAppService.cs
+++ /dev/null
@@ -1,464 +0,0 @@
-using EFCore.BulkExtensions;
-using Magicodes.ExporterAndImporter.Core;
-using Magicodes.ExporterAndImporter.Excel;
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.EntityFrameworkCore;
-using Shouldly;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Volo.Abp;
-using Volo.Abp.Application.Dtos;
-using Volo.Abp.Caching;
-using Volo.Abp.Domain.Repositories;
-using Volo.Abp.Uow;
-using Win.Abp.Snowflakes;
-using Win.Sfs.BaseData.ImportExcelCommon;
-using Win.Sfs.SettleAccount.CommonManagers;
-using Win.Sfs.SettleAccount.Constant;
-using Win.Sfs.SettleAccount.Entities.TaskJobs;
-using Win.Sfs.SettleAccount.Entities.Wms;
-using Win.Sfs.SettleAccount.ExcelImporter;
-using Win.Sfs.SettleAccount.ExportReports;
-using Win.Sfs.SettleAccount.Repository;
-using Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report;
-using Win.Sfs.Shared.Filter;
-using WY.NewJit.Extends.PaiGe.WMS;
-
-namespace Win.Sfs.SettleAccount.Entities.WMS
-{
-    [Route("api/settleaccount/WmsOneTimeSaleOutput")]
-    //[AllowAnonymous]
-    [Authorize(SettleAccountPermissions.WMSJIT.Default)]
-    public class WmsOneTimeSaleOutputAppService : SettleAccountApplicationBase<WmsOneTimeSaleOutPutDetial>
-    {
-
-        private readonly ISettleAccountBranchEfCoreRepository<WmsOneTimeSaleOutPutDetial, Guid> _wmsRepository;
-        private readonly ISettleAccountBranchEfCoreRepository<WmsOneTimeSaleOutPut, Guid> _wmsVersionRepository;
-
-        private readonly KanbanUnSettledDapperRepository _dapper;
-        private readonly WMSEfCoreRepository<WmsKanbanOutPutDetial> _wmsefRespository;
-
-        private readonly WMSEfCoreRepository<TB_BILL> _wmstbRespository;
-        private readonly ISettleAccountBranchEfCoreRepository<TaskJob, Guid> _job;
-        private readonly IExcelImportAppService _excelImportService;
-
-
-        private readonly TaskJobService _service;
-        private readonly WmsDapperRepository _wmsDapper;
-        private readonly ErpPartDapperRepository _erpdapperRepository;
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="wmsRepository"></param>
-        /// <param name="job"></param>
-        /// <param name="wmsVersionRepository"></param>
-        /// <param name="wmsefRespository"></param>
-        /// <param name="wmstbRespository"></param>
-        public WmsOneTimeSaleOutputAppService(
-
-            IExcelImportAppService excelImportService,
-            ISettleAccountBranchEfCoreRepository<WmsOneTimeSaleOutPutDetial, Guid> wmsRepository,
-            ISettleAccountBranchEfCoreRepository<TaskJob, Guid> job,
-            ISettleAccountBranchEfCoreRepository<WmsOneTimeSaleOutPut, Guid> wmsVersionRepository,
-            WMSEfCoreRepository<WmsKanbanOutPutDetial> wmsefRespository,
-            KanbanUnSettledDapperRepository dapper,
-            WMSEfCoreRepository<TB_BILL> wmstbRespository,
-            IDistributedCache<WmsOneTimeSaleOutPutDetial> cache,
-            ISnowflakeIdGenerator snowflakeIdGenerator,
-            ICommonManager commonManager,
-            ErpPartDapperRepository erpdapperRepository,
-            WmsDapperRepository wmsDapper
-        ) : base(cache, excelImportService, snowflakeIdGenerator, commonManager)
-        {
-            _job = job;
-            _wmstbRespository = wmstbRespository;
-            _wmsRepository = wmsRepository;
-            _wmsVersionRepository = wmsVersionRepository;
-            _wmsefRespository = wmsefRespository;
-            _excelImportService = excelImportService;
-            _dapper = dapper;
-            _wmsDapper = wmsDapper;
-            _erpdapperRepository = erpdapperRepository;
-        }
-
-        private async Task<long> GetCountAsync(WmsOneTimeSaleOutPutDetialRequestDto input)
-        {
-            input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "BillNum", Logic = EnumFilterLogic.And, Value = input.BillNum });
-            return await _wmsRepository.GetCountByFilterAsync(GuidGenerator.Create(), input.Filters);
-        }
-
-        private async Task<long> GetCountAsync(WmsKanbanOutPutRequestDto input)
-        {
-            return await _wmsVersionRepository.GetCountByFilterAsync(GuidGenerator.Create(), input.Filters);
-        }
-
-        /// <summary>
-        /// 准时化出库主表
-        /// </summary>
-        /// <param name="input"></param>
-        /// <returns></returns>
-        [HttpPost]
-        [Route("WmsKanbanList")]
-        //[Authorize(SettleAccountPermissions.SettleAccounts.Default)]
-        virtual public async Task<PagedResultDto<WmsOneTimeSaleOutPut>> GetListAsync(WmsKanbanOutPutRequestDto input)
-        {
-            //input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "BillNum", Logic = EnumFilterLogic.And, Value = input.BillNum });
-            var entities = await _wmsVersionRepository.GetListByFilterAsync(GuidGenerator.Create(), input.Filters, input.Sorting, input.MaxResultCount,
-                 input.SkipCount, true);
-
-            var totalCount = await GetCountAsync(input);
-
-            return new PagedResultDto<WmsOneTimeSaleOutPut>(totalCount, entities);
-        }
-
-        /// <summary>
-        /// 准时化出库明细
-        /// </summary>
-        /// <param name="input"></param>
-        /// <returns></returns>
-        [HttpPost]
-        [Route("WmsKanbanDetailList")]
-        [UnitOfWork(false)]
-        //[Authorize(SettleAccountPermissions.SettleAccounts.Default)]
-        virtual public async Task<PagedResultDto<WmsOneTimeSaleOutPutDetial>> GetListAsync(WmsOneTimeSaleOutPutDetialRequestDto input)
-        {
-            input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "BillNum", Logic = EnumFilterLogic.And, Value = input.BillNum });
-            var entities = await _wmsRepository.GetListByFilterAsync(GuidGenerator.Create(), input.Filters, input.Sorting, input.MaxResultCount,
-                 input.SkipCount, true);
-            var totalCount = await GetCountAsync(input);
-            var stockList = _wmsDapper.GetSalesStock();
-            var query = from itm in entities
-                        join itm1 in stockList on itm.SapMaterialCode equals itm1.SapCode
-            into temp1
-                        from tm1 in temp1.DefaultIfEmpty()
-                        select new WmsOneTimeSaleOutPutDetial(
-                GuidGenerator.Create(),
-                "无看板发货",
-                itm.SapMaterialCode,
-                itm.MaterialDesc,
-                itm.Version,
-                itm.IsBack,
-                string.Empty,
-                itm.Qty,
-                tm1 == null ? 0 : tm1.Qty,
-                itm.Qty,
-                itm.Extend,
-                itm.BillNum,
-                itm.State,
-                itm.RealityNumber,
-                itm.Price,
-                itm.Amt
-                );
-
-            return new PagedResultDto<WmsOneTimeSaleOutPutDetial>(totalCount, entities);
-        }
-
-        /// <summary>
-        ///更新备注
-        /// </summary>
-        /// <param name="input"></param>
-        /// <returns></returns>
-        [HttpGet]
-        [Route("UpdateRemark")]
-
-        public async Task<bool> UpdateRemark(Guid id, string remark)
-        {
-            var entity = _wmsVersionRepository.FirstOrDefault(p => p.Id == id);
-            if (entity != null)
-            {
-                entity.Remark = remark;
-                await _wmsVersionRepository.UpdateAsync(entity);
-
-            }
-            return true;
-        }
-
-
-        /// <summary>
-        ///  任务明细标记已确认
-        /// </summary>
-        /// <param name="files">上传的文件(前端已经限制只能上传一个附件)</param>
-        /// <returns></returns>
-        [HttpPost]
-        [Route("WmsSharePartOutPutModify")]
-        [DisableRequestSizeLimit]
-
-        public async Task<bool> WmsSharePartUpdate(WmsOneTimeSaleOutPutDetial detial)
-        {
-            var _entityList = _wmsRepository.Where(p => p.Id == detial.BranchId).ToList();
-            if (_entityList.Count() > 0)
-            {
-                foreach (var itm in _entityList)
-                {
-                    itm.OutputQty = detial.OutputQty;
-                    await _wmsRepository.UpdateAsync(itm);
-                }
-            }
-            return true;
-
-        }
-
-        /// <summary>
-        /// 选择任务，生成出库单，只包含已确认的单据
-        /// </summary>
-        /// <param name="ids"></param>
-        /// <param name="version"></param>
-        /// <returns></returns>
-        [HttpPost]
-        [Route("ExcelImport")]
-        [UnitOfWork(false)]
-        public async Task<string> WmsKanbanOutPut([FromForm] IFormFileCollection files, string version)
-        {
-            var checkList = new List<ErrorExportDto>();
-            var _billNum = "OTS" + DateTime.Now.ToString("yyyyMMddhhmmss");
-
-
-            //var _list = _dapper.GetNoKanbanSettleDetail(input.Version);
-
-            ExportImporter _exportImporter = new ExportImporter();
-            //只取导入模板第一个页签
-            var _list_org = await _exportImporter.ExtendExcelOfSheetOneImport<WmsOneTimeSaleOutPutDetial>(files, _excelImportService);
-            // 根据物料号是否为空，过滤EXCEL自带的空行
-             var _list = _list_org.Where(p => !string.IsNullOrEmpty(p.SapMaterialCode));
-
-
-            //检验1:导入模板中的第一页签数据不能为空
-            if (_list == null || _list.Count() == 0)
-            {
-                checkList.Add(new ErrorExportDto(version, "一次性寄售销售导入", string.Empty, string.Empty, string.Empty, string.Empty, "导入模板中第一页签没有数据，请检查！", string.Empty));
-            }
-
-            //和物料主数据中SAP物料号检验是否存在
-            foreach (var itm in _list)
-            {
-                if (!_erpdapperRepository.GetMaterialList().Any(p => p.MaterialCode == itm.SapMaterialCode))
-                {
-                    checkList.Add(new ErrorExportDto(version, "一次性寄售销售导入", string.Empty, string.Empty, itm.SapMaterialCode, string.Empty, string.Format("物料主数据不存在当前导入的物料号{0}！", itm.SapMaterialCode), string.Empty));
-                }
-
-            }
-            if (checkList.Count > 0)
-            {
-                return await ExportErrorReportAsync(checkList);
-            }
-
-            ////插入数据前检验
-            //var checkList = new List<ErrorExportDto>();
-            //var _group = _list.GroupBy(x => new { x.Qty,x.SapMaterialCode, x.Version }).Select(p => new { Count = p.Count(), Qty = p.Key.Qty, SapMaterialCode = p.Key.SapMaterialCode });
-            //foreach (var itm in _group)
-            //{
-            //    if (itm.Qty==null)
-            //    {
-            //        checkList.Add(new ErrorExportDto(version, "OneTiemSale", string.Empty, string.Empty, string.Empty, string.Empty, string.Format("导入的平台数据不是{0}平台的，请检查！", itm.Factory), string.Empty));
-            //        break;
-            //    }
-            //}
-
-
-            var stockList = _wmsDapper.GetSalesStock();
-            var query = from itm in _list
-                        join itm1 in stockList on itm.SapMaterialCode equals itm1.SapCode
-            into temp1
-                        from tm1 in temp1.DefaultIfEmpty()
-                        select new WmsOneTimeSaleOutPutDetial(
-                GuidGenerator.Create(),
-                "无看板发货",
-                itm.SapMaterialCode,
-                itm.MaterialDesc,
-                version,
-                itm.IsBack,//是否备件
-                string.Empty,
-                itm.Qty,
-                tm1 == null ? 0 : tm1.Qty,
-                itm.Qty,
-                itm.Extend,//客户信息
-                _billNum,
-                0,
-                0,
-                itm.Price,
-                itm.Amt
-                );
-
-            await _wmsRepository.GetDbContext().BulkInsertAsync(query.ToList(), new BulkConfig() { BulkCopyTimeout = 0, BatchSize = 10000 });
-            int _count = _wmsVersionRepository.Count(p => p.Version == version && p.BillNum == _billNum);
-            if (_count == 0)
-            {
-                var _version = new WmsOneTimeSaleOutPut(GuidGenerator.Create(), version, _billNum, CurrentUser.Email,string.Empty);
-                await _wmsVersionRepository.InsertAsync(_version, true);
-            }
-            return ApplicationConsts.SuccessStr; 
-        }
-        /// <summary>
-        /// 出库界面功能，核准出库功能
-        /// </summary>
-        /// <param name="version"></param>
-        /// <param name="p_list"></param>
-        /// <returns></returns>
-        [HttpPost]
-        [Route("WmsKanbanOutPut-Pass")]
-        [UnitOfWork(false)]
-        public async Task<string> WmsKanbanOutPutPass(WmsJitRequestDto input)
-        {
-            if (input.Guids != null)
-            {
-                List<WmsOneTimeSaleOutPutDetial> _ls = new List<WmsOneTimeSaleOutPutDetial>();
-                if (input.Guids.Count() > 0)
-                {
-                    _ls = await _wmsRepository.Where(p => input.Guids.Contains(p.Id) && p.Version == input.Version && p.BillNum == input.BillNum && p.State != 2 && p.State!=4).ToListAsync();
-                }
-                else
-                {
-                    _ls = await _wmsRepository.Where(p => p.Version == input.Version && p.BillNum == input.BillNum && p.State != 2 && p.State != 4).ToListAsync();
-                }
-                //_ls = _ls.Where(p => p.SockQty < p.OutputQty || p.Qty < p.OutputQty).ToList();
-                //var checkList = new List<ErrorExportDto>();
-
-                //foreach (var itm in _ls)
-                //{
-                //    checkList.Add(new ErrorExportDto() { Message = string.Format("物料号:{0}出库数量大于结算数量或寄售库存数量!",itm.SapMaterialCode) });
-                //}
-                //if (checkList.Count > 0)
-                //{
-
-                //    return await ExportErrorReportAsync(checkList,"校验失败.xlsx");
-                //}
-
-                if (_ls.Count() > 0)
-                {
-                    var sql = "DECLARE	@return_value int\n" +
-                         "EXEC	@return_value = [dbo].[p_wms_ou" +
-                         "tput]\n" +
-                         "		@billnum = N'{0}',\n" +
-                         "		@type = 22,\n" +
-                         "      @date = N'{1}'\n" +
-                         "SELECT	'Return Value' = @return_value";
-                    await _wmsRepository.GetDbContext().Database.ExecuteSqlRawAsync(
-                       string.Format(sql, input.BillNum, input.AccountDate.ToShortDateString()));
-
-                }
-            }
-            return ApplicationConsts.SuccessStr;
-        }
-        /// <summary>
-        ///出库界面功能， 撤销核准出库
-        /// </summary>
-        /// <param name="ids"></param>
-        /// <param name="version"></param>
-        /// <returns></returns>
-        [HttpPost]
-        [Route("WmsKanbanOutPut-Cancel")]
-        [UnitOfWork(false)]
-        public async Task<bool> WmsKanbanOutPutCancel(WmsJitRequestDto input)
-        {
-            if (input.Guids != null && input.Guids.Count() > 0)
-            {
-                List<string> _ls = new List<string>();
-                foreach (var itm in input.Guids)
-                {
-                    _ls.Add(string.Format("{0}", itm));
-                }
-
-                string str = string.Join(",", _ls.ToArray());
-
-                var sql = "DECLARE	@return_value int\n" +
-                          "EXEC	@return_value = [dbo].[p_wms_output_cancel]\n" +
-                          "     @Guids ='{0}', \n" +
-                          "		@billnum = N'{1}',\n" +
-                          "		@type = 22,\n" +
-                          "     @accountdate = N'{2}'\n" +
-                          "SELECT	'Return Value' = @return_value";
-
-                sql = string.Format(sql, str, input.BillNum, input.AccountDate.ToShortDateString());
-
-                await _wmsRepository.GetDbContext().Database.ExecuteSqlRawAsync(
-                   sql
-                 );
-
-            }
-            return true;
-        }
-        /// <summary>
-        /// 出库界面功能删除
-        /// </summary>
-        /// <param name="version"></param>
-        /// <param name="p_list"></param>
-        /// <returns></returns>
-        [HttpPost]
-        [Route("WmsOutPutDelete")]
-        [UnitOfWork(false)]
-        public async Task<bool> WmsOutPutDelete(WmsJitRequestDto input)
-        {
-            var count = _wmsRepository.Count(p => p.BillNum == input.BillNum && p.State != 0);
-
-            if (count > 0)
-            {
-                return false;
-            }
-            var sql = "DECLARE	@return_value int\n" +
-                      "EXEC	@return_value = [dbo].[p_wms_output_cancel_all]\n" +
-                      "		@billnum = N'{0}',\n" +
-                      "		@type = 22\n" +
-                      "SELECT	'Return Value' = @return_value";
-            await _wmsRepository.GetDbContext().Database.ExecuteSqlRawAsync(
-               string.Format(sql, input.BillNum)
-             );
-
-            return true;
-        }
-
-
-        /// <summary>
-        /// 导出
-        /// </summary>
-        /// <param name="input"></param>
-        /// <returns></returns>
-        [HttpPost]
-        [Route("Export")]
-        //[Authorize(SettleAccountPermissions.SettleAccounts.Default)]
-        virtual public async Task<string> ExportAsync(WmsOneTimeSaleOutPutDetialRequestDto input)
-        {
-            input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "BillNum", Logic = EnumFilterLogic.And, Value = input.BillNum });
-            var entities = await _wmsRepository.GetListByFilterAsync(GuidGenerator.Create(), input.Filters, input.Sorting, int.MaxValue,
-                 0, true);
-
-            var dtos = ObjectMapper.Map<List<WmsOneTimeSaleOutPutDetial>, List<WmsOneTimeSaleOutPutDetialDto>>(entities);
-
-            IExporter _excel = new ExcelExporter();
-            byte[] result = null;
-
-            var _fileName = string.Format("一次性寄售销售出库单_{0}.xlsx", Guid.NewGuid().ToString());
-            result = await _excel.ExportAsByteArray(dtos);
-
-
-            result.ShouldNotBeNull();
-
-            //保存导出文件到服务器存成二进制
-            await _excelImportService.SaveBlobAsync(
-                     new SaveExcelImportInputDto
-                     {
-                         Name = _fileName,
-                         Content = result
-                     }
-                 );
-            return _fileName;
-
-
-
-        }
-
-
-        // 物料 物料组 物料描述 物料号 期间  单位 出库数量 结算数量 
-
-
-
-
-
-
-
-    }
-}
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WmsOutputSumAppService.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WmsOutputSumAppService.cs
deleted file mode 100644
index 52d187db..00000000
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WmsOutputSumAppService.cs
+++ /dev/null
@@ -1,157 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.Extensions.Caching.Distributed;
-using AutoMapper;
-using System.Linq;
-using System.Text;
-using Volo.Abp.Guids;
-using Volo.Abp.Application.Services;
-using Volo.Abp.Caching;
-
-using Volo.Abp.ObjectMapping;
-using Win.Sfs.SettleAccount.ExcelImporter;
-using Win.Sfs.Shared.CacheBase;
-using Win.Utils;
-using Volo.Abp.Application.Dtos;
-using Win.Sfs.BaseData.ImportExcelCommon;
-using Volo.Abp.Domain.Repositories;
-using EFCore.BulkExtensions;
-using System.IO;
-using Microsoft.EntityFrameworkCore;
-using Win.Sfs.SettleAccount.Entities.SettleAccountVersion;
-using Win.Sfs.SettleAccount.FISes;
-using Win.Sfs.Shared.Enums.SettleAccount;
-using Win.Sfs.Shared.Filter;
-using Shouldly;
-using Magicodes.ExporterAndImporter.Csv;
-using Magicodes.ExporterAndImporter.Core;
-using Magicodes.ExporterAndImporter.Excel;
-using System.Data.Common;
-using Volo.Abp.Uow;
-using Volo.Abp;
-using Win.Abp.Snowflakes;
-using Win.Sfs.SettleAccount.CommonManagers;
-using Win.Sfs.SettleAccount.ExportReports;
-using Win.Sfs.SettleAccount.Constant;
-using Win.Sfs.SettleAccount.MaterialRelationships;
-using Win.Sfs.SettleAccount.Entities.TaskJobs;
-using Magicodes.ExporterAndImporter.Core.Models;
-
-using TaskJob.Services;
-using TaskJob.EventArgs;
-using Win.Sfs.SettleAccount.Entities.WMS;
-using Win.Sfs.SettleAccount.Entities.Wms;
-using Win.Sfs.SettleAccount.Repository;
-using WY.NewJit.Extends.PaiGe.WMS;
-using System.Text.RegularExpressions;
-
-namespace Win.Sfs.SettleAccount.Entities.WMS
-{
-    public class WmsOutputSum
-    {
-        [ImporterHeader(Name = "物料号", AutoTrim = true)]
-        //物料号
-        public string MaterialCode { set; get; }
-        [ImporterHeader(Name = "物料描述", AutoTrim = true)]
-        //物料描述
-        public string MaterialDesc { set; get; }
-        [ImporterHeader(Name = "物料组(车型)", AutoTrim = true)]
-        //物料组(车型)  
-        public string MaterialGroup { set; get; }
-        [ImporterHeader(Name = "结算数量")]
-        public decimal Qty { set; get; }
-        [ImporterHeader(Name = "单价")]
-        public decimal Price { set; get; }
-        [ImporterHeader(Name = "金额")]
-        public decimal Amt { set; get; }
-
-
-    }
-
-
-
-    [Route("api/settleaccount/WmsOutputSum")]
-    [Authorize(SettleAccountPermissions.WMSJIT.Default)]
-    public class WmsOutputSumAppService: SettleAccountApplicationBase<WmsJitOutPutDetial>
-    {
-        private readonly TaskJobService _service;
-        private readonly IExcelImportAppService _excelImportService;
-        private readonly ISettleAccountBranchEfCoreRepository<TaskJob, Guid> _job;
-        public WmsOutputSumAppService(
-           IExcelImportAppService excelImportService,
-            ISettleAccountBranchEfCoreRepository<TaskJob, Guid> job,
-            ISnowflakeIdGenerator snowflakeIdGenerator,
-          ICommonManager commonManager,
-          IDistributedCache<WmsJitOutPutDetial> cache
-       ) : base(cache, excelImportService, snowflakeIdGenerator, commonManager)
-        {
-            _job = job;
-           
-            _excelImportService = excelImportService;
-        }
-
-
-
-
-     
-
-        
-
-        //public  async Task<string> GetWmsSum(WmsJitOutPutDetial input)
-        //{
-        //    var jobList= _job.Where(p =>  p.Type == input.Version).ToList();
-
-        //    var _fileList=  jobList.Where(p=>p.Name == "准时化结算核对明细"   && Regex.Replace(p.FileName, @"^[A-Z]+[0-9]+$", string.Empty)==string.Empty);
-
-
-        //    List<WmsJitOutPutDetial> _lst = new List<WmsJitOutPutDetial>();
-        //    foreach (var filename in _fileList)
-        //    {
-        //        string fileSavePath = Environment.CurrentDirectory + @"\wwwroot\files\host\my-file-container\" + filename.RealDownFileName;
-        //        ExcelHelper _excelHelper = new ExcelHelper(fileSavePath);
-        //        var _list = _excelHelper.ExcelToList<WmsJitOutPutDetial>();
-        //        var _ls1 = _list.Where(p => p.ParentMaterialCode == p.MaterialCode).ToList();
-
-        //        _ls1.GroupBy(p=>new {p.MaterialCode,p. })
-        //        foreach (var itm in _ls1)
-        //        {
-        //            var _detail = new List<WmsOutputSum>();
-        //        }
-
-        //        //var _lsCopy = new List<WmsJitOutPutDetial>();
-        //        //foreach (var itm in _list)
-        //        //{
-        //        //    WmsJitOutPutDetial _detail = new WmsJitOutPutDetial(
-        //        //    GuidGenerator.Create(),
-        //        //    itm.WmsBillNum,
-        //        //    itm.KennCode,
-        //        //    itm.ChassisNumber,
-        //        //    itm.MaterialCode,
-        //        //    itm.MaterialDesc,
-        //        //    itm.MaterialGroup,
-        //        //    string.Empty,
-        //        //    string.Empty,
-        //        //    0,
-        //        //    string.Empty,
-        //        //    string.Empty,
-        //        //    input.Version,
-        //        //    itm.ParentMaterialCode,
-        //        //    itm.BillNum,
-        //        //    GuidGenerator.Create()
-        //        //    , string.Empty
-        //        //    , itm.Qty
-        //        //    );
-        //        //    _lsCopy.Add(_detail);
-        //        //}
-        //        //_lst.AddRange(_lsCopy.ToArray());
-        //    }
-        //}
-
-
-
-    }
-}
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WmsOutputSumInterfaceAppService.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WmsOutputSumInterfaceAppService.cs
deleted file mode 100644
index ebbc1529..00000000
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WmsOutputSumInterfaceAppService.cs
+++ /dev/null
@@ -1,243 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.Extensions.Caching.Distributed;
-using AutoMapper;
-using System.Linq;
-using System.Text;
-using Volo.Abp.Guids;
-using Volo.Abp.Application.Services;
-using Volo.Abp.Caching;
-
-using Volo.Abp.ObjectMapping;
-using Win.Sfs.SettleAccount.ExcelImporter;
-using Win.Sfs.Shared.CacheBase;
-using Win.Utils;
-using Volo.Abp.Application.Dtos;
-using Win.Sfs.BaseData.ImportExcelCommon;
-using Volo.Abp.Domain.Repositories;
-using EFCore.BulkExtensions;
-using System.IO;
-using Microsoft.EntityFrameworkCore;
-using Win.Sfs.SettleAccount.Entities.SettleAccountVersion;
-using Win.Sfs.SettleAccount.FISes;
-using Win.Sfs.Shared.Enums.SettleAccount;
-using Win.Sfs.Shared.Filter;
-using Shouldly;
-using Magicodes.ExporterAndImporter.Csv;
-using Magicodes.ExporterAndImporter.Core;
-using Magicodes.ExporterAndImporter.Excel;
-using System.Data.Common;
-using Volo.Abp.Uow;
-using Volo.Abp;
-using Win.Abp.Snowflakes;
-using Win.Sfs.SettleAccount.CommonManagers;
-using Win.Sfs.SettleAccount.ExportReports;
-using Win.Sfs.SettleAccount.Constant;
-using Win.Sfs.SettleAccount.MaterialRelationships;
-using Win.Sfs.SettleAccount.Entities.TaskJobs;
-using Magicodes.ExporterAndImporter.Core.Models;
-
-using TaskJob.Services;
-using TaskJob.EventArgs;
-using Win.Sfs.SettleAccount.Entities.WMS;
-using Win.Sfs.SettleAccount.Entities.Wms;
-using Win.Sfs.SettleAccount.Repository;
-using WY.NewJit.Extends.PaiGe.WMS;
-using System.Text.RegularExpressions;
-using Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report;
-
-namespace Win.Sfs.SettleAccount.Entities.WMS
-{
-
-
-
-    [Authorize(SettleAccountPermissions.WMSJIT.Default)]
-    [Route("api/settleaccount/WmsOutputSumInterface")]
-
-
-    public class WmsOutputSumInterfaceAppService :ApplicationService
-    {
-        private readonly TaskJobService _service;
-        private readonly IExcelImportAppService _excelImportService;
-        private readonly ISettleAccountBranchEfCoreRepository<TaskJob, Guid> _job;
-
-        private readonly ErpSumOutputDapperRepository _dapper;
-
-        public WmsOutputSumInterfaceAppService(
-           IExcelImportAppService excelImportService,
-           ErpSumOutputDapperRepository dapper
-        //ISettleAccountBranchEfCoreRepository<TaskJob, Guid> job,
-          //ISnowflakeIdGenerator snowflakeIdGenerator,
-          //ICommonManager commonManager
-        
-         )
-        {
-            _dapper = dapper;
-           
-            _excelImportService = excelImportService;
-        }
-
-        //[HttpPost]
-        //[Route("ExcelImport")]
-        //[UnitOfWork(false)]
-        ////[Authorize(SettleAccountPermissions.PriceLists.Create)]
-        //virtual public async Task<string> ImportAsync([FromForm] IFormFileCollection files, string version,string accountDate)
-        //{
-        //    ExportImporter _exportImporter = new ExportImporter();
-
-        //    var result = await _exportImporter.UploadExcelImport<WmsOutputSumReport>(files, _excelImportService);
-        //    var _list = result.Where(p => p.实际出库数量 != 0).ToList();
-
-        //    _dapper.InsertWmsSum(_list, version,DateTime.Parse(accountDate));
-
-          
-        //    return ApplicationConsts.SuccessStr;
-        //}
-        /// <summary>
-        /// 准时化出库主表
-        /// </summary>
-        /// <param name="input"></param>
-        /// <returns></returns>
-        [HttpGet]
-        [Route("WmsOutputList")]
-        //[Authorize(SettleAccountPermissions.SettleAccounts.Default)]
-        virtual public async Task<List<TA_WMS_CTRL>> GetListAsync(string version,string begin,string end)
-        {
-
-           return  _dapper.GetTask(version,begin, end);
-
-      
-        }
-
-        /// <summary>
-        /// 准时化出库明细
-        /// </summary>
-        /// <param name="input"></param>
-        /// <returns></returns>
-        [HttpGet]
-        [Route("WmsOutputDetailList")]
-        [UnitOfWork(false)]
-        //[Authorize(SettleAccountPermissions.SettleAccounts.Default)]
-        virtual public async Task<List<TA_WMS_JSKH>> GetDetailListAsync(string taskid,string materialCode,string billnum)
-        {
-            return _dapper.GetTaskList(taskid, materialCode, billnum);
-           
-        }
-
-
-
-        [HttpGet]
-        [Route("WmsOutputVersionList")]
-        [UnitOfWork(false)]
-        //[Authorize(SettleAccountPermissions.SettleAccounts.Default)]
-        virtual public async Task<List<string>> GetVersionListAsync(string taskid, string materialCode, string billnum)
-        {
-            return _dapper.GetVersionList();
-
-
-        }
-
-        [HttpGet]
-        [Route("Export")]
-        [UnitOfWork(false)]
-        //[Authorize(SettleAccountPermissions.SettleAccounts.Default)]
-        virtual public async Task<string> ExportAsync(string taskid, string materialCode, string billnum)
-        {
-            var _ls=_dapper.GetTaskList(taskid, materialCode, billnum);
-      
-            IExporter _excel = new ExcelExporter();
-
-
-            string _fileName = string.Empty;
-            //声明导出容器
-
-     
-            _fileName = string.Format("结算接口内容导出_{0}.xlsx", Guid.NewGuid().ToString());
-           var result = await _excel.ExportAsByteArray(_ls);
-
-            result.ShouldNotBeNull();
-
-            //保存导出文件到服务器存成二进制
-            await _excelImportService.SaveBlobAsync(
-                     new SaveExcelImportInputDto
-                     {
-                         Name = _fileName,
-                         Content = result
-                     }
-                 );
-            return _fileName;
-
-        }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-        //public  async Task<string> GetWmsSum(WmsJitOutPutDetial input)
-        //{
-        //    var jobList= _job.Where(p =>  p.Type == input.Version).ToList();
-
-        //    var _fileList=  jobList.Where(p=>p.Name == "准时化结算核对明细"   && Regex.Replace(p.FileName, @"^[A-Z]+[0-9]+$", string.Empty)==string.Empty);
-
-
-        //    List<WmsJitOutPutDetial> _lst = new List<WmsJitOutPutDetial>();
-        //    foreach (var filename in _fileList)
-        //    {
-        //        string fileSavePath = Environment.CurrentDirectory + @"\wwwroot\files\host\my-file-container\" + filename.RealDownFileName;
-        //        ExcelHelper _excelHelper = new ExcelHelper(fileSavePath);
-        //        var _list = _excelHelper.ExcelToList<WmsJitOutPutDetial>();
-        //        var _ls1 = _list.Where(p => p.ParentMaterialCode == p.MaterialCode).ToList();
-
-        //        _ls1.GroupBy(p=>new {p.MaterialCode,p. })
-        //        foreach (var itm in _ls1)
-        //        {
-        //            var _detail = new List<WmsOutputSum>();
-        //        }
-
-        //        //var _lsCopy = new List<WmsJitOutPutDetial>();
-        //        //foreach (var itm in _list)
-        //        //{
-        //        //    WmsJitOutPutDetial _detail = new WmsJitOutPutDetial(
-        //        //    GuidGenerator.Create(),
-        //        //    itm.WmsBillNum,
-        //        //    itm.KennCode,
-        //        //    itm.ChassisNumber,
-        //        //    itm.MaterialCode,
-        //        //    itm.MaterialDesc,
-        //        //    itm.MaterialGroup,
-        //        //    string.Empty,
-        //        //    string.Empty,
-        //        //    0,
-        //        //    string.Empty,
-        //        //    string.Empty,
-        //        //    input.Version,
-        //        //    itm.ParentMaterialCode,
-        //        //    itm.BillNum,
-        //        //    GuidGenerator.Create()
-        //        //    , string.Empty
-        //        //    , itm.Qty
-        //        //    );
-        //        //    _lsCopy.Add(_detail);
-        //        //}
-        //        //_lst.AddRange(_lsCopy.ToArray());
-        //    }
-        //}
-
-
-
-    }
-}
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WmsUnInterface.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WmsUnInterface.cs
deleted file mode 100644
index 003806c1..00000000
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WmsUnInterface.cs
+++ /dev/null
@@ -1,426 +0,0 @@
-
-using EFCore.BulkExtensions;
-using Magicodes.ExporterAndImporter.Core;
-using Magicodes.ExporterAndImporter.Excel;
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Mvc;
-using Shouldly;
-using System;
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Volo.Abp;
-using Volo.Abp.Application.Dtos;
-using Volo.Abp.Caching;
-using Volo.Abp.Domain.Repositories;
-using Volo.Abp.Uow;
-using Win.Abp.Snowflakes;
-using Win.Sfs.BaseData.ImportExcelCommon;
-using Win.Sfs.SettleAccount.CommonManagers;
-using Win.Sfs.SettleAccount.Constant;
-using Win.Sfs.SettleAccount.Entities.Wms;
-using Win.Sfs.SettleAccount.Entities.Wms.WmsSumOutput;
-using Win.Sfs.SettleAccount.ExportReports;
-using Win.Sfs.SettleAccount.Reports;
-using Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report;
-using Win.Sfs.Shared.DomainBase;
-using Win.Sfs.Shared.Filter;
-
-namespace Win.Sfs.SettleAccount.Entities.WMS
-{
-    [Authorize(SettleAccountPermissions.WMSJIT.Default)]
-    [Route("api/settleaccount/WMSOutputSumReport")]
-    public class WMSOutputSumReportAppService :
-        SettleAccountApplicationBase<WmsDetailReport>
-    {
-        private readonly ISettleAccountBranchEfCoreRepository<WmsDetailReport, Guid> _wmsRepository;
-        private readonly WmsOutputSumDapperRepository _dapper;
-        private readonly IExcelImportAppService _excelImportService;
-
-        private readonly ErpSumOutputDapperRepository _erpDapper;
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="wmsRepository"></param>
-        /// <param name="job"></param>
-
-        public WMSOutputSumReportAppService(
-            WmsOutputSumDapperRepository dapper,
-            ISettleAccountBranchEfCoreRepository<WmsDetailReport, Guid> wmsRepository,
-            ISettleAccountBranchEfCoreRepository<TaskJob, Guid> job,
-            IExcelImportAppService excelImportService,
-            IDistributedCache<WmsDetailReport> cache,
-            ISnowflakeIdGenerator snowflakeIdGenerator,
-            ICommonManager commonManager,
-            ErpSumOutputDapperRepository erpDapper
-        ) : base(cache, excelImportService, snowflakeIdGenerator, commonManager)
-        {
-            _erpDapper = erpDapper;
-            _wmsRepository = wmsRepository;
-            _dapper = dapper;
-            _excelImportService=excelImportService;
-
-        }
-
-        [HttpGet]
-        [Route("Make")]
-        [UnitOfWork(false)]
-        public async Task<string> ReportMake(string version)
-        {
-            var _ls= _dapper.GetWmsSumExtendList(version);//报表
-            var _count= _wmsRepository.Count(p => p.Version == version && p.State>0);
-            if (_count > 0)
-            {
-               var _query= _wmsRepository.Where(p => p.State == 0 && p.Version == version);
-                _wmsRepository.GetDbContext().BulkDelete(_query.ToList());
-                await _query.BatchDeleteAsync();
-               var _query1= _wmsRepository.Where(p => p.Version == version);
-               var _existLst = _query1.ToList();
-           
-               var _diffls = from itm1 in _ls 
-                           join itm2 in _existLst
-                 on new { BillNum=itm1.结算单, MaterialCode=itm1.物料号, Pric=itm1.开票单价 }
-                 equals new { BillNum = itm2.BillNum, MaterialCode = itm2.MaterialCode, Pric = itm2.Price } into temp1
-                           from tm1 in temp1.DefaultIfEmpty() where tm1 is null
-                           select itm1;
-                var _difflst=_diffls.ToList();
-                List<WmsDetailReport> _lst = new List<WmsDetailReport>();
-                if (_difflst != null && _difflst.Count() > 0)
-                {
-                    foreach (var itm in _difflst)
-                    {
-                        _lst.Add(new WmsDetailReport(Guid.NewGuid(),
-                             int.Parse(itm.行号),
-                            itm.客户,
-                            itm.出库类型,
-                            itm.结算编码,
-                            itm.销售渠道,
-                            itm.客户代码,
-                            itm.结算单,
-                            itm.物料号,
-                            String.Empty,
-                            itm.结算数量,
-                            itm.实际出库数量,
-                            itm.差异数量,
-                            itm.开票单价,
-                            itm.结算金额,
-                            itm.已出库金额,
-                            itm.WMS待出库金额,
-                            itm.物料组编码,
-                            itm.物料组车型,
-                            itm.物料描述,
-                            String.Empty,
-                            0,
-                            version,
-                            DateTime.MaxValue
-                            ));
-                    }
-                }
-                await _wmsRepository.GetDbContext().BulkInsertAsync(_lst);
-            }
-            else
-            {
-                var query = _wmsRepository.Where(p => p.Version == version);
-                _wmsRepository.GetDbContext().BulkDelete(query.ToList());
-                await query.BatchDeleteAsync();
-                List<WmsDetailReport> _lst = new List<WmsDetailReport>();
-                if (_ls != null && _ls.Count() > 0)
-                {
-                    foreach (var itm in _ls)
-                    {
-                        _lst.Add(new WmsDetailReport(Guid.NewGuid(),
-                            int.Parse(itm.行号),
-                            itm.客户,
-                            itm.出库类型,
-                            itm.结算编码,
-                            itm.销售渠道,
-                            itm.客户代码,
-                            itm.结算单,
-                            itm.物料号,
-                            String.Empty,
-                            itm.结算数量,
-                            itm.实际出库数量,
-                            itm.差异数量,
-                            itm.开票单价,
-                            itm.结算金额,
-                            itm.已出库金额,
-                            itm.WMS待出库金额,
-                            itm.物料组编码,
-                            itm.物料组车型,
-                            itm.物料描述,
-                            String.Empty,
-                            0,
-                            version,
-                            DateTime.MaxValue
-                            ));
-                    }
-                }
-                await _wmsRepository.GetDbContext().BulkInsertAsync(_lst);
-            } 
-          
-            return ApplicationConsts.SuccessStr;
-        }
-        /// <summary>
-        /// Wms汇总合计明细
-        /// </summary>
-        /// <param name="input"></param>
-        /// <returns></returns>
-        [HttpPost]
-        [Route("WmsDetailReport")]
-
-        virtual public async Task<PagedResultDto<WmsDetailReport>> GetListAsync(WmsRequestDetailReportDto input)
-        {
-            if (!string.IsNullOrEmpty(input.Client))
-            {
-                input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "Client", Logic = EnumFilterLogic.And, Value = input.Client });
-            }
-
-            if (!string.IsNullOrEmpty(input.Type))
-            {
-                input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "Type", Logic = EnumFilterLogic.And, Value = input.Type });
-            }
-
-            if (!string.IsNullOrEmpty(input.MaterialGroup))
-            {
-                input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "MaterialGroup", Logic = EnumFilterLogic.And, Value = input.MaterialGroup });
-            }
-
-            if (!string.IsNullOrEmpty(input.BillNum))
-            {
-                input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Like, Column = "BillNum", Logic = EnumFilterLogic.And, Value = input.BillNum });
-            }
-            if (input.State!=4)
-            {
-                input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "State", Logic = EnumFilterLogic.And, Value = input.State.ToString() });
-            }
-
-            //20220613 新增物料号+销售渠道
-            if (!string.IsNullOrEmpty(input.MaterialCode))
-            {
-                input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Like, Column = "MaterialCode", Logic = EnumFilterLogic.And, Value = input.MaterialCode });
-            }
-            //20220613 新增物料号+销售渠道
-            if (!string.IsNullOrEmpty(input.SaleCode))
-            {
-                input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Like, Column = "SaleCode", Logic = EnumFilterLogic.And, Value = input.SaleCode });
-            }
-
-
-
-
-            input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "Version", Logic = EnumFilterLogic.And, Value = input.Version });
-
-            var entities = await _wmsRepository.GetListByFilterAsync(GuidGenerator.Create(), input.Filters, input.Sorting, input.MaxResultCount,
-                 input.SkipCount, true);
-            var totalCount = await GetCountAsync(input);
-            return new PagedResultDto<WmsDetailReport>(totalCount, entities);
-        }
-
-
-        /// <summary>
-        /// Wms汇总合计明细
-        /// </summary>
-        /// <param name="input"></param>
-        /// <returns></returns>
-        [HttpPost]
-        [Route("Version")]
-
-        virtual public async Task<List<string>> GetVersionListAsync()
-        {
-            var entities =  _wmsRepository.Select(p => p.Version).Distinct().ToList();
-            
-            return entities;
-        }
-
-
-        private async Task<long> GetCountAsync(WmsRequestDetailReportDto input)
-        {
-            if (!string.IsNullOrEmpty(input.Client))
-            {
-                input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "Client", Logic = EnumFilterLogic.And, Value = input.Client });
-            }
-
-            if (!string.IsNullOrEmpty(input.Type))
-            {
-                input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "Type", Logic = EnumFilterLogic.And, Value = input.Type });
-            }
-
-            if (!string.IsNullOrEmpty(input.MaterialGroup))
-            {
-                input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "MaterialGroup", Logic = EnumFilterLogic.And, Value = input.MaterialGroup });
-            }
-
-            if (!string.IsNullOrEmpty(input.BillNum))
-            {
-                input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "BillNum", Logic = EnumFilterLogic.And, Value = input.BillNum });
-            }
-            if (input.State != 4)
-            {
-                input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "State", Logic = EnumFilterLogic.And, Value = input.State.ToString() });
-            }
-            input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "Version", Logic = EnumFilterLogic.And, Value = input.Version });
-            // input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "BillNum", Logic = EnumFilterLogic.And, Value = input.BillNum });
-            return await _wmsRepository.GetCountByFilterAsync(GuidGenerator.Create(), input.Filters);
-        }
-
-
-        [HttpPost]
-        [Route("SyncSap")]
-        [UnitOfWork(false)]
-        virtual public async Task<string> OutputAsync(WmsRequestDetailReportDto input)
-        {
-           
-
-            if (!string.IsNullOrEmpty(input.Client))
-            {
-                input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "Client", Logic = EnumFilterLogic.And, Value = input.Client });
-            }
-
-            if (!string.IsNullOrEmpty(input.Type))
-            {
-                input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "Type", Logic = EnumFilterLogic.And, Value = input.Type });
-            }
-
-            if (!string.IsNullOrEmpty(input.MaterialGroup))
-            {
-                input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "MaterialGroup", Logic = EnumFilterLogic.And, Value = input.MaterialGroup });
-            }
-
-            if (!string.IsNullOrEmpty(input.BillNum))
-            {
-                input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "BillNum", Logic = EnumFilterLogic.And, Value = input.BillNum });
-            }
-            //if (!string.IsNullOrEmpty(input.))
-            //{
-            //    input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "MaterialGroup", Logic = EnumFilterLogic.And, Value = input.BillNum });
-            //}
-
-
-            input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "Version", Logic = EnumFilterLogic.And, Value = input.Version });//不能跨区间出库
-            var entities = await _wmsRepository.GetListByFilterAsync(GuidGenerator.Create(), input.Filters, input.Sorting, int.MaxValue,
-                 0, true);
-            var checkList = new List<ErrorExportDto>();
-
-            var en1= entities.Where(p => p.OutputQty == 0).ToList();
-            foreach(var itm in en1)
-            {
-                checkList.Add(new ErrorExportDto() { Message = string.Format("结算号:{0}物料号:{1}实际出库数量为0不能同步Sap", itm.BillNum, itm.MaterialCode) });
-            }
-
-            var en2=entities.Where(p => p.OutputQty != p.Qty && p.OutputQty>0).ToList();
-            foreach (var itm in en2)
-            {
-                checkList.Add(new ErrorExportDto() { Message = string.Format("结算号:{0}物料号:{1}实际出库数量不等于结算数量不能同步Sap", itm.BillNum, itm.MaterialCode) });
-            }
-
-            var _count = entities.Count(p => p.State==2);
-            if (_count > 1)
-            {
-                throw new BusinessException("8989", "记录中有已经完成记录!");
-         
-            }
-            if (checkList.Count > 0)
-            {
-                return await ExportErrorReportAsync(checkList);
-            }
-
-
-            int lineNumber = 1;
-            foreach (var itm in entities)
-            {
-                itm.LineNumber = lineNumber;
-                itm.State = 2;
-                lineNumber++;
-            }
-            await _wmsRepository.GetDbContext().BulkUpdateAsync(entities);
-
-
-           // var count = entities.GroupBy(p => new {  p.Type, p.ClientCode }).Count();
-
-           //if (count > 1)
-           // {
-           //     throw new BusinessException("8989", "记录不在同一物料组车型、出库类型、客户编码");
-           //     return false;
-           // }
-
-            List<WmsDetailReport> _ls = new List<WmsDetailReport>();
-            if (entities.Count() > 0)
-            {
-                var _entity = entities.FirstOrDefault();
-                if (_entity != null)
-                {
-                    var _version = input.Version;
-                    var _accountDate = input.AccountDate;
-                    _erpDapper.InsertWmsSum(entities, _version, _accountDate);
-                }
-            }
-             return ApplicationConsts.SuccessStr;
-        }
-        [HttpPost]
-        [Route("Export")]
-        virtual public async Task<string> ExportAsync(WmsRequestDetailReportDto input)
-        {
-            if (!string.IsNullOrEmpty(input.Client))
-            {
-                input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "Client", Logic = EnumFilterLogic.And, Value = input.Client });
-            }
-
-            if (!string.IsNullOrEmpty(input.Type))
-            {
-                input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "Type", Logic = EnumFilterLogic.And, Value = input.Type });
-            }
-
-            if (!string.IsNullOrEmpty(input.MaterialGroup))
-            {
-                input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "MaterialGroup", Logic = EnumFilterLogic.And, Value = input.MaterialGroup });
-            }
-
-            if (!string.IsNullOrEmpty(input.BillNum))
-            {
-                input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "BillNum", Logic = EnumFilterLogic.And, Value = input.BillNum });
-            }
-
-
-            input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "Version", Logic = EnumFilterLogic.And, Value = input.Version });
-            var entities = await _wmsRepository.GetListByFilterAsync(GuidGenerator.Create(), input.Filters, input.Sorting, int.MaxValue,
-                 0, true);
-
-            var dtoDetails = ObjectMapper.Map<List<WmsDetailReport>, List<WmsDetailReportDto>>(entities);
-
-            dtoDetails= dtoDetails.OrderBy( p => p.Type ).ThenBy(p=> p.BillNum).ToList();
-
-            IExporter _excel = new ExcelExporter();
-            byte[] result = null;
-            var _fileName = string.Format("汇总合计报表_{0}.xlsx", Guid.NewGuid().ToString());
-            result = await _excel.ExportAsByteArray(dtoDetails);
-            result.ShouldNotBeNull();
-            //保存导出文件到服务器存成二进制
-            await _excelImportService.SaveBlobAsync(
-                     new SaveExcelImportInputDto
-                     {
-                         Name = _fileName,
-                         Content = result
-                     }
-                 );
-            return _fileName;
-        }
-
-
-    }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-}
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WmsUnSumInterface.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WmsUnSumInterface.cs
deleted file mode 100644
index 5490749d..00000000
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WmsUnSumInterface.cs
+++ /dev/null
@@ -1,217 +0,0 @@
-using EFCore.BulkExtensions;
-using Magicodes.ExporterAndImporter.Core;
-using Magicodes.ExporterAndImporter.Excel;
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Mvc;
-using Shouldly;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Volo.Abp;
-using Volo.Abp.Application.Dtos;
-using Volo.Abp.Caching;
-using Volo.Abp.Domain.Repositories;
-using Volo.Abp.Uow;
-using Win.Abp.Snowflakes;
-using Win.Sfs.BaseData.ImportExcelCommon;
-using Win.Sfs.SettleAccount.CommonManagers;
-using Win.Sfs.SettleAccount.Constant;
-using Win.Sfs.SettleAccount.Entities.Wms.WmsSumOutput;
-using Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report;
-using Win.Sfs.Shared.Filter;
-
-namespace Win.Sfs.SettleAccount.Entities.WMS
-{
-    /// <summary>
-    /// 已结算出库查询
-    /// </summary>
-    [Authorize(SettleAccountPermissions.WMSJIT.Default)]
-    [Route("api/settleaccount/WMSOutputDetailWithCodeReport")]
-    public class WMSOutputDetailWithCodeReportAppService :
-       SettleAccountApplicationBase<WmsDetailWithCodeReport>
-    {
-        private readonly ISettleAccountBranchEfCoreRepository<WmsDetailWithCodeReport, Guid> _wmsRepository;
-        private readonly WmsOutputSumDapperRepository _dapper;
-        private readonly IExcelImportAppService _excelImportService;
-
-        private readonly ErpSumOutputDapperRepository _erpDapper;
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="wmsRepository"></param>
-        /// <param name="job"></param>
-
-        public WMSOutputDetailWithCodeReportAppService(
-            WmsOutputSumDapperRepository dapper,
-            ISettleAccountBranchEfCoreRepository<WmsDetailWithCodeReport, Guid> wmsRepository,
-            ISettleAccountBranchEfCoreRepository<TaskJob, Guid> job,
-            IExcelImportAppService excelImportService,
-            IDistributedCache<WmsDetailWithCodeReport> cache,
-            ISnowflakeIdGenerator snowflakeIdGenerator,
-            ICommonManager commonManager,
-            ErpSumOutputDapperRepository erpDapper
-        ) : base(cache, excelImportService, snowflakeIdGenerator, commonManager)
-        {
-            _erpDapper = erpDapper;
-            _wmsRepository = wmsRepository;
-            _dapper = dapper;
-            _excelImportService = excelImportService;
-
-        }
-
-        [HttpPost]
-        [Route("Make")]
-        [UnitOfWork(false)]
-        public async Task<string> ReportMake(WmsDetailWithCodeDto input)
-        {
-            //先删除
-            await _wmsRepository.BatchDeleteAsync();
-            //有条码的业务（可根据条码/K号/底盘号，查询是否结算过，结算期间）
-            var _ls = _dapper.GetWmsSearchWithCodeReportList(input.cnumber, input.materialCode);
-
-            //var _count = _wmsRepository.Count(p =>p.State > 0);
-            //if (_count > 0)
-            //{
-            //    throw new BusinessException("8899", "状态大于0不能生成!");
-            //}
-            //else
-            //{
-            //    await _wmsRepository.BatchDeleteAsync();
-            //}
-
-            List<WmsDetailWithCodeReport> _lst = new List<WmsDetailWithCodeReport>();
-            if (_ls != null && _ls.Count() > 0)
-            {
-                foreach (var itm in _ls)
-                {
-                    _lst.Add(new WmsDetailWithCodeReport(
-                        Guid.NewGuid(),
-                        itm.客户,
-                        itm.出库类型,
-                        string.Empty,
-                        itm.结算单,
-                        itm.通用代码号,
-                        itm.物料号,
-                        itm.结算数量,
-                        itm.实际出库数量,
-                        itm.差异数量,
-                        itm.物料组编码,
-                        itm.物料组车型,
-                        itm.物料描述,
-                        itm.备注,
-                        0,
-                        itm.行号,
-                        itm.开票单价,
-                        itm.物料组编码,
-                        itm.结算金额
-                        ));
-                }
-            }
-            //get方法
-            //if (!string.IsNullOrEmpty(input.materialCode))
-            //{
-            //    var _org_groupList = input.materialCode.Split(new char[] { '\n' }).Distinct().ToList();
-            //    var _groupList = _org_groupList[0].Replace("\\n", ",").TrimEnd(',');
-            //    if (_groupList.Count() > 0)
-            //    {
-            //        _lst = _lst.Where(p => _groupList.Contains(p.MaterialCode)).ToList();
-            //    }
-            //}
-            //post方式
-            if (!string.IsNullOrEmpty(input.materialCode))
-            {
-                var _groupList = input.materialCode.Split(new char[] { '\n' }).Distinct().ToList();
-                if (_groupList.Count() > 0)
-                {
-                    _lst = _lst.Where(p => _groupList.Contains(p.MaterialCode)).ToList();
-                }
-            }
-            await _wmsRepository.GetDbContext().BulkInsertAsync(_lst);
-            return ApplicationConsts.SuccessStr;
-        }
-        /// <summary>
-        /// Wms汇总合计明细
-        /// </summary>
-        /// <param name="input"></param>
-        /// <returns></returns>
-        [HttpPost]
-        [Route("WmsDetailReport")]
-
-        virtual public async Task<PagedResultDto<WmsDetailWithCodeReport>> GetListAsync(WmsRequestDetailReportDto input)
-        {
-            //input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "Version", Logic = EnumFilterLogic.And, Value = input.Version });
-            ////客户过滤
-            //if (!string.IsNullOrEmpty(input.Client))
-            //{
-            //    input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "Client", Logic = EnumFilterLogic.And, Value = input.Client });
-            //}
-            ////出库类型
-            //if (!string.IsNullOrEmpty(input.Type))
-            //{
-            //    input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "Type", Logic = EnumFilterLogic.And, Value = input.Type });
-            //}
-            var entities = await _wmsRepository.GetListByFilterAsync(GuidGenerator.Create(), input.Filters, input.Sorting, input.MaxResultCount,
-                 input.SkipCount, true);
-            var totalCount = await GetCountAsync(input);
-            return new PagedResultDto<WmsDetailWithCodeReport>(totalCount, entities);
-        }
-
-        private async Task<long> GetCountAsync(WmsRequestDetailReportDto input)
-        {
-            return await _wmsRepository.GetCountByFilterAsync(GuidGenerator.Create(), input.Filters);
-        }
-
-
-        //private async Task<long> GetCountAsync(WmsRequestDetailReportDto input)
-        //{
-        //    input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "Version", Logic = EnumFilterLogic.And, Value = input.Version });
-        //    return await _wmsRepository.GetCountByFilterAsync(GuidGenerator.Create(), input.Filters);
-        //}
-        [HttpPost]
-        [Route("ModifyTaskState")]
-
-        public virtual async Task<bool> SyncInterface()
-        {
-            //_wmsRepository.Where(p => p.BillNum ==)
-            return true;
-        }
-
-        [HttpPost]
-        [Route("Export")]
-        virtual public async Task<string> ExportAsync(WmsRequestDetailReportDto input)
-        {
-            //input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "Version", Logic = EnumFilterLogic.And, Value = input.Version });
-            ////客户过滤
-            //if (!string.IsNullOrEmpty(input.Client))
-            //{
-            //    input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "Client", Logic = EnumFilterLogic.And, Value = input.Client });
-            //}
-            ////出库类型
-            //if (!string.IsNullOrEmpty(input.Type))
-            //{
-            //    input.Filters.Add(new FilterCondition() { Action = EnumFilterAction.Equal, Column = "Type", Logic = EnumFilterLogic.And, Value = input.Type });
-            //}
-            var entities = await _wmsRepository.GetListByFilterAsync(GuidGenerator.Create(), input.Filters, input.Sorting, int.MaxValue,
-                 0, true);
-            var dtoDetails = ObjectMapper.Map<List<WmsDetailWithCodeReport>, List<WmsDetailWithCodeReportDto>>(entities);
-            IExporter _excel = new ExcelExporter();
-            byte[] result = null;
-            var _fileName = string.Format("已结算出库查询_{0}.xlsx", Guid.NewGuid().ToString());
-            result = await _excel.ExportAsByteArray(dtoDetails);
-            result.ShouldNotBeNull();
-            //保存导出文件到服务器存成二进制
-            await _excelImportService.SaveBlobAsync(
-                     new SaveExcelImportInputDto
-                     {
-                         Name = _fileName,
-                         Content = result
-                     }
-                 );
-            return _fileName;
-        }
-
-
-    }
-}
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/ImportExcelCommon/ExportImporter.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/ImportExcelCommon/ExportImporter.cs
index a4d8f376..595069a9 100644
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/ImportExcelCommon/ExportImporter.cs
+++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/ImportExcelCommon/ExportImporter.cs
@@ -24,7 +24,6 @@ using Microsoft.Extensions.Configuration;
 using System.Reflection;
 using System.Text.Encodings.Web;
 using System.Text.Unicode;
-using Win.Sfs.SettleAccount.EstimatedInventories;
 using OfficeOpenXml;
 using Win.Sfs.SettleAccount.Inventories;
 using Win.Sfs.SettleAccount.Entities.Errors;
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Reports/ReportServices/ReportMakeService.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Reports/ReportServices/ReportMakeService.cs
index 1dd1b388..5796ad19 100644
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Reports/ReportServices/ReportMakeService.cs
+++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Reports/ReportServices/ReportMakeService.cs
@@ -27,7 +27,6 @@ using Win.Sfs.SettleAccount.Entities.SettleAccounts;
 using Win.Sfs.SettleAccount.Entities.SettlementParts;
 using Win.Sfs.SettleAccount.Entities.TaskJobs;
 using Win.Sfs.SettleAccount.Entities.Wms;
-using Win.Sfs.SettleAccount.Entities.WMS;
 using Win.Sfs.SettleAccount.FISes;
 using Win.Sfs.SettleAccount.Reports.ReportRequestDto;
 using Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report;
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/SettleAccount.Application.csproj b/code/src/Modules/SettleAccount/src/SettleAccount.Application/SettleAccount.Application.csproj
index 0db67178..db34af2d 100644
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/SettleAccount.Application.csproj
+++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/SettleAccount.Application.csproj
@@ -162,5 +162,9 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
   </ItemGroup>
+	
+  <ItemGroup>
+    <Folder Include="Entities\VWKanBan\" />
+  </ItemGroup>
 
 </Project>
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/SettleAccountApplicationAutoMapperProfile.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/SettleAccountApplicationAutoMapperProfile.cs
index 6ab6d142..53d54fdf 100644
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/SettleAccountApplicationAutoMapperProfile.cs
+++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/SettleAccountApplicationAutoMapperProfile.cs
@@ -3,16 +3,13 @@ using Win.Sfs.SettleAccount.EstimatedStockDiffReports;
 using Win.Sfs.SettleAccount.Boms;
 using Win.Sfs.SettleAccount.Entities.Boms;
 using Win.Sfs.SettleAccount.Entities.CodeSettings;
-using Win.Sfs.SettleAccount.Entities.EstimatedSums;
 using Win.Sfs.SettleAccount.FISes;
 using Win.Sfs.SettleAccount.Entities.Materials;
 using Win.Sfs.SettleAccount.Entities.SettleAccounts;
-using Win.Sfs.SettleAccount.EstimatedInventories;
  
 using Win.Sfs.SettleAccount.Inventories;
 using Win.Sfs.SettleAccount.Items;
 using Win.Sfs.SettleAccount.MaterialRelationships;
-using Win.Sfs.SettleAccount.Entities.EstimatedInventories;
 using Win.Sfs.SettleAccount.Entities.SettleAccountVersion;
  
 using Win.Sfs.SettleAccount.Prebatches;
@@ -27,7 +24,6 @@ using Win.Sfs.SettleAccount.Entities.StorageLocations;
 using Win.Sfs.SettleAccount.Entities.Inventories;
 using Win.Sfs.SettleAccount.Entities.InventoryDetialVersion;
 using Win.Sfs.SettleAccount.Entities.Factories;
-using Win.Sfs.SettleAccount.Entities.SecondaryMatching;
 using Win.Sfs.SettleAccount.SecondaryExportReports;
 using System;
 using Win.Sfs.SettleAccount.SupplierItemSetUps;
@@ -48,22 +44,11 @@ using Win.Sfs.SettleAccount.Entities.Prices;
 using Win.Sfs.SettleAccount.Entities.MaterialRelationships;
 using Win.Sfs.SettleAccount.Entities.SettlementParts;
 using Win.Sfs.SettleAccount.Entities.ItemInvoicePrices;
-using Win.Sfs.SettleAccount.Entities.SettlementPakAndSparePartsRef;
-using Win.Sfs.SettleAccount.Entities.SettlementCrossReferences;
 using Win.Sfs.SettleAccount.Entities.SettlementPartss;
-using Win.Sfs.SettleAccount.Entities.SettlementCrossReference;
 using Win.Sfs.SettleAccount.Entities.SettlementPakAndSparePartss;
 using Win.Sfs.SettleAccount.Entities.SecMatch;
 using Win.Sfs.SettleAccount.Entities.VWKanBan;
-using Win.Sfs.SettleAccount.Entities.VWScrapClaims;
-using Win.Sfs.SettleAccount.Entities.VWSparePart;
 using Win.Sfs.SettleAccount.Entities.VWKanBanVersion;
-using Win.Sfs.SettleAccount.Entities.WMS_KanBan;
-using Win.Sfs.SettleAccount.Entities.WMSKanBan;
-using Win.Sfs.SettleAccount.Entities.WMS_SparePart;
-using Win.Sfs.SettleAccount.Entities.WMSSparePart;
-using Win.Sfs.SettleAccount.Entities.HQ_H;
-using Win.Sfs.SettleAccount.Entities.WMS;
 using Win.Sfs.SettleAccount.Entities;
 using Win.Sfs.SettleAccount.Entities.UnHQSettleAccounts;
 using Win.Sfs.SettleAccount.Entities.Wms.WmsSumOutput;
@@ -86,10 +71,8 @@ namespace Win.Sfs.SettleAccount
 
             CreateMapBom();
             CreateMapBomVersion();
-            CreateMapEstimatedInventoryDetail();
             CreateMapInventoryDetail();
            
-            CreateMapEstimatedSum();
             CreateMapMaterial();
             CreateMapMaterialRelationship();
             CreateMapCodeSetting();
@@ -100,21 +83,10 @@ namespace Win.Sfs.SettleAccount
             CreateMapCentralizedControl();
             CreateMapPrebatch();
 
-            CreateMapEstimatedInventoryVersion();
             CreateMapInventoryDetailVersion();
        
-            CreateMapEstimatedSumVersion();
             CreateMapFISVersion();
             CreateMapFactory();
-
-            CreateMapSecondaryPriceRatio();
-            CreateMapSecondaryAdjustment();
-            CreateMapSecondaryDiscount();
-            CreateMapSecondaryDiscountVersion();
-
-
-            CreateMapSecondaryPriceRatioVersion();
-            CreateMapSecondaryAdjustmentVersion();
             CreateMapEstimatedStockDiffReport();
             CreateMapSendUnsettledDiffReport();
             CreateMapStockSettledDiffReport();
@@ -123,7 +95,7 @@ namespace Win.Sfs.SettleAccount
 
             CreateMapSecondaryActuralAdjustmentReport();
             CreateMapSecondaryActuralDiffReport();
-            CreateMapSecondaryAdjustment();
+
 
  
             CreateMapBTSeqKBDiffReport();
@@ -138,11 +110,6 @@ namespace Win.Sfs.SettleAccount
             CreateMapPriceListVersion();
             CreateMapMaterialRelationshipDetail();
             CreateMapMaterialRelationshipVersion();
-
-            CreateMapSettlementCrossReference();
-            CreateMapSettlementCrossReferenceVersion();
-            CreateMapSettlementPakAndSpareParts();
-            CreateMapSettlementPakAndSparePartsVersion();
             CreateMapSecMatchBaseDto();
 
             CreateMapPriceListBJVersion();
@@ -155,55 +122,20 @@ namespace Win.Sfs.SettleAccount
             #region 派格
             CreateMapInvoice();
             CreateMapInvoiceVersion();
-            CreateMapVWKanBan();
-            CreateMapVWKanBanVersion();
-            CreateMapScrapClaims();
-            CreateMapScrapClaimsVersion();
-
-            CreateMapSparePart();
-            CreateMapSparePartVersion();
 
             CreateMapSettleAccount();
             CreateMapSettleAccountVersion();
 
-            CreateMapUnSettleAccount();
-            CreateMapUnSettleAccountVersion();
-
-            //红旗H平台
-            CreateMapHQ_H_Platform();
-            CreateMapHQ_H_PlatformVersion();
-
             //红旗未结明细
             CreateMapUnHQSettleAccount();
             CreateMapUnHQSettleAccountVersion();
 
             #endregion
 
-            #region 出库单导出
-
-            CreateMapWMSJit();
-            CreateMapWmsKanban();
-            CreateMapWMSKanbanExtend();
-            CreateMapWmsSharePart();
-            CreateMapWmsSharePart90();
-            CreateMapWmsHQWithOutKanban();
-            CreateMapWmsHQCar();
-            CreateMapWmsOneTimeSale();
-            CreateMapWMSOutputSum();
-            CreateMapCustomerKanban();
-            CreateMapWMSDiffOutputSum();
-            CreateMapWMSWithCodeOutputSum();
-            CreateMapWMSCacelOutputSum();
-            CreateMapWMSErrorBill();
-            #endregion
         }
 
         #region 派格出库单
 
-        private void CreateMapCustomerKanban()
-        {
-            CreateMap<WmsCustomerKanbanOutPutDetial, WmsCustomerKanbanOutPutDetialDTO>().ReverseMap();
-        }
         private void CreateMapWMSErrorBill()
         {
             CreateMap<ErrorBill, ErrorBillDto>().ReverseMap();
@@ -235,80 +167,12 @@ namespace Win.Sfs.SettleAccount
             CreateMap<WmsDetailWithCodeReport, WmsDetailWithCodeReportDto>().ReverseMap();
 
         }
-
-        private void CreateMapWMSJit()
-        {
-            CreateMap<WmsJitOutPutDetial, WmsJitOutPutDetialDto>().ReverseMap();
-        }
-
-        private void CreateMapWmsKanban()
-        {
-            CreateMap<WmsKanbanOutPutDetial, WmsKanbanOutPutDetialDto>().ReverseMap();
-        }
-
-
-        private void CreateMapWMSKanbanExtend()
-        {
-            CreateMap<WmsWithOutKanbanOutPutDetial, WmsWithOutKanbanOutPutDetialDto>().ReverseMap();
-        }
-
-        private void CreateMapWmsSharePart()
-        {
-            CreateMap<WmsSharePartOutPutDetial, WmsSharePartOutPutDetialDto>().ReverseMap();
-        }
-
-        private void CreateMapWmsSharePart90()
-        {
-            CreateMap<WmsSharePart90OutPutDetial, WmsSharePart90OutPutDetialDto>().ReverseMap();
-        }
-
-
-        private void CreateMapWmsHQWithOutKanban()
-        {
-            CreateMap<WmsHQWithOutKanbanOutPutDetial, WmsHQWithOutKanbanOutPutDetialDto>().ReverseMap();
-        }
-
-        private void CreateMapWmsOneTimeSale()
-        {
-            CreateMap<WmsOneTimeSaleOutPutDetial, WmsOneTimeSaleOutPutDetialDto>().ReverseMap();
-        }
-
-        private void CreateMapWmsHQCar()
-        {
-            CreateMap<WmsHQCarOutPutDetial, WmsHQCarOutPutDetialDto>().ReverseMap();
-        }
-
         #endregion
 
         #region PG-派格映射
 
 
-        /// <summary>
-        /// 红旗H平台导入
-        /// </summary>
-        private void CreateMapHQ_H_Platform()
-
-        {
-            CreateMap<HQ_H_Platform, HQ_H_PlatformDto>().ReverseMap();
-            CreateMap<HQ_H_Platform, HQ_H_PlatformRequestDto>().ReverseMap();
-            CreateMap<HQ_H_Platform, HQ_H_PlatformImportDto>().ReverseMap();
-            CreateMap<HQ_H_Platform, HQ_H_PlatformExportDto>().ReverseMap();
-            CreateMap<HQ_H_Platform, HQ_H_PlatformExportDto>().ReverseMap();
-        }
-
-        /// <summary>
-        /// 红旗H平台-版本
-        /// </summary>
-        private void CreateMapHQ_H_PlatformVersion()
-
-        {
-            CreateMap<HQ_H_PlatformVersion, HQ_H_PlatformVersionDto>().ReverseMap();
-            CreateMap<HQ_H_PlatformVersion, HQ_H_PlatformVersionCreateDto>();
-            CreateMap<HQ_H_PlatformVersion, HQ_H_PlatformVersionUpdateDto>();
-            CreateMap <HQ_H_PlatformVersionCreateDto,HQ_H_PlatformVersion > ();
-            CreateMap <HQ_H_PlatformVersionUpdateDto, HQ_H_PlatformVersion > ();
-        }
-
+      
 
         /// <summary>
         /// 红旗明细未结导入
@@ -335,86 +199,7 @@ namespace Win.Sfs.SettleAccount
             CreateMap<UnHQSettleVersionUpdateDto, UnHQSettleAccountVersion>();
         }
 
-        /// <summary>
-        /// 大众备件发货
-        /// </summary>
-        private void CreateMapWMSSparePart()
-
-        {
-            CreateMap<WMSSparePart, WMSSparePartDto>().ReverseMap();
-            CreateMap<WMSSparePart, WMSSparePartRequestDto>().ReverseMap();
-            CreateMap<WMSSparePart, WMSSparePartImportDto>().ReverseMap();
-            CreateMap<WMSSparePart, WMSSparePartExportDto>().ReverseMap();
-            CreateMap<WMSSparePart, WMSSparePartExportDto>().ReverseMap();
-        }
-
-        /// <summary>
-        /// 大众备件导入-版本
-        /// </summary>
-        private void CreateMapWMSSparePartVersion()
-
-        {
-            CreateMap<WMSSparePartVersion, WMSSparePartVersionDto>().ReverseMap();
-            CreateMap<WMSSparePartVersion, WMSSparePartVersionCreateDto>();
-            CreateMap<WMSSparePartVersion, WMSSparePartVersionUpdateDto>();
-            CreateMap<WMSSparePartVersionCreateDto, WMSSparePartVersion>();
-            CreateMap<WMSSparePartVersionUpdateDto, WMSSparePartVersion>();
-        }
-
-        /// <summary>
-        /// 大众看板发货
-        /// </summary>
-        private void CreateMapWMSVWKanBan()
-
-        {
-            CreateMap<WMSKanBanSettle, WMSVWKanBanDto>().ReverseMap();
-            CreateMap<WMSKanBanSettle, WMSVWKanBanRequestDto>().ReverseMap();
-            //CreateMap<WMSVWKanBanImportDto, WMSKanBanSettle>()
-            //   .ForMember(dest => dest.SettleInputDate,
-            //       opt => opt.MapFrom(src => DateTime.ParseExact(src.SettleInputDate, "yyyyMMdd", System.Globalization.CultureInfo.CurrentCulture)))
-            //   .ForMember(dest => dest.SettleDate,
-            //       opt => opt.MapFrom(src => DateTime.ParseExact(src.SettleDate, "yyyyMMdd", System.Globalization.CultureInfo.CurrentCulture)));
-            CreateMap<WMSKanBanSettle, WMSVWKanBanExportDto>().ReverseMap();
-        }
-
-        /// <summary>
-        /// 大众看板发货-版本
-        /// </summary>
-        private void CreateMapWMSVWKanBanVersion()
-        {
-            CreateMap<KanBanVersion, VWKanBanVersionDto>().ReverseMap();
-            CreateMap<KanBanVersion, VWKanBanVersionCreateDto>();
-            CreateMap<KanBanVersion, VWKanBanVersionUpdateDto>();
-            CreateMap<VWKanBanVersionCreateDto, KanBanVersion>();
-            CreateMap<VWKanBanVersionUpdateDto, KanBanVersion>();
-        }
-        /// <summary>
-        /// 大众看板导入
-        /// </summary>
-        private void CreateMapVWKanBan()
-
-        {
-            CreateMap<KanBanSettle, VWKanBanDto>().ReverseMap();
-            CreateMap<KanBanSettle, VWKanBanRequestDto>().ReverseMap();
-            CreateMap<VWKanBanImportDto, KanBanSettle>()
-               .ForMember(dest => dest.SettleInputDate,
-                   opt => opt.MapFrom(src => DateTime.ParseExact(src.SettleInputDate, "yyyyMMdd", System.Globalization.CultureInfo.CurrentCulture)))
-               .ForMember(dest => dest.SettleDate,
-                   opt => opt.MapFrom(src => DateTime.ParseExact(src.SettleDate, "yyyyMMdd", System.Globalization.CultureInfo.CurrentCulture)));
-            CreateMap<KanBanSettle, VWKanBanExportDto>().ReverseMap();
-        }
 
-        /// <summary>
-        /// 大众看板导入-版本
-        /// </summary>
-        private void CreateMapVWKanBanVersion()
-        {
-            CreateMap<KanBanVersion, VWKanBanVersionDto>().ReverseMap();
-            CreateMap<KanBanVersion, VWKanBanVersionCreateDto>();
-            CreateMap<KanBanVersion, VWKanBanVersionUpdateDto>();
-            CreateMap<VWKanBanVersionCreateDto, KanBanVersion>();
-            CreateMap<VWKanBanVersionUpdateDto, KanBanVersion>();
-        }
 
         /// <summary>
         /// 大众发票导入
@@ -441,59 +226,6 @@ namespace Win.Sfs.SettleAccount
             CreateMap<InvoiceVersion, InvoiceVersionExportDto>().ReverseMap();
         }
 
-        /// <summary>
-        /// 报废和索赔导入
-        /// </summary>
-        private void CreateMapScrapClaims()
-
-        {
-            CreateMap<ScrapClaims, ScrapClaimsDto>().ReverseMap();
-            CreateMap<ScrapClaims, ScrapClaimsRequestDto>().ReverseMap();
-            CreateMap<ScrapClaims, ScrapClaimsImportDto>().ReverseMap();
-            CreateMap<ScrapClaims, ScrapClaimsExportDto>().ReverseMap();
-            CreateMap<ScrapClaims, ScrapClaimsExportDto>().ReverseMap();
-        }
-
-        /// <summary>
-        /// 报废和索赔导入-版本
-        /// </summary>
-        private void CreateMapScrapClaimsVersion()
-
-        {
-            CreateMap<ScrapClaimsVersion, ScrapClaimsVersionDto>().ReverseMap();
-            CreateMap<ScrapClaimsVersion, ScrapClaimsVersionCreateDto>();
-            CreateMap<ScrapClaimsVersion, ScrapClaimsVersionUpdateDto>();
-            CreateMap<ScrapClaimsVersionCreateDto, ScrapClaimsVersion>();
-            CreateMap<ScrapClaimsVersionUpdateDto, ScrapClaimsVersion>();
-        }
-
-        /// <summary>
-        /// 大众备件导入
-        /// </summary>
-        private void CreateMapSparePart()
-
-        {
-            CreateMap<SparePart, SparePartDto>().ReverseMap();
-            CreateMap<SparePart, SparePartRequestDto>().ReverseMap();
-            CreateMap<SparePart, SparePartImportDto>().ReverseMap();
-            CreateMap<SparePart, SparePartExportDto>().ReverseMap();
-            CreateMap<SparePart, SparePartExportDto>().ReverseMap();
-        }
-
-        /// <summary>
-        /// 大众备件导入-版本
-        /// </summary>
-        private void CreateMapSparePartVersion()
-
-        {
-            CreateMap<SparePartVersion, SparePartVersionDto>().ReverseMap();
-            CreateMap<SparePartVersionDto, SparePartVersion>();
-            CreateMap<SparePartVersion, SparePartVersionCreateDto>();
-            CreateMap<SparePartVersion, SparePartVersionUpdateDto>();
-            CreateMap<SparePartVersionCreateDto, SparePartVersion>();
-            CreateMap<SparePartVersionUpdateDto, SparePartVersion>();
-        }
-
         /// <summary>
         /// 大众准时化结算明细导入
         /// </summary>
@@ -524,31 +256,6 @@ namespace Win.Sfs.SettleAccount
             CreateMap<SettleAccountVersionUpdateDto, SettleAccountVersion>();
         }
 
-        /// <summary>
-        /// 大众FIS未结算明细导入
-        /// </summary>
-        private void CreateMapUnSettleAccount()
-        {
-            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<UnSettleAccountVersion, UnSettleAccountVersionDto>().ReverseMap();
-            CreateMap<UnSettleAccountVersion, UnSettleAccountVersionCreateDto>();
-            CreateMap<UnSettleAccountVersion, UnSettleAccountVersionUpdateDto>();
-            CreateMap<UnSettleAccountVersionCreateDto, UnSettleAccount>();
-            CreateMap<UnSettleAccountVersionUpdateDto, UnSettleAccount>();
-        }
-
-
         #endregion
 
         #region 天合
@@ -818,28 +525,9 @@ namespace Win.Sfs.SettleAccount
           
         }
       
-        private void CreateMapEstimatedInventoryDetail()
-        {
-            CreateMap<EstimatedInventoryDetail, EstimatedInventoryDetailDto>().ReverseMap();
-            CreateMap<EstimatedInventoryDetail, EstimatedInventoryDetailCreateDto>();
-            CreateMap<EstimatedInventoryDetail, EstimatedInventoryDetailUpdateDto>();
-            CreateMap<EstimatedInventoryDetailCreateDto, EstimatedInventoryDetail>();
-            CreateMap<EstimatedInventoryDetailUpdateDto, EstimatedInventoryDetail>();
-            CreateMap<EstimatedInventoryDetail, EstimatedInventoryDetailExportDto>();
-        }
 
 
 
-        private void CreateMapEstimatedInventoryVersion()
-        {
-            CreateMap<EstimatedInventoryVersion, EstimatedInventoryVersionDto>().ReverseMap();
-            CreateMap<EstimatedInventoryVersion, EstimatedInventoryVersionCreateDto>();
-            CreateMap<EstimatedInventoryVersion, EstimatedInventoryVersionUpdateDto>();
-            CreateMap<EstimatedInventoryVersionCreateDto, EstimatedInventoryVersion>();
-            CreateMap<EstimatedInventoryVersionUpdateDto, EstimatedInventoryVersion>();
-        }
-
-
 
 
         private void CreateMapInventoryDetail()
@@ -853,28 +541,6 @@ namespace Win.Sfs.SettleAccount
             CreateMap<InventoryDetailImportDto, InventoryDetail>();
            
         }
-
-
-
-        private void CreateMapEstimatedSum()
-        {
-            CreateMap<EstimatedSum, EstimatedSumDto>().ReverseMap();
-            CreateMap<EstimatedSum, EstimatedSumCreateDto>();
-            CreateMap<EstimatedSum, EstimatedSumUpdateDto>();
-            CreateMap<EstimatedSum, EstimatedSumExportDto>();
-            CreateMap<EstimatedSumImportDto, EstimatedSum>();
-            CreateMap<EstimatedSumUpdateDto, EstimatedSum>();
-        }
-
-        private void CreateMapEstimatedSumVersion()
-        {
-            CreateMap<EstimatedSumVersion, EstimatedSumVersionDto>().ReverseMap();
-            CreateMap<EstimatedSumVersion, EstimatedSumCreateDto>();
-            CreateMap<EstimatedSumVersion, EstimatedSumUpdateDto>();
-            CreateMap<EstimatedSumVersionImportDto, EstimatedSumVersion>();
-            CreateMap<EstimatedSumVersionUpdateDto, EstimatedSumVersion>();
-        }
-
         private void CreateMapSupplierItemSetUp()
         {
             CreateMap<SupplierItemSetUp, SupplierItemSetUpDto>().ReverseMap();
@@ -984,67 +650,6 @@ namespace Win.Sfs.SettleAccount
             CreateMap<FactoryImportDto, Factory>();
             CreateMap<FactoryUpdateDto, Factory>();
         }
-
-        private void CreateMapSecondaryPriceRatio()
-        {
-            CreateMap<SecondaryPriceRatio, SecondaryPriceRatioDto>().ReverseMap();
-            CreateMap<SecondaryPriceRatio, SecondaryPriceRatioCreateDto>();
-            CreateMap<SecondaryPriceRatio, SecondaryPriceRatioUpdateDto>();
-            CreateMap<SecondaryPriceRatio, SecondaryPriceRatioExportDto>();
-            CreateMap<SecondaryPriceRatioImportDto, SecondaryPriceRatio>();
-            CreateMap<SecondaryPriceRatioUpdateDto, SecondaryPriceRatio>();
-        }
-        private void CreateMapSecondaryAdjustment()
-        {
-            CreateMap<SecondaryAdjustment, SecondaryAdjustmentDto>().ReverseMap();
-            CreateMap<SecondaryAdjustment, SecondaryAdjustmentCreateDto>();
-            CreateMap<SecondaryAdjustment, SecondaryAdjustmentUpdateDto>();
-            CreateMap<SecondaryAdjustment, SecondaryAdjustmentExportDto>();
-            CreateMap<SecondaryAdjustmentImportDto, SecondaryAdjustment>();
-            CreateMap<SecondaryAdjustmentUpdateDto, SecondaryAdjustment>();
-        }
-
-        private void CreateMapSecondaryPriceRatioVersion()
-        {
-            CreateMap<SecondaryPriceRatioVersion, SecondaryPriceRatioVersionDto>().ReverseMap();
-            CreateMap<SecondaryPriceRatioVersion, SecondaryPriceRatioVersionCreateDto>();
-            CreateMap<SecondaryPriceRatioVersion, SecondaryPriceRatioVersionUpdateDto>();
-            CreateMap<SecondaryPriceRatioVersionImportDto, SecondaryPriceRatioVersion>();
-            CreateMap<SecondaryPriceRatioVersionUpdateDto, SecondaryPriceRatioVersion>();
-        }
-        private void CreateMapSecondaryAdjustmentVersion()
-        {
-            CreateMap<SecondaryAdjustmentVersion, SecondaryAdjustmentVersionDto>().ReverseMap();
-            CreateMap<SecondaryAdjustmentVersion, SecondaryAdjustmentVersionCreateDto>();
-            CreateMap<SecondaryAdjustmentVersion, SecondaryAdjustmentVersionUpdateDto>();
-        ;
-            CreateMap<SecondaryAdjustmentVersionImportDto, SecondaryAdjustmentVersion>();
-            CreateMap<SecondaryAdjustmentVersionUpdateDto, SecondaryAdjustmentVersion>();
-        }
-
-        private void CreateMapSecondaryDiscountVersion()
-        {
-            CreateMap<SecondaryDiscountVersion, SecondaryDiscountVersionDto>().ReverseMap();
-            CreateMap<SecondaryDiscountVersion, SecondaryDiscountVersionCreateDto>();
-            CreateMap<SecondaryDiscountVersion, SecondaryDiscountVersionUpdateDto>();
-            ;
-            CreateMap<SecondaryDiscountVersionImportDto, SecondaryDiscountVersion>();
-            CreateMap<SecondaryDiscountVersionUpdateDto, SecondaryDiscountVersion>();
-        }
-
-        private void CreateMapSecondaryDiscount()
-        {
-            CreateMap<SecondaryDiscount, SecondaryDiscountDto>().ReverseMap();
-            CreateMap<SecondaryDiscount, SecondaryDiscountCreateDto>();
-            CreateMap<SecondaryDiscount, SecondaryDiscountUpdateDto>();
-            CreateMap<SecondaryDiscount, SecondaryDiscountExportDto>();
-            CreateMap<SecondaryDiscountImportDto, SecondaryDiscount>();
-            CreateMap<SecondaryDiscountUpdateDto, SecondaryDiscount>();
-        }
-
-
-
-
         private void CreateMapSecMatchBaseDto()
         {
             CreateMap<SecMatchBase, SecMatchBaseDto>().ReverseMap();
@@ -1103,58 +708,6 @@ namespace Win.Sfs.SettleAccount
             CreateMap<HQSPNotConsignReportDetailDto, HQSPNotConsignReportDetailExportDto>();
 
         }
-
-
-
-
-        /// <summary>
-        /// 结算件对照表
-        /// </summary>
-        private void CreateMapSettlementCrossReference()
-        {
-            CreateMap<SettlementCrossReference, SettlementCrossReferenceDto>().ReverseMap();
-            CreateMap<SettlementCrossReference, SettlementCrossReferenceCreateDto>().ReverseMap();
-            CreateMap<SettlementCrossReference, SettlementCrossReferenceUpdateDto>().ReverseMap();
-            CreateMap<SettlementCrossReference, SettlementCrossReferenceExportDto>().ReverseMap();
-            CreateMap<SettlementCrossReference, SettlementCrossReferenceRequestDto>().ReverseMap();
-            CreateMap<SettlementCrossReference, ImportSettlementCrossReferenceDto>().ReverseMap();
-        }
-
-        /// <summary>
-        /// 结算件对照表_Version
-        /// </summary>
-        private void CreateMapSettlementCrossReferenceVersion()
-
-        {
-
-            CreateMap<SettlementCrossReferenceVersion, SettlementCrossReferenceVersionDto>().ReverseMap();
-            CreateMap<SettlementCrossReferenceVersion, SettlementCrossReferenceVersionRequestDto>().ReverseMap();
-        }
-
-        /// <summary>
-        /// 结算包和散件对应关系
-        /// </summary>
-        private void CreateMapSettlementPakAndSpareParts()
-        {
-            CreateMap<SettlementPakAndSpareParts, SettlementPakAndSparePartsDto>().ReverseMap();
-            CreateMap<SettlementPakAndSpareParts, SettlementPakAndSparePartsCreateDto>().ReverseMap();
-            CreateMap<SettlementPakAndSpareParts, SettlementPakAndSparePartsUpdateDto>().ReverseMap();
-            CreateMap<SettlementPakAndSpareParts, SettlementPakAndSparePartsExportDto>().ReverseMap();
-            CreateMap<SettlementPakAndSpareParts, SettlementPakAndSparePartsRequestDto>().ReverseMap();
-        }
-
-        /// <summary>
-        /// 结算包和散件对应关系_Version
-        /// </summary>
-        private void CreateMapSettlementPakAndSparePartsVersion()
-
-        {
-
-            CreateMap<SettlementPakAndSparePartsVersion, SettlementPakAndSparePartsVersionDto>().ReverseMap();
-            CreateMap<SettlementPakAndSparePartsVersion, SettlementPakAndSparePartsVersionRequestDto>().ReverseMap();
-            //CreateMap<MaterialRelationshipVersion, MaterialRelationshipVersionImportDto>().ReverseMap();
-            //CreateMap<MaterialRelationshipVersion, MaterialRelationshipVersionExportDto>().ReverseMap();
-        }
         #endregion
     }
 }
\ No newline at end of file
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/EstimatedInventories/EstimatedInventoryDetail.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/EstimatedInventories/EstimatedInventoryDetail.cs
deleted file mode 100644
index 7063b57a..00000000
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/EstimatedInventories/EstimatedInventoryDetail.cs
+++ /dev/null
@@ -1,213 +0,0 @@
-using Magicodes.ExporterAndImporter.Core;
-using System;
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
-using System.Linq;
-using System.Text;
-using Win.Sfs.Shared.DomainBase;
-using Win.Sfs.Shared.Enums;
-
-namespace Win.Sfs.SettleAccount.EstimatedInventories
-{
-    public class EstimatedInventoryDetail : FullAuditedAggregateRootBase<Guid>
-    {
-
-
-        [ImporterHeader(Name = "年度")]
-     
-        /// <summary>
-        ///年度
-        /// </summary>
-        public string Year { get; set; }
-        [ImporterHeader(Name = "期间")]
-     
-        public string Period { set; get; }
-
-
-
-
-        /// <summary>
-        /// 物料凭证号（收获单号）
-        /// </summary>
-        [ImporterHeader(Name = "物料凭证号")]
-     
-   
-        public virtual string MaterialDocument { get; set; }
-
-
-
-        /// <summary>
-        /// 物料凭证号（收获单号）
-        /// </summary>
-        [ImporterHeader(Name = "物料凭证行项号")]
-   
-    
-        public virtual string MaterialDocumentLine { get; set; }
-
-        /// <summary>
-        /// 外部单号
-        /// </summary>
-        [ImporterHeader(Name = "外部单号")]
-   
-     
-        public virtual string BillNumber { get; set; }
-
-        /// <summary>
-        /// 记账日期（收货日期）
-        /// </summary>
-        [ImporterHeader(Name = "记账日期")]
-     
-        public virtual DateTime PostingDate { get; set; }
-
-
-        /// <summary>
-        /// 物料编号
-        /// </summary>
-        [ImporterHeader(Name = "物料号")]
-       
-        public virtual string MaterialCode { get; set; }
-
-
-
-        /// <summary>
-        /// 物料描述
-        /// </summary>
-
-        [ImporterHeader(Name = "物料描述")]
-
-        public virtual string MaterialDesc { get; set; }
-
-
-  
-
-
-        /// <summary>
-        /// 收货数量
-        /// </summary>
-        [ImporterHeader(Name = "收货数量")]
-       
-
-        public virtual decimal ReceiveQty { get; set; }
-
-
-        /// <summary>
-        /// 发票数量
-        /// </summary>
-        ///   [ImporterHeader(Name = "描述")]
-        [ImporterHeader(Name = "发票数量")]
-    
-        public virtual decimal InvoiceQty { get; set; }
-
-        /// <summary>
-        /// 供应商
-        /// </summary>
-        [ImporterHeader(Name = "供应商")]
-      
-        public virtual string SupplierCode { get; set; }
-
-        /// <summary>
-        /// 供应商描述
-        /// </summary>
-        [ImporterHeader(Name = "供应商描述")]
-
-        public virtual string SupplierDesc { get; set; }
-
-
-        /// <summary>
-        /// 采购凭证号
-        /// </summary>
-
-        [ImporterHeader(Name = "采购凭证号")]
-       
-        public virtual string PurchaseDocument { get; set; }
-
-
-        /// <summary>
-        /// 采购凭证行
-        /// </summary>
-        [ImporterHeader(Name = "采购凭证行项")]
-       
-        public virtual string PurchaseLine { get; set; }
-
-
-        /// <summary>
-        /// 来源
-        /// </summary>
-        /// 
-        [ImporterHeader(Name = "来源")]
-
-        public virtual string Source { get; set; }
-
-
-
-        /// <summary>
-        /// 存储扩展字段
-        /// </summary>
-       
-        public virtual Guid BranchId { get; set; }
-
-
-    
-        /// <summary>
-        /// 存储地点
-        /// </summary>
-        [ImporterHeader(Name = "存储地点")]
-
-
-
-        public string StorageLocation  { get; set; }
-
-
-
-
-        [ImporterHeader(Name = "工厂")]
-        /// <summary>
-        /// 存储扩展字段
-        /// </summary>
-        public string Factory { get; set; }
-
-
-
-        public Guid ParentId { get; set; }
-
-        public string Version { get; set; }
-        public void SetValue(Guid guid, Guid branchId, string year, string peroid, string version, Guid parentId)
-        {
-            Period = peroid;
-            Year = year;
-            Id = guid;
-            Version = version;
-            BranchId = branchId;
-            ParentId = parentId;
-        }
-
-        public EstimatedInventoryDetail()
-        { }
-        public EstimatedInventoryDetail(Guid id,
-            Guid branchId, string materialDocument, string billNumber, DateTime postingDate, string materialCode, string materialDesc, string storagelocation, decimal receiveQty, decimal invoiceQty, string supplierCode, string supplierDesc, string purchaseDocument, string purchaseLine, string source, string factory, string materialDocumentLine,string year, string period , Guid parentId)
-        {
-         
-            BranchId = branchId;
-            MaterialDocument = materialDocument;
-            BillNumber = billNumber;
-            PostingDate = postingDate;
-            MaterialCode = materialCode;
-            MaterialDesc = materialDesc;
-            StorageLocation = storagelocation;
-            ReceiveQty = receiveQty;
-            InvoiceQty = invoiceQty;
-            SupplierCode = supplierCode;
-            SupplierDesc = supplierDesc;
-            PurchaseDocument = purchaseDocument;
-            PurchaseLine = purchaseLine;
-            Source = source;
-            Factory = factory;
-            MaterialDocumentLine = materialDocumentLine;
-            Year = year;
-            Period = period;
-            ParentId = parentId;
-    }
-
-       
-    }
-}
\ No newline at end of file
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/EstimatedInventories/EstimatedInventoryVersion.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/EstimatedInventories/EstimatedInventoryVersion.cs
deleted file mode 100644
index 2c45c294..00000000
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/EstimatedInventories/EstimatedInventoryVersion.cs
+++ /dev/null
@@ -1,63 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Volo.Abp;
-using Volo.Abp.Guids;
-using Win.Sfs.SettleAccount.EstimatedInventories;
-using Win.Sfs.Shared.DomainBase;
-
-namespace Win.Sfs.SettleAccount.Entities.EstimatedInventories
-{
-    //class EstimatedInventoryVersion
-    //{
-    //}
-
-
-
-
-    public class EstimatedInventoryVersion : FullAuditedAggregateRootBase<Guid>
-    {
-
-        public EstimatedInventoryVersion()
-        { }
-
-        public string Year { get; private set; }
-        /// <summary>
-        /// 期间
-        /// </summary>
-        public string Period { get; private set; }
-        /// <summary>
-        /// 版本号
-        /// </summary>
-        public string Version { get; private set; }
-
-        /// <summary>
-        /// 客户号
-        /// </summary>
-        public string CustomerCode { private set; get; }
-
-
-        public string Factory { private set; get; }
-
-    
-
-        public EstimatedInventoryVersion(
-             Guid id,
-             Guid branchId,
-            string year, string period, string version, string customerCode,string factory) : base(id)
-        {
-            BranchId = branchId;
-            Year = year;
-            Period = period;
-            Version = version;
-            CustomerCode = customerCode;
-            Factory = factory;
-          
-        }
-
-      
-    }
-}
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/EstimatedSums/EstimatedSum.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/EstimatedSums/EstimatedSum.cs
deleted file mode 100644
index 218d0e58..00000000
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/EstimatedSums/EstimatedSum.cs
+++ /dev/null
@@ -1,107 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Win.Sfs.Shared.DomainBase;
-
-namespace Win.Sfs.SettleAccount.Entities.EstimatedSums
-{
-    public class EstimatedSum : FullAuditedAggregateRootBase<Guid>
-    {
-        /// <summary>
-        /// 会计年度
-        /// </summary
-        public string Year { set; get; }
-        /// <summary>
-        /// 记账期间
-        /// </summary>
-        public string Postingperiod { set; get; }
-
-        /// <summary>
-        /// 物料代码
-        /// </summary>
-        public string MaterialCode { set; get; }
-        /// <summary>
-        /// 物料描述
-        /// </summary>
-        public string MaterialDesc { set; get; }
-
-        /// <summary>
-        /// 数量
-        /// </summary>
-        public Decimal Qty { set; get; }
-
-        /// <summary>
-        /// 供应商编码
-        /// </summary>
-        public string SupplierCode{set;get;}
-
-
-
-        /// <summary>
-        /// 供应商描述
-        /// </summary>
-        public string SupplierDesc { set; get; }
-
-
-
-        /// <summary>
-        /// 
-        /// </summary>
-        public string Version { set; get; }
-
-
-        /// <summary>
-        ///采购订单号
-        /// </summary>
-        public string PurchaseDocument { get; set; }
-
-
-        /// <summary>
-        /// 采购订单行号
-        /// </summary>
-        public string PurchaseLine { get; set; }
-
-
-        public Guid ParentId { get; set; }
-
-        public void SetValue(Guid id, Guid branchId, string year, string period,string version ,string supplierCode,Guid parentId)
-        {
-
-            Id = id;
-            BranchId = branchId;
-
-            Year = year;
-            Postingperiod = period;
-            Version = version;
-
-            SupplierCode = supplierCode.Split(" ")[0];
-            SupplierDesc =supplierCode.Split(" ")[1];
-            ParentId = parentId;
-        }
-       
-
-        public EstimatedSum() { }
-        public EstimatedSum(
-            Guid id,
-            Guid branchId,
-
-            string year, string postingperiod, string materialCode, string materialDesc, decimal qty, string supplierCode, string supplierDesc,Guid parentId,string purchaseDocument,string purchaseLine)
-            :base(id)
-        {
-            BranchId = branchId;
-            Year = year;
-            
-            Postingperiod = postingperiod;
-            MaterialCode = materialCode;
-            MaterialDesc = materialDesc;
-            Qty = qty;
-            SupplierCode = supplierCode;
-            SupplierDesc = supplierDesc;
-            PurchaseDocument = purchaseDocument;
-            PurchaseLine = purchaseLine;
-           
-        }
-    }
-}
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/EstimatedSums/EstimatedSumVersion.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/EstimatedSums/EstimatedSumVersion.cs
deleted file mode 100644
index 60f92e02..00000000
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/EstimatedSums/EstimatedSumVersion.cs
+++ /dev/null
@@ -1,52 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Volo.Abp;
-using Volo.Abp.Guids;
-using Win.Sfs.Shared.DomainBase;
-
-namespace Win.Sfs.SettleAccount.Entities.EstimatedSums
-{
-    public class EstimatedSumVersion : FullAuditedAggregateRootBase<Guid>
-    {
-
-        public EstimatedSumVersion()
-        { }
-
-        public string Year { get; private set; }
-        /// <summary>
-        /// 期间
-        /// </summary>
-        public string Period { get; private set; }
-        /// <summary>
-        /// 版本号
-        /// </summary>
-        public string Version { get; private set; }
-
-        /// <summary>
-        /// 客户号
-        /// </summary>
-        public string CustomerCode { private set; get; }
-
-        public string Factory { private set; get; }
-
-
-        public EstimatedSumVersion(
-             Guid id,
-             Guid branchId,
-            string year, string period, string version, string customerCode,string factory) : base(id)
-        {
-            BranchId = branchId;
-            Year = year;
-            Period = period;
-            Version = version;
-            CustomerCode = customerCode;
-            Factory = factory;
-        }
-
-     
-    }
-}
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/HQExtend/HQKBExtend.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/HQExtend/HQKBExtend.cs
deleted file mode 100644
index 8fe70293..00000000
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/HQExtend/HQKBExtend.cs
+++ /dev/null
@@ -1,52 +0,0 @@
-using Magicodes.ExporterAndImporter.Core;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Win.Sfs.Shared.DomainBase;
-
-namespace Win.Sfs.SettleAccount.Entities.HQExtend
-{
-    public class HQKBExtend: FullAuditedAggregateRootBase<Guid>, ISettleAccountEntityBase
-    {
-        public HQKBExtend(string taskBillNum, string billNum, string materialDesc, string materialCode, decimal qty, decimal price, decimal amt, decimal tax, decimal taxAmt, decimal totalAmt)
-        {
-            TaskBillNum = taskBillNum;
-            BillNum = billNum;
-            MaterialDesc = materialDesc;
-            MaterialCode = materialCode;
-            Qty = qty;
-            Price = price;
-            Amt = amt;
-            Tax = tax;
-            TaxAmt = taxAmt;
-            TotalAmt = totalAmt;
-        }
-
-        [ImporterHeader(Name = "试制任务单编号")]
-
-        public string TaskBillNum { get; set; }
-        [ImporterHeader(Name = "采购申请单号")]
-        public string BillNum { get; set; }
-        [ImporterHeader(Name = "零件名称")]
-        public string MaterialDesc { get; set; }
-        [ImporterHeader(Name = "零件号")]
-        public string MaterialCode { get; set; }
-        [ImporterHeader(Name = "数量")]
-        public decimal Qty { get; set; }
-        [ImporterHeader(Name = "无税单价")]
-        public decimal Price { get; set; }
-
-        [ImporterHeader(Name = "无税金额")]
-        public decimal Amt { get; set; }
-        [ImporterHeader(Name = "税率")]
-        public decimal Tax { get; set; }
-        [ImporterHeader(Name = "税额合计")]
-        public decimal TaxAmt { get; set; }
-        [ImporterHeader(Name = "价税合计")]
-        public decimal TotalAmt { get; set; }
-        [ImporterHeader(Name = "版本号",IsIgnore =false)]
-        public string Version { get ; set ; }
-    }
-}
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/HQExtend/HQKBExtendVersion.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/HQExtend/HQKBExtendVersion.cs
deleted file mode 100644
index e667ce0c..00000000
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/HQExtend/HQKBExtendVersion.cs
+++ /dev/null
@@ -1,55 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Win.Sfs.Shared.DomainBase;
-
-namespace Win.Sfs.SettleAccount.Entities.HQExtend
-{
-    public class HQKBExtendVersion : FullAuditedAggregateRootBase<Guid>, ISettleAccountEntityBase
-    {
-
-
-
-
-        public HQKBExtendVersion()
-        { }
-
-        public string Year { get;  set; }
-        /// <summary>
-        /// 期间
-        /// </summary>
-        public string Period { get;  set; }
-        /// <summary>
-        /// 版本号
-        /// </summary>
-        public string Version { get;  set; }
-
-
-        /// <summary>
-        /// 工厂
-        /// </summary>
-        public string Factory { set; get; }
-
-        /// <summary>
-        /// 客户号
-        /// </summary>
-        public string CustomerCode { private set; get; }
-
-
-        public HQKBExtendVersion(
-             Guid id,
-             Guid branchId,
-            string year, string period, string version, string customerCode, string factory) : base(id)
-        {
-            BranchId = branchId;
-            Year = year;
-            Period = period;
-            Version = version;
-            CustomerCode = customerCode;
-            Factory = factory;
-
-        }
-    }
-}
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/HQExtend/HQKBSettleExtend.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/HQExtend/HQKBSettleExtend.cs
deleted file mode 100644
index 7a3f40e3..00000000
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/HQExtend/HQKBSettleExtend.cs
+++ /dev/null
@@ -1,52 +0,0 @@
-using Magicodes.ExporterAndImporter.Core;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Win.Sfs.Shared.DomainBase;
-
-namespace Win.Sfs.SettleAccount.Entities.HQExtend
-{
-    public class HQKBSettleExtend : FullAuditedAggregateRootBase<Guid>, ISettleAccountEntityBase
-    {
-        public HQKBSettleExtend(string taskBillNum, string billNum, string materialDesc, string materialCode, decimal qty, decimal price, decimal amt, decimal tax, decimal taxAmt, decimal totalAmt)
-        {
-            TaskBillNum = taskBillNum;
-            BillNum = billNum;
-            MaterialDesc = materialDesc;
-            MaterialCode = materialCode;
-            Qty = qty;
-            Price = price;
-            Amt = amt;
-            Tax = tax;
-            TaxAmt = taxAmt;
-            TotalAmt = totalAmt;
-        }
-
-        [ImporterHeader(Name = "试制任务单编号")]
-
-        public string TaskBillNum { get; set; }
-        [ImporterHeader(Name = "采购申请单号")]
-        public string BillNum { get; set; }
-        [ImporterHeader(Name = "零件名称")]
-        public string MaterialDesc { get; set; }
-        [ImporterHeader(Name = "零件号")]
-        public string MaterialCode { get; set; }
-        [ImporterHeader(Name = "数量")]
-        public decimal Qty { get; set; }
-        [ImporterHeader(Name = "无税单价")]
-        public decimal Price { get; set; }
-
-        [ImporterHeader(Name = "无税金额")]
-        public decimal Amt { get; set; }
-        [ImporterHeader(Name = "税率")]
-        public decimal Tax { get; set; }
-        [ImporterHeader(Name = "税额合计")]
-        public decimal TaxAmt { get; set; }
-        [ImporterHeader(Name = "价税合计")]
-        public decimal TotalAmt { get; set; }
-        [ImporterHeader(Name = "版本号", IsIgnore = false)]
-        public string Version { get; set; }
-    }
-}
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/HQExtend/HQKBSettleExtendVersion.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/HQExtend/HQKBSettleExtendVersion.cs
deleted file mode 100644
index e21f237d..00000000
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/HQExtend/HQKBSettleExtendVersion.cs
+++ /dev/null
@@ -1,55 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Win.Sfs.Shared.DomainBase;
-
-namespace Win.Sfs.SettleAccount.Entities.HQExtend
-{
-    public class HQKBSettleExtendVersion : FullAuditedAggregateRootBase<Guid>, ISettleAccountEntityBase
-    {
-
-
-
-
-        public HQKBSettleExtendVersion()
-        { }
-
-        public string Year { get; set; }
-        /// <summary>
-        /// 期间
-        /// </summary>
-        public string Period { get; set; }
-        /// <summary>
-        /// 版本号
-        /// </summary>
-        public string Version { get; set; }
-
-
-        /// <summary>
-        /// 工厂
-        /// </summary>
-        public string Factory { set; get; }
-
-        /// <summary>
-        /// 客户号
-        /// </summary>
-        public string CustomerCode { private set; get; }
-
-
-        public HQKBSettleExtendVersion(
-             Guid id,
-             Guid branchId,
-            string year, string period, string version, string customerCode, string factory) : base(id)
-        {
-            BranchId = branchId;
-            Year = year;
-            Period = period;
-            Version = version;
-            CustomerCode = customerCode;
-            Factory = factory;
-
-        }
-    }
-}
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/HQ_H/HQ_H_Kanban.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/HQ_H/HQ_H_Kanban.cs
deleted file mode 100644
index f68600b1..00000000
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/HQ_H/HQ_H_Kanban.cs
+++ /dev/null
@@ -1,86 +0,0 @@
-using Magicodes.ExporterAndImporter.Core;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Win.Sfs.Shared.DomainBase;
-
-namespace Win.Sfs.SettleAccount.Entities.HQ_F
-{
-
-    //行号 
-    //零件号 
-    //零件中文名称 
-    //需求数 
-    //已接收数 
-    //订货看板编号  
-    //手工或自动 
-    //收货仓库    
-    //收货仓库描述 
-    //交货时间    
-    //发货状态 
-    //供应商
-
-   public class HQ_H_Kanban:FullAuditedAggregateRootBase<Guid>
-   {
-        [ExporterHeader(DisplayName = "交货时间")]
-        public DateTime BillDate { set; get; }
-        [ExporterHeader(DisplayName = "交货单号")]
-        public string WmsBillNum { set; get; }
-        [ExporterHeader(DisplayName = "行号")]
-        public string PoLine { set; get; }
-        [ExporterHeader(DisplayName = "零件号")]
-        public string MaterialCode { set; get; }
-        [ExporterHeader(DisplayName = "零件中文名称 ")]
-        public string MaterialDesc { set; get; }
-        [ExporterHeader(DisplayName = "发货数量")]
-        public decimal Qty { get; set; }
-        [ExporterHeader(DisplayName = "订货看板编号")]
-        public string Kanban { set; get; }
-        [ExporterHeader(DisplayName = "手工或自动")]
-        public string IsAuto { set; get; }
-        [ExporterHeader(DisplayName = "收货仓库")]
-        public string Warehouse { set; get; }
-        [ExporterHeader(DisplayName = "收货仓库描述 ")]
-        public string WarehouseDesc { set; get; }
-        [ExporterHeader(DisplayName = "供应商")]
-        public string Supplier { set; get; }
-        [ExporterHeader(DisplayName = "发货状态")]
-        public string State { set; get; }
-
-        //public HQ_H_Kanban(DateTime billDate, string wmsBillNum, string poLine, string materialCode, string materialDesc, decimal qty, string kanban, string isAuto, string warehouse, string warehouseDesc, string supplier, string state)
-        //{
-        //    BillDate = billDate;
-        //    WmsBillNum = wmsBillNum;
-        //    PoLine = poLine;
-        //    MaterialCode = materialCode;
-        //    MaterialDesc = materialDesc;
-        //    Qty = qty;
-        //    Kanban = kanban;
-        //    IsAuto = isAuto;
-        //    Warehouse = warehouse;
-        //    WarehouseDesc = warehouseDesc;
-        //    Supplier = supplier;
-        //    State = state;
-        //}
-
-        public HQ_H_Kanban(Guid id, DateTime billDate, string wmsBillNum, string poLine, string materialCode, string materialDesc, decimal qty, string kanban, string isAuto, string warehouse, string warehouseDesc, string supplier, string state):base(id)
-        {
-            Id = id;
-
-            BillDate = billDate;
-            WmsBillNum = wmsBillNum;
-            PoLine = poLine;
-            MaterialCode = materialCode;
-            MaterialDesc = materialDesc;
-            Qty = qty;
-            Kanban = kanban;
-            IsAuto = isAuto;
-            Warehouse = warehouse;
-            WarehouseDesc = warehouseDesc;
-            Supplier = supplier;
-            State = state;
-        }
-    }
-}
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/HQ_H/HQ_H_Platform.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/HQ_H/HQ_H_Platform.cs
deleted file mode 100644
index 4883b898..00000000
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/HQ_H/HQ_H_Platform.cs
+++ /dev/null
@@ -1,172 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Win.Sfs.Shared.DomainBase;
-
-namespace Win.Sfs.SettleAccount.Entities.HQ_H
-{
-    public class HQ_H_Platform : FullAuditedAggregateRootBase<Guid>, ISettleAccountEntityBase
-    {
-        public HQ_H_Platform()
-        { }
-
-        public void SetValue(Guid guid, Guid branchId, string year, string peroid, string version,string kanban)
-        {
-            Period = peroid;
-            Year = year;
-            Id = guid;
-            Version = version;
-            BranchId = branchId;
-            HQHKanBan = kanban;
-        }
-
-        public void SetValue(Guid guid, Guid branchId, string year, string peroid, string version)
-        {
-            Period = peroid;
-            Year = year;
-            Id = guid;
-            Version = version;
-            BranchId = branchId;
-        }
-        public HQ_H_Platform(Guid Id,string materialVoucherNo,string externalKanbanNumber,
-            string kanbanNumber, string year,string factory,DateTime acceptanceDate,
-            string period, string version,string kanBan,string supplier,string storageLocation,string storageLocationDesc,
-            string materialCode,string acceptanceNo, decimal qty, decimal price, decimal amt) : base(Id)
-        {
-            MaterialVoucherNo = materialVoucherNo;
-            KanbanNumber = kanbanNumber;
-            ExternalKanbanNumber = externalKanbanNumber;
-            Year = year;
-            Factory = factory;
-            AcceptanceDate = acceptanceDate;
-            Period = period;
-            Version = version;
-            MaterialCode = materialCode;
-            HQHKanBan = kanBan;
-            Supplier = supplier;
-            StorageLocation = storageLocation;
-            StorageLocationDesc = storageLocationDesc;
-            AcceptanceNo = acceptanceNo;
-            Qty = qty;
-            Price = price;
-            Amt = amt;
-        }
-
-
-        //验收单号	外部单号	物料凭证号	物料凭证日期	物料凭证记账日期	看板编号	外部看板编号	物料号	物料描述	数量	单价	金额
-        //工厂	备注	创建者	创建时间	修改人	修改时间	公司	验收单号	外部单号	发票号	会计年度	金额	计划员	存储地点	
-        //存储地点描述	状态	验收单日期	供应商	录入人	录入人描述	看板号
-
-
-
-        /// <summary>
-        ///工厂
-        /// </summary>
-        [Display(Name = "工厂")]
-        public string Factory { get; set; }
-        /// <summary>
-        ///外部看板编号
-        /// </summary>
-        [Display(Name = "外部单号")]
-        public string ExternalKanbanNumber { get; set; }
-        /// <summary>
-        ///看板编号
-        /// </summary>
-        [Display(Name = "看板编号")]
-        public string KanbanNumber { get; set; }
-        /// <summary>
-        ///物料凭证号
-        /// </summary>
-        [Display(Name = "物料凭证号")]
-        public string MaterialVoucherNo { get; set; }
-       
-        /// <summary>
-        ///会计年度
-        /// </summary>
-        [Display(Name = "会计年度")]
-        public string Year { get; set; }
-        /// <summary>
-        /// 期间
-        /// </summary>
-        [Display(Name = "期间")]
-        public string Period { set; get; }
-        /// <summary>
-        /// 版本号
-        /// </summary>
-        [Display(Name = "版本号")]
-        public string Version { set; get; }
-        /// <summary>
-        /// 看板号
-        /// </summary>
-        [Display(Name = "看板号")]
-        public string HQHKanBan { set; get; }
-
-
-        /// <summary>
-        /// 物料号
-        /// </summary>
-        [Display(Name = "物料号")]
-        public string MaterialCode { get; set; }
-
-        /// <summary>
-        /// 验收单日期
-        /// </summary>
-        [Display(Name = "验收单日期")]
-        public DateTime AcceptanceDate { get; set; }
-
-        /// <summary>
-        /// 供应商
-        /// </summary>
-        [Display(Name = "供应商")]
-        public string Supplier { get; set; }
-
-        /// <summary>
-        /// 存储地点
-        /// </summary>
-        [Display(Name = "存储地点")]
-        public string StorageLocation { get; set; }
-
-        /// <summary>
-        /// 存储地点描述
-        /// </summary>
-        [Display(Name = "存储地点描述")]
-        public string StorageLocationDesc { get; set; }
-
-        /// <summary>
-        ///验收单号
-        /// </summary>
-        [Display(Name = "验收单号")]
-        public string AcceptanceNo { get; set; }
-
-        /// <summary>
-        /// 数量
-        /// </summary>
-        [Display(Name = "数量")]
-        public decimal Qty { set; get; }
-
-        /// <summary>
-        /// 单价
-        /// </summary>
-        [Display(Name = "单价")]
-        public decimal Price { set; get; }
-
-        /// <summary>
-        /// 金额
-        /// </summary>
-        [Display(Name = "金额")]
-        public decimal Amt { set; get; }
-
-
-        /// <summary>
-        /// 备注
-        /// </summary>
-        [Display(Name = "备注")]
-        public string Extend { set; get; }
-
-
-
-    }
-}
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/HQ_H/HQ_H_PlatformVersion.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/HQ_H/HQ_H_PlatformVersion.cs
deleted file mode 100644
index b178f157..00000000
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/HQ_H/HQ_H_PlatformVersion.cs
+++ /dev/null
@@ -1,47 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Win.Sfs.Shared.DomainBase;
-
-namespace Win.Sfs.SettleAccount.Entities.HQ_H
-{
-    public class HQ_H_PlatformVersion : FullAuditedAggregateRootBase<Guid>, ISettleAccountEntityBase
-    {
-
-        public HQ_H_PlatformVersion()
-        { }
-
-        public string Year { get; private set; }
-        /// <summary>
-        /// 期间
-        /// </summary>
-        public string Period { get; private set; }
-        /// <summary>
-        /// 版本号
-        /// </summary>
-        public string Version { get; set; }
-
-        /// <summary>
-        /// 客户号
-        /// </summary>
-        public string CustomerCode { private set; get; }
-
-
-        public HQ_H_PlatformVersion(
-             Guid id,
-             Guid branchId,
-            string year, string period, string version, string customerCode) : base(id)
-        {
-            BranchId = branchId;
-            Year = year;
-            Period = period;
-            Version = version;
-            CustomerCode = customerCode;
-
-        }
-
-
-    }
-}
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/KanBan/KanBan.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/KanBan/KanBan.cs
deleted file mode 100644
index c6ec0a1c..00000000
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/KanBan/KanBan.cs
+++ /dev/null
@@ -1,171 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Win.Sfs.Shared.DomainBase;
-
-namespace Win.Sfs.SettleAccount.Entities.VWKanBan
-{
-
-
-    /* 看板条码号 
-     * 入库关联号   
-     * 工厂 
-     * 零件号 
-     * 零件类型 
-     * 供应商 
-     * R3入库日期 
-     * 批次  
-     * 入库结算标识 
-     * 第一文本年
-     * 第一步文本号
-     * 第二步文本年
-     * 第二步文本号
-     * R3结算时间 
-     * 数量 
-     * 结算状态
-    */
-    /// <summary>
-    /// 大众看板
-    /// </summary>
-    public class KanBanSettle : FullAuditedAggregateRootBase<Guid>, ISettleAccountEntityBase
-    {
-        /// <summary>
-        ///年度
-        /// </summary>
-        public string Year { get; protected set; }
-
-        /// <summary>
-        /// 期间
-        /// </summary>
-        public string Period { set; get; }
-
-        /// <summary>
-        /// 版本
-        /// </summary>
-        public string Version { set; get; }
-        /// <summary>
-        /// 看板条码号
-        /// </summary>
-        public string Kanban { set; get; }
-
-        /// <summary>
-        /// 入库关联号
-        /// </summary>
-
-        public string Relation { set; get; }
-        /// <summary>
-        /// 工厂
-        /// </summary>
-        public string Factory { set; get; }
-        /// <summary>
-        /// 零件号
-        /// </summary>
-        public string MaterialCode { set; get; }
-        /// <summary>
-        /// 零件类型
-        /// </summary>
-        public string PartType { set; get; }
-        /// <summary>
-        /// 供应商编码
-        /// </summary>
-        public string SupplierCode { set; get; }
-        /// <summary>
-        /// R3入库时间
-        /// </summary>
-        public DateTime SettleInputDate { set; get; }
-
-
-        /// <summary>
-        /// 批次
-        /// </summary>
-        public string Batch { set; get; }
-
-
-        /// <summary>
-        /// 入库结算标识
-        /// </summary>
-        public string Flag { set; get; }
-        /// <summary>
-        /// 数量
-        /// </summary>
-        public decimal Qty { set; get; }
-
-
-        /// <summary>
-        /// R3结算时间 
-        /// </summary>
-        public DateTime SettleDate { set; get; }
-        /// <summary>
-        /// 结算状态
-        /// </summary>
-        public string State { set; get; }
-
-        /// <summary>
-        /// 备注
-        /// </summary>
-        [Display(Name = "备注")]
-        public string Extend { set; get; }
-
-        public Guid ParentId { get; protected set; }
-
-        public void SetValue(Guid guid, Guid branchId, string year, string peroid, string version, Guid parentId)
-        {
-            Period = peroid;
-            Year = year;
-            Id = guid;
-            Version = version;
-            BranchId = branchId;
-            ParentId = parentId;
-        }
-        public KanBanSettle()
-        { }
-        public KanBanSettle(
-            Guid id,
-            Guid branchId,
-            string year,
-            string version,
-            string kanban,
-            string relation,
-            string factory,
-            string materialCode,
-            string partType,
-            DateTime settleInputDate,
-            string supplierCode,
-            decimal qty,
-            string batch,
-            string flag,
-            DateTime settleDate,
-            string state,
-            Guid parentId,
-            //DateTime creationTime,
-            Guid guid) : base(id)
-        {
-            BranchId = branchId;
-            Year = year;
-            Version = version;
-            Kanban = kanban;
-            Relation = relation;
-            Factory = factory;
-            MaterialCode = materialCode;
-            PartType = partType;
-            SettleInputDate = settleInputDate;
-            SupplierCode = supplierCode;
-            Qty = qty;
-            Batch = batch;
-            Flag = flag;
-            SettleDate = settleDate;
-            State = state;
-            ParentId = parentId;
-            //CreationTime = creationTime;
-            CreatorId = guid;
-        }
-
-
-
-
-
-    }
-}
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/KanBan/KanBanManager.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/KanBan/KanBanManager.cs
deleted file mode 100644
index 60660cb0..00000000
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/KanBan/KanBanManager.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-using EFCore.BulkExtensions;
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Volo.Abp.Domain.Repositories;
-using Volo.Abp.Domain.Services;
-
-namespace Win.Sfs.SettleAccount.Entities.VWKanBan
-{
-    public class KanBanManager:DomainService
-    {
-        private readonly ISettleAccountBranchEfCoreRepository<KanBanSettle, Guid> _repository;
-        private readonly ISettleAccountBranchEfCoreRepository<KanBanVersion, Guid> _versionRepository;
-        public KanBanManager(
-                    ISettleAccountBranchEfCoreRepository<KanBanSettle, Guid> repository,
-                    ISettleAccountBranchEfCoreRepository<KanBanVersion, Guid> versionRepository
-            
-            
-            )
-        {
-            _versionRepository = versionRepository;
-            _repository = repository;
-           
-
-        }
-      
-     
-
-
-    }
-}
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/KanBan/KanBanVersion.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/KanBan/KanBanVersion.cs
deleted file mode 100644
index 1eb897cc..00000000
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/KanBan/KanBanVersion.cs
+++ /dev/null
@@ -1,51 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Volo.Abp;
-using Volo.Abp.Guids;
-using Win.Sfs.Shared.DomainBase;
-
-namespace Win.Sfs.SettleAccount.Entities.VWKanBan
-{
-   
-    public class KanBanVersion : FullAuditedAggregateRootBase<Guid>,ISettleAccountEntityBase
-    {
-
-        public KanBanVersion()
-        { }
-
-        public string Year { get; private set; }
-        /// <summary>
-        /// 期间
-        /// </summary>
-        public string Period { get; private set; }
-        /// <summary>
-        /// 版本号
-        /// </summary>
-        public string Version { get;  set; }
-
-        /// <summary>
-        /// 客户号
-        /// </summary>
-        public string CustomerCode { private set; get; }
-
-
-        public KanBanVersion(
-             Guid id,
-             Guid branchId,
-            string year, string period, string version, string customerCode) : base(id)
-        {
-            BranchId = branchId;
-            Year = year;
-            Period = period;
-            Version = version;
-            CustomerCode = customerCode;
-          
-        }
-
-
-    }
-}
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/SecondaryMatching/SecondaryAdjustment.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/SecondaryMatching/SecondaryAdjustment.cs
deleted file mode 100644
index 0aa1f089..00000000
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/SecondaryMatching/SecondaryAdjustment.cs
+++ /dev/null
@@ -1,129 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Win.Sfs.Shared.DomainBase;
-
-namespace Win.Sfs.SettleAccount.Entities.SecondaryMatching
-{
-    public class SecondaryAdjustment : FullAuditedAggregateRootBase<Guid>
-    {
-        /// <summary>
-        ///年度
-        /// </summary>
-        public string Year { get; set; }
-
-        /// <summary>
-        /// 期间
-        /// </summary>
-        public string Period { set; get; }
-
-
-        public string Version { set; get; }
-
-
-        /// <summary>
-        /// 客户总成物料号
-        /// </summary>
-        public string CustomerMaterialCode { set; get; }
-
-        /// <summary>
-        /// 客户组件物料号
-        /// </summary>
-        public string CustomerComponentCode { set; get; }
-
-
-        /// <summary>
-        /// 供应商代码
-        /// </summary>
-        public string SupplierCode { set; get; }
-
-
-        /// <summary>
-        /// 零件数量（回款）
-        /// </summary>
-        public decimal Qty { set; get; }
-
-        /// <summary>
-        /// 金额（不含税）
-        /// </summary>
-        public decimal Amt { set; get; }
-
-        /// <summary>
-        /// 金额（含税）
-        /// </summary>
-        public decimal Total { set; get; }
-
-
-
-        /// <summary>
-        /// 价格或零件号变动情况
-        /// </summary>
-
-        //[Display(Name = "价格或零件号变动情况")]
-        public string HasChanged { get; set; } = "否";
-
-
-        /// <summary>
-        /// 二配采购员
-        /// </summary>
-
-        //[Display(Name = "二配采购员")]
-        public string Buyer { get; set; }
-
- 
-
-
-
-        public Guid ParentId { set; get; }
-
-        public SecondaryAdjustment()
-        { }
-
-        public void SetValue(Guid guid, Guid branchId, string year, string peroid, string version, Guid parentId, decimal qty, decimal amt, decimal total)
-        {
-            Period = peroid;
-            Year = year;
-            Id = guid;
-            Version = version;
-            BranchId = branchId;
-            ParentId = parentId;
-            Qty = qty;
-            Amt = amt;
-            Total = total;
-        }
-
-        public SecondaryAdjustment(Guid guid, Guid branchId, string year, string period, string version, string customerMaterialCode, string customerComponentCode, string supplierCode, decimal qty, decimal amt, decimal total, string hasChanged, string buyer, Guid parentId):base(guid)
-        {
-            BranchId = branchId;
-            Year = year;
-            Period = period;
-            Version = version;
-            CustomerMaterialCode = customerMaterialCode;
-            CustomerComponentCode = customerComponentCode;
-            SupplierCode = supplierCode;
-            Qty = qty;
-            Amt = amt;
-            Total = total;
-            HasChanged = hasChanged;
-            Buyer = buyer;
-            ParentId = parentId;
-        }
-
-        //public SecondaryAdjustment(string year, string period, string version, string customerMaterialCode, string customerComponentCode, string supplierCode, decimal qty, decimal amt, decimal total, string remark, Guid parentId)
-        //{
-        //    Year = year;
-        //    Period = period;
-        //    Version = version;
-        //    CustomerMaterialCode = customerMaterialCode;
-        //    CustomerComponentCode = customerComponentCode;
-        //    SupplierCode = supplierCode;
-        //    Qty = qty;
-        //    Amt = amt;
-        //    Total = total;
-        //    Remark = remark;
-        //    ParentId = parentId;
-        //}
-    }
-}
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/SecondaryMatching/SecondaryAdjustmentVersion.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/SecondaryMatching/SecondaryAdjustmentVersion.cs
deleted file mode 100644
index 6714593a..00000000
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/SecondaryMatching/SecondaryAdjustmentVersion.cs
+++ /dev/null
@@ -1,53 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Win.Sfs.Shared.DomainBase;
-
-namespace Win.Sfs.SettleAccount.Entities.SecondaryMatching
-{
-    public class SecondaryAdjustmentVersion: FullAuditedAggregateRootBase<Guid>
-    {
-        public SecondaryAdjustmentVersion()
-        { }
-
-        public string Year { get; private set; }
-        /// <summary>
-        /// 期间
-        /// </summary>
-        public string Period { get; private set; }
-        /// <summary>
-        /// 版本号
-        /// </summary>
-        public string Version { get; private set; }
-
-        /// <summary>
-        /// 客户号
-        /// </summary>
-        public string CustomerCode { private set; get; }
-
-
-        public string Factory { private set; get; }
-
-
-
-        public SecondaryAdjustmentVersion(
-             Guid id,
-             Guid branchId,
-            string year, string period, string version, string customerCode, string factory) : base(id)
-        {
-            BranchId = branchId;
-            Year = year;
-            Period = period;
-            Version = version;
-            CustomerCode = customerCode;
-            Factory = factory;
-
-        }
-    }
-
-
-
-}
-
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/SecondaryMatching/SecondaryDiscount.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/SecondaryMatching/SecondaryDiscount.cs
deleted file mode 100644
index a9140f6d..00000000
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/SecondaryMatching/SecondaryDiscount.cs
+++ /dev/null
@@ -1,116 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Win.Sfs.Shared.DomainBase;
-
-namespace Win.Sfs.SettleAccount.Entities.SecondaryMatching
-{
-    public class SecondaryDiscount : FullAuditedAggregateRootBase<Guid>
-    {
-        /// <summary>
-        ///年度
-        /// </summary>
-        public string Year { get; set; }
-
-        /// <summary>
-        /// 期间
-        /// </summary>
-        public string Period { set; get; }
-
-
-        public string Version { set; get; }
-
-
-        /// <summary>
-        /// 供应商代码
-        /// </summary>
-        public string SupplierCode { set; get; }
-
-
-        /// <summary>
-        /// 零件数量（回款）
-        /// </summary>
-        public decimal Qty { set; get; }
-
-        /// <summary>
-        /// 金额（不含税）
-        /// </summary>
-        public decimal Amt { set; get; }
-
-        /// <summary>
-        /// 金额（含税）
-        /// </summary>
-        public decimal Total { set; get; }
-
-
-
-        /// <summary>
-        /// 价格或零件号变动情况
-        /// </summary>
-
-        //[Display(Name = "价格或零件号变动情况")]
-        public string HasChanged { get; set; } = "否";
-
-
-        /// <summary>
-        /// 二配采购员
-        /// </summary>
-
-        //[Display(Name = "二配采购员")]
-        public string Buyer { get; set; }
-
- 
-
-
-
-        public Guid ParentId { set; get; }
-
-        public SecondaryDiscount()
-        { }
-
-        public void SetValue(Guid guid, Guid branchId, string year, string peroid, string version, Guid parentId, decimal qty, decimal amt, decimal total)
-        {
-            Period = peroid;
-            Year = year;
-            Id = guid;
-            Version = version;
-            BranchId = branchId;
-            ParentId = parentId;
-            Qty = qty;
-            Amt = amt;
-            Total = total;
-        }
-
-        public SecondaryDiscount(Guid guid, Guid branchId, string year, string period, string version, string supplierCode, decimal qty, decimal amt, decimal total, string hasChanged, string buyer, Guid parentId):base(guid)
-        {
-            BranchId = branchId;
-            Year = year;
-            Period = period;
-            Version = version;
-            SupplierCode = supplierCode;
-            Qty = qty;
-            Amt = amt;
-            Total = total;
-            HasChanged = hasChanged;
-            Buyer = buyer;
-            ParentId = parentId;
-        }
-
-        //public SecondaryAdjustment(string year, string period, string version, string customerMaterialCode, string customerComponentCode, string supplierCode, decimal qty, decimal amt, decimal total, string remark, Guid parentId)
-        //{
-        //    Year = year;
-        //    Period = period;
-        //    Version = version;
-        //    CustomerMaterialCode = customerMaterialCode;
-        //    CustomerComponentCode = customerComponentCode;
-        //    SupplierCode = supplierCode;
-        //    Qty = qty;
-        //    Amt = amt;
-        //    Total = total;
-        //    Remark = remark;
-        //    ParentId = parentId;
-        //}
-    }
-}
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/SecondaryMatching/SecondaryDiscountVersion.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/SecondaryMatching/SecondaryDiscountVersion.cs
deleted file mode 100644
index 92580497..00000000
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/SecondaryMatching/SecondaryDiscountVersion.cs
+++ /dev/null
@@ -1,53 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Win.Sfs.Shared.DomainBase;
-
-namespace Win.Sfs.SettleAccount.Entities.SecondaryMatching
-{
-    public class SecondaryDiscountVersion : FullAuditedAggregateRootBase<Guid>
-    {
-        public SecondaryDiscountVersion()
-        { }
-
-        public string Year { get; private set; }
-        /// <summary>
-        /// 期间
-        /// </summary>
-        public string Period { get; private set; }
-        /// <summary>
-        /// 版本号
-        /// </summary>
-        public string Version { get; private set; }
-
-        /// <summary>
-        /// 客户号
-        /// </summary>
-        public string CustomerCode { private set; get; }
-
-
-        public string Factory { private set; get; }
-
-
-
-        public SecondaryDiscountVersion(
-             Guid id,
-             Guid branchId,
-            string year, string period, string version, string customerCode, string factory) : base(id)
-        {
-            BranchId = branchId;
-            Year = year;
-            Period = period;
-            Version = version;
-            CustomerCode = customerCode;
-            Factory = factory;
-
-        }
-    }
-
-
-
-}
-
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/SecondaryMatching/SecondaryPriceRatio.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/SecondaryMatching/SecondaryPriceRatio.cs
deleted file mode 100644
index 39f47006..00000000
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/SecondaryMatching/SecondaryPriceRatio.cs
+++ /dev/null
@@ -1,140 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Win.Sfs.Shared.DomainBase;
-
-namespace Win.Sfs.SettleAccount.Entities.SecondaryMatching
-{
-    public class SecondaryPriceRatio: FullAuditedAggregateRootBase<Guid>
-    {
-
-        public string Year { get;  set; }
-        /// <summary>
-        /// 期间
-        /// </summary>
-        public string Period { get;  set; } 
-
-        public string Version { set; get; }
-
-
-
-
-        /// <summary>
-        /// 客户代码
-        /// </summary>
-        public string CustomerCode { set; get; }
-
-
-
-        /// <summary>
-        /// 客户总成物料号
-        /// </summary>
-        public string CustomItemCode { set; get; }
-
-        /// <summary>
-        /// 客户物料号结算价格
-        /// </summary>
-        public decimal CustomItemPrice { set; get; }
-
-
-
-        /// <summary>
-        /// 客户组件物料号
-        /// </summary> 
-        public string CustomSubItemCode { get; set; }
-
-
-        /// <summary>
-        /// 客户物料号结算价格
-        /// </summary>
-        public decimal CustomSubItemPrice { set; get; }
-         
-
-        /// <summary>
-        /// 供应商代码
-        /// </summary>
-        public string SupplierCode { get; set; }
-         /// <summary>
-         /// 供应商描述
-         /// </summary>
-        public string SupplierDesc { get; set; } 
-
-        /// <summary>
-        /// 供货比例
-        /// </summary>
-        public string SupplyProportion { set; get; } 
-
-        /// <summary>
-        /// 比例供货价格
-        /// </summary>
-        public decimal SupplyProportionPrice { set; get; }
-
-
-
-
-        public Guid ParentId { set; get; }
-
-
-
-        public void SetPrice(decimal supplyProportionPrice)
-        {
-            SupplyProportionPrice = supplyProportionPrice;
-        }
-
-
-        public void SetValue(Guid guid, Guid branchId, string year, string peroid,string version, Guid parentId,decimal supplyProportionPrice)
-        {
-            Period = peroid;
-            Year = year;
-            Id = guid;
-            Version = version;
-            BranchId = branchId;
-            ParentId = parentId;
-            SupplyProportionPrice = supplyProportionPrice;
-
-            
-        }
-
-        public SecondaryPriceRatio()
-        { }
-
-        public SecondaryPriceRatio(Guid guid, Guid branchId, string year, string period, string version, string customerCode, string customItemCode, decimal customItemPrice, string customSubItemCode, decimal customSubItemPrice, string supplierCode, string supplierDesc, string supplyProportion, decimal supplyProportionPrice, Guid parentId)
-        {
-            Year = year;
-            Period = period;
-            Version = version;
-            CustomerCode = customerCode;
-            CustomItemCode = customItemCode;
-            CustomItemPrice = customItemPrice;
-            CustomSubItemCode = customSubItemCode;
-            CustomSubItemPrice = customSubItemPrice;
-            SupplierCode = supplierCode;
-            SupplierDesc = supplierDesc;
-            SupplyProportion = supplyProportion;
-            SupplyProportionPrice = supplyProportionPrice;
-            ParentId = parentId;
-        }
-
-     
-
-
-
-        //public SecondaryPriceRatio(string year, string period, string erpMaterialCode, decimal erpPrice, string erpComponentCode, string erpComponentDesc, string supplierCode, string supplierDesc, string supplyProportion, decimal erpComponentPrice, decimal supplyProportionPrice, Guid parentId)
-        //{
-        //    //Year = year;
-        //    //Period = period;
-        //    //ErpMaterialCode = erpMaterialCode;
-        //    //ErpPrice = erpPrice;
-        //    //ErpComponentCode = erpComponentCode;
-        //    //ErpComponentDesc = erpComponentDesc;
-        //    //SupplierCode = supplierCode;
-        //    //SupplierDesc = supplierDesc;
-        //    //SupplyProportion = supplyProportion;
-        //    //ErpComponentPrice = erpComponentPrice;
-        //    //SupplyProportionPrice = supplyProportionPrice;
-        //    //ParentId = parentId;
-        //}
-    }
-}
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/SecondaryMatching/SecondaryPriceRatioVersion.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/SecondaryMatching/SecondaryPriceRatioVersion.cs
deleted file mode 100644
index 82b23c8c..00000000
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/SecondaryMatching/SecondaryPriceRatioVersion.cs
+++ /dev/null
@@ -1,50 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Win.Sfs.Shared.DomainBase;
-
-namespace Win.Sfs.SettleAccount.Entities.SecondaryMatching
-{
-    public class SecondaryPriceRatioVersion : FullAuditedAggregateRootBase<Guid>
-    {
-    
-        public SecondaryPriceRatioVersion()
-        { }
-
-        public string Year { get;  set; }
-        /// <summary>
-        /// 期间
-        /// </summary>
-        public string Period { get; set; }
-        /// <summary>
-        /// 版本号
-        /// </summary>
-        public string Version { get;  set; }
-
-        /// <summary>
-        /// 客户号
-        /// </summary>
-        public string CustomerCode { set; get; }
-
-
-        public string Factory {  set; get; }
-
-
-
-        public SecondaryPriceRatioVersion(
-             Guid id,
-             Guid branchId,
-            string year, string period, string version, string customerCode, string factory) : base(id)
-        {
-            BranchId = branchId;
-            Year = year;
-            Period = period;
-            Version = version;
-            CustomerCode = customerCode;
-            Factory = factory;
-
-        }
-    }
-}
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/SettledPartAndErpPartPriceDiffs/SettledPartAndErpPartPriceDiff.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/SettledPartAndErpPartPriceDiffs/SettledPartAndErpPartPriceDiff.cs
deleted file mode 100644
index 0104069a..00000000
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/SettledPartAndErpPartPriceDiffs/SettledPartAndErpPartPriceDiff.cs
+++ /dev/null
@@ -1,44 +0,0 @@
-using Magicodes.ExporterAndImporter.Core;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Win.Sfs.SettleAccount.Reports.SettledPartAndErpPartPriceDiffs
-{
-    public class SettledPartAndErpPartPriceDiff
-    {
-        //[ExporterHeader(DisplayName = "版本号")]
-        //public string Version{ set; get; }
-        //[ExporterHeader(DisplayName ="物料编号")]
-        //public string MaterialCode { set; get; }
-
-        [ExporterHeader(DisplayName = "物料描述")]
-        public string MaterialDesc { set; get; }
-
-        [ExporterHeader(DisplayName = "ERP物料编号")]
-        public string ErpMaterialCode { set; get; }
-        [ExporterHeader(DisplayName = "总成定价")]
-        public decimal Price { set; get; }
-        [ExporterHeader(DisplayName = "Bom组成价格")]
-        public decimal SumPrice { get; set; }
-        [ExporterHeader(DisplayName = "差额")]
-        public decimal DiffPrice { get; set; }
-    }
-    public class PartCodeDiff
-    {
-       [ExporterHeader(DisplayName = "组成组零件")]
-        public string   ErpMaterialCode      {set;get;}
-        [ExporterHeader(DisplayName = "Sap零件号")]
-        public string   MaterialCode   {set;get;}
-        [ExporterHeader(DisplayName = "客户零件号")]
-        public string   ShipMaterailCode     {set;get;}
-        [ExporterHeader(DisplayName = "物料描述")]
-        public string   MaterialDesc         {set;get;}
-        [ExporterHeader(DisplayName = "物料组车型")]
-        public string EstimateTypeDesc { set; get; }
-
-
-    }
-}
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/SettlementCrossReference/SettlementCrossReference.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/SettlementCrossReference/SettlementCrossReference.cs
deleted file mode 100644
index 802fbfc2..00000000
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/SettlementCrossReference/SettlementCrossReference.cs
+++ /dev/null
@@ -1,114 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Win.Sfs.Shared.DomainBase;
-
-namespace Win.Sfs.SettleAccount.Entities.SettlementCrossReferences
-{
-    public class SettlementCrossReference : FullAuditedAggregateRootBase<Guid>, ISettleAccountEntityBase
-    {
-        public SettlementCrossReference()
-        { }
-        public SettlementCrossReference(Guid Id, string year, string period, string factory, string model, string partType, string settlementMaterialCode, string bomMaterialCode, string materialDesc, string supplierCode, string supplierDesc, string buyer,string customerCode,string version) : base(Id)
-        {
-            Year = year;
-            Period = period;
-            Model = model;
-            Factory = factory;
-            PartType = partType;
-            SettlementMaterialCode = settlementMaterialCode;
-            BomMaterialCode = bomMaterialCode;
-            MaterialDesc = materialDesc;
-            SupplierCode = supplierCode;
-            SupplierDesc = supplierDesc;
-            Buyer = buyer;
-            CustomerCode = customerCode;
-            Version = version;
-        }
-
-
-        /// <summary>
-        ///年
-        /// </summary>
-        [Display(Name = "年")]
-        public string Year { get; set; }
-
-        /// <summary>
-        /// 期间
-        /// </summary>
-        [Display(Name = "期间")]
-        public string Period { set; get; }
-        /// <summary>
-        /// 车型
-        /// </summary>
-        [Display(Name = "车型")]
-        public string Model { set; get; }
-        /// <summary>
-        /// 工厂
-        /// </summary>
-        [Display(Name = "工厂")]
-        public string Factory { set; get; }
-
-
-        /// <summary>
-        /// 零件类型
-        /// </summary>
-        [Display(Name = "零件类型")]
-        public string PartType { get; set; }
-
-        /// <summary>
-        /// 总成结算号
-        /// </summary>
-        [Display(Name = "总成结算号")]
-        public string SettlementMaterialCode { get; set; }
-
-        /// <summary>
-        /// BOM清单零件号
-        /// </summary>
-        [Display(Name = "BOM清单零件号")]
-        public string BomMaterialCode { get; set; }
-
-        /// <summary>
-        /// 零件名称
-        /// </summary>
-        [Display(Name = "零件名称")]
-        public string MaterialDesc { get; set; }
-
-        /// <summary>
-        /// 供应商代码
-        /// </summary>
-        [Display(Name = "供应商代码")]
-        public string SupplierCode { set; get; }
-        /// <summary>
-        /// 供应商名称
-        /// </summary>
-        [Display(Name = "供应商名称")]
-        public string SupplierDesc { set; get; }
-        /// <summary>
-        /// 采购员
-        /// </summary>
-        [Display(Name = "采购员")]
-        public string Buyer { set; get; }
-        public string Version { get ; set ; }
-        /// <summary>
-        /// 客户号
-        /// </summary>
-        public string CustomerCode { set; get; }
-
-   
-
-        public void SetValue(Guid guid, Guid branchId, string year, string peroid, string version,string customerCode, string factory)
-        {
-            Period = peroid;
-            Year = year;
-            Id = guid;
-            Version = version;
-            BranchId = branchId;
-            CustomerCode = customerCode;
-            Factory = factory;
-        }
-    }
-}
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/SettlementCrossReference/SettlementCrossReferenceVersion.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/SettlementCrossReference/SettlementCrossReferenceVersion.cs
deleted file mode 100644
index c8e3102d..00000000
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/SettlementCrossReference/SettlementCrossReferenceVersion.cs
+++ /dev/null
@@ -1,53 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Volo.Abp;
-using Volo.Abp.Guids;
-using Win.Sfs.Shared.DomainBase;
-
-namespace Win.Sfs.SettleAccount.Entities.SettlementCrossReference
-{
-   
-    public class SettlementCrossReferenceVersion : FullAuditedAggregateRootBase<Guid>,ISettleAccountEntityBase
-    {
-
-        public SettlementCrossReferenceVersion()
-        { }
-
-        public string Year { get; private set; }
-        /// <summary>
-        /// 期间
-        /// </summary>
-        public string Period { get; private set; }
-        /// <summary>
-        /// 版本号
-        /// </summary>
-        public string Version { get;  set; }
-
-        /// <summary>
-        /// 客户号
-        /// </summary>
-        public string CustomerCode { private set; get; }
-
-
-        public string Factory { private set; get; }
-        public SettlementCrossReferenceVersion(
-             Guid id,
-             Guid branchId,
-            string year, string period, string version, string customerCode,string factory) : base(id)
-        {
-            BranchId = branchId;
-            Year = year;
-            Period = period;
-            Version = version;
-            CustomerCode = customerCode;
-            Factory = factory;
-          
-        }
-
-
-    }
-}
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/SettlementPakAndSparePartsRef/SettlementPakAndSpareParts.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/SettlementPakAndSparePartsRef/SettlementPakAndSpareParts.cs
deleted file mode 100644
index ac6e7cb1..00000000
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/SettlementPakAndSparePartsRef/SettlementPakAndSpareParts.cs
+++ /dev/null
@@ -1,227 +0,0 @@
-using System;
-using System.ComponentModel.DataAnnotations;
-using Win.Sfs.Shared.DomainBase;
- 
-using Win.Sfs.Shared.Constant;
-
-namespace Win.Sfs.SettleAccount.Entities.SettlementPakAndSparePartsRef
-{
-    /// <summary>
-    /// 结算包跟散件对应关系
-    /// </summary>
-    public class SettlementPakAndSpareParts : FullAuditedAggregateRootBase<Guid>
-    {
-        private string empty1;
-        private string empty2;
-        private string settleCode;
-        private string v1;
-        private string v2;
-        private string empty3;
-        private string v3;
-        private string v4;
-        private string v5;
-        private string v6;
-        private string v7;
-        private int v8;
-        private decimal v9;
-        private string v10;
-        private decimal v11;
-        private string partDesc;
-        private string partcode;
-        private string productType;
-        private decimal carNumber;
-        private string v;
-        private decimal carPrice;
-
-        /// <summary>
-        /// 分支id
-        /// </summary>
-        [Display(Name = "分支Id")]
-
-        public Guid BranchId { get; set; }
-
-        /// <summary>
-        /// 期间
-        /// </summary>
-        [Display(Name = "期间")]
-        public string Period { set; get; }
-
-
-        /// <summary>
-        /// 适用功能
-        /// </summary>
-        [Display(Name = "适用功能")]
-        public string ApplicableFunction { get; protected set; }
-
-
-        /// <summary>
-        /// 结算件编码
-        /// </summary>
-        [Display(Name = "结算件编码")]
-        [Required(ErrorMessage = "{0}是必填项")]
-        public string SettlementPartCode { get; set; }
-
-
-        /// <summary>
-        /// 结算件描述
-        /// </summary>
-        [Display(Name = "结算件描述")]
-        [MaxLength(CommonConsts.MaxDescriptionLength, ErrorMessage = "{0}最多输入{1}个字符")]
-        public string SettlementPartDesc { get; set; }
-
-
-        /// <summary>
-        /// (Erp散件)零件号
-        /// </summary>
-        [Display(Name = "(Erp散件)零件号")]
-        public string ErpSparePartCode { get; set; }
-
-
-        /// <summary>
-        /// (Erp散件)零件名称
-        /// </summary>
-        [Display(Name = "(Erp散件)零件名称")]
-        public string ErpSparePartName { get; set; }
-
-
-        /// <summary>
-        /// 零件类型
-        /// </summary>
-        [Display(Name = "零件类型")]
-        public string PartType { set; get; }
-
-
-        /// <summary>
-        /// QAD代码
-        /// </summary>
-        [Display(Name = "QAD代码")]
-        public string QADCode  { set; get; }
-
-
-        /// <summary>
-        /// 供应商代码
-        /// </summary>
-        [Display(Name = "供应商代码")]
-        public string SupplierCode { set; get; }
-
-
-        /// <summary>
-        /// 供应商名称
-        /// </summary>
-        [Display(Name = "供应商名称")]
-        public string SupplierName { set; get; }
-
-
-        /// <summary>
-        /// 产品类
-        /// </summary>
-        [Display(Name = "产品类")]
-        public string ProductLine { get; internal set; }
-
-
-        /// <summary>
-        /// 每车数量
-        /// </summary>
-        [Display(Name = "每车数量")]
-        public decimal PerCarNum { get;  set; }
-
-
-        /// <summary>
-        /// 单价
-        /// </summary>
-        [Display(Name = "单价")]
-        public decimal Price { get; set; }
-
-
-        /// <summary>
-        /// 供货比例
-        /// </summary>
-        [Display(Name = "供货比例")]
-        public string SupplyProportion { get; set; }
-        
-
-        /// <summary>
-        /// 辆份价格
-        /// </summary>
-        [Display(Name = "辆份价格")]
-        public decimal QuantityPrice { get; set; }
-        [Display(Name = "版本")]
-        public string Version { get; set; }
-        [Display(Name = "客户编码")]
-        public string CustomerCode { get; set; }
-        [Display(Name = "车型")]
-        public string Model { get; set; }
-
-
-        public SettlementPakAndSpareParts()
-        {
-        }
-
-        public SettlementPakAndSpareParts(Guid id, string period, string applicableFunction, string settlementPartCode, string settlementPartDesc, 
-            string erpSparePartCode, string erpSparePartName, string partType, string qadCode, string supplierCode, string supplierName, string productLine,
-            decimal perCarNum, decimal price, string supplyProportion, decimal quantityPrice,string version,string customerCode,string model):base(id)
-        {
-
-            Period = period;
-            ApplicableFunction = applicableFunction;
-            SettlementPartCode = settlementPartCode;
-            SettlementPartDesc = settlementPartDesc;
-            ErpSparePartCode = erpSparePartCode;
-            ErpSparePartName = erpSparePartName;
-            PartType = partType;
-            QADCode = qadCode;
-            SupplierCode = supplierCode;
-            SupplierName = supplierName;
-            ProductLine = productLine;
-            PerCarNum = perCarNum;
-            Price = price;
-            SupplyProportion = supplyProportion;
-            QuantityPrice = quantityPrice;
-            Version = version;
-            CustomerCode = customerCode;
-            Model = model;
-        }
-
-        public SettlementPakAndSpareParts(Guid id, string empty1, string empty2, string settleCode, string v1, string v2, string empty3, string v3, string v4, string v5, string v6, string v7, int v8, decimal v9, string v10, decimal v11, string version, string customerCode) : base(id)
-        {
-            this.empty1 = empty1;
-            this.empty2 = empty2;
-            this.settleCode = settleCode;
-            this.v1 = v1;
-            this.v2 = v2;
-            this.empty3 = empty3;
-            this.v3 = v3;
-            this.v4 = v4;
-            this.v5 = v5;
-            this.v6 = v6;
-            this.v7 = v7;
-            this.v8 = v8;
-            this.v9 = v9;
-            this.v10 = v10;
-            this.v11 = v11;
-            Version = version;
-            CustomerCode = customerCode;
-        }
-
-        public SettlementPakAndSpareParts(Guid id, string empty1, string empty2, string settleCode, string partDesc, string partcode, string empty3, string partType, string qadCode, string supplierCode, string supplierName, string productType, decimal carNumber, decimal price, string v, decimal carPrice, string version, string customerCode) : base(id)
-        {
-            this.empty1 = empty1;
-            this.empty2 = empty2;
-            this.settleCode = settleCode;
-            this.partDesc = partDesc;
-            this.partcode = partcode;
-            this.empty3 = empty3;
-            PartType = partType;
-            QADCode = qadCode;
-            SupplierCode = supplierCode;
-            SupplierName = supplierName;
-            this.productType = productType;
-            this.carNumber = carNumber;
-            Price = price;
-            this.v = v;
-            this.carPrice = carPrice;
-            Version = version;
-            CustomerCode = customerCode;
-        }
-    }
-}
\ No newline at end of file
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/SettlementPakAndSparePartsRef/SettlementPakAndSparePartsVersion.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/SettlementPakAndSparePartsRef/SettlementPakAndSparePartsVersion.cs
deleted file mode 100644
index 50deb1b9..00000000
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/SettlementPakAndSparePartsRef/SettlementPakAndSparePartsVersion.cs
+++ /dev/null
@@ -1,53 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Volo.Abp;
-using Volo.Abp.Guids;
-using Win.Sfs.Shared.DomainBase;
-
-namespace Win.Sfs.SettleAccount.Entities.SettlementPakAndSparePartsRef
-{
-   
-    public class SettlementPakAndSparePartsVersion : FullAuditedAggregateRootBase<Guid>,ISettleAccountEntityBase
-    {
-
-        public SettlementPakAndSparePartsVersion()
-        { }
-
-        public string Year { get; private set; }
-        /// <summary>
-        /// 期间
-        /// </summary>
-        public string Period { get; private set; }
-        /// <summary>
-        /// 版本号
-        /// </summary>
-        public string Version { get;  set; }
-
-        /// <summary>
-        /// 客户号
-        /// </summary>
-        public string CustomerCode { private set; get; }
-
-
-        public string Factory { private set; get; }
-        public SettlementPakAndSparePartsVersion(
-             Guid id,
-             Guid branchId,
-            string year, string period, string version, string customerCode,string factory) : base(id)
-        {
-            BranchId = branchId;
-            Year = year;
-            Period = period;
-            Version = version;
-            CustomerCode = customerCode;
-            Factory = factory;
-          
-        }
-
-
-    }
-}
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/UnSettleAccounts/UnSettleAccount.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/UnSettleAccounts/UnSettleAccount.cs
deleted file mode 100644
index 9b48cbf2..00000000
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/UnSettleAccounts/UnSettleAccount.cs
+++ /dev/null
@@ -1,128 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Win.Sfs.Shared.DomainBase;
-
-namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
-{
-    /// <summary>
-    /// 大众FIS未结算明细导入
-    /// </summary>
-    public class UnSettleAccount: FullAuditedAggregateRootBase<Guid>, ISettleAccountEntityBase
-    {
-
-
-        /// <summary>
-        ///年度
-        /// </summary>
-        public string Year { get; protected set; }
-
-        /// <summary>
-        /// 期间
-        /// </summary>
-        public string Period { set; get; }
-
-
-
-        /// <summary>
-        /// 年份
-        /// </summary>
-        public string SettleYear { set; get; }
-        /// <summary>
-        /// KENEN号
-        /// </summary>
-        public string KENNCode { set; get; }
-        /// <summary>
-        /// 底盘号
-        /// </summary>
-        public string ChassisNumber { set; get; }
-        /// <summary>
-        /// 车型
-        /// </summary>
-        public string Model { set; get; }
-        /// <summary>
-        /// CP5A日期
-        /// </summary>
-        public DateTime CP5A { set; get; }
-        /// <summary>
-        /// CP7日期,可空
-        /// </summary>
-        public DateTime? CP7 { set; get; }
-
-        /// <summary>
-        /// 零件号
-        /// </summary>
-        public string MaterialCode { get; protected set; }
-        /// <summary>
-        /// 数量
-        /// </summary>
-        public decimal Qty { get; protected set; }
-        /// <summary>
-        /// 结算标识
-        /// </summary>
-
-        public string SettlementID { get; protected set; }
-
-        /// <summary>
-        /// 结算供应商
-        /// </summary>
-        public string SettlementSupplier { get; protected set; }
-
-
-
-        public Guid ParentId { get; protected set; }
-
-
-
-
-        /// <summary>
-        /// 状态
-        /// </summary>
-        public int state { get; set; }
-
-        /// <summary>
-        /// 未结算原因
-        /// </summary>
-        public string UnsettledReason { get; set; }
-
-        public string Version { set; get; }
-        public void SetValue(Guid guid, Guid branchId, string year, string peroid, string version, Guid parentId)
-        {
-            Period = peroid;
-            Year = year;
-            Id = guid;
-            Version = version;
-            BranchId = branchId;
-            ParentId = parentId;
-        }
-        public UnSettleAccount()
-        { }
-        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)
-        {
-            BranchId = branchId;
-            Year = year;
-            KENNCode = kENNCode;
-            ChassisNumber = chassisNumber;
-            Model = model;
-            CP5A = cP5A;
-            CP7 = cP7;
-            MaterialCode = materialCode;
-            Qty = qty;
-            SettlementID = settlementID;
-            SettlementSupplier = settlementSupplier;
-            Version = version;
-            Period = period;
-            SettleYear = settleYear;
-            ParentId = parentId;
-            CreationTime = creationTime;
-            CreatorId = guid;
-            UnsettledReason = reason;
-
-        }
-    }
-}
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/UnSettleAccounts/UnSettleAccountVersion.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/UnSettleAccounts/UnSettleAccountVersion.cs
deleted file mode 100644
index f13d0ccc..00000000
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/UnSettleAccounts/UnSettleAccountVersion.cs
+++ /dev/null
@@ -1,53 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Volo.Abp;
-using Volo.Abp.Guids;
-using Win.Sfs.Shared.DomainBase;
-
-namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
-{
-   
-    public class UnSettleAccountVersion : FullAuditedAggregateRootBase<Guid>,ISettleAccountEntityBase
-    {
-
-        public UnSettleAccountVersion()
-        { }
-
-        public string Year { get; private set; }
-        /// <summary>
-        /// 期间
-        /// </summary>
-        public string Period { get; private set; }
-        /// <summary>
-        /// 版本号
-        /// </summary>
-        public string Version { get;  set; }
-
-        /// <summary>
-        /// 客户号
-        /// </summary>
-        public string CustomerCode { private set; get; }
-
-
-        public string Factory { private set; get; }
-        public UnSettleAccountVersion(
-             Guid id,
-             Guid branchId,
-            string year, string period, string version, string customerCode,string factory) : base(id)
-        {
-            BranchId = branchId;
-            Year = year;
-            Period = period;
-            Version = version;
-            CustomerCode = customerCode;
-            Factory = factory;
-          
-        }
-
-
-    }
-}
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/VWScrapClaims/ScrapClaims.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/VWScrapClaims/ScrapClaims.cs
deleted file mode 100644
index 78332181..00000000
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/VWScrapClaims/ScrapClaims.cs
+++ /dev/null
@@ -1,101 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Win.Sfs.Shared.DomainBase;
-
-namespace Win.Sfs.SettleAccount.Entities.VWScrapClaims
-{
-    /// <summary>
-    /// CP7报废和索赔
-    /// </summary>
-    public class ScrapClaims : FullAuditedAggregateRootBase<Guid>, ISettleAccountEntityBase
-    {
-        public ScrapClaims()
-        { }
-
-        public void SetValue(Guid guid, Guid branchId, string year, string peroid, string version)
-        {
-            Period = peroid;
-            Year = year;
-            Id = guid;
-            Version = version;
-            BranchId = branchId;
-        }
-        public ScrapClaims(Guid Id, string year, string period, string version,string type,
-            string materialCode, string materialDesc, decimal qty,
-            decimal amt) : base(Id)
-        {
-            Year = year;
-            Period = period;
-            Version = version;
-            Type = type;
-            MaterialCode = materialCode;
-            MaterialDesc = materialDesc;
-            Qty = qty;
-            Amt = amt;
-        }
-
-        //类型	零件号	零件名称	 数    量	金    额
-
-        /// <summary>
-        ///年
-        /// </summary>
-        [Display(Name = "年")]
-        public string Year { get; set; }
-        /// <summary>
-        /// 期间
-        /// </summary>
-        [Display(Name = "期间")]
-        public string Period { set; get; }
-        /// <summary>
-        /// 版本号
-        /// </summary>
-        [Display(Name = "版本号")]
-        public string Version { set; get; }
-        /// <summary>
-        /// 类型：CP7报废和索赔两种
-        /// </summary>
-        [Display(Name = "类型")]
-        public string Type { set; get; }
-
-
-        /// <summary>
-        /// 零件号
-        /// </summary>
-        [Display(Name = "零件号")]
-        public string MaterialCode { get; set; }
-
-        /// <summary>
-        /// 零件名称
-        /// </summary>
-        [Display(Name = "零件名称")]
-        public string MaterialDesc { get; set; }
-
-
-
-        /// <summary>
-        /// 数量
-        /// </summary>
-        [Display(Name = "数量")]
-        public decimal Qty { set; get; }
-
-        /// <summary>
-        /// 金额
-        /// </summary>
-        [Display(Name = "金额")]
-        public decimal Amt { set; get; }
-
-
-        /// <summary>
-        /// 备注
-        /// </summary>
-        [Display(Name = "备注")]
-        public string Extend { set; get; }
-
-     
-
-    }
-}
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/VWScrapClaims/ScrapClaimsVersion.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/VWScrapClaims/ScrapClaimsVersion.cs
deleted file mode 100644
index 2015dfbe..00000000
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/VWScrapClaims/ScrapClaimsVersion.cs
+++ /dev/null
@@ -1,47 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Win.Sfs.Shared.DomainBase;
-
-namespace Win.Sfs.SettleAccount.Entities.VWScrapClaims
-{
-    public class ScrapClaimsVersion : FullAuditedAggregateRootBase<Guid>, ISettleAccountEntityBase
-    {
-
-        public ScrapClaimsVersion()
-        { }
-
-        public string Year { get; private set; }
-        /// <summary>
-        /// 期间
-        /// </summary>
-        public string Period { get; private set; }
-        /// <summary>
-        /// 版本号
-        /// </summary>
-        public string Version { get; set; }
-
-        /// <summary>
-        /// 客户号
-        /// </summary>
-        public string CustomerCode { private set; get; }
-
-
-        public ScrapClaimsVersion(
-             Guid id,
-             Guid branchId,
-            string year, string period, string version, string customerCode) : base(id)
-        {
-            BranchId = branchId;
-            Year = year;
-            Period = period;
-            Version = version;
-            CustomerCode = customerCode;
-
-        }
-
-
-    }
-}
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/VWSparePart/SparePart.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/VWSparePart/SparePart.cs
deleted file mode 100644
index cae54b14..00000000
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/VWSparePart/SparePart.cs
+++ /dev/null
@@ -1,215 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Win.Sfs.Shared.DomainBase;
-
-namespace Win.Sfs.SettleAccount.Entities.VWSparePart
-{
-    /// <summary>
-    /// 大众备件
-    /// </summary>
-    public class SparePart : FullAuditedAggregateRootBase<Guid>, ISettleAccountEntityBase
-    {
-        public SparePart()
-        { }
-
-        public void SetValue(Guid guid, Guid branchId, string year, string peroid, string version,string extend)
-        {
-            Period = peroid;
-            Year = year;
-            Id = guid;
-            Version = version;
-            BranchId = branchId;
-            Extend = extend;
-        }
-
-        public void SetValue(Guid guid, Guid branchId, string year, string peroid, string version, string extend,string purchaseOrderNo)
-        {
-            Period = peroid;
-            Year = year;
-            Id = guid;
-            Version = version;
-            BranchId = branchId;
-            Extend = extend;
-            PurchaseOrderNo = purchaseOrderNo;
-        }
-        public SparePart(Guid Id, string year, string period, string version, string lineNumber,
-            string purchaseType,string purchaseOrderNo, string purchaseOrderNoItem, string purchaseOrderNoText,
-            decimal receiptQty, decimal invoicedQty, decimal amountNoTax, decimal purchasePriceNoTax,
-            string accountNum,string materialCode, string materialDesc, DateTime spareDate, string deliveryOrderNo,
-            string deliveryLineNum, string batchNo, string unit, decimal taxRate, string taxCode, string factory
-
-            ) : base(Id)
-        {
-            Year = year;
-            Period = period;
-            Version = version;
-            LineNumber = lineNumber;
-            PurchaseType = purchaseType;
-            PurchaseOrderNo = purchaseOrderNo;
-            PurchaseOrderNoItem = purchaseOrderNoItem;
-            PurchaseOrderNoText = purchaseOrderNoText;
-            ReceiptQty = receiptQty;
-            InvoicedQty = invoicedQty;
-            AmountNoTax = amountNoTax;
-            PurchasePriceNoTax = purchasePriceNoTax;
-            AccountNum = accountNum;
-            MaterialCode = materialCode;
-            MaterialDesc = materialDesc;
-            SpareDate = spareDate;
-            DeliveryOrderNo = deliveryOrderNo;
-            DeliveryLineNum = deliveryLineNum;
-            BatchNo = batchNo;
-            Unit = unit;
-            TaxRate = taxRate;
-            TaxCode = taxCode;
-            Factory = factory;
-        }
-
-        //行号	采购类型	采购订单号	采购订单行项目	采购订单文本	收货数量	开票数量	不含税金额	采购价格不含税
-        //科目号	物料代码	物料描述	日期	交货单号	交货行号	批次号	单位	税率	税码	
-        //德国发票号	AP_REQUISITION_MIMRS.GERMANY_INVOCE_AMOUNT	借贷	PO币种	工厂	工厂名称	BM 单号	
-
-        /// <summary>
-        ///年
-        /// </summary>
-        [Display(Name = "年")]
-        public string Year { get; set; }
-        /// <summary>
-        /// 期间
-        /// </summary>
-        [Display(Name = "期间")]
-        public string Period { set; get; }
-        /// <summary>
-        /// 版本号
-        /// </summary>
-        [Display(Name = "版本号")]
-        public string Version { set; get; }
-
-        /// <summary>
-        /// 行号
-        /// </summary>
-        [Display(Name = "行号")]
-        public string LineNumber { set; get; }
-
-
-        /// <summary>
-        /// 采购类型
-        /// </summary>
-        [Display(Name = "采购类型")]
-        public string PurchaseType { get; set; }
-
-        /// <summary>
-        /// 采购订单号
-        /// </summary>
-        [Display(Name = "采购订单号")]
-        public string PurchaseOrderNo { get; set; }
-        /// <summary>
-        /// 采购订单行项目
-        /// </summary>
-        [Display(Name = "采购订单行项目")]
-        public string PurchaseOrderNoItem { get; set; }
-        /// <summary>
-        /// 采购订单文本
-        /// </summary>
-        [Display(Name = "采购订单文本")]
-        public string PurchaseOrderNoText { get; set; }
-        /// <summary>
-        /// 收货数量
-        /// </summary>
-        [Display(Name = "收货数量")]
-        public decimal ReceiptQty { get; set; }
-
-        /// <summary>
-        /// 开票数量
-        /// </summary>
-        [Display(Name = "开票数量")]
-        public decimal InvoicedQty { get; set; }
-        /// <summary>
-        /// 不含税金额
-        /// </summary>
-        [Display(Name = "不含税金额")]
-        public decimal AmountNoTax { get; set; }
-        /// <summary>
-        /// 采购价格不含税
-        /// </summary>
-        [Display(Name = "采购价格不含税")]
-        public decimal PurchasePriceNoTax { get; set; }
-        /// <summary>
-        /// 科目号
-        /// </summary>
-        [Display(Name = "科目号")]
-        public string AccountNum { get; set; }
-        /// <summary>
-        /// 物料代码
-        /// </summary>
-        [Display(Name = "物料代码")]
-        public string MaterialCode { get; set; }
-        /// <summary>
-        /// 物料描述
-        /// </summary>
-        [Display(Name = "物料描述")]
-        public string MaterialDesc { get; set; }
-        /// <summary>
-        /// 日期
-        /// </summary>
-        [Display(Name = "日期")]
-        public DateTime SpareDate { get; set; }
-        /// <summary>
-        /// 交货单号
-        /// </summary>
-        [Display(Name = "交货单号")]
-        public string DeliveryOrderNo { get; set; }
-        /// <summary>
-        /// 交货行号
-        /// </summary>
-        [Display(Name = "交货行号")]
-        public string DeliveryLineNum { get; set; }
-        /// <summary>
-        /// 批次号
-        /// </summary>
-        [Display(Name = "批次号")]
-        public string BatchNo { get; set; }
-        /// <summary>
-        /// 单位
-        /// </summary>
-        [Display(Name = "单位")]
-        public string Unit { get; set; }
-        /// <summary>
-        /// 税率
-        /// </summary>
-        [Display(Name = "税率")]
-        public decimal TaxRate { get; set; }
-        /// <summary>
-        /// 税码
-        /// </summary>
-        [Display(Name = "税码")]
-        public string TaxCode { get; set; }
-        /// <summary>
-        /// 德国发票号
-        /// </summary>
-        [Display(Name = "德国发票号")]
-        public string GermanInvoiceNo { get; set; }
-        /// <summary>
-        /// 工厂
-        /// </summary>
-        [Display(Name = "工厂")]
-        public string Factory { get; set; }
-        /// <summary>
-        /// 工厂名称
-        /// </summary>
-        [Display(Name = "工厂名称")]
-        public string FactoryName { get; set; }
-        /// <summary>
-        /// 备注
-        /// </summary>
-        [Display(Name = "备注")]
-        public string Extend { set; get; }
-
-
-
-    }
-}
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/VWSparePart/SparePartVersion.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/VWSparePart/SparePartVersion.cs
deleted file mode 100644
index ed1757cb..00000000
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/VWSparePart/SparePartVersion.cs
+++ /dev/null
@@ -1,47 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Win.Sfs.Shared.DomainBase;
-
-namespace Win.Sfs.SettleAccount.Entities.VWSparePart
-{
-    public class SparePartVersion : FullAuditedAggregateRootBase<Guid>, ISettleAccountEntityBase
-    {
-
-        public SparePartVersion()
-        { }
-
-        public string Year { get; private set; }
-        /// <summary>
-        /// 期间
-        /// </summary>
-        public string Period { get; private set; }
-        /// <summary>
-        /// 版本号
-        /// </summary>
-        public string Version { get; set; }
-
-        /// <summary>
-        /// 客户号
-        /// </summary>
-        public string CustomerCode { private set; get; }
-
-
-        public SparePartVersion(
-             Guid id,
-             Guid branchId,
-            string year, string period, string version, string customerCode) : base(id)
-        {
-            BranchId = branchId;
-            Year = year;
-            Period = period;
-            Version = version;
-            CustomerCode = customerCode;
-
-        }
-
-
-    }
-}
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/WMS-KanBan/WMSKanBanManager.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/WMS-KanBan/WMSKanBanManager.cs
deleted file mode 100644
index 169d875e..00000000
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/WMS-KanBan/WMSKanBanManager.cs
+++ /dev/null
@@ -1,31 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Volo.Abp.Domain.Services;
-
-namespace Win.Sfs.SettleAccount.Entities.WMS_KanBan
-{
-    public class WMSKanBanManager : DomainService
-    {
-        private readonly ISettleAccountBranchEfCoreRepository<WMSKanBanSettle, Guid> _repository;
-        private readonly ISettleAccountBranchEfCoreRepository<WMSKanBanVersion, Guid> _versionRepository;
-        public WMSKanBanManager(
-                    ISettleAccountBranchEfCoreRepository<WMSKanBanSettle, Guid> repository,
-                    ISettleAccountBranchEfCoreRepository<WMSKanBanVersion, Guid> versionRepository
-
-
-            )
-        {
-            _versionRepository = versionRepository;
-            _repository = repository;
-
-
-        }
-
-
-
-
-    }
-}
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/WMS-KanBan/WMSKanBanSettle.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/WMS-KanBan/WMSKanBanSettle.cs
deleted file mode 100644
index 0be2eae0..00000000
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/WMS-KanBan/WMSKanBanSettle.cs
+++ /dev/null
@@ -1,254 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Win.Sfs.Shared.DomainBase;
-
-namespace Win.Sfs.SettleAccount.Entities.WMS_KanBan
-{
-    public class WMSKanBanSettle : FullAuditedAggregateRootBase<Guid>, ISettleAccountEntityBase
-    {
-        public Guid Id { set; get; }
-        /// <summary>
-        /// 版本
-        /// </summary>
-        public string Version { set; get; }
-        /// <summary>
-        /// 看板条码号
-        /// </summary>
-        public string Kanban { set; get; }
-
-        /// <summary>
-        /// 入库关联号
-        /// </summary>
-
-        public string Relation { set; get; }
-        /// <summary>
-        /// 零件号
-        /// </summary>
-        public string MaterialCode { set; get; }
-        /// <summary>
-        /// 零件类型
-        /// </summary>
-        public string PartType { set; get; }
-      
-
-        /// <summary>
-        /// WMS交货单
-        /// </summary>
-        public string WMSDeliveryNote { set; get; }
-
-        /// <summary>
-        /// WMS实际发货日期
-        /// </summary>
-        public DateTime WMSActualGoodsDate { set; get; }
-
-        /// <summary>
-        /// WMS交货数量
-        /// </summary>
-        public decimal WMSDeliveryQty { set; get; }
-
-        /// <summary>
-        /// 出库单号
-        /// </summary>
-        public string DeliveryOrderNo { set; get; }
-
-
-
-        public void SetValue(Guid guid, string version)
-        {
-            Id = guid;
-            Version = version;
-        }
-        public WMSKanBanSettle()
-        { }
-        public WMSKanBanSettle(
-            Guid id,
-            Guid branchId,
-            string version,
-            string kanban,
-            string relation,
-            string materialCode,
-            string partType,
-            Guid guid) : base(id)
-        {
-            BranchId = branchId;
-            Version = version;
-            Kanban = kanban;
-            Relation = relation;
-            MaterialCode = materialCode;
-            PartType = partType;
-            CreatorId = guid;
-        }
-
-
-
-
-
-    }
-    //public class WMSKanBanSettle : FullAuditedAggregateRootBase<Guid>, ISettleAccountEntityBase
-    //{
-    //    /// <summary>
-    //    ///年度
-    //    /// </summary>
-    //    public string Year { get; protected set; }
-
-    //    /// <summary>
-    //    /// 期间
-    //    /// </summary>
-    //    public string Period { set; get; }
-
-    //    /// <summary>
-    //    /// 版本
-    //    /// </summary>
-    //    public string Version { set; get; }
-    //    /// <summary>
-    //    /// 看板条码号
-    //    /// </summary>
-    //    public string Kanban { set; get; }
-
-    //    /// <summary>
-    //    /// 入库关联号
-    //    /// </summary>
-
-    //    public string Relation { set; get; }
-    //    /// <summary>
-    //    /// 工厂
-    //    /// </summary>
-    //    public string Factory { set; get; }
-    //    /// <summary>
-    //    /// 零件号
-    //    /// </summary>
-    //    public string MaterialCode { set; get; }
-    //    /// <summary>
-    //    /// 零件类型
-    //    /// </summary>
-    //    public string PartType { set; get; }
-    //    /// <summary>
-    //    /// 供应商编码
-    //    /// </summary>
-    //    public string SupplierCode { set; get; }
-    //    /// <summary>
-    //    /// R3入库时间
-    //    /// </summary>
-    //    public DateTime SettleInputDate { set; get; }
-
-
-    //    /// <summary>
-    //    /// 批次
-    //    /// </summary>
-    //    public string Batch { set; get; }
-
-
-    //    /// <summary>
-    //    /// 入库结算标识
-    //    /// </summary>
-    //    public string Flag { set; get; }
-    //    /// <summary>
-    //    /// 数量
-    //    /// </summary>
-    //    public decimal Qty { set; get; }
-
-
-    //    /// <summary>
-    //    /// R3结算时间 
-    //    /// </summary>
-    //    public DateTime SettleDate { set; get; }
-    //    /// <summary>
-    //    /// 结算状态
-    //    /// </summary>
-    //    public string State { set; get; }
-
-
-    //    /// <summary>
-    //    /// WMS交货单
-    //    /// </summary>
-    //    public string WMSDeliveryNote { set; get; }
-
-    //    /// <summary>
-    //    /// WMS实际发货日期
-    //    /// </summary>
-    //    public string WMSActualGoodsDate { set; get; }
-
-    //    /// <summary>
-    //    /// WMS交货数量
-    //    /// </summary>
-    //    public decimal WMSDeliveryQty { set; get; }
-
-    //    /// <summary>
-    //    /// WMS发货状态
-    //    /// </summary>
-    //    public string WMSDeliverGoodsState { set; get; }
-
-    //    /// <summary>
-    //    /// 看板结算状态
-    //    /// </summary>
-    //    public string WMSKanBanState { set; get; }
-
-    //    /// <summary>
-    //    /// 出库单号
-    //    /// </summary>
-    //    public string DeliveryOrderNo { set; get; }
-
-    //    /// <summary>
-    //    /// 备注
-    //    /// </summary>
-
-    //    public string Extend { set; get; }
-
-
-    //    public void SetValue(Guid guid, string year, string peroid, string version)
-    //    {
-    //        Period = peroid;
-    //        Year = year;
-    //        Id = guid;
-    //        Version = version;
-    //    }
-    //    public WMSKanBanSettle()
-    //    { }
-    //    public WMSKanBanSettle(
-    //        Guid id,
-    //        Guid branchId,
-    //        string year,
-    //        string version,
-    //        string kanban,
-    //        string relation,
-    //        string factory,
-    //        string materialCode,
-    //        string partType,
-    //        DateTime settleInputDate,
-    //        string supplierCode,
-    //        decimal qty,
-    //        string batch,
-    //        string flag,
-    //        DateTime settleDate,
-    //        string state,
-    //        //DateTime creationTime,
-    //        Guid guid) : base(id)
-    //    {
-    //        BranchId = branchId;
-    //        Year = year;
-    //        Version = version;
-    //        Kanban = kanban;
-    //        Relation = relation;
-    //        Factory = factory;
-    //        MaterialCode = materialCode;
-    //        PartType = partType;
-    //        SettleInputDate = settleInputDate;
-    //        SupplierCode = supplierCode;
-    //        Qty = qty;
-    //        Batch = batch;
-    //        Flag = flag;
-    //        SettleDate = settleDate;
-    //        State = state;
-    //        //CreationTime = creationTime;
-    //        CreatorId = guid;
-    //    }
-
-
-
-
-
-    //}
-}
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/WMS-KanBan/WMSKanBanVersion.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/WMS-KanBan/WMSKanBanVersion.cs
deleted file mode 100644
index 84b4f406..00000000
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/WMS-KanBan/WMSKanBanVersion.cs
+++ /dev/null
@@ -1,47 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Win.Sfs.Shared.DomainBase;
-
-namespace Win.Sfs.SettleAccount.Entities.WMS_KanBan
-{
-    public class WMSKanBanVersion : FullAuditedAggregateRootBase<Guid>, ISettleAccountEntityBase
-    {
-
-        public WMSKanBanVersion()
-        { }
-
-        public string Year { get; private set; }
-        /// <summary>
-        /// 期间
-        /// </summary>
-        public string Period { get; private set; }
-        /// <summary>
-        /// 版本号
-        /// </summary>
-        public string Version { get; set; }
-
-        /// <summary>
-        /// 客户号
-        /// </summary>
-        public string CustomerCode { private set; get; }
-
-
-        public WMSKanBanVersion(
-             Guid id,
-             Guid branchId,
-            string year, string period, string version, string customerCode) : base(id)
-        {
-            BranchId = branchId;
-            Year = year;
-            Period = period;
-            Version = version;
-            CustomerCode = customerCode;
-
-        }
-
-
-    }
-}
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/WMS-KanBan/WmsKanban.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/WMS-KanBan/WmsKanban.cs
deleted file mode 100644
index 2462194e..00000000
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/WMS-KanBan/WmsKanban.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Win.Sfs.Shared.DomainBase;
-
-namespace Win.Sfs.SettleAccount.Entities.WMS_KanBan
-{
-    public class WmsKanban: FullAuditedAggregateRootBase<Guid>
-    {
-       
-        /// <summary>
-        /// 实际发货日期
-        /// </summary>
-        public DateTime BeginTime { set; get; }
-
-        /// <summary>
-        /// 
-        /// </summary>
-        public string Version { set; get; }
-        /// <summary>
-        /// 零件号
-        /// </summary>
-        public string MaterialCode { set; get; }
-
-        /// <summary>
-        /// 用量
-        /// </summary>
-        public decimal Qty { set; get; }
-
-    }
-}
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/WMS-SparePart/WMSSparePart.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/WMS-SparePart/WMSSparePart.cs
deleted file mode 100644
index bb3cb651..00000000
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/WMS-SparePart/WMSSparePart.cs
+++ /dev/null
@@ -1,308 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Win.Sfs.Shared.DomainBase;
-
-namespace Win.Sfs.SettleAccount.Entities.WMS_SparePart
-{
-    public class WMSSparePart : FullAuditedAggregateRootBase<Guid>, ISettleAccountEntityBase
-    {
-        public WMSSparePart()
-        { }
-
-        public void SetValue(Guid guid, Guid branchId, string year, string peroid, string version)
-        {
-            //Period = peroid;
-            //Year = year;
-            Id = guid;
-            Version = version;
-            BranchId = branchId;
-        }
-        public WMSSparePart(Guid Id, string year, string period, string version, string lineNumber,
-            string purchaseType, string purchaseOrderNo, string purchaseOrderNoItem, string purchaseOrderNoText,
-            decimal receiptQty, decimal invoicedQty, decimal amountNoTax, decimal purchasePriceNoTax,
-            string accountNum, string materialCode, string materialDesc, DateTime spareDate, string deliveryOrderNo,
-            string deliveryLineNum, string batchNo, string unit, decimal taxRate, string taxCode, string factory
-
-            ) : base(Id)
-        {
-            Version = version;
-            ReceiptQty = receiptQty;
-            MaterialCode = materialCode;
-            MaterialDesc = materialDesc;
-            SpareDate = spareDate;
-        }
-
-        /// <summary>
-        /// 版本号
-        /// </summary>
-        [Display(Name = "版本号")]
-        public string Version { set; get; }
-
-
-
-        /// <summary>
-        /// SAP物料号
-        /// </summary>
-        [Display(Name = "SAP物料号")]
-        public string SapCode { get; set; }
-
-
-        /// <summary>
-        /// 主机厂
-        /// </summary>
-        [Display(Name = "主机厂")]
-        public string MainFactory { get; set; }
-
-        /// <summary>
-        /// 车型
-        /// </summary>
-        [Display(Name = "车型")]
-        public string MaterialGroup { get; set; }
-
-
-        /// <summary>
-        /// 物料代码-零件号
-        /// </summary>
-        [Display(Name = "物料代码")]
-        public string MaterialCode { get; set; }
-        /// <summary>
-        /// 物料描述-存货名称
-        /// </summary>
-        [Display(Name = "物料描述")]
-        public string MaterialDesc { get; set; }
-
-        /// <summary>
-        /// 发货数量 
-        /// </summary>
-        [Display(Name = "发货数量")]
-        public decimal ReceiptQty { get; set; }
-
-        /// <summary>
-        /// 订单号
-        /// </summary>
-        [Display(Name = "订单号")]
-        public string PurchaseOrderNo { get; set; }
-
-        /// <summary>
-        /// 交货单号
-        /// </summary>
-        [Display(Name = "交货单号")]
-        public string WMSDeliveryNote { set; get; }
-
-        /// <summary>
-        /// 交货日期
-        /// </summary>
-        [Display(Name = "交货日期")]
-        public DateTime SpareDate { get; set; }
-
-
-    }
-    //public class WMSSparePart : FullAuditedAggregateRootBase<Guid>, ISettleAccountEntityBase
-    //{
-    //    public WMSSparePart()
-    //    { }
-
-    //    public void SetValue(Guid guid, Guid branchId, string year, string peroid, string version)
-    //    {
-    //        Period = peroid;
-    //        Year = year;
-    //        Id = guid;
-    //        Version = version;
-    //        BranchId = branchId;
-    //    }
-    //    public WMSSparePart(Guid Id, string year, string period, string version, string lineNumber,
-    //        string purchaseType, string purchaseOrderNo, string purchaseOrderNoItem, string purchaseOrderNoText,
-    //        decimal receiptQty, decimal invoicedQty, decimal amountNoTax, decimal purchasePriceNoTax,
-    //        string accountNum, string materialCode, string materialDesc, DateTime spareDate, string deliveryOrderNo,
-    //        string deliveryLineNum, string batchNo, string unit, decimal taxRate, string taxCode, string factory
-
-    //        ) : base(Id)
-    //    {
-    //        Year = year;
-    //        Period = period;
-    //        Version = version;
-    //        LineNumber = lineNumber;
-    //        PurchaseType = purchaseType;
-    //        PurchaseOrderNo = purchaseOrderNo;
-    //        PurchaseOrderNoItem = purchaseOrderNoItem;
-    //        PurchaseOrderNoText = purchaseOrderNoText;
-    //        ReceiptQty = receiptQty;
-    //        InvoicedQty = invoicedQty;
-    //        AmountNoTax = amountNoTax;
-    //        PurchasePriceNoTax = purchasePriceNoTax;
-    //        AccountNum = accountNum;
-    //        MaterialCode = materialCode;
-    //        MaterialDesc = materialDesc;
-    //        SpareDate = spareDate;
-    //        DeliveryOrderNo = deliveryOrderNo;
-    //        DeliveryLineNum = deliveryLineNum;
-    //        BatchNo = batchNo;
-    //        Unit = unit;
-    //        TaxRate = taxRate;
-    //        TaxCode = taxCode;
-    //        Factory = factory;
-    //    }
-
-    //    //行号	采购类型	采购订单号	采购订单行项目	采购订单文本	收货数量	开票数量	不含税金额	采购价格不含税
-    //    //科目号	物料代码	物料描述	日期	交货单号	交货行号	批次号	单位	税率	税码	
-    //    //德国发票号	AP_REQUISITION_MIMRS.GERMANY_INVOCE_AMOUNT	借贷	PO币种	工厂	工厂名称	BM 单号	
-
-    //    /// <summary>
-    //    ///年
-    //    /// </summary>
-    //    [Display(Name = "年")]
-    //    public string Year { get; set; }
-    //    /// <summary>
-    //    /// 期间
-    //    /// </summary>
-    //    [Display(Name = "交货日期")]
-    //    public string Period { set; get; }
-    //    /// <summary>
-    //    /// 版本号
-    //    /// </summary>
-    //    [Display(Name = "版本号")]
-    //    public string Version { set; get; }
-
-    //    /// <summary>
-    //    /// 行号
-    //    /// </summary>
-    //    [Display(Name = "行号")]
-    //    public string LineNumber { set; get; }
-
-
-    //    /// <summary>
-    //    /// 采购类型
-    //    /// </summary>
-    //    [Display(Name = "采购类型")]
-    //    public string PurchaseType { get; set; }
-
-    //    /// <summary>
-    //    /// 采购订单号
-    //    /// </summary>
-    //    [Display(Name = "采购订单号")]
-    //    public string PurchaseOrderNo { get; set; }
-    //    /// <summary>
-    //    /// 采购订单行项目
-    //    /// </summary>
-    //    [Display(Name = "采购订单行项目")]
-    //    public string PurchaseOrderNoItem { get; set; }
-    //    /// <summary>
-    //    /// 采购订单文本
-    //    /// </summary>
-    //    [Display(Name = "采购订单文本")]
-    //    public string PurchaseOrderNoText { get; set; }
-    //    /// <summary>
-    //    /// 收货数量
-    //    /// </summary>
-    //    [Display(Name = "发货数量")]
-    //    public decimal ReceiptQty { get; set; }
-
-    //    /// <summary>
-    //    /// 开票数量
-    //    /// </summary>
-    //    [Display(Name = "开票数量")]
-    //    public decimal InvoicedQty { get; set; }
-    //    /// <summary>
-    //    /// 不含税金额
-    //    /// </summary>
-    //    [Display(Name = "不含税金额")]
-    //    public decimal AmountNoTax { get; set; }
-    //    /// <summary>
-    //    /// 采购价格不含税
-    //    /// </summary>
-    //    [Display(Name = "采购价格不含税")]
-    //    public decimal PurchasePriceNoTax { get; set; }
-    //    /// <summary>
-    //    /// 科目号
-    //    /// </summary>
-    //    [Display(Name = "科目号")]
-    //    public string AccountNum { get; set; }
-    //    /// <summary>
-    //    /// 物料代码
-    //    /// </summary>
-    //    [Display(Name = "物料代码")]
-    //    public string MaterialCode { get; set; }
-    //    /// <summary>
-    //    /// 物料描述
-    //    /// </summary>
-    //    [Display(Name = "物料描述")]
-    //    public string MaterialDesc { get; set; }
-    //    /// <summary>
-    //    /// 日期
-    //    /// </summary>
-    //    [Display(Name = "订单日期")]
-    //    public DateTime SpareDate { get; set; }
-    //    /// <summary>
-    //    /// 交货单号
-    //    /// </summary>
-    //    [Display(Name = "交货单号")]
-    //    public string DeliveryOrderNo { get; set; }
-    //    /// <summary>
-    //    /// 交货行号
-    //    /// </summary>
-    //    [Display(Name = "交货行号")]
-    //    public string DeliveryLineNum { get; set; }
-    //    /// <summary>
-    //    /// 批次号
-    //    /// </summary>
-    //    [Display(Name = "批次号")]
-    //    public string BatchNo { get; set; }
-    //    /// <summary>
-    //    /// 单位
-    //    /// </summary>
-    //    [Display(Name = "单位")]
-    //    public string Unit { get; set; }
-    //    /// <summary>
-    //    /// 税率
-    //    /// </summary>
-    //    [Display(Name = "税率")]
-    //    public decimal TaxRate { get; set; }
-    //    /// <summary>
-    //    /// 税码
-    //    /// </summary>
-    //    [Display(Name = "税码")]
-    //    public string TaxCode { get; set; }
-    //    /// <summary>
-    //    /// 德国发票号
-    //    /// </summary>
-    //    [Display(Name = "德国发票号")]
-    //    public string GermanInvoiceNo { get; set; }
-    //    /// <summary>
-    //    /// 工厂
-    //    /// </summary>
-    //    [Display(Name = "工厂")]
-    //    public string Factory { get; set; }
-    //    /// <summary>
-    //    /// 工厂名称
-    //    /// </summary>
-    //    [Display(Name = "工厂名称")]
-    //    public string FactoryName { get; set; }
-    //    /// <summary>
-    //    /// 备注
-    //    /// </summary>
-    //    [Display(Name = "备注")]
-    //    public string Extend { set; get; }
-
-    //    /// <summary>
-    //    /// WMS采购订单号
-    //    /// </summary>
-    //    public string WMSDeliveryNote { set; get; }
-
-    //    /// <summary>
-    //    /// WMS发货状态
-    //    /// </summary>
-    //    public string WMSDeliverGoodsState { set; get; }
-
-    //    /// <summary>
-    //    /// 看板结算状态
-    //    /// </summary>
-    //    public string WMSSparePartState { set; get; }
-
-
-
-    //}
-}
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/WMS-SparePart/WMSSparePartVersion.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/WMS-SparePart/WMSSparePartVersion.cs
deleted file mode 100644
index 8c96e797..00000000
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/WMS-SparePart/WMSSparePartVersion.cs
+++ /dev/null
@@ -1,47 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Win.Sfs.Shared.DomainBase;
-
-namespace Win.Sfs.SettleAccount.Entities.WMS_SparePart
-{
-    public class WMSSparePartVersion : FullAuditedAggregateRootBase<Guid>, ISettleAccountEntityBase
-    {
-
-        public WMSSparePartVersion()
-        { }
-
-        public string Year { get; private set; }
-        /// <summary>
-        /// 期间
-        /// </summary>
-        public string Period { get; private set; }
-        /// <summary>
-        /// 版本号
-        /// </summary>
-        public string Version { get; set; }
-
-        /// <summary>
-        /// 客户号
-        /// </summary>
-        public string CustomerCode { private set; get; }
-
-
-        public WMSSparePartVersion(
-             Guid id,
-             Guid branchId,
-            string year, string period, string version, string customerCode) : base(id)
-        {
-            BranchId = branchId;
-            Year = year;
-            Period = period;
-            Version = version;
-            CustomerCode = customerCode;
-
-        }
-
-
-    }
-}
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/WMS/TB_BILL.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/WMS/TB_BILL.cs
deleted file mode 100644
index 5b599697..00000000
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/WMS/TB_BILL.cs
+++ /dev/null
@@ -1,133 +0,0 @@
-using System;
-using System.ComponentModel;
-using System.ComponentModel.DataAnnotations;
-using System.ComponentModel.DataAnnotations.Schema;
-using Magicodes.ExporterAndImporter.Core;
-using Volo.Abp.Domain.Entities;
-
-namespace WY.NewJit.Extends.PaiGe.WMS
-{
-    public partial class TB_BILL:IEntity
-    {
-        [DatabaseGenerated(DatabaseGeneratedOption.Computed)]
-        [Display(AutoGenerateField = false)]
-        [ScaffoldColumn(false)]
-        public int UID { get; set; }
-
-        [Key]
-        [StringLength(50)]
-
-        [DisplayName("单据编号")]
-        [ExporterHeader(DisplayName = "单据编号")]
-        [ImporterHeader(Name = "单据编号")]
-        public string BillNum { get; set; } = "";
-
-        public int State { get; set; }
-
-        [DisplayName("原始单据")]
-        [ExporterHeader(DisplayName = "原始单据")]
-        public string SourceBillNum { get; set; } = "";
-
-        //[StringLength(50)]
-        [DisplayName("原始单据2")]
-        [ExporterHeader(DisplayName = "原始单据2")]
-        public string SourceBillNum2 { get; set; } = "";
-
-        //[StringLength(50)]
-        [DisplayName("原始单据3")]
-        [ExporterHeader(DisplayName = "原始单据3")]
-        public string SourceBillNum3 { get; set; } = "";
-
-        [DisplayName("单据类型")]
-        [ExporterHeader(DisplayName = "单据类型")]
-        [NotMapped]
-        public string BillType { get; set; }
-
-        [DisplayName("单据子类型")]
-        [ExporterHeader(DisplayName = "单据子类型")]
-        [NotMapped]
-        public string SubBillType { get; set; }
-
-        [DisplayName("单据时间")]
-        [ExporterHeader(DisplayName = "单据时间")]
-        public DateTime BillTime { get; set; }
-
-        [StringLength(50)]
-        [DisplayName("开始时间")]
-        [ExporterHeader(DisplayName = "开始时间")]
-        public string StartTime { get; set; }
-
-        [StringLength(50)]
-        [DisplayName("结束时间")]
-        [ExporterHeader(DisplayName = "结束时间")]
-        public string FinishTime { get; set; }
-
-        [Required(AllowEmptyStrings = true)]
-        [StringLength(50)]
-        [DisplayName("操作员")]
-        [ExporterHeader(DisplayName = "操作员")]
-        public string OperName { get; set; }
-
-        [DisplayName("明细数量")]
-        [ExporterHeader(DisplayName = "明细数量")]
-        public int DetailQty { get; set; }
-
-        [StringLength(50)]
-        [DisplayName("供应商编号")]
-        [ExporterHeader(DisplayName = "供应商编号")]
-        public string VendId { get; set; }
-
-        [StringLength(50)]
-        [DisplayName("客户编号")]
-        [ExporterHeader(DisplayName = "客户编号")]
-        public string CustId { get; set; }
-
-        [StringLength(50)]
-        [DisplayName("项目编号")]
-        [ExporterHeader(DisplayName = "项目编号")]
-        public string ProjectId { get; set; }
-
-        [StringLength(50)]
-        [DisplayName("运输方式")]
-        [ExporterHeader(DisplayName = "运输方式")]
-        public string TransportType { get; set; }
-
-        [StringLength(50)]
-        [DisplayName("车牌号")]
-        [ExporterHeader(DisplayName = "运输方式")]
-        public string TruckNum { get; set; }
-
-        [StringLength(50)]
-        [DisplayName("到货门编号")]
-        [ExporterHeader(DisplayName = "到货门编号")]
-        public string GateCode { get; set; }
-
-        [StringLength(50)]
-        [DisplayName("到货门名称")]
-        [ExporterHeader(DisplayName = "到货门名称")]
-        public string GateName { get; set; }
-
-        //[StringLength(50)]
-        [DisplayName("到货口编号")]
-        [ExporterHeader(DisplayName = "到货口编号")]
-        public string DockCode { get; set; }
-
-        [DisplayName("备注")]
-        [ExporterHeader(DisplayName = "备注")]
-        public string Remark { get; set; }
-
-        public DateTime? AccountDate { get; set; }
-
-
-        public Guid GUID { get; set; } = Guid.NewGuid();
-
-        public TB_BILL()
-        {
-        }
-
-        public object[] GetKeys()
-        {
-            throw new NotImplementedException();
-        }
-    }
-}
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/WMS/TS_SORT_DETAIL.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/WMS/TS_SORT_DETAIL.cs
deleted file mode 100644
index b76a0a46..00000000
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/WMS/TS_SORT_DETAIL.cs
+++ /dev/null
@@ -1,105 +0,0 @@
-using System;
-using System.ComponentModel;
-using System.ComponentModel.DataAnnotations;
-using System.ComponentModel.DataAnnotations.Schema;
-
-namespace ChangKeTec.Wms.Models.Wms
-{
-    public partial class TS_SORT_DETAIL
-    {
-        
-        [DatabaseGenerated(DatabaseGeneratedOption.Computed)]
-        public long UID { get; set; }
-
-        [Key]
-        [Column(Order = 0)]
-        [StringLength(50)]
-        [DisplayName("单据编号")]
-        public string BillNum { get; set; }
-
-        [DisplayName("行号")]
-        public int LineNum { get; set; }
-
-        [Key]
-        [Column(Order = 1)]
-        [StringLength(50)]
-        [DisplayName("VIN码")]
-        public string VinCode { get; set; }
-
-        [Required(AllowEmptyStrings = true)]
-        [StringLength(50)]
-        [DisplayName("顺序号")]
-        public string SeqNum { get; set; }
-
-        /// <summary>
-        /// SAP物料号
-        /// </summary>
-        [Key]
-        [Column(Order = 2)]
-        [StringLength(50)]
-        [DisplayName("物料号")]
-        public string PartCode { get; set; }
-
-        [DisplayName("箱码")]
-        public string BarCode { get; set; }
-
-        [StringLength(50)]
-        [DisplayName("客户物料号")]
-        public string CustPartCode { get; set; }
-
-
-        [Required(AllowEmptyStrings = true)]
-        [StringLength(50)]
-        [DisplayName("项目编号")]
-        public string ProjectId { get; set; }
-
-        [StringLength(50)]
-        [DisplayName("FYON NUMBER")]
-        public string FyonNum { get; set; }
-
-        [StringLength(50)]
-        [DisplayName("SUPPLIER")]
-        public string VendId { get; set; }
-
-        [StringLength(50)]
-        [DisplayName("DOCK")]
-        public string Dock { get; set; }
-
-        [StringLength(50)]
-        [DisplayName("DISPATCH DATE")]
-        public string DispatchDate { get; set; }
-
-        [Required(AllowEmptyStrings = true)]
-        [StringLength(50)]
-        [DisplayName("状态")]
-        public string State { get; set; }
-
-        [StringLength(200)]
-        [DisplayName("备注")]
-        public string Remark { get; set; }
-
-        [Column(TypeName = "money")]
-        [DisplayName("计划数量")]
-        public decimal PlanQty { get; set; } = 0;
-
-        [Column(TypeName = "money")]
-        [DisplayName("发货数量")]
-        public decimal Qty { get; set; } = 0;
-
-        [StringLength(200)]
-        [DisplayName("客户条码")]
-        public string CustBarCode { get; set; } = string.Empty;
-
-        [Column(TypeName = "money")]
-        [DisplayName("回执数量")]
-        public decimal ReceiptQty { get; set; } = 0;
-
-        [StringLength(200)]
-        [DisplayName("箱码(Full)")]
-        public string FullBarCode { get; set; } = string.Empty;
-
-        [NotMapped]
-        public string PartGroup { get; set; }
-
-    }
-}
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/WMS/TaskList.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/WMS/TaskList.cs
deleted file mode 100644
index dccb6322..00000000
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/WMS/TaskList.cs
+++ /dev/null
@@ -1,2613 +0,0 @@
-using Magicodes.ExporterAndImporter.Core;
-using Magicodes.ExporterAndImporter.Excel;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Win.Sfs.Shared.DomainBase;
-
-namespace Win.Sfs.SettleAccount.Entities.WMS
-{
-    public partial class TS_UNI_API: FullAuditedAggregateRootBase<Guid>
-    {
-        public TS_UNI_API(Guid guid ,string interfaceType, string version, string tableName, string sourceBillNum, int wmsState, int settleAccountState, Guid taskId)
-        {
-            InterfaceType = interfaceType;
-            Version = version;
-            TableName = tableName;
-            SourceBillNum = sourceBillNum;
-            WmsState = wmsState;
-            SettleAccountState = settleAccountState;
-            TaskId = taskId;
-        }
-        /// <summary>
-        /// 接口类型
-        /// </summary>
-        public string InterfaceType { get; set; }
-        /// <summary>
-        /// 版本号
-        /// </summary>
-        public string Version { get; set; }
-        /// <summary>
-        /// 表明
-        /// </summary>
-        public string TableName { get; set; }
-
-        /// <summary>
-        /// 原单据号
-        /// </summary>
-        public string SourceBillNum { get; set; }
-
-        /// <summary>
-        /// 状态
-        /// </summary>
-        public int WmsState { set; get; }
-        /// <summary>
-        /// 状态
-        /// </summary>
-        public int SettleAccountState { set; get; }
-
-        /// <summary>
-        /// 状态
-        /// </summary>
-        public Guid TaskId { set; get; }
-
-
-    }
-
-
-    #region 客户代码
-
-    public class WmsCustomerKanbanOutPut : FullAuditedAggregateRootBase<Guid>
-    {
-        public WmsCustomerKanbanOutPut()
-        {
-        }
-
-        public WmsCustomerKanbanOutPut(Guid id, string version, string billNum, string creator,string customercode,string content) : base(id)
-        {
-            Id = id;
-            Version = version;
-            BillNum = billNum;
-            Creator = creator;
-            CustomerCode = customercode;
-            SumContent = content;
-        }
-
-        public string Version { set; get; }
-        public string BillNum { set; get; }
-        public string Creator { set; get; }
-        public string CustomerCode { set; get; }
-
-        public string SumContent { set; get; }
-    }
-
-
-    /// <summary>
-    /// H平台出库单
-    /// </summary>
-    public class WmsCustomerKanbanOutPutDetial : FullAuditedAggregateRootBase<Guid>
-    {
-        public WmsCustomerKanbanOutPutDetial()
-        {
-        }
-
-        public WmsCustomerKanbanOutPutDetial(Guid id, string wmsBillNum, string kanban, string sapmaterialCode, string materialDesc, string materialGroup,
-            string outPut, string inPut, int state, string extend1, string extend2, string extend3, string materialCode, string billNum,
-            Guid taskId, string remark, decimal qty, decimal price, decimal amt,string customerCode)
-        {
-            Id = id;
-            WmsBillNum = wmsBillNum;
-            Kanban = kanban;
-            SapMaterialCode = sapmaterialCode;
-            MaterialDesc = materialDesc;
-            MaterialGroup = materialGroup;
-            OutPut = outPut;
-            InPut = inPut;
-            State = state;
-            Extend1 = extend1;
-            Extend2 = extend2;
-            Version = extend3;
-            MaterialCode = materialCode;
-            BillNum = billNum;
-            TaskId = taskId;
-            Remark = remark;
-            Qty = qty;
-         
-            Price = price;
-            Amt = amt;
-            CustomerCode = customerCode;
-        }
-        public void SetData(Guid id, string remark, string wmsbillnum, string version, Guid taskId,string customerCode)
-        {
-            Id = id;
-            Remark = remark;
-            WmsBillNum = wmsbillnum;
-            Version = version;
-            TaskId = taskId;
-            CustomerCode = customerCode;
-        }
-
-
-        [ImporterHeader(Name = "客户编码")]
-        [ExporterHeader(DisplayName = "客户编码")]
-        public string  CustomerCode { set; get; }
-
-        [ImporterHeader(Name = "看板编号")]
-        [ExporterHeader(DisplayName = "看板编号")]
-        //KENN号
-        public string Kanban { set; get; }
-
-        [ImporterHeader(Name = "客户零件号", IsIgnore = true)]
-        [ExporterHeader(DisplayName = "客户零件号", IsIgnore = true)]
-        public string MaterialCode { set; get; }
-        [ImporterHeader(Name = "交货单号")]
-        [ExporterHeader(DisplayName = "交货单号")]
-        public string WmsBillNum { set; get; }
-        //[ImporterHeader(Name = "订货看板编号")]
-        ////KENN号
-        //public string OrderBillNum { set; get; }
-        [ImporterHeader(Name = "SAP零件号")]
-        [ExporterHeader(DisplayName = "SAP零件号")]
-        //物料号
-        public string SapMaterialCode { set; get; }
-        [ImporterHeader(Name = "零件中文名称")]
-        [ExporterHeader(DisplayName = "零件中文名称")]
-        //物料描述
-        public string MaterialDesc { set; get; }
-        [ImporterHeader(Name = "物料组(车型)")]
-        [ExporterHeader(DisplayName = "物料组(车型)")]
-        //物料组(车型)  
-        public string MaterialGroup { set; get; }
-        [ImporterHeader(Name = "出库库位", IsIgnore = true)]
-        [ExporterHeader(DisplayName = "出库库位", IsIgnore = true)]
-        //出库库位
-        public string OutPut { set; get; }
-        [ImporterHeader(Name = "入库库位", IsIgnore = true)]
-        [ExporterHeader(DisplayName = "入库库位", IsIgnore = true)]
-        //入库库位
-        public string InPut { set; get; }
-        [ImporterHeader(Name = "状态", IsIgnore = true)]
-        [ExporterHeader(DisplayName = "状态", IsIgnore = true)]
-        public int State { get; set; }
-        [ImporterHeader(Name = "发货零件号",IsIgnore =true)]
-        [ExporterHeader(DisplayName = "发货零件号",IsIgnore =true)]
-        /// <summary>
-        /// 扩展字段1
-        /// </summary>
-        public string Extend1 { set; get; }
-      
-        [ImporterHeader(Name = "收货仓库", IsIgnore = true)]
-        [ExporterHeader(DisplayName = "收货仓库", IsIgnore = true)]
-        public string Extend2 { set; get; }
-        /// <summary>
-        /// 扩展字段3
-        /// </summary>
-        [ImporterHeader(Name = "版本号", IsIgnore = true)]
-        [ExporterHeader(DisplayName = "版本号", IsIgnore = true)]
-        public string Version { set; get; }
-        [ImporterHeader(Name = "结算数量")]
-        [ExporterHeader(DisplayName = "结算数量")]
-        public decimal Qty { set; get; }
-        [ImporterHeader(Name = "结算单价")]
-        [ExporterHeader(DisplayName = "结算单价")]
-        public decimal Price { set; get; }
-        [ImporterHeader(Name = "结算金额")]
-        [ExporterHeader(DisplayName = "结算金额")]
-        public decimal Amt { set; get; }
-        [ImporterHeader(Name = "数量", IsIgnore = true)]
-        [ExporterHeader(DisplayName = "数量", IsIgnore = true)]
-        public string BillNum { set; get; }
-        [ImporterHeader(Name = "任务描述", IsIgnore = true)]
-        [ExporterHeader(DisplayName = "任务描述", IsIgnore = true)]
-        public Guid TaskId { set; get; }
-
-
-
-    }
-
-
-    /// <summary>
-    /// 根据ＤＴＯ自动生成模板，供前端下载模板用
-    /// </summary>
-    public class WmsCustomerKanbanOutPutDetialDTO
-    {
-        public WmsCustomerKanbanOutPutDetialDTO()
-        {
-        }
-
-        [ImporterHeader(Name = "客户编码")]
-        [ExporterHeader(DisplayName = "客户编码")]
-        public string CustomerCode { set; get; }
-
-        [ImporterHeader(Name = "看板编号")]
-        [ExporterHeader(DisplayName = "看板编号")]
-        //KENN号
-        public string Kanban { set; get; }
-
-        [ImporterHeader(Name = "客户零件号", IsIgnore = true)]
-        [ExporterHeader(DisplayName = "客户零件号", IsIgnore = true)]
-        public string MaterialCode { set; get; }
-        [ImporterHeader(Name = "交货单号", IsIgnore = true)]
-        [ExporterHeader(DisplayName = "交货单号", IsIgnore = true)]
-        public string WmsBillNum { set; get; }
-        //[ImporterHeader(Name = "订货看板编号")]
-        ////KENN号
-        //public string OrderBillNum { set; get; }
-        [ImporterHeader(Name = "SAP零件号")]
-        [ExporterHeader(DisplayName = "SAP零件号")]
-        //物料号
-        public string SapMaterialCode { set; get; }
-        [ImporterHeader(Name = "零件中文名称")]
-        [ExporterHeader(DisplayName = "零件中文名称")]
-        //物料描述
-        public string MaterialDesc { set; get; }
-        [ImporterHeader(Name = "物料组(车型)", IsIgnore = true)]
-        [ExporterHeader(DisplayName = "物料组(车型)", IsIgnore = true)]
-        //物料组(车型)  
-        public string MaterialGroup { set; get; }
-        [ImporterHeader(Name = "出库库位", IsIgnore = true)]
-        [ExporterHeader(DisplayName = "出库库位", IsIgnore = true)]
-        //出库库位
-        public string OutPut { set; get; }
-        [ImporterHeader(Name = "入库库位", IsIgnore = true)]
-        [ExporterHeader(DisplayName = "入库库位", IsIgnore = true)]
-        //入库库位
-        public string InPut { set; get; }
-        [ImporterHeader(Name = "状态", IsIgnore = true)]
-        [ExporterHeader(DisplayName = "状态", IsIgnore = true)]
-        public int State { get; set; }
-        [ImporterHeader(Name = "发货零件号", IsIgnore = true)]
-        [ExporterHeader(DisplayName = "发货零件号", IsIgnore = true)]
-        /// <summary>
-        /// 扩展字段1
-        /// </summary>
-        public string Extend1 { set; get; }
-
-        [ImporterHeader(Name = "收货仓库", IsIgnore = true)]
-        [ExporterHeader(DisplayName = "收货仓库", IsIgnore = true)]
-        public string Extend2 { set; get; }
-        /// <summary>
-        /// 扩展字段3
-        /// </summary>
-        [ImporterHeader(Name = "版本号", IsIgnore = true)]
-        [ExporterHeader(DisplayName = "版本号", IsIgnore = true)]
-        public string Version { set; get; }
-        [ImporterHeader(Name = "结算数量")]
-        [ExporterHeader(DisplayName = "结算数量")]
-        public decimal Qty { set; get; }
-        [ImporterHeader(Name = "结算单价")]
-        [ExporterHeader(DisplayName = "结算单价")]
-        public decimal Price { set; get; }
-        [ImporterHeader(Name = "结算金额")]
-        [ExporterHeader(DisplayName = "结算金额")]
-        public decimal Amt { set; get; }
-        [ImporterHeader(Name = "数量", IsIgnore = true)]
-        [ExporterHeader(DisplayName = "数量", IsIgnore = true)]
-        public string BillNum { set; get; }
-        [ImporterHeader(Name = "任务描述", IsIgnore = true)]
-        [ExporterHeader(DisplayName = "任务描述", IsIgnore = true)]
-        public Guid TaskId { set; get; }
-
-
-
-    }
-
-
-
-
-
-    #endregion
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-    /// <summary>
-    /// 准时化出库主表
-    /// </summary>
-    public class WmsJitOutPut : FullAuditedAggregateRootBase<Guid>
-    {
-        public WmsJitOutPut()
-        {
-        }
-
-        public WmsJitOutPut(Guid id,string version, string billNum, string creator,string content):base(id)
-        {
-            Id = id;
-            Version = version;
-            BillNum = billNum;
-            Creator = creator;
-            SumContent = content;
-        }
-
-        public string Version { set; get; }
-
-        public string BillNum { set; get; }
-
-        public string Creator { set; get; }
-
-
-        public string SumContent { set; get; }
-
-
-
-
-    }
-
-
-
-
-
-    /// <summary>
-    /// 准时化出库明细
-    /// </summary>
-    public class WmsJitOutPutDetial : FullAuditedAggregateRootBase<Guid>
-    {
-        public WmsJitOutPutDetial()
-        {
-        }
-
-    
-
-        public WmsJitOutPutDetial(Guid id, string wmsBillNum, string kennCode, string chassisNumber, string materialCode, string materialDesc, string materialGroup, string outPut, string inPut, int state, string extend1, string extend2, string extend3, string parentMaterialCode,string billNum,Guid taskId,string remark,decimal qty, decimal price, decimal amt) :base(id)
-        {
-            Id = id;
-            WmsBillNum = wmsBillNum;
-            KennCode = kennCode;
-            ChassisNumber = chassisNumber;
-            MaterialCode = materialCode;
-            MaterialDesc = materialDesc;
-            MaterialGroup = materialGroup;
-            OutPut = outPut;
-            InPut = inPut;
-            State = state;
-            Extend1 = extend1;
-            Extend2 = extend2;
-            Version = extend3;
-            ParentMaterialCode = parentMaterialCode;
-            BillNum = billNum;
-            TaskId = taskId;
-            Remark = remark;
-            Qty = qty;
-            Amt = amt;
-            Price = price;
-           
-        }
-
-      
-
-        public void SetData(Guid guid,string output,string input,string extend1,string extend2,string version,Guid taskid)
-        {
-            Id = guid;
-            OutPut = output;
-            InPut = input;
-            Extend1 = extend1;
-            Extend2 = extend2;
-            Version = version;
-            TaskId=taskid;
-        }
-
-        [ExporterHeader(DisplayName = "出库库位")]
-        [ImporterHeader(Name = "出库库位", IsIgnore = true)]
-        //出库库位
-        public string OutPut { set; get; }
-        [ImporterHeader(Name = "入库库位", IsIgnore = true)]
-        [ExporterHeader(DisplayName = "入库库位")]
-        //入库库位
-        public string InPut { set; get; }
-        [ImporterHeader(Name = "状态")]
-        [ExporterHeader(DisplayName = "状态")]
-        public int State { get; set; }
-
-        [ImporterHeader(Name = "开票单价")]
-        [ExporterHeader(DisplayName = "开票单价")]
-
-        public decimal Price { set; get; }
-        [ImporterHeader(Name = "开票金额")]
-        [ExporterHeader(DisplayName = "开票金额")]
-        public decimal Amt { set; get; }
-        [ImporterHeader(Name = "开票单价",IsIgnore =true)]
-        [ExporterHeader(DisplayName = "开票单价")]
-        /// <summary>
-        /// 扩展字段1
-        /// </summary>
-        public string Extend1 { set; get; }
-        /// <summary>
-        /// 扩展字段2
-        /// </summary>
-        [ExporterHeader(DisplayName = "开票金额")]
-        [ImporterHeader(Name = "开票金额", IsIgnore = true)]
-        public string Extend2 { set; get; }
-        /// <summary>
-        /// 扩展字段3
-        /// </summary>
-        [ExporterHeader(DisplayName = "版本号")]
-        [ImporterHeader(Name = "版本号", IsIgnore = true)]
-        public string Version { set; get; }
-
-        [ExporterHeader(DisplayName = "单号")]
-        [ImporterHeader(Name = "单号",IsIgnore =true)]
-        public string BillNum { set; get; }
-        [ExporterHeader(DisplayName = "任务号", IsIgnore = true)]
-        [ImporterHeader(Name = "任务号", IsIgnore = true)]
-        public Guid TaskId { set; get; }
-
-        [ExporterHeader(DisplayName = "交货单号")]
-        [ImporterHeader(Name = "交货单号", AutoTrim = true)]
-        public string WmsBillNum { set; get; }
-        [ExporterHeader(DisplayName = "KENN号")]
-        [ImporterHeader(Name = "KENN号")]
-        //KENN号
-        public string KennCode { set; get; }
-        [ExporterHeader(DisplayName = "底盘号")]
-        [ImporterHeader(Name = "底盘号", AutoTrim = true)]
-        //底盘号
-        public string ChassisNumber { set; get; }
-        [ExporterHeader(DisplayName = "物料号")]
-        [ImporterHeader(Name = "物料号", AutoTrim = true)]
-        //物料号
-        public string MaterialCode { set; get; }
-        [ExporterHeader(DisplayName = "组件组物料")]
-        [ImporterHeader(Name = "组件组物料",AutoTrim =true)]
-        //物料号
-        public string ParentMaterialCode { set; get; }
-        [ExporterHeader(DisplayName = "物料描述")]
-        [ImporterHeader(Name = "物料描述", AutoTrim = true)]
-        //物料描述
-        public string MaterialDesc { set; get; }
-        [ExporterHeader(DisplayName = "物料组(车型)")]
-        [ImporterHeader(Name = "物料组(车型)", AutoTrim = true)]
-        //物料组(车型)  
-        public string MaterialGroup { set; get; }
-        [ExporterHeader(DisplayName = "结算数量")]
-        [ImporterHeader(Name = "结算数量")]
-        public decimal Qty { set; get; }
-
-        ////以下继承的全部不导出
-
-        //[ExporterHeader(DisplayName = "BranchId", IsIgnore = true)]
-        //public Guid BranchId { set; get; }
-
-        //[ExporterHeader(DisplayName = "Enabled", IsIgnore = true)]
-        //public bool Enabled { set; get; }
-
-        //[ExporterHeader(DisplayName = "Remark", IsIgnore = true)]
-        //public string Remark { set; get; }
-
-        //[ExporterHeader(DisplayName = "IsDeleted", IsIgnore = true)]
-        //public bool IsDeleted { set; get; }
-
-        //[ExporterHeader(DisplayName = "DeleterId", IsIgnore = true)]
-        //public bool DeleterId { set; get; }
-
-        //[ExporterHeader(DisplayName = "DeletionTime", IsIgnore = true)]
-        //public DateTime DeletionTime { set; get; }
-
-        //[ExporterHeader(DisplayName = "LastModificationTime", IsIgnore = true)]
-        //public DateTime LastModificationTime { set; get; }
-
-        //[ExporterHeader(DisplayName = "LastModifierId", IsIgnore = true)]
-        //public Guid LastModifierId { set; get; }
-
-        //[ExporterHeader(DisplayName = "CreationTime", IsIgnore = true)]
-        //public DateTime CreationTime { set; get; }
-
-        //[ExporterHeader(DisplayName = "CreatorId", IsIgnore = true)]
-        //public Guid CreatorId { set; get; }
-
-        //[ExporterHeader(DisplayName = "ExtraProperties", IsIgnore = true)]
-        //public string ExtraProperties { set; get; }
-
-        //[ExporterHeader(DisplayName = "ConcurrencyStamp", IsIgnore = true)]
-        //public DateTime ConcurrencyStamp { set; get; }
-
-        //[ExporterHeader(DisplayName = "Id", IsIgnore = true)]
-        //public Guid Id { set; get; }
-
-
-
-
-    }
-
-
-
-
-
-    public class WmsKanbanOutPut : FullAuditedAggregateRootBase<Guid>
-    {
-        public WmsKanbanOutPut()
-        {
-        }
-
-        public WmsKanbanOutPut(Guid id, string version, string billNum, string creator,string content) : base(id)
-        {
-            Id = id;
-            Version = version;
-            BillNum = billNum;
-            Creator = creator;
-            SumContent = content;
-        }
-
-        public string Version { set; get; }
-
-        public string BillNum { set; get; }
-
-        public string Creator { set; get; }
-        public string SumContent { set; get; }
-
-
-    }
-
-
-    /// <summary>
-    /// 看板明细
-    /// </summary>
-    public class WmsKanbanOutPutDetial : FullAuditedAggregateRootBase<Guid>
-    {
-        public WmsKanbanOutPutDetial()
-        {
-        }
-
-        public WmsKanbanOutPutDetial(Guid id, string wmsBillNum, string kanban, string materialCode, string materialDesc, string materialGroup, string outPut, string inPut, int state, string extend1, string extend2, string extend3, string parentMaterialCode, string billNum, Guid taskId,string remark,decimal qty, decimal price, decimal amt)
-        {
-            Id = id;
-            WmsBillNum = wmsBillNum;
-            Kanban = kanban;
-            MaterialCode = materialCode;
-            MaterialDesc = materialDesc;
-            MaterialGroup = materialGroup;
-            OutPut = outPut;
-            InPut = inPut;
-            State = state;
-            Extend1 = extend1;
-            Extend2 = extend2;
-            Version = extend3;
-            ParentMaterialCode = parentMaterialCode;
-            BillNum = billNum;
-            TaskId = taskId;
-            Remark = remark;
-            Qty = qty;
-            Price = price;
-            Amt = amt;
-
-        }
-
-      
-
-        public void SetData(Guid id,string remark,string wmsbillnum,string version,Guid taskId)
-        {
-            Id = id;
-            Remark = remark;
-            WmsBillNum = wmsbillnum;
-            Version = version;
-            TaskId = taskId;
-
-        }
-        //  交货单号 实际发货日期  KENN号 底盘号 物料号 物料描述    客户物料 组件组物料   组件组物料描述 物料组(车型)     定价 金额  结算平台未结数量 大众R3未结数量    差异金额 差异数量    漏结标识 漏结期间    说明
-
-        [ExporterHeader(DisplayName = "组件组物料", IsIgnore = true)]
-
-        [ImporterHeader(Name = "组件组物料",IsIgnore =true)]
-        public string ParentMaterialCode { set; get; }
-        [ExporterHeader(DisplayName = "交货单号")]
-        [ImporterHeader(Name = "交货单号")]
-        public string WmsBillNum { set; get; }
-        [ExporterHeader(DisplayName = "条码号")]
-        [ImporterHeader(Name = "条码号")]
-        //KENN号
-        public string Kanban { set; get; }
-        [ExporterHeader(DisplayName = "物料号")]
-        [ImporterHeader(Name = "物料号")]
-        //物料号
-        public string MaterialCode { set; get; }
-        [ExporterHeader(DisplayName = "物料描述")]
-        [ImporterHeader(Name = "物料描述")]
-        //物料描述
-        public string MaterialDesc { set; get; }
-        [ExporterHeader(DisplayName = "物料组(车型)")]
-        [ImporterHeader(Name = "物料组(车型)")]
-        //物料组(车型)  
-        public string MaterialGroup { set; get; }
-        [ExporterHeader(DisplayName = "出库库位")]
-        [ImporterHeader(Name = "出库库位",IsIgnore =true)]
-        //出库库位
-        public string OutPut { set; get; }
-        [ExporterHeader(DisplayName = "入库库位")]
-        [ImporterHeader(Name = "入库库位", IsIgnore = true)]
-        //入库库位
-        public string InPut { set; get; }
-        [ExporterHeader(DisplayName = "状态")]
-        [ImporterHeader(Name = "状态",IsIgnore =true)]
-        public int State { get; set; }
-        [ExporterHeader(DisplayName = "客户物料")]
-        [ImporterHeader(Name = "客户物料")]
-        /// <summary>
-        /// 扩展字段1
-        /// </summary>
-        public string Extend1 { set; get; }
-        /// <summary>
-        /// 扩展字段2
-        /// </summary>
-        [ExporterHeader(DisplayName = "订单日期")]
-        [ImporterHeader(Name = "订单日期")]
-        public string Extend2 { set; get; }
-        /// <summary>
-        /// 扩展字段3
-        /// </summary>
-        [ImporterHeader(Name = "版本号", IsIgnore = true)]
-        public string Version { set; get; }
-        [ExporterHeader(DisplayName = "结算数量")]
-        [ImporterHeader(Name = "结算数量")]
-        public decimal Qty { set; get; }
-        [ExporterHeader(DisplayName = "单据")]
-        [ImporterHeader(Name = "单据", IsIgnore = true)]
-        public string BillNum { set; get; }
-        [ExporterHeader(DisplayName = "任务", IsIgnore = true)]
-        [ImporterHeader(Name = "任务", IsIgnore = true)]
-        public Guid TaskId { set; get; }
-        [ExporterHeader(DisplayName = "开票单价")]
-        [ImporterHeader(Name = "开票单价")]
-
-        public decimal Price { set; get; }
-        [ExporterHeader(DisplayName = "开票金额")]
-        [ImporterHeader(Name = "开票金额")]
-        public decimal Amt { set; get; }
-
-
-
-    }
-
-
-    public class WmsWithOutKanbanOutPut : FullAuditedAggregateRootBase<Guid>
-    {
-        public WmsWithOutKanbanOutPut()
-        {
-        }
-
-        public WmsWithOutKanbanOutPut(Guid id, string version, string billNum, string creator,string content) : base(id)
-        {
-            Id = id;
-            Version = version;
-            BillNum = billNum;
-            Creator = creator;
-            SumContent = content;
-        }
-
-        public string Version { set; get; }
-
-        public string BillNum { set; get; }
-
-        public string Creator { set; get; }
-
-        public string SumContent { set; get; }
-
-    }
-
-
-    /// <summary>
-    /// 看板明细
-    /// </summary>
-    public class WmsWithOutKanbanOutPutDetial : FullAuditedAggregateRootBase<Guid>
-    {
-        public WmsWithOutKanbanOutPutDetial()
-        {
-        }
-
-       
-
-        public WmsWithOutKanbanOutPutDetial(Guid id ,string type, string sapMaterialCode, string materialDesc, string version, string isBack, string remark, decimal qty, decimal sockQty, decimal outputQty, string extend,string billnum,int state,decimal realqty, decimal price, decimal amt) :base(id)
-        {
-            Type = type;
-            SapMaterialCode = sapMaterialCode;
-            MaterialDesc = materialDesc;
-            Version = version;
-            IsBack = isBack;
-            Remark = remark;
-            Qty = qty;
-            SockQty = sockQty;
-            OutputQty = outputQty;
-            Extend = extend;
-            BillNum = billnum;
-            State = state;
-            RealityNumber = realqty;
-            Price = price;
-            Amt = amt;
-        }
-
-      
-
-        [ImporterHeader(Name = "单据类型")]
-        [ExporterHeader(DisplayName = "单据类型")]
-        public string Type { set; get; }
-        [ImporterHeader(Name = "物料号")]
-        [ExporterHeader(DisplayName = "物料号")]
-        public string SapMaterialCode { set; get; }
-        [ImporterHeader(Name = "物料描述")]
-        [ExporterHeader(DisplayName = "物料描述")]
-        public string MaterialDesc { set; get; }
-        [ImporterHeader(Name = "版本号")]
-        [ExporterHeader(DisplayName = "版本号")]
-        public string Version { set; get; }
-        [ImporterHeader(Name = "是否备件")]
-        [ExporterHeader(DisplayName = "是否备件")]
-        public string IsBack { set; get; }
-        [ImporterHeader(Name = "结算数量")]
-        [ExporterHeader(DisplayName = "结算数量")]
-        public decimal Qty { set; get; }
-        [ImporterHeader(Name = "寄售库存数量", IsIgnore = true)]
-        [ExporterHeader(DisplayName = "寄售库存数量", IsIgnore = true)]
-        public decimal SockQty { set; get; }
-
-        [ImporterHeader(Name = "真实数量", IsIgnore = true)]
-        [ExporterHeader(DisplayName = "真实数量", IsIgnore = true)]
-        public decimal RealityNumber { set; get; }
-
-        [ImporterHeader(Name = "出库数量", IsIgnore = true)]
-        [ExporterHeader(DisplayName = "出库数量", IsIgnore = true)]
-        public decimal OutputQty { set; get; }
-        [ImporterHeader(Name = "Extend", IsIgnore = true)]
-        [ExporterHeader(DisplayName = "Extend", IsIgnore = true)]
-        public string Extend { set; get; }
-        [ImporterHeader(Name = "BillNum", IsIgnore = true)]
-        [ExporterHeader(DisplayName = "BillNum", IsIgnore = true)]
-        public string BillNum { set; get; }
-        [ImporterHeader(Name = "状态", IsIgnore = true)]
-        [ExporterHeader(DisplayName = "状态", IsIgnore = true)]
-        public int  State { set; get; }
-        [ImporterHeader(Name = "开票单价")]
-        [ExporterHeader(DisplayName = "开票单价")]
-
-        public decimal Price { set; get; }
-        [ImporterHeader(Name = "开票金额")]
-        [ExporterHeader(DisplayName = "开票金额")]
-        public decimal Amt { set; get; }
-
-  
-
-    }
-   
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-    public class WmsHQWithOutKanbanOutPut : FullAuditedAggregateRootBase<Guid>
-    {
-        public WmsHQWithOutKanbanOutPut()
-        {
-        }
-
-        public WmsHQWithOutKanbanOutPut(Guid id, string version, string billNum, string creator,string content) : base(id)
-        {
-            Id = id;
-            Version = version;
-            BillNum = billNum;
-            Creator = creator;
-            SumContent = content;
-        }
-
-        public string Version { set; get; }
-
-        public string BillNum { set; get; }
-
-        public string Creator { set; get; }
-
-        public string SumContent { set; get; }
-
-    }
-
-
-    /// <summary>
-    /// 看板明细
-    /// </summary>
-    public class WmsHQWithOutKanbanOutPutDetial : FullAuditedAggregateRootBase<Guid>
-    {
-        public WmsHQWithOutKanbanOutPutDetial()
-        {
-        }
-
-
-
-        public WmsHQWithOutKanbanOutPutDetial(Guid id, string type, string sapMaterialCode, string materialDesc, string version, string isBack, string remark, decimal qty, decimal sockQty, decimal outputQty, string extend, string billnum, int state, decimal realqty, decimal price, decimal amt) : base(id)
-        {
-            Type = type;
-            SapMaterialCode = sapMaterialCode;
-            MaterialDesc = materialDesc;
-            Version = version;
-            IsBack = isBack;
-            Remark = remark;
-            Qty = qty;
-            SockQty = sockQty;
-            OutputQty = outputQty;
-            Extend = extend;
-            BillNum = billnum;
-            State = state;
-            RealityNumber = realqty;
-            Price = price;
-            Amt = amt;
-        }
-
-
-
-        [ImporterHeader(Name = "单据类型", IsIgnore = true)]
-        [ExporterHeader(DisplayName = "单据类型", IsIgnore = true)]
-        public string Type { set; get; }
-        [ImporterHeader(Name = "物料号")]
-        [ExporterHeader(DisplayName = "物料号")]
-        public string SapMaterialCode { set; get; }
-        [ImporterHeader(Name = "物料描述")]
-        [ExporterHeader(DisplayName = "物料描述")]
-        public string MaterialDesc { set; get; }
-        [ImporterHeader(Name = "版本号")]
-        [ExporterHeader(DisplayName = "版本号")]
-        public string Version { set; get; }
-        [ImporterHeader(Name = "是否备件")]
-        [ExporterHeader(DisplayName = "是否备件")]
-        public string IsBack { set; get; }
-        [ImporterHeader(Name = "结算数量")]
-        [ExporterHeader(DisplayName = "结算数量")]
-        public decimal Qty { set; get; }
-        [ImporterHeader(Name = "寄售库存数量", IsIgnore = true)]
-        [ExporterHeader(DisplayName = "寄售库存数量", IsIgnore = true)]
-        public decimal SockQty { set; get; }
-
-        [ImporterHeader(Name = "真实数量", IsIgnore = true)]
-        [ExporterHeader(DisplayName = "真实数量", IsIgnore = true)]
-        public decimal RealityNumber { set; get; }
-
-        [ImporterHeader(Name = "出库数量", IsIgnore = true)]
-        [ExporterHeader(DisplayName = "出库数量", IsIgnore = true)]
-        public decimal OutputQty { set; get; }
-        [ImporterHeader(Name = "客户")]
-        [ExporterHeader(DisplayName = "客户")]
-        public string Extend { set; get; }
-        [ImporterHeader(Name = "BillNum", IsIgnore = true)]
-        [ExporterHeader(DisplayName = "BillNum", IsIgnore = true)]
-        public string BillNum { set; get; }
-        [ImporterHeader(Name = "状态", IsIgnore = true)]
-        [ExporterHeader(DisplayName = "状态", IsIgnore = true)]
-        public int State { set; get; }
-        [ImporterHeader(Name = "开票单价")]
-        [ExporterHeader(DisplayName = "开票单价")]
-
-        public decimal Price { set; get; }
-        [ImporterHeader(Name = "开票金额")]
-        [ExporterHeader(DisplayName = "开票金额")]
-        public decimal Amt { set; get; }
-
-    }
-
-    #region 一次性寄售销售结算主表
-    /// <summary>
-    /// 一次性寄售销售结算主表
-    /// </summary>
-    public class WmsOneTimeSaleOutPut : FullAuditedAggregateRootBase<Guid>
-    {
-        public WmsOneTimeSaleOutPut()
-        {
-        }
-
-        public WmsOneTimeSaleOutPut(Guid id, string version, string billNum, string creator,string content) : base(id)
-        {
-            Id = id;
-            Version = version;
-            BillNum = billNum;
-            Creator = creator;
-            SumContent = content;
-        }
-
-        public string Version { set; get; }
-
-        public string BillNum { set; get; }
-
-        public string Creator { set; get; }
-
-        public string SumContent { set; get; }
-
-    }
-
-
-    /// <summary>
-    /// 一次性寄售销售从表
-    /// </summary>
-    public class WmsOneTimeSaleOutPutDetial : FullAuditedAggregateRootBase<Guid>
-    {
-        public WmsOneTimeSaleOutPutDetial()
-        {
-        }
-
-
-
-        public WmsOneTimeSaleOutPutDetial(Guid id, string type, string sapMaterialCode, string materialDesc, string version, string isBack, string remark, decimal qty, decimal sockQty, decimal outputQty, string extend, string billnum, int state, decimal realqty, decimal price, decimal amt) : base(id)
-        {
-            Type = type;
-            SapMaterialCode = sapMaterialCode;
-            MaterialDesc = materialDesc;
-            Version = version;
-            IsBack = isBack;
-            Remark = remark;
-            Qty = qty;
-            SockQty = sockQty;
-            OutputQty = outputQty;
-            Extend = extend;
-            BillNum = billnum;
-            State = state;
-            RealityNumber = realqty;
-            Price = price;
-            Amt = amt;
-        }
-
-
-
-        [ImporterHeader(Name = "单据类型", IsIgnore = true)]
-        [ExporterHeader(DisplayName = "单据类型", IsIgnore = true)]
-        public string Type { set; get; }
-        [ImporterHeader(Name = "物料号")]
-        [ExporterHeader(DisplayName = "物料号")]
-        public string SapMaterialCode { set; get; }
-        [ImporterHeader(Name = "物料描述")]
-        [ExporterHeader(DisplayName = "物料描述")]
-        public string MaterialDesc { set; get; }
-        [ImporterHeader(Name = "版本号")]
-        [ExporterHeader(DisplayName = "版本号")]
-        public string Version { set; get; }
-        [ImporterHeader(Name = "是否备件")]
-        [ExporterHeader(DisplayName = "是否备件")]
-        public string IsBack { set; get; }
-        [ImporterHeader(Name = "结算数量")]
-        [ExporterHeader(DisplayName = "结算数量")]
-        public decimal Qty { set; get; }
-        [ImporterHeader(Name = "寄售库存数量", IsIgnore = true)]
-        [ExporterHeader(DisplayName = "寄售库存数量", IsIgnore = true)]
-        public decimal SockQty { set; get; }
-
-        [ImporterHeader(Name = "真实数量", IsIgnore = true)]
-        [ExporterHeader(DisplayName = "真实数量", IsIgnore = true)]
-        public decimal RealityNumber { set; get; }
-
-        [ImporterHeader(Name = "出库数量", IsIgnore = true)]
-        [ExporterHeader(DisplayName = "出库数量", IsIgnore = true)]
-        public decimal OutputQty { set; get; }
-        [ImporterHeader(Name = "客户")]
-        [ExporterHeader(DisplayName = "客户")]
-        public string Extend { set; get; }
-        [ImporterHeader(Name = "BillNum", IsIgnore = true)]
-        [ExporterHeader(DisplayName = "BillNum", IsIgnore = true)]
-        public string BillNum { set; get; }
-        [ImporterHeader(Name = "状态", IsIgnore = true)]
-        [ExporterHeader(DisplayName = "状态", IsIgnore = true)]
-        public int State { set; get; }
-        [ImporterHeader(Name = "开票单价")]
-        [ExporterHeader(DisplayName = "开票单价")]
-
-        public decimal Price { set; get; }
-        [ImporterHeader(Name = "开票金额")]
-        [ExporterHeader(DisplayName = "开票金额")]
-        public decimal Amt { set; get; }
-
-
-        [ImporterHeader(Name = "出库库位", IsIgnore = true)]
-        [ExporterHeader(DisplayName = "出库库位", IsIgnore = true)]
-        //出库库位
-        public string OutPut { set; get; }
-        [ImporterHeader(Name = "入库库位", IsIgnore = true)]
-        [ExporterHeader(DisplayName = "入库库位", IsIgnore = true)]
-        //入库库位
-        public string InPut { set; get; }
-        [ExporterHeader(DisplayName = "组件组物料", IsIgnore = true)]
-        public string ParentMaterialCode { set; get; }
-        [ExporterHeader(DisplayName = "交货单号", IsIgnore = true)]
-        public string WmsBillNum { set; get; }
-        [ExporterHeader(DisplayName = "订单号", IsIgnore = true)]
-        //KENN号
-        public string OrderBillNum { set; get; }
-
-    }
-
-
-    #endregion
-
-
-
-    #region 红旗M平台出库
-
-    /// <summary>
-    /// 看板M平台明细
-    /// </summary>
-    public class WmsHQMKanbanOutPutDetial : FullAuditedAggregateRootBase<Guid>
-    {
-        public WmsHQMKanbanOutPutDetial()
-        {
-        }
-
-        public WmsHQMKanbanOutPutDetial(Guid id, string wmsBillNum, string kanban, string materialCode, string materialDesc, string materialGroup, string outPut, string inPut, int state, string extend1, string extend2, string extend3, string parentMaterialCode, string billNum, Guid taskId, string remark, decimal qty, string poline)
-        {
-            Id = id;
-            WmsBillNum = wmsBillNum;
-            Kanban = kanban;
-            MaterialCode = materialCode;
-            MaterialDesc = materialDesc;
-            MaterialGroup = materialGroup;
-            OutPut = outPut;
-            InPut = inPut;
-            State = state;
-            Extend1 = extend1;
-            Extend2 = extend2;
-            Version = extend3;
-            ParentMaterialCode = parentMaterialCode;
-            BillNum = billNum;
-            TaskId = taskId;
-            Remark = remark;
-            Qty = qty;
-            PoLine = poline;
-        }
-        public void SetData(Guid id, string remark, string wmsbillnum, string version, Guid taskId)
-        {
-            Id = id;
-            Remark = remark;
-            WmsBillNum = wmsbillnum;
-            Version = version;
-            TaskId = taskId;
-        }
-        //  交货单号 实际发货日期  KENN号 底盘号 物料号 物料描述    客户物料 组件组物料   组件组物料描述 物料组(车型)     定价 金额  结算平台未结数量 大众R3未结数量    差异金额 差异数量    漏结标识 漏结期间    说明
-        [ImporterHeader(Name = "行号")]
-        [ExporterHeader(DisplayName = "行号")]
-        public string PoLine { set; get; }
-
-        [ImporterHeader(Name = "订货看板编号")]
-        [ExporterHeader(DisplayName = "订货看板编号")]
-        //KENN号
-        public string Kanban { set; get; }
-
-        [ImporterHeader(Name = "组件组物料", IsIgnore = true)]
-        [ExporterHeader(DisplayName = "组件组物料", IsIgnore = true)]
-        public string ParentMaterialCode { set; get; }
-        [ImporterHeader(Name = "交货单号")]
-        [ExporterHeader(DisplayName = "交货单号")]
-        public string WmsBillNum { set; get; }
-        //[ImporterHeader(Name = "订货看板编号")]
-        ////KENN号
-        //public string OrderBillNum { set; get; }
-        [ImporterHeader(Name = "Sap编码")]
-        [ExporterHeader(DisplayName = "Sap编码")]
-        //物料号
-        public string MaterialCode { set; get; }
-        [ImporterHeader(Name = "零件中文名称")]
-        [ExporterHeader(DisplayName = "零件中文名称")]
-        //物料描述
-        public string MaterialDesc { set; get; }
-        [ImporterHeader(Name = "物料组(车型)")]
-        [ExporterHeader(DisplayName = "物料组(车型)")]
-        //物料组(车型)  
-        public string MaterialGroup { set; get; }
-        [ImporterHeader(Name = "出库库位", IsIgnore = true)]
-        [ExporterHeader(DisplayName = "出库库位", IsIgnore = true)]
-        //出库库位
-        public string OutPut { set; get; }
-        [ImporterHeader(Name = "入库库位", IsIgnore = true)]
-        [ExporterHeader(DisplayName = "入库库位", IsIgnore = true)]
-        //入库库位
-        public string InPut { set; get; }
-        [ImporterHeader(Name = "状态", IsIgnore = true)]
-        [ExporterHeader(DisplayName = "状态", IsIgnore = true)]
-        public int State { get; set; }
-        [ImporterHeader(Name = "发货零件号")]
-        [ExporterHeader(DisplayName = "发货零件号")]
-        /// <summary>
-        /// 扩展字段1
-        /// </summary>
-        public string Extend1 { set; get; }
-        /// <summary>
-        /// 扩展字段2
-        /// </summary>
-        [ImporterHeader(Name = "收货仓库")]
-        [ExporterHeader(DisplayName = "收货仓库")]
-        public string Extend2 { set; get; }
-        /// <summary>
-        /// 扩展字段3
-        /// </summary>
-        [ImporterHeader(Name = "版本号", IsIgnore = true)]
-        [ExporterHeader(DisplayName = "版本号", IsIgnore = true)]
-        public string Version { set; get; }
-        [ImporterHeader(Name = "结算数量")]
-        [ExporterHeader(DisplayName = "结算数量")]
-        public decimal Qty { set; get; }
-        [ImporterHeader(Name = "数量", IsIgnore = true)]
-        [ExporterHeader(DisplayName = "数量", IsIgnore = true)]
-        public string BillNum { set; get; }
-        [ImporterHeader(Name = "任务描述", IsIgnore = true)]
-        [ExporterHeader(DisplayName = "任务描述", IsIgnore = true)]
-        public Guid TaskId { set; get; }
-
-    }
-
-    public class WmsHQMKanbanOutPut : FullAuditedAggregateRootBase<Guid>
-    {
-        public WmsHQMKanbanOutPut()
-        {
-        }
-
-        public WmsHQMKanbanOutPut(Guid id, string version, string billNum, string creator) : base(id)
-        {
-            Id = id;
-            Version = version;
-            BillNum = billNum;
-            Creator = creator;
-        }
-
-        public string Version { set; get; }
-        public string BillNum { set; get; }
-        public string Creator { set; get; }
-    }
-
-    /// <summary>
-    /// 备件出库
-    /// </summary>
-    public class WmsHQMSharePartOutPut : FullAuditedAggregateRootBase<Guid>
-    {
-        public WmsHQMSharePartOutPut()
-        {
-        }
-        public WmsHQMSharePartOutPut(Guid id, string version, string billNum, string creator) : base(id)
-        {
-            Id = id;
-            Version = version;
-            BillNum = billNum;
-            Creator = creator;
-        }
-        public string Version { set; get; }
-        public string BillNum { set; get; }
-        public string Creator { set; get; }
-
-    }
-
-
-    /// <summary>
-    /// M平台-备件出库明细
-    /// </summary>
-    public class WmsHQMSharePartOutPutDetial : FullAuditedAggregateRootBase<Guid>
-    {
-
-        public WmsHQMSharePartOutPutDetial()
-        {
-        }
-        public WmsHQMSharePartOutPutDetial(Guid id, string wmsBillNum, string orderBillNum, string materialCode, string materialDesc, string materialGroup, string outPut, string inPut, int state, string extend1, string extend2, string extend3, string parentMaterialCode, string billNum, Guid taskId, string remark, decimal qty, decimal stockQty,decimal outputQty)
-        {
-            Id = id;
-            WmsBillNum = wmsBillNum;
-            OrderBillNum = orderBillNum;
-            MaterialCode = materialCode;
-            MaterialDesc = materialDesc;
-            MaterialGroup = materialGroup;
-            OutPut = outPut;
-            InPut = inPut;
-            State = state;
-            Extend1 = extend1;
-            Extend2 = extend2;
-            Version = extend3;
-            ParentMaterialCode = parentMaterialCode;
-            BillNum = billNum;
-            TaskId = taskId;
-            Remark = remark;
-            Qty = qty;
-            StockQty = stockQty;
-            OutPutQty = outputQty;
-            BranchId = Id;
-        }
-        public void SetId(Guid id)
-        {
-            Id = id;
-        }
-        //交货单号
-
-        [ImporterHeader(Name = "寄销库数量", IsIgnore = true)]
-        [ExporterHeader(DisplayName = "寄销库数量", IsIgnore = true)]
-        public decimal StockQty { set; get; }
-
-        [ImporterHeader(Name = "组件组物料", IsIgnore = true)]
-        [ExporterHeader(DisplayName = "组件组物料", IsIgnore = true)]
-        public string ParentMaterialCode { set; get; }
-        [ImporterHeader(Name = "交货单号", IsIgnore = true)]
-        [ExporterHeader(DisplayName = "交货单号", IsIgnore = true)]
-        public string WmsBillNum { set; get; }
-        [ImporterHeader(Name = "看板号", IsIgnore = true)]
-        [ExporterHeader(DisplayName = "看板号", IsIgnore = true)]
-        //KENN号
-        public string OrderBillNum { set; get; }
-        [ImporterHeader(Name = "Sap编码")]
-        [ExporterHeader(DisplayName = "Sap编码")]
-        //物料号
-        public string MaterialCode { set; get; }
-        [ImporterHeader(Name = "结算物料描述")]
-        [ExporterHeader(DisplayName = "结算物料描述")]
-        //物料描述
-        public string MaterialDesc { set; get; }
-        [ImporterHeader(Name = "物料组(车型)")]
-        [ExporterHeader(DisplayName = "物料组(车型)")]
-        //物料组(车型)  
-        public string MaterialGroup { set; get; }
-        [ImporterHeader(Name = "出库库位", IsIgnore = true)]
-        [ExporterHeader(DisplayName = "出库库位", IsIgnore = true)]
-        //出库库位
-        public string OutPut { set; get; }
-        [ImporterHeader(Name = "入库库位", IsIgnore = true)]
-        [ExporterHeader(DisplayName = "入库库位", IsIgnore = true)]
-        //入库库位
-        public string InPut { set; get; }
-        [ImporterHeader(Name = "状态", IsIgnore = true)]
-        [ExporterHeader(DisplayName = "状态", IsIgnore = true)]
-        public int State { get; set; }
-        [ImporterHeader(Name = "结算物料号")]
-        [ExporterHeader(DisplayName = "结算物料号")]
-        /// <summary>
-        /// 扩展字段1
-        /// </summary>
-        public string Extend1 { set; get; }
-        /// <summary>
-        /// 扩展字段2
-        /// </summary>
-        [ImporterHeader(Name = "收货仓库")]
-        [ExporterHeader(DisplayName = "收货仓库")]
-        public string Extend2 { set; get; }
-        /// <summary>
-        /// 扩展字段3
-        /// </summary>
-        [ImporterHeader(Name = "版本号", IsIgnore = true)]
-        [ExporterHeader(DisplayName = "版本号", IsIgnore = true)]
-        public string Version { set; get; }
-        [ImporterHeader(Name = "结算数量")]
-        [ExporterHeader(DisplayName = "结算数量")]
-        public decimal Qty { set; get; }
-        [ImporterHeader(Name = "单据号", IsIgnore = true)]
-        [ExporterHeader(DisplayName = "单据号", IsIgnore = true)]
-        public string BillNum { set; get; }
-        [ImporterHeader(Name = "任务ID", IsIgnore = true)]
-        [ExporterHeader(DisplayName = "任务ID", IsIgnore = true)]
-        public Guid TaskId { set; get; }
-        [ImporterHeader(Name = "出库数量", IsIgnore = true)]
-        [ExporterHeader(DisplayName = "出库数量", IsIgnore = true)]
-        public decimal OutPutQty { set; get; }
-    }
-
-    #endregion
-
-    #region 一汽轿车出库
-    /// <summary>
-    /// 一汽轿车出库
-    /// </summary>
-    public class WmsHQCarOutPut : FullAuditedAggregateRootBase<Guid>
-    {
-        public WmsHQCarOutPut()
-        {
-        }
-        public WmsHQCarOutPut(Guid id, string version, string billNum, string creator) : base(id)
-        {
-            Id = id;
-            Version = version;
-            BillNum = billNum;
-            Creator = creator;
-        }
-        public string Version { set; get; }
-        public string BillNum { set; get; }
-        public string Creator { set; get; }
-
-    }
-
-
-    /// <summary>
-    /// 一汽轿车出库明细
-    /// </summary>
-    public class WmsHQCarOutPutDetial : FullAuditedAggregateRootBase<Guid>
-    {
-
-        public WmsHQCarOutPutDetial()
-        {
-        }
-        public WmsHQCarOutPutDetial(Guid id, string wmsBillNum, string orderBillNum, string materialCode, 
-            string materialDesc, string materialGroup, string outPut, string inPut, int state, string extend1, string extend2, 
-            string extend3, string parentMaterialCode, string billNum, Guid taskId, string remark, decimal qty, decimal stockQty, decimal outputQty, string issparepart,decimal price,decimal amt)
-        {
-            Id = id;
-            WmsBillNum = wmsBillNum;
-            OrderBillNum = orderBillNum;
-            MaterialCode = materialCode;
-            MaterialDesc = materialDesc;
-            MaterialGroup = materialGroup;
-            OutPut = outPut;
-            InPut = inPut;
-            State = state;
-            Extend1 = extend1;
-            Extend2 = extend2;
-            Version = extend3;
-            ParentMaterialCode = parentMaterialCode;
-            BillNum = billNum;
-            TaskId = taskId;
-            Remark = remark;
-            Qty = qty;
-            StockQty = stockQty;
-            OutPutQty = outputQty;
-            IsSparePart = issparepart;
-            Price = price;
-            Amt = amt;
-        }
-        public void SetId(Guid id)
-        {
-            Id = id;
-        }
-
-        [ImporterHeader(Name = "是否备件", IsIgnore = true)]
-        [ExporterHeader(DisplayName = "是否备件", IsIgnore = true)]
-        public string IsSparePart { set; get; }
-        //交货单号
-
-        [ImporterHeader(Name = "寄销库数量", IsIgnore = true)]
-        [ExporterHeader(DisplayName = "寄销库数量", IsIgnore = true)]
-        public decimal StockQty { set; get; }
-
-        [ImporterHeader(Name = "出库数量", IsIgnore = true)]
-        [ExporterHeader(DisplayName = "出库数量", IsIgnore = true)]
-        public decimal OutPutQty { set; get; }
-
-        [ImporterHeader(Name = "组件组物料", IsIgnore = true)]
-        [ExporterHeader(DisplayName = "组件组物料", IsIgnore = true)]
-        public string ParentMaterialCode { set; get; }
-        [ImporterHeader(Name = "交货单号", IsIgnore = true)]
-        [ExporterHeader(DisplayName = "交货单号", IsIgnore = true)]
-        public string WmsBillNum { set; get; }
-        [ImporterHeader(Name = "看板号", IsIgnore = true)]
-        [ExporterHeader(DisplayName = "看板号", IsIgnore = true)]
-        //KENN号
-        public string OrderBillNum { set; get; }
-        [ImporterHeader(Name = "SAP编码")]
-        [ExporterHeader(DisplayName = "SAP编码")]
-        //物料号
-        public string MaterialCode { set; get; }
-        [ImporterHeader(Name = "物料描述")]
-        [ExporterHeader(DisplayName = "物料描述")]
-        //物料描述
-        public string MaterialDesc { set; get; }
-        [ImporterHeader(Name = "物料组")]
-        [ExporterHeader(DisplayName = "物料组")]
-        //物料组(车型)  
-        public string MaterialGroup { set; get; }
-        [ImporterHeader(Name = "出库库位", IsIgnore = true)]
-        [ExporterHeader(DisplayName = "出库库位", IsIgnore = true)]
-        //出库库位
-        public string OutPut { set; get; }
-        [ImporterHeader(Name = "入库库位", IsIgnore = true)]
-        [ExporterHeader(DisplayName = "入库库位", IsIgnore = true)]
-        //入库库位
-        public string InPut { set; get; }
-        [ImporterHeader(Name = "状态", IsIgnore = true)]
-        [ExporterHeader(DisplayName = "状态", IsIgnore = true)]
-        public int State { get; set; }
-        [ImporterHeader(Name = "结算物料号")]
-        [ExporterHeader(DisplayName = "结算物料号")]
-        /// <summary>
-        /// 扩展字段1
-        /// </summary>
-        public string Extend1 { set; get; }
-        /// <summary>
-        /// 扩展字段2
-        /// </summary>
-        [ImporterHeader(Name = "收货仓库")]
-        [ExporterHeader(DisplayName = "收货仓库")]
-        public string Extend2 { set; get; }
-        /// <summary>
-        /// 扩展字段3
-        /// </summary>
-        [ImporterHeader(Name = "版本号", IsIgnore = true)]
-        [ExporterHeader(DisplayName = "版本号", IsIgnore = true)]
-        public string Version { set; get; }
-
-        [ImporterHeader(Name = "结算数量")]
-        [ExporterHeader(DisplayName = "结算数量")]
-        public decimal Qty { set; get; }
-
-        [ImporterHeader(Name = "结算单价")]
-        [ExporterHeader(DisplayName = "结算单价")]
-        public decimal Price { set; get; }
-
-        [ImporterHeader(Name = "结算金额")]
-        [ExporterHeader(DisplayName = "结算金额")]
-        public decimal Amt { set; get; }
-
-
-        [ImporterHeader(Name = "单据号", IsIgnore = true)]
-        [ExporterHeader(DisplayName = "单据号", IsIgnore = true)]
-        public string BillNum { set; get; }
-        [ImporterHeader(Name = "任务ID", IsIgnore = true)]
-        [ExporterHeader(DisplayName = "任务ID", IsIgnore = true)]
-        public Guid TaskId { set; get; }
-    }
-    #endregion
-
-
-
-
-    #region 红旗看板
-
-    public class WmsHQFKanbanOutPut : FullAuditedAggregateRootBase<Guid>
-    {
-        public WmsHQFKanbanOutPut()
-        {
-        }
-
-        public WmsHQFKanbanOutPut(Guid id, string version, string billNum, string creator,string content) : base(id)
-        {
-            Id = id;
-            Version = version;
-            BillNum = billNum;
-            Creator = creator;
-            SumContent = content;
-        }
-
-        public string Version { set; get; }
-        public string BillNum { set; get; }
-        public string Creator { set; get; }
-        public string SumContent { set; get; }
-    }
-
-
-    /// <summary>
-    /// 看板明细
-    /// </summary>
-    public class WmsHQFKanbanOutPutDetial : FullAuditedAggregateRootBase<Guid>
-    {
-        public WmsHQFKanbanOutPutDetial()
-        {
-        }
-
-        public WmsHQFKanbanOutPutDetial(Guid id, string wmsBillNum, string kanban, string materialCode, string materialDesc, string materialGroup, string outPut, string inPut, int state, string extend1, string extend2, string extend3, string parentMaterialCode, string billNum, Guid taskId, string remark, decimal qty,string poline)
-        {
-            Id = id;
-            WmsBillNum = wmsBillNum;
-            Kanban = kanban;
-            MaterialCode = materialCode;
-            MaterialDesc = materialDesc;
-            MaterialGroup = materialGroup;
-            OutPut = outPut;
-            InPut = inPut;
-            State = state;
-            Extend1 = extend1;
-            Extend2 = extend2;
-            Version = extend3;
-            ParentMaterialCode = parentMaterialCode;
-            BillNum = billNum;
-            TaskId = taskId;
-            Remark = remark;
-            Qty = qty;
-            PoLine = poline;
-        }
-        public void SetData(Guid id, string remark, string wmsbillnum, string version, Guid taskId)
-        {
-            Id = id;
-            Remark = remark;
-            WmsBillNum = wmsbillnum;
-            Version = version;
-            TaskId = taskId;
-        }
-        //  交货单号 实际发货日期  KENN号 底盘号 物料号 物料描述    客户物料 组件组物料   组件组物料描述 物料组(车型)     定价 金额  结算平台未结数量 大众R3未结数量    差异金额 差异数量    漏结标识 漏结期间    说明
-        [ImporterHeader(Name = "行号")]
-        [ExporterHeader(DisplayName = "行号")]
-        public string PoLine { set; get; }
-
-        [ImporterHeader(Name = "订货看板编号")]
-        [ExporterHeader(DisplayName = "订货看板编号")]
-        //KENN号
-        public string Kanban { set; get; }
-
-        [ImporterHeader(Name = "组件组物料", IsIgnore = true)]
-        [ExporterHeader(DisplayName = "组件组物料", IsIgnore = true)]
-        public string ParentMaterialCode { set; get; }
-        [ImporterHeader(Name = "交货单号")]
-        [ExporterHeader(DisplayName = "交货单号")]
-        public string WmsBillNum { set; get; }
-        //[ImporterHeader(Name = "订货看板编号")]
-        ////KENN号
-        //public string OrderBillNum { set; get; }
-        [ImporterHeader(Name = "Sap编码")]
-        [ExporterHeader(DisplayName = "Sap编码")]
-        //物料号
-        public string MaterialCode { set; get; }
-        [ImporterHeader(Name = "零件中文名称")]
-        [ExporterHeader(DisplayName = "零件中文名称")]
-        //物料描述
-        public string MaterialDesc { set; get; }
-        [ImporterHeader(Name = "物料组(车型)")]
-        [ExporterHeader(DisplayName = "物料组(车型)")]
-        //物料组(车型)  
-        public string MaterialGroup { set; get; }
-        [ImporterHeader(Name = "出库库位", IsIgnore = true)]
-        [ExporterHeader(DisplayName = "出库库位", IsIgnore = true)]
-        //出库库位
-        public string OutPut { set; get; }
-        [ImporterHeader(Name = "入库库位", IsIgnore = true)]
-        [ExporterHeader(DisplayName = "入库库位", IsIgnore = true)]
-        //入库库位
-        public string InPut { set; get; }
-        [ImporterHeader(Name = "状态", IsIgnore = true)]
-        [ExporterHeader(DisplayName = "状态", IsIgnore = true)]
-        public int State { get; set; }
-        [ImporterHeader(Name = "发货零件号")]
-        [ExporterHeader(DisplayName = "发货零件号")]
-        /// <summary>
-        /// 扩展字段1
-        /// </summary>
-        public string Extend1 { set; get; }
-        /// <summary>
-        /// 扩展字段2
-        /// </summary>
-        [ImporterHeader(Name = "收货仓库")]
-        [ExporterHeader(DisplayName = "收货仓库")]
-        public string Extend2 { set; get; }
-        /// <summary>
-        /// 扩展字段3
-        /// </summary>
-        [ImporterHeader(Name = "版本号", IsIgnore = true)]
-        [ExporterHeader(DisplayName = "版本号", IsIgnore = true)]
-        public string Version { set; get; }
-        [ImporterHeader(Name = "结算数量")]
-        [ExporterHeader(DisplayName = "结算数量")]
-        public decimal Qty { set; get; }
-        [ImporterHeader(Name = "数量", IsIgnore = true)]
-        [ExporterHeader(DisplayName = "数量", IsIgnore = true)]
-        public string BillNum { set; get; }
-        [ImporterHeader(Name = "任务描述", IsIgnore = true)]
-        [ExporterHeader(DisplayName = "任务描述", IsIgnore = true)]
-        public Guid TaskId { set; get; }
-
-
-
-
-
-
-
-
-
-
-
-      
-
-
-
-
-    }
-    
-    /// <summary>
-    /// 备件出库
-    /// </summary>
-    public class WmsHQFSharePartOutPut : FullAuditedAggregateRootBase<Guid>
-    {
-        public WmsHQFSharePartOutPut()
-        {
-        }
-        public WmsHQFSharePartOutPut(Guid id, string version, string billNum, string creator) : base(id)
-        {
-            Id = id;
-            Version = version;
-            BillNum = billNum;
-            Creator = creator;
-        }
-        public string Version { set; get; }
-        public string BillNum { set; get; }
-        public string Creator { set; get; }
-
-    }
-
-
-    /// <summary>
-    /// F平台-备件出库明细
-    /// </summary>
-    public class WmsHQFSharePartOutPutDetial : FullAuditedAggregateRootBase<Guid>
-    {
-
-        public WmsHQFSharePartOutPutDetial()
-        {
-        }
-        public WmsHQFSharePartOutPutDetial(Guid id, string wmsBillNum, string orderBillNum, string materialCode, string materialDesc, string materialGroup, string outPut, string inPut, int state, string extend1, string extend2, string extend3, string parentMaterialCode, string billNum, Guid taskId, string remark, decimal qty, decimal stockQty,decimal outPutQty)
-        {
-            Id = id;
-            WmsBillNum = wmsBillNum;
-            OrderBillNum = orderBillNum;
-            MaterialCode = materialCode;
-            MaterialDesc = materialDesc;
-            MaterialGroup = materialGroup;
-            OutPut = outPut;
-            InPut = inPut;
-            State = state;
-            Extend1 = extend1;
-            Extend2 = extend2;
-            Version = extend3;
-            ParentMaterialCode = parentMaterialCode;
-            BillNum = billNum;
-            TaskId = taskId;
-            Remark = remark;
-            Qty = qty;
-            StockQty = stockQty;
-            OutPutQty = outPutQty;
-            BranchId = Id;
-
-        }
-        public void SetId(Guid id)
-        {
-            Id = id;
-        }
-        //交货单号
-
-        [ImporterHeader(Name = "寄销库数量", IsIgnore = true)]
-        [ExporterHeader(DisplayName = "寄销库数量", IsIgnore = true)]
-        public decimal StockQty { set; get; }
-
-        [ImporterHeader(Name = "组件组物料", IsIgnore = true)]
-        [ExporterHeader(DisplayName = "组件组物料", IsIgnore = true)]
-        public string ParentMaterialCode { set; get; }
-        [ImporterHeader(Name = "交货单号", IsIgnore = true)]
-        [ExporterHeader(DisplayName = "交货单号", IsIgnore = true)]
-        public string WmsBillNum { set; get; }
-        [ImporterHeader(Name = "看板号", IsIgnore = true)]
-        [ExporterHeader(DisplayName = "看板号", IsIgnore = true)]
-        //KENN号
-        public string OrderBillNum { set; get; }
-        [ImporterHeader(Name = "Sap编码")]
-        [ExporterHeader(DisplayName = "Sap编码")]
-        //物料号
-        public string MaterialCode { set; get; }
-        [ImporterHeader(Name = "结算物料描述")]
-        [ExporterHeader(DisplayName = "结算物料描述")]
-        //物料描述
-        public string MaterialDesc { set; get; }
-        [ImporterHeader(Name = "物料组(车型)")]
-        [ExporterHeader(DisplayName = "物料组(车型)")]
-        //物料组(车型)  
-        public string MaterialGroup { set; get; }
-        [ImporterHeader(Name = "出库库位", IsIgnore = true)]
-        [ExporterHeader(DisplayName = "出库库位", IsIgnore = true)]
-        //出库库位
-        public string OutPut { set; get; }
-        [ImporterHeader(Name = "入库库位", IsIgnore = true)]
-        [ExporterHeader(DisplayName = "入库库位", IsIgnore = true)]
-        //入库库位
-        public string InPut { set; get; }
-        [ImporterHeader(Name = "状态", IsIgnore = true)]
-        [ExporterHeader(DisplayName = "状态", IsIgnore = true)]
-        public int State { get; set; }
-        [ImporterHeader(Name = "结算物料号")]
-        [ExporterHeader(DisplayName = "结算物料号")]
-        /// <summary>
-        /// 扩展字段1
-        /// </summary>
-        public string Extend1 { set; get; }
-        /// <summary>
-        /// 扩展字段2
-        /// </summary>
-        [ImporterHeader(Name = "收货仓库")]
-        [ExporterHeader(DisplayName = "收货仓库")]
-        public string Extend2 { set; get; }
-        /// <summary>
-        /// 扩展字段3
-        /// </summary>
-        [ImporterHeader(Name = "版本号", IsIgnore = true)]
-        [ExporterHeader(DisplayName = "版本号", IsIgnore = true)]
-        public string Version { set; get; }
-        [ImporterHeader(Name = "结算数量")]
-        [ExporterHeader(DisplayName = "结算数量")]
-        public decimal Qty { set; get; }
-        [ImporterHeader(Name = "单据号", IsIgnore = true)]
-        [ExporterHeader(DisplayName = "单据号", IsIgnore = true)]
-        public string BillNum { set; get; }
-        [ImporterHeader(Name = "任务ID", IsIgnore = true)]
-        [ExporterHeader(DisplayName = "任务ID", IsIgnore = true)]
-        public Guid TaskId { set; get; }
-
-        [ImporterHeader(Name = "出库数量", IsIgnore = true)]
-        [ExporterHeader(DisplayName = "出库数量", IsIgnore = true)]
-        public decimal OutPutQty { set; get; }
-    }
-
-
-
-    public class WmsHQHKanbanOutPut : FullAuditedAggregateRootBase<Guid>
-    {
-        public WmsHQHKanbanOutPut()
-        {
-        }
-
-        public WmsHQHKanbanOutPut(Guid id, string version, string billNum, string creator,string content) : base(id)
-        {
-            Id = id;
-            Version = version;
-            BillNum = billNum;
-            Creator = creator;
-            SumContent = content;
-
-        }
-        public string SumContent { set; get; }
-
-        public string Version { set; get; }
-        public string BillNum { set; get; }
-        public string Creator { set; get; }
-    }
-
-
-    /// <summary>
-    /// H平台出库单
-    /// </summary>
-    public class WmsHQHKanbanOutPutDetial : FullAuditedAggregateRootBase<Guid>
-    {
-        public WmsHQHKanbanOutPutDetial()
-        {
-        }
-
-        public WmsHQHKanbanOutPutDetial(Guid id, string wmsBillNum, string kanban, string materialCode, string materialDesc, string materialGroup, 
-            string outPut, string inPut, int state, string extend1, string extend2, string extend3, string parentMaterialCode, string billNum,
-            Guid taskId, string remark, decimal qty, string poline,decimal price,decimal amt)
-        {
-            Id = id;
-            WmsBillNum = wmsBillNum;
-            Kanban = kanban;
-            MaterialCode = materialCode;
-            MaterialDesc = materialDesc;
-            MaterialGroup = materialGroup;
-            OutPut = outPut;
-            InPut = inPut;
-            State = state;
-            Extend1 = extend1;
-            Extend2 = extend2;
-            Version = extend3;
-            ParentMaterialCode = parentMaterialCode;
-            BillNum = billNum;
-            TaskId = taskId;
-            Remark = remark;
-            Qty = qty;
-            PoLine = poline;
-            Price = price;
-            Amt = amt;
-        }
-        public void SetData(Guid id, string remark, string wmsbillnum, string version, Guid taskId)
-        {
-            Id = id;
-            Remark = remark;
-            WmsBillNum = wmsbillnum;
-            Version = version;
-            TaskId = taskId;
-        }
-
-
-        [ImporterHeader(Name = "行号")]
-        [ExporterHeader(DisplayName = "行号")]
-        public string PoLine { set; get; }
-
-        [ImporterHeader(Name = "订货看板编号")]
-        [ExporterHeader(DisplayName = "订货看板编号")]
-        //KENN号
-        public string Kanban { set; get; }
-
-        [ImporterHeader(Name = "组件组物料", IsIgnore = true)]
-        [ExporterHeader(DisplayName = "组件组物料", IsIgnore = true)]
-        public string ParentMaterialCode { set; get; }
-        [ImporterHeader(Name = "交货单号")]
-        [ExporterHeader(DisplayName = "交货单号")]
-        public string WmsBillNum { set; get; }
-        //[ImporterHeader(Name = "订货看板编号")]
-        ////KENN号
-        //public string OrderBillNum { set; get; }
-        [ImporterHeader(Name = "Sap编码")]
-        [ExporterHeader(DisplayName = "Sap编码")]
-        //物料号
-        public string MaterialCode { set; get; }
-        [ImporterHeader(Name = "零件中文名称")]
-        [ExporterHeader(DisplayName = "零件中文名称")]
-        //物料描述
-        public string MaterialDesc { set; get; }
-        [ImporterHeader(Name = "物料组(车型)")]
-        [ExporterHeader(DisplayName = "物料组(车型)")]
-        //物料组(车型)  
-        public string MaterialGroup { set; get; }
-        [ImporterHeader(Name = "出库库位", IsIgnore = true)]
-        [ExporterHeader(DisplayName = "出库库位", IsIgnore = true)]
-        //出库库位
-        public string OutPut { set; get; }
-        [ImporterHeader(Name = "入库库位", IsIgnore = true)]
-        [ExporterHeader(DisplayName = "入库库位", IsIgnore = true)]
-        //入库库位
-        public string InPut { set; get; }
-        [ImporterHeader(Name = "状态", IsIgnore = true)]
-        [ExporterHeader(DisplayName = "状态", IsIgnore = true)]
-        public int State { get; set; }
-
-        [ImporterHeader(Name = "订货零件号")]
-        [ExporterHeader(DisplayName = "订货零件号")]
-        /// <summary>
-        /// 扩展字段1
-        /// </summary>
-        public string Extend1 { set; get; }
-        /// <summary>
-        /// 扩展字段2
-        /// </summary>
-        [ImporterHeader(Name = "收货仓库")]
-        [ExporterHeader(DisplayName = "收货仓库")]
-        public string Extend2 { set; get; }
-        /// <summary>
-        /// 扩展字段3
-        /// </summary>
-        [ImporterHeader(Name = "版本号", IsIgnore = true)]
-        [ExporterHeader(DisplayName = "版本号", IsIgnore = true)]
-        public string Version { set; get; }
-        [ImporterHeader(Name = "结算数量")]
-        [ExporterHeader(DisplayName = "结算数量")]
-        public decimal Qty { set; get; }
-        [ImporterHeader(Name = "结算单价")]
-        [ExporterHeader(DisplayName = "结算单价")]
-        public decimal Price { set; get; }
-        [ImporterHeader(Name = "结算金额")]
-        [ExporterHeader(DisplayName = "结算金额")]
-        public decimal Amt { set; get; }
-        [ImporterHeader(Name = "数量", IsIgnore = true)]
-        [ExporterHeader(DisplayName = "数量", IsIgnore = true)]
-        public string BillNum { set; get; }
-        [ImporterHeader(Name = "任务描述", IsIgnore = true)]
-        [ExporterHeader(DisplayName = "任务描述", IsIgnore = true)]
-        public Guid TaskId { set; get; }
-
-
-
-    }
-
-    /// <summary>
-    /// 备件出库
-    /// </summary>
-    public class WmsHQHSharePartOutPut : FullAuditedAggregateRootBase<Guid>
-    {
-        public WmsHQHSharePartOutPut()
-        {
-        }
-        public WmsHQHSharePartOutPut(Guid id, string version, string billNum, string creator) : base(id)
-        {
-            Id = id;
-            Version = version;
-            BillNum = billNum;
-            Creator = creator;
-        }
-        public string Version { set; get; }
-        public string BillNum { set; get; }
-        public string Creator { set; get; }
-
-    }
-
-
-    /// <summary>
-    /// H-平台-备件出库明细
-    /// </summary>
-    public class WmsHQHSharePartOutPutDetial : FullAuditedAggregateRootBase<Guid>
-    {
-
-        
-
-
-        public WmsHQHSharePartOutPutDetial()
-        {
-        }
-        public WmsHQHSharePartOutPutDetial(Guid id, string wmsBillNum, string orderBillNum, string materialCode, string materialDesc, string materialGroup, string outPut, string inPut, int state, string extend1, string extend2, string extend3, string parentMaterialCode, string billNum, Guid taskId, string remark, decimal qty,decimal stockQty,decimal outputQty)
-        {
-            Id = id;
-            WmsBillNum = wmsBillNum;
-            OrderBillNum = orderBillNum;
-            MaterialCode = materialCode;
-            MaterialDesc = materialDesc;
-            MaterialGroup = materialGroup;
-            OutPut = outPut;
-            InPut = inPut;
-            State = state;
-            Extend1 = extend1;
-            Extend2 = extend2;
-            Version = extend3;
-            ParentMaterialCode = parentMaterialCode;
-            BillNum = billNum;
-            TaskId = taskId;
-            Remark = remark;
-            Qty = qty;
-            StockQty = stockQty;
-            OutPutQty = outputQty;
-            BranchId = Id;
-
-
-
-
-        }
-        public void SetId(Guid id)
-        {
-            Id = id;
-        }
-        //交货单号
-
-        [ImporterHeader(Name = "寄销库数量", IsIgnore = true)]
-        [ExporterHeader(DisplayName = "寄销库数量", IsIgnore = true)]
-        public decimal StockQty { set; get; }
-
-        [ImporterHeader(Name = "组件组物料", IsIgnore = true)]
-        [ExporterHeader(DisplayName = "寄销库数量", IsIgnore = true)]
-        public string ParentMaterialCode { set; get; }
-        [ImporterHeader(Name = "交货单号", IsIgnore = true)]
-        [ExporterHeader(DisplayName = "交货单号", IsIgnore = true)]
-        public string WmsBillNum { set; get; }
-        [ImporterHeader(Name = "看板号", IsIgnore = true)]
-        [ExporterHeader(DisplayName = "看板号", IsIgnore = true)]
-        //KENN号
-        public string OrderBillNum { set; get; }
-        [ImporterHeader(Name = "Sap编码")]
-        [ExporterHeader(DisplayName = "Sap编码")]
-        //物料号
-        public string MaterialCode { set; get; }
-        [ImporterHeader(Name = "结算物料描述")]
-        [ExporterHeader(DisplayName = "结算物料描述")]
-        //物料描述
-        public string MaterialDesc { set; get; }
-        [ImporterHeader(Name = "物料组(车型)")]
-        [ExporterHeader(DisplayName = "物料组(车型)")]
-        //物料组(车型)  
-        public string MaterialGroup { set; get; }
-        [ImporterHeader(Name = "出库库位", IsIgnore = true)]
-        [ExporterHeader(DisplayName = "出库库位", IsIgnore = true)]
-        //出库库位
-        public string OutPut { set; get; }
-        [ImporterHeader(Name = "入库库位", IsIgnore = true)]
-        [ExporterHeader(DisplayName = "入库库位", IsIgnore = true)]
-        //入库库位
-        public string InPut { set; get; }
-        [ImporterHeader(Name = "状态", IsIgnore = true)]
-        [ExporterHeader(DisplayName = "状态", IsIgnore = true)]
-        public int State { get; set; }
-        [ImporterHeader(Name = "结算物料号")]
-        [ExporterHeader(DisplayName = "结算物料号")]
-        /// <summary>
-        /// 扩展字段1
-        /// </summary>
-        public string Extend1 { set; get; }
-        /// <summary>
-        /// 扩展字段2
-        /// </summary>
-        [ImporterHeader(Name = "收货仓库")]
-        [ExporterHeader(DisplayName = "收货仓库")]
-        public string Extend2 { set; get; }
-        /// <summary>
-        /// 扩展字段3
-        /// </summary>
-        [ImporterHeader(Name = "版本号", IsIgnore = true)]
-        [ExporterHeader(DisplayName = "版本号", IsIgnore = true)]
-        public string Version { set; get; }
-        [ImporterHeader(Name = "结算数量")]
-        [ExporterHeader(DisplayName = "结算数量")]
-        public decimal Qty { set; get; }
-        [ImporterHeader(Name = "单据号", IsIgnore = true)]
-        [ExporterHeader(DisplayName = "单据号", IsIgnore = true)]
-        public string BillNum { set; get; }
-        [ImporterHeader(Name = "任务ID", IsIgnore = true)]
-        [ExporterHeader(DisplayName = "任务ID", IsIgnore = true)]
-        public Guid TaskId { set; get; }
-        [ImporterHeader(Name = "出库数量", IsIgnore = true)]
-        [ExporterHeader(DisplayName = "出库数量", IsIgnore = true)]
-        public decimal OutPutQty { set; get; }
-    }
-
-
-
-
-
-    #endregion
-
-    /// <summary>
-    /// 备件无订单号出库
-    /// </summary>
-
-    public class WmsSharePartOutPutDetial2: FullAuditedAggregateRootBase<Guid>
-    {
-        public WmsSharePartOutPutDetial2()
-        {
-        }
-
-        public WmsSharePartOutPutDetial2(Guid id, string wmsBillNum, string orderBillNum, string materialCode, string materialDesc, string materialGroup, string outPut, string inPut, int state, string extend1, string extend2, string extend3, string parentMaterialCode, string billNum, Guid taskId, string remark, decimal qty)
-        {
-            Id = id;
-            //WmsBillNum = wmsBillNum;
-            //OrderBillNum = orderBillNum;
-            MaterialCode = materialCode;
-            MaterialDesc = materialDesc;
-            //MaterialGroup = materialGroup;
-            OutPut = outPut;
-            InPut = inPut;
-            State = state;
-            Extend1 = extend1;
-            Extend2 = extend2;
-            Version = extend3;
-            //ParentMaterialCode = parentMaterialCode;
-            BillNum = billNum;
-            TaskId = taskId;
-            Remark = remark;
-            Qty = qty;
-        }
-
-
-        public void SetId(Guid id)
-        {
-            Id = id;
-        }
-
-
-        //[ImporterHeader(Name = "组件组物料")]
-        //public string ParentMaterialCode { set; get; }
-        //[ImporterHeader(Name = "交货单号")]
-        //public string WmsBillNum { set; get; }
-        //[ImporterHeader(Name = "采购订单号")]
-        ////KENN号
-        //public string OrderBillNum { set; get; }
-
-        [ImporterHeader(Name = "SAP编码")]
-        //物料号
-        public string MaterialCode { set; get; }
-        [ImporterHeader(Name = "物料描述")]
-        //物料描述
-        public string MaterialDesc { set; get; }
-        //[ImporterHeader(Name = "物料组(车型)",IsIgnore =true)]
-        ////物料组(车型)  
-        //public string MaterialGroup { set; get; }
-        [ImporterHeader(Name = "出库库位", IsIgnore = true)]
-        //出库库位
-        public string OutPut { set; get; }
-        [ImporterHeader(Name = "入库库位", IsIgnore = true)]
-        //入库库位
-        public string InPut { set; get; }
-        [ImporterHeader(Name = "状态", IsIgnore = true)]
-        public int State { get; set; }
-        [ImporterHeader(Name = "物料代码")]
-        /// <summary>
-        /// 扩展字段1
-        /// </summary>
-        public string Extend1 { set; get; }
-        /// <summary>
-        /// 扩展字段2
-        /// </summary>
-        [ImporterHeader(Name = "扩展字段2", IsIgnore = true)]
-        public string Extend2 { set; get; }
-        /// <summary>
-        /// 扩展字段3
-        /// </summary>
-        [ImporterHeader(Name = "版本号", IsIgnore = true)]
-        public string Version { set; get; }
-        [ImporterHeader(Name = "开票数量")]
-        public decimal InvoiceQty { set; get; }
-        [ImporterHeader(Name = "出库数量", IsIgnore = true)]
-        public decimal Qty { set; get; }
-        [ImporterHeader(Name = "已出数量", IsIgnore = true)]
-        public decimal OutQty { set; get; }
-        [ImporterHeader(Name = "数量", IsIgnore = true)]
-        public string BillNum { set; get; }
-
-
-        public Guid TaskId { set; get; }
-
-
-    }
-
-
-
-
-
-    /// <summary>
-    /// 备件出库
-    /// </summary>
-    public class WmsSharePartOutPut : FullAuditedAggregateRootBase<Guid>
-    {
-        public WmsSharePartOutPut()
-        {
-        }
-
-        public WmsSharePartOutPut(Guid id, string version, string billNum, string creator,string content) : base(id)
-        {
-            Id = id;
-            Version = version;
-            BillNum = billNum;
-            Creator = creator;
-            SumContent = content;
-        }
-
-        public string Version { set; get; }
-
-        public string BillNum { set; get; }
-
-        public string Creator { set; get; }
-
-        public string SumContent { set; get; }
-
-    }
-
-
-    /// <summary>
-    /// 备件无单号出库明细
-    /// </summary>
-    //[ExcelImporter(SheetName = "大众备件数据输出")]
-    public class WmsSharePartOutPutDetial : FullAuditedAggregateRootBase<Guid>
-    {
-        public WmsSharePartOutPutDetial()
-        {
-        }
-
-        public WmsSharePartOutPutDetial(Guid id, string wmsBillNum, string orderBillNum, string materialCode, string materialDesc, 
-            string materialGroup, string outPut, string inPut, int state, string extend1, string extend2, string extend3, 
-            string parentMaterialCode, string billNum, Guid taskId, string remark, decimal qty, decimal stockQty,
-            decimal outputQty, decimal price, decimal amt,decimal realqty)
-        {
-            Id = id;
-            WmsBillNum = wmsBillNum;
-            OrderBillNum = orderBillNum;
-            MaterialCode = materialCode;
-            MaterialDesc = materialDesc;
-            MaterialGroup = materialGroup;
-            OutPut = outPut;
-            InPut = inPut;
-            State = state;
-            Extend1 = extend1;
-            Extend2 = extend2;
-            Version = extend3;
-            ParentMaterialCode = parentMaterialCode;
-            BillNum = billNum;
-            TaskId = taskId;
-            Remark = remark;
-            Qty = qty;
-            StockQty = stockQty;
-            OutPutQty = outputQty;
-            Price = price;
-            Amt = amt;
-            RealityNumber = realqty;
-        }
-
-      
-
-        public void SetId(Guid id)
-        {
-            Id = id;
-        }
-
-       // 期间 交货单号    发货日期 采购订单号   SAP编码 物料代码    物料描述 物料组 开票单价 数量差异    发货数量 开票数量    定价 单价差异
-
-
-        [ImporterHeader(Name = "组件组物料",IsIgnore =true)]
-        [ExporterHeader(DisplayName = "组件组物料", IsIgnore = true)]
-        public string ParentMaterialCode { set; get; }
-        [ImporterHeader(Name = "交货单号")]
-        [ExporterHeader(DisplayName = "交货单号")]
-        public string WmsBillNum { set; get; }
-        [ImporterHeader(Name = "采购订单号")]
-        [ExporterHeader(DisplayName = "采购订单号")]
-        //KENN号
-        public string OrderBillNum { set; get; }
-
-        [ImporterHeader(Name = "SAP编码")]
-        [ExporterHeader(DisplayName = "SAP编码")]
-        //物料号
-        public string MaterialCode { set; get; }
-        [ImporterHeader(Name = "物料描述")]
-        [ExporterHeader(DisplayName = "物料描述")]
-        //物料描述
-        public string MaterialDesc { set; get; }
-        [ImporterHeader(Name = "物料组(车型)")]
-        [ExporterHeader(DisplayName = "物料组(车型)")]
-        //物料组(车型)  
-        public string MaterialGroup { set; get; }
-        [ImporterHeader(Name = "出库库位", IsIgnore = true)]
-        [ExporterHeader(DisplayName = "出库库位", IsIgnore = true)]
-        //出库库位
-        public string OutPut { set; get; }
-        [ImporterHeader(Name = "入库库位", IsIgnore = true)]
-        [ExporterHeader(DisplayName = "入库库位", IsIgnore = true)]
-        //入库库位
-        public string InPut { set; get; }
-        [ImporterHeader(Name = "状态", IsIgnore = true)]
-        [ExporterHeader(DisplayName = "状态", IsIgnore = true)]
-        public int State { get; set; }
-        [ImporterHeader(Name = "物料代码")]
-        [ExporterHeader(DisplayName = "物料代码")]
-        /// <summary>
-        /// 扩展字段1
-        /// </summary>
-        public string Extend1 { set; get; }
-        /// <summary>
-        /// 扩展字段2
-        /// </summary>
-        [ImporterHeader(Name = "扩展字段2", IsIgnore = true)]
-        [ExporterHeader(DisplayName = "扩展字段2", IsIgnore = true)]
-        public string Extend2 { set; get; }
-        /// <summary>
-        /// 扩展字段3
-        /// </summary>
-        [ImporterHeader(Name = "版本号", IsIgnore = true)]
-        [ExporterHeader(DisplayName = "版本号", IsIgnore = true)]
-        public string Version { set; get; }
-        [ImporterHeader(Name = "开票数量")]
-        [ExporterHeader(DisplayName = "开票数量")]
-        public decimal Qty { set; get; }
-
-        [ImporterHeader(Name = "单据", IsIgnore = true)]
-        [ExporterHeader(DisplayName = "单据", IsIgnore = true)]
-        public string BillNum { set; get; }
-
-
-        [ImporterHeader(Name = "任务代码", IsIgnore = true)]
-        [ExporterHeader(DisplayName = "任务代码", IsIgnore = true)]
-        public Guid TaskId { set; get; }
-
-        [ImporterHeader(Name = "寄销库数量", IsIgnore = true)]
-        [ExporterHeader(DisplayName = "寄销库数量", IsIgnore = true)]
-        public decimal StockQty { set; get; }
-
-        [ImporterHeader(Name = "出库数量", IsIgnore = true)]
-        [ExporterHeader(DisplayName = "出库数量", IsIgnore = true)]
-        public decimal OutPutQty { set; get; }
-
-
-        [ImporterHeader(Name = "真实数量", IsIgnore = true)]
-        [ExporterHeader(DisplayName = "真实数量", IsIgnore = true)]
-        public decimal RealityNumber { set; get; }
-
-
-        [ImporterHeader(Name = "开票单价")]
-        [ExporterHeader(DisplayName = "开票单价")]
-
-        public decimal Price { set; get; }
-        [ImporterHeader(Name = "开票金额")]
-        [ExporterHeader(DisplayName = "开票金额")]
-        public decimal Amt { set; get; }
-
-
-    }
-
-
-
-
-
-    public class WmsSharePart90OutPut : FullAuditedAggregateRootBase<Guid>
-    {
-        public WmsSharePart90OutPut()
-        {
-        }
-
-        public WmsSharePart90OutPut(Guid id, string version, string billNum, string creator,string content) : base(id)
-        {
-            Id = id;
-            Version = version;
-            BillNum = billNum;
-            Creator = creator;
-            SumContent = content;
-        }
-
-        public string Version { set; get; }
-
-        public string BillNum { set; get; }
-
-        public string Creator { set; get; }
-
-        public string SumContent { set; get; }
-
-    }
-
-
-
-    //public class WmsSharePart90OutPutDetial : FullAuditedAggregateRootBase<Guid>
-    //{
-    //    public WmsSharePart90OutPutDetial()
-    //    {
-    //    }
-
-    //    public WmsSharePart90OutPutDetial(Guid id, DateTime spareDate, string orderGoodsData, string wmsBillNum, string orderBillNum, 
-    //        string materialCode, string materialDesc, string purchaseOrderNoText, string extend1, string extend2, string extend3,
-    //         decimal billNum, decimal qty, decimal diffQty, decimal invoicePrice, decimal amountNoTax, decimal price, decimal diffPrice, decimal diffAmountNoTax,string billNO,
-    //         Guid taskId, string remark, decimal stockQty, decimal outputQty, string outPut, string inPut,
-    //        int state)
-    //    {
-    //        Id = id;
-    //        SpareDate = spareDate;
-    //        OrderGoodsData = orderGoodsData;
-    //        WmsBillNum = wmsBillNum;
-    //        OrderBillNum = orderBillNum;
-    //        MaterialCode = materialCode;
-    //        MaterialDesc = materialDesc;
-    //        PurchaseOrderNoText = purchaseOrderNoText;
-    //        Extend1 = extend1;
-    //        Extend2 = extend2;
-    //        Version = extend3;
-    //        BillNum = billNum;
-    //        Qty = qty;
-    //        DiffQty = diffQty;
-    //        InvoicePrice = invoicePrice;
-    //        AmountNoTax = amountNoTax;
-    //        Price = price;
-    //        DiffPrice = diffPrice;
-    //        DiffAmountNoTax = diffAmountNoTax;
-    //        BillNO = billNO;
-    //        TaskId = taskId;
-    //        Remark = remark;
-          
-    //        StockQty = stockQty;
-    //        OutPutQty = outputQty;
-    //        OutPut = outPut;
-    //        InPut = inPut;
-    //        State = state;
-    //    }
-
-
-    //    public void SetId(Guid id)
-    //    {
-    //        Id = id;
-    //    }
-
-    //    // 期间 交货单号    发货日期 采购订单号   SAP编码 物料代码    物料描述 物料组 开票单价 数量差异    发货数量 开票数量    定价 单价差异
-
-
-    //    [ImporterHeader(Name = "寄销库数量", IsIgnore = true)]
-    //    public decimal StockQty { set; get; }
-
-    //    [ImporterHeader(Name = "出库数量", IsIgnore = true)]
-    //    public decimal OutPutQty { set; get; }
-
-    //    [ImporterHeader(Name = "交货日期", Format ="yyyy-MM-dd")]
-    //    public DateTime SpareDate { get; set; }
-
-    //    [ImporterHeader(Name = "交货单号")]
-    //    public string WmsBillNum { set; get; }
-
-    //    [ImporterHeader(Name = "订单日期")]
-    //    public string OrderGoodsData { set; get; }
-
-    //    [ImporterHeader(Name = "采购订单号")]
-    //    //KENN号
-    //    public string OrderBillNum { set; get; }
-    //    [ImporterHeader(Name = "SAP编码")]
-    //    public string MaterialCode { set; get; }
-    //    [ImporterHeader(Name = "物料代码")]
-    //    public string Extend1 { set; get; }
-
-    //    [ImporterHeader(Name = "物料描述")]
-    //    public string MaterialDesc { set; get; }
-
-    //    [ImporterHeader(Name = "采购订单文本")]
-    //    public string PurchaseOrderNoText { get; set; }
-
-    //    [ImporterHeader(Name = "发货数量", IsIgnore = true)]
-    //    public decimal BillNum { set; get; }
-
-    //    [ImporterHeader(Name = "开票数量")]
-    //    public decimal Qty { set; get; }
-
-    //    [ImporterHeader(Name = "发货与开票差异")]
-    //    public decimal DiffQty { set; get; }
-
-    //    [ImporterHeader(Name = "开票单价")]
-    //    public decimal InvoicePrice { get; set; }
-
-    //    [ImporterHeader(Name = "开票金额")]
-    //    public decimal AmountNoTax { get; set; }
-
-    //    [ImporterHeader(Name = "定价")]
-    //    public decimal Price { get; set; }
-
-    //    [ImporterHeader(Name = "单价差异")]
-    //    public decimal DiffPrice { get; set; }
-
-    //    [ImporterHeader(Name = "差异总金额")]
-    //    public decimal DiffAmountNoTax { get; set; }
-
-    //    [ImporterHeader(Name = "单据", IsIgnore = true)]
-    //    public string BillNO { set; get; }
-
-
-    //    [ImporterHeader(Name = "出库库位", IsIgnore = true)]
-    //    //出库库位
-    //    public string OutPut { set; get; }
-    //    [ImporterHeader(Name = "入库库位", IsIgnore = true)]
-    //    //入库库位
-    //    public string InPut { set; get; }
-    //    [ImporterHeader(Name = "状态", IsIgnore = true)]
-    //    public int State { get; set; }
-        
-    //    /// <summary>
-    //    /// 扩展字段2
-    //    /// </summary>
-    //    [ImporterHeader(Name = "扩展字段2", IsIgnore = true)]
-    //    public string Extend2 { set; get; }
-    //    /// <summary>
-    //    /// 扩展字段3
-    //    /// </summary>
-    //    [ImporterHeader(Name = "版本号", IsIgnore = true)]
-    //    public string Version { set; get; }
-      
-
-      
-
-
-    //    [ImporterHeader(Name = "任务代码", IsIgnore = true)]
-    //    public Guid TaskId { set; get; }
-
-
-    //}
-
-
-    public class WmsSharePart90OutPutDetial : FullAuditedAggregateRootBase<Guid>
-    {
-        public WmsSharePart90OutPutDetial()
-        {
-        }
-
-        public WmsSharePart90OutPutDetial(Guid id, string wmsBillNum, string orderBillNum, string materialCode, string materialDesc, string materialGroup, string outPut, string inPut, int state, string extend1, string extend2, string extend3, string parentMaterialCode, string billNum, Guid taskId, string remark, decimal qty, decimal stockQty, decimal outputQty, decimal price, decimal amt)
-        {
-            Id = id;
-            WmsBillNum = wmsBillNum;
-            OrderBillNum = orderBillNum;
-            MaterialCode = materialCode;
-            MaterialDesc = materialDesc;
-            MaterialGroup = materialGroup;
-            OutPut = outPut;
-            InPut = inPut;
-            State = state;
-            Extend1 = extend1;
-            Extend2 = extend2;
-            Version = extend3;
-            ParentMaterialCode = parentMaterialCode;
-            BillNum = billNum;
-            TaskId = taskId;
-            Remark = remark;
-            Qty = qty;
-            StockQty = stockQty;
-            OutPutQty = outputQty;
-            Price = price;
-            Amt = amt;
-        }
-
-      
-
-        public void SetId(Guid id)
-        {
-            Id = id;
-        }
-
-        // 期间 交货单号    发货日期 采购订单号   SAP编码 物料代码    物料描述 物料组 开票单价 数量差异    发货数量 开票数量    定价 单价差异
-
-
-        [ImporterHeader(Name = "寄销库数量", IsIgnore = true)]
-        [ExporterHeader(DisplayName = "寄销库数量", IsIgnore = true)]
-        public decimal StockQty { set; get; }
-
-        [ImporterHeader(Name = "出库数量", IsIgnore = true)]
-        [ExporterHeader(DisplayName = "出库数量", IsIgnore = true)]
-        public decimal OutPutQty { set; get; }
-
-        [ImporterHeader(Name = "组件组物料", IsIgnore = true)]
-        [ExporterHeader(DisplayName = "组件组物料", IsIgnore = true)]
-        public string ParentMaterialCode { set; get; }
-        [ImporterHeader(Name = "交货单号")]
-        [ExporterHeader(DisplayName = "交货单号")]
-        public string WmsBillNum { set; get; }
-        [ImporterHeader(Name = "采购订单号")]
-        [ExporterHeader(DisplayName = "采购订单号")]
-        //KENN号
-        public string OrderBillNum { set; get; }
-
-        [ImporterHeader(Name = "SAP编码")]
-        [ExporterHeader(DisplayName = "SAP编码")]
-        //物料号
-        public string MaterialCode { set; get; }
-        [ImporterHeader(Name = "物料描述")]
-        [ExporterHeader(DisplayName = "物料描述")]
-        //物料描述
-        public string MaterialDesc { set; get; }
-        [ImporterHeader(Name = "物料组(车型)", IsIgnore = true)]
-        [ExporterHeader(DisplayName = "物料组(车型)", IsIgnore = true)]
-        //物料组(车型)  
-        public string MaterialGroup { set; get; }
-        [ImporterHeader(Name = "出库库位", IsIgnore = true)]
-        [ExporterHeader(DisplayName = "出库库位", IsIgnore = true)]
-        //出库库位
-        public string OutPut { set; get; }
-        [ImporterHeader(Name = "入库库位", IsIgnore = true)]
-        [ExporterHeader(DisplayName = "入库库位", IsIgnore = true)]
-        //入库库位
-        public string InPut { set; get; }
-        [ImporterHeader(Name = "状态", IsIgnore = true)]
-        [ExporterHeader(DisplayName = "状态", IsIgnore = true)]
-        public int State { get; set; }
-        [ImporterHeader(Name = "物料代码")]
-        [ExporterHeader(DisplayName = "物料代码")]
-        /// <summary>
-        /// 扩展字段1
-        /// </summary>
-        public string Extend1 { set; get; }
-        /// <summary>
-        /// 扩展字段2
-        /// </summary>
-        [ImporterHeader(Name = "扩展字段2", IsIgnore = true)]
-        [ExporterHeader(DisplayName = "扩展字段2", IsIgnore = true)]
-        public string Extend2 { set; get; }
-        /// <summary>
-        /// 扩展字段3
-        /// </summary>
-        [ImporterHeader(Name = "版本号", IsIgnore = true)]
-        [ExporterHeader(DisplayName = "版本号", IsIgnore = true)]
-        public string Version { set; get; }
-
-        [ImporterHeader(Name = "开票数量")]
-        [ExporterHeader(DisplayName = "开票数量")]
-        public decimal Qty { set; get; }
-
-        [ImporterHeader(Name = "单据", IsIgnore = true)]
-        [ExporterHeader(DisplayName = "单据", IsIgnore = true)]
-        public string BillNum { set; get; }
-
-
-        [ImporterHeader(Name = "任务代码", IsIgnore = true)]
-        [ExporterHeader(DisplayName = "任务代码", IsIgnore = true)]
-        public Guid TaskId { set; get; }
-        [ImporterHeader(Name = "开票单价")]
-        [ExporterHeader(DisplayName = "开票单价")]
-        public decimal Price { set; get; }
-        [ImporterHeader(Name = "开票金额")]
-        [ExporterHeader(DisplayName = "开票金额")]
-        public decimal Amt { set; get; }
-
-
-    }
-
-
-
-
-
-
-
-
-
-
-
-
-}
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/WMS/WmsOutPutPercent.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/WMS/WmsOutPutPercent.cs
deleted file mode 100644
index 52acfb16..00000000
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/WMS/WmsOutPutPercent.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Win.Sfs.Shared.DomainBase;
-
-namespace Win.Sfs.SettleAccount.Entities.WMS
-{
-    public class WmsOutPutPercent:FullAuditedAggregateRootBase<Guid>
-    {
-        public WmsOutPutPercent(Guid id,decimal completeQty, decimal applyQty, decimal cancelQty):base(id)
-        {
-            CompleteQty = completeQty;
-            ApplyQty = applyQty;
-            CancelQty = cancelQty;
-        }
-
-        public decimal CompleteQty { set; get; }
-
-        public decimal ApplyQty { set; get; }
-
-        public decimal CancelQty { set; get; }
-
-
-
-    }
-}
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/EntityFrameworkCore/SettleAccountDbContextModelCreatingExtensions.cs b/code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/EntityFrameworkCore/SettleAccountDbContextModelCreatingExtensions.cs
index 72baf19e..b3795b1a 100644
--- a/code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/EntityFrameworkCore/SettleAccountDbContextModelCreatingExtensions.cs
+++ b/code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/EntityFrameworkCore/SettleAccountDbContextModelCreatingExtensions.cs
@@ -7,16 +7,12 @@ using Win.Sfs.SettleAccount.Customers;
 using Win.Sfs.SettleAccount.Entities.Boms;
 using Win.Sfs.SettleAccount.Entities.CodeSettings;
 using Win.Sfs.SettleAccount.Entities.Controls;
-using Win.Sfs.SettleAccount.Entities.EstimatedInventories;
-using Win.Sfs.SettleAccount.Entities.EstimatedSums;
 using Win.Sfs.SettleAccount.FISes;
 using Win.Sfs.SettleAccount.Entities.Inventories;
 using Win.Sfs.SettleAccount.Entities.Materials;
-using Win.Sfs.SettleAccount.Entities.SecondaryMatching;
 using Win.Sfs.SettleAccount.Prebatches;
 using Win.Sfs.SettleAccount.Entities.SettleAccounts;
 using Win.Sfs.SettleAccount.Entities.StorageLocations;
-using Win.Sfs.SettleAccount.EstimatedInventories;
 using Win.Sfs.SettleAccount.EstimatedStockDiffReports;
 using Win.Sfs.SettleAccount.Inventories;
 using Win.Sfs.SettleAccount.MaterialRelationships;
@@ -44,17 +40,8 @@ using Win.Sfs.SettleAccount.Entities.FISes;
 using Win.Sfs.SettleAccount.Entities.MaterialRelationships;
 using Win.Sfs.SettleAccount.Entities.SettlementParts;
 using Win.Sfs.SettleAccount.Entities.ItemInvoicePrices;
-using Win.Sfs.SettleAccount.Entities.SettlementPakAndSparePartsRef;
-using Win.Sfs.SettleAccount.Entities.SettlementCrossReferences;
-using Win.Sfs.SettleAccount.Entities.SettlementCrossReference;
 using Win.Sfs.SettleAccount.Entities.SecMatch;
-using Win.Sfs.SettleAccount.Entities.VWKanBan;
-using Win.Sfs.SettleAccount.Entities.VWScrapClaims;
-using Win.Sfs.SettleAccount.Entities.VWSparePart;
-using Win.Sfs.SettleAccount.Entities.WMS_KanBan;
-using Win.Sfs.SettleAccount.Entities.WMS_SparePart;
-using Win.Sfs.SettleAccount.Entities.HQ_H;
-using Win.Sfs.SettleAccount.Entities.WMS;
+
 using Win.Sfs.SettleAccount.Entities.UnHQSettleAccounts;
 using Win.Sfs.SettleAccount.Errors;
 
@@ -75,227 +62,26 @@ namespace Win.Sfs.SettleAccount
                 SettleAccountDbProperties.DbSchema
             );
 
-            // optionsAction?.Invoke(options);
-
-            #region 天合
-            //产品结构
-            builder.ConfigureBom(options);
-
-
-            //结算件
-            builder.ConfigureSettlementPart(options);
-
-
-
-            //ERP总成开票价格
-            builder.ConfigureItemInvoicePrice(options);
-            builder.ConfigureItemInvoicePriceVersion(options);
-
-
-            //客户
-            builder.ConfigureCustomer(options);
-
-            //客户产品结构
-            builder.ConfigureCustomerBom(options);
-            builder.ConfigureEstimatedSum(options);
-            builder.ConfigureCodeSetting(options);
-            builder.ConfigureMaterial(options);
-            builder.ConfigureEstimatedInventoryDetail(options);
-            builder.ConfigureInventoryDetail(options);
-
-
-            builder.ConfigureMaterialRelationship(options);
-            builder.ConfigureFIS(options);
-            builder.ConfigureFISExtend(options);
-            builder.ConfigureCentralizedControl(options);
-            builder.ConfigurePrebatch(options);
-            builder.ConfigureFactory(options);
-            builder.ConfigureSupplierItemSetUp(options);
-            builder.ConfigureSecondaryAdjustment(options);
-            builder.ConfigureSecondaryPriceRatio(options);
-            builder.ConfigureCustomerStorageLocation(options);
-            builder.ConfigureBomVersion(options);
-            builder.ConfigureFISVersion(options);
-            builder.ConfigureEstimatedSumVersion(options);
-            builder.ConfigureEstimatedInventoryVersion(options);
-            builder.ConfigureInventoryDetailVersion(options);
-            builder.ConfigureSecondaryAdjustmentVersion(options);
-            builder.ConfigureSecondaryPriceRatioVersion(options);
-            builder.ConfigureSecondaryDiscount(options);
-            builder.ConfigureSecondaryDiscountVersion(options);
-            builder.ConfigureSecondaryPriceRatioVersion(options);
-            //暂估发出未结算
-            builder.ConfigureEstimatedStockDiffReport(options);
-            //暂估发出未结算明细
-            builder.ConfigureEstimatedStockDiffReportDetail(options);
-            //库存未结算比对
-            builder.ConfigureStockUnsettledDiffReport(options);
-
-            //库存未结算比对明细
-            builder.ConfigureStockUnsettledDiffReportDetail(options);
-
-
-            //R3结算数据对比输出表
-            builder.ConfigureStockSettledDiffReport(options);
-
-            //R3结算数据对比输出表明细
-            builder.ConfigureStockSettledDiffReportDetail(options);
-
-            //FIS发运数据对比输出表
-            builder.ConfigureStockFisDiffReport(options);
-
-            //FIS发运数据对比输出表明细
-            builder.ConfigureStockFisDiffReportDetail(options);
-
-
-            //发出未结算比对
-            builder.ConfigureSendUnsettledDiffReport(options);
-
-            //发出未结算比对明细
-            builder.ConfigureSendUnsettledDiffReportDetail(options);
-
-      
-            //实际二配调整后输出表
-            builder.ConfigureSecondaryActuralAdjustmentReport(options);
-
-            //实际二配调整后输出表明细
-            builder.ConfigureSecondaryActuralAdjustmentReportDetail(options);
-
-
-            //二配对比输出表
-            builder.ConfigureSecondaryActuralDiffReport(options);
-
-            //二配对比输出表明细
-            builder.ConfigureSecondaryActuralDiffReportDetail(options);
-         
-
-
-            //轿车车序与看板差异输出表
-            builder.ConfigureBTSeqKBDiffReport(options);
-
-            //轿车车序与看板差异输出表明细
-            builder.ConfigureBTSeqKBDiffReportDetail(options);
-
-            //轿车发出未结算输出表
-            builder.ConfigureBTNotConsignReport(options);
-            //轿车发出未结算输出表明细
-            builder.ConfigureBTNotConsignReportDetail(options);
-
-
-            builder.ConfigureTaskJob(options);
-            builder.ConfigureImportMap(options);
-
-
-
-
-            builder.ConfigureInvoiceSettledDiff(options);
-            builder.ConfigureInventoryDetailVersion(options);
-            builder.ConfigureInvoiceSettledDiffVersion(options);
-            builder.ConfigurePriceListVersion(options);
-            builder.ConfigurePriceList(options);
-            builder.ConfigureFIS_TH(options);
-            builder.ConfigureMaterialRelationshipVersion(options);
-            builder.ConfigureMaterialRelationshipDetail(options);
-            builder.ConfigureSettlementPartVersion(options);
-            //结算关系对照表
-            builder.ConfigureSettlementCrossReference(options);
-            builder.ConfigureSettlementCrossReferenceVersion(options);
-            //结算包和跟散件对应关系
-            builder.ConfigureSettlementPakAndSpareParts(options);
-            builder.ConfigureSettlementPakAndSparePartsVersion(options);
-
-            builder.ConfigureSecMatchBase(options);
-            builder.ConfigureWmsJitOutPutDetial(options);
-            #endregion
-
 
             #region 派格结算
 
-            //大众看板明细导入
-            builder.ConfigureKanBan(options);
-            builder.ConfigureKanBanVersion(options);
+
 
             //大众发票导入
             builder.ConfigureInvoice(options);
             builder.ConfigureInvoiceVersion(options);
 
-            //CP7报废和索赔
-            builder.ConfigureScrapClaims(options);
-            builder.ConfigureScrapClaimsVersion(options);
-
-            //大众备件
-            builder.ConfigureSparePart(options);
-            builder.ConfigureSparePartVersion(options);
-
-            //大众FIS未结明细
-            builder.ConfigureUnSettleAccount(options);
-            builder.ConfigureUnSettleAccountVersion(options);
-
             //大众准时化结算明细导入-已结
             builder.ConfigureSettleAccount(options);
             builder.ConfigureSettleAccountVersion(options);
 
-            //大众看板发货
-            builder.ConfigureWMSKanBan(options);
-            builder.ConfigureWMSKanBanVersion(options);
-
-            //大众备件发货
-            builder.ConfigureWMSSparePart(options);
-            //builder.ConfigureWMSSparePartVersion(options);
 
-            //红旗H平台
-            builder.ConfigureHQH(options);
-            builder.ConfigureHQHVersion(options);
 
             //红旗主机场-未结明细-导入
             builder.ConfigureUnHQSettleAccount(options);
             builder.ConfigureUnHQSettleAccountVersion(options);
-           
-
-
-            builder.ConfigureWmsJitOutPutDetail(options);
-            builder.ConfigureWmsJitOutPutVersion(options);
-            builder.ConfigureWmsJitOutPutDetail(options);
-            builder.ConfigureWmsJitOutPutVersion(options);
-            builder.ConfigureWmsKanbanOutPutVersion(options);
-            builder.ConfigureWmsKanbanOutPutDetail(options);
-
-            //大众看板
-            builder.ConfigureWmsWithOutKanbanOutPutVersion(options);
-            builder.ConfigureWmsWithOutKanbanOutPutDetail(options);
-            //大众备件-正常出库（有采购订单号）
-            builder.ConfigureWmsSharePartOutPutDetail(options);
-            builder.ConfigureWmsSharePartOutPutVersion(options);
-            //大众备件-数据调整（无采购订单号）
-            builder.ConfigureWmsSharePart90OutPutDetail(options);
-            builder.ConfigureWmsSharePart90OutPutVersion(options);
-
-            builder.ConfigureWmsHQFKanbanOutPutVersion(options);
-            builder.ConfigureWmsHQFKanbanOutPutDetial(options);
-            builder.ConfigureWmsHQFSharePartOutPutVersion(options);
-            builder.ConfigureWmsHQFSharePartOutPutDetial(options);
-            builder.ConfigureWmsHQHKanbanOutPutVersion(options);
-            builder.ConfigureWmsHQHKanbanOutPutDetial(options);
-            builder.ConfigureWmsHQHSharePartOutPutVersion(options);
-            builder.ConfigureWmsHQHSharePartOutPutDetial(options);
-
-            //M平台出库
-            builder.ConfigureWmsHQMKanbanOutPutVersion(options);
-            builder.ConfigureWmsHQMKanbanOutPutDetial(options);
-            builder.ConfigureWmsHQMSharePartOutPutVersion(options);
-            builder.ConfigureWmsHQMSharePartOutPutDetial(options);
-            //一汽轿车出库
-            builder.ConfigureWmsHQCarOutPutVersion(options);
-            builder.ConfigureWmsHQCarPutDetial(options);
-            builder.ConfigurePriceListVersionBJ(options);
-            builder.ConfigurePriceListBJ(options);
-
-            builder.ConfigureWmsHQWithOutKanbanOutPutVersion(options);
-            builder.ConfigureWmsHQWithOutKanbanOutPutDetail(options);
-
-            //一次性寄售销售库
-            builder.ConfigureWmsOneTimeSaleOutPutVersion(options);
-            builder.ConfigureWmsOneTimeSaleOutPutDetial(options);
+
+
 
             builder.ConfigureWmsDetailReport(options);
             builder.ConfigureWmsDetailDiffReport(options);
@@ -304,8 +90,7 @@ namespace Win.Sfs.SettleAccount
 
             //有条码
             builder.ConfigureWmsDetailWithCodeReport(options);
-            builder.ConfigureWmsCustomerKanbanOutPut(options);
-            builder.ConfigureWmsCustomerKanbanOutPutDetial(options);
+
             builder.ConfigureErrorBill(options);
 
             #endregion
@@ -316,53 +101,7 @@ namespace Win.Sfs.SettleAccount
 
         #region 红旗M平台、一汽轿车
 
-        /// <summary>
-        /// M平台-出库单
-        /// </summary>
-        /// <param name="builder"></param>
-        /// <param name="options"></param>
-        private static void ConfigureWmsHQMKanbanOutPutVersion(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options)
-        {
-
-            builder.Entity<WmsHQMKanbanOutPut>(b =>
-            {
-                b.ToTable($"{options.TablePrefix}_WmsHQMKanbanOutPut", options.Schema);
-                b.ConfigureByConvention();
-                b.Property(x => x.BillNum).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.Version).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
-
-                b.HasIndex(x => new { x.BillNum });
-            });
-
-        }
-        /// <summary>
-        /// M平台出库详表
-        /// </summary>
-        /// <param name="builder"></param>
-        /// <param name="options"></param>
-        private static void ConfigureWmsHQMKanbanOutPutDetial(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options)
-        {
-
-            builder.Entity<WmsHQMKanbanOutPutDetial>(b =>
-            {
-                b.ToTable($"{options.TablePrefix}_WmsHQMKanbanOutPutDetial", options.Schema);
-                b.ConfigureByConvention();
-                b.Property(x => x.BillNum).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.WmsBillNum).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.Version).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.OutPut).HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.InPut).HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.PoLine).HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.Kanban).HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.ParentMaterialCode).HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.Extend1).HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.Extend2).HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.MaterialCode).HasMaxLength(CommonConsts.MaxCodeLength);
-                b.HasIndex(x => new { x.Version });
-            });
-
-        }
-
+   
 
 
         /// <summary>
@@ -386,92 +125,6 @@ namespace Win.Sfs.SettleAccount
                 b.HasIndex(x => new { x.CustomerMaterialCode,x.BillNum });
             });
 
-        }
-
-        /// <summary>
-        /// 一汽轿车-出库单
-        /// </summary>
-        /// <param name="builder"></param>
-        /// <param name="options"></param>
-        private static void ConfigureWmsHQCarOutPutVersion(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options)
-        {
-
-            builder.Entity<WmsHQCarOutPut>(b =>
-            {
-                b.ToTable($"{options.TablePrefix}_WmsHQCarOutPut", options.Schema);
-                b.ConfigureByConvention();
-                b.Property(x => x.BillNum).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.Version).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
-
-                b.HasIndex(x => new { x.BillNum });
-            });
-
-        }
-        /// <summary>
-        /// 一汽轿车-出库详表
-        /// </summary>
-        /// <param name="builder"></param>
-        /// <param name="options"></param>
-        private static void ConfigureWmsHQCarPutDetial(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options)
-        {
-
-            builder.Entity<WmsHQCarOutPutDetial>(b =>
-            {
-                b.ToTable($"{options.TablePrefix}_WmsHQCarOutPutDetial", options.Schema);
-                b.ConfigureByConvention();
-                b.Property(x => x.BillNum).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.WmsBillNum).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.Version).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.OutPut).HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.InPut).HasMaxLength(CommonConsts.MaxCodeLength);
-                //b.Property(x => x.PoLine).HasMaxLength(CommonConsts.MaxCodeLength);
-                //b.Property(x => x.Kanban).HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.ParentMaterialCode).HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.Extend1).HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.Extend2).HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.MaterialCode).HasMaxLength(CommonConsts.MaxCodeLength);
-                b.HasIndex(x => new { x.Version });
-            });
-
-        }
-
-        private static void ConfigureWmsHQMSharePartOutPutVersion(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options)
-        {
-
-            builder.Entity<WmsHQMSharePartOutPut>(b =>
-            {
-                b.ToTable($"{options.TablePrefix}_WmsHQMSharePartOutPut", options.Schema);
-                b.ConfigureByConvention();
-                b.Property(x => x.BillNum).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.Version).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
-
-                b.HasIndex(x => new { x.BillNum });
-            });
-
-        }
-        private static void ConfigureWmsHQMSharePartOutPutDetial(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options)
-        {
-
-            builder.Entity<WmsHQMSharePartOutPutDetial>(b =>
-            {
-                b.ToTable($"{options.TablePrefix}_WmsHQMSharePartOutPutDetial", options.Schema);
-                b.ConfigureByConvention();
-                b.Property(x => x.BillNum).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.WmsBillNum).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.Version).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.OutPut).HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.InPut).HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.OrderBillNum).HasMaxLength(CommonConsts.MaxCodeLength);
-
-                //b.Property(x => x.PoLine).HasMaxLength(CommonConsts.MaxCodeLength);
-                //b.Property(x => x.Kanban).HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.ParentMaterialCode).HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.Extend1).HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.Extend2).HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.MaterialCode).HasMaxLength(CommonConsts.MaxCodeLength);
-                b.HasIndex(x => new { x.Version });
-            });
-
         }
         #endregion
 
@@ -640,91 +293,6 @@ namespace Win.Sfs.SettleAccount
         //    });
 
         //}
-
-
-       
-
-        /// <summary>
-        /// 准时化出库明细
-        /// </summary>
-        /// <param name="builder"></param>
-        /// <param name="options"></param>
-        private static void ConfigureWmsJitOutPutDetial(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options)
-        {
-            builder.Entity<WmsJitOutPutDetial>(b =>
-            {
-                b.ToTable($"{options.TablePrefix}_WmsJitOutPutDetial", options.Schema);
-                b.ConfigureByConvention();
-                b.Property(x => x.WmsBillNum).HasMaxLength(50).IsRequired();
-                b.Property(x => x.Remark).HasMaxLength(200).IsRequired();
-                b.Property(x => x.ParentMaterialCode).HasMaxLength(50).IsRequired();
-                b.Property(x => x.MaterialCode).HasMaxLength(50).IsRequired();
-                b.Property(x => x.MaterialGroup).HasMaxLength(200);
-                b.Property(x => x.OutPut).HasMaxLength(50);
-                b.Property(x => x.InPut).HasMaxLength(50);
-                b.Property(x => x.Extend1).HasMaxLength(50);
-                b.Property(x => x.Extend2).HasMaxLength(50);
-                b.Property(x => x.Version).HasMaxLength(50);
-                b.Property(x => x.ChassisNumber).HasMaxLength(50);
-                b.Property(x => x.KennCode).HasMaxLength(50);
-                b.Property(x => x.MaterialDesc).HasMaxLength(50);
-            });
-        }
-
-
-
-        /// <summary>
-        /// 红旗工厂H平台验收结算明细-导入
-        /// </summary>
-        /// <param name="builder"></param>
-        /// <param name="options"></param>
-        private static void ConfigureHQH(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options)
-        {
-
-            builder.Entity<HQ_H_Platform>(b =>
-            {
-
-                b.ToTable($"{options.TablePrefix}_HQ_H_Platform", options.Schema);
-
-                b.ConfigureByConvention();
-                //b.Property(x => x.HQHKanBan).IsRequired().HasMaxLength(150);//必填项
-                b.Property(x => x.HQHKanBan).HasMaxLength(150);//有空的情况
-                b.Property(x => x.MaterialVoucherNo).HasMaxLength(150);
-                b.Property(x => x.Factory).HasMaxLength(50);
-                b.Property(x => x.MaterialCode).IsRequired().HasMaxLength(150);
-                b.Property(x => x.ExternalKanbanNumber).HasMaxLength(50);
-                b.Property(x => x.KanbanNumber).HasMaxLength(150);
-                b.Property(x => x.Period).HasMaxLength(50);
-                b.Property(x => x.Year).HasMaxLength(50);
-                b.Property(x => x.Version).HasMaxLength(50);
-                b.Property(x => x.Supplier).HasMaxLength(50);
-                b.Property(x => x.StorageLocation).HasMaxLength(50);
-                b.Property(x => x.StorageLocationDesc).HasMaxLength(150);
-                b.Property(x => x.AcceptanceNo).HasMaxLength(50);
-
-                //创建组合索引
-                //b.HasIndex(x => new { x.Version, x.HQHKanBan, x.MaterialCode }).IsUnique().HasFilter(IsDeletedFilter);
-
-            });
-        }
-
-        private static void ConfigureHQHVersion(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options)
-        {
-
-            builder.Entity<HQ_H_PlatformVersion>(b =>
-            {
-                b.ToTable($"{options.TablePrefix}_HQ_H_PlatformVersion", options.Schema);
-                b.ConfigureByConvention();
-                b.Property(x => x.Year).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.Period).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.Version).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.CustomerCode).HasMaxLength(CommonConsts.MaxCodeLength);
-                b.HasIndex(x => new { x.Version }).IsUnique().HasFilter(IsDeletedFilter);
-            });
-
-        }
-
-
         /// <summary>
         /// 红旗主机场-未结明细-导入
         /// </summary>
@@ -781,399 +349,63 @@ namespace Win.Sfs.SettleAccount
 
         }
 
-
-
-
-
-
         /// <summary>
-        /// 大众备件发货
+        /// 大众发票汇总导入
         /// </summary>
         /// <param name="builder"></param>
         /// <param name="options"></param>
-        private static void ConfigureWMSSparePart(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options)
+        private static void ConfigureInvoice(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options)
         {
 
-            builder.Entity<WMSSparePart>(b =>
+            builder.Entity<Invoice>(b =>
             {
 
-                b.ToTable($"{options.TablePrefix}_WMSSparePart", options.Schema);
+                b.ToTable($"{options.TablePrefix}_Invoice", options.Schema);
 
                 b.ConfigureByConvention();
-                //b.Property(x => x.Year).HasMaxLength(CommonConsts.MaxCodeLength);
-                //b.Property(x => x.Period).HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.Version).HasMaxLength(CommonConsts.MaxCodeLength);
-
-                //b.Property(x => x.LineNumber).HasMaxLength(50);
-                //b.Property(x => x.PurchaseType).HasMaxLength(50);
-                //b.Property(x => x.PurchaseOrderNo).IsRequired().HasMaxLength(50);
-                //b.Property(x => x.PurchaseOrderNoItem).HasMaxLength(50);
-                //b.Property(x => x.PurchaseOrderNoText).HasMaxLength(50);
-
-                b.Property(x => x.ReceiptQty).IsRequired();
-                //b.Property(x => x.InvoicedQty).IsRequired();
-                //b.Property(x => x.AmountNoTax).IsRequired();
-                //b.Property(x => x.PurchasePriceNoTax).IsRequired();
-
-                //b.Property(x => x.AccountNum).HasMaxLength(50);
-                b.Property(x => x.MaterialCode).IsRequired().HasMaxLength(150);
-                b.Property(x => x.MaterialDesc).HasMaxLength(500);
-                b.Property(x => x.SpareDate);
-                //b.Property(x => x.DeliveryOrderNo).IsRequired().HasMaxLength(50);
-                //b.Property(x => x.DeliveryLineNum).HasMaxLength(50);
-                //b.Property(x => x.BatchNo).HasMaxLength(50);
-                //b.Property(x => x.Unit).HasMaxLength(50);
-                //b.Property(x => x.TaxRate);
-                //b.Property(x => x.TaxCode);
-                //b.Property(x => x.GermanInvoiceNo).HasMaxLength(100);
-                //b.Property(x => x.Factory).HasMaxLength(50);
-                //b.Property(x => x.FactoryName).HasMaxLength(50);
-                //b.Property(x => x.Extend).HasMaxLength(250);
-                //创建索引（没有版本一说）
-                //b.HasIndex(x => new { x.Version,x.PurchaseOrderNo, x.MaterialCode }).IsUnique().HasFilter(IsDeletedFilter);
+                b.Property(x => x.Year).HasMaxLength(50);
+                b.Property(x => x.Period).HasMaxLength(50);
+                b.Property(x => x.Version).HasMaxLength(50);
+                b.Property(x => x.Factory).HasMaxLength(50);
+                b.Property(x => x.MaterialCode).IsRequired().HasMaxLength(50);//零件号不能为空
+                b.Property(x => x.MaterialDesc).HasMaxLength(50);
+                b.Property(x => x.Remark).HasMaxLength(1000);
+
             });
         }
-
-        /// <summary>
-        /// 大众备件发货-版本
-        /// </summary>
-        /// <param name="builder"></param>
-        /// <param name="options"></param>
-        //private static void ConfigureWMSSparePartVersion(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options)
-        //{
-
-        //    builder.Entity<SparePartVersion>(b =>
-        //    {
-        //        b.ToTable($"{options.TablePrefix}_WMSSparePart_Version", options.Schema);
-        //        b.ConfigureByConvention();
-        //        b.Property(x => x.Year).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
-        //        b.Property(x => x.Period).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
-        //        b.Property(x => x.Version).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
-        //        b.Property(x => x.CustomerCode).HasMaxLength(CommonConsts.MaxCodeLength);
-        //        b.HasIndex(x => new { x.Version }).IsUnique().HasFilter(IsDeletedFilter);
-        //    });
-
-        //}
-
         /// <summary>
-        /// 大众看板发货
+        /// 大众发票汇总导入-版本
         /// </summary>
         /// <param name="builder"></param>
         /// <param name="options"></param>
-        private static void ConfigureWMSKanBan(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options)
+        private static void ConfigureInvoiceVersion(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options)
         {
 
-            builder.Entity<WMSKanBanSettle>(b =>
+            builder.Entity<InvoiceVersion>(b =>
             {
 
-                b.ToTable($"{options.TablePrefix}_WMSKanBanSettle", options.Schema);
+                b.ToTable($"{options.TablePrefix}_InvoiceVersion", options.Schema);
 
                 b.ConfigureByConvention();
-                b.Property(x => x.Kanban).IsRequired().HasMaxLength(150);//必填项
-                b.Property(x => x.Relation).HasMaxLength(100);
-                b.Property(x => x.MaterialCode).IsRequired().HasMaxLength(150);
-                b.Property(x => x.PartType).HasMaxLength(50);
-
-                //b.ConfigureByConvention();
-                //b.Property(x => x.Kanban).IsRequired().HasMaxLength(150);//必填项
-                //b.Property(x => x.Relation).HasMaxLength(100);
-                //b.Property(x => x.Factory).HasMaxLength(50);
-                //b.Property(x => x.MaterialCode).IsRequired().HasMaxLength(150);
-                //b.Property(x => x.PartType).HasMaxLength(50);
-                //b.Property(x => x.SupplierCode).HasMaxLength(50);
-                //b.Property(x => x.Batch).HasMaxLength(50);
-                //b.Property(x => x.Flag).HasMaxLength(50);
-                //创建组合索引
-                //b.HasIndex(x => new { x.Version,x.Kanban, x.MaterialCode }).IsUnique().HasFilter(IsDeletedFilter);
+                b.Property(x => x.Year).HasMaxLength(50);
+                b.Property(x => x.Period).HasMaxLength(50);
+                b.Property(x => x.Version).HasMaxLength(50);
+                b.Property(x => x.CustomerCode).HasMaxLength(50);
+                // b.Property(x => x.Factory).HasMaxLength(50);
 
             });
         }
+
         /// <summary>
-        /// 大众看板发货-版本
+        /// 大众准时化结算明细导入
         /// </summary>
         /// <param name="builder"></param>
         /// <param name="options"></param>
-        private static void ConfigureWMSKanBanVersion(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options)
+        private static void ConfigureSettleAccount(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options)
         {
-
-            builder.Entity<WMSKanBanVersion>(b =>
+            builder.Entity<Win.Sfs.SettleAccount.Entities.SettleAccounts.SettleAccount>(b =>
             {
-                b.ToTable($"{options.TablePrefix}_WMSKanBanSettle_Version", options.Schema);
-                b.ConfigureByConvention();
-                b.Property(x => x.Year).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.Period).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.Version).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.CustomerCode).HasMaxLength(CommonConsts.MaxCodeLength);
-                b.HasIndex(x => new { x.Version }).IsUnique().HasFilter(IsDeletedFilter);
-            });
-        }
-
-        /// <summary>
-        /// 大众看板结算明细导入表结构
-        /// </summary>
-        /// <param name="builder"></param>
-        /// <param name="options"></param>
-        private static void ConfigureKanBan(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options)
-        {
-
-            builder.Entity<KanBanSettle>(b =>
-            {
-
-                b.ToTable($"{options.TablePrefix}_KanBanSettle", options.Schema);
-
-                b.ConfigureByConvention();
-                b.Property(x => x.Kanban).IsRequired().HasMaxLength(150);//必填项
-                b.Property(x => x.Relation).HasMaxLength(100);
-                b.Property(x => x.Factory).HasMaxLength(50);
-                b.Property(x => x.MaterialCode).IsRequired().HasMaxLength(150);
-                b.Property(x => x.PartType).HasMaxLength(50);
-                b.Property(x => x.SupplierCode).HasMaxLength(50);
-                b.Property(x => x.Batch).HasMaxLength(50);
-                b.Property(x => x.Flag).HasMaxLength(50);
-                //创建组合索引
-                b.HasIndex(x => new {x.Version, x.Kanban, x.MaterialCode }).IsUnique().HasFilter(IsDeletedFilter);
-
-            });
-        }
-
-        private static void ConfigureKanBanVersion(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options)
-        {
-
-            builder.Entity<KanBanVersion>(b =>
-            {
-                b.ToTable($"{options.TablePrefix}_KanBanSettle_Version", options.Schema);
-                b.ConfigureByConvention();
-                b.Property(x => x.Year).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.Period).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.Version).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.CustomerCode).HasMaxLength(CommonConsts.MaxCodeLength);
-                b.HasIndex(x => new { x.Version }).IsUnique().HasFilter(IsDeletedFilter);
-            });
-        }
-        /// <summary>
-        /// 大众发票汇总导入
-        /// </summary>
-        /// <param name="builder"></param>
-        /// <param name="options"></param>
-        private static void ConfigureInvoice(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options)
-        {
-
-            builder.Entity<Invoice>(b =>
-            {
-
-                b.ToTable($"{options.TablePrefix}_Invoice", options.Schema);
-
-                b.ConfigureByConvention();
-                b.Property(x => x.Year).HasMaxLength(50);
-                b.Property(x => x.Period).HasMaxLength(50);
-                b.Property(x => x.Version).HasMaxLength(50);
-                b.Property(x => x.Factory).HasMaxLength(50);
-                b.Property(x => x.MaterialCode).IsRequired().HasMaxLength(50);//零件号不能为空
-                b.Property(x => x.MaterialDesc).HasMaxLength(50);
-                b.Property(x => x.Remark).HasMaxLength(1000);
-
-            });
-        }
-        /// <summary>
-        /// 大众发票汇总导入-版本
-        /// </summary>
-        /// <param name="builder"></param>
-        /// <param name="options"></param>
-        private static void ConfigureInvoiceVersion(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options)
-        {
-
-            builder.Entity<InvoiceVersion>(b =>
-            {
-
-                b.ToTable($"{options.TablePrefix}_InvoiceVersion", options.Schema);
-
-                b.ConfigureByConvention();
-                b.Property(x => x.Year).HasMaxLength(50);
-                b.Property(x => x.Period).HasMaxLength(50);
-                b.Property(x => x.Version).HasMaxLength(50);
-                b.Property(x => x.CustomerCode).HasMaxLength(50);
-                // b.Property(x => x.Factory).HasMaxLength(50);
-
-            });
-        }
-
-        /// <summary>
-        /// CP7报废和索赔
-        /// </summary>
-        /// <param name="builder"></param>
-        /// <param name="options"></param>
-        private static void ConfigureScrapClaims(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options)
-        {
-
-            builder.Entity<ScrapClaims>(b =>
-            {
-
-                b.ToTable($"{options.TablePrefix}_ScrapClaims", options.Schema);
-
-                b.ConfigureByConvention();
-                b.Property(x => x.Year).HasMaxLength(50);
-                b.Property(x => x.Period).HasMaxLength(50);
-                b.Property(x => x.Version).HasMaxLength(50);
-                b.Property(x => x.Type).IsRequired().HasMaxLength(50);//类型不能为空，否则区分不开报废还是索赔
-                b.Property(x => x.MaterialCode).IsRequired().HasMaxLength(50);//零件号不能为空
-                b.Property(x => x.MaterialDesc).HasMaxLength(50);
-                b.Property(x => x.Remark).HasMaxLength(1000);
-
-            });
-        }
-
-
-
-        /// <summary>
-        /// CP7报废和索赔-版本
-        /// </summary>
-        /// <param name="builder"></param>
-        /// <param name="options"></param>
-        private static void ConfigureScrapClaimsVersion(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options)
-        {
-
-            builder.Entity<ScrapClaimsVersion>(b =>
-            {
-                b.ToTable($"{options.TablePrefix}_ScrapClaims_Version", options.Schema);
-                b.ConfigureByConvention();
-                b.Property(x => x.Year).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.Period).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.Version).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.CustomerCode).HasMaxLength(CommonConsts.MaxCodeLength);
-                b.HasIndex(x => new { x.Version }).IsUnique().HasFilter(IsDeletedFilter);
-            });
-
-        }
-
-        /// <summary>
-        /// 大众备件发票导入
-        /// </summary>
-        /// <param name="builder"></param>
-        /// <param name="options"></param>
-        private static void ConfigureSparePart(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options)
-        {
-
-            builder.Entity<SparePart>(b =>
-            {
-
-                b.ToTable($"{options.TablePrefix}_SparePart", options.Schema);
-
-                b.ConfigureByConvention();
-                b.Property(x => x.Year).HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.Period).HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.Version).HasMaxLength(CommonConsts.MaxCodeLength);
-
-                b.Property(x => x.LineNumber).HasMaxLength(50);
-                b.Property(x => x.PurchaseType).HasMaxLength(50);
-                b.Property(x => x.PurchaseOrderNo).IsRequired().HasMaxLength(50);//采购订单号
-                b.Property(x => x.PurchaseOrderNoItem).HasMaxLength(50);
-                b.Property(x => x.PurchaseOrderNoText).HasMaxLength(50);
-
-                b.Property(x => x.ReceiptQty).IsRequired();//收货数量
-                b.Property(x => x.InvoicedQty);
-                b.Property(x => x.AmountNoTax);
-                b.Property(x => x.PurchasePriceNoTax).IsRequired();//采购价格不含税
-
-                b.Property(x => x.AccountNum).HasMaxLength(50);
-                b.Property(x => x.MaterialCode).IsRequired().HasMaxLength(150);//物料号
-                b.Property(x => x.MaterialDesc).HasMaxLength(50);
-                b.Property(x => x.SpareDate);
-                b.Property(x => x.DeliveryOrderNo).HasMaxLength(50);
-                b.Property(x => x.DeliveryLineNum).HasMaxLength(50);
-                b.Property(x => x.BatchNo).HasMaxLength(50);
-                b.Property(x => x.Unit).HasMaxLength(50);
-                b.Property(x => x.TaxRate);
-                b.Property(x => x.TaxCode); 
-                b.Property(x => x.GermanInvoiceNo).HasMaxLength(100);
-                b.Property(x => x.Factory).HasMaxLength(50);
-                b.Property(x => x.FactoryName).HasMaxLength(50);
-                b.Property(x => x.Extend).HasMaxLength(250);
-                //创建索引
-                b.HasIndex(x => new { x.Version, x.PurchaseOrderNo, x.MaterialCode }).IsUnique().HasFilter(IsDeletedFilter);
-
-            });
-        }
-        /// <summary>
-        /// 大众备件发票导入-版本
-        /// </summary>
-        /// <param name="builder"></param>
-        /// <param name="options"></param>
-        private static void ConfigureSparePartVersion(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options)
-        {
-
-            builder.Entity<SparePartVersion>(b =>
-            {
-                b.ToTable($"{options.TablePrefix}_SparePart_Version", options.Schema);
-                b.ConfigureByConvention();
-                b.Property(x => x.Year).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.Period).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.Version).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.CustomerCode).HasMaxLength(CommonConsts.MaxCodeLength);
-                b.HasIndex(x => new { x.Version }).IsUnique().HasFilter(IsDeletedFilter);
-            });
-
-        }
-        /// <summary>
-        /// 大众FIS未结算明细导入
-        /// </summary>
-        /// <param name="builder"></param>
-        /// <param name="options"></param>
-        private static void ConfigureUnSettleAccount(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options)
-        {
-            builder.Entity<UnSettleAccount>(b =>
-            {
-                b.ToTable($"{options.TablePrefix}_Unsettle", options.Schema);
-                b.ConfigureByConvention();
-
-                b.Property(x => x.KENNCode).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
-
-                b.Property(x => x.Version).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.Year).HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.Period).HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.MaterialCode).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.Qty).IsRequired();
-                b.Property(x => x.Model).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.SettlementID).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.SettlementSupplier).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.ChassisNumber).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
-                //b.Property(x => x.SettlementSupplier).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
-
-                b.Property(x => x.Enabled);
-                b.HasIndex(x => new { x.state });
-                b.HasIndex(x => new { x.Version, x.ChassisNumber, x.MaterialCode,x.KENNCode }).IsUnique();
-            });
-        }
-        /// <summary>
-        /// 大众FIS未结算明细导入-版本
-        /// </summary>
-        /// <param name="builder"></param>
-        /// <param name="options"></param>
-        private static void ConfigureUnSettleAccountVersion(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options)
-        {
-
-            builder.Entity<UnSettleAccountVersion>(b =>
-            {
-                b.ToTable($"{options.TablePrefix}_Unsettle_Version", options.Schema);
-                b.ConfigureByConvention();
-                b.Property(x => x.Year).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.Period).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.Version).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.CustomerCode).HasMaxLength(CommonConsts.MaxCodeLength);
-                b.HasIndex(x => new { x.Version }).IsUnique().HasFilter(IsDeletedFilter);
-            });
-
-        }
-
-        /// <summary>
-        /// 大众准时化结算明细导入
-        /// </summary>
-        /// <param name="builder"></param>
-        /// <param name="options"></param>
-        private static void ConfigureSettleAccount(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options)
-        {
-            builder.Entity<Win.Sfs.SettleAccount.Entities.SettleAccounts.SettleAccount>(b =>
-            {
-                b.ToTable($"{options.TablePrefix}_Settle", options.Schema);
+                b.ToTable($"{options.TablePrefix}_Settle", options.Schema);
                 b.ConfigureByConvention();
 
                 b.Property(x => x.KENNCode).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
@@ -1215,1791 +447,11 @@ namespace Win.Sfs.SettleAccount
 
         }
 
-        private static void ConfigureWmsJitOutPutVersion(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options)
-        {
-
-            builder.Entity<WmsJitOutPut>(b =>
-            {
-                b.ToTable($"{options.TablePrefix}_WmsJitOutPut", options.Schema);
-                b.ConfigureByConvention();
-                b.Property(x => x.BillNum).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.Version).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
-            
-                b.HasIndex(x => new { x.BillNum });
-            });
-
-        }
-        private static void ConfigureWmsJitOutPutDetail(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options)
-        {
-
-            builder.Entity<WmsJitOutPutDetial>(b =>
-            {
-                b.ToTable($"{options.TablePrefix}_WmsJitOutPutDetial", options.Schema);
-                b.ConfigureByConvention();
-                b.Property(x => x.BillNum).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.WmsBillNum).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.Version).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.OutPut).HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.InPut).HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.KennCode).HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.ChassisNumber).HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.ParentMaterialCode).HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.Extend1).HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.Extend2).HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.MaterialCode).HasMaxLength(CommonConsts.MaxCodeLength);
-                b.HasIndex(x => new { x.Version }).IsUnique().HasFilter(IsDeletedFilter);
-            });
-
-        }
-
-        private static void ConfigureWmsKanbanOutPutVersion(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options)
-        {
-
-            builder.Entity<WmsKanbanOutPut>(b =>
-            {
-                b.ToTable($"{options.TablePrefix}_WmsKanbanOutPut", options.Schema);
-                b.ConfigureByConvention();
-                b.Property(x => x.BillNum).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.Version).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
-
-                b.HasIndex(x => new { x.BillNum });
-            });
-
-        }
-        private static void ConfigureWmsKanbanOutPutDetail(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options)
-        {
-
-            builder.Entity<WmsKanbanOutPutDetial>(b =>
-            {
-                b.ToTable($"{options.TablePrefix}_WmsKanbanOutPutDetial", options.Schema);
-                b.ConfigureByConvention();
-                b.Property(x => x.BillNum).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.WmsBillNum).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.Version).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.OutPut).HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.InPut).HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.Kanban).HasMaxLength(CommonConsts.MaxCodeLength);
-     
-                b.Property(x => x.ParentMaterialCode).HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.Extend1).HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.Extend2).HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.MaterialCode).HasMaxLength(CommonConsts.MaxCodeLength);
-                b.HasIndex(x => new { x.BillNum});
-            });
-
         }
 
 
-        private static void ConfigureWmsWithOutKanbanOutPutVersion(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options)
-        {
-
-            builder.Entity<WmsWithOutKanbanOutPut>(b =>
-            {
-                //b.ToTable($"{options.TablePrefix}_WmsKanbanOutPutExtend", options.Schema);
-                b.ToTable($"{options.TablePrefix}_WmsWithOutKanbanOutPut", options.Schema);
-                b.ConfigureByConvention();
-                b.Property(x => x.BillNum).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.Version).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
-
-                b.HasIndex(x => new { x.BillNum });
-            });
 
-        }
-        private static void ConfigureWmsWithOutKanbanOutPutDetail(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options)
-        {
 
-            builder.Entity<WmsWithOutKanbanOutPutDetial>(b =>
-            {
-                b.ToTable($"{options.TablePrefix}_WmsWithOutKanbanOutPutDetial", options.Schema);
-                b.ConfigureByConvention();
-                b.Property(x => x.BillNum).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.Version).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
-                b.HasIndex(x => new { x.BillNum });
-            });
-
-        }
-
-        private static void ConfigureWmsHQWithOutKanbanOutPutVersion(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options)
-        {
-
-            builder.Entity<WmsHQWithOutKanbanOutPut>(b =>
-            {
-                b.ToTable($"{options.TablePrefix}_WmsHQWithOutKanbanOutPut", options.Schema);
-                b.ConfigureByConvention();
-                b.Property(x => x.BillNum).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.Version).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
-
-                b.HasIndex(x => new { x.BillNum });
-            });
-
-        }
-        private static void ConfigureWmsHQWithOutKanbanOutPutDetail(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options)
-        {
-
-            builder.Entity<WmsHQWithOutKanbanOutPutDetial>(b =>
-            {
-                //b.ToTable($"{options.TablePrefix}_WmsKanbanOutPutDetialExtend", options.Schema);
-                b.ToTable($"{options.TablePrefix}_WmsHQWithOutKanbanOutPutDetial", options.Schema);
-                b.ConfigureByConvention();
-                b.Property(x => x.BillNum).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
-
-                b.Property(x => x.Version).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
-
-                b.HasIndex(x => new { x.BillNum });
-            });
-
-        }
-
-
-
-
-
-
-
-
-
-
-
-        private static void ConfigureWmsSharePartOutPutVersion(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options)
-        {
-
-            builder.Entity<WmsSharePartOutPut>(b =>
-            {
-                b.ToTable($"{options.TablePrefix}_WmsSharePartOutPut", options.Schema);
-                b.ConfigureByConvention();
-                b.Property(x => x.BillNum).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.Version).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
-
-                b.HasIndex(x => new { x.BillNum });
-            });
-
-        }
-        private static void ConfigureWmsSharePartOutPutDetail(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options)
-        {
-
-            builder.Entity<WmsSharePartOutPutDetial>(b =>
-            {
-                b.ToTable($"{options.TablePrefix}_WmsSharePartOutPutDetial", options.Schema);
-                b.ConfigureByConvention();
-                b.Property(x => x.BillNum).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.WmsBillNum).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.Version).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.OutPut).HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.InPut).HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.OrderBillNum).HasMaxLength(CommonConsts.MaxCodeLength);
-
-                b.Property(x => x.ParentMaterialCode).HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.Extend1).HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.Extend2).HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.MaterialCode).HasMaxLength(CommonConsts.MaxCodeLength);
-                b.HasIndex(x => new { x.BillNum });
-            });
-
-        }
-
-        /// <summary>
-        /// 大众备件0-90数据调整（无采购订单号）
-        /// </summary>
-        /// <param name="builder"></param>
-        /// <param name="options"></param>
-        private static void ConfigureWmsSharePart90OutPutDetail(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options)
-        {
-
-            builder.Entity<WmsSharePart90OutPutDetial>(b =>
-            {
-                b.ToTable($"{options.TablePrefix}_WmsSharePart90OutPutDetial", options.Schema);
-                b.ConfigureByConvention();
-                b.Property(x => x.BillNum).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.WmsBillNum).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.Version).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.OutPut).HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.InPut).HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.OrderBillNum).HasMaxLength(CommonConsts.MaxCodeLength);
-
-                b.Property(x => x.ParentMaterialCode).HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.Extend1).HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.Extend2).HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.MaterialCode).HasMaxLength(CommonConsts.MaxCodeLength);
-                b.HasIndex(x => new { x.BillNum });
-            });
-
-        }
-
-        private static void ConfigureWmsSharePart90OutPutVersion(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options)
-        {
-
-            builder.Entity<WmsSharePart90OutPut>(b =>
-            {
-                b.ToTable($"{options.TablePrefix}_WmsSharePart90OutPut", options.Schema);
-                b.ConfigureByConvention();
-                b.Property(x => x.BillNum).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.Version).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
-
-                b.HasIndex(x => new { x.BillNum });
-            });
-
-        }
-
-
-        private static void ConfigureWmsHQFKanbanOutPutVersion(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options)
-        {
-
-            builder.Entity<WmsHQFKanbanOutPut>(b =>
-            {
-                b.ToTable($"{options.TablePrefix}_WmsHQFKanbanOutPut", options.Schema);
-                b.ConfigureByConvention();
-                b.Property(x => x.BillNum).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.Version).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
-
-                b.HasIndex(x => new { x.BillNum });
-            });
-
-        }
-        private static void ConfigureWmsHQFKanbanOutPutDetial(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options)
-        {
-
-            builder.Entity<WmsHQFKanbanOutPutDetial>(b =>
-            {
-                b.ToTable($"{options.TablePrefix}_WmsHQFKanbanOutPutDetial", options.Schema);
-                b.ConfigureByConvention();
-                b.Property(x => x.BillNum).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.WmsBillNum).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.Version).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.OutPut).HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.InPut).HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.PoLine).HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.Kanban).HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.ParentMaterialCode).HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.Extend1).HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.Extend2).HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.MaterialCode).HasMaxLength(CommonConsts.MaxCodeLength);
-                b.HasIndex(x => new { x.Version }).IsUnique().HasFilter(IsDeletedFilter);
-            });
-
-        }
-
-        private static void ConfigureWmsHQFSharePartOutPutVersion(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options)
-        {
-
-            builder.Entity<WmsHQFSharePartOutPut>(b =>
-            {
-                b.ToTable($"{options.TablePrefix}_WmsHQFSharePartOutPut", options.Schema);
-                b.ConfigureByConvention();
-                b.Property(x => x.BillNum).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.Version).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
-
-                b.HasIndex(x => new { x.BillNum });
-            });
-
-        }
-        private static void ConfigureWmsHQFSharePartOutPutDetial(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options)
-        {
-
-            builder.Entity<WmsHQFSharePartOutPutDetial>(b =>
-            {
-                b.ToTable($"{options.TablePrefix}_WmsHQFSharePartOutPutDetial", options.Schema);
-                b.ConfigureByConvention();
-                b.Property(x => x.BillNum).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.WmsBillNum).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.Version).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.OutPut).HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.InPut).HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.OrderBillNum).HasMaxLength(CommonConsts.MaxCodeLength);
-     
-                //b.Property(x => x.PoLine).HasMaxLength(CommonConsts.MaxCodeLength);
-                //b.Property(x => x.Kanban).HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.ParentMaterialCode).HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.Extend1).HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.Extend2).HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.MaterialCode).HasMaxLength(CommonConsts.MaxCodeLength);
-                b.HasIndex(x => new { x.Version }).IsUnique().HasFilter(IsDeletedFilter);
-            });
-
-        }
-
-        private static void ConfigureWmsHQHKanbanOutPutVersion(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options)
-        {
-
-            builder.Entity<WmsHQHKanbanOutPut>(b =>
-            {
-                b.ToTable($"{options.TablePrefix}_WmsHQHKanbanOutPut", options.Schema);
-                b.ConfigureByConvention();
-                b.Property(x => x.BillNum).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.Version).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
-
-                b.HasIndex(x => new { x.BillNum });
-            });
-
-        }
-        private static void ConfigureWmsHQHKanbanOutPutDetial(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options)
-        {
-
-            builder.Entity<WmsHQHKanbanOutPutDetial>(b =>
-            {
-                b.ToTable($"{options.TablePrefix}_WmsHQHKanbanOutPutDetial", options.Schema);
-                b.ConfigureByConvention();
-                b.Property(x => x.BillNum).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.WmsBillNum).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.Version).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.OutPut).HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.InPut).HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.PoLine).HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.Kanban).HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.ParentMaterialCode).HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.Extend1).HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.Extend2).HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.MaterialCode).HasMaxLength(CommonConsts.MaxCodeLength);
-                b.HasIndex(x => new { x.Version }).IsUnique().HasFilter(IsDeletedFilter);
-            });
-
-        }
-
-
-
-
-
-        private static void ConfigureWmsCustomerKanbanOutPut(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options)
-        {
-
-            builder.Entity<WmsCustomerKanbanOutPut>(b =>
-            {
-                b.ToTable($"{options.TablePrefix}_WmsCustomerKanbanOutPut", options.Schema);
-                b.ConfigureByConvention();
-                b.Property(x => x.BillNum).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.Version).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.CustomerCode).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
-                b.HasIndex(x => new { x.BillNum });
-            });
-
-        }
-        private static void ConfigureWmsCustomerKanbanOutPutDetial(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options)
-        {
-
-            builder.Entity<WmsCustomerKanbanOutPutDetial>(b =>
-            {
-                b.ToTable($"{options.TablePrefix}_WmsCustomerKanbanOutPutDetial", options.Schema);
-                b.ConfigureByConvention();
-                b.Property(x => x.BillNum).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.WmsBillNum).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.Version).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.OutPut).HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.InPut).HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.CustomerCode).HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.Kanban).HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.SapMaterialCode).HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.Extend1).HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.Extend2).HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.MaterialCode).HasMaxLength(CommonConsts.MaxCodeLength);
-                b.HasIndex(x => new { x.Version }).IsUnique().HasFilter(IsDeletedFilter);
-            });
-
-        }
-
-
-
-
-
-        private static void ConfigureWmsHQHSharePartOutPutVersion(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options)
-        {
-
-            builder.Entity<WmsHQHSharePartOutPut>(b =>
-            {
-                b.ToTable($"{options.TablePrefix}_WmsHQHSharePartOutPut", options.Schema);
-                b.ConfigureByConvention();
-                b.Property(x => x.BillNum).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.Version).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
-
-                b.HasIndex(x => new { x.BillNum });
-            });
-
-        }
-        private static void ConfigureWmsHQHSharePartOutPutDetial(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options)
-        {
-
-            builder.Entity<WmsHQHSharePartOutPutDetial>(b =>
-            {
-                b.ToTable($"{options.TablePrefix}_WmsHQHSharePartOutPutDetial", options.Schema);
-                b.ConfigureByConvention();
-                b.Property(x => x.BillNum).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.WmsBillNum).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.Version).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.OutPut).HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.InPut).HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.OrderBillNum).HasMaxLength(CommonConsts.MaxCodeLength);
-
-                //b.Property(x => x.PoLine).HasMaxLength(CommonConsts.MaxCodeLength);
-                //b.Property(x => x.Kanban).HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.ParentMaterialCode).HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.Extend1).HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.Extend2).HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.MaterialCode).HasMaxLength(CommonConsts.MaxCodeLength);
-                b.HasIndex(x => new { x.Version }).IsUnique().HasFilter(IsDeletedFilter);
-            });
-
-        }
-
-
-
-
- 
-
-
-        private static void ConfigureWmsOneTimeSaleOutPutVersion(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options)
-        {
-
-            builder.Entity<WmsOneTimeSaleOutPut>(b =>
-            {
-                b.ToTable($"{options.TablePrefix}_WmsOneTimeSaleOutPut", options.Schema);
-                b.ConfigureByConvention();
-                b.Property(x => x.BillNum).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.Version).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
-
-                b.HasIndex(x => new { x.BillNum });
-            });
-
-        }
-
-        private static void ConfigureWmsOneTimeSaleOutPutDetial(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options)
-        {
-
-            builder.Entity<WmsOneTimeSaleOutPutDetial>(b =>
-            {
-                b.ToTable($"{options.TablePrefix}_WmsOneTimeSaleOutPutDetial", options.Schema);
-                b.ConfigureByConvention();
-                b.Property(x => x.BillNum).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.WmsBillNum).HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.Version).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.OutPut).HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.InPut).HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.OrderBillNum).HasMaxLength(CommonConsts.MaxCodeLength);
-
-                b.Property(x => x.ParentMaterialCode).HasMaxLength(CommonConsts.MaxCodeLength);
-                //b.Property(x => x.Extend1).HasMaxLength(CommonConsts.MaxCodeLength);
-                //b.Property(x => x.Extend2).HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.SapMaterialCode).HasMaxLength(CommonConsts.MaxCodeLength);
-                b.HasIndex(x => new { x.BillNum });
-            });
-
-        }
-
-
-
-    
-
-
-
-
-
-
-        #endregion
-
-        #region 天合
-
-        private static void ConfigureHangfire(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options)
-        {
-            builder.Entity<Job>(b =>
-            {
-                b.ToTable($"Job", "Hangfire");
-                b.ConfigureByConvention();
-               
-            });
-        }
-
-        private static void ConfigureSecMatchBase(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options)
-        {
-
-            builder.Entity<SecMatchBase>(b =>
-            {
-
-                b.ToTable($"{options.TablePrefix}_SecMatchBase", options.Schema);
-
-                b.ConfigureByConvention();
-                b.Property(x => x.Version).HasMaxLength(50);
-                b.Property(x => x.Index).HasMaxLength(50);
-                b.Property(x => x.Factory).HasMaxLength(50);
-                b.Property(x => x.Model).HasMaxLength(50);
-                b.Property(x => x.PartType).HasMaxLength(50);
-                b.Property(x => x.SettleMentPartCode).HasMaxLength(50);
-                b.Property(x => x.MaterialPartCode).HasMaxLength(50);
-                b.Property(x => x.MaterialDesc).HasMaxLength(50);
-                b.Property(x => x.SupplierCode).HasMaxLength(50);
-                b.Property(x => x.SupplierName).HasMaxLength(50);
-                b.Property(x => x.UsedNumber).HasMaxLength(50);
-                b.Property(x => x.SupplyProportion).HasMaxLength(50);
-                b.Property(x => x.Buyer).HasMaxLength(50);
-                b.Property(x => x.Remark).HasMaxLength(50);
-                b.Property(x => x.ConcurrencyStamp).HasMaxLength(50);
-            });
-        }
-
-
-        private static void ConfigurePriceList(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options)
-        {
-
-            builder.Entity<PriceList>(b =>
-            {
-
-                b.ToTable($"{options.TablePrefix}_PriceList", options.Schema);
-              
-                b.ConfigureByConvention();
-                b.Property(x => x.MaterialCode).HasMaxLength(50);
-                b.Property(x => x.CustomerCode).HasMaxLength(50);
-
-            });
-        }
-        private static void ConfigurePriceListVersion(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options)
-        {
-
-            builder.Entity<PriceListVersion>(b =>
-            {
-
-                b.ToTable($"{options.TablePrefix}_PriceListVersion", options.Schema);
-
-                b.ConfigureByConvention();
-                b.Property(x => x.Year).HasMaxLength(50);
-                b.Property(x => x.Period).HasMaxLength(50);
-                b.Property(x => x.Version).HasMaxLength(50);
-                b.Property(x => x.Factory).HasMaxLength(50);
-              
-            });
-        }
-        private static void ConfigurePriceListBJ(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options)
-        {
-
-            builder.Entity<PriceListBJ>(b =>
-            {
-
-                b.ToTable($"{options.TablePrefix}_PriceListBJ", options.Schema);
-
-                b.ConfigureByConvention();
-                b.Property(x => x.MaterialCode).HasMaxLength(50);
-                b.Property(x => x.CustomerCode).HasMaxLength(50);
-
-            });
-        }
-        private static void ConfigurePriceListVersionBJ(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options)
-        {
-
-            builder.Entity<PriceListVersionBJ>(b =>
-            {
-
-                b.ToTable($"{options.TablePrefix}_PriceListVersionBJ", options.Schema);
-
-                b.ConfigureByConvention();
-                b.Property(x => x.Year).HasMaxLength(50);
-                b.Property(x => x.Period).HasMaxLength(50);
-                b.Property(x => x.Version).HasMaxLength(50);
-                b.Property(x => x.Factory).HasMaxLength(50);
-
-            });
-        }
-
-
-
-
-
-
-
-        //private static void ConfigureMaterialRelationshipVersion(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options)
-        //{
-
-        //    builder.Entity<PriceListVersion>(b =>
-        //    {
-
-        //        b.ToTable($"{options.TablePrefix}_PriceListVersion", options.Schema);
-
-        //        b.ConfigureByConvention();
-        //        b.Property(x => x.Year).HasMaxLength(50);
-        //        b.Property(x => x.Period).HasMaxLength(50);
-        //        b.Property(x => x.Version).HasMaxLength(50);
-        //        b.Property(x => x.Factory).HasMaxLength(50);
-
-        //    });
-        //}
-
-
-
-
-
-
-
-        private static void ConfigureInvoiceSettledDiff(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options)
-        {
-
-            builder.Entity<InvoiceSettledDiff>(b =>
-            {
-
-                b.ToTable($"{options.TablePrefix}_InvoiceSettledDiff", options.Schema);
-
-                b.ConfigureByConvention();
-                b.Property(x => x.MaterialCode).HasMaxLength(50);
-               
-
-            });
-        }
-        private static void ConfigureInvoiceSettledDiffVersion(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options)
-        {
-
-            builder.Entity<InvoiceSettledDiffVersion>(b =>
-            {
-
-                b.ToTable($"{options.TablePrefix}_InvoiceSettledDiffVersion", options.Schema);
-
-                b.ConfigureByConvention();
-                b.Property(x => x.Year).HasMaxLength(50);
-                b.Property(x => x.Period).HasMaxLength(50);
-                b.Property(x => x.Version).HasMaxLength(50);
-                b.Property(x => x.CustomCode).HasMaxLength(50);
-                b.Property(x => x.CustomName).HasMaxLength(50);
-                b.Property(x => x.CreatorName).HasMaxLength(50);
-                b.Property(x => x.ProjectName).HasMaxLength(50);
-              
-            });
-        }
-
-        private static void ConfigureTaskJob(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options)
-        {
-            builder.Entity<TaskJob>(b =>
-            {
-                b.ToTable($"{options.TablePrefix}_TaskJob", options.Schema);
-                b.ConfigureByConvention();
-                b.Property(x => x.Name).HasMaxLength(50);
-                b.Property(x => x.Creator).HasMaxLength(50);
-                b.Property(x => x.Email).HasMaxLength(50);
-                b.Property(x => x.ConcurrencyStamp).HasMaxLength(50);
-                b.Property(x => x.FileName).HasMaxLength(500);
-                b.Property(x => x.DownFileName).HasMaxLength(500);
-                b.Property(x => x.RealFileName).HasMaxLength(500);
-                b.Property(x => x.RealDownFileName).HasMaxLength(500);
-            });
-        }
-
-        private static void ConfigureBom(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options)
-        {
-            builder.Entity<Bom>(b =>
-            {
-
-                b.ToTable($"{options.TablePrefix}_bom", options.Schema);
-                b.ConfigureByConvention();
-
-                b.Property(x => x.Year).HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.Period).HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.Factory).HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.Version).HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.ParentItemCode).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.ChildItemCode).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.Qty).IsRequired();
-                b.Property(x => x.OperateProcess);
-                b.Property(x => x.ScrapPercent);
-                b.Property(x => x.BomType).HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.EffectiveTime);
-                b.Property(x => x.ExpireTime);
-                b.Property(x => x.IssuePosition);
-                b.Property(x => x.BomLevel);
-
-                b.Property(x => x.Enabled);
-
-                b.HasIndex(x => new { x.ParentItemCode, x.ChildItemCode,x.Version }).IsUnique().HasFilter(IsDeletedFilter);
-            });
-        }
-
-        private static void ConfigureSettlementPart(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options)
-        {
-            builder.Entity<SettlementPart>(b =>
-            {
-
-                b.ToTable($"{options.TablePrefix}_settlement_part", options.Schema);
-                b.ConfigureByConvention();
-
-                b.Property(x => x.Year).HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.Period).HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.CustomerCode).HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.Factory).HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.Version).HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.SettlementPartCode).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
-              
-                b.Property(x => x.Enabled);
-
-                b.HasIndex(x => new { x.Period, x.CustomerCode, x.Version, x.SettlementPartCode }).IsUnique().HasFilter(IsDeletedFilter);
-            });
-        }
-
-
-        private static void ConfigureItemInvoicePrice(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options)
-        {
-            builder.Entity<ItemInvoicePrice>(b =>
-            {
-
-                b.ToTable($"{options.TablePrefix}_item_invoice_price", options.Schema);
-                b.ConfigureByConvention();
-
-                b.Property(x => x.Year).HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.Period).HasMaxLength(CommonConsts.MaxCodeLength);
-          
-                b.Property(x => x.Factory).HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.Version).HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.MaterialCode).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
-
-                b.Property(x => x.Enabled);
-
-                b.HasIndex(x => new { x.Period,x.Version, x.MaterialCode }).IsUnique().HasFilter(IsDeletedFilter);
-            });
-        }
-
-
-        private static void ConfigureItemInvoicePriceVersion(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options)
-        {
-
-            builder.Entity<ItemInvoicePriceVersion>(b =>
-            {
-
-                b.ToTable($"{options.TablePrefix}_item_invoice_price_version", options.Schema);
-
-                b.ConfigureByConvention();
-                b.Property(x => x.Year).HasMaxLength(50);
-                b.Property(x => x.Period).HasMaxLength(50);
-                b.Property(x => x.Version).HasMaxLength(50);
-                b.Property(x => x.CustomerCode).HasMaxLength(50);
-                b.Property(x => x.Factory).HasMaxLength(50);
-
-            });
-        }
-
-
-
-        private static void ConfigureSupplierItemSetUp(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options)
-        {
-            builder.Entity<SupplierItemSetUp>(b =>
-            {
-
-                b.ToTable($"{options.TablePrefix}_supplier_item_setup", options.Schema);
-                b.ConfigureByConvention();
-                b.Property(x => x.ErpSupplierCode).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.ErpItemCode).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.CustomerSupplierCode).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.Enabled);
-                b.HasIndex(x => new { x.ErpSupplierCode, x.ErpItemCode, x.CustomerSupplierCode,x.CustomerCode }).IsUnique().HasFilter(IsDeletedFilter);
-            });
-        }
-
-
-        private static void ConfigureCustomerBom(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options)
-        {
-            builder.Entity<CustomerBom>(b =>
-            {
-                b.ToTable($"{options.TablePrefix}_customer_bom", options.Schema);
-                b.ConfigureByConvention();
-                b.Property(x => x.CustomerCode).IsRequired().HasMaxLength(CommonConsts.MaxNameLength);
-                b.Property(x => x.ParentItemCode).IsRequired().HasMaxLength(CommonConsts.MaxNameLength);
-                b.Property(x => x.ChildItemCode).IsRequired().HasMaxLength(CommonConsts.MaxNameLength);
-                b.Property(x => x.Qty);
-                b.Property(x => x.EffectiveTime);
-                b.Property(x => x.FailureTime);
-                b.Property(x => x.Enabled);
-                b.HasIndex(x => new { x.BranchId, x.CustomerCode, x.ParentItemCode, x.ChildItemCode }).IsUnique().HasFilter(IsDeletedFilter);
-            });
-        }
-
-
-        private static void ConfigureCustomer(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options)
-        {
-            builder.Entity<Customer>(b =>
-            {
-                b.ToTable($"{options.TablePrefix}_customer", options.Schema);
-
-                b.ConfigureByConvention();
-                b.Property(x => x.BranchId).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.Code).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
-                b.HasIndex(x => new { x.BranchId, x.Code }).IsUnique().HasFilter(IsDeletedFilter);
-            });
-        } 
-
-
-
-
-        private static void ConfigureEstimatedInventoryDetail(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options)
-        {
-            builder.Entity<EstimatedInventoryDetail>(b =>
-            {
-                b.ToTable($"{options.TablePrefix}_estdetail", options.Schema);
-                b.ConfigureByConvention();
-
-
-
-                b.Property(x => x.Version).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.Year).HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.Period).HasMaxLength(CommonConsts.MaxCodeLength);
-
-                b.Property(x => x.MaterialCode).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.MaterialDocument).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.PurchaseDocument).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.PurchaseLine).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.ReceiveQty).IsRequired();
-                b.Property(x => x.InvoiceQty).IsRequired();
-                b.Property(x => x.SupplierCode).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.PostingDate).IsRequired();
-
-
-
-
-                b.Property(x => x.StorageLocation).IsRequired();
-                b.Property(x => x.Enabled);
-                b.HasIndex(x => new { x.MaterialDocument, x.MaterialDocumentLine, x.MaterialCode, x.Version }).IsUnique();
-                // b.HasIndex(x => new { x.BranchId, x.ParentItemCode, x.ChildItemCode, x.EffectiveTime, x.ExpireTime }).IsUnique().HasFilter(IsDeletedFilter);
-            });
-        }
-        private static void ConfigureInventoryDetail(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options)
-        {
-            builder.Entity<InventoryDetail>(b =>
-            {
-                b.ToTable($"{options.TablePrefix}_inventory", options.Schema);
-                b.ConfigureByConvention();
-
-                b.Property(x => x.Version).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.Year).HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.Period).HasMaxLength(CommonConsts.MaxCodeLength);
-
-                b.Property(x => x.MaterialCode).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.EndingInventoryQty).IsRequired();
-                b.Property(x => x.InputQty).IsRequired();
-                b.Property(x => x.OutputQty).IsRequired();
-                b.Property(x => x.Price);
-                b.Property(x => x.StorageLocation).HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.Unit).HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.AppraisalCategory).HasMaxLength(CommonConsts.MaxCodeLength);
-                b.HasIndex(x => new {x.Version, x.MaterialCode, x.StorageLocation }).IsUnique().HasFilter(IsDeletedFilter);
-
-
-            });
-        }
-        private static void ConfigureEstimatedSum(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options)
-        {
-            builder.Entity<EstimatedSum>(b =>
-            {
-                b.ToTable($"{options.TablePrefix}_estsum", options.Schema);
-                b.ConfigureByConvention();
-
-         
-
-                b.Property(x => x.MaterialCode).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.Postingperiod).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.Qty).IsRequired();
-
-                b.Property(x => x.Version).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.Year).HasMaxLength(CommonConsts.MaxCodeLength);
-              
-
-
-            });
-        }
-
-        private static void ConfigureCodeSetting(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options)
-        {
-            builder.Entity<CodeSetting>(b =>
-            {
-                b.ToTable($"{options.TablePrefix}_code", options.Schema);
-                b.ConfigureByConvention();
-
-                b.Property(x => x.Project).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.Value).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
-
-                b.HasIndex(x => new { x.Project,x.Value}).IsUnique().HasFilter(IsDeletedFilter);
-            });
-        }
-
-
-        private static void ConfigureMaterial(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options)
-        {
-            builder.Entity<Material>(b =>
-            {
-                b.ToTable($"{options.TablePrefix}_material", options.Schema);
-                b.ConfigureByConvention();
-
-
-                b.Property(x => x.MaterialCode).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.EstimateType).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.MaterialCode).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.Unit).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
-                b.HasIndex(x => new { x.MaterialCode }).IsUnique().HasFilter(IsDeletedFilter);
-
-
-            });
-        }
-
-
-
-        private static void ConfigureMaterialRelationship(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options)
-        {
-            builder.Entity<MaterialRelationship>(b =>
-            {
-                b.ToTable($"{options.TablePrefix}_relationship", options.Schema);
-                b.ConfigureByConvention();
-
-           
-
-
-                //b.Property(x => x.SettleMaterialCode).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.MaterialProperty).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
-                //b.Property(x => x.ShipMaterailCode).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.ErpMaterialCode).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
-                b.HasIndex(x => new { x.ErpMaterialCode });
-
-                b.HasIndex(x => new { x.ErpMaterialCode }).IsUnique().HasFilter(IsDeletedFilter);
-
-
-            });
-        }
-
-
-        private static void ConfigureFIS(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options)
-        {
-            builder.Entity<FIS>(b =>
-            {
-                b.ToTable($"{options.TablePrefix}_fis", options.Schema);
-                b.ConfigureByConvention();
-
-                b.Property(x => x.Version).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.Year).HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.Period).HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.Model).HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.KENNCode).HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.ChassisNumber).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.OrderBillNum).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.ItemCode).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.Period).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.Qty).IsRequired();
-                b.Property(x=>x.ChassisNumber2).HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x =>x.ErpMaterialCode).HasMaxLength(CommonConsts.MaxCodeLength);
-                b.HasIndex(x => new { x.ChassisNumber2, x.Version, x.KENNCode, x.ItemCode });
-                b.HasIndex(x => new { x.ChassisNumber2, x.KENNCode });
-
-            });
-        }
-
-        private static void ConfigureFIS_TH(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options)
-        {
-            builder.Entity<FIS_TH>(b =>
-            {
-                b.ToTable($"{options.TablePrefix}_fis_th", options.Schema);
-                b.ConfigureByConvention();
-
-                b.Property(x => x.Version).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.Year).HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.Period).HasMaxLength(CommonConsts.MaxCodeLength);
-
-                b.Property(x => x.ChassisNumber).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.OrderBillNum).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.MaterialCode).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.ErpMaterialCode).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.Period).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.Qty).IsRequired();
-                b.HasIndex(x => new { x.ChassisNumber2, x.Version, x.Model, x.MaterialCode }).IsUnique();
-
-
-            });
-        }
-
-
-
-
-        private static void ConfigureFISExtend(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options)
-        {
-           // ChassisNumber2_Version_Model_ItemCode
-            builder.Entity<FISExtend>(b =>
-            {
-                b.ToTable($"{options.TablePrefix}_fis_extend", options.Schema);
-                b.ConfigureByConvention();
-
-                b.Property(x => x.Version).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.Year).HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.Period).HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.Model).HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.ChassisNumber2).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.ChassisNumber).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.OrderBillNum).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.ItemCode).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.Period).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.Qty).IsRequired();
-
-
-                b.HasIndex(x => new { x.ChassisNumber2, x.Version,x.Model,x.ItemCode }).IsUnique();
-
-
-
-
-            });
-        }
-
-
-
-        private static void ConfigureBomVersion(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options)
-        {
-
-            builder.Entity<BomVersion>(b =>
-            {
-                b.ToTable($"{options.TablePrefix}_bom_version", options.Schema);
-                b.ConfigureByConvention();
-                b.Property(x => x.Version).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.Year).HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.Period).HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.CustomerCode).HasMaxLength(CommonConsts.MaxCodeLength); 
-            });
-        }
-
-
-
-        private static void ConfigureEstimatedSumVersion(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options)
-        {
-
-            builder.Entity<EstimatedSumVersion>(b =>
-            {
-                b.ToTable($"{options.TablePrefix}_estsum_verion", options.Schema);
-                b.ConfigureByConvention();
-
-                b.Property(x => x.Version).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.Year).HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.Period).HasMaxLength(CommonConsts.MaxCodeLength);
-
-                b.Property(x => x.CustomerCode).HasMaxLength(CommonConsts.MaxCodeLength);
-            });
-
-
-
-        }
-        private static void ConfigureEstimatedInventoryVersion(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options)
-        {
-
-            builder.Entity<EstimatedInventoryVersion>(b =>
-            {
-                b.ToTable($"{options.TablePrefix}_estinventory_version", options.Schema);
-                b.ConfigureByConvention();
-
-                b.Property(x => x.Version).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.Year).HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.Period).HasMaxLength(CommonConsts.MaxCodeLength);
-
-                b.Property(x => x.CustomerCode).HasMaxLength(CommonConsts.MaxCodeLength);
-            });
-
-
-        }
-
-        private static void ConfigureEstimatedStockDiffReport(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options)
-        {
-            builder.Entity<EstimatedStockDiffReport>(b =>
-            {
-                b.ToTable($"{options.TablePrefix}_estimate_stock_report", options.Schema);
-
-                b.ConfigureByConvention();
-                b.Property(x => x.BranchId).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.DocumentNumber).IsRequired().HasMaxLength(CommonConsts.MaxNameLength);
-
-                b.Property(x => x.Enabled);
-
-                b.HasMany(u => u.EstimatedStockDiffReportDetails).WithOne().HasForeignKey(rd => rd.DocumentId).OnDelete(DeleteBehavior.NoAction).IsRequired();
-
-
-                b.HasIndex(x => new { x.BranchId, x.DocumentNumber }).IsUnique().HasFilter(IsDeletedFilter);
-            });
-        }
-
-
-        private static void ConfigureEstimatedStockDiffReportDetail(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options)
-        {
-            builder.Entity<EstimatedStockDiffReportDetail>(b =>
-            {
-                b.ToTable($"{options.TablePrefix}_estimate_stock_report_detail", options.Schema);
-
-                b.ConfigureByConvention();
-                b.Property(x => x.BranchId).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.DocumentNumber).IsRequired().HasMaxLength(CommonConsts.MaxNameLength);
-
-                b.Property(x => x.Enabled);
-                b.HasIndex(x => new { x.BranchId, x.DocumentId, x.ItemCode }).IsUnique().HasFilter(IsDeletedFilter);
-
-            });
-        }
-
-
-
-        private static void ConfigureStockUnsettledDiffReport(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options)
-        {
-            builder.Entity<StockUnsettledDiffReport>(b =>
-            {
-                b.ToTable($"{options.TablePrefix}_stock_unsettled_report", options.Schema);
-
-                b.ConfigureByConvention();
-                b.Property(x => x.BranchId).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.DocumentNumber).IsRequired().HasMaxLength(CommonConsts.MaxNameLength);
-
-                b.Property(x => x.Enabled);
-
-                b.HasMany(u => u.StockUnsettledDiffReportDetails).WithOne().HasForeignKey(rd => rd.DocumentId).OnDelete(DeleteBehavior.NoAction).IsRequired();
-
-
-                b.HasIndex(x => new { x.BranchId, x.DocumentNumber }).IsUnique().HasFilter(IsDeletedFilter);
-            });
-        }
-
-
-        private static void ConfigureStockUnsettledDiffReportDetail(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options)
-        {
-            builder.Entity<StockUnsettledDiffReportDetail>(b =>
-            {
-                b.ToTable($"{options.TablePrefix}_stock_unsettled_report_detail", options.Schema);
-
-                b.ConfigureByConvention();
-                b.Property(x => x.BranchId).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.DocumentNumber).IsRequired().HasMaxLength(CommonConsts.MaxNameLength);
-
-                b.Property(x => x.Enabled);
-                b.HasIndex(x => new { x.BranchId, x.DocumentId, x.ItemCode }).IsUnique().HasFilter(IsDeletedFilter);
-
-            });
-        }
-
-        private static void ConfigureStockSettledDiffReport(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options)
-        {
-            builder.Entity<StockSettledDiffReport>(b =>
-            {
-                b.ToTable($"{options.TablePrefix}_stock_settled_report", options.Schema);
-
-                b.ConfigureByConvention();
-                b.Property(x => x.BranchId).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.DocumentNumber).IsRequired().HasMaxLength(CommonConsts.MaxNameLength);
-
-                b.Property(x => x.Enabled);
-
-                b.HasMany(u => u.StockSettledDiffReportDetails).WithOne().HasForeignKey(rd => rd.DocumentId).OnDelete(DeleteBehavior.NoAction).IsRequired();
-
-
-                b.HasIndex(x => new { x.BranchId, x.DocumentNumber }).IsUnique().HasFilter(IsDeletedFilter);
-            });
-        }
-
-
-        private static void ConfigureStockSettledDiffReportDetail(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options)
-        {
-            builder.Entity<StockSettledDiffReportDetail>(b =>
-            {
-                b.ToTable($"{options.TablePrefix}_stock_settled_report_detail", options.Schema);
-
-                b.ConfigureByConvention();
-                b.Property(x => x.BranchId).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.DocumentNumber).IsRequired().HasMaxLength(CommonConsts.MaxNameLength);
-
-                b.Property(x => x.Enabled);
-                b.HasIndex(x => new { x.BranchId, x.DocumentId, x.ItemCode }).IsUnique().HasFilter(IsDeletedFilter);
-
-            });
-        }
-
-
-        private static void ConfigureStockFisDiffReport(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options)
-        {
-            builder.Entity<StockFisDiffReport>(b =>
-            {
-                b.ToTable($"{options.TablePrefix}_stock_fis_diff_report", options.Schema);
-
-                b.ConfigureByConvention();
-                b.Property(x => x.BranchId).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.DocumentNumber).IsRequired().HasMaxLength(CommonConsts.MaxNameLength);
-
-                b.Property(x => x.Enabled);
-
-                b.HasMany(u => u.StockFisDiffReportDetails).WithOne().HasForeignKey(rd => rd.DocumentId).OnDelete(DeleteBehavior.NoAction).IsRequired();
-
-
-                b.HasIndex(x => new { x.BranchId, x.DocumentNumber }).IsUnique().HasFilter(IsDeletedFilter);
-            });
-        }
-
-
-        private static void ConfigureStockFisDiffReportDetail(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options)
-        {
-            builder.Entity<StockFisDiffReportDetail>(b =>
-            {
-                b.ToTable($"{options.TablePrefix}_stock_fis_diff_report_detail", options.Schema);
-
-                b.ConfigureByConvention();
-                b.Property(x => x.BranchId).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.DocumentNumber).IsRequired().HasMaxLength(CommonConsts.MaxNameLength);
-
-                b.Property(x => x.Enabled);
-                b.HasIndex(x => new { x.BranchId, x.DocumentId, x.ItemCode }).IsUnique().HasFilter(IsDeletedFilter);
-
-            });
-        }
-
-
-
-        private static void ConfigureSendUnsettledDiffReport(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options)
-        {
-            builder.Entity<SendUnsettledDiffReport>(b =>
-            {
-                b.ToTable($"{options.TablePrefix}_send_unsettled_report", options.Schema);
-
-                b.ConfigureByConvention();
-                b.Property(x => x.BranchId).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.DocumentNumber).IsRequired().HasMaxLength(CommonConsts.MaxNameLength);
-
-                b.Property(x => x.Enabled);
-
-                //b.HasMany(u => u.SendUnsettledDiffReportDetails).WithOne().HasForeignKey(rd => rd.DocumentId).OnDelete(DeleteBehavior.NoAction).IsRequired();
-
-
-                b.HasIndex(x => new { x.BranchId, x.DocumentNumber }).IsUnique().HasFilter(IsDeletedFilter);
-            });
-        }
-
-
-        private static void ConfigureSendUnsettledDiffReportDetail(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options)
-        {
-            builder.Entity<SendUnsettledDiffReportDetail>(b =>
-            {
-                b.ToTable($"{options.TablePrefix}_send_unsettled_report_detail", options.Schema);
-                b.ConfigureByConvention();
-                b.Property(x => x.BranchId).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.DocumentNumber).IsRequired().HasMaxLength(CommonConsts.MaxNameLength);
-                b.HasIndex(x => new { x.BranchId, x.DocumentId, x.Version, x.ChassisNumber, x.ItemCode }).IsUnique().HasFilter(IsDeletedFilter);
-            });
-        }
-
-
-        private static void ConfigureSecondaryActuralAdjustmentReport(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options)
-        {
-            builder.Entity<SecondaryActuralAdjustmentReport>(b =>
-            {
-                b.ToTable($"{options.TablePrefix}_sec_act_adjustment_report", options.Schema);
-                b.ConfigureByConvention();
-                b.Property(x => x.BranchId).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.DocumentNumber).IsRequired().HasMaxLength(CommonConsts.MaxNameLength);
-                b.Property(x => x.Enabled);
-                b.HasMany(u => u.SecondaryActuralAdjustmentReportDetails).WithOne().HasForeignKey(rd => rd.DocumentId).OnDelete(DeleteBehavior.NoAction).IsRequired();
-                b.HasIndex(x => new { x.BranchId, x.DocumentNumber }).IsUnique().HasFilter(IsDeletedFilter);
-            });
-        }
-
-
-        private static void ConfigureSecondaryActuralAdjustmentReportDetail(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options)
-        {
-            builder.Entity<SecondaryActuralAdjustmentReportDetail>(b =>
-            {
-                b.ToTable($"{options.TablePrefix}_sec_act_adjustment_report_detail", options.Schema);
-                b.ConfigureByConvention();
-                b.Property(x => x.BranchId).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.DocumentNumber).IsRequired().HasMaxLength(CommonConsts.MaxNameLength);
-                b.Property(x => x.Enabled);
-                b.HasIndex(x => new { x.BranchId, x.DocumentId, x.Version, x.CustomItemCode, x.CustomSubItemCode, x.SupplierCode }).IsUnique().HasFilter(IsDeletedFilter);
-
-            });
-        }
-
-
-
-        private static void ConfigureSecondaryActuralDiffReport(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options)
-        {
-            builder.Entity<SecondaryActuralDiffReport>(b =>
-            {
-                b.ToTable($"{options.TablePrefix}_sec_act_diff_report", options.Schema);
-                b.ConfigureByConvention();
-                b.Property(x => x.BranchId).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.DocumentNumber).IsRequired().HasMaxLength(CommonConsts.MaxNameLength);
-                b.Property(x => x.Enabled);
-                b.HasMany(u => u.SecondaryActuralDiffReportDetails).WithOne().HasForeignKey(rd => rd.DocumentId).OnDelete(DeleteBehavior.NoAction).IsRequired();
-                b.HasIndex(x => new { x.BranchId, x.DocumentNumber }).IsUnique().HasFilter(IsDeletedFilter);
-            });
-        }
-
-
-        private static void ConfigureSecondaryActuralDiffReportDetail(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options)
-        {
-            builder.Entity<SecondaryActuralDiffReportDetail>(b =>
-            {
-                b.ToTable($"{options.TablePrefix}_sec_act_diff_report_detail", options.Schema);
-                b.ConfigureByConvention();
-                b.Property(x => x.BranchId).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.DocumentNumber).IsRequired().HasMaxLength(CommonConsts.MaxNameLength);
-                b.Property(x => x.Enabled);
-                b.HasIndex(x => new { x.BranchId, x.DocumentId, x.Version, x.CustomItemCode, x.CustomSubItemCode, x.SupplierCode }).IsUnique().HasFilter(IsDeletedFilter);
-            });
-        }
-
-
-        private static void ConfigureInventoryDetailVersion(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options)
-        {
-
-            builder.Entity<InventoryDetailVersion>(b =>
-            {
-                b.ToTable($"{options.TablePrefix}_inventory_version", options.Schema);
-                b.ConfigureByConvention();
-                b.Property(x => x.Version).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.Year).HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.Period).HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.CustomerCode).HasMaxLength(CommonConsts.MaxCodeLength);
-                b.HasIndex(x => new {x.Version,x.Factory }).IsUnique().HasFilter(IsDeletedFilter);
-            });
-        }
- 
-
-
-
-        private static void ConfigureFISVersion(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options)
-        {
-
-            builder.Entity<FISVersion>(b =>
-            {
-                b.ToTable($"{options.TablePrefix}_fis_version", options.Schema);
-                b.ConfigureByConvention();
-                b.Property(x => x.Year).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.Period).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.Version).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.CustomerCode).HasMaxLength(CommonConsts.MaxCodeLength);
-            });
-        }
-
-        private static void ConfigurePrebatch(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options)
-        {
-
-            builder.Entity<Prebatch>(b =>
-            {
-                b.ToTable($"{options.TablePrefix}_prebatch", options.Schema);
-                b.ConfigureByConvention();
-                b.Property(x => x.Year).HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.YearKennCode).HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.CarCode).HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.KENNCode).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.State).IsRequired();
-               // b.HasIndex(x => new { x.KENNCode, x.Year}).IsUnique().HasFilter(IsDeletedFilter);
-
-            });
-        }
-
-
-        private static void ConfigureCentralizedControl(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options)
-        {
-
-            builder.Entity<CentralizedControl>(b =>
-            {
-                b.ToTable($"{options.TablePrefix}_control", options.Schema);
-                b.ConfigureByConvention();
-                b.Property(x => x.Year).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.Period).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
-                b.HasIndex(x => new { x.Year, x.Period }).IsUnique().HasFilter(IsDeletedFilter);
-            });
-        }
-
-
-        private static void ConfigureSecondaryAdjustment(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options)
-        {
-            builder.Entity<SecondaryAdjustment>(b =>
-            {
-                b.ToTable($"{options.TablePrefix}_sec_adj", options.Schema);
-                b.ConfigureByConvention();
-                b.Property(x => x.Year).HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.Period).HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.CustomerMaterialCode).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.CustomerComponentCode).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
-                b.HasIndex(x => new { x.Version ,x.CustomerComponentCode,x.CustomerMaterialCode,x.SupplierCode}).IsUnique().HasFilter(IsDeletedFilter);
-
-            });
-        }
-
-
-        private static void ConfigureSecondaryDiscount(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options)
-        {
-            builder.Entity<SecondaryDiscount>(b =>
-            {
-                b.ToTable($"{options.TablePrefix}_sec_dis", options.Schema);
-                b.ConfigureByConvention();
-                b.Property(x => x.Year).HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.Period).HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.SupplierCode).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
-                b.HasIndex(x => new {  x.SupplierCode }).IsUnique().HasFilter(IsDeletedFilter);
-            });
-        }
-
-
-
-
-
-
-
-        private static void ConfigureSecondaryPriceRatio(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options)
-        {
-            builder.Entity<SecondaryPriceRatio>(b =>
-            {
-                b.ToTable($"{options.TablePrefix}_sec_ratio", options.Schema);
-                b.ConfigureByConvention();
-
-                b.Property(x => x.Year).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.Period).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.CustomItemCode).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.CustomerCode).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.CustomItemPrice).IsRequired();
-                b.HasIndex(x => new { x.Version, x.CustomItemCode, x.CustomSubItemCode,x.SupplierCode }).IsUnique().HasFilter(IsDeletedFilter);
-
-            });
-
-
-        }
-
-       
-
-
-        private static void ConfigureSecondaryAdjustmentVersion(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options)
-        {
-            builder.Entity<SecondaryAdjustmentVersion>(b =>
-            {
-
-                b.ToTable($"{options.TablePrefix}_sec_adj_version", options.Schema);
-                b.ConfigureByConvention();
-
-                b.Property(x => x.Year).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.Period).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
-
-                b.HasIndex(x => new { x.Version}).IsUnique().HasFilter(IsDeletedFilter);
-
-
-
-            });
-
-
-        }
-
-        private static void ConfigureSecondaryDiscountVersion(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options)
-        {
-            builder.Entity<SecondaryDiscountVersion>(b =>
-            {
-
-                b.ToTable($"{options.TablePrefix}_sec_dis_version", options.Schema);
-                b.ConfigureByConvention();
-
-                b.Property(x => x.Year).HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.Period).HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.Version).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
-                b.HasIndex(x => new { x.Version }).IsUnique().HasFilter(IsDeletedFilter);
-
-
-
-            });
-
-
-        }
-
-        private static void ConfigureSecondaryPriceRatioVersion(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options)
-        {
-            builder.Entity<SecondaryPriceRatioVersion>(b =>
-            {
-                b.ToTable($"{options.TablePrefix}_sec_ratio_version", options.Schema);
-                b.ConfigureByConvention();
-
-                b.Property(x => x.Year).IsRequired();
-                b.Property(x => x.Period).IsRequired();
-
-                b.HasIndex(x => new { x.Version }).IsUnique().HasFilter(IsDeletedFilter);
-            });
-
-
-        }
-        private static void ConfigureCustomerStorageLocation(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options)
-        {
-            builder.Entity<CustomerStorageLocation>(b =>
-            {
-                b.ToTable($"{options.TablePrefix}_customerlocation", options.Schema);
-                b.ConfigureByConvention();
-            
-                b.Property(x => x.Storagelocation).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.CustomerCode).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.CustomerDesc).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
-                b.HasIndex(x => new { x.Storagelocation,x.CustomerCode }).IsUnique().HasFilter(IsDeletedFilter);
-            });
-        }
-
-        private static void ConfigureFactory(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options)
-        {
-            builder.Entity<Factory>(b =>
-            {
-                b.ToTable($"{options.TablePrefix}_factory", options.Schema);
-                b.ConfigureByConvention();
-
-                b.Property(x => x.Code).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.Desc).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
-                b.HasIndex(x => new {x.Code }).IsUnique().HasFilter(IsDeletedFilter);
-            });
-        }
-
-       
-        private static void ConfigureBTSeqKBDiffReport(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options)
-        {
-            builder.Entity<BTSeqKBDiffReport>(b =>
-            {
-                b.ToTable($"{options.TablePrefix}_bt_seq_kb_diff_report", options.Schema);
-
-                b.ConfigureByConvention();
-                b.Property(x => x.BranchId).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.DocumentNumber).IsRequired().HasMaxLength(CommonConsts.MaxNameLength);
-
-                b.Property(x => x.Enabled);
-
-                b.HasMany(u => u.BTSeqKBDiffReportDetails).WithOne().HasForeignKey(rd => rd.DocumentId).OnDelete(DeleteBehavior.NoAction).IsRequired();
-
-
-                b.HasIndex(x => new { x.BranchId, x.DocumentNumber }).IsUnique().HasFilter(IsDeletedFilter);
-            });
-        }
-
-
-        private static void ConfigureBTSeqKBDiffReportDetail(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options)
-        {
-            builder.Entity<BTSeqKBDiffReportDetail>(b =>
-            {
-                b.ToTable($"{options.TablePrefix}_bt_seq_kb_diff_report_detail", options.Schema);
-
-                b.ConfigureByConvention();
-                b.Property(x => x.BranchId).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.DocumentNumber).IsRequired().HasMaxLength(CommonConsts.MaxNameLength);
-
-                b.Property(x => x.Enabled);
-                b.HasIndex(x => new { x.BranchId, x.DocumentId, x.Version, x.DT, x.CustomCode,x.MaterialCode }).IsUnique().HasFilter(IsDeletedFilter);
-
-            });
-        }
-        private static void ConfigureBTNotConsignReport(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options)
-        {
-            builder.Entity<BTNotConsignReport>(b =>
-            {
-                b.ToTable($"{options.TablePrefix}_bt_not_kb_consign_report", options.Schema);
-
-                b.ConfigureByConvention();
-                b.Property(x => x.BranchId).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.DocumentNumber).IsRequired().HasMaxLength(CommonConsts.MaxNameLength);
-
-                b.Property(x => x.Enabled);
-
-                b.HasMany(u => u.BTNotConsignReportDetails).WithOne().HasForeignKey(rd => rd.DocumentId).OnDelete(DeleteBehavior.NoAction).IsRequired();
-
-
-                b.HasIndex(x => new { x.BranchId, x.DocumentNumber }).IsUnique().HasFilter(IsDeletedFilter);
-            });
-        }
-
-        private static void ConfigureBTNotConsignReportDetail(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options)
-        {
-            builder.Entity<BTNotConsignReportDetail>(b =>
-            {
-                b.ToTable($"{options.TablePrefix}_bt_not_kb_consign_report_detail", options.Schema);
-
-                b.ConfigureByConvention();
-                b.Property(x => x.BranchId).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.DocumentNumber).IsRequired().HasMaxLength(CommonConsts.MaxNameLength);
-
-                b.Property(x => x.Enabled);
-                b.HasIndex(x => new { x.BranchId, x.DocumentId, x.Version, x.CustomCode, x.MaterialCode,x.OrderKBCode }).IsUnique().HasFilter(IsDeletedFilter);
-
-            });
-        }
-
-
-     
-        private static void ConfigureImportMap(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options)
-        {
-            builder.Entity<ImportColumnMap>(b =>
-            {
-                b.ToTable($"{options.TablePrefix}_importmap", options.Schema);
-
-                b.ConfigureByConvention();
-                b.Property(x => x.NewColumnName).HasMaxLength(CommonConsts.MaxCodeLength);
-                b.Property(x => x.OldColumnName).HasMaxLength(CommonConsts.MaxCodeLength);
-
-                b.Property(x => x.ProjectName).HasMaxLength(CommonConsts.MaxCodeLength);
-
-            });
-        }
-   
-
- 
-
-
-        private static void ConfigureSettlementPartVersion(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options)
-        {
-
-            builder.Entity<SettlementPartVersion>(b =>
-            {
-
-                b.ToTable($"{options.TablePrefix}_settlement_part_version", options.Schema);
-
-                b.ConfigureByConvention();
-                b.Property(x => x.Year).HasMaxLength(50);
-                b.Property(x => x.Period).HasMaxLength(50);
-                b.Property(x => x.Version).HasMaxLength(50);
-                b.Property(x => x.CustomerCode).HasMaxLength(50);
-                b.Property(x => x.Factory).HasMaxLength(50);
-
-            });
-        }
-
-
-
-
-
-
-
-
-
-        private static void ConfigureMaterialRelationshipDetail(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options)
-        {
-
-            builder.Entity<MaterialRelationshipDetail>(b =>
-            {
-
-                b.ToTable($"{options.TablePrefix}_MaterialRelationshipDetail", options.Schema);
-
-                b.ConfigureByConvention();
-                b.Property(x => x.Version).HasMaxLength(50);
-                b.Property(x => x.CustomerCode).HasMaxLength(50);
-                b.Property(x => x.ErpMaterialCode).HasMaxLength(50);
-                b.Property(x => x.MaterialDesc).HasMaxLength(50);
-                b.Property(x => x.MaterialProperty).HasMaxLength(50);
-                b.Property(x => x.SettleMaterialCode).HasMaxLength(50);
-                b.Property(x => x.ShipMaterailCode).HasMaxLength(50);
-                b.Property(x => x.AppraisalCategory).HasMaxLength(50);
-                b.Property(x => x.Remark).HasMaxLength(50);
-                b.Property(x => x.ConcurrencyStamp).HasMaxLength(50);
-            });
-        }
-
-
-        private static void ConfigureMaterialRelationshipVersion(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options)
-        {
-
-            builder.Entity<MaterialRelationshipVersion>(b =>
-            {
-
-                b.ToTable($"{options.TablePrefix}_MaterialRelationshipVersion", options.Schema);
-
-                b.ConfigureByConvention();
-                b.Property(x => x.Year).HasMaxLength(50);
-                b.Property(x => x.Period).HasMaxLength(50);
-                b.Property(x => x.Version).HasMaxLength(50);
-                b.Property(x => x.CustomerCode).HasMaxLength(50);
-                b.Property(x => x.Factory).HasMaxLength(50);
-                b.Property(x => x.Remark).HasMaxLength(50);
-                b.Property(x => x.ConcurrencyStamp).HasMaxLength(50);
-            });
-        }
-
-
-        /// <summary>
-        /// 结算关系对照表
-        /// </summary>
-        /// <param name="builder"></param>
-        /// <param name="options"></param>
-        private static void ConfigureSettlementCrossReference(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options)
-        {
-            builder.Entity<SettlementCrossReference>(b =>
-            {
-
-                b.ToTable($"{options.TablePrefix}_SettlementCrossReference", options.Schema);
-                b.ConfigureByConvention();
-
-                b.Property(x => x.Year).HasMaxLength(50);
-                b.Property(x => x.Period).HasMaxLength(50);
-                b.Property(x => x.Factory).HasMaxLength(50);
-                b.Property(x => x.Model).HasMaxLength(50);
-                b.Property(x => x.PartType).HasMaxLength(50);
-                b.Property(x => x.SettlementMaterialCode).IsRequired().HasMaxLength(50);
-                b.Property(x => x.BomMaterialCode).IsRequired().HasMaxLength(50);
-                b.Property(x => x.MaterialDesc).HasMaxLength(50);
-                b.Property(x => x.SupplierCode).HasMaxLength(50);
-                b.Property(x => x.SupplierDesc).HasMaxLength(128);
-                b.Property(x => x.Buyer).HasMaxLength(50);
-                b.Property(x => x.Version).IsRequired().HasMaxLength(50);
-                b.Property(x => x.CustomerCode).HasMaxLength(50);
-
-                b.HasIndex(x => new { x.Version, x.SettlementMaterialCode, x.BomMaterialCode }).IsUnique().HasFilter(IsDeletedFilter); 
-            });
-        }
-
-        /// <summary>
-        /// 结算关系对照表_Version
-        /// </summary>
-        /// <param name="builder"></param>
-        /// <param name="options"></param>
-        private static void ConfigureSettlementCrossReferenceVersion(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options)
-        {
-
-            builder.Entity<SettlementCrossReferenceVersion>(b =>
-            {
-
-                b.ToTable($"{options.TablePrefix}_SettlementCrossReference_Version", options.Schema);
-
-                b.ConfigureByConvention();
-                b.Property(x => x.Year).HasMaxLength(50);
-                b.Property(x => x.Period).HasMaxLength(50);
-                b.Property(x => x.Version).HasMaxLength(50);
-                b.Property(x => x.CustomerCode).HasMaxLength(50);
-                b.Property(x => x.Factory).HasMaxLength(50);
-
-            });
-        }
-
-        /// <summary>
-        /// 结算包跟散件对应关系
-        /// </summary>
-        /// <param name="builder"></param>
-        /// <param name="options"></param>
-        private static void ConfigureSettlementPakAndSpareParts(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options)
-        {
-
-            builder.Entity<SettlementPakAndSpareParts>(b =>
-            {
-
-                b.ToTable($"{options.TablePrefix}_SettlementPakAndSpareParts", options.Schema);
-
-
-                b.ConfigureByConvention();
-                b.Property(x => x.Period).HasMaxLength(50);
-                b.Property(x => x.ApplicableFunction).HasMaxLength(50);
-                b.Property(x => x.SettlementPartCode).HasMaxLength(50);
-                b.Property(x => x.SettlementPartDesc).HasMaxLength(50);
-                b.Property(x => x.ErpSparePartCode).HasMaxLength(50);
-                b.Property(x => x.ErpSparePartName).HasMaxLength(50);
-                b.Property(x => x.PartType).HasMaxLength(50);
-                b.Property(x => x.QADCode).HasMaxLength(50);
-                b.Property(x => x.SupplierCode).HasMaxLength(50);
-                b.Property(x => x.SupplierName).HasMaxLength(50);
-                b.Property(x => x.ProductLine).HasMaxLength(50);
-                b.Property(x => x.PerCarNum).HasMaxLength(50);
-                b.Property(x => x.Price).HasMaxLength(50);
-                b.Property(x => x.SupplyProportion).HasMaxLength(50);
-                b.Property(x => x.QuantityPrice).HasMaxLength(50);
-                b.Property(x => x.Version).HasMaxLength(50);
-            });
-        }
-
-        /// <summary>
-        /// 结算包跟散件对应关系_Version
-        /// </summary>
-        /// <param name="builder"></param>
-        /// <param name="options"></param>
-        private static void ConfigureSettlementPakAndSparePartsVersion(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options)
-        {
-
-            builder.Entity<SettlementPakAndSparePartsVersion>(b =>
-            {
-
-                b.ToTable($"{options.TablePrefix}_SettlementPakAndSpareParts_Version", options.Schema);
-
-                b.ConfigureByConvention();
-                b.Property(x => x.Year).HasMaxLength(50);
-                b.Property(x => x.Period).HasMaxLength(50);
-                b.Property(x => x.Version).HasMaxLength(50);
-                b.Property(x => x.CustomerCode).HasMaxLength(50);
-                b.Property(x => x.Factory).HasMaxLength(50);
-
-            });
-        }
         #endregion
 
     }
@@ -3007,4 +459,3 @@ namespace Win.Sfs.SettleAccount
 
 
 
-}
\ No newline at end of file
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/EntityFrameworkCore/SettleAccountEntityFrameworkCoreModule.cs b/code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/EntityFrameworkCore/SettleAccountEntityFrameworkCoreModule.cs
index 3ca15628..54fd185a 100644
--- a/code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/EntityFrameworkCore/SettleAccountEntityFrameworkCoreModule.cs
+++ b/code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/EntityFrameworkCore/SettleAccountEntityFrameworkCoreModule.cs
@@ -55,12 +55,6 @@ namespace Win.Sfs.SettleAccount
                 //options.AddDefaultRepositories(includeAllEntities: true);
             });
 
-            context.Services.AddAbpDbContext<WMSDbContext>(options =>
-            {
-                options.AddDefaultRepositories();
-
-          
-            });
 
             context.Services.AddAbpDbContext<UnInterfaceDbContext>(options =>
             {
@@ -74,7 +68,6 @@ namespace Win.Sfs.SettleAccount
             //     context.Services.AddTransient(typeof(IInventoryDetailRepository),
             //typeof(InventoryDetailRepository));
             context.Services.AddTransient(typeof(UnInterfaceEfCoreRepository<>));
-            context.Services.AddTransient(typeof(WMSEfCoreRepository<>));
             context.Services.AddTransient(typeof(INormalEfCoreRepository<,>),
                 typeof(SettleAccountNormalEfCoreRepository<,>));
             context.Services.AddTransient(typeof(IBranchEfCoreRepository<,>),
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/EntityFrameworkCore/UnInterfaceDbContext.cs b/code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/EntityFrameworkCore/UnInterfaceDbContext.cs
index f3969393..f37664c1 100644
--- a/code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/EntityFrameworkCore/UnInterfaceDbContext.cs
+++ b/code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/EntityFrameworkCore/UnInterfaceDbContext.cs
@@ -9,8 +9,7 @@ using System.Threading.Tasks;
 using Volo.Abp.Data;
 using Volo.Abp.EntityFrameworkCore;
 using Win.Sfs.SettleAccount.Entities;
-using Win.Sfs.SettleAccount.Entities.WMS;
-using WY.NewJit.Extends.PaiGe.WMS;
+
 
 
 namespace Win.Sfs.SettleAccount.EntityFrameworkCore
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/EntityFrameworkCore/WMSDapperRepository.cs b/code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/EntityFrameworkCore/WMSDapperRepository.cs
deleted file mode 100644
index 7cb3f3eb..00000000
--- a/code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/EntityFrameworkCore/WMSDapperRepository.cs
+++ /dev/null
@@ -1,128 +0,0 @@
-using Dapper;
-using System;
-using System.Collections.Generic;
-using System.Data;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Volo.Abp.DependencyInjection;
-using Volo.Abp.Domain.Repositories.Dapper;
-using Volo.Abp.EntityFrameworkCore;
-
-
-
-namespace Win.Sfs.SettleAccount
-{
-    public class WMSDapperRepository : DapperRepository<WMSDbContext>, ITransientDependency
-    {
-
-
-        public WMSDapperRepository(IDbContextProvider<WMSDbContext> dbContextProvider)
-            : base(dbContextProvider)
-        {
-
-        }
-
-        public virtual async Task<List<T>> GetListBySqlAsync<T>(string sql, bool isTrans = false)
-        {
-            if (isTrans)
-            {
-                IDbConnection conn = await GetDbConnectionAsync();
-                IDbTransaction trans = await GetDbTransactionAsync();
-                return (await conn.QueryAsync<T>(sql, null, trans))
-                    .ToList();
-            }
-            else
-            {
-                IDbConnection conn = await GetDbConnectionAsync();
-                return (await conn.QueryAsync<T>(sql))
-                    .ToList();
-            }
-        }
-
-        public virtual async Task<T> GetSingleBySqlAsync<T>(string sql, bool isTrans = false)
-        {
-            if (isTrans)
-            {
-                IDbConnection conn = await GetDbConnectionAsync();
-                IDbTransaction trans = await GetDbTransactionAsync();
-                return await conn.QuerySingleOrDefaultAsync<T>(sql, null, trans);
-            }
-            else
-            {
-                IDbConnection conn = await GetDbConnectionAsync();
-                return await conn.QuerySingleOrDefaultAsync<T>(sql);
-            }
-        }
-
-
-        public virtual async Task<int> ExecuteSqlAsync(string sql, object obj = null, bool isTrans = false)
-        {
-            if (isTrans)
-            {
-                //return await DbConnection.ExecuteAsync("update People set Name = @NewName", new { NewName = name }, DbTransaction);
-                IDbConnection conn = await GetDbConnectionAsync();
-                IDbTransaction trans = await GetDbTransactionAsync();
-                return await conn.ExecuteAsync(sql, obj, trans);
-            }
-            else
-            {
-                //return await DbConnection.ExecuteAsync("update People set Name = @NewName", new { NewName = name }, DbTransaction);
-                IDbConnection conn = await GetDbConnectionAsync();
-                return await conn.ExecuteAsync(sql, obj);
-            }
-        }
-
-
-        #region 同步方法
-        public virtual List<T> GetListBySql<T>(string sql, bool isTrans = false)
-        {
-            if (isTrans)
-            {
-                IDbConnection conn = GetDbConnectionAsync().GetAwaiter().GetResult();
-                IDbTransaction trans = GetDbTransactionAsync().GetAwaiter().GetResult();
-                return (conn.Query<T>(sql, null, trans))
-                    .ToList();
-            }
-            else
-            {
-                IDbConnection conn = (IDbConnection)GetDbConnectionAsync().GetAwaiter().GetResult();
-                return (conn.Query<T>(sql))
-                    .ToList();
-            }
-        }
-
-        public virtual T GetSingleBySql<T>(string sql, bool isTrans = false)
-        {
-            if (isTrans)
-            {
-                IDbConnection conn = GetDbConnectionAsync().GetAwaiter().GetResult();
-                IDbTransaction trans = GetDbTransactionAsync().GetAwaiter().GetResult();
-                return conn.QuerySingleOrDefault<T>(sql, null, trans);
-            }
-            else
-            {
-                IDbConnection conn = (IDbConnection)GetDbConnectionAsync().GetAwaiter().GetResult();
-                return conn.QuerySingleOrDefault<T>(sql);
-            }
-        }
-
-
-        public virtual int ExecuteSql(string sql, object obj = null, bool isTrans = false)
-        {
-            if (isTrans)
-            {
-                IDbConnection conn = GetDbConnectionAsync().GetAwaiter().GetResult();
-                IDbTransaction trans = GetDbTransactionAsync().GetAwaiter().GetResult();
-                return conn.Execute(sql, obj, trans);
-            }
-            else
-            {
-                IDbConnection conn = (IDbConnection)GetDbConnectionAsync().GetAwaiter().GetResult();
-                return conn.Execute(sql, obj);
-            }
-        }
-
-        #endregion
-    }
-}
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/EntityFrameworkCore/WMSDbContext.cs b/code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/EntityFrameworkCore/WMSDbContext.cs
deleted file mode 100644
index ce476740..00000000
--- a/code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/EntityFrameworkCore/WMSDbContext.cs
+++ /dev/null
@@ -1,48 +0,0 @@
-
-using Microsoft.EntityFrameworkCore;
-using System;
-using System.Collections.Generic;
-using System.Data;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Volo.Abp.Data;
-using Volo.Abp.EntityFrameworkCore;
-using Win.Sfs.SettleAccount.Entities;
-using Win.Sfs.SettleAccount.Entities.WMS;
-using WY.NewJit.Extends.PaiGe.WMS;
-
-namespace Win.Sfs.SettleAccount
-{
-
-
-
-
-    [ConnectionStringName("Wms")]
-    public class WMSDbContext : AbpDbContext<WMSDbContext>
-    {
-       
-
-        /* Add DbSet properties for your Aggregate Roots / Entities here.
-         * Also map them inside NewJitDbContextModelCreatingExtensions.ConfigureNewJit
-         */
-
-        public WMSDbContext(DbContextOptions<WMSDbContext> options)
-            : base(options)
-        {
-            this.Database.SetCommandTimeout(System.TimeSpan.FromMinutes(30));
-        }
-
-
-
-        protected override void OnModelCreating(ModelBuilder builder)
-        {
-            base.OnModelCreating(builder);
-
-
-        }
-
-        
-
-    }
-}
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/ErpSumOutputDapperRepository.cs b/code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/ErpSumOutputDapperRepository.cs
index 959c7e4e..be303a03 100644
--- a/code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/ErpSumOutputDapperRepository.cs
+++ b/code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/ErpSumOutputDapperRepository.cs
@@ -56,257 +56,4 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report
         [ExporterHeader(DisplayName ="单号")]
         public string REMARK { set; get; }
     }
-
-
-    public  class ErpSumOutputDapperRepository: DapperRepository<WMSDbContext>, ITransientDependency
-    {
-
-        public ErpSumOutputDapperRepository(IDbContextProvider<WMSDbContext> dbContextProvider) : base(dbContextProvider)
-        {
-
-        }
-        public virtual List<TA_WMS_CTRL> GetTask(string version,string begin, string end)
-        {
-            var str = "";
-
-            if (!string.IsNullOrEmpty(begin))
-            {
-                str += string.Format("  and AccountDate>='{0}' ", begin);
-            }
-            if (!string.IsNullOrEmpty(end))
-            {
-                str += string.Format("  and AccountDate<='{0}' ", end);
-            }
-            if (!string.IsNullOrEmpty(begin))
-            {
-                str += string.Format("  and JsonString='{0}' ", version);
-            }
-            var sql = "SELECT TOP (1000) [wms_seq]\n" +
-                "      ,[wms_table]\n" +
-                "      ,[wms_table_qty]\n" +
-                "      ,[wms_state]\n" +
-                "      ,[remark]\n" +
-                "      ,[createtime]\n" +
-                "      ,[wms_domin]\n" +
-                "      ,[SourceBillNum]\n" +
-                "      ,[updatetime]\n" +
-                "      ,[wms_uid]\n" +
-                "      ,[JsonString]\n" +
-                "      ,[AccountDate]\n" +
-                "  FROM [TA_WMS_CTRL]  WHERE {0}" +
-                "  SourceBillNum LIKE 'S2%'  order by createtime desc";
-
-            sql = string.Format(sql, str);
-            var query = DbConnection.Query<TA_WMS_CTRL>(sql);
-            return query.ToList();
-
-
-
-        }
-
-        public virtual List<TA_WMS_JSKH> GetTaskList(string taskid, string materialCode, string billnum)
-        {
-            var str = " where 1=1 ";
-
-            if (!string.IsNullOrEmpty(taskid))
-            {
-                str += string.Format("  and wms_seq='{0}' ", taskid);
-            }
-            if (!string.IsNullOrEmpty(materialCode))
-            {
-                str += string.Format("  and ZVBELN='{0}' ", billnum);
-            }
-            if (!string.IsNullOrEmpty(billnum))
-            {
-                str += string.Format("  and MATNR='{0}' ", materialCode);
-            }
-
-            var sql =
-            " SELECT [wms_seq]\n" +
-            "      ,[POSNR]\n" +
-            "      ,[ZVBELN] \n" +
-            "      ,[KUNNR] \n" +
-            "      ,[AUGRU]\n" +
-            "      ,[MATNR]\n" +
-            "      ,[ZPR0]\n" +
-            "      ,[KWMENG]\n" +
-            "      ,[ZNOTE1]\n" +
-            "      ,[ZNOTE4]\n" +
-            "      ,[ZNOTE5]\n" +
-            "      ,[STATE]\n" +
-            "      ,[REMARK]\n" +
-            "  FROM [TA_WMS_JSKH] {0} ";
-
-            sql = string.Format(sql, str);
-            var query = DbConnection.Query<TA_WMS_JSKH>(sql);
-            return query.ToList();
-
-
-
-        }
-
-
-
-        public virtual List<string> GetVersionList()
-        {
-
-
-            var sql =
-                " SELECT \n" +
-                "      distinct [JsonString]\n" +
-               
-                "  FROM [TA_WMS_CTRL]  WHERE " +
-                "  SourceBillNum LIKE 'S2%'  ";
-
-           
-            var query = DbConnection.Query<string>(sql);
-            return query.ToList();
-
-
-
-        }
-
-        [UnitOfWork(false)]
-
-
-        public virtual  void InsertWmsSum(List<WmsDetailReport> p_list,string version,DateTime accountDate)
-        {
-            StringBuilder _buffer = new StringBuilder();
-
-            var _ary=p_list.Select(p => p.BillNum).Distinct().ToList();
-       
-            var billnum= string.Join(",", _ary);
-
-            
-            //var billnum ="S" +DateTime.Now.ToString("yyyyMMddhhmmss");
-            var taskid = Guid.NewGuid().ToString();
-            foreach (var itm in p_list)
-            {
-
-                var sql = "INSERT INTO [dbo].[TA_WMS_JSKH]\n" +
-           "           ([wms_seq]\n" +
-           "           ,[POSNR]\n" +
-           "           ,[ZVBELN]\n" +
-           "           ,[AUART]\n" +
-           "           ,[VKORG]\n" +
-           "           ,[SPART]\n" +
-           "           ,[VTWEG]\n" +
-           "           ,[KUNNR]\n" +
-           "           ,[KUNNR2]\n" +
-           "           ,[AUGRU]\n" +
-           "           ,[MATNR]\n" +
-           "           ,[WERKS]\n" +
-           "           ,[LGORT]\n" +
-           "           ,[ZPR0]\n" +
-           "           ,[KWMENG]\n" +
-           "           ,[ZNOTE1]\n" +
-           "           ,[ZNOTE2]\n" +
-           "           ,[ZNOTE3]\n" +
-           "           ,[ZNOTE4]\n" +
-           "           ,[ZNOTE5]\n" +
-           "           ,[STATE]\n" +
-           "           ,[REMARK]" +
-           "           ,[KOEIN]  )\n" +
-           "     VALUES\n" +
-           "           ( '{0}'   ,\n" +
-           "             '{1}'   ,  \n" +
-           "             '{2}'   , \n" +
-           "             '{3}'   ,  \n" +
-           "             '{4}'   ,  \n" +
-           "             '{5}'   ,  \n" +
-           "             '{6}'   ,  \n" +
-           "             '{7}'   ,  \n" +
-           "             '{8}'   ,  \n" +
-           "             '{9}'   ,  \n" +
-           "             '{10}'  ,  \n" +
-           "             '{11}'  ,  \n" +
-           "             '{12}'  ,  \n" +
-           "             '{13}'  ,  \n" +
-           "             '{14}'  , \n" +
-           "             '{15}'  , \n" +
-           "             '{16}'  , \n" +
-           "             '{17}'  , \n" +
-           "             '{18}'  , \n" +
-           "             '{19}'  , \n" +
-           "              {20}   , \n" +
-           "             '{21}'  , '{22}' ) \n";
-
-                sql = string.Format(sql,
-                    taskid,
-                    itm.LineNumber.ToString(),
-                    itm.BillNum,
-                    "ZKE1",
-                    "1001",
-                    "00",
-                    itm.SaleCode,
-                    itm.ClientCode,
-                    itm.ClientCode,
-                    itm.SettleCode,
-                    itm.MaterialCode,
-                    "1000",
-                    string.Empty,
-                    itm.Price,
-                    itm.OutputQty,
-                    itm.Client,
-                    itm.MaterialGroupCode,
-                    itm.MaterialGroup,
-                    itm.Type,
-                     itm.OutPutAmt,
-                    "0",
-                    "",
-                    "CNY"
-
-                    );
-                _buffer.AppendLine(sql);
-            }
-
-
-
-           var count= DbConnection.Execute(_buffer.ToString(), null, null, 1200, null);
-           if (count > 0)
-           {
-                var sql = "INSERT INTO [TA_WMS_CTRL]\n" +
-      "           ([wms_seq]\n" +
-      "           ,[wms_table]\n" +
-      "           ,[wms_table_qty]\n" +
-      "           ,[wms_state]\n" +
-      "           ,[remark]\n" +
-      "           ,[createtime]\n" +
-      "           ,[wms_domin]\n" +
-      "           ,[SourceBillNum]\n" +
-      "           ,[JsonString]\n" +
-      "           ,[AccountDate])\n" +
-      "     VALUES\n" +
-      "           ( '{0}'     \n" +
-      "           , '{1}'    \n" +
-      "           , '{2}'    \n" +
-      "           , '{3}'    \n" +
-      "           , '{4}'    \n" +
-      "           , '{5}'    \n" +
-      "           , '{6}'    \n" +
-      "           , '{7}'    \n" +
-      "           , '{8}'    \n" +
-      "           , '{9}'     )";
-
-                sql = string.Format(sql,
-                         taskid
-                       , "TA_WMS_JSKH"
-                       , count.ToString(),
-                       0,
-                       string.Empty,
-                       DateTime.Now,
-                       "1000",
-                       billnum
-                      , version
-                      , accountDate.ToString("yyyy-MM-dd")
-
-                       ) ;
-
-                DbConnection.Execute(sql, null, null, 1200, null);
-            }
-
-
-
-        }
-    }
 }
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/SecMatchBaseDapperReportRepository.cs b/code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/SecMatchBaseDapperReportRepository.cs
index 57fe5927..5dc6644d 100644
--- a/code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/SecMatchBaseDapperReportRepository.cs
+++ b/code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/SecMatchBaseDapperReportRepository.cs
@@ -10,7 +10,6 @@ using Volo.Abp.Domain.Repositories.Dapper;
 using Volo.Abp.Domain.Repositories.EntityFrameworkCore;
 using Volo.Abp.EntityFrameworkCore;
 using Win.Sfs.SettleAccount.Entities.SecMatch;
-using Win.Sfs.SettleAccount.Entities.SettlementPakAndSparePartsRef;
 
 namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report
 {
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/SettledPartAndErpPartPriceDiffRepository.cs b/code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/SettledPartAndErpPartPriceDiffRepository.cs
index 41e11874..968a0c02 100644
--- a/code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/SettledPartAndErpPartPriceDiffRepository.cs
+++ b/code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/SettledPartAndErpPartPriceDiffRepository.cs
@@ -7,7 +7,6 @@ using System.Threading.Tasks;
 using Volo.Abp.DependencyInjection;
 using Volo.Abp.Domain.Repositories.Dapper;
 using Volo.Abp.EntityFrameworkCore;
-using Win.Sfs.SettleAccount.Reports.SettledPartAndErpPartPriceDiffs;
 
 namespace Win.Sfs.SettleAccount.Repository.Report
 {
@@ -18,131 +17,5 @@ namespace Win.Sfs.SettleAccount.Repository.Report
         : base(dbContextProvider)
         {
         }
-   
-        public virtual List<SettledPartAndErpPartPriceDiff> GetDiffReport(string year, string customcode, string version)
-        {
-
-            string sqlString = "SELECT\n" +
-"t1.ErpMaterialCode,\n" +
-"t1.Price SumPrice,\n" +
-"t2.Price,\n" +
-"t3.MaterialDesc,\n" +
-"t3.EstimateTypeDesc ,\n" +
-"(ISNULL(t1.price,0)-ISNULL(t2.price,0)) DiffPrice\n" +
-"FROM\n" +
-"(\n" +
-"SELECT\n" +
-"ErpMaterialCode,\n" +
-"SUM( amt ) Price\n" +
-"FROM\n" +
-"(\n" +
-"SELECT\n" +
-"ErpMaterialCode,\n" +
-"SettleMaterialCode,(\n" +
-"Qty * isnull( b.Price, 0 )) amt\n" +
-"FROM\n" +
-"(\n" +
-"\n" +
-"select MaterialCode,ErpMaterialCode,Qty,SettleMaterialCode from\n" +
-"Set_MaterialRelationshipDetail_pg ab inner join  Set_material ac\n" +
-"on ab.SettleMaterialCode=ac.CustomerPartCode\n" +
-") a\n" +
-"LEFT JOIN ( SELECT Price, MaterialCode FROM Set_PriceList WHERE version = ( SELECT Max( Version ) FROM Set_PriceList ) AND type = 10 ) b ON a.MaterialCode = b.MaterialCode\n" +
-") temp1\n" +
-"GROUP BY\n" +
-"ErpMaterialCode\n" +
-") t1\n" +
-"LEFT JOIN ( SELECT Price, MaterialCode FROM Set_PriceList WHERE version = ( SELECT Max( Version ) FROM Set_PriceList ) AND type = 10 ) t2 ON t1.ErpMaterialCode = t2.MaterialCode\n" +
-"LEFT JOIN ( SELECT max( Id ) Id, MaterialCode, MaterialDesc, EstimateTypeDesc FROM Set_material GROUP BY MaterialCode, MaterialDesc, EstimateTypeDesc ) t3 ON t1.ErpMaterialCode = t3.MaterialCode;\n";
-
-
-//            string sqlString = "SELECT\n" +
-//"	t1.ErpMaterialCode,\n" +
-//"	t1.Price SumPrice,\n" +
-//"	t2.Price,\n" +
-//"	t3.MaterialDesc,\n" +
-//"	t3.EstimateTypeDesc ,\n" +
-
-//"	(ISNULL(t1.price,0)-ISNULL(t2.price,0)) DiffPrice\n" +
-
-//"FROM\n" +
-//"	(\n" +
-//"	SELECT\n" +
-//"		ErpMaterialCode,\n" +
-//"		SUM( amt ) Price \n" +
-//"	FROM\n" +
-//"		(\n" +
-//"		SELECT\n" +
-//"			ErpMaterialCode,\n" +
-//"			SettleMaterialCode,(\n" +
-//"			Qty * isnull( b.Price, 0 )) amt \n" +
-//"		FROM\n" +
-//"			Set_MaterialRelationshipDetail_pg a\n" +
-//"			LEFT JOIN ( SELECT Price, MaterialCode FROM Set_PriceList WHERE version = ( SELECT Max( Version ) FROM Set_PriceList ) AND type = 10 ) b ON a.SettleMaterialCode = b.MaterialCode \n" +
-//"		) temp1 \n" +
-//"	GROUP BY\n" +
-//"		ErpMaterialCode \n" +
-//"	) t1\n" +
-//"	LEFT JOIN ( SELECT Price, MaterialCode FROM Set_PriceList WHERE version = ( SELECT Max( Version ) FROM Set_PriceList ) AND type = 10 ) t2 ON t1.ErpMaterialCode = t2.MaterialCode\n" +
-//"	LEFT JOIN ( SELECT max( Id ) Id, MaterialCode, MaterialDesc, EstimateTypeDesc FROM Set_material GROUP BY MaterialCode, MaterialDesc, EstimateTypeDesc ) t3 ON t1.ErpMaterialCode = t3.MaterialCode";
-
-           string _sql = string.Format(sqlString, version, customcode);
-           
-            var _query = DbConnection.Query<SettledPartAndErpPartPriceDiff>(_sql,null,null,true,1200,null);
-            //var _query = _db.Query<SettledPartAndErpPartPriceDiff>();
-            return _query.ToList();
-        }
-
-        public virtual List<PartCodeDiff> GetDiffDetailReport(string year, string customcode, string version)
-        {
-            string sqlString =
-
-"select\n" +
-"a.ErpMaterialCode,\n" +
-"isnull(d.materialCode,\n" +
-"SettleMaterialCode) MaterialCode,\n" +
-"a.SettleMaterialCode,\n" +
-"d.MaterialDesc,\n" +
-"d.EstimateTypeDesc\n" +
-"from\n" +
-"(\n" +
-"select\n" +
-"MaterialCode,\n" +
-"ErpMaterialCode,\n" +
-"Qty,\n" +
-"SettleMaterialCode\n" +
-"from\n" +
-"Set_MaterialRelationshipDetail_pg ab\n" +
-"inner join Set_material ac\n" +
-"on\n" +
-"ab.SettleMaterialCode = ac.CustomerPartCode) a\n" +
-"left join\n" +
-"(\n" +
-"SELECT\n" +
-"Price,\n" +
-"MaterialCode\n" +
-"FROM\n" +
-"Set_PriceList\n" +
-"WHERE\n" +
-"version = (\n" +
-"SELECT\n" +
-"Max(Version)\n" +
-"FROM\n" +
-"Set_PriceList )\n" +
-"and type = 10 )\n" +
-"b on\n" +
-"a.SettleMaterialCode = b.MaterialCode\n" +
-"left join\n" +
-"set_material d ON\n" +
-"a.SettleMaterialCode = d.CustomerPartCode\n" +
-"where\n" +
-"b.MaterialCode is null\n";
-            string _sql = string.Format(sqlString, version, customcode);
-            var _query = DbConnection.Query<PartCodeDiff>(_sql, null, null, true, 1200, null);
-            //var _query = _db.Query<SettledPartAndErpPartPriceDiff>();
-            return _query.ToList();
-        }
-
-
     }
 }
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/WmsDapperRepository.cs b/code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/WmsDapperRepository.cs
index b58be080..ea9ef760 100644
--- a/code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/WmsDapperRepository.cs
+++ b/code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/WmsDapperRepository.cs
@@ -52,120 +52,4 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report
         public decimal Qty { set; get; }
     }
 
-    /// <summary>
-    /// 主数据Dapper表
-    /// </summary>
-    public class WmsDapperRepository : DapperRepository<WMSDbContext>, ITransientDependency
-    {
-        public WmsDapperRepository(IDbContextProvider<WMSDbContext> dbContextProvider) : base(dbContextProvider)
-        {
-
-        }
-
-
-        public virtual List<SalesStock> GetSalesStock()
-        {
-            string str = "  select SUM(Qty) Qty,PartCode SapCode from TS_STOCK_DETAIL where AreaCode='SALE' group by PartCode  ";
-
-            var _list = DbConnection.Query<SalesStock>(str);
-            return _list.ToList();
-
-
-        }
-
-
-
-        public virtual List<SalesStock> GetSalesStock(string locCode)
-        {
-            string str = "  select SUM(Qty) Qty,PartCode SapCode from TS_STOCK_DETAIL where AreaCode='SALE' and LocCode='{0}' group by PartCode  ";
-            str=string.Format(str, locCode);
-
-            var _list = DbConnection.Query<SalesStock>(str);
-            return _list.ToList();
-
-
-        }
-
-
-
-        public virtual List<SalesStockSum> GetSalesStockSum(string version)
-        {
-            //     string str =
-            //     "SELECT A\n" +
-            //"	.*,\n" +
-            //"	B.PartDesc,\n" +
-            //"	B.PartGroup \n" +
-            //"FROM\n" +
-            //"	TM_PG_TIME_STOCK_DETAIL\n" +
-            //"	A LEFT JOIN (\n" +
-            //"	SELECT DISTINCT\n" +
-            //"		[ PartCode ],\n" +
-            //"		( ISNULL ( [ PartDesc1 ], '' ) + ISNULL ( [ PartDesc2 ], '' ) ) PartDesc,\n" +
-            //"		PartGroup \n" +
-            //"	FROM\n" +
-            //"	[ VIEW_PG_SIMPLE_PART ] \n" +
-            //"	) B ON A.PartCode = B.PartCode where a.version='{0}'";
-            string str = " SELECT A.*, \n" +
-"        	B.PartDesc, \n" +
-"        	B.PartGroup,  \n" +
-"        	B.PartGroupDesc  \n" +
-"        FROM \n" +
-"        	TM_PG_TIME_STOCK_DETAIL \n" +
-"        	A LEFT JOIN ( \n" +
-"        	SELECT DISTINCT \n" +
-"        		PartCode, \n" +
-"        		( ISNULL ( [PartDesc1], '' ) + ISNULL ( [PartDesc2], '' ) ) PartDesc, \n" +
-"        		PartGroup  ,PartGroupDesc\n" +
-
-
-"        	FROM \n" +
-"        	VIEW_PG_SIMPLE_PART  \n" +
-"        	) B ON A.PartCode = B.PartCode where a.version='{0}'";
-            str = string.Format(str, version);
-            var _list = DbConnection.Query<SalesStockSum>(str);
-            return _list.ToList();
-
-
-        }
-
-      
-
-        //public virtual Dictionary<string,decimal> GetSapList<T>(List<T> childList, string version, bool isNotHistoryPart = false) where T : ReportDetailBase, new()
-        //{
-
-        //    return tmpList;
-        //}
-        //public virtual List<ErpPrice> GetErpPartCodePriceList(string version)
-        //{
-        //    string str = "SELECT\n" +
-        //       "	ErpMaterialCode SapErpPartCode,\n" +
-        //       "	SUM( PRICE ) SapPrice \n" +
-        //       "    FROM  \n" +
-        //       "	Set_MaterialRelationshipDetail A\n" +
-        //       "	LEFT JOIN ( SELECT SUM( AMT )/ SUM( Qty ) PRICE, MaterialCode FROM Set_Invoice WHERE VERSION = '{0}' GROUP BY MaterialCode ) B ON A.SettleMaterialCode = B.MaterialCode \n" +
-        //       "GROUP BY\n" +
-        //       "	ErpMaterialCode";
-
-        //    var _list = DbConnection.Query<ErpPrice>(string.Format(str, version));
-        //    return _list.ToList();
-        //}
-        //public virtual List<InvoiceSettleDiff> GetSettleInvoiceDiff(string version)
-        //{
-        //    var str = "SELECT\n" +
-        //              "	* \n" +
-        //              " FROM\n" +
-        //              "	(\n" +
-        //              "	SELECT\n" +
-        //              "		b.MaterialCode,\n" +
-        //              "		InvocieQty-SettleQty DiffQty \n" +
-        //              "	FROM\n" +
-        //              "		( SELECT sum( Qty ) SettleQty, MaterialCode FROM Set_Settle a WHERE version = '{0}' GROUP BY MaterialCode ) a\n" +
-        //              "		INNER JOIN ( SELECT SUM( QTY ) InvocieQty, MaterialCode FROM Set_Invoice WHERE version = '{0}' GROUP BY MaterialCode ) b ON a.MaterialCode = b.MaterialCode \n" +
-        //              "	) temp \n" +
-        //              " WHERE\n" +
-        //              "	temp.DiffQty <>0";
-        //    var _list = DbConnection.Query<InvoiceSettleDiff>(string.Format(str, version));
-        //    return _list.ToList();
-        //}
-    } 
 }
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/SettlementPakAndSpareParts/SettlementPakAndSparePartRepository.cs b/code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/SettlementPakAndSpareParts/SettlementPakAndSparePartRepository.cs
deleted file mode 100644
index 244850c5..00000000
--- a/code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/SettlementPakAndSpareParts/SettlementPakAndSparePartRepository.cs
+++ /dev/null
@@ -1,71 +0,0 @@
-using EFCore.BulkExtensions;
-using Microsoft.EntityFrameworkCore;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Volo.Abp.DependencyInjection;
-using Volo.Abp.Domain.Repositories.EntityFrameworkCore;
-using Volo.Abp.EntityFrameworkCore;
-using Win.Sfs.SettleAccount.Entities.SettlementPakAndSparePartsRef;
-
-namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.SettlementPakAndSparePartsRef
-{
-    public class SettlementPakAndSparePartRepository: EfCoreRepository<SettleAccountDbContext, SettlementPakAndSpareParts>, ITransientDependency
-    {
-        public SettlementPakAndSparePartRepository(IDbContextProvider<SettleAccountDbContext> dbContextProvider) : base(dbContextProvider)
-        {
-
-        }
-        public virtual bool Delete(string version, string customerCode)
-        {
-            try
-            {
-                DbContext.Database.SetCommandTimeout(1200);
-                var _detailQuery = DbSet.Where(p => p.Version == version && p.CustomerCode == customerCode);
-                _detailQuery.BatchDelete();
-            }
-            catch (Exception e)
-            {
-                throw e;
-            }
-            return true;
-        }
-
-        public virtual List<SettlementPakAndSpareParts> GetDetail(string version, string customerCode)
-        {
-            var list = GetQueryable().Where(p => p.Version == version && p.CustomerCode == customerCode).ToList();
-            return list;
-        }
-
-        public virtual bool DelDetailByErpPartCode(string version, List<string> settleCodeList)
-        {
-            var query = GetQueryable().Where(p => p.Version == version && settleCodeList.Contains(p.ErpSparePartCode));
-            query.BatchDelete();
-            return true;
-        }
-        public virtual bool DelVersion(string version,string model)
-        {
-            var query = GetQueryable().Where(p => p.Version == version  && p.Model==model);
-            query.BatchDelete();
-            return true;
-        }
-
-        public virtual bool Insert(List<SettlementPakAndSpareParts> list)
-        {
-            try
-            {
-                DbContext.Database.SetCommandTimeout(1200);
-               
-                DbContext.BulkInsert(list);
-            }
-            catch (Exception e)
-            {
-                throw e;
-            }
-            return true;
-        }
-
-    }
-}
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/SettlementPakAndSpareParts/SettlementPakAndSparePartVersionRepository.cs b/code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/SettlementPakAndSpareParts/SettlementPakAndSparePartVersionRepository.cs
deleted file mode 100644
index ba18900d..00000000
--- a/code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/SettlementPakAndSpareParts/SettlementPakAndSparePartVersionRepository.cs
+++ /dev/null
@@ -1,66 +0,0 @@
-using EFCore.BulkExtensions;
-using Microsoft.EntityFrameworkCore;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Volo.Abp.DependencyInjection;
-using Volo.Abp.Domain.Repositories.EntityFrameworkCore;
-using Volo.Abp.EntityFrameworkCore;
-using Win.Sfs.SettleAccount.Entities.SettlementPakAndSparePartsRef;
-
-namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.SettlementPakAndSparePartsRef
-{
-    public class SettlementPakAndSparePartVersionRepository : EfCoreRepository<SettleAccountDbContext, SettlementPakAndSparePartsVersion>, ITransientDependency
-    {
-        public SettlementPakAndSparePartVersionRepository(IDbContextProvider<SettleAccountDbContext> dbContextProvider) : base(dbContextProvider)
-        {
-
-        }
-
-        //public virtual bool DelVersion(string version, List<string> settleCodeList)
-        //{
-        //    var query = GetQueryable().Where(p => p.Version == version);
-        //    query.BatchDelete();
-        //    return true;
-        //}
-
-
-        public virtual bool Delete(string version)
-        {
-            try
-            {
-                DbContext.Database.SetCommandTimeout(1200);
-                var _detailQuery = GetQueryable().Where(p => p.Version == version);
-                _detailQuery.BatchDelete();
-            }
-            catch (Exception e)
-            {
-                throw e;
-            }
-            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 && p.CustomerCode == p_customCode);
-                if (_first == null)
-                {
-                    var version = new SettlementPakAndSparePartsVersion(GuidGenerator.Create(), GuidGenerator.Create(), DateTime.Now.Year.ToString(), DateTime.Now.Month.ToString(), p_version, p_customCode, p_factory);
-                    List<SettlementPakAndSparePartsVersion> _ls = new List<SettlementPakAndSparePartsVersion>();
-                    _ls.Add(version);
-                    DbContext.BulkInsert(_ls);
-                }
-            }
-            catch (Exception e)
-            {
-                throw e;
-            }
-            return true;
-        }
-    }
-}
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/UnSettleAccount/UnSettleAccountRepository.cs b/code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/UnSettleAccount/UnSettleAccountRepository.cs
deleted file mode 100644
index 2185dfd7..00000000
--- a/code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/UnSettleAccount/UnSettleAccountRepository.cs
+++ /dev/null
@@ -1,69 +0,0 @@
-using EFCore.BulkExtensions;
-using Microsoft.EntityFrameworkCore;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Volo.Abp.DependencyInjection;
-using Volo.Abp.Domain.Entities;
-using Volo.Abp.Domain.Repositories.EntityFrameworkCore;
-using Volo.Abp.EntityFrameworkCore;
-using Volo.Abp.Uow;
-using Win.Sfs.SettleAccount.Entities;
-using Win.Sfs.SettleAccount.Entities.SettleAccounts;
-
-namespace Win.Sfs.SettleAccount.Repository.SettleAccount
-{
- 
-
-    public class UnSettleAccountRepository : EfCoreRepository<SettleAccountDbContext, UnSettleAccount>, ITransientDependency
-    {
-        public UnSettleAccountRepository(IDbContextProvider<SettleAccountDbContext> dbContextProvider) : base(dbContextProvider)
-        {
-
-        }
-        public virtual bool Delete(string version)
-        {
-            try
-            {
-                DbContext.Database.SetCommandTimeout(1200);
-                var _detailQuery = DbSet.Where(p => p.Version == version);
-                _detailQuery.BatchDelete();
-            }
-            catch (Exception e)
-            {
-                throw e;
-            }
-            return true;
-        }
-
-        public virtual bool Insert(List<UnSettleAccount> list)
-        {
-            try
-            {
-                DbContext.Database.SetCommandTimeout(1200);
-                List<UnSettleAccount> _insertls = new List<UnSettleAccount>();
-                if (list.Count > 0)
-                {
-                    var _version = list.FirstOrDefault().Version;
-                    var _ls=  GetQueryable().Where(p => p.Version == _version).Select(p=>new { MaterialCode=p.MaterialCode, ChassisNumber=p.ChassisNumber }).ToList();
-                    var _query = from r1 in list join r2 in _ls on new { r1.ChassisNumber, r1.MaterialCode } equals new { r2.ChassisNumber, r2.MaterialCode }    
-                                into temp from t in temp.DefaultIfEmpty()
-                                where t==null
-                                select  r1 ;
-                    foreach (var s in _query.ToList())
-                    {
-                        _insertls.Add(s);
-                    }
-                }
-                DbContext.BulkInsert(_insertls,new BulkConfig() { BatchSize=100000, BulkCopyTimeout=0 });
-            }
-            catch (Exception e)
-            {
-                throw e;
-            }
-            return true;
-        }
-    }
-}
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/UnSettleAccount/UnSettleAccountVersionRepository.cs b/code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/UnSettleAccount/UnSettleAccountVersionRepository.cs
deleted file mode 100644
index 4da812ae..00000000
--- a/code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/UnSettleAccount/UnSettleAccountVersionRepository.cs
+++ /dev/null
@@ -1,81 +0,0 @@
-using EFCore.BulkExtensions;
-using Microsoft.EntityFrameworkCore;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Volo.Abp.DependencyInjection;
-using Volo.Abp.Domain.Entities;
-using Volo.Abp.Domain.Repositories.EntityFrameworkCore;
-using Volo.Abp.EntityFrameworkCore;
-using Volo.Abp.Uow;
-using Win.Sfs.SettleAccount.Entities;
-using Win.Sfs.SettleAccount.Entities.SettleAccounts;
-
-namespace Win.Sfs.SettleAccount.Repository.SettleAccount
-{
-   
-
-    public class UnSettleAccountVersionRepository : EfCoreRepository<SettleAccountDbContext, UnSettleAccountVersion>, ITransientDependency
-    {
-        public UnSettleAccountVersionRepository(IDbContextProvider<SettleAccountDbContext> dbContextProvider) : base(dbContextProvider)
-        {
-
-        }
-        public virtual bool Delete(string version)
-        {
-            try
-            {
-                DbContext.Database.SetCommandTimeout(1200);
-                var _detailQuery = DbSet.Where(p => p.Version == version);
-                _detailQuery.BatchDelete();
-            }
-            catch (Exception e)
-            {
-                throw e;
-            }
-            return true;
-        }
-        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);
-                if (_first == null)
-                {
-                    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);
-                }
-            }
-            catch (Exception e)
-            {
-                throw e;
-            }
-            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;
-        //}
-    }
-}
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/WMSEfCoreRepository.cs b/code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/WMSEfCoreRepository.cs
deleted file mode 100644
index bbec2721..00000000
--- a/code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/WMSEfCoreRepository.cs
+++ /dev/null
@@ -1,162 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Data;
-using System.Data.Common;
-using System.Data.SqlClient;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Storage;
-using Volo.Abp.DependencyInjection;
-using Volo.Abp.Domain.Entities;
-using Volo.Abp.Domain.Repositories.EntityFrameworkCore;
-using Volo.Abp.EntityFrameworkCore;
-using Win.Sfs.Shared;
-using Win.Sfs.Shared.DomainBase;
-using Win.Sfs.Shared.Filter;
-using Win.Sfs.Shared.RepositoryBase;
-
-namespace Win.Sfs.SettleAccount.Repository
-{
-    public class WMSEfCoreRepository<TEntity> :
-                   EfCoreRepository<WMSDbContext,TEntity>,
-                   ITransientDependency
-        where TEntity : class,IEntity
-    {
-
-        private readonly IDbContextProvider<WMSDbContext> _dbContextProvider;
-
-
-
-        public WMSEfCoreRepository(IDbContextProvider<WMSDbContext> dbContextProvider) :
-            base(dbContextProvider)
-        {
-
-            _dbContextProvider = dbContextProvider;
-
-        }
-        public WMSEfCoreRepository() : base(null)
-        {
-
-        }
-
-        public  DbCommand CreateCommand(string commandText, CommandType commandType, params DbParameter[] parameters)
-        {
-            var command = DbContext.Database.GetDbConnection().CreateCommand();
-
-            command.CommandText = commandText;
-            command.CommandType = commandType;
-            command.Transaction = DbContext.Database.CurrentTransaction?.GetDbTransaction();
-
-            foreach (var parameter in parameters)
-            {
-                command.Parameters.Add(parameter);
-            }
-
-            return command;
-        }
-
-        public  async Task EnsureConnectionOpenAsync(CancellationToken cancellationToken = default)
-        {
-            var connection = DbContext.Database.GetDbConnection();
-
-            if (connection.State != ConnectionState.Open)
-            {
-                await connection.OpenAsync(cancellationToken);
-            }
-        }
-        public virtual async Task<List<TEntity>> GetAllAsync( bool includeDetails = false,
-            CancellationToken cancellationToken = default)
-        {
-            var query = includeDetails ? this.WithDetails() : this.GetQueryable();
-
-            //query = query.Where(p => p.BranchId.Equals(branchId));
-
-            return await query.ToListAsync(cancellationToken: cancellationToken);
-        }
-
-        public virtual async Task<long> GetCountAsync( CancellationToken cancellationToken = default)
-        {
-            return await this.GetQueryable()
-                //.Where(p => p.BranchId.Equals(branchId))
-                .LongCountAsync(GetCancellationToken(cancellationToken));
-
-        }
-
-        public virtual async Task<long> GetCountByFilterAsync( List<FilterCondition> filters,
-            CancellationToken cancellationToken = default)
-        {
-            return await this.GetQueryable()
-                //.Where(p => p.BranchId.Equals(branchId))
-                .WhereIf(filters?.Count != 0, filters.ToLambda<TEntity>())
-                .LongCountAsync(GetCancellationToken(cancellationToken));
-        }
-
-        public virtual async Task<List<TEntity>> GetListByFilterAsync(List<FilterCondition> filters,
-            string sorting = null,
-            int maxResultCount = int.MaxValue, int skipCount = 0, bool includeDetails = false,
-            CancellationToken cancellationToken = default)
-        {
-            var query = includeDetails ? this.WithDetails() : this.GetQueryable();
-          //  query = query.Where(p => p.BranchId.Equals(branchId));
-            var entities = query.WhereIf(filters?.Count != 0, filters.ToLambda<TEntity>());
-            //2021-07-02 设置sorting首字母大小，因设置了驼峰规则，不匹配“ var memberProp = typeof(T).GetProperty(propertyName);”反射
-            if(!string.IsNullOrEmpty(sorting))
-            {
-                sorting = sorting.Substring(0, 1).ToUpper() + sorting.Substring(1);
-            }
-            entities = GetSortingQueryable(entities, sorting);
-            return await entities.PageBy(skipCount, maxResultCount)
-                .ToListAsync(GetCancellationToken(cancellationToken));
-
-
-        }
-
-        protected static IQueryable<TEntity> GetSortingQueryable(IQueryable<TEntity> entities, string sorting)
-        {
-            if (string.IsNullOrEmpty(sorting))
-            {
-                entities = entities.OrderByDescending("Id");
-            }
-            else
-            {
-
-
-
-
-                var sortParams = sorting?.Split(' ');
-                var sortName = sortParams[0];
-
-
-                Type t = typeof(TEntity);
-                var _first = t.GetProperties().Where(p => p.Name.ToUpper() == sortName.ToUpper()).FirstOrDefault();
-                if (_first != null)
-                {
-                    sortName = _first.Name;
-                }
-
-
-
-
-                bool isDesc;
-                if (sortParams.Length > 1)
-                {
-                    var sortDirection = sortParams[1];
-                    isDesc = sortDirection.ToUpper().Contains("DESC") ? true : false;
-                }
-                else
-                {
-                    isDesc = true;
-                }
-
-                entities = isDesc ? entities.OrderByDescending(sortName) : entities.OrderBy(sortName);
-            }
-
-            return entities;
-        }
-
-    }
-
-
-}
\ No newline at end of file
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.HttpApi/BlobFileController.cs b/code/src/Modules/SettleAccount/src/SettleAccount.HttpApi/BlobFileController.cs
index 4548ffba..33990d59 100644
--- a/code/src/Modules/SettleAccount/src/SettleAccount.HttpApi/BlobFileController.cs
+++ b/code/src/Modules/SettleAccount/src/SettleAccount.HttpApi/BlobFileController.cs
@@ -11,7 +11,6 @@ using System.Text;
 using System.Threading.Tasks;
 using Win.Sfs.BaseData.ImportExcelCommon;
 using Win.Sfs.SettleAccount.Entities;
-using Win.Sfs.SettleAccount.Entities.WMS;
 
 namespace Win.Sfs.SettleAccount
 {
@@ -39,29 +38,6 @@ namespace Win.Sfs.SettleAccount
             return File(fileDto.Content, "application/octet-stream", fileDto.Name);
         }
 
-        /// <summary>
-        /// 客户自定义发货结算导入模板
-        /// </summary>
-        /// <returns></returns>
-        [HttpPost]
-        [Route("saveCustomExcelTemplate")]
-        public async Task<string> SaveCustomExcelImportTemplate()
-        {
-            string fileName = "客户自定义发货结算导入模板.xlsx";
-            var result = await Importer.GenerateTemplateBytes<WmsCustomerKanbanOutPutDetialDTO>();
-            result.ShouldNotBeNull();
-            result.Length.ShouldBeGreaterThan(0);
-            await _excelImportService.SaveBlobAsync(
-                   new SaveExcelImportInputDto
-                   {
-                       Name = fileName,
-                       Content = result
-                   }
-              );
-            return fileName;
-        }
-
-
         /// <summary>
         /// 红旗一轿手工出库单导入模板
         /// </summary>
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Base/SecRelationShipImportService.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Base/SecRelationShipImportService.cs
index ef541af0..a466b07a 100644
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Base/SecRelationShipImportService.cs
+++ b/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Base/SecRelationShipImportService.cs
@@ -21,7 +21,6 @@ using Volo.Abp.EventBus.Distributed;
 using Win.Sfs.SettleAccount;
 using Win.Sfs.SettleAccount.Entities.MaterialRelationships;
 using Win.Sfs.SettleAccount.Entities.SettleAccounts;
-using Win.Sfs.SettleAccount.Entities.SettlementPakAndSparePartsRef;
 using Win.Sfs.SettleAccount.Entities.SettlementParts;
 using Win.Sfs.SettleAccount.ExportReports;
 using Win.Sfs.SettleAccount.MaterialRelationships;
@@ -29,13 +28,12 @@ using Win.Sfs.SettleAccount.Repository.Code;
 using Win.Sfs.SettleAccount.Repository.SettleAccount;
 using Win.Sfs.SettleAccount.Repository.SettleAccountJob;
 using Win.Sfs.SettleAccount.Repository.SettleAccountJob.MaterialRelationships;
-using Win.Sfs.SettleAccount.Repository.SettleAccountJob.SettlementPakAndSparePartsRef;
 using WY.NewJit.MsgBaseData;
 using WY.NewJit.MsgTransmission.TianHe;
 
 namespace TaskJob.Services
 {
-  
+
     public class SecRelationShipImportService : ITransientDependency, IImportJob
     {
 
@@ -44,9 +42,6 @@ namespace TaskJob.Services
         private readonly SettlementPartVersionRepository _spartVersionRepository;
         private readonly MaterialRelationshipDetailRepository _reldetailRepository;
         private readonly MaterialRelationshipVersionRepository _relversionRepository;
-
-        private readonly SettlementPakAndSparePartRepository _settlePakRepository;
-        private readonly SettlementPakAndSparePartVersionRepository _settlePakVersionRepository;
         private readonly IDistributedEventBus _distributedEventBus;
         private readonly OutputService _outputService;
         private readonly InputService _inputService;
@@ -59,13 +54,9 @@ namespace TaskJob.Services
             OutputService service,
             MaterialRelationshipDetailRepository reldetailRepository,
             MaterialRelationshipVersionRepository relversionRepository,
-            SettlementPakAndSparePartRepository settlePakRepository,
-            SettlementPakAndSparePartVersionRepository settlePakVersionRepository,
         IDistributedEventBus distributedEventBus
             )
         {
-            _settlePakRepository = settlePakRepository;
-            _settlePakVersionRepository = settlePakVersionRepository;
             _codesettingRepository = codesettingRepository;
             _spartRepository = spartRepository;
             _spartVersionRepository = spartVersionRepository;
@@ -75,16 +66,16 @@ namespace TaskJob.Services
             _outputService = service;
             _inputService = inputService;
             _codesettingRepository = codesettingRepository;
-        
+
         }
 
         public string ImportFile(Guid id, List<string> fileName, List<string> realfileName, List<CustomCondition> customConditions)
         {
-           
+
             var version = customConditions.Where(p => p.Name == "Version").FirstOrDefault().Value;
             var customerCode = customConditions.Where(p => p.Name == "CustomerCode").FirstOrDefault().Value;
             var Site = customConditions.Where(p => p.Name == "Site").FirstOrDefault().Value;
-          
+
 
             List<ErrorExportDto> checkList = new List<ErrorExportDto>();
             if (string.IsNullOrEmpty(version))
@@ -95,12 +86,12 @@ namespace TaskJob.Services
             {
                 checkList.Add(new ErrorExportDto(string.Empty, string.Empty, string.Empty, string.Empty, string.Empty, string.Empty, "客户代码不能为空!", string.Empty));
             }
-            if (Site=="TH")
+            if (Site == "TH")
             {
                 bool isInvoke = true;
                 foreach (var itm in fileName)
                 {
-                    if (!Regex.IsMatch(itm, @"^\w+\s\w+\s") )
+                    if (!Regex.IsMatch(itm, @"^\w+\s\w+\s"))
                     {
                         var error = string.Format("文件名称{0}不符合导入规则,规则例如:AUDI B9 XXXXX.xlsx间隔一位空格!", itm);
                         checkList.Add(new ErrorExportDto(string.Empty, string.Empty, string.Empty, string.Empty, string.Empty, string.Empty, error, string.Empty));
@@ -109,66 +100,22 @@ namespace TaskJob.Services
                 }
                 if (isInvoke == true)
                 {
-                    foreach (var itm in fileName)
-                    {
-                        string _fileSavePath = Environment.CurrentDirectory + @"\wwwroot\files\host\my-file-container\";
-                        var _filePath = _fileSavePath + itm;//获取到导入的excel
-                        var _exten = Path.GetExtension(_fileSavePath);
-
-                        var file = Path.GetFileName(_filePath);
-                        var model = Regex.Match(file, @"^\w+\s\w+\s").Value.Trim();
-                        _settlePakRepository.Delete(version,model);
-                   
 
 
-
-                        var _ds = Import(_filePath, 4);
-                        var _errorlist = ImportRelationship(_ds, version, customerCode, model);
-
-                        if (_errorlist.Count == 0)
-                        {
-                            var _errlist = ImportPriceList(_ds, version, customerCode, model);
-
-                            
-                            foreach (var error in _errlist)
-                            {
-                                checkList.Add(new ErrorExportDto(string.Empty, string.Empty, string.Empty, string.Empty, string.Empty, string.Empty, error, string.Empty));
-                            }
-
-                            if (_errlist.Count == 0)
-                            {
-                                var _errlist1 = ImportSecRelationship(_ds, version, customerCode, model);
-
-                                foreach (var error in _errlist1)
-                                {
-                                    checkList.Add(new ErrorExportDto(string.Empty, string.Empty, string.Empty, string.Empty, string.Empty, string.Empty, error, string.Empty));
-                                }
-                            }
-                                
-                        }
-                        else
-                        {
-                            foreach (var error in _errorlist)
-                            {
-                                checkList.Add(new ErrorExportDto(string.Empty, string.Empty, string.Empty, string.Empty, string.Empty, string.Empty, error, string.Empty));
-                            }
-                        }
-
-                    }
                 }
             }
             if (checkList.Count > 0)
             {
-                _outputService.ExportError(id, string.Format("错误信息_{0}.xlsx",Guid.NewGuid().ToString()), checkList);
+                _outputService.ExportError(id, string.Format("错误信息_{0}.xlsx", Guid.NewGuid().ToString()), checkList);
             }
             return id.ToString();
         }
 
-        private List<string> ImportPriceList(DataSet ds, string version, string customerCode,string model)
+        private List<string> ImportPriceList(DataSet ds, string version, string customerCode, string model)
         {
-            var projectList=_codesettingRepository.GetList("工厂车型");
+            var projectList = _codesettingRepository.GetList("工厂车型");
             var factory = string.Empty;
-            var f=projectList.FirstOrDefault(p => p.Value == model);
+            var f = projectList.FirstOrDefault(p => p.Value == model);
             if (f != null)
             {
                 factory = f.Description;
@@ -191,7 +138,7 @@ namespace TaskJob.Services
                         }
                         i++;
                     }
-                    
+
                     var _materialCodeKey = table.Columns[12].ColumnName.Trim();
                     Dictionary<string, decimal> _dic = new Dictionary<string, decimal>();
 
@@ -220,7 +167,7 @@ namespace TaskJob.Services
 
                     if (_dic.Count > 0)
                     {
-                         
+
                         //int number2 = 0;
                         foreach (DataRow row in table.Rows)
                         {
@@ -228,8 +175,8 @@ namespace TaskJob.Services
                             {
                                 if (row[settleCode] != null && !string.IsNullOrEmpty(row[settleCode].ToString()))
                                 {
-                                 
-                                    var part = new SettlementPart(Guid.NewGuid(), Guid.NewGuid(), DateTime.Now.Year.ToString(), DateTime.Now.Month.ToString(), customerCode,factory , model, version, settleCode.ToUpper(), string.Empty, _dic[settleCode], string.Empty);
+
+                                    var part = new SettlementPart(Guid.NewGuid(), Guid.NewGuid(), DateTime.Now.Year.ToString(), DateTime.Now.Month.ToString(), customerCode, factory, model, version, settleCode.ToUpper(), string.Empty, _dic[settleCode], string.Empty);
                                     partList.Add(part);
                                 }
                             }
@@ -414,11 +361,11 @@ namespace TaskJob.Services
             var _templist = from itm1 in _group1 join itm2 in _group2 on new { itm1.ErpMaterialCode } equals new { itm2.ErpMaterialCode } where itm1.Qty != itm2.Qty select itm1;
 
             var _delete = from r1 in _ls
-                       join r2 in list on new { r1.SettleMaterialCode, r1.ErpMaterialCode, r1.Version } equals new { r2.SettleMaterialCode, r2.ErpMaterialCode, r2.Version }
-            into temp
-                       from t in temp.DefaultIfEmpty()
-                       where t == null
-                       select r1;
+                          join r2 in list on new { r1.SettleMaterialCode, r1.ErpMaterialCode, r1.Version } equals new { r2.SettleMaterialCode, r2.ErpMaterialCode, r2.Version }
+               into temp
+                          from t in temp.DefaultIfEmpty()
+                          where t == null
+                          select r1;
 
             List<string> _ls1 = new List<string>();
             foreach (var itm in _templist)
@@ -433,26 +380,26 @@ namespace TaskJob.Services
                 _ls1.Add(itm);
             }
 
-            var erplist= _ls1.Distinct().ToList();
+            var erplist = _ls1.Distinct().ToList();
 
 
-            _reldetailRepository.DelDetailByErpPartCode(version,erplist);
+            _reldetailRepository.DelDetailByErpPartCode(version, erplist);
 
-            var _add=_ls.Where(p => erplist.Contains(p.ErpMaterialCode) && p.Version == version);
+            var _add = _ls.Where(p => erplist.Contains(p.ErpMaterialCode) && p.Version == version);
 
 
             var _addList = _add.ToList();
 
 
-            foreach(var itm in erplist)
+            foreach (var itm in erplist)
             {
                 var parendId = Guid.NewGuid();
-                var ary=_addList.Where(p => p.ErpMaterialCode == itm);
+                var ary = _addList.Where(p => p.ErpMaterialCode == itm);
                 foreach (var re in ary)
                 {
                     re.AppraisalCategory = parendId.ToString();
                 }
-               
+
             }
             if (_addList.Count() > 0 && errorList.Count == 0)
             {
@@ -463,153 +410,6 @@ namespace TaskJob.Services
             return errorList;
 
         }
-
-
-
-
-        private List<string> ImportSecRelationship(DataSet ds, string version, string customerCode, string model)
-        {
-            List<string> errorList = new List<string>();
-            List<SettlementPakAndSpareParts> _ls = new List<SettlementPakAndSpareParts>();
-            foreach (DataTable table in ds.Tables)
-            {
-                if (table.Columns.Count > 11 && table.Columns[11].ColumnName == "辆份价格")
-                {
-                    int i = 0;
-                    List<string> settleCodeList = new List<string>();
-                    foreach (DataColumn column in table.Columns)
-                    {
-                        if (i > 11)
-                        {
-                            settleCodeList.Add(column.ColumnName);
-                        }
-                        i++;
-                    }
-                    if (i == 0)
-                    {
-                        errorList.Add(table.TableName + " [辆份价格]字段不存在!");
-                    }
-            
-                    int end = 0;
-                    int number = 0;
-
-                    foreach (DataRow row in table.Rows)
-                    {
-
-                        if (row["零 件 号"] != null && row["零 件 号"].ToString().Contains("装配费用"))
-                        {
-                            foreach (var settleCode in settleCodeList)
-                            {
-                                if (row[settleCode] != null && !string.IsNullOrEmpty(row[settleCode].ToString()))
-                                {
-                                    var _settlementPakAndSpareParts = new SettlementPakAndSpareParts(Guid.NewGuid(), string.Empty, string.Empty, settleCode.Trim().ToUpper(), "装配费用", "装配费", string.Empty, "装配费", "", "J7W",
-                                        "采埃孚富奥汽车底盘系统（长春）有限公司",
-                                        "装配费",
-                                        1,
-                                        !row.IsNull(settleCode)?decimal.Parse(row[settleCode].ToString()):0,
-                                        "1",
-                                         !row.IsNull(settleCode) ? decimal.Parse(row[settleCode].ToString()) : 0, 
-                                        version, 
-                                        customerCode,model);
-                                    _ls.Add(_settlementPakAndSpareParts);
-                                }
-
-                            }
-                        }
-                        if (row["零 件 号"] != null && row["零 件 号"].ToString().Contains("零件成本"))
-                        {
-                            end = number;
-                        }
-                        number++;
-                    }
-                    if (end == 0)
-                    {
-                        errorList.Add(table.TableName + "零 件 号 列:[零件成本]行不存在!");
-                    }
-                    int number2 = 0;
-                    foreach (DataRow row in table.Rows)
-                    {
-                        if (number2 < end && number2 > 0 && !row.IsNull("QAD代码") && !string.IsNullOrEmpty(row["QAD代码"].ToString().Trim()))
-                        {
-
-                            if (!row.IsNull("零 件 号") && !row.IsNull("每车数量") && row["单价"] != null && !row.IsNull("辆份价格")
-                                && !string.IsNullOrEmpty(row["每车数量"].ToString().Trim())
-                                && !string.IsNullOrEmpty(row["单价"].ToString().Trim())
-                                && !string.IsNullOrEmpty(row["辆份价格"].ToString().Trim())
-                                )
-                            {
-                                var partcode = row["零 件 号"].ToString();
-                                var partDesc = row["零件名称"].ToString();
-                                var partType = row["零件类型"].ToString();
-                                var QadCode = !row.IsNull("QAD代码") ? row["QAD代码"].ToString() : string.Empty;
-                                var SupplierCode = !row.IsNull("供应商代码") ? row["供应商代码"].ToString() : string.Empty;
-                                var SupplierName = !row.IsNull("供应商名称") ? row["供应商名称"].ToString() : string.Empty;
-                                var ProductType = row["产品类"].ToString();
-                                var CarNumber = decimal.Parse(row["每车数量"].ToString());
-                                var Price = decimal.Parse(row["单价"].ToString());
-                                var CarPrice = decimal.Parse(row["辆份价格"].ToString());
-                                int key = 0;
-                                foreach (var settleCode in settleCodeList)
-                                {
-                                    if (row[settleCode] != null && !string.IsNullOrEmpty(row[settleCode].ToString()))
-                                    {
-                                        var _settlementPakAndSpareParts = new SettlementPakAndSpareParts(Guid.NewGuid(), string.Empty, string.Empty, settleCode.Trim().ToUpper(), partDesc, partcode, string.Empty, partType, QadCode, SupplierCode, SupplierName, ProductType, CarNumber, Price, "1", CarPrice, version, customerCode, model);
-                                        _ls.Add(_settlementPakAndSpareParts);
-                                    }
-                                    key++;
-                                }
-                            }
-                            else
-                            {
-                                errorList.Add(table.TableName + ":零 件 号、每车数量、单价、辆份价格不存在!");
-                            }
-                        }
-                        else
-                        {
-                            if (number2 < end && number2 > 0  && row["零件类型"].ToString() == "自制件")
-                            {
-                                var partcode = row["零 件 号"].ToString();
-                                var partDesc = row["零件名称"].ToString();
-                                var partType = row["零件类型"].ToString();
-                                var QadCode = string.Empty;
-                                var SupplierCode = "J7W";
-                                var SupplierName = "采埃孚富奥汽车底盘系统（长春）有限公司";
-                                var ProductType = row["产品类"].ToString();
-                                var CarNumber = decimal.Parse(row["每车数量"].ToString());
-                                var Price = decimal.Parse(row["单价"].ToString());
-                                var CarPrice = decimal.Parse(row["辆份价格"].ToString());
-                                int key = 0;
-
-                                foreach (var settleCode in settleCodeList)
-                                {
-                                    if (row[settleCode] != null && !string.IsNullOrEmpty(row[settleCode].ToString()))
-                                    {
-                                        var _settlementPakAndSpareParts = new SettlementPakAndSpareParts(Guid.NewGuid(), string.Empty, string.Empty, settleCode.Trim().ToUpper(), partDesc, partcode, string.Empty, partType, QadCode, SupplierCode, SupplierName, ProductType, CarNumber, Price, "1", CarPrice, version, customerCode, model);
-                                        _ls.Add(_settlementPakAndSpareParts);
-                                    }
-                                    key++;
-                                }
-                            }
-                        }
-                        number2++;
-                    }
-                }
-            }
-            var query = from arc in _ls
-                        group arc by new { arc.ErpSparePartCode,arc.SettlementPartCode }
-              into g
-                        where g.Count() > 1
-                        select g;
-           var _addList= _ls.GroupBy(p => new { p.ErpSparePartCode, p.SettlementPartCode }).Select(y => y.FirstOrDefault());
-            var _lst=  _ls.GroupBy(p => new { p.ErpSparePartCode, p.SettlementPartCode }).Select(y => new { ErpSparePartCode = y.Key.ErpSparePartCode, SettlementPartCode = y.Key.SettlementPartCode, Count = y.Count() }).Where(p=>p.Count>1);
-            foreach (var itm in _lst)
-            {
-                var _first = _addList.FirstOrDefault(p => p.ErpSparePartCode == itm.ErpSparePartCode && p.SettlementPartCode == itm.SettlementPartCode);
-               var _carNumber =_ls.Where(p => p.ErpSparePartCode == itm.ErpSparePartCode && p.SettlementPartCode == itm.SettlementPartCode).GroupBy(p => new { p.ErpSparePartCode, p.SettlementPartCode }).Select(p => new { ErpSparePartCode = p.Key.ErpSparePartCode, SettlementPartCode = p.Key.SettlementPartCode, PerCarNum = p.Sum(y => y.PerCarNum) });
-
-                _first.PerCarNum = _carNumber.FirstOrDefault().PerCarNum;
-            }
-
             //var list = _settlePakRepository.GetDetail(version, customerCode);
             //var _group1 = _ls.Where(p => p.Version == version).GroupBy(p => p.ErpSparePartCode).Select(p => new { Price = p.Sum(p => p.Price), Qty = p.Sum(p => p.PerCarNum), ErpSparePartCode = p.Key });
             //var _group2 = list.Where(p => p.Version == version).GroupBy(p => p.ErpSparePartCode).Select(p => new { Price = p.Sum(p => p.Price), Qty = p.Sum(p => p.PerCarNum), ErpSparePartCode = p.Key });
@@ -635,123 +435,130 @@ namespace TaskJob.Services
             //var _add = _ls.Where(p => erplist.Contains(p.ErpSparePartCode) && p.Version == version);
             //var _addList = _add.ToList();
 
-            if (_addList.Count() > 0 && errorList.Count == 0)
-            {
-                var ary = _addList.ToList();
-                _settlePakRepository.Insert(ary);
-                _settlePakVersionRepository.Insert(version, customerCode, customerCode);
-            }
-
-            return errorList;
-        }
-
             /// <summary>读取excel
             /// 默认第一行为表头
             /// </summary>
             /// <param name="strFileName">excel文档绝对路径</param>
             /// <param name="rowIndex">内容行偏移量，第一行为表头，内容行从第二行开始则为1</param>
             /// <returns></returns>
-            public  DataSet Import(string strFileName, int rowIndex)
-        {
-            //DataTable dt = new DataTable();
-            DataSet _ds = new DataSet();
-            List<string> _sheetNames = new List<string>();
-            IWorkbook hssfworkbook;
-            using (FileStream file = new FileStream(strFileName, FileMode.Open, FileAccess.Read))
+            public DataSet Import(string strFileName, int rowIndex)
             {
-                hssfworkbook = WorkbookFactory.Create(file);
-            }
-            int x = hssfworkbook.NumberOfSheets; ;
-            List<string> sheetNames = new List<string>();
-            for (int i = 0; i < x; i++)
-            {
-                _sheetNames.Add(hssfworkbook.GetSheetName(i));
+                //DataTable dt = new DataTable();
+                DataSet _ds = new DataSet();
+                List<string> _sheetNames = new List<string>();
+                IWorkbook hssfworkbook;
+                using (FileStream file = new FileStream(strFileName, FileMode.Open, FileAccess.Read))
+                {
+                    hssfworkbook = WorkbookFactory.Create(file);
+                }
+                int x = hssfworkbook.NumberOfSheets; ;
+                List<string> sheetNames = new List<string>();
+                for (int i = 0; i < x; i++)
+                {
+                    _sheetNames.Add(hssfworkbook.GetSheetName(i));
+                }
+                foreach (var itm in _sheetNames)
+                {
+                    ISheet sheet = hssfworkbook.GetSheet(itm);
+                    IRow headRow = sheet.GetRow(rowIndex);
+
+                    if (headRow != null)
+                    {
+                        bool isAnlysis = false;
+                        int colCount = headRow.LastCellNum;
+                        if (colCount > 11)
+                        {
+                            if (headRow.Cells[11] != null && headRow.Cells[11].StringCellValue.Trim() == "辆份价格")
+                            {
+                                isAnlysis = true;
+                            }
+                        }
+                        if (isAnlysis == true)
+                        {
+                            _ds.Tables.Add(GetDataTable(hssfworkbook, sheet, 4));
+                        }
+                    }
+
+                }
+                return _ds;
+
             }
-            foreach (var itm in _sheetNames)
+            public DataTable GetDataTable(IWorkbook hssfworkbook, ISheet sheet, int rowIndex)
             {
-                ISheet sheet = hssfworkbook.GetSheet(itm);
+                var dt = new DataTable();
+                dt.TableName = sheet.SheetName;
                 IRow headRow = sheet.GetRow(rowIndex);
-
                 if (headRow != null)
                 {
-                    bool isAnlysis = false;
                     int colCount = headRow.LastCellNum;
                     if (colCount > 11)
                     {
-                        if (headRow.Cells[11] != null && headRow.Cells[11].StringCellValue.Trim() == "辆份价格")
+                        for (int i = 0; i < colCount; i++)
                         {
-                            isAnlysis = true;   
+                            dt.Columns.Add(headRow.Cells[i].StringCellValue.Trim());
                         }
                     }
-                    if (isAnlysis == true)
-                    {
-                        _ds.Tables.Add(GetDataTable(hssfworkbook, sheet, 4));
-                    }
-                }
-                
-            }
-            return _ds;
-            
-        }
-        public DataTable GetDataTable(IWorkbook hssfworkbook, ISheet sheet,int rowIndex)
-        {
-            var dt = new DataTable();
-            dt.TableName =sheet.SheetName;
-            IRow headRow = sheet.GetRow(rowIndex);
-            if (headRow != null)
-            {
-                int colCount = headRow.LastCellNum;
-                if (colCount>11)
-                {
-                    for (int i = 0; i < colCount; i++)
+                    else
                     {
-                        dt.Columns.Add(headRow.Cells[i].StringCellValue.Trim());
+                        for (int i = 0; i < colCount; i++)
+                        {
+                            dt.Columns.Add("Grid_" + i.ToString());
+                        }
                     }
                 }
-                else
-                {
-                    for (int i = 0; i < colCount; i++)
-                    {
-                        dt.Columns.Add("Grid_"+i.ToString());
-                    }
-                }  
-            }
 
-            for (int i = (sheet.FirstRowNum + rowIndex); i <= sheet.LastRowNum; i++)
-            {
-                IRow row = sheet.GetRow(i);
-                bool emptyRow = true;
-                object[] itemArray = null;
-                if (row != null && row.LastCellNum>=0)
+                for (int i = (sheet.FirstRowNum + rowIndex); i <= sheet.LastRowNum; i++)
                 {
-                    itemArray = new object[row.LastCellNum];
-                    try
+                    IRow row = sheet.GetRow(i);
+                    bool emptyRow = true;
+                    object[] itemArray = null;
+                    if (row != null && row.LastCellNum >= 0)
                     {
-                        for (int j = row.FirstCellNum; j < row.LastCellNum; j++)
+                        itemArray = new object[row.LastCellNum];
+                        try
                         {
-                            if (row.GetCell(j) != null)
+                            for (int j = row.FirstCellNum; j < row.LastCellNum; j++)
                             {
-                                switch (row.GetCell(j).CellType)
+                                if (row.GetCell(j) != null)
                                 {
-                                    case CellType.Numeric:
-                                        if (HSSFDateUtil.IsCellDateFormatted(row.GetCell(j)))//日期类型
-                                        {
-                                            itemArray[j] = row.GetCell(j).DateCellValue.ToString("yyyy-MM-dd");
-                                        }
-                                        else//其他数字类型
-                                        {
-                                            itemArray[j] = row.GetCell(j).NumericCellValue;
-                                        }
-                                        break;
-                                    case CellType.Blank:
-                                        itemArray[j] = string.Empty;
-                                        break;
-                                    case CellType.Formula:   //获取公式执行后的值,速度较慢
-                                        if (hssfworkbook is XSSFWorkbook)
-                                        {
-                                            try
+                                    switch (row.GetCell(j).CellType)
+                                    {
+                                        case CellType.Numeric:
+                                            if (HSSFDateUtil.IsCellDateFormatted(row.GetCell(j)))//日期类型
+                                            {
+                                                itemArray[j] = row.GetCell(j).DateCellValue.ToString("yyyy-MM-dd");
+                                            }
+                                            else//其他数字类型
                                             {
-                                                XSSFFormulaEvaluator eva = new XSSFFormulaEvaluator(hssfworkbook);
+                                                itemArray[j] = row.GetCell(j).NumericCellValue;
+                                            }
+                                            break;
+                                        case CellType.Blank:
+                                            itemArray[j] = string.Empty;
+                                            break;
+                                        case CellType.Formula:   //获取公式执行后的值,速度较慢
+                                            if (hssfworkbook is XSSFWorkbook)
+                                            {
+                                                try
+                                                {
+                                                    XSSFFormulaEvaluator eva = new XSSFFormulaEvaluator(hssfworkbook);
+                                                    if (eva.Evaluate(row.GetCell(j)).CellType == CellType.Numeric)
+                                                    {
+                                                        itemArray[j] = eva.Evaluate(row.GetCell(j)).NumberValue;
+                                                    }
+                                                    else
+                                                    {
+                                                        itemArray[j] = eva.Evaluate(row.GetCell(j)).StringValue;
+                                                    }
+                                                }
+                                                catch (Exception e)
+                                                {
+                                                    var b = j;
+                                                }
+                                            }
+                                            else
+                                            {
+                                                HSSFFormulaEvaluator eva = new HSSFFormulaEvaluator(hssfworkbook);
                                                 if (eva.Evaluate(row.GetCell(j)).CellType == CellType.Numeric)
                                                 {
                                                     itemArray[j] = eva.Evaluate(row.GetCell(j)).NumberValue;
@@ -761,60 +568,43 @@ namespace TaskJob.Services
                                                     itemArray[j] = eva.Evaluate(row.GetCell(j)).StringValue;
                                                 }
                                             }
-                                            catch(Exception e)
-                                            {
-                                                var b = j;
-                                            }
-                                        }
-                                        else
-                                        {
-                                            HSSFFormulaEvaluator eva = new HSSFFormulaEvaluator(hssfworkbook);
-                                            if (eva.Evaluate(row.GetCell(j)).CellType == CellType.Numeric)
-                                            {
-                                                itemArray[j] = eva.Evaluate(row.GetCell(j)).NumberValue;
-                                            }
-                                            else
-                                            {
-                                                itemArray[j] = eva.Evaluate(row.GetCell(j)).StringValue;
-                                            }
-                                        }
-                                        break;
-                                    default:
-                                        itemArray[j] = row.GetCell(j).StringCellValue;
-                                        break;
-                                }
-                                if (itemArray[j] != null && !string.IsNullOrEmpty(itemArray[j].ToString().Trim()))
-                                {
-                                    emptyRow = false;
+                                            break;
+                                        default:
+                                            itemArray[j] = row.GetCell(j).StringCellValue;
+                                            break;
+                                    }
+                                    if (itemArray[j] != null && !string.IsNullOrEmpty(itemArray[j].ToString().Trim()))
+                                    {
+                                        emptyRow = false;
+                                    }
                                 }
                             }
                         }
+                        catch (Exception e)
+                        {
+                            var a = i;
+
+
+                        }
                     }
-                    catch(Exception e)
-                    {
-                        var a = i;
-                        
-                        
-                    }
-                }
-                if (!emptyRow)
-                {
-                    if (itemArray.Count()> dt.Columns.Count)
+                    if (!emptyRow)
                     {
-                        var _ls = itemArray.ToList();
-                        _ls.RemoveRange(dt.Columns.Count, itemArray.Count() - dt.Columns.Count);
-                        itemArray = _ls.ToArray();
-                    }
+                        if (itemArray.Count() > dt.Columns.Count)
+                        {
+                            var _ls = itemArray.ToList();
+                            _ls.RemoveRange(dt.Columns.Count, itemArray.Count() - dt.Columns.Count);
+                            itemArray = _ls.ToArray();
+                        }
 
-                    dt.Rows.Add(itemArray);
+                        dt.Rows.Add(itemArray);
+                    }
                 }
+                return dt;
             }
-            return dt;
+
+
         }
 
 
     }
 
-  
-
-}
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/HQHSharePartSettledDetailDiffExportService.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/HQHSharePartSettledDetailDiffExportService.cs
index f17ecb86..df47b411 100644
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/HQHSharePartSettledDetailDiffExportService.cs
+++ b/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/HQHSharePartSettledDetailDiffExportService.cs
@@ -23,7 +23,7 @@ namespace SettleAccount.Job.Services.Report
         private readonly OutputService _outputService;
         private readonly InputService _inputService;
 
-        private readonly WmsDapperRepository _wmsDapper;
+
 
         private readonly IBlobContainer<MyFileContainer> _fileContainer;
 
@@ -32,7 +32,6 @@ namespace SettleAccount.Job.Services.Report
             ErpPartDapperRepository erpdapperRepository,
             HQHSettledDetailDapperRepository dapperRepository,
             OutputService outputService,
-             WmsDapperRepository wmsDapper,
 
             InputService inputService
              , IBlobContainer<MyFileContainer> fileContainer
@@ -41,7 +40,6 @@ namespace SettleAccount.Job.Services.Report
             _inputService = inputService;
             _outputService = outputService;
             _erpdapperRepository = erpdapperRepository;
-            _wmsDapper = wmsDapper;
             _fileContainer = fileContainer;
             _dapperRepository = dapperRepository;
         }
@@ -66,26 +64,6 @@ namespace SettleAccount.Job.Services.Report
             var _ls_sum = _dapperRepository.GetSharePartSumSettledDetailDiffReportList(version, materialCode, begin, end, materialGroup);
 
             //按照零件号汇总数量，有一列显示寄售库数量
-            var stockList = _wmsDapper.GetSalesStock("BJJS");
-            var queryStockList = from itm in _ls_sum
-                                 join itm1 in stockList on itm.Sap编码 equals itm1.SapCode into temp1
-                                 from tm1 in temp1.DefaultIfEmpty()
-                                 select new HQHSharePartSettledDetailDiffSum(
-                                    itm.Sap编码,
-                                    itm.结算物料号,
-                                    itm.物料描述,
-                                    itm.结算单价,
-                                    itm.收货仓库,
-                                    itm.收货仓库描述,
-                                    itm.发货定价,
-                                    itm.价格差异,
-                                    itm.差异总金额,
-                                    itm.结算金额,
-                                    itm.结算数量,
-                                    tm1 == null ? 0 : tm1.Qty,
-                                    itm.物料组
-                                    );
-
             //var _ls = _dapperRepository.GetInvoiceSettledDetailDiffReportList(version, materialCode, begin, end,  materialGroup);
             //var _lst=_dapperRepository.GetDiffQtyList(version);
 
@@ -157,7 +135,6 @@ namespace SettleAccount.Job.Services.Report
             ExcelExporter _exporter = new ExcelExporter();//导出Excel
             var result = _exporter.Append(_ls.ToList(), "红旗工厂备件明细")
              .SeparateBySheet()
-            .Append(queryStockList.ToList(), "备件汇总比对寄售库存")
             .ExportAppendDataAsByteArray();
             result.ShouldNotBeNull();
             _fileContainer.SaveAsync(_filename, result.Result, true);
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/SettleFisDiffExportService.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/SettleFisDiffExportService.cs
index 2c2bf34b..c64085bd 100644
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/SettleFisDiffExportService.cs
+++ b/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/SettleFisDiffExportService.cs
@@ -9,7 +9,6 @@ using System.Threading.Tasks;
 using TaskJob.EventArgs;
 using TaskJob.Interfaces;
 using Volo.Abp.DependencyInjection;
-using Win.Sfs.SettleAccount.Reports.SettledPartAndErpPartPriceDiffs;
 using Win.Sfs.SettleAccount.Repository.Report;
 using Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report;
 
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/SettleSparePartExportService.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/SettleSparePartExportService.cs
index ab19ae5c..96368048 100644
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/SettleSparePartExportService.cs
+++ b/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/SettleSparePartExportService.cs
@@ -22,26 +22,9 @@ namespace SettleAccount.Job.Services.Report
         private readonly OutputService _outputService;
         private readonly ErpPartDapperRepository _erpdapperRepository;
         private readonly IBlobContainer<MyFileContainer> _fileContainer;
-        private readonly WmsDapperRepository _wmsDapper;
-
-        private readonly ISettleAccountBranchEfCoreRepository<ErrorBill, Guid> _errorListRepository;
-
-
-        public SettleSparePartExportService(SettleSparePartDapperReportRepository dapper,
-             ISettleAccountBranchEfCoreRepository<ErrorBill, Guid> errorListRepository,
-            ErpPartDapperRepository erpdapperRepository, OutputService outputService
-            , WmsDapperRepository wmsDapper
-            , IBlobContainer<MyFileContainer> fileContainer)
-        {
-            _dapper = dapper;
-            _outputService = outputService;
-            _erpdapperRepository = erpdapperRepository;
-            _fileContainer = fileContainer;
-            _wmsDapper = wmsDapper;
-            _errorListRepository = errorListRepository;
-        }
 
 
+        private readonly ISettleAccountBranchEfCoreRepository<ErrorBill, Guid> _errorListRepository;
         public string ExportFile(Guid id, List<string> exportName, List<CustomCondition> p_list)
         {
             var fileName = exportName.FirstOrDefault();
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/SettleUnSparePartExportService.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/SettleUnSparePartExportService.cs
index f2ef5bb9..1dbeabdf 100644
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/SettleUnSparePartExportService.cs
+++ b/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/SettleUnSparePartExportService.cs
@@ -22,21 +22,21 @@ namespace SettleAccount.Job.Services.Report
         private readonly OutputService _outputService;
         private readonly ErpPartDapperRepository _erpdapperRepository;
         private readonly IBlobContainer<MyFileContainer> _fileContainer;
-        private readonly WmsDapperRepository _wmsDapper;
+
         private readonly ISettleAccountBranchEfCoreRepository<ErrorBill, Guid> _errorListRepository;
 
 
         public SettleUnSparePartExportService(SettleSparePartDapperReportRepository dapper,
              ISettleAccountBranchEfCoreRepository<ErrorBill, Guid> errorListRepository,
             ErpPartDapperRepository erpdapperRepository, OutputService outputService
-            , WmsDapperRepository wmsDapper
+
             , IBlobContainer<MyFileContainer> fileContainer)
         {
             _dapper = dapper;
             _outputService = outputService;
             _erpdapperRepository = erpdapperRepository;
             _fileContainer = fileContainer;
-            _wmsDapper = wmsDapper;
+
             _errorListRepository = errorListRepository;
         }
 
@@ -56,54 +56,13 @@ namespace SettleAccount.Job.Services.Report
             //反向对比，即大众备件未结（有单号），包含有发货有结算并且发货数量大于结算数量的数据也整合到未结中
             var _reversels_withcode = _dapper.GetReverseWithCodeSettleSparePartReportList_unsettle(purchaseOrderNo, version, sapCode, matialCode, beginTime, endTime);
 
-
-            var stockList = _wmsDapper.GetSalesStock("BJJS");
-
             //针对无单号备件，求和汇总显示
             var _forwardls_nocode = _dapper.GetNoCodeSettleSparePartReportList(purchaseOrderNo, version, sapCode, matialCode, beginTime, endTime);
-            var queryStockList_nocode = from itm in _forwardls_nocode
-                                        join itm1 in stockList on itm.SAP编码 equals itm1.SapCode into temp1
-                                        from tm1 in temp1.DefaultIfEmpty()
-                                        select new SettleSparePartExport(
-                                            itm.SAP编码,
-                                           itm.物料代码,
-                                           itm.物料描述,
-                                           itm.发货数量,
-                                           itm.收货数量,
-                                           itm.开票数量,
-                                           itm.收货与开票差异,
-                                           itm.开票单价,
-                                           itm.开票金额,
-                                           itm.定价,
-                                           itm.单价差异,
-                                           itm.差异总金额,
-                                           tm1 == null ? 0 : tm1.Qty
-                                           );
 
             //不管有单号备件还是无单号备件，财务要求全部按照零件汇总求和显示，并和寄售库存比对
             var _forwardls = _dapper.GetForwardSettleSparePartReportList(purchaseOrderNo, version, sapCode, matialCode, beginTime, endTime);
             //按照零件号汇总数量，有一列显示寄售库数量
 
-            var queryStockList = from itm in _forwardls
-                                 join itm1 in stockList on itm.SAP编码 equals itm1.SapCode into temp1
-                                 from tm1 in temp1.DefaultIfEmpty()
-                                 select new SettleSparePartExport(
-                                    itm.SAP编码,
-                                    itm.物料代码,
-                                    itm.物料描述,
-                                    itm.发货数量,
-                                    itm.收货数量,
-                                    itm.开票数量,
-                                    itm.收货与开票差异,
-                                    itm.开票单价,
-                                    itm.开票金额,
-                                    itm.定价,
-                                    itm.单价差异,
-                                    itm.差异总金额,
-                                    tm1 == null ? 0 : tm1.Qty
-                                    );
-
-
             if (!string.IsNullOrEmpty(sapCode))
             {
                 var _groupList = sapCode.Split(new char[] { '\n' }).Distinct().ToList();
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/SettledPartAndErpPartPriceDiffExportService.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/SettledPartAndErpPartPriceDiffExportService.cs
index b3321115..1b8618a5 100644
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/SettledPartAndErpPartPriceDiffExportService.cs
+++ b/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/SettledPartAndErpPartPriceDiffExportService.cs
@@ -10,7 +10,6 @@ using TaskJob.Interfaces;
 using Volo.Abp.BlobStoring;
 using Volo.Abp.DependencyInjection;
 using Win.Sfs.BaseData.ImportExcelCommon;
-using Win.Sfs.SettleAccount.Reports.SettledPartAndErpPartPriceDiffs;
 using Win.Sfs.SettleAccount.Repository.Report;
 
 namespace SettleAccount.Job.Services.Report
@@ -39,15 +38,11 @@ namespace SettleAccount.Job.Services.Report
             //var state = p_list.Where(p => p.Name == "State").FirstOrDefault().Value;
             var version = p_list.Where(p => p.Name == "Version").FirstOrDefault().Value;
             var customerCode = p_list.Where(p => p.Name == "CustomerCode").FirstOrDefault().Value;
-            var _list= _dapper.GetDiffReport(DateTime.Now.Year.ToString(), customerCode, version);
-            var _childList= _dapper.GetDiffDetailReport(DateTime.Now.Year.ToString(), customerCode, version);
             var _filename = exportName.FirstOrDefault();
             ExcelExporter _exporter = new ExcelExporter();//导出Excel
 
             var result = _exporter
-            .Append(_list, "BOM价格对比明细")
             .SeparateBySheet()
-            .Append(_childList, "无价格零件")
             .SeparateBySheet()
             
             .ExportAppendDataAsByteArray();
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/SyncFisService.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/SyncFisService.cs
index ac9c17d7..1450bfc3 100644
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/SyncFisService.cs
+++ b/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/SyncFisService.cs
@@ -25,7 +25,7 @@ namespace SettleAccount.Job.Services.Report
         private readonly HQHSettledDetailDapperRepository _hqkanbanDapper;
         private readonly KanbanUnSettledDapperRepository _kanbanDapper;
         private readonly UnSettledDetailDapperRepository _dapper;
-        private readonly WmsDapperRepository _wmsDapper;
+
         private readonly OutputService _outputService;
         private readonly ErpPartDapperRepository _erpDapper;
         private readonly SettleSparePartDapperReportRepository _sparepartdapper;
@@ -37,13 +37,11 @@ namespace SettleAccount.Job.Services.Report
          UnSettledDetailDapperRepository dapper,
             OutputService outputService,
             ErpPartDapperRepository erpDapper,
-            WmsDapperRepository wmsDapper,
             SettleSparePartDapperReportRepository sparepartdapper,
             ErpPartDapperRepository erpdapperRepository,
                IBlobContainer<MyFileContainer> fileContainer
             )
         {
-            _wmsDapper = wmsDapper;
             _hqkanbanDapper = hqkanbanDapper;
             _kanbanDapper = kanbanDapper;
             _dapper = dapper;
@@ -56,26 +54,6 @@ namespace SettleAccount.Job.Services.Report
         [UnitOfWork(false)]
         public string ExportFile(Guid id, List<string> exportName, List<CustomCondition> p_list)
         {
-         
-            var _lsExport= GetReport(id,exportName,p_list);
-            var _lsleft = GetLeftReport(id, exportName, p_list);
-
- 
-
-
-            //ExcelExporter _exporter = new ExcelExporter();//导出Excel
-            //var result = _exporter.Append(_lsExport, "汇总核对表1")
-            ////.SeparateBySheet()
-            ////.Append(_lsleft, "汇总核对表2")
-            //.ExportAppendDataAsByteArray();
-
-            //result.ShouldNotBeNull();
-            //_fileContainer.SaveAsync(String.Format("结算未结寄售核对表{0}.xlsx",Guid.NewGuid().ToString("N")), result.Result, true);
-
-
-
-            var _first = exportName.FirstOrDefault();
-            _outputService.Export<UnSettledSum>(id, _first, _lsExport);
             return id.ToString();
 
 
@@ -401,93 +379,6 @@ namespace SettleAccount.Job.Services.Report
 
             return kanbanList;
         }
-
-
-
-
-
-        public List<UnSettledSum> GetReport(Guid id, List<string> exportName, List<CustomCondition> p_list)
-        {
-            var version = p_list.Where(p => p.Name == "Version").FirstOrDefault().Value;
-            List<UnSettledSum> _ls = new List<UnSettledSum>();
-           _ls.AddRange(GetFisSum(id, exportName, p_list));
-            _ls.AddRange(GetHQKanbanSum(id, exportName, p_list));
-            _ls.AddRange(GetKanbanSum(id, exportName, p_list));
-            _ls.AddRange(GetSparePartSum(id, exportName, p_list));//大众备件未结
-
-
-
-            var _lst = _wmsDapper.GetSalesStockSum(version);
-            var query = from itm in _lst 
-                        join itm1 in _ls
-     on new { Version = itm.Version, PartCode = itm.PartCode.Trim(), LocCode= itm.LocCode.ToUpper()} equals new { Version = itm1.版本, PartCode = itm1.物料号.Trim(), LocCode = itm1.库位}
-into temp
-                        from tm in temp.DefaultIfEmpty()
-                        select new UnSettledSum
-                        {
-
-                            版本 = itm.Version,
-                            物料号 = itm.PartCode,
-                            物料描述 = itm.PartDesc,
-                            物料组编码= itm.PartGroup,
-                            物料组车型 = itm.PartGroupDesc,
-                            SAS未结明细汇总 = tm == null ? "0" : tm.SAS未结明细汇总,
-                            WMS期初库存 = itm.StartQty.ToString(),
-                            WMS期末库存 = itm.EndQty.ToString(),
-                            库位 = itm.LocCode,
-                            本月减少 = itm.OutQty.ToString(),
-                            本月增加 = itm.InQty.ToString(),
-                            差异= (itm.EndQty- decimal.Parse( tm == null ? "0" : tm.SAS未结明细汇总)).ToString()
-
-
-                        };
-            return query.ToList();
-        }
-
-
-        public List<UnSettledSum> GetLeftReport(Guid id, List<string> exportName, List<CustomCondition> p_list)
-        {
-            var version = p_list.Where(p => p.Name == "Version").FirstOrDefault().Value;
-            List<UnSettledSum> _ls = new List<UnSettledSum>();
-            _ls.AddRange(GetFisSum(id, exportName, p_list));
-            _ls.AddRange(GetHQKanbanSum(id, exportName, p_list));
-            _ls.AddRange(GetKanbanSum(id, exportName, p_list));
-            _ls.AddRange(GetSparePartSum(id, exportName, p_list));//大众备件未结
-
-
-
-            var _lst = _wmsDapper.GetSalesStockSum(version);
-            var query = from itm in   _ls
-                        join itm1 in _lst
-     on new  { Version = itm.版本, PartCode = itm.物料号.Trim(), LocCode = itm.库位 } equals
-            new { Version = itm1.Version, PartCode = itm1.PartCode.Trim(), LocCode = itm1.LocCode.ToUpper() } 
-into temp
-                        from tm in temp.DefaultIfEmpty()
-                        select new UnSettledSum
-                        {
-
-                            版本 = itm.版本,
-                            物料号 = itm.物料号,
-                            物料描述 = itm.物料号,
-                            物料组编码 = itm.物料组编码,
-                            物料组车型 = itm.物料组车型,
-                            SAS未结明细汇总 = tm == null ? "0" : tm.EndQty.ToString(),
-                            WMS期初库存 = tm == null ? "0" : tm.StartQty.ToString(),
-                            WMS期末库存 = tm == null ? "0" : tm.EndQty.ToString(),
-                            库位 = itm.库位,
-                            本月减少 = tm == null ? "0" : tm.OutQty.ToString(),
-                            本月增加 = tm == null ? "0" : tm.InQty.ToString(),
-                            差异 = ((tm == null ? 0 : tm.EndQty) - decimal.Parse(tm == null ? "0" : itm.SAS未结明细汇总)).ToString()
-
-
-                        };
-            return query.ToList();
         }
-
-
-
-
-
-
     }
-}
+
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/UnSettledSumService.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/UnSettledSumService.cs
index 47c1d8dd..b2ae4c81 100644
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/UnSettledSumService.cs
+++ b/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/UnSettledSumService.cs
@@ -49,12 +49,11 @@ namespace SettleAccount.Job.Services.Report
         public string 差异 { set; get; }
     }
 
-    public class UnSettledSumService : ITransientDependency, IExportJob
+    public class UnSettledSumService : ITransientDependency
     {
         private readonly HQHSettledDetailDapperRepository _hqkanbanDapper;
         private readonly KanbanUnSettledDapperRepository _kanbanDapper;
         private readonly UnSettledDetailDapperRepository _dapper;
-        private readonly WmsDapperRepository _wmsDapper;
         private readonly OutputService _outputService;
         private readonly ErpPartDapperRepository _erpDapper;
         private readonly SettleSparePartDapperReportRepository _sparepartdapper;
@@ -66,13 +65,11 @@ namespace SettleAccount.Job.Services.Report
          UnSettledDetailDapperRepository dapper,
             OutputService outputService,
             ErpPartDapperRepository erpDapper,
-            WmsDapperRepository wmsDapper,
             SettleSparePartDapperReportRepository sparepartdapper,
                IBlobContainer<MyFileContainer> fileContainer
           
             )
         {
-            _wmsDapper = wmsDapper;
             _hqkanbanDapper = hqkanbanDapper;
             _kanbanDapper = kanbanDapper;
             _dapper = dapper;
@@ -82,38 +79,6 @@ namespace SettleAccount.Job.Services.Report
             _fileContainer = fileContainer;
       
         }
-        [UnitOfWork(false)]
-        public string ExportFile(Guid id, List<string> exportName, List<CustomCondition> p_list)
-        {
-         
-            var _lsExport= GetReport(id,exportName,p_list);
-            var _lsleft = GetLeftReport(id, exportName, p_list);
-
- 
-
-
-            //ExcelExporter _exporter = new ExcelExporter();//导出Excel
-            //var result = _exporter.Append(_lsExport, "汇总核对表1")
-            ////.SeparateBySheet()
-            ////.Append(_lsleft, "汇总核对表2")
-            //.ExportAppendDataAsByteArray();
-
-            //result.ShouldNotBeNull();
-            //_fileContainer.SaveAsync(String.Format("结算未结寄售核对表{0}.xlsx",Guid.NewGuid().ToString("N")), result.Result, true);
-
-
-
-            var _first = exportName.FirstOrDefault();
-            _outputService.Export<UnSettledSum>(id, _first, _lsExport);
-            return id.ToString();
-
-
-        }
-
-
-
-
-
         [UnitOfWork(false)]
         public List<UnSettledSum> GetFisSum(Guid id, List<string> exportName, List<CustomCondition> p_list)
         {
@@ -444,88 +409,6 @@ equals new { ChassisNumber = itm1.BillNum, MaterialCode = itm1.MaterialCode, Wms
 
 
 
-        public List<UnSettledSum> GetReport(Guid id, List<string> exportName, List<CustomCondition> p_list)
-        {
-            var version = p_list.Where(p => p.Name == "Version").FirstOrDefault().Value;
-            List<UnSettledSum> _ls = new List<UnSettledSum>();
-           _ls.AddRange(GetFisSum(id, exportName, p_list));
-            _ls.AddRange(GetHQKanbanSum(id, exportName, p_list));
-            _ls.AddRange(GetKanbanSum(id, exportName, p_list));
-            _ls.AddRange(GetSparePartSum(id, exportName, p_list));//大众备件未结
-
-
-
-            var _lst = _wmsDapper.GetSalesStockSum(version);
-            var query = from itm in _lst 
-                        join itm1 in _ls
-     on new { Version = itm.Version, PartCode = itm.PartCode.Trim(), LocCode= itm.LocCode.ToUpper()} equals new { Version = itm1.版本, PartCode = itm1.物料号.Trim(), LocCode = itm1.库位}
-into temp
-                        from tm in temp.DefaultIfEmpty()
-                        select new UnSettledSum
-                        {
-
-                            版本 = itm.Version,
-                            物料号 = itm.PartCode,
-                            物料描述 = itm.PartDesc,
-                            物料组编码= itm.PartGroup,
-                            物料组车型 = itm.PartGroupDesc,
-                            SAS未结明细汇总 = tm == null ? "0" : tm.SAS未结明细汇总,
-                            WMS期初库存 = itm.StartQty.ToString(),
-                            WMS期末库存 = itm.EndQty.ToString(),
-                            库位 = itm.LocCode,
-                            本月减少 = itm.OutQty.ToString(),
-                            本月增加 = itm.InQty.ToString(),
-                            差异= (itm.EndQty- decimal.Parse( tm == null ? "0" : tm.SAS未结明细汇总)).ToString()
-
-
-                        };
-            return query.ToList();
-        }
-
-
-        public List<UnSettledSum> GetLeftReport(Guid id, List<string> exportName, List<CustomCondition> p_list)
-        {
-            var version = p_list.Where(p => p.Name == "Version").FirstOrDefault().Value;
-            List<UnSettledSum> _ls = new List<UnSettledSum>();
-            _ls.AddRange(GetFisSum(id, exportName, p_list));
-            _ls.AddRange(GetHQKanbanSum(id, exportName, p_list));
-            _ls.AddRange(GetKanbanSum(id, exportName, p_list));
-            _ls.AddRange(GetSparePartSum(id, exportName, p_list));//大众备件未结
-
-
-
-            var _lst = _wmsDapper.GetSalesStockSum(version);
-            var query = from itm in   _ls
-                        join itm1 in _lst
-     on new  { Version = itm.版本, PartCode = itm.物料号.Trim(), LocCode = itm.库位 } equals
-            new { Version = itm1.Version, PartCode = itm1.PartCode.Trim(), LocCode = itm1.LocCode.ToUpper() } 
-into temp
-                        from tm in temp.DefaultIfEmpty()
-                        select new UnSettledSum
-                        {
-
-                            版本 = itm.版本,
-                            物料号 = itm.物料号,
-                            物料描述 = itm.物料号,
-                            物料组编码 = itm.物料组编码,
-                            物料组车型 = itm.物料组车型,
-                            SAS未结明细汇总 = tm == null ? "0" : tm.EndQty.ToString(),
-                            WMS期初库存 = tm == null ? "0" : tm.StartQty.ToString(),
-                            WMS期末库存 = tm == null ? "0" : tm.EndQty.ToString(),
-                            库位 = itm.库位,
-                            本月减少 = tm == null ? "0" : tm.OutQty.ToString(),
-                            本月增加 = tm == null ? "0" : tm.InQty.ToString(),
-                            差异 = ((tm == null ? 0 : tm.EndQty) - decimal.Parse(tm == null ? "0" : itm.SAS未结明细汇总)).ToString()
-
-
-                        };
-            return query.ToList();
-        }
-
-
-
-
-
 
     }
 }
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/UnSettleAccount/UnSettleAccountImportService.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/UnSettleAccount/UnSettleAccountImportService.cs
index fcc1167c..82244810 100644
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/UnSettleAccount/UnSettleAccountImportService.cs
+++ b/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/UnSettleAccount/UnSettleAccountImportService.cs
@@ -21,17 +21,13 @@ namespace TaskJob.Services
     /// </summary>
     public class UnSettleAccountImportService : ITransientDependency, IImportJob
     {
-        private readonly UnSettleAccountRepository _repository;
-        private readonly UnSettleAccountVersionRepository _versionRepository;
+
         private readonly InputService _inputService;
         public UnSettleAccountImportService(
-            InputService inputService,
-            UnSettleAccountRepository repository,
-            UnSettleAccountVersionRepository versionRepository
+            InputService inputService
             )
         {
-            _repository = repository;
-            _versionRepository = versionRepository;
+
             _inputService = inputService;
         }
 
@@ -55,7 +51,6 @@ namespace TaskJob.Services
 
                     var filePath = fileSavePath + itm;//获取到导入的excel
                     var exten = Path.GetExtension(fileSavePath);
-                    List<UnSettleAccount> _setls = new List<UnSettleAccount>();
                     List<string> _errorList = new List<string>();
 
                     var checkList = new List<ErrorExportDto>();
@@ -63,29 +58,8 @@ namespace TaskJob.Services
                     List<string> _precodeList = new List<string>();//
 
                     var errorlist = new List<ErrorExportDto>();
-                    var dtoList = _inputService.Input<UnSettleAccountImportDto>(filePath, null, errorlist);
-                    foreach (var dto in dtoList)
-                    {
-                        if (dto.KENNCode.Length == 6)
-                        {
-                            dto.KENNCode = "0" + dto.KENNCode;
-                        }
-                        var _settleaccount = new UnSettleAccount(Guid.NewGuid(), Guid.NewGuid(), dto.SettleYear, dto.KENNCode,
-                            dto.ChassisNumber, dto.Model, dto.CP5A, dto.CP7,
-                            dto.MaterialCode, dto.Qty, string.Empty, string.Empty,
-                            DateTime.Now.Year.ToString(), DateTime.Now.Month.ToString(),_id, version, DateTime.Now, Guid.NewGuid(),dto.UnsettledReason);
-
-                        _setls.Add(_settleaccount);
-                    }
-
-                    var _ls = _setls;
-                    var a = _ls.Where(p => string.IsNullOrEmpty(p.KENNCode));
-                    var query = from arc in _ls
-                                group arc by new { arc.ChassisNumber, arc.MaterialCode } into g
-                                where g.Count() > 1
-                                select g;
-                    _repository.Insert(_setls);
-                    _versionRepository.Insert(_id, version, customerCode, customerCode);
+
+
 
 
                     #region
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Job/SettleAccountJobModule.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Job/SettleAccountJobModule.cs
index 9a7d7638..4dba8c89 100644
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Job/SettleAccountJobModule.cs
+++ b/code/src/Modules/SettleAccount/src/SettleAccount.Job/SettleAccountJobModule.cs
@@ -219,11 +219,6 @@ namespace Win.Sfs.SettleAccount
                     {
                         return implementationFactory.GetService<FisUpdateExportService>();
                     }
-
-                    if (key.Equals(typeof(UnSettledSumService).FullName))
-                    {
-                        return implementationFactory.GetService<UnSettledSumService>();
-                    }
                     if (key.Equals(typeof(FisOutputService).FullName))
                     {
                         return implementationFactory.GetService<FisOutputService>();
diff --git a/code/src/Shared/Win.Abp.Snowflakes/bin/Debug/netcoreapp5/Win.Abp.Snowflakes.dll b/code/src/Shared/Win.Abp.Snowflakes/bin/Debug/netcoreapp5/Win.Abp.Snowflakes.dll
index c9d08db5e563c6331dcd106268298e27a2fcdffb..a5c3a589b2710907d9701992ff0b561eccaf25ea 100644
GIT binary patch
delta 239
zcmZp0Xt0^kq12LnXgvcIJYY~#;AS*nU=RZeut5YLnND04#@IiZk+GiZg(y%=0f@yW
zcQI-+N=)9ysLm)e`5vPZ<KfMWOyxoXXATSA%Y0VmI`^gRwu=YSJvMiU@G$W%U2*UQ
z1EX&M6Hsf*<b`7LtQn>Z3>lM;iYZHPthTUKS?un%ext*ku1<GXMxYuOs~Bg07uU(=
z;yHRydA0XYd5~FRzty@=l>N+MJC!229cU5^Tr{10QCy1g@Z>k*VVn7+elasWG2JXE
K_nvX00XqOzYfG{K

delta 299
zcmZp$X>gd(p%iQP>jDE5JYY~#;AS*nV2}U`ut5aH%qFf1V>~>Wk+GgjMhqyX0K^iL
zyBM_@r6zA<RA-c%e2-Cy@%v^*rg9+xFaD*>`L<5JjW6<ymgPjtZtf7_Vd6b!8hM3*
z(KmnzsCCEWg<|rob4(c+=1e{+rtJUWp19vUw=A#K%bs0xeOMC52vp-@74vfH{%13m
zzFfHT`RsKuPkW|6*|i2pKHIqW`R>Wj*G-2?_@$ORc?GAIl;os3CMV~Y=9Nrl7SAz)
zni&N%6KH?Pm2NeA$y@HzqY4i`d=0c623XC2EQN`RVvOG>?+_2$tRQoSaWkL9FJ>kQ
Ov(17s?-?f=umb=T)@lL(

diff --git a/code/src/Shared/Win.Abp.Snowflakes/bin/Debug/netcoreapp5/Win.Abp.Snowflakes.pdb b/code/src/Shared/Win.Abp.Snowflakes/bin/Debug/netcoreapp5/Win.Abp.Snowflakes.pdb
index 0567182885e10cac81cb046eb8f3a68134dd646c..512da4b1aed8512941e9ca98708112fea9a11c73 100644
GIT binary patch
delta 751
zcmZ9~Ye<t(7zgm@oV|O!E%8!nI&tVy(cS0f?DA$#Q@eTTgQZf<Da{BhjZi||JMFeY
zlsCE%#UMqgG-Q=Y7#1XzcCpMLwIr}CgA@X3Vf7>h*@xf%|KXhHa6UXuw!z&^`(&kR
zfS9zs6(s=Bb;z_vekpVPwXW1L=kd&p*7mzo%}w^YN+3`N6z*X^!}cWv!U%;t?48*6
zu}84ODS<>v@g=}p=M)rNs10?Z8|aZ@;qXr|FsfkS9r}o7&>Z@K#7YJvC>VuHF%F|v
z)PruT7zk1`umKgjuaL(iw_3^Kn_kEp#Q_7kG!Dd|WXvFfEwmnU6YT>Q`V|uk*+*Hp
zshq$(uL2PZKUFeJvpN;CUm-jYwTKyWPI`vW%9N`l#f0&RjE+^Nre|%Hotzd13`O5O
z@_}vLZSzqv&wH)Q@^8J(m5fIyj4yXQ5!Q;MwM+gPvAbl)*qYij(W?U|D)I)0!~?bu
z<xQ3D&+>xi<=HRJI19dpWeeltQ1zmzSy`>kyJ6CY?@mwP{G6NR(#~DJQ`J>|U(7Ru
zZ&n9z5@AdnwrGY=k$K{igI@39y60)+?DhGTy+!4hC$*<ShFX|_hgTi(+l3WuhA!am
z?|3`kz&rWVvbd^Mck%^Sc;VCO!u?6@Tw`PXk#!d;W`e6zhWl)xF5w~@6ZrqwoG{GB
zl2PG18)-DEG)lcnr`H)$RHj6$-fGpBYOG~tmJ+SSXehO4blT*yB#qu=&|0)*CW~I9
zF&QoH9IufC-$c@(BOM&+C~~WHVMHpW_D>A&5%C`4h$lxkQb!SWyr=bc+Atzm^;!PG
rgd+zD?@#!%#K8$YdSld5Y7QZRxCX@D<wJm@-Vs1(&F{S^@$-RS3ER`L

delta 818
zcmZY7Ye<t(7zglk&fd)#W@L&hwpbbpvu)0IZZj#opqAmfSb<{YZg!hn>S`*LZW?~k
zQeM>MHBF_kdBH4FEUjP_CPZOD7gS8MH0(l_QuJg&WCwo#|A)hQI0w$)!O}ye$Ap)p
z2>C}D&02)e>?>b&UF?zg)|QFkm{H6Aq0po!Wu^IfEeNA)h@fxK?wFuxj8P(VF?0<y
zAsG1(f|8(((7zTz&o>Y>2ByF)m;)Z-#mzrKA%U1e>p>6*0bw8l!~r$f15)@9E-(oe
zz;_9Sc1tN#4C=aC@k6|$N6dklZh#8{5rxV~AYvmk6^&Tv94UY-A^nJhxZ;t;>?a)b
zRXhUuQi50<6e$%#o{>gCa>dL&R#TYARQat5NApy}jmhdZ-s|GZ@t!M?6P<mNz071=
z<?jtIwZR${pJ=dHjD|>^&V1ZtVKS)0vK1+qS}EGJb8oW7l6^A2NZ8r+@x;yf@(XIe
z)PeAU?b>ix?1z$eciyQr_0K$cjcyE=?U%RY)Keklx~zL3NQe{N%{j{#{Ae28WtbgI
zt*Gg1Rz+#=^ak>_CYsFFG^6IIVXHpQU@~NCEaps!F6-Y(Hj!|Cj-T~e$P~--K20~B
z=c={1d%Phlx2j=GFs^r8?ev8~Of%bi$<1vR;r*&1YgoeOcb>gN3EBH@zgM_s(kDbw
z&f1IKo@L5bHuHuZBlr6IUR$4Sz~-_&7GAH;FwrGNj{3Od!s*ii-mM+0$J=8oFlS>>
z_aoNZ2<8CCf7O2n?FxqB1mG7;4@aO3l?00wk`P)JqLRquL5fhBo(|Egf@Mlwnog$(
zPSa`i3MH+g6~VGJO_+w(8?-WcXxDPLVbQX5?6hEKK6ci2&B%C|zn0|BQg$xO&c${W
uF3KTxBe5@#0tYGl!mOjWczWYVoQrKf*w%>c+ZZdYVEK?3ri13gul@<1lnFur

diff --git a/code/src/Shared/Win.Abp.Snowflakes/bin/Release/netcoreapp5/Win.Abp.Snowflakes.dll b/code/src/Shared/Win.Abp.Snowflakes/bin/Release/netcoreapp5/Win.Abp.Snowflakes.dll
index 16a996079cc0f9179c2b3628746c5538495e4c2d..66ccd59381f12250b936938f4924c4b1de1a2362 100644
GIT binary patch
delta 268
zcmexw-C#4JOpKRHg#iKrTp1XA7?~NidK^1Ev0H|5*Tfa!jH#0t>lqJBZUB-qH!&3p
z3LL$0&3f{dT>t&0_sUI^E_7{f7JkBLxc&#ndj>||04AVOZ9u%k7>Gro1_LQZAQlE<
zbs)Ag0piIsM3qfEcx*(ZoGM*6?lsyx|L@zMAXP3_G0y%jt}#xjnO>QB!Ko!BIjN4x
z$@!&uB{9kQDXEihh=v+LHHyMCf~?=js%ps?5;nE-#Y5R%pcOE%9K=?bs3^ubb8?xO
b_T~j*p^Te(C4Mn8?J?ObDD#eSq5%g0<S0`P

delta 227
zcmZp$`ENa;Oq5H70RjSC85n#RnHkvjTz@jLM}~3H#FgQUev=s)>ls%}ZUmA|n;Dsk
z1qJ5p<&t9!Z}*&W<oCg!G3`B@TZEr5@^Uo){K~-S8^8oKEPryTs64B>2?K-r<e8$%
zvNjtw%;2)?c5FYG`A1vv^lnC=8h5Lh5Kl)x57)^bL_>|BDjpt(ssNf+y8ofx$EP<g
zNnF+YdbkW|77R=Pu@xpNiZM1#?i15y`>)ENz#y<$P$rFWGoQpSW~L=3K+b!{i3aQd
Dl7~za

diff --git a/code/src/Shared/Win.Abp.Snowflakes/bin/Release/netcoreapp5/Win.Abp.Snowflakes.pdb b/code/src/Shared/Win.Abp.Snowflakes/bin/Release/netcoreapp5/Win.Abp.Snowflakes.pdb
index 7c786df95f2e67a4cc1dea26858f2c225062dd1a..563d669faef65f08c4fd67d5285b9b46a300ca06 100644
GIT binary patch
delta 811
zcmX?-(vdpBBxVZ}1A}rM1H%+%1_lELAUn9EC^Ij;7|3Ke0u*BbiG>C;oB*-|Ky3F=
zPZuC90hB1v1M;16@{@pk4;~v4DW^);jeCtY&;R@O=lUNU?<Y>EsR!vVVqj#bXJBGD
z1f(wjX)Z=a1_?$chCm=452TL+=^H>=hKZ3umkH<~AYfvcrNhLq5QtX*@p>TM2E==H
zz>-jch2e+}3&Uw3z68WKf%pLsKL_G>K>QVm|0n<nW?dGBOdxIn;%*@3(qmz80pd6y
zPTRbi@gSpGj4m6{Om-mV0Ah8ZuY;J>8CV(gSezM{83LG^futYP<TmCofjuR9lULrZ
zaOrj9H(I`H^X18Rn3WV<tXQ1=U0j8oQZv0W^MX@LN^(*ilaupH^GaBf^HWkMv$F)~
z@x(B)aLOvF={mT01S|Bso_yLg`sXi|(-GU3|CLw1v^QBaXvh5kp1aaIW>@3RO>SmU
zs^>-0(y&0GgRQdGiTQd-cYffRi>#+Jo@Y)d+WbZ(e4?c1<>_7FUnD$(^YY8nauTys
zJyYCM^HPfvOY)2Kl8aHy`KVBv!O`-RvvIqNmK}GOuZqmN1g;kq#oX_mKb*N|BVflP
z4mHLepE-?|3cobWg>GfpZU4(8`*F)(tG&^gtDYK85xcmAMd0L`CXL9+v8?V!0x&-`
zHZ-<0_B75==sIF+k!W}|xv|1F_}rH-dk>u2&RTN+@%pH~P1{n8<D({DVO17H*Y<NV
z8=E2<BQqmo<E_b>Y|<7cdS-eCy2g4&#zv-=dKTKr#>vTsDF(@@sfkI3iDsrLi3Uc7
z=BXwI#ulcAiH4~biN*#77G{Z)YuV~qEDg=fHnHE-<lzR!w}KTX8!%})O}=U1&%KtP
Vajh8RS|!G{_M7buS%Jxt0Ra3b=z;(M

delta 733
zcmeB3J(4oPBxVH@1A}rM149Qh1A_qrkR4o7l$n=a3}iCw0E)4I#6p7^_5j%qAhvs`
zrwfq&1LS+?0r^fj`AI;&&4vv#xa_(e+Ye^`(N;XYo1^*X*NGEq>Vd{HL^Cilq%klt
ztOU|qf%JPI{ToP|FfuYYFfuW$0Mgrm^lu=|#RSs90F*7!VPdET;wB*O1mX!mJY5GY
z2_;w<=IO97ECu2<K)e}<cLDK1AU*-a=YjZ|0+2A*Wnpjz;y55q1>z?_ET_l9U;)Gq
zn^!X)WR%j<WdoYY4#XTltj@s9pv|NX^g9R3<Vnn7lYcNPak^Wvg?KvpdALrtVhPaU
zieY5o<`>h{HMCLKxcO7rzF$)p_$ehEv_9ycWPRN2WAA!SiCU@oH~1tLu}|K?qEycf
z*U-?ez;b+L@+nzgcda9peKNBDmOKnf{ct8>+MK;hEu4}L?^c)a49?3hPs>TnPW4Q2
zPt8j$N-W7Q(n~HzGUb}WukSL&Ulb<ynACrMvt%ZRUlQZiCku<KW-WXq`y^$?mW|>_
zhD?rS<<UjxZj@0tIqO`xrLWy<zTM}1D`F45Gdun^_nDT{+PRBG_$HdKW}Q5P)!l#(
z;_Al4#?;2##!3a-)k?Crt9ol$*$waXYRvtV8}|LyzMayx_0yi7&Y9_>Ia!cRnIBct
zjmfTTicF2SC+Dz9TN>*b8tNJ7n&=rBniv@CnQ14c8m6VC8Jn1-n3!3bo0%Dzq?%a(
z1<ei3Oi~TZ49pXg%q)@&4JPkrt7kDWv@qE0#C}tAvbv$a_?o+nYo0K!`M|iAmm3&q
R3RawKz;xxbxzUi75dhjV(X;>n

diff --git a/code/src/Shared/Win.Abp.Snowflakes/obj/Debug/netcoreapp5/Win.Abp.Snowflakes.GeneratedMSBuildEditorConfig.editorconfig b/code/src/Shared/Win.Abp.Snowflakes/obj/Debug/netcoreapp5/Win.Abp.Snowflakes.GeneratedMSBuildEditorConfig.editorconfig
index 795cd352..a8549a82 100644
--- a/code/src/Shared/Win.Abp.Snowflakes/obj/Debug/netcoreapp5/Win.Abp.Snowflakes.GeneratedMSBuildEditorConfig.editorconfig
+++ b/code/src/Shared/Win.Abp.Snowflakes/obj/Debug/netcoreapp5/Win.Abp.Snowflakes.GeneratedMSBuildEditorConfig.editorconfig
@@ -8,4 +8,4 @@ build_property.PlatformNeutralAssembly =
 build_property.EnforceExtendedAnalyzerRules = 
 build_property._SupportedPlatformList = Linux,macOS,Windows
 build_property.RootNamespace = 
-build_property.ProjectDir = D:\长春项目\北京北汽结算项目\NewBJSettleAccount\BeiJinSettleAccount\code\src\Shared\Win.Abp.Snowflakes\
+build_property.ProjectDir = D:\CODE\BeiJinSettleAccount\code\src\Shared\Win.Abp.Snowflakes\
diff --git a/code/src/Shared/Win.Abp.Snowflakes/obj/Debug/netcoreapp5/Win.Abp.Snowflakes.assets.cache b/code/src/Shared/Win.Abp.Snowflakes/obj/Debug/netcoreapp5/Win.Abp.Snowflakes.assets.cache
index 8fe10ea0cfcc91c43238d505b88083bd230a51eb..ba2c3186e9a275e8388f0a3d86b8c3c9dcac5ef0 100644
GIT binary patch
delta 2281
zcmZuyYfM{Z80OkC3M-xCQq5R9ZsS@g<<dfFO9LGYN?A+C@Nj9MR2ZYsi{gaP#i&yg
z9X?Ti%*?xq(HRn!?H64ZO<eq8{GnN*k|l<yaWVWb#KgED-_H5I^O4v;=RD8*yzlq+
zocDRp_Eze@Td6M3X_q4>B_#!09}JxH)qM8l!}(>`PhU@d9{%gd_xFEm7*1UK`;)!F
zFEnTOMbfWo|2pfm2t(0eBq}(1dWT0aW)apttjH9BCbJRo5-V(}Rg5tqx73g8DizYx
zj&p3Xv=<+z@w!#(S&XO4wM@93euc|0*hbNQI17Jf$aOxF;%oL-(WRidi;8O!zo;;y
zU-=TNQjR_4YaH5fj-&7p&C_I-W4YRg%|miu<v3O|{HXtUb}^Tk%%0_tyLMz>Q^_&w
zE(bbu_{!@pC9dXN<TUo&i33Q9>xK}_hxs}a^-g@pn1ot~V)dw$l~B`vmQWX?D(^|g
z7vR0T^AgI_#HG82q9W*ysNiX=#g7_#ipcVs2W~y4O-;ypjB4(fIuK)sWV}0|!l|a?
z*gn8+YMr=nlx7j#T~8sb&DGdFz_#Uwq@MKN6R2sa!EQdy(tAtLT|l3%-mAsytqN4M
zR^nlStRbuwmkKG<P^5**+=lcbnYkpLvEc7{LtDolM;}(TdhU^IYNwd6dt>hLUFGVd
zc^2yC<Dp<oSO`p>4}^kIf%w3+Zvamu9Et=k=(=a-f>B+Wv304nxy)!5`e!C1;b?d|
zrt{B4<AFJyHx{3o2@Bq*0+Ha9;Eub3F^^P?)cPMoiDzQU;>8msC#1GSUyU<FJhjB3
zWa%7-R;@nVDwA`GkEXFy&NBwv2x=>2<|4jjXw7~ZD<^4eQ4vE?rHqK5M)3n<h-dbc
zQ+Tn8Y6!FA6kw?4ndR!IS&zh1&vGc4ZAWS?uXfiy$HmuO9Wd7ManVbIxK~GCBstZd
z+l+GtUT4oGp1RD{ny9BQTlA6%#~NsjgnA6`bBK7#h(e<rC%)>$n~cfR^g-E3<Fdcp
z(upFouQBl&(O-T^bH_yAtn4d0mrp$PdlR28da94pwB>hTyP0Z4PxVW2(N7Ni(jv#H
zr+S%&Fk`GD@shyMFupR=+y#F(>Mhh`W0tFuithgTwob-~yWiH%Gi2{)Sb1jE`WBaQ
zJADSXI&2(cu)V|33i|Cdwr2lE;ujUq;GTo>;?AGIjZVslGaAARPM+Cu(ys)Glf9qQ
zCHE!neOtQ<KX)~=^UIOUb|TTu*CD%~=muQ8ZrzpOvc!4y;pV9hj<x5SG2Fw~66ZC9
z`d$a8Bj14gj1lLy1<R*tt%N!NU7w7|+&1AR$B?=0g0G)y@-zeZl_7CT2XMtr<AizO
zep~86oJ;yWA&AW6tcUhUn7f|mIdxlpK2`?l4kz)9Gt}{VZv{R*6P46@?+tc$5^27d
n87jes?-ho~d>%!3NUo{J-jKBSHWvH=wIp5emu~zM{3Gi>LiD+P

delta 2337
zcmZuyZA@Eb6o#>mk9LJ_&;l`o!6@IQKu3WIcp<jHMk!D_a90VF+Rb%i<zvWDU@n`+
zWCnObGXLn7xI`03Oh`0~(eXo*ZAyqgjLCG#nru2Hvh0VMA2ad3eeb#Vme@bN=XsuU
z-jAH;Jx}k(-@hC0_8xQ#hPb%6s}~oIpM9FS>!UjlItqR`|5|+7{aU9`@%_W^eyO_M
zJX!RYUlPf`66ycdmU^*wG%zwMIvh35YTU`|pTAO~<AF(6jZ66rXo@G~asE44*6We5
zEl1HfaAez<CYmbnK}?_wlg@z~33D2L!}<d1jC%aOU9It<hTqgp%Taj8`^r}x=89j8
zuKj1R0r#4da4S(Svym1Db|%d#(FItN3zet@CzH?0kx6I8{<6Mkoy%p01y@q)#FiTf
z+lsK7a!gL(Q3?k16ADs}b$30Q4YWkqHXSYa#IT2!X&b=gPU1~%<@mZHC>^?(cxfA#
zj3GIS*nQ|uB`#vm#g){c!tKGol~oYah&Oc{!Gkob!kf{SRRhsPyx_^lvdJ&=f+vXK
zU8EK~*%)y6khGiBm6@6F?CzA+EV}32jxV<$I#i_7j=08x+vz?{)@)Y>ycyjZWYw2~
zTN%AEh#uFS0^TxfS6?&tYcy--L@d`jan7P@vT)Nfq-f5`Uz>q_Sn?MvWZ7gOVrN%z
zSP`<Lu#Gn^Wbcj1$y*6!|B*Nt?Qzj|YCISi6HgDmd}1&d7!{c}Dx{Y1jtmD!22bX?
zj)x?4Xn5?Dq#7MMA$rE$fic%$D0EaxaSext0wXNv|IIWdFU*}ZAV-h$mlT}2ryaQk
zc^YJ@;EX1^k?;!UtXh7<`ntlO#m|LWZd2#OVi6(X9b>Q;s}Xb2jGW6|<HsYL9v_!j
z6!cBFODQAL!rbG<Lj~aunv~Vt9*xK<rwr9F9;}wr#fNRoG)}bJRNV)3hBgu53c|Tr
z-X<<;loot$r%Dm~IPElQltx^yR5@mr9?I>Id|st;X8c-3-N8*#j>T%?1<w$29BRaj
zLMw5TSYg>uylNCHX11Wb=W1f5%rB*wjX}9*it#iC<-RGyX{WZrs*ic+sC+cG{F>R0
zW3^fh_fDUpVZJ$lm+DkaAAV9I?w>rg)|1nuw;${E&2)Y8<A3o0A?)!N-R$vC$C+pI
z6&-8g4&*d6X%IF9HX10C4}s%YZ`5koAh_D3YTiKLIW51bI}C?FNO;Et9%&*z5ZHeB
zKq!@0=WX4O0e2FvwKx^@E9Hx|bPo!jr^+-GSgq(#pxMQHS-@o%N!9M|k``!`OY-hk
zJuw}<rYDAU{MMQ$YfNo4%V-?5whP2XyWEAp+o>WO3G)Yu=OaNt?ID%tW8s@aq%n28
zM+c0)gEjc4gE+x+P3HIj$ico&dSTQ~PQ=Y_6MjrLBGO5joMjy?;DVP{=jeI4CW~gf
zW;D?=-E<d>W3Br|_k@OLh}bi~1<CNe8-pxrBHr4@=nlWF&BQ0Y>JIn9;-^t6HTBAp
Ozaf>Uu51R3$^QW_U%U1I

diff --git a/code/src/Shared/Win.Abp.Snowflakes/obj/Debug/netcoreapp5/Win.Abp.Snowflakes.csproj.AssemblyReference.cache b/code/src/Shared/Win.Abp.Snowflakes/obj/Debug/netcoreapp5/Win.Abp.Snowflakes.csproj.AssemblyReference.cache
index 507cad31c384c32cebb59002f0997b74a95ed6b2..a5d377865ee6beaac0f9144056b7e3fd02c1086f 100644
GIT binary patch
delta 6996
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

delta 6999
zcmZu#d017|7I!}x@4Z|G5dkkUNKYIPP#oi>$tVyqq@bdJ6HbVPCMqOiW{Co_#4TxM
z<vhbKk3%N(${zXU^ktG+YNa2aPg3jIX!`a(_v~}_Irh)}?pf=%erxTu*IIj@bMT1M
z!6QySPU!tEUAmyTu_JTGm(F~lG&eeW=&->Xd`>vZf118ri|qg4eqm3j{Kr)DU8uJ$
zYIi{hg+Pfz2$;K$R1mGHJ)y<yODejS>5Y6L+%ex_r}ruwY;attL;Jx%M+^7{M8IfQ
zE1Yn&kXom)Mr#k3=N)EuskK4iAREPb!)6z~Pd{RIU1zj9XPW9TGwxj*M45{<pQOe7
zo)LN8+8tWmCOc#YY_&m<wM;|P_4vU7H*a#&`i{}+l*bHn@X^akGNK^Lr8fk4Ss~BU
z5FE64SjlzIO-6!)-O?T0{C>B=y->C+E8Oem0FmAXYx1u5D@Mz?JuFb<lj#tBF(iO4
zuOD>!#Os45^LlL2TbUuqzZ=B)HR*t6669a|cfih`*Y!ZzytAhp@eO#>XwVtx4`-ty
z;C!e9-0N+E@<0ou2RXVTT3cOi%&%tqZWFW#dTP=cxc^B?D_jiDc1Rex#|Ggc^Ys?c
z8E7RJL+XuIwV_iS)}CI(QaamUQ5)(-8lI{$TEv8T)6jikL7yQGgSLETud)2T-Y{;E
zek05zCalq5UElAZ-b;Ny3%S{E!4ohGREN7!KUP>D?FXmAd%@KK`Z6;!)9Ubz22)6m
z*rj(tY>}l#(DA5qdJr6s@`m&<Uvhm=kr7-L{gxg~#tfNf1ho%cVlJJxS1Imj@EjHm
zHNy-Uf%c(+#B2Byh1Ndeu)zZvxr}?5I;t0>$6y6;C+0uOKPJEYubrwq2;O-{Qgw$^
zc`t|@y<L_2z}?Y1l&8jL&kFLYF`zv8$9|yv`#QG8{*P>ntL6bkCTvsGmlBBb?|xwn
zv?VT3o?25ANL5k<H(<)RR3A8#><XUA(^XI=Ig>nG4^sA+w5C>yimJ3K)hdCE8yBl7
zW8q5r97P%YNi3<(h!&O3S==8}HfIggl<{zVq6z*Q?+#BDxr56jZ~ET^3&)Sp*kD|q
zh5R*sw9#n5L|1q{d#)Y`R7whRhUmd73?SPi6FE6)s2*g3Ww~a^%;jB6V`Z+Hlmtu}
zW(4n^ny0anad`q;CLAd6fIInOY<08T$$^4+jU^Kv&v1vF>7^PAP>?J=TF@6C-h^tP
zW5yaqeZMfXo@y`66!4^OR<1_)nSto`922q48KD6(VgKBh450mUy>QtE)C}?SS8JXi
zxM-RlNUjuxYfSO5tk?{>#UiMz*bR<#?F*3;YQU}81=#bog#{{UJghC@Pb{^smRQKB
z7eYkReWjBHuW5@mD^F4Nage{n0R}IgrRm9y#cIm!fJ#jXVP(91xN+3d96^6!sYq_F
zFvE|_T;cRGam&`%SeTToU#^xDBQsaLC=gK)xm2Nx#9U#4{1sv}j45wLcQUq8Eh9UV
z8O&Ag@cl}DzhH@BU@9d?s-EV_;b5257RY#6XeI_GE~`h1!0J~Fu1Ve+wRt$xv9&$G
z^x9J0Lfqi^S|9S`YieV2@apP$dLW5kXGn<|ifhgA)q0_M$oiTzF)o(mh&q0&v9HvF
z{8A_6j_(;$&Tnu5>qZmU=1A}emMZ~7)u%w)Mxji|{04QLuz0`U^nw;Ec>_PgL%3fU
z3+;`b5Z#z70NNXc;TH?Nwpn4;mc<$Xa<<sWsI7xU76$tB4HH~=qeusorR2>w4UFQ7
zbGBH)uYZ`@Bsp8$;NaT@3eARn3Gi@-1;XDo!<Sdwq4J#xf`hx;-Kl1u0UNPh8P~v)
zc6a+nI=$HL%-&_E1-{w&whm)~OS{BIUa@<>s?UJby;i8*Q>aL&kNQJalDbzds15u0
zS*Yj^?H|LFwP9ZdSPxlX$WnKhc2HPL^PyxBv+Xd?fSm)j9d;m-o5D0q0-S9Yx{j<P
zaiX&4`^&Td$v5vOiOPkNusY&@G*VQy9qSHzj|uxo@{XsAfIm(Mag)s-gmPu;$)l>z
zByj!E12%_+${YLEPcBe*szlMYo=k$Y7HzI15yw`wd6?4eV^^sANNegOGWy@@m|%d9
zKUO9e3I0UA^K3ZH?-Mj<q~g;7Jg$s$iLk%T3SHZ#C=oPuB!b6T2XeSgEn@~6c&5Mr
zxOPTOIRj*U&euR0h{xF&&BboblEk0a`967pw-2*=>7rUGj56j6FR*>VrwI#;O32MG
z)EU4)g<lGR5%0@7`gQGmvzYa|c6a!2e>2oApu^${?=(izc7<O^<S@QgFC<YnlHl=G
ze$i%1@{LXzeT`3Jro4AeU3SzBesN}s{@<zDjJll+5jUNn`FmbzO&zj?%=tk*H5thF
zmIt)la>U^#<PNU4lx+oyCWmh&^7Jy~pB*Mh?@%TcY3f+6DS3x8ACK-hL%<zplKx+{
zq@r$T!qq!sAQVJ4cB)g7Wyg9qTiZdHmU9FO@A1){aV`#Q_ZO-9II#ZD1=8<3laBjp
z@7O^uFz07JO`AFxkl)hTwB7x{0~{ZSvwHUfzR?)@qBtCALMC|hs~5!ns%!{;)&-@J
zN5Arml7Kt=yC>}WT`5T!2UJAL|KJ-WV84CX9fBSzb!O-M_F;;WLjhO*Nc0Qkk6g*<
z$NiqbHT;N74WA;ViDf<}l4=m*dDlqsS6z`CKD`RL<3U}~^Y%Q-HWJnFGhM(BbfVP|
zIMNX>cSQLjoGL~=5esf{M&)*tM3dEE1c(cgu9#3?9U#?$l$~V}#Y-kP#7{_jL=<4g
zTdhbraAg#xC=(NUNfqvhH;amQ#VwxH$m%IZA1@vC)KRD4$KI$1p3+SXU}XTZ3#H-S
zx`oP8Pu$*}FBEgAEVRI^oMv1+61m{15%h=hdg6^e5MMbhtq+tm%68xS(de&cAqk)L
zQ`bd7DY(%e@fwkl^w}ci_e5d^q~M?c6oMbxkaDe(C{z-XDg!+5=0K5aG7fzf9l;Tq
zG(O(|y6)k@s6YuycD=ke4eIA$q@1j5g=zSu-pE;cF9h+)!cv@q^FxsnjtND|5n)dT
z6G{(45pQcdG_nsZy~=;88^Km3Q6ayQ*ijLY$cj&gA?3BmPRNDs(C4U@T_0T4PhFQB
zjf}GmK(6)@pWYuS9j?(xR4rCj3YLwIhX0L6DwIdKx}Ph>EKxgSkUsM6M|jWx&P5^R
z25Vne-eBZ~_YOic#oedEW|8uvRj3<Y6pfPXLa8+xmGIrXkb>gz$>DU*Mh&CeQ!^9^
z?|9ffhPFIas13m3{GFYi#0=yk9UOu91qXAGH=gh`;s+{4N)(xCbnJ~!{fn0<yU@vW
zOy&k<4b3=v6jI&?1=^U=JV%-Zm8n_nh3ON$M_<WyU#|aRY9~1`25qzFLbI=nLmtwJ
zSd?H4&>2_8)67qf=Y`8{TxEr1OVEm!uiP1*Pec~HFOd&W&4wwUv_ZmmooLcOO+?*s
z!dSIYG=ks8B7V*&S#gziB%?k;c-n0&7JH|n?$WJP)L+mi<NP!+0Lg0{;wK0FP8^GK
z$J4GT&Y(X#{ORm&O-IW4j8|r%42f#gtBeYF%tA|)I-(#@+;KYPJ|f%0qJ|^vy%=Ac
zfcPgGg~kn^&qj`TS2oWnGf0<(((D{HpEB!r6Gc#xv}qDjZy1cuoQqZ|)lNy0q_1<4
z@MSs{UoWI}JuHt-iB(gPa!J5w7J5#iLiIJ0G0Diu(<uD&e5Bl^WF%%nslGt%1354X
z_rSfTBjxhPkXh{6P5Ny*8Z0J8MuxLE*3U#riX;lh29WYS!p?NBkTQKX`)`;$<{<|>
zaW3yv87@&FAB;RYGfpd_KDW$Qha>fwCQ%_j!ZqZAg|x=6EfANThPlvD+Ea{#?`p9)
zs01lrWtjIg+`k05N_R`tV}ui%@Vru_+{zj9Imv$!Qm@=B>1!9O6OC?P99~~W52TzI
zk@`NMfZXs8OVo96<SwO)8K!(G51uuf6uwNqTYHxCh^63iv{KCc?Fx0EQ&l3n9OA?k
zh~Eww`JXG)vxq|Cq+ONzBD7WU5iEClTa`Lsn03=CUL<m83trau)i0}gOUcIc(FdP-
z1#J};cW4c-8yV8RhSo;utNIuy#u0bEhJ?39Y2R9PpvhYzW1d;Z`#>h67?bqVI{miD
zz``1}aal?OYSlANBimhvgwGF{Vw~~bI^-_VZ*1yo3`@eDdY)z3Yb~Hn!UBsnqAcZ+
xjXReHRHJHR@Z|<HLwRgXjgiVXiPac`?_e}lQ{(E*s8KMU*{Cx%y^ccB{{fQ);mrU5

diff --git a/code/src/Shared/Win.Abp.Snowflakes/obj/Debug/netcoreapp5/Win.Abp.Snowflakes.csproj.CoreCompileInputs.cache b/code/src/Shared/Win.Abp.Snowflakes/obj/Debug/netcoreapp5/Win.Abp.Snowflakes.csproj.CoreCompileInputs.cache
index 5d6b3243..5fd21b10 100644
--- a/code/src/Shared/Win.Abp.Snowflakes/obj/Debug/netcoreapp5/Win.Abp.Snowflakes.csproj.CoreCompileInputs.cache
+++ b/code/src/Shared/Win.Abp.Snowflakes/obj/Debug/netcoreapp5/Win.Abp.Snowflakes.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-f07d2ca3dd6442e8b55ef6ad5afa72e0a111088e
+45e6072ab5eb696ef5d62c419debca5b1894b3a0
diff --git a/code/src/Shared/Win.Abp.Snowflakes/obj/Debug/netcoreapp5/Win.Abp.Snowflakes.csproj.FileListAbsolute.txt b/code/src/Shared/Win.Abp.Snowflakes/obj/Debug/netcoreapp5/Win.Abp.Snowflakes.csproj.FileListAbsolute.txt
index 3494d13c..a9f4ca0b 100644
--- a/code/src/Shared/Win.Abp.Snowflakes/obj/Debug/netcoreapp5/Win.Abp.Snowflakes.csproj.FileListAbsolute.txt
+++ b/code/src/Shared/Win.Abp.Snowflakes/obj/Debug/netcoreapp5/Win.Abp.Snowflakes.csproj.FileListAbsolute.txt
@@ -58,3 +58,15 @@ D:\长春项目\北京北汽结算项目\NewBJSettleAccount\BeiJinSettleAccount\
 D:\长春项目\北京北汽结算项目\NewBJSettleAccount\BeiJinSettleAccount\code\src\Shared\Win.Abp.Snowflakes\obj\Debug\netcoreapp5\refint\Win.Abp.Snowflakes.dll
 D:\长春项目\北京北汽结算项目\NewBJSettleAccount\BeiJinSettleAccount\code\src\Shared\Win.Abp.Snowflakes\obj\Debug\netcoreapp5\Win.Abp.Snowflakes.pdb
 D:\长春项目\北京北汽结算项目\NewBJSettleAccount\BeiJinSettleAccount\code\src\Shared\Win.Abp.Snowflakes\obj\Debug\netcoreapp5\ref\Win.Abp.Snowflakes.dll
+D:\CODE\BeiJinSettleAccount\code\src\Shared\Win.Abp.Snowflakes\bin\Debug\netcoreapp5\Win.Abp.Snowflakes.deps.json
+D:\CODE\BeiJinSettleAccount\code\src\Shared\Win.Abp.Snowflakes\bin\Debug\netcoreapp5\Win.Abp.Snowflakes.dll
+D:\CODE\BeiJinSettleAccount\code\src\Shared\Win.Abp.Snowflakes\bin\Debug\netcoreapp5\Win.Abp.Snowflakes.pdb
+D:\CODE\BeiJinSettleAccount\code\src\Shared\Win.Abp.Snowflakes\obj\Debug\netcoreapp5\Win.Abp.Snowflakes.csproj.AssemblyReference.cache
+D:\CODE\BeiJinSettleAccount\code\src\Shared\Win.Abp.Snowflakes\obj\Debug\netcoreapp5\Win.Abp.Snowflakes.GeneratedMSBuildEditorConfig.editorconfig
+D:\CODE\BeiJinSettleAccount\code\src\Shared\Win.Abp.Snowflakes\obj\Debug\netcoreapp5\Win.Abp.Snowflakes.AssemblyInfoInputs.cache
+D:\CODE\BeiJinSettleAccount\code\src\Shared\Win.Abp.Snowflakes\obj\Debug\netcoreapp5\Win.Abp.Snowflakes.AssemblyInfo.cs
+D:\CODE\BeiJinSettleAccount\code\src\Shared\Win.Abp.Snowflakes\obj\Debug\netcoreapp5\Win.Abp.Snowflakes.csproj.CoreCompileInputs.cache
+D:\CODE\BeiJinSettleAccount\code\src\Shared\Win.Abp.Snowflakes\obj\Debug\netcoreapp5\Win.Abp.Snowflakes.dll
+D:\CODE\BeiJinSettleAccount\code\src\Shared\Win.Abp.Snowflakes\obj\Debug\netcoreapp5\refint\Win.Abp.Snowflakes.dll
+D:\CODE\BeiJinSettleAccount\code\src\Shared\Win.Abp.Snowflakes\obj\Debug\netcoreapp5\Win.Abp.Snowflakes.pdb
+D:\CODE\BeiJinSettleAccount\code\src\Shared\Win.Abp.Snowflakes\obj\Debug\netcoreapp5\ref\Win.Abp.Snowflakes.dll
diff --git a/code/src/Shared/Win.Abp.Snowflakes/obj/Debug/netcoreapp5/Win.Abp.Snowflakes.dll b/code/src/Shared/Win.Abp.Snowflakes/obj/Debug/netcoreapp5/Win.Abp.Snowflakes.dll
index c9d08db5e563c6331dcd106268298e27a2fcdffb..a5c3a589b2710907d9701992ff0b561eccaf25ea 100644
GIT binary patch
delta 239
zcmZp0Xt0^kq12LnXgvcIJYY~#;AS*nU=RZeut5YLnND04#@IiZk+GiZg(y%=0f@yW
zcQI-+N=)9ysLm)e`5vPZ<KfMWOyxoXXATSA%Y0VmI`^gRwu=YSJvMiU@G$W%U2*UQ
z1EX&M6Hsf*<b`7LtQn>Z3>lM;iYZHPthTUKS?un%ext*ku1<GXMxYuOs~Bg07uU(=
z;yHRydA0XYd5~FRzty@=l>N+MJC!229cU5^Tr{10QCy1g@Z>k*VVn7+elasWG2JXE
K_nvX00XqOzYfG{K

delta 299
zcmZp$X>gd(p%iQP>jDE5JYY~#;AS*nV2}U`ut5aH%qFf1V>~>Wk+GgjMhqyX0K^iL
zyBM_@r6zA<RA-c%e2-Cy@%v^*rg9+xFaD*>`L<5JjW6<ymgPjtZtf7_Vd6b!8hM3*
z(KmnzsCCEWg<|rob4(c+=1e{+rtJUWp19vUw=A#K%bs0xeOMC52vp-@74vfH{%13m
zzFfHT`RsKuPkW|6*|i2pKHIqW`R>Wj*G-2?_@$ORc?GAIl;os3CMV~Y=9Nrl7SAz)
zni&N%6KH?Pm2NeA$y@HzqY4i`d=0c623XC2EQN`RVvOG>?+_2$tRQoSaWkL9FJ>kQ
Ov(17s?-?f=umb=T)@lL(

diff --git a/code/src/Shared/Win.Abp.Snowflakes/obj/Debug/netcoreapp5/Win.Abp.Snowflakes.pdb b/code/src/Shared/Win.Abp.Snowflakes/obj/Debug/netcoreapp5/Win.Abp.Snowflakes.pdb
index 0567182885e10cac81cb046eb8f3a68134dd646c..512da4b1aed8512941e9ca98708112fea9a11c73 100644
GIT binary patch
delta 751
zcmZ9~Ye<t(7zgm@oV|O!E%8!nI&tVy(cS0f?DA$#Q@eTTgQZf<Da{BhjZi||JMFeY
zlsCE%#UMqgG-Q=Y7#1XzcCpMLwIr}CgA@X3Vf7>h*@xf%|KXhHa6UXuw!z&^`(&kR
zfS9zs6(s=Bb;z_vekpVPwXW1L=kd&p*7mzo%}w^YN+3`N6z*X^!}cWv!U%;t?48*6
zu}84ODS<>v@g=}p=M)rNs10?Z8|aZ@;qXr|FsfkS9r}o7&>Z@K#7YJvC>VuHF%F|v
z)PruT7zk1`umKgjuaL(iw_3^Kn_kEp#Q_7kG!Dd|WXvFfEwmnU6YT>Q`V|uk*+*Hp
zshq$(uL2PZKUFeJvpN;CUm-jYwTKyWPI`vW%9N`l#f0&RjE+^Nre|%Hotzd13`O5O
z@_}vLZSzqv&wH)Q@^8J(m5fIyj4yXQ5!Q;MwM+gPvAbl)*qYij(W?U|D)I)0!~?bu
z<xQ3D&+>xi<=HRJI19dpWeeltQ1zmzSy`>kyJ6CY?@mwP{G6NR(#~DJQ`J>|U(7Ru
zZ&n9z5@AdnwrGY=k$K{igI@39y60)+?DhGTy+!4hC$*<ShFX|_hgTi(+l3WuhA!am
z?|3`kz&rWVvbd^Mck%^Sc;VCO!u?6@Tw`PXk#!d;W`e6zhWl)xF5w~@6ZrqwoG{GB
zl2PG18)-DEG)lcnr`H)$RHj6$-fGpBYOG~tmJ+SSXehO4blT*yB#qu=&|0)*CW~I9
zF&QoH9IufC-$c@(BOM&+C~~WHVMHpW_D>A&5%C`4h$lxkQb!SWyr=bc+Atzm^;!PG
rgd+zD?@#!%#K8$YdSld5Y7QZRxCX@D<wJm@-Vs1(&F{S^@$-RS3ER`L

delta 818
zcmZY7Ye<t(7zglk&fd)#W@L&hwpbbpvu)0IZZj#opqAmfSb<{YZg!hn>S`*LZW?~k
zQeM>MHBF_kdBH4FEUjP_CPZOD7gS8MH0(l_QuJg&WCwo#|A)hQI0w$)!O}ye$Ap)p
z2>C}D&02)e>?>b&UF?zg)|QFkm{H6Aq0po!Wu^IfEeNA)h@fxK?wFuxj8P(VF?0<y
zAsG1(f|8(((7zTz&o>Y>2ByF)m;)Z-#mzrKA%U1e>p>6*0bw8l!~r$f15)@9E-(oe
zz;_9Sc1tN#4C=aC@k6|$N6dklZh#8{5rxV~AYvmk6^&Tv94UY-A^nJhxZ;t;>?a)b
zRXhUuQi50<6e$%#o{>gCa>dL&R#TYARQat5NApy}jmhdZ-s|GZ@t!M?6P<mNz071=
z<?jtIwZR${pJ=dHjD|>^&V1ZtVKS)0vK1+qS}EGJb8oW7l6^A2NZ8r+@x;yf@(XIe
z)PeAU?b>ix?1z$eciyQr_0K$cjcyE=?U%RY)Keklx~zL3NQe{N%{j{#{Ae28WtbgI
zt*Gg1Rz+#=^ak>_CYsFFG^6IIVXHpQU@~NCEaps!F6-Y(Hj!|Cj-T~e$P~--K20~B
z=c={1d%Phlx2j=GFs^r8?ev8~Of%bi$<1vR;r*&1YgoeOcb>gN3EBH@zgM_s(kDbw
z&f1IKo@L5bHuHuZBlr6IUR$4Sz~-_&7GAH;FwrGNj{3Od!s*ii-mM+0$J=8oFlS>>
z_aoNZ2<8CCf7O2n?FxqB1mG7;4@aO3l?00wk`P)JqLRquL5fhBo(|Egf@Mlwnog$(
zPSa`i3MH+g6~VGJO_+w(8?-WcXxDPLVbQX5?6hEKK6ci2&B%C|zn0|BQg$xO&c${W
uF3KTxBe5@#0tYGl!mOjWczWYVoQrKf*w%>c+ZZdYVEK?3ri13gul@<1lnFur

diff --git a/code/src/Shared/Win.Abp.Snowflakes/obj/Debug/netcoreapp5/ref/Win.Abp.Snowflakes.dll b/code/src/Shared/Win.Abp.Snowflakes/obj/Debug/netcoreapp5/ref/Win.Abp.Snowflakes.dll
index 942af20cbd6b34fe3130ce9c360135ea7f80ccce..0c32d7d3380799fe788d42740ee3d75ade9ef221 100644
GIT binary patch
delta 10
Rcmeyb-Jmm}Y-4GcC;%I=1fl={

delta 10
RcmZqB`L8{pY-4$+C;%F{1fu`|

diff --git a/code/src/Shared/Win.Abp.Snowflakes/obj/Debug/netcoreapp5/refint/Win.Abp.Snowflakes.dll b/code/src/Shared/Win.Abp.Snowflakes/obj/Debug/netcoreapp5/refint/Win.Abp.Snowflakes.dll
index 942af20cbd6b34fe3130ce9c360135ea7f80ccce..0c32d7d3380799fe788d42740ee3d75ade9ef221 100644
GIT binary patch
delta 10
Rcmeyb-Jmm}Y-4GcC;%I=1fl={

delta 10
RcmZqB`L8{pY-4$+C;%F{1fu`|

diff --git a/code/src/Shared/Win.Abp.Snowflakes/obj/Release/netcoreapp5/Win.Abp.Snowflakes.GeneratedMSBuildEditorConfig.editorconfig b/code/src/Shared/Win.Abp.Snowflakes/obj/Release/netcoreapp5/Win.Abp.Snowflakes.GeneratedMSBuildEditorConfig.editorconfig
index bcabfb21..a8549a82 100644
--- a/code/src/Shared/Win.Abp.Snowflakes/obj/Release/netcoreapp5/Win.Abp.Snowflakes.GeneratedMSBuildEditorConfig.editorconfig
+++ b/code/src/Shared/Win.Abp.Snowflakes/obj/Release/netcoreapp5/Win.Abp.Snowflakes.GeneratedMSBuildEditorConfig.editorconfig
@@ -3,8 +3,9 @@ build_property.TargetFramework = netcoreapp5
 build_property.TargetPlatformMinVersion = 
 build_property.UsingMicrosoftNETSdkWeb = 
 build_property.ProjectTypeGuids = 
-build_property.PublishSingleFile = 
-build_property.IncludeAllContentForSelfExtract = 
-build_property._SupportedPlatformList = Android,iOS,Linux,macOS,Windows
+build_property.InvariantGlobalization = 
+build_property.PlatformNeutralAssembly = 
+build_property.EnforceExtendedAnalyzerRules = 
+build_property._SupportedPlatformList = Linux,macOS,Windows
 build_property.RootNamespace = 
-build_property.ProjectDir = C:\Users\Administrator\Source\Repos\Win.Sfs.SmartSettlementSystem.PG\src\Shared\Win.Abp.Snowflakes\
+build_property.ProjectDir = D:\CODE\BeiJinSettleAccount\code\src\Shared\Win.Abp.Snowflakes\
diff --git a/code/src/Shared/Win.Abp.Snowflakes/obj/Release/netcoreapp5/Win.Abp.Snowflakes.assets.cache b/code/src/Shared/Win.Abp.Snowflakes/obj/Release/netcoreapp5/Win.Abp.Snowflakes.assets.cache
index cf64310d63469fc887588b9d7c492d4d9c70891d..e83841c2d425d0b925f01aefe68afe0debd44cb3 100644
GIT binary patch
literal 28412
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
Tu}S`jNZpHcFludWLaq8goAlUX

literal 22517
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%0A7lB=4=C_F4
zfFA=GH{d78myvV>eu}c(w?49;t$K1p*)@K4yUF3d4_F-j&yX)8>F|G!vbTEoe}H?>
zWYcB>pK!Ah?p*rDltcdjkT~=YkuM|Z(0_rlE|&<AN|u>{3Eb2zE64ae+U6KPLcWZo
zWBeFpc>|Vca0Kd}*5u821xqe(*{#?oXptlPCGuq?9oer?cBM&P>g6Pnyd+G&1}6UR
zH^|(^uY_l-G7s!7E_4nb5#kH|o7JBWxOKh~tj@a8t@1&1_fYze2@HwcGV1Oe+_KGK
zV18WCn&WB{O~_Ox^9|^ey|tuYqRLF5bh905+lk&9>{KQv%0#AgQ;Zik-CKK112x(!
zv+i_ntxF_5g3&!m@2TDZ5YK|$prdJ-zm|48G5sFTG&quHOsbE`^Yktw3HI2#Oar+!
zH_h;9WE>``Y?MGvqy~DUCeCGC*+r}R43+UxKg(Y@=Uy1hD#-F~Xp$%M+M8}tu`H=M
zd6bg;Lh7sH>?k$3Hd~dNk(WD(pqX9n4AViXOigXf?i}7|P^L(pP$|!`loTI5k9DP=
z*ChNh>oekrj%9k>;2p&&HTqr&@aD6=H*~U8*^E6Rq#oGFEsD4b%snw%pUF7K0ADqf
zT8z`H_eKoa!%<t&XGHiOPF^n(<|6q=WW_4KFk047NNQDwih!v;{oJ8FNZ7M#P_LsU
z5hg4G)poz&z*K|r@uq>0yE*(y@{mbQhQLcWG6deu;U|uJO-dNmH#DQOPI0R5=I~pL
z{n)1RKoj354rOIYg<_;~crh&)CgJ14?7SP6l*P43?Z#wc0L6!a$26e$BrVZx;vrK5
z38Q#GQ-SZ?l#0&xe4K8)D<gbF35RDg&}?KQ!yC|z4RaX7M}waM&d`?$r-{C7Z2&|&
z!cyGZ^uf`=jFPx#(t?B}%YELLsUCaoY_eHKRW(RhX)?FRGFoB~qC8>IxW|JT6$y}N
z8;nZI2WkFs)(4ro$=6sSQTafo^?0(R2+aiCz+FDHjtaG<?y#ImNt)%1iGbUcJ;Ibv
zk)f&LmI>dt13JC9DLPHqGU+wf!k6)lL91<VowDgql!PC%FSM6v^SQ&g!F)L1CUGo>
z7=Mux&_g-uB%8F+9Makr>(LxlO#31^zD~UlEsEsQFGV>vP1jQUk~{`!yNZLNL53Z|
z@!Z0C$H<+T4w3ab^2<G4hlka&r{vgJ9w?^pc2KlC6^ml<$=**%=_U>s6vuzEMaF3g
z1!Z+A@&d$TVtYy;HK@{~aJN`7S&V7&-J1$qSOE2)_8=V-b;24Icg4}pePJaY9>jm+
zp%c+*F^T&2gx5%g2FEfhUCvkjU>w1$7Z~i))Z>Cpf5YD%DN=8I^?DOu;Oc#^VoP10
z_M*O@>(-v>$A2s;%f7DFw>a4+!naL&@X9o6H#zDBW+-NFZ2AOBk7k)(O_B!QeUa_L
zqdebHJ(B6U_&uy^)Gto<8d}!na(t$xpQf&3vUdIPumOZ7rX~opDSaQI&W(~0mqav4
ySeC9s?%$JbKP!|SgNgFYje{D4>4=Nk%6!<RZ&{ezQdb3W1Qv%y&~|4g()m9TN5AI)

diff --git a/code/src/Shared/Win.Abp.Snowflakes/obj/Release/netcoreapp5/Win.Abp.Snowflakes.csproj.AssemblyReference.cache b/code/src/Shared/Win.Abp.Snowflakes/obj/Release/netcoreapp5/Win.Abp.Snowflakes.csproj.AssemblyReference.cache
index f5e894aea93a73e58fa9d4feab241bc197ee1a40..a5d377865ee6beaac0f9144056b7e3fd02c1086f 100644
GIT binary patch
literal 105262
zcmds=3w#yDxxjM}#6smIDq2CnM^*5ggpd$|l!g!y3=m0pX?SeT*(8UYSN7})#7Dtb
z5$h8wT(xRiYw-ov>!nt#wpOHC+uB;S+N!M&s#QzvwG?l!c<=0<ot@d;*>k>}?3dr!
zroUQjW|r@p`Oi1seDlrBk%8SMB_)Biwbji_(z23nu9-J~`Gw8FM5awvn^RJ_Lu!-L
z&1+?~MUkS3bWlnplB%RelZkZml+r1s!Lnd!b1d4@oRHPDDkUP45}88&ulce%J6ofM
z)d)snu|R<Qg(b6guYdCQzdI@r2plUc8F+Uv5lbs+{AhpH|GR<wVc<sNUzFBpOs)=v
zLbcT)UH*_Re<&+|h{_)l${(Wghlu<ktNbCMRJ!~<CFJMStPtNMe>`$P_TLvb)|8bD
z)C3EZZ2ISn@9o(9^souTzV_UvQ|7<+dHJ40mEBwSJp9P0R}M}7&bG(Ky}WPvwnhJY
zXD0RGnE8t@ZQu9Ao|+f_eA#t}XI*o})bSmkY#DU7e0KFGb1wS9p<@p}*cd$Ht`BM^
z-u~dUu1Rel9(VA@1D%(hDt~t0f#W~E;Wur{w?A9_)KjU6Z+-mQ6Tcp~cz$d3&jUvh
znMRE0dG(d5BTfrkBvfYd_@$)7Nk`74?GP-TJiay)Q!|P@Ga+YGMT$)x-;imEMZ@RI
z-A&03IWe=Ww5(JrjZ{S{%d1Mur&N%?hx`PFbWIJG2Fpv!%chqEE)V3vDIN_g$#k++
z4a)0PIiU%W4u+G7)@WNs(cx;YAfFS0wZN=f$LiMdbs1%$M|)PQuWFP{%wH`qD65P4
zPcd?v13>2TD;d(26w#MoS}=;ARG&F;(S5)B>T{1wsNTB&(yRVUd3NE@Ylofq?hS4C
zefrNg?^wNI=HdrWdH339#svQU`Yl7AylL#+3(mT8#{GX7ed6&y``RbZ$ZxFLKj{3M
zUkE>b&e|W&QXZ&&=r1#eKmF6G-{@NO(DxtyNqXk~(JOX6aPIOWuKMvE>fX06k39Oz
zx95I(^Pa(*Pr75%SuZ}Wqqy_2?y582*tI4g=huvJsW%S<N-5GZecJT$swvYW5lOBr
z&32&`%G>)6Wl(BKlR**ATED&!TEl&a;ri!kHygNy@;6hE{|1oVyS-!A(iVLJnb*Uo
zR4cvgE+oWn^Z@aeXd)sjeKNnZ^-nOY?>*%X1M4#Z?Ubzz1bVxNKxZ}Y6Uv<CJ(>;5
z<0TZAX^w$A2MOO>J-|1djK_%+8jB|6J~3RI{Z2jk4g>j~wucRngMhZ;J^`fp+aA))
zHAJ6~=CtssaqjG0Um?N$fCq5PiLR)UOvL4c+9fGbsU=31W_@u(>evUD(hoA+w}171
z1NUiwCKP=O$o(T8axZG5J`DhoUOpWO7Z=!#NJHW-4~B%c7GrD3J`IL*$)~s_r5UP_
z{;=N|24#Tuvwj6Q0Cspd0IV(2C-kkl_!N4z*PVuh`!_tmeQi3KaD%+88KCKW@&RVy
z7o0PAO*TIAWnf((&|5tOTGQDL<1)xX+0@y8KKWW;w;&<wg-4#z!pd@3A>m;+a!VoP
zYT@0+>~|Qz>cLV2V2DS~eFDg_mmWFS5N<e^LU87^@Tp0Lc;uXxNN`_WkUfsbDVan_
z65;M>Vy&!)0<BmRe_V|79JA&;T9bi%-OD!^PR1F+Aup&5MELqXnPP#uR(OfJVrT^t
z`xMs>XpbO)y2C3_Eiqdwwfxo{R9#C1nxUN9w9!DhqM$DUxqirNt}U%&g`8_0IPCuh
zaqaa5bs*9(C~N~qTMng^WLK0#waM-^x9`%+0iZ308q5zlI#=JTo^aEx2Kr)5+`j>Y
zzHb{i?rqUa+}-u?sfibF;JB-ag!tBiEWNc`Q|;a9XjqE%3GW8uBh0FQedVJD+LMGv
z!P-`|J`n5M`((?-`u7QGD!)&0PV}OSkWelx+M#u2x;w4P@wQm9h3v?+6@YQ0{(-s1
z2N=RX|H~By!s2L$hOo6R5Z}H<JDfTffUZ?;pJFSHb~w8Q3E9H7&)bt}m2e7jEnGr$
z=NX?6I~B^4uNv5jx6ehjf#CLS`&^{C8@eumI+5%?g;%_NE>aK)-*tr~-Nll`Rft|J
z$hmWkW7Kn1m~mZM|MGx~^;EkF!pVoP1*CI>W*Gs=opCcGknIEodBv<yx<)K`5q%0_
zByZaz!FO{(o-5x;ISeQaMX~i9{mW+zF2xaIOQ-Xn0780epIleh1}FqsUV5MMD~=4i
z_7M`ynZhh-TU!o))n)3hPwKUp9Sx8Aim{_{lFL}uD*)-dtZyb%|EsJhvQU`Il+J79
zzYVw5xf&e_x5E6+m_d$Icu0$OmBVo8!7R3168oK^+CVJ(=68xTcZ1Yrb3!D$Pfe!S
z?-VJBgm1hMYne<5lIUIM`9;~%%t~%P;cjD1B({=91t5-@zF0{^6DxqOJ|?fpzl(J=
zbV9=Go`O6}qgSklirDg?mr*6!YnEe1qFk{@Zup_W<y7HBlIKG}UU&A%=giYIR*>0r
z?_x>wXyj9)x~`DkLmB`V7h+#iN;Do-qh0m{;c!xsrBtfiElHultjCP)ZJ*s@Kz*{X
zSy&w)zgP5$U#6NBRi>JF^Noq=Qz%>Vv_2AlavuH?Q8gKq(%p%$yk4`nDlxO}_I06F
zx<)Hqw?0VhsaBeyc1!&Ak&nKj9oQT#D(K*goUsv{3XTKkbCKj$rg-xw5=fI=7oa3?
zzUcP_bV(vZKB@m$&o3r>*9}P}5={ugdYnehHi=mk)*(N=^9`dzPH-&^?3Hze^$L>;
z+%>EU*FO!e@_X1xQg1p*mC_wKaw0AAHfd#9x3F<C%2^E9AJIbkLzfxY5vI(>2$|;;
z)x)NbLYh9DjK#7^d!#Yt&Wzklt}h5q6<uJU3tP*TpQDv$UGS~e1IrG*q?xMY#6`0g
z9gvYs?gTJ@oL3lh_NE&g@`rT!MMucRLU99Pfw%<g68+PV<JWE`YbB&hBGGgzna-YN
zA{R%95B=++&S524H;g;yg43UUS?h)o_Cf*eVg~z<vjgPbbO0x9NSD^N>21;)V_>db
zNY>o?=laszu{_P4-B=Hjvyq*_NOwYtN5f>kR<tot7ObFSz;L6c1k0MUo613Q2(mLc
z$EZ+CDzMi7*;{*+k@~LB7`MXuFwk0^Uaz3{0QvWT<t7gm*b8n-kbyvypuNGA2)W6n
zE77Cjk>`}|%!d}8f7x+EN0h&L+x#h+f3#j)w|w;MZBIYGqPpksgqb@({$Rnu`=f6k
zAAaczJHK=9r&}5>|55Pr%1Q6toS3-p)Ty;!_;5$$uX{iJboR7egJzz->46#7TzA)^
zS)blJ@bT3Lq_=*x^P}zG-~7$x!~Xk^9l!h2x<Af;anQaOpLn<XnNbhi{^yT=dd`Sw
z-FE!~h2eugn)Bw`XQu=%a?^)_q_+eFq|(;XX>xe#)QDUug{#V^XpLdN%VSv{sJfCd
z;{COxvLtDjfCz8xSgIAPA;qlxT(@o5+U+_&M_Wn+c$=9OOXTRS20~*IGNcPhN#XpV
zkVOQ}QqHmbf;F`MAxJ~J8OT+68kdYv<DL|9JB`M4kgVN;iri}W*V>=RZ>({%+QxQC
zNwG0{;$LrS$sY0<!4?qNLJm(s8=KmXb!@f*o7q)d!(kxeYS-*ogJYbyJ=$NLXEYA}
z&A*oI-SyhXcL%S!fB3G$NB`yh!)rgfant`E(G|P0{?;wy{&U8Ax4riA>rcIL+l!UQ
zOc-#}Q01Ke*?7x_y>G1>apS(h>lU5){*+-`J{a`TyYEl<$vuC2|L>9J`Y&#M>VaF&
zSlKf9etGiPf4wqOU70+4|KGp1>Y?F#x6M5Lq-#gj%45dIf3kJzf(u{Vs*lF+&sx1<
z<jX^<1C90;WpEHJwg2S5QKzM}ytSfrT5DNZq@q+Rm$XK(kHU5gP?kp187VefBI$y*
zVR`o8*9~M&WD44g2Zm%NEjiNoUoku>OnB@vfsJ}`VYJG<l^IZF8c&s85f#QJ$~-?i
zcia{OrelR_nj9GzWf%0?5U@B19sR|TCU}n~i?1xv3SryY=qYY{v@Dt^pAxi%>2#y=
z-E%fN?UB7Wa56)+M|PQfYL8YjnCu!cqCB18R(ofT3<tR;m2!j^8Al@>rGWUfd2fas
zqWF}WCWj(OurzxP%j`^Rt9CxfoV1qI-D+5zVTM*l5g;ZJG)#C=A=A|PU*G%u`lj2b
z?)kxqGscv>J>&D;k9;(}L>+i+<&Jlre{I9+fiDcdx^v0BTW+}j%nuKbeBtq(Gj<I7
ze8&@aPmHa-e%g@w-yU&j^m!eLA5C0w_4lggj!PWu{Kb~<O6QdP@L%#PC;jSA&+q>v
zT>4zk$u(Clx$8@RJM|Z59>4FkW8S%^ro4LWpx2&!aZ=Uuy2Jd7OOE-!U!MKO1%V5!
ztyusd;qbJUvhvo}aAZm(5~(QDW@@{;+~GMOd?1jRm2gH;$SpjK7iL+;8XAgg0P#tq
z;UgByrxs^T&bBT9F34Ie-(9(J_@Z4P{=9fRqiWGm5nCtassKa_dS$Mw8qURhE~$J<
z*6Lh3A%TT!wH785bLE7rkj1_^%dyaq$ZD|~K(zYDYB8~V%9hA#F{O~;%C|Y-I^3P1
zM#0c%Ov&M>c92AlFuK^ne_ZY=K)j$^1g@%pESFuC9?iY*RVYBp-P%ZitwHs<Oq0bN
ztx--jfgrW_i+APEIMNblt0DoDFQLVC80WA^@l-NF{PG3Kh#U(FA0A-*OfWTds|Caf
zn%Ls1P!7A~CYn#DzDV9SM}jSlV4W;|Ge=S-A#lHX_!c9QaGF?oTTRE-rxpR#|7!_{
zUxH}E@+t<I6L)`h(|ZFpv~3!<uKLC|H&;D7_N4)P<j2O3U9;jV+xBje$6fQSr)G^l
z_QTz?9voS=Yv^ywpE<B*LfhHf$9zzB@2)3~?in09?bXZnB%d38c*PAb{l4Pe`svrz
z)ee6Dof%i1K6>V^=MHYWGP(WPLvtJUZ*PvgJ?5^uH~-Ob)}&E$cRnpoI{5TagI3<B
z#~sRkT(xv(<-&?UJE-j$eBiC!^0JoJ@~VnTDN<fJRW294hk*`XT^BKWWFt?G=$Vzw
z1*@EKS8n)hHGvkd-{7-}=Toca0-sGe2A`*q^#r!%%e`SUUOezvB_MKL{blc%WIm-W
zoUg@^K<mT?t*JXDlh|vQtf;cWY}_>mIt?3lidb_?Js@t~{e_!FIG+;N3TSsE=sZkg
z5Gx^AcpfV(2?PrvjX@}mPf=PfR0av276gmMy<x^o6kBwTHud8Q0$u*Kh&G9n#;4>g
z6SXV@2kg*8wt&3ffF|==Iw{`tp&QUf5ulyH+koapg)9V%E7gu}KpR>xKs<H2S0Gpx
zKJWfF@yiXLXQ+w2A_MJ+glI<$AxDsy1^pRl{6SxkKYDTV(i5isX>(v9CpYT^_$Zw=
zO{xf2RF+LIpDLGDP0#)v))RByN2Ik-4M~-a$N5JTKELw{qc3Pgnkxnzt#}b>P8OdU
zb{di9G-1GaI%>V&fYoKz{?RC_qWc2aIHnu0;u^w{tub%Sk;U796^o@4m4B?$4Nvh$
zSZ8`V`n@;7y7=aL;J(man+eu_FYG91^cK$qn?mOA7HWdEDoCB+eXh)$sMMCw?#m3P
z_2c8(bF5t69y7)?S4LO?XqNGEWrR}s)Iif*8KF)LEKf~!tLF|DFZ~?3CDW$&hMs=T
ztTa94=qL;XiY&8wd8MW8;Fs%Gp+h2{!bHzEI`lyT$@{3KMRL<xH6}Akm`mzAWAuO6
zqL#Vp0rA3%TILcCOj>cJBGag4F4YQv4w9doLbYD!5*xFWWV1(;iFt|EB(q~I-EX3?
z`r>uBRRbcozF#bwO*Sxb#T9!nZkG?{X!Qbsg9NNRJU=QRhdhfCmeZUU#<rbLbT1AB
z4B@<%yG%X>Yo)tJNI)ShmCdO#9c)yka7Pny?YRk)Ibr5fSy%&z72;A^D3(vjGMDZ`
zrI6rSk2*azksHUBDN(YAtP@rrCC`nJym&TEvJK_41mnu3IuN^!y}$adkQIQ7kUoVl
z4(|peB5{|SP03`8n?0GO6D>FO!a&;kXSvD5@6ke%zRHysEjM+2kU;YO7zXc5>ITie
z(quT%V;C+~fKcHb!*G$yr&fy|!*J0G2{2qwUjs~g?8uCQGq^;azEK<qR{wbVybAua
zS0Yc}&<F{rHt(G=MOvppWXrU)g<4OblfI)g5T_(wWWphmPfZlP;ct#ZAtac*Pn@Bm
zn-+-$xoF~yQ3SX(hnG0Ri|RkiLlb8VEf^s1U0c9KXA$qMjd5}1;!Hw~#<_q31LZhs
zYOF<pb|!{rXRPx0)X1z5w=M(7(~ZG=H!!;%!gD=Ucy3aOOJt9^CY>l_jt{#a<`_di
zz8nx8=oQSaLc4AU^1^_*DX#sQrGj=X02;`CjQ6WD?e$snVZ~sr6q6GXiN9coInH!d
z=28WS65guJMJ_N^#kB`RS7k0*6#y7y{{{X=k}cZjYL%?=i*n0YD$L2oNOG$KM6CDE
zB-xa4wN`F|`INDiJnfAHnfJ#Tto>rT*epO!k26>b0&&7S&R~(orwq~K3>ICG!0|py
zZ{8v;O**BJU15@i5S*<f)mT*T34N8%Zib;*dcq1oknpnfgi`5h<j=08S#iQ|6w;A^
zjCb$P`r4$|@-PhJW?BQ*ne?o$YbD?k9Pg~Jt7O1VrDtnhzr#8fzAOfGtoPgPHVrO}
zrnJ6gLzJaA)9rR~4d58X+in+&1?*3{y)FI->rD6(70{X9pINnuZw^hi$e?FdttEk-
zhj(VxDh{yI=owLKWu(sXerZU==FI3Eg*?({P19qJJ6#&OQ~`D$-qO%TF1;W97vZE!
zLl><I0SplF^nPh*m0z^WvS-wzM)EOT8oJd1B8Im#bQ8>{jM1f`n_5Vap?LV56<a2$
z;dVZUin$M*hwrQa#0%BKcS_|`wzw6CQzs;_ypK6pM~3OjIAac$f<Tb)Vh$E*d<qba
zIaqW-0>}Hb0wVQ1a)*MX%8^DjsYq?yYKA4G)3gF-X&^#)X$4M^e993`D{v}=1XI4Z
zKVA3FT*K=`^aXM}sdO(OFRsZE&7N`@n#@E0k`WCNl?MU^eE`%|3D>Z?NGP8owJJwD
zBSDq#^-|aV$OTnHG{u87>DN~pj`(n<pk4+D5A^X;S7CF(!-VzUVs5dmJ&_<mS-mYu
z#H9q8zam)^)Tk=56xRo?9zEZEa@x6i6V?Gjgt~eY3g%NQ#I4?hY9T?E?+sSh!JW$z
znVvP9%)Vfb86Y^&_g7s7%w>Hv0sUup>diJpf<g8?Lr#C+xo$n(t>gS0<~AR1sAVq;
z1SQ@|9H{D0C{$Y=T9PJblS4K0<}bf66ij5=WHpo`$Nh-CONV+7id`U|T9yl4+7}5T
z@0aa*KQu^+6pN9o_f6x%92}Y|U?~X12XEPKk;bR&&}F+t7bI}J-@DSKz91tj-PTvH
zn3qHMuB;`2=-};LS;g@wJ9ID2stgi5-e1Y3i)|Vk=E=}o5w+g~LBYF{%M{Xo-VD7W
zOj7{~ii<q=XR@m%HV1ui-)3XIbhI(cW=jCU2&4HfoS+aiiYq<4!P1rmzyV3j_TEof
zD67HqR5cZxpXM*|?A*G;V1)W9mV!W3@ca~uG~l_WxQL;CibWSBaJ&!RnNka;8ydW$
zWq`Qg1@EXJU{Z=JNuLJqs2T-80?Eqvekn}_c3vvN?t7z4X?s~9G<ZvCyFg%gip$K<
zrL<k00w97+Q8<=nffVId(d@7pZ)vnLKxl9+jVY}EycpinXlfuq;{9&7M)yJ~E-#kJ
zo_9vovh2-?i3MHgZnv{E5FEVSZl_3KdsAGK72WN2DpUYWkZH^NWN=+{SzVV@I<!<&
z?Yyf6D3&islflI`fKcHjgNw!TDOfZ)U91!mTsYHNgXPi~W}o=!Oe+Hf2zNR&g@sIK
z#bt~5=}c1t2@>z4z#8MCOl20*qfuaMNgyzIQDCb$KD9J73T#yd2_ElnXwbx7EO%z)
zH2)L;JC{apXyD5M!NI$sffvT7*w7mqcvXA_O`{ynkefie_4e0uYuMDpLqp3I1vFHc
ze*<W!DoD`a#CIBHr7Iei8<Nq4%D`bubUwbrmj%Lu8{gpt0s~aM@f}{B0w99Kcf5Z^
zOf#2_$#93v&sNOvj50P>xMDzb@Lmz)WC2rCT%Iv~MU2y=0AL`?bDTY^WpYbxEJ~hv
zXC{Y*l=(d?vmg)}+&wE(8Zb7+Wo-C8D^r&Oz=2pA?~fX5uoJ1zlck8P)Fw%4R@fTY
zSsu9B*!HAHja{k$VZu9V>>?K!tKzao^r*3mRs{eCu}nBCF9H~O0AxMqL^H$0JJGZp
z5GCA|7ZnD~PjQ(ge&t0~DF7OXRr3DmumL@Ff$Y;7^MvTpVPORzMtDbug;IfeDlU6O
zj}8lUDgZ2qHNpuZlF>lH66}ZZK}1#(h!SoPk%{9|hWH>NQw9m1<(_8^YUrE9u(0zG
zwi*N8UbO}-UyzFEzkP`XtQ8p$@EfuK*Qg-GdNOfY(Vm%IO1$PIe|IaJq0Cs1tt`-@
zAjW!Z0{PUYn7KSQbr?kOo4EiGA#8q9!A;Y`wk6EXPooUbz94RX^1|l7;n3V{G^(*q
zfsbs!b!pxQ;1;#4B|~~aGQyu!VmH>%0325gIG*tWaGWeY9m+HS$7#ZV@pKe>e<pje
z+)6_ybE4^#cG;0_$;$#M^hPbWIzW{0&Sbj@=2NcdnQS+;kRbE^-DpmMx_DF#&a0oR
zy-R3I#bVRPDTYs#s~!+GymzB>3FlMb=)2LmR6~N!`*)-5O4LW&+SPTk_D{WgY@6Z}
zU6|vl0g=OdH#(n6{#!lKE0=R<h6J4V&+*uGF#TedV@jXnu@wb^h4&nfO&*_`FZvvh
zO&cVDypJC9a<3;Z_i7i+b5~Zd!=5yHEUW;82`_pql**?_(de;ICnT`Ef9H~ueu1n?
z5lNNU6nI6~ZN^3^edkh890(QOJC_2Pe2Nr(=Te{%5>Tj?N|f51(^9btK&bk~QZcD~
zij}}pF`baW^8Qf{ZcsFJr)1INPY><5-LO~mQ4ZHiK)~=G<#3hEr;yP{LR|Gi0&TVD
zdt#ghrk~CtT_YWfK_E(PXgg#!f&I7CYjU(H5-i^DmuV+aGfJ3TZ@O5|H)GDz^h4Jg
z#)$5h*~<dK!P_sh3*=MNL-)(<>L5XcF|{#>vVU5jUxliOXkt^FOC=yym{XgJWIpAK
zO>HiEA%TWzt(K7!K>X7c%rAFZt87^yR{deEIN|*_**UFMRvjdWRPX&G<4tkxtwVCb
zsbU;QNe7oC(o!q;{s0RfoK7eB+*N^yU5e*P<(AK<_A3f&eIx)g{RiOEXgVXsYT2yG
z2>f!sHZbY}5xlJb5#*KgpVeCnY=0yOy}ycPv0*AiafpkaNExm_y^6+J8VDNRRWweK
zd}`k4RWwe8kYGaCA2eV(PfA2AZ?4?A_g;e}bAQlU6o?Vx{-9MJpE6|b4_dWB0%!x;
zlsGRzy!vFybjge{A-vy+1t`jF#yS62fY@ycpwE-}W%VhNYOgy5iB|7VXi`gU?>jTx
z%2uQFgr-XsAcuG-G+pHKDRcCMri)fcfZ;i31TZB^k|oG_1_4`k=ZuvGVukOVF_FMT
z71x<fyK}}ADgY+P$xZJM*wMjIpVSVNi$J0W?5rh$5aAuLvx)--sJISk(gSu@WeR`?
zayk<s;%YdQ3;9zfdVVQ$zs!iMtt=2A#E7d+AfF;+MqF*`AVGu|@FH$~REk9}&SuA-
zt6y14{C#e6V^G-xUT$@Pkl_cs+ywL~boPLkn|eqPCefCdRz<82O0anA1l#JxSqli>
zI`kE!Q#79<7s=b^NU-&n#ba4(dJpN-D2uh`ws@>A5WN1jcuYW_;+NavG4+rjL`cgp
z`~|ClSRUuzC}8ugnU>*J35XqHT85isKIP3!%W%^R2{eS9X`u#Y#DbYP^K^%(0`Md~
zV$QTkDjlx;$Lh@-WzjcSM|yh3z8TF&GP{mBM8m9;Gte4D(7hi`RR3)!Utn!b28gF;
z>b>9Sqj&!XYhzM0E?l_LjXqmZATW3veKvV~I%&|2KASd30D12iGr5)Sl$vZ)q*Qx%
zuqM`)Bnf@(JW;J@TxV<@Q^z=8T_9q3j&VK#eaakljPt371flniu~?DXbV~0aTXd5;
z#;%os*x@<Gu9EqbH|iL>>V*Va+H-$OtU+BOoQzoB*17(z-G;3@&2S8I*90PW37Yqn
zTRfj~*A8lXB>4Jks%3Euk+I7?)v~%k0Q-BYWdiyX!Q4|VQx6HkOZv$IF0Uw^UMnjq
zxh^^^spRmPx!`00sk3vAM*A0lKwgQL&?PpBb~$~@WvW-5fkdbGc{XOBk&%@MM^h3P
z8fAyEX`YR<G>|&HJR7G-J_U^C**FzKg30?Rs42Ss2f0y8-D+c&jjd;C6jWFNh!kEF
zR4A2CsiIL?p-xC(d4C<PDZM#MGM4Cdw6qK`h>mw1EfvJ4#L(+;sTvFtc<3H*XR-H*
zT4a+?d*Cd4KQ6h+of)37_g!i%E@`5cy(|zKyhJU#Kwx-we|FP*12(j68n>?c#y2-t
zJv;WL0ej@f#*baI;w#(sZjr}b^R1_5jXw6n-LoDXS+;BFZ_A%Kux3Kr+1tl_P<HRG
zCywqJ96IgQ%l0In8-94j4KMw^;@$e`*VWYye*c{rSDik3=C0=sZo4wM{n<lv8}@H+
zj=VkQuDUn>(Q($KQFC`bEl)c5^ihLW-WNEkq@<+m$5l&rRxYdv&_pe}It4&fUe?lD
zUR6;kManCu%H<X0uOUByAzd1V<)!6i(@O&0r-~YalWTIxjS!qy&g>0M6}6TG0)&?;
zY83~JPjRM-T9qjP9!RRF_opJ7<n?OMjBVADi@F=6Hhyi#4ujEC5iV7LJ`moi2p740
z$`w5o;i44-%+t+B?=SSW$}c*&%C@UdHWsXIb%2QBUFhv5m`@p_7kay?g#?-R&o){W
z5P015*+xr2AWnGCHd>_dDMQOdV-^V<?_)`p9!P61IO^S??<TUh^=K@~SsI8CUM$He
z5}2dnJhSCgr~sHCXSP;(9yZrSx8|lZhDPw?L@NYDrxk5G&?;_^wp2N_q-5a6l9F$d
zKOQ-N{Db`a;>Mb?l7VCuL;h1-#5CGl6bTe0r+cy7mWfG9-TIV5mTlInwb|CP#p!ld
z0YZfAbUWn&8=>M_%vqdnr&a|323gf1Ol$25xfoK5WY@M!iG&>E!U9X`ZZ#rH=CtN0
z4a5p@T62g5CaSoM6x||eawt>)Ops|U>ix84ioU2zR$@{rB}bT-#G*`JqV`x&9tcz?
z-ee~b3XD{78L3q{+PMIzAQlQCEMWFWla%gA2j`GC09s?obqp*)Siq$Y5H7^9fQw*0
z1<VW!xTu8$nfIqhnbFNcCW=0>>5!ftb*}{k4e#`*yJ%q4ifekLr$^ltD*!ggG>LD~
z8YD%E#rStG*^w$U&}kcCv<?uo{<COQFfeAtHD$V4G^$nskU^$R?~n4>$B7`+Nssc_
ziUN_sJIZ5|$EPIGqdYckkO1;N<A9S}w>^3{=;6+-E3UU?9N5bO5yHzjunXi<hG@ot
zT^%HdFjs_G6&jLBE(bH$ijb8D!qgutLMD_?fpV@0nMz1dp-yelIDh3C<4G{JX+?o3
z^~=;|irz!Q=lSC4#pNUkrZ!C*B!CdMUrcA(^om$IxVim83jv`)+<u{w_|)i_+b>iP
zBv25d<BCKcjR>pyo=bf)%pV}=+`7Xa9e0!lqJtP6cZdXLsJNE@W^~-4PysMOmi?0V
z(Q#gM)9|o4>lhlX<;npwFUdixm|PtSg=(uqOVZ@Zy->}(`O7a11rwPzSq-J6aEF$w
z7m7#2N-~{nRf7px4JQ>jNMiIsMQ#o0xnUvgPvke`UqS+5bae9Hm9kV&m30z4&wAQ4
zsUloaSvI|Vs$5z%U7IECDYD+buD4W*W#pzzD#kq&!vcTwbv;(f?4TpE@{zso>`!0=
z`QL#Xwe4{7U%c1#m?%CS+4OZiric}m@?h!Y@wJ(lno;DL2|1&ZVA<sH4Vji$G<?3?
z-IVN*6Eh(r+IvS-O9DDiRZ~mUXe_FB>m8u?KO=@ZqPC*Ii2=_MwaMdCcBmt2(}n>A
zPI-j@wA}M4L6h5@30PQVh+#p=uTA?xtcd=jn-lUUt9@C6HUUr(d$hkjPu5Rytx^`S
zR%AfHrysyEAMbDIS{6-2lIyq}3<d?gq01-&1OxAeE?!js!9j26GPFPf#QVd7+Vzh0
z(L|@nY|z7kv<wgtyu*T25M9{(jw3ysN2?XmDFCO@`%t+iaQ1y&?&(L}5n!na^l+ZN
zEYK6c3zgdi0=ojmW$kIG+^!CT2<!_$HtbqG_XRY;$<Z+G26cgFFvghE9EE{nJ%Q#Y
zI3xlN`itB&VjTycvjL;u`y(Zq=F8_K!{iBtgetPj^hk-NAaLB{9VxL$<I_P;kCa$+
zVc>W=;@eS1{PG4#ZO@I*iQEXW6$e6;LLK!snS6@UO7~Vq0?PY+4Sg8sK$%mAb6>+O
z1cV1~U&EBdr^wKK4O0&!P`nRZ=@Q3d&Pj{;t2A(BD++`LFK}g($EWDfz?DrKB!F<7
zRU$j}SNTnN7O~)+RZC$YM7YkXMIxVK#5>OxeUL!%J_1Ul*4tiREwjUHGy+O~4P4pa
zML?;D`2!d<;z(++4)ApK(&V`lYI+KD$89n8vyaTWLcoS^MsqGT(egL?ysWfH4Zgy=
z1~)>Dv!yh*x5#d98p{11*z}V3P0tAdwu!}cOVdJ5g#w^}+|0DpJ1F95vJD@La@#=H
z9OyL0;ZgLLKpa+ij{}uJXCePsJfD^?py68p!5a@pBS~{etK>a<N#Twt?i<i*wEa--
s_W|vIyFNi_dtl^8ya$Ic8aW}rqp`U1b{29fFes)3%g8-v-t6oDKl_!F&Hw-a

literal 11
QcmeZu3JP{+WMlvW01Ze1dH?_b

diff --git a/code/src/Shared/Win.Abp.Snowflakes/obj/Release/netcoreapp5/Win.Abp.Snowflakes.csproj.CoreCompileInputs.cache b/code/src/Shared/Win.Abp.Snowflakes/obj/Release/netcoreapp5/Win.Abp.Snowflakes.csproj.CoreCompileInputs.cache
index ef019e4a..601878b8 100644
--- a/code/src/Shared/Win.Abp.Snowflakes/obj/Release/netcoreapp5/Win.Abp.Snowflakes.csproj.CoreCompileInputs.cache
+++ b/code/src/Shared/Win.Abp.Snowflakes/obj/Release/netcoreapp5/Win.Abp.Snowflakes.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-41375255bdfa3a4e775b2622577fc114b4d1fb9a
+dabb1a5d47fc58eca331ebf17c1e39cf211ca0c0
diff --git a/code/src/Shared/Win.Abp.Snowflakes/obj/Release/netcoreapp5/Win.Abp.Snowflakes.csproj.FileListAbsolute.txt b/code/src/Shared/Win.Abp.Snowflakes/obj/Release/netcoreapp5/Win.Abp.Snowflakes.csproj.FileListAbsolute.txt
index 49ef6f30..d34a14aa 100644
--- a/code/src/Shared/Win.Abp.Snowflakes/obj/Release/netcoreapp5/Win.Abp.Snowflakes.csproj.FileListAbsolute.txt
+++ b/code/src/Shared/Win.Abp.Snowflakes/obj/Release/netcoreapp5/Win.Abp.Snowflakes.csproj.FileListAbsolute.txt
@@ -22,3 +22,15 @@ C:\Users\Administrator\Source\Repos\Win.Sfs.SmartSettlementSystem.PG\src\Shared\
 C:\Users\Administrator\Source\Repos\Win.Sfs.SmartSettlementSystem.PG\src\Shared\Win.Abp.Snowflakes\obj\Release\netcoreapp5\Win.Abp.Snowflakes.dll
 C:\Users\Administrator\Source\Repos\Win.Sfs.SmartSettlementSystem.PG\src\Shared\Win.Abp.Snowflakes\obj\Release\netcoreapp5\ref\Win.Abp.Snowflakes.dll
 C:\Users\Administrator\Source\Repos\Win.Sfs.SmartSettlementSystem.PG\src\Shared\Win.Abp.Snowflakes\obj\Release\netcoreapp5\Win.Abp.Snowflakes.pdb
+D:\CODE\BeiJinSettleAccount\code\src\Shared\Win.Abp.Snowflakes\bin\Release\netcoreapp5\Win.Abp.Snowflakes.deps.json
+D:\CODE\BeiJinSettleAccount\code\src\Shared\Win.Abp.Snowflakes\bin\Release\netcoreapp5\Win.Abp.Snowflakes.dll
+D:\CODE\BeiJinSettleAccount\code\src\Shared\Win.Abp.Snowflakes\bin\Release\netcoreapp5\Win.Abp.Snowflakes.pdb
+D:\CODE\BeiJinSettleAccount\code\src\Shared\Win.Abp.Snowflakes\obj\Release\netcoreapp5\Win.Abp.Snowflakes.csproj.AssemblyReference.cache
+D:\CODE\BeiJinSettleAccount\code\src\Shared\Win.Abp.Snowflakes\obj\Release\netcoreapp5\Win.Abp.Snowflakes.GeneratedMSBuildEditorConfig.editorconfig
+D:\CODE\BeiJinSettleAccount\code\src\Shared\Win.Abp.Snowflakes\obj\Release\netcoreapp5\Win.Abp.Snowflakes.AssemblyInfoInputs.cache
+D:\CODE\BeiJinSettleAccount\code\src\Shared\Win.Abp.Snowflakes\obj\Release\netcoreapp5\Win.Abp.Snowflakes.AssemblyInfo.cs
+D:\CODE\BeiJinSettleAccount\code\src\Shared\Win.Abp.Snowflakes\obj\Release\netcoreapp5\Win.Abp.Snowflakes.csproj.CoreCompileInputs.cache
+D:\CODE\BeiJinSettleAccount\code\src\Shared\Win.Abp.Snowflakes\obj\Release\netcoreapp5\Win.Abp.Snowflakes.dll
+D:\CODE\BeiJinSettleAccount\code\src\Shared\Win.Abp.Snowflakes\obj\Release\netcoreapp5\refint\Win.Abp.Snowflakes.dll
+D:\CODE\BeiJinSettleAccount\code\src\Shared\Win.Abp.Snowflakes\obj\Release\netcoreapp5\Win.Abp.Snowflakes.pdb
+D:\CODE\BeiJinSettleAccount\code\src\Shared\Win.Abp.Snowflakes\obj\Release\netcoreapp5\ref\Win.Abp.Snowflakes.dll
diff --git a/code/src/Shared/Win.Abp.Snowflakes/obj/Release/netcoreapp5/Win.Abp.Snowflakes.dll b/code/src/Shared/Win.Abp.Snowflakes/obj/Release/netcoreapp5/Win.Abp.Snowflakes.dll
index 16a996079cc0f9179c2b3628746c5538495e4c2d..66ccd59381f12250b936938f4924c4b1de1a2362 100644
GIT binary patch
delta 268
zcmexw-C#4JOpKRHg#iKrTp1XA7?~NidK^1Ev0H|5*Tfa!jH#0t>lqJBZUB-qH!&3p
z3LL$0&3f{dT>t&0_sUI^E_7{f7JkBLxc&#ndj>||04AVOZ9u%k7>Gro1_LQZAQlE<
zbs)Ag0piIsM3qfEcx*(ZoGM*6?lsyx|L@zMAXP3_G0y%jt}#xjnO>QB!Ko!BIjN4x
z$@!&uB{9kQDXEihh=v+LHHyMCf~?=js%ps?5;nE-#Y5R%pcOE%9K=?bs3^ubb8?xO
b_T~j*p^Te(C4Mn8?J?ObDD#eSq5%g0<S0`P

delta 227
zcmZp$`ENa;Oq5H70RjSC85n#RnHkvjTz@jLM}~3H#FgQUev=s)>ls%}ZUmA|n;Dsk
z1qJ5p<&t9!Z}*&W<oCg!G3`B@TZEr5@^Uo){K~-S8^8oKEPryTs64B>2?K-r<e8$%
zvNjtw%;2)?c5FYG`A1vv^lnC=8h5Lh5Kl)x57)^bL_>|BDjpt(ssNf+y8ofx$EP<g
zNnF+YdbkW|77R=Pu@xpNiZM1#?i15y`>)ENz#y<$P$rFWGoQpSW~L=3K+b!{i3aQd
Dl7~za

diff --git a/code/src/Shared/Win.Abp.Snowflakes/obj/Release/netcoreapp5/Win.Abp.Snowflakes.pdb b/code/src/Shared/Win.Abp.Snowflakes/obj/Release/netcoreapp5/Win.Abp.Snowflakes.pdb
index 7c786df95f2e67a4cc1dea26858f2c225062dd1a..563d669faef65f08c4fd67d5285b9b46a300ca06 100644
GIT binary patch
delta 811
zcmX?-(vdpBBxVZ}1A}rM1H%+%1_lELAUn9EC^Ij;7|3Ke0u*BbiG>C;oB*-|Ky3F=
zPZuC90hB1v1M;16@{@pk4;~v4DW^);jeCtY&;R@O=lUNU?<Y>EsR!vVVqj#bXJBGD
z1f(wjX)Z=a1_?$chCm=452TL+=^H>=hKZ3umkH<~AYfvcrNhLq5QtX*@p>TM2E==H
zz>-jch2e+}3&Uw3z68WKf%pLsKL_G>K>QVm|0n<nW?dGBOdxIn;%*@3(qmz80pd6y
zPTRbi@gSpGj4m6{Om-mV0Ah8ZuY;J>8CV(gSezM{83LG^futYP<TmCofjuR9lULrZ
zaOrj9H(I`H^X18Rn3WV<tXQ1=U0j8oQZv0W^MX@LN^(*ilaupH^GaBf^HWkMv$F)~
z@x(B)aLOvF={mT01S|Bso_yLg`sXi|(-GU3|CLw1v^QBaXvh5kp1aaIW>@3RO>SmU
zs^>-0(y&0GgRQdGiTQd-cYffRi>#+Jo@Y)d+WbZ(e4?c1<>_7FUnD$(^YY8nauTys
zJyYCM^HPfvOY)2Kl8aHy`KVBv!O`-RvvIqNmK}GOuZqmN1g;kq#oX_mKb*N|BVflP
z4mHLepE-?|3cobWg>GfpZU4(8`*F)(tG&^gtDYK85xcmAMd0L`CXL9+v8?V!0x&-`
zHZ-<0_B75==sIF+k!W}|xv|1F_}rH-dk>u2&RTN+@%pH~P1{n8<D({DVO17H*Y<NV
z8=E2<BQqmo<E_b>Y|<7cdS-eCy2g4&#zv-=dKTKr#>vTsDF(@@sfkI3iDsrLi3Uc7
z=BXwI#ulcAiH4~biN*#77G{Z)YuV~qEDg=fHnHE-<lzR!w}KTX8!%})O}=U1&%KtP
Vajh8RS|!G{_M7buS%Jxt0Ra3b=z;(M

delta 733
zcmeB3J(4oPBxVH@1A}rM149Qh1A_qrkR4o7l$n=a3}iCw0E)4I#6p7^_5j%qAhvs`
zrwfq&1LS+?0r^fj`AI;&&4vv#xa_(e+Ye^`(N;XYo1^*X*NGEq>Vd{HL^Cilq%klt
ztOU|qf%JPI{ToP|FfuYYFfuW$0Mgrm^lu=|#RSs90F*7!VPdET;wB*O1mX!mJY5GY
z2_;w<=IO97ECu2<K)e}<cLDK1AU*-a=YjZ|0+2A*Wnpjz;y55q1>z?_ET_l9U;)Gq
zn^!X)WR%j<WdoYY4#XTltj@s9pv|NX^g9R3<Vnn7lYcNPak^Wvg?KvpdALrtVhPaU
zieY5o<`>h{HMCLKxcO7rzF$)p_$ehEv_9ycWPRN2WAA!SiCU@oH~1tLu}|K?qEycf
z*U-?ez;b+L@+nzgcda9peKNBDmOKnf{ct8>+MK;hEu4}L?^c)a49?3hPs>TnPW4Q2
zPt8j$N-W7Q(n~HzGUb}WukSL&Ulb<ynACrMvt%ZRUlQZiCku<KW-WXq`y^$?mW|>_
zhD?rS<<UjxZj@0tIqO`xrLWy<zTM}1D`F45Gdun^_nDT{+PRBG_$HdKW}Q5P)!l#(
z;_Al4#?;2##!3a-)k?Crt9ol$*$waXYRvtV8}|LyzMayx_0yi7&Y9_>Ia!cRnIBct
zjmfTTicF2SC+Dz9TN>*b8tNJ7n&=rBniv@CnQ14c8m6VC8Jn1-n3!3bo0%Dzq?%a(
z1<ei3Oi~TZ49pXg%q)@&4JPkrt7kDWv@qE0#C}tAvbv$a_?o+nYo0K!`M|iAmm3&q
R3RawKz;xxbxzUi75dhjV(X;>n

diff --git a/code/src/Shared/Win.Abp.Snowflakes/obj/Release/netcoreapp5/ref/Win.Abp.Snowflakes.dll b/code/src/Shared/Win.Abp.Snowflakes/obj/Release/netcoreapp5/ref/Win.Abp.Snowflakes.dll
index 3b7b54fe1250044d89278e029580246c81dae76c..ea550334f4521bbf11e5a9d8a087b05e0e959993 100644
GIT binary patch
delta 10
Rcmeyb-Jmm}Y-4GcC;%I=1fl={

delta 10
RcmZqB`L8{pY-4$+C;%F{1fu`|

diff --git a/code/src/Shared/Win.Abp.Snowflakes/obj/Win.Abp.Snowflakes.csproj.nuget.dgspec.json b/code/src/Shared/Win.Abp.Snowflakes/obj/Win.Abp.Snowflakes.csproj.nuget.dgspec.json
index 72aae98b..0c8a60a6 100644
--- a/code/src/Shared/Win.Abp.Snowflakes/obj/Win.Abp.Snowflakes.csproj.nuget.dgspec.json
+++ b/code/src/Shared/Win.Abp.Snowflakes/obj/Win.Abp.Snowflakes.csproj.nuget.dgspec.json
@@ -1,23 +1,24 @@
 {
   "format": 1,
   "restore": {
-    "D:\\长春项目\\北京北汽结算项目\\NewBJSettleAccount\\BeiJinSettleAccount\\code\\src\\Shared\\Win.Abp.Snowflakes\\Win.Abp.Snowflakes.csproj": {}
+    "D:\\CODE\\BeiJinSettleAccount\\code\\src\\Shared\\Win.Abp.Snowflakes\\Win.Abp.Snowflakes.csproj": {}
   },
   "projects": {
-    "D:\\长春项目\\北京北汽结算项目\\NewBJSettleAccount\\BeiJinSettleAccount\\code\\src\\Shared\\Win.Abp.Snowflakes\\Win.Abp.Snowflakes.csproj": {
+    "D:\\CODE\\BeiJinSettleAccount\\code\\src\\Shared\\Win.Abp.Snowflakes\\Win.Abp.Snowflakes.csproj": {
       "version": "1.0.0",
       "restore": {
-        "projectUniqueName": "D:\\长春项目\\北京北汽结算项目\\NewBJSettleAccount\\BeiJinSettleAccount\\code\\src\\Shared\\Win.Abp.Snowflakes\\Win.Abp.Snowflakes.csproj",
+        "projectUniqueName": "D:\\CODE\\BeiJinSettleAccount\\code\\src\\Shared\\Win.Abp.Snowflakes\\Win.Abp.Snowflakes.csproj",
         "projectName": "Win.Abp.Snowflakes",
-        "projectPath": "D:\\长春项目\\北京北汽结算项目\\NewBJSettleAccount\\BeiJinSettleAccount\\code\\src\\Shared\\Win.Abp.Snowflakes\\Win.Abp.Snowflakes.csproj",
-        "packagesPath": "C:\\Users\\44673\\.nuget\\packages\\",
-        "outputPath": "D:\\长春项目\\北京北汽结算项目\\NewBJSettleAccount\\BeiJinSettleAccount\\code\\src\\Shared\\Win.Abp.Snowflakes\\obj\\",
+        "projectPath": "D:\\CODE\\BeiJinSettleAccount\\code\\src\\Shared\\Win.Abp.Snowflakes\\Win.Abp.Snowflakes.csproj",
+        "packagesPath": "C:\\Users\\AIJXZ\\.nuget\\packages\\",
+        "outputPath": "D:\\CODE\\BeiJinSettleAccount\\code\\src\\Shared\\Win.Abp.Snowflakes\\obj\\",
         "projectStyle": "PackageReference",
         "fallbackFolders": [
-          "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder"
+          "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages"
         ],
         "configFilePaths": [
-          "C:\\Users\\44673\\AppData\\Roaming\\NuGet\\NuGet.Config",
+          "C:\\Users\\AIJXZ\\AppData\\Roaming\\NuGet\\NuGet.Config",
+          "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
           "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config"
         ],
         "originalTargetFrameworks": [
@@ -25,8 +26,6 @@
         ],
         "sources": {
           "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
-          "D:\\上海富维东阳工作\\设备管理\\localhost-nuget": {},
-          "D:\\长春项目\\北京北汽结算项目\\源代码\\nuget": {},
           "https://api.nuget.org/v3/index.json": {}
         },
         "frameworks": {
@@ -81,7 +80,7 @@
               "privateAssets": "all"
             }
           },
-          "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.302\\RuntimeIdentifierGraph.json"
+          "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.304\\RuntimeIdentifierGraph.json"
         }
       }
     }
diff --git a/code/src/Shared/Win.Abp.Snowflakes/obj/Win.Abp.Snowflakes.csproj.nuget.g.props b/code/src/Shared/Win.Abp.Snowflakes/obj/Win.Abp.Snowflakes.csproj.nuget.g.props
index 1ab7de77..50301f3c 100644
--- a/code/src/Shared/Win.Abp.Snowflakes/obj/Win.Abp.Snowflakes.csproj.nuget.g.props
+++ b/code/src/Shared/Win.Abp.Snowflakes/obj/Win.Abp.Snowflakes.csproj.nuget.g.props
@@ -5,12 +5,12 @@
     <RestoreTool Condition=" '$(RestoreTool)' == '' ">NuGet</RestoreTool>
     <ProjectAssetsFile Condition=" '$(ProjectAssetsFile)' == '' ">$(MSBuildThisFileDirectory)project.assets.json</ProjectAssetsFile>
     <NuGetPackageRoot Condition=" '$(NuGetPackageRoot)' == '' ">$(UserProfile)\.nuget\packages\</NuGetPackageRoot>
-    <NuGetPackageFolders Condition=" '$(NuGetPackageFolders)' == '' ">C:\Users\44673\.nuget\packages\;C:\Program Files\dotnet\sdk\NuGetFallbackFolder</NuGetPackageFolders>
+    <NuGetPackageFolders Condition=" '$(NuGetPackageFolders)' == '' ">C:\Users\AIJXZ\.nuget\packages\;C:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages</NuGetPackageFolders>
     <NuGetProjectStyle Condition=" '$(NuGetProjectStyle)' == '' ">PackageReference</NuGetProjectStyle>
-    <NuGetToolVersion Condition=" '$(NuGetToolVersion)' == '' ">6.5.0</NuGetToolVersion>
+    <NuGetToolVersion Condition=" '$(NuGetToolVersion)' == '' ">6.6.0</NuGetToolVersion>
   </PropertyGroup>
   <ItemGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
-    <SourceRoot Include="C:\Users\44673\.nuget\packages\" />
-    <SourceRoot Include="C:\Program Files\dotnet\sdk\NuGetFallbackFolder\" />
+    <SourceRoot Include="C:\Users\AIJXZ\.nuget\packages\" />
+    <SourceRoot Include="C:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages\" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/code/src/Shared/Win.Abp.Snowflakes/obj/project.assets.json b/code/src/Shared/Win.Abp.Snowflakes/obj/project.assets.json
index 7cb6f30f..fd3f0fd6 100644
--- a/code/src/Shared/Win.Abp.Snowflakes/obj/project.assets.json
+++ b/code/src/Shared/Win.Abp.Snowflakes/obj/project.assets.json
@@ -3033,23 +3033,24 @@
     ]
   },
   "packageFolders": {
-    "C:\\Users\\44673\\.nuget\\packages\\": {},
-    "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder": {}
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\": {},
+    "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages": {}
   },
   "project": {
     "version": "1.0.0",
     "restore": {
-      "projectUniqueName": "D:\\长春项目\\北京北汽结算项目\\NewBJSettleAccount\\BeiJinSettleAccount\\code\\src\\Shared\\Win.Abp.Snowflakes\\Win.Abp.Snowflakes.csproj",
+      "projectUniqueName": "D:\\CODE\\BeiJinSettleAccount\\code\\src\\Shared\\Win.Abp.Snowflakes\\Win.Abp.Snowflakes.csproj",
       "projectName": "Win.Abp.Snowflakes",
-      "projectPath": "D:\\长春项目\\北京北汽结算项目\\NewBJSettleAccount\\BeiJinSettleAccount\\code\\src\\Shared\\Win.Abp.Snowflakes\\Win.Abp.Snowflakes.csproj",
-      "packagesPath": "C:\\Users\\44673\\.nuget\\packages\\",
-      "outputPath": "D:\\长春项目\\北京北汽结算项目\\NewBJSettleAccount\\BeiJinSettleAccount\\code\\src\\Shared\\Win.Abp.Snowflakes\\obj\\",
+      "projectPath": "D:\\CODE\\BeiJinSettleAccount\\code\\src\\Shared\\Win.Abp.Snowflakes\\Win.Abp.Snowflakes.csproj",
+      "packagesPath": "C:\\Users\\AIJXZ\\.nuget\\packages\\",
+      "outputPath": "D:\\CODE\\BeiJinSettleAccount\\code\\src\\Shared\\Win.Abp.Snowflakes\\obj\\",
       "projectStyle": "PackageReference",
       "fallbackFolders": [
-        "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder"
+        "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages"
       ],
       "configFilePaths": [
-        "C:\\Users\\44673\\AppData\\Roaming\\NuGet\\NuGet.Config",
+        "C:\\Users\\AIJXZ\\AppData\\Roaming\\NuGet\\NuGet.Config",
+        "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
         "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config"
       ],
       "originalTargetFrameworks": [
@@ -3057,8 +3058,6 @@
       ],
       "sources": {
         "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
-        "D:\\上海富维东阳工作\\设备管理\\localhost-nuget": {},
-        "D:\\长春项目\\北京北汽结算项目\\源代码\\nuget": {},
         "https://api.nuget.org/v3/index.json": {}
       },
       "frameworks": {
@@ -3113,7 +3112,7 @@
             "privateAssets": "all"
           }
         },
-        "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.302\\RuntimeIdentifierGraph.json"
+        "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.304\\RuntimeIdentifierGraph.json"
       }
     }
   }
diff --git a/code/src/Shared/Win.Abp.Snowflakes/obj/project.nuget.cache b/code/src/Shared/Win.Abp.Snowflakes/obj/project.nuget.cache
index 3e63b7c7..141940ba 100644
--- a/code/src/Shared/Win.Abp.Snowflakes/obj/project.nuget.cache
+++ b/code/src/Shared/Win.Abp.Snowflakes/obj/project.nuget.cache
@@ -1,67 +1,67 @@
 {
   "version": 2,
-  "dgSpecHash": "tSZslriUzptLn3fT1NvayYI2wDLD8G+HgvJxyxB9sQe1idX89sn4DGjTVPjZb9lkwQu34K2l63l26mh9A5BskQ==",
+  "dgSpecHash": "CugfBKjayiD+GhmotTe3At90iFNx0Pi6XhbVBO993irp5Dtb+LKaC/9V7bidoTRT9vBbQnaftq7cMvEHm+sOcQ==",
   "success": true,
-  "projectFilePath": "D:\\长春项目\\北京北汽结算项目\\NewBJSettleAccount\\BeiJinSettleAccount\\code\\src\\Shared\\Win.Abp.Snowflakes\\Win.Abp.Snowflakes.csproj",
+  "projectFilePath": "D:\\CODE\\BeiJinSettleAccount\\code\\src\\Shared\\Win.Abp.Snowflakes\\Win.Abp.Snowflakes.csproj",
   "expectedPackageFiles": [
-    "C:\\Users\\44673\\.nuget\\packages\\jetbrains.annotations\\2020.1.0\\jetbrains.annotations.2020.1.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\microsoft.extensions.configuration\\5.0.0\\microsoft.extensions.configuration.5.0.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\microsoft.extensions.configuration.abstractions\\5.0.0\\microsoft.extensions.configuration.abstractions.5.0.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\microsoft.extensions.configuration.binder\\5.0.0\\microsoft.extensions.configuration.binder.5.0.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\microsoft.extensions.configuration.commandline\\5.0.0\\microsoft.extensions.configuration.commandline.5.0.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\microsoft.extensions.configuration.environmentvariables\\5.0.0\\microsoft.extensions.configuration.environmentvariables.5.0.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\microsoft.extensions.configuration.fileextensions\\5.0.0\\microsoft.extensions.configuration.fileextensions.5.0.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\microsoft.extensions.configuration.json\\5.0.0\\microsoft.extensions.configuration.json.5.0.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\microsoft.extensions.configuration.usersecrets\\5.0.0\\microsoft.extensions.configuration.usersecrets.5.0.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\microsoft.extensions.dependencyinjection\\5.0.0\\microsoft.extensions.dependencyinjection.5.0.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\microsoft.extensions.dependencyinjection.abstractions\\5.0.0\\microsoft.extensions.dependencyinjection.abstractions.5.0.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\microsoft.extensions.fileproviders.abstractions\\5.0.0\\microsoft.extensions.fileproviders.abstractions.5.0.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\microsoft.extensions.fileproviders.physical\\5.0.0\\microsoft.extensions.fileproviders.physical.5.0.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\microsoft.extensions.filesystemglobbing\\5.0.0\\microsoft.extensions.filesystemglobbing.5.0.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\microsoft.extensions.hosting.abstractions\\5.0.0\\microsoft.extensions.hosting.abstractions.5.0.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\microsoft.extensions.localization\\5.0.0\\microsoft.extensions.localization.5.0.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\microsoft.extensions.localization.abstractions\\5.0.0\\microsoft.extensions.localization.abstractions.5.0.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\microsoft.extensions.logging\\5.0.0\\microsoft.extensions.logging.5.0.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\microsoft.extensions.logging.abstractions\\5.0.0\\microsoft.extensions.logging.abstractions.5.0.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\microsoft.extensions.options\\5.0.0\\microsoft.extensions.options.5.0.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\microsoft.extensions.options.configurationextensions\\5.0.0\\microsoft.extensions.options.configurationextensions.5.0.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\microsoft.extensions.primitives\\5.0.0\\microsoft.extensions.primitives.5.0.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\microsoft.netcore.platforms\\1.1.0\\microsoft.netcore.platforms.1.1.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\microsoft.netcore.targets\\1.1.0\\microsoft.netcore.targets.1.1.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\nito.asyncex.context\\5.0.0\\nito.asyncex.context.5.0.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\nito.asyncex.coordination\\5.0.0\\nito.asyncex.coordination.5.0.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\nito.asyncex.tasks\\5.0.0\\nito.asyncex.tasks.5.0.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\nito.collections.deque\\1.0.4\\nito.collections.deque.1.0.4.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\nito.disposables\\2.0.0\\nito.disposables.2.0.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\system.collections\\4.3.0\\system.collections.4.3.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\system.collections.immutable\\1.7.1\\system.collections.immutable.1.7.1.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\system.componentmodel.annotations\\4.7.0\\system.componentmodel.annotations.4.7.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\system.diagnostics.debug\\4.3.0\\system.diagnostics.debug.4.3.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\system.globalization\\4.3.0\\system.globalization.4.3.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\system.io\\4.3.0\\system.io.4.3.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\system.linq\\4.3.0\\system.linq.4.3.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\system.linq.dynamic.core\\1.1.5\\system.linq.dynamic.core.1.1.5.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\system.linq.expressions\\4.3.0\\system.linq.expressions.4.3.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\system.linq.queryable\\4.3.0\\system.linq.queryable.4.3.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\system.objectmodel\\4.3.0\\system.objectmodel.4.3.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\system.reflection\\4.3.0\\system.reflection.4.3.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\system.reflection.emit\\4.3.0\\system.reflection.emit.4.3.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\system.reflection.emit.ilgeneration\\4.3.0\\system.reflection.emit.ilgeneration.4.3.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\system.reflection.emit.lightweight\\4.3.0\\system.reflection.emit.lightweight.4.3.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\system.reflection.extensions\\4.3.0\\system.reflection.extensions.4.3.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\system.reflection.primitives\\4.3.0\\system.reflection.primitives.4.3.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\system.reflection.typeextensions\\4.3.0\\system.reflection.typeextensions.4.3.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\system.resources.resourcemanager\\4.3.0\\system.resources.resourcemanager.4.3.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\system.runtime\\4.3.0\\system.runtime.4.3.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\system.runtime.extensions\\4.3.0\\system.runtime.extensions.4.3.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\system.runtime.loader\\4.3.0\\system.runtime.loader.4.3.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\system.text.encoding\\4.3.0\\system.text.encoding.4.3.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\system.threading\\4.3.0\\system.threading.4.3.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\system.threading.tasks\\4.3.0\\system.threading.tasks.4.3.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\volo.abp.core\\4.0.0\\volo.abp.core.4.0.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\microsoft.windowsdesktop.app.ref\\5.0.0\\microsoft.windowsdesktop.app.ref.5.0.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\microsoft.netcore.app.ref\\5.0.0\\microsoft.netcore.app.ref.5.0.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\microsoft.aspnetcore.app.ref\\5.0.0\\microsoft.aspnetcore.app.ref.5.0.0.nupkg.sha512"
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\jetbrains.annotations\\2020.1.0\\jetbrains.annotations.2020.1.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\microsoft.extensions.configuration\\5.0.0\\microsoft.extensions.configuration.5.0.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\microsoft.extensions.configuration.abstractions\\5.0.0\\microsoft.extensions.configuration.abstractions.5.0.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\microsoft.extensions.configuration.binder\\5.0.0\\microsoft.extensions.configuration.binder.5.0.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\microsoft.extensions.configuration.commandline\\5.0.0\\microsoft.extensions.configuration.commandline.5.0.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\microsoft.extensions.configuration.environmentvariables\\5.0.0\\microsoft.extensions.configuration.environmentvariables.5.0.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\microsoft.extensions.configuration.fileextensions\\5.0.0\\microsoft.extensions.configuration.fileextensions.5.0.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\microsoft.extensions.configuration.json\\5.0.0\\microsoft.extensions.configuration.json.5.0.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\microsoft.extensions.configuration.usersecrets\\5.0.0\\microsoft.extensions.configuration.usersecrets.5.0.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\microsoft.extensions.dependencyinjection\\5.0.0\\microsoft.extensions.dependencyinjection.5.0.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\microsoft.extensions.dependencyinjection.abstractions\\5.0.0\\microsoft.extensions.dependencyinjection.abstractions.5.0.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\microsoft.extensions.fileproviders.abstractions\\5.0.0\\microsoft.extensions.fileproviders.abstractions.5.0.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\microsoft.extensions.fileproviders.physical\\5.0.0\\microsoft.extensions.fileproviders.physical.5.0.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\microsoft.extensions.filesystemglobbing\\5.0.0\\microsoft.extensions.filesystemglobbing.5.0.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\microsoft.extensions.hosting.abstractions\\5.0.0\\microsoft.extensions.hosting.abstractions.5.0.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\microsoft.extensions.localization\\5.0.0\\microsoft.extensions.localization.5.0.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\microsoft.extensions.localization.abstractions\\5.0.0\\microsoft.extensions.localization.abstractions.5.0.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\microsoft.extensions.logging\\5.0.0\\microsoft.extensions.logging.5.0.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\microsoft.extensions.logging.abstractions\\5.0.0\\microsoft.extensions.logging.abstractions.5.0.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\microsoft.extensions.options\\5.0.0\\microsoft.extensions.options.5.0.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\microsoft.extensions.options.configurationextensions\\5.0.0\\microsoft.extensions.options.configurationextensions.5.0.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\microsoft.extensions.primitives\\5.0.0\\microsoft.extensions.primitives.5.0.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\microsoft.netcore.platforms\\1.1.0\\microsoft.netcore.platforms.1.1.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\microsoft.netcore.targets\\1.1.0\\microsoft.netcore.targets.1.1.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\nito.asyncex.context\\5.0.0\\nito.asyncex.context.5.0.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\nito.asyncex.coordination\\5.0.0\\nito.asyncex.coordination.5.0.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\nito.asyncex.tasks\\5.0.0\\nito.asyncex.tasks.5.0.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\nito.collections.deque\\1.0.4\\nito.collections.deque.1.0.4.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\nito.disposables\\2.0.0\\nito.disposables.2.0.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\system.collections\\4.3.0\\system.collections.4.3.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\system.collections.immutable\\1.7.1\\system.collections.immutable.1.7.1.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\system.componentmodel.annotations\\4.7.0\\system.componentmodel.annotations.4.7.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\system.diagnostics.debug\\4.3.0\\system.diagnostics.debug.4.3.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\system.globalization\\4.3.0\\system.globalization.4.3.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\system.io\\4.3.0\\system.io.4.3.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\system.linq\\4.3.0\\system.linq.4.3.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\system.linq.dynamic.core\\1.1.5\\system.linq.dynamic.core.1.1.5.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\system.linq.expressions\\4.3.0\\system.linq.expressions.4.3.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\system.linq.queryable\\4.3.0\\system.linq.queryable.4.3.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\system.objectmodel\\4.3.0\\system.objectmodel.4.3.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\system.reflection\\4.3.0\\system.reflection.4.3.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\system.reflection.emit\\4.3.0\\system.reflection.emit.4.3.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\system.reflection.emit.ilgeneration\\4.3.0\\system.reflection.emit.ilgeneration.4.3.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\system.reflection.emit.lightweight\\4.3.0\\system.reflection.emit.lightweight.4.3.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\system.reflection.extensions\\4.3.0\\system.reflection.extensions.4.3.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\system.reflection.primitives\\4.3.0\\system.reflection.primitives.4.3.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\system.reflection.typeextensions\\4.3.0\\system.reflection.typeextensions.4.3.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\system.resources.resourcemanager\\4.3.0\\system.resources.resourcemanager.4.3.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\system.runtime\\4.3.0\\system.runtime.4.3.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\system.runtime.extensions\\4.3.0\\system.runtime.extensions.4.3.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\system.runtime.loader\\4.3.0\\system.runtime.loader.4.3.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\system.text.encoding\\4.3.0\\system.text.encoding.4.3.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\system.threading\\4.3.0\\system.threading.4.3.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\system.threading.tasks\\4.3.0\\system.threading.tasks.4.3.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\volo.abp.core\\4.0.0\\volo.abp.core.4.0.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\microsoft.windowsdesktop.app.ref\\5.0.0\\microsoft.windowsdesktop.app.ref.5.0.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\microsoft.netcore.app.ref\\5.0.0\\microsoft.netcore.app.ref.5.0.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\microsoft.aspnetcore.app.ref\\5.0.0\\microsoft.aspnetcore.app.ref.5.0.0.nupkg.sha512"
   ],
   "logs": []
 }
\ No newline at end of file
diff --git a/code/src/Shared/Win.Sfs.Shared/bin/Debug/Win.Sfs.Shared.2.0.0.nupkg b/code/src/Shared/Win.Sfs.Shared/bin/Debug/Win.Sfs.Shared.2.0.0.nupkg
index e25e8ff53b0d2932362f9f415e1c96ad07a326a6..001b4a995ff8bafdc762e7e32d460ef306e5bc90 100644
GIT binary patch
delta 31437
zcmZ^pRa6{J7p_AH7D5Q_5Hz^EhM<AqKDf&u0fNf}2<{%-onf$n;E>=p=#UKVI=JiM
z`_I+6I2ZlY+i&&mwYzq&u3ps*e?)0|L;<NQqrM`1@!|#M3z+hTZX^%<J1NSG7x&K_
z_Oom1X6@+C#rYpo6ODntxe3FLFz#?^uLSL@jK!*X?XlZ*%;$JS?Ej2nd`>|wb8%w~
zll~g{BLe$#=a#mQ8z5_YENw8oCSF7uw5rR@*K|#|S>3-syZ*-wTY-35<tHcwn^~Hv
z(K~8Vf&l;eRc7d@D7QU5c#gevGQOARaa{gAS_#p~+}rGG%ti0X$LSufD&2*7Gwab`
zvn1w9=_w+N=aF_cDL>xvAo!#{Ir8{uG0hJpAepwLt+og$zs8uzMK_PB69<?I228&>
zFEKQeJybb`1j@=-1<T3*y5LrKmz<Pj#ncl4?Ywxb7QP=#Fv4sZ#MRN6y2<`iz*!km
zO@=x=BA2+GferZTwfom)uX5K;MyQb@tl;kO7lV+RQ2@&SGlUJQC^;zj<JcRzUmo8|
zhIl;>;(L@AR4<av18I^eQ7J$#KmG0;ii^l+dO3`*_#P#3%&MEpOC4|K{V%Q}dd^?y
zeF1&O3%_?_D8|coVz7Th_FA?tk^RE!cLB?=yT>z`yWPs|nTkrS?FIKE<he?m)Gn{v
zyToKug?M}k*{v?}+oLDI4blABsy>3~#_dwZ;eO=b^cI)hxB~$0-Cqy7?K5!SOJ}!t
z91?Xhf!A*;*Auf3kxRNdz}Na)&Y~<V+C>lp#dxyosUdrMsnm7%o|=$qW}Qzdg%Jx(
z=_21Z**|}YB**y2ea2M3T%i+`4tiTDrtoDGbSH5g2IA6X&QvU2CZIBYQ?IJQ-_>DI
zV~3zA|9nidO@db_Un>a`mF05CXs!=kc2BzarFqaUV>Cm=0W=W|x87i~Ob;rp<ZdH>
z?6UjU9wsjs0~h(Dx8-sWMxC`a`FdL3jc-uyDtlC<L%BFk;6CKZm+a9*)@0aLq@Y*2
z<&~+V>OvMFk)o%c=T|=fKUo~6l+ddP@u3g$J`3sWJ6Bj<O6!uKheYgK{!1I%rH}1x
zi6k*XQGPz(xV$X!`9eWY%)`bju0o#a`7|5JQOTW&DH#eHNos(|=q9py;=g(HClN|t
zZ?n-R8)G{71+G?2s<J5<>FwQajHYJj|8CfA+;@!kiw~^{@SNQl81?%mcR{S4-Qo^v
zDGc{Ep{+=?58I#%5^e_5QI<-{&$$#2+0yS35y$T2K|cr0J~qRQCt}~&TJmIVYi{Cd
zdWxwA4{Y0StarE7q!g%`yB)R$vQxUchqjMd|As0>=aI;DA6Y0y9LrtbBw#VrT`8Jc
zNjtfh2%jdwMmj4QZoV^^j!hwg-iQXrcf74{54*)48;A!P#bLv&YjZ|ib(i~T@%dS6
zYg*)g*qJtRRo3Z#dYkHVDtBEN|0^8rj}L=pHCI!&bdYQ3&a8#ixY9c2E=^I3V%Aw7
zr3P=mbEh-f5Fz|9+Mbd{!@IwzR<Tl#Qo{GVh}2YD`W4@n(kdl9_BG9*o!|SS-x&BL
zq`T2Fk64nR)0<CIiV;^gpLj3&vJ4on@n5eEIh^)k5Jd6mAv>~FC~XOBt&<^B){C4v
z>6AJ=KQ2t2zI6Qko~^!Coby9wdG0=yu6YirFJ@Bb%pbS<I5`v=Md!;zB8Pqrw$%Wv
zcwaf#3jw_4wb%8@#)J*PK?JdBe4*s9OyYRk$$(x^K*EEd+Pe|VjC;kPp`GN0m^uAq
zGFGM~R|Xc9Ruw!g1GzD+O~ph)ajfwdH`zCC3j=PQoFZFq6q547sgKbIb6gIwXq|>u
zot#?}YB%o&4R#FrrzZ%%a)^a2e~Oa~2W4(tkkh!KV>W|CZKg7^NC%Z$gvl^+oIsX&
zR%!(xdY+X_{@nKt>u)LyeyA_f<7;sqqWj5=I-ln;hr~FphUS(k(ECMXy^-XV7|dwq
zapNB+q)CN+Z8`~iV%U{EdHcj}fUhdn2#Yi#Frqdf@^>UYH>>(r|4N*cI9?S!W92Qw
zJdWX5So)+H?lg($c&BmP^mdYlkAF=<;xH2($gv(qKv_-Ev}M;(|1`|3nkG}C_%_w~
zq(8AZu)ch3b60S`XJmwA=z{y|FRAa*(ae}p9(v!rJFB00Hw~32#JF+bKK=6V)6^12
z<Dy)9)TaLklJpkn(<8CZKk6CO<`Y*voiOHD^JdBEdOOr{_K@O1{MW~n4@@5uZ~S@1
zKvW+Z62qR}Q1-|tNhuK9JtC$1S7Ai`UnBJby>8D=sP|_|Gx{A=;X_N5Kw54*TRhjy
zV}l=R1SiBOD3%+ueYS#RMW9Yfl-%I;@~ULbZ>RkN;+b==MhiGG$t-^O2u5LD$H;c6
zRqk94gskALUw>hY8C4jIw(1~@#VG_ffXZL^oQ|DU8r8~08W*N(DRIL@vvtOv<aKG5
zf)*jJJaNU{?cQY|tho25E%%XbxnJ8hM~9+YyJaMs(_acKFw9{c{!siEdR-hInrTEx
zp}0y=-6b||iIO+?x%9w|?_D*$cQIwL#@h}y?@h6IhSYhsJV~WZ_w9O!_d7`!OOV!A
zm?0~0$SEymwBwEeaGB&IJ~-QdN29@-r<OXiD-pWSYnpBysdTGmJ(>P?sfLZ*od481
zYQF2sWnS;AGFlSW!_h+L(g{9%+oJDEzf)Dbq8uI50=nuT-&oV4hFE03l;pYz@csr;
z+xD(Tzyf*=@xd!|*7vPBqj#wPE<l%ORj1en3GD+!_nveesgRxiv>NiG+1QabhlOGa
zy>FAG`iva5p0k=CIM~`8$XX7{vwQA`CRm|qFF9y3Yht=Eeid_b5@q+KtI+hFUc56k
z%L!dyr#Eo*RW3$+bKkm2iW=X(35+sz%jKK<9<pR1(l4q@u2&ZlY*pk6bp+|~1@pmx
z-6IWs;p(g+G5yeLCgXk6@QQwGM#v?j{Q5s(1)}2B`+vhqBQHE@Nt)6oN#khee6gIX
zU9Wia)&!=RfD4!mqW2&R`}MDp6x}^U5$>cBmb+VZt4SKAOx|_|<X78leU`W{M56rh
zcms)SYwr9G`Q|zf^y&jGKp>YzKO78V2x`?N5@Hr}`s3iwFRLwVa`&TkY-W*Pk9z($
zb46bVe$5P2Ut4`};~JFIs%BAy+v=?M_v5VnT~$5L3#od)bWsfB{2e=Vv~gmn@OD}w
zg`mRci_0WlqynXQ2uiN>2j2LvcO$Oix7h<5Y~h@y)ZaSFn7kj?4_86c^B7m#a^LU0
zMu<k9D(;nAhiR<StK+E#pE9Hqd~$?Um#iu4RLh<gp0e8p>{77H>_~LIzA$h_YO^(*
zjh?;XJnw}ptbd3yO_ymiHg6GN?-KMVdh#b6uu1T3oVN^(;Fd9)H5ib+vfPtWHMn?+
zFH<yDID2)!9PltuNWBgk>3;CVKTM46$L_uTM5*_y&Et;iw>_$VW&qCd@}2R5oK$Di
z=h_-4{PRB5LOHvh_NJH9##!H<RFspPKi{e-*E@f1S}3)n>!b6vD-4$_cA%T3o8nKj
z!Q0JLY>s%NVx=!z%2a)ot1F|XVr3wk##GNiXGqY&UYO40YbfgiQrXa#jbpmim!(nJ
z0LVJ)oBv{jIbgjGTpV!03lK2x*fzwGrp-5eNvx3{`7)Y$Mz%nX(EhhCR}*>gr$}d(
zx(H2`6o9Oh%6UV?W9E(vo^@vJ(g--rO+{N@Hk1inzxRcTHbAz7sgk`=iC~skBf!y>
z%N&K{-Opb$bno8?f|4dJuDKd~#qDpVf}dO$xN5()Si6O8uD?c}D@FgBa`Q#YHmM=$
z0wpuP3UF*{eHB{O$hZICP_^oyVq}RYZ659X&jN4GVGR)dw=xn;T&F@X&%P$AqJK1J
zh%*OVLy!I?O@JhxtcgSt7oZuBPONr1>k$2Zg(}3O{^lvR2gI?4Ba!E#4|j1`Q;GIg
zCV=0~>;9R~^d6vFn(S?Rj(M8>2`do)EXMs=jIn(|#o_mA*O1k(v$sGiv2%5oCQQt=
z4PxPzSx>j<-HoRF<aw}UGw?&RelJJnuRnC}H^?8w#>Q_Bwrle9+BmA(ptE^SRer&`
zR{-5Bhiy<DD5A@5O)~ly3;+i8kb0U^|2=wWTE++tq-pe(C|?w}!o#(<XqG#G-+1h9
zn~&_7FCy`xy=4jF0lh^Cm}OJmKuBP2ZFTO%q9}XepUg}NQh4&^%mGi?Rz-fYgl?V$
zV#p-=FHpqi_OIOOd0q4dSrv>AF*Hql(#Vtxjj#n>MC3Loocm9}u+wI-Tj!&RPYRh#
z>Lb$mPwM5`9ZRzsFNuopDpPBiC?Ds7%}wfV+Y56J8X^KRy%*_B=6WfJPr{g%8Y6@R
zPSWJst!I%)%jl=ex<1gr-dUXIX_H(#IMR!Qj+qj!aACe*{-{IH1?a_7Sqb<GqaW*H
zb^~4Uz{l0MR-a71Hj7kp!~={!XS`xjVOCi&_7{0`ok_G6jq|1|yueSG{dWOYnVhh|
zYCUE;(*p4-{Ko*DcxFUx1g45CK(?5v{dq!~3nn;+egD>UI{Eix_+HVmkXMQ>tNL8Q
zQcI<0Gtc=o-XmG*$|Z~+EgqDH$t<5@5ChWkIACV;OkpbIpaT%_5aU_S^7VY<*%opq
zsA}s47`NINX36#1(~Z;lKhJyP(_gl2Da8y<bmP4j>3it#`4jE%A~ScK@fHOVt?)kU
zHZIvT$_>aXH?b#s%n?Q_PRim&@0j1b{@F<$f0627P`X!RPn=j9`7K&;PBu)=$_|rm
znvPdsa+)p~_YFPh{RUu!&lG+TVL8Xn)$Lvl^`U+h{`9gVO30Ay%%LN@88C9wx}u46
zA#OAn7;muHw*T#d7YKZfo+&YYKQ??&)pibT-2l=p?}?5cwBG*xhpjL1vQ;5Sj?k`f
zg6_3|h83P%+L>$VS;L=f<+1Cuh@=ydZ-ZsKr@NCXg=;dP8>9Vo*QNXrniL2}ziv>6
z1^u03Q2gv~!NU(X+@0L4ORmL!9Db2+id!j`ZR<}^!>rpu`~rc4nr8|OUgtc|FGB<D
zL%4#428StxZ!zyvH^P>-*(1(DpRU=fV4&JG+~0-t8>n1)Y*HS^p$0L!?PWC-`8w^(
zf9H)@L<H<W<4H6F1=a=<ALi~^{2ahDefL?CH=Y`({22lXutwiO*!g2z&z;nIGc=Fy
zS1i<YFv}8|e!69Jm)h=O>ZiU0kB}3;xsl{IV|@humE7EZU$J(UM=ROI6A%czy&pgK
zQCu<tb_p3jy_j46S;Mz-oAqw)y5(cby*QN=$#ptNSg3V<eUn*D8olM=DNU)LLO$e4
zA)_?UYA>)q9~?gva#Nxl*!A;<D(yZ{;7rV7%WGydUM)5$Pje8K&@9lEd1Fl{rE%{c
zcLwO(JWF_UGPW&pGG;3T$)4=>`VoAjIGshZR2<oH@k2=Ce)8C6GlQkm;)`kBT2<CA
z+xR(XQ)`fKX_T+$JR1|X_yuNg%pN7h!l0IMmAfV;((4tq+ZMhnHhZ39BdQWUO*m~Y
zm|glq7}}r9D9QK9-zHPiFH^GNi|xO!Y4)P~Xto(md>OWqO)T^G2IQUGUojvq;a%y%
zX_jr}8O<gxz&PHc?oo;r0?I&1$(NxTZ*M9<dhbsn=<}1#Hn9mE({{EOVTSMa?ancv
z-<57%#-z7}#133Iiv><ScR0TAvmAt)Bqx9G;VjcfwxjyeuC2Sw=l?cevE8`dLXWTb
z*so10SX#J6M;jeatNepqBJALU)sy8QFYQP?E!z*uuWt-ktaM0Q)Un%bza-~v-c?yE
zy;Vz~>UXM{^gP?<m$ZZ?PvXDFNdsy>eUt<`Q7RR~Rg)j_>E5vuS(0|MT)vGf*iL+8
z>32xxCZGm+6dG42k6L`rt_p^Vo^;I&(~uGgQ$a;F=9FrB9{v=+<{RV9v5P&DZFtR1
zipQ_Gi!jrk$XED<!phIr{)ul)%eq!xq-SA_Jcm%Xh#*8DX&${IQMPvs)q&9GORUYj
zfM{RMB)aviU6Vo4Ag2SN<>L#KEZNo;4fXfoPZR{N^o@KXlP3rWi5omrHZ_-|bcy5c
zNga?wHs-d5))`L8w*)L8f)HokRzYDF@6m2nzJ=FpYa7Qzu5N#MrauU)ZTSi_I!cVb
ztqEuDpk`n`%&VpLAE*u&^^?ek&+=$pg~w-zN_4s9ZA!^is=KH<<p^|&K3_^XHhJ+k
zr>}tjdnwv9CIz>aaTyC{hc>aQ*i{<Fwenc4^7wc{5#<{3AWH}Sxthsc&sY;oxLu6_
zy&j1`5=|wB#kJJIpVahZNz$!7i=lv`r#EDK;tl%l;DT`hAW8_DbVy1K4)IVXITO$!
z*PxCQOdM`l5@uLXbM|{*^yp{n7TN$1esNygI*tPuP?^*Dy|zT^F(z4BbB1i?Y}~(v
znHg_qd3Zd5RE;+&NP@f{A*N>aHBOtxx<T9fFGs-jU7z=wyV;NZfum<*!`)^E6Yooa
zA!+&2@ijQQuY|(UY@FH}0c78jiJiZ%aba>jz9ee5O+ws-2=D;AxT`PELZC-rAQ#HX
zXB3C!tDgv=zfe<)xuwn;yKBfmhllZGJ{t!O!}T0!@C8X$s&g&+Uo+ho==;HK%N7j_
z#sDa~-kwFnmbor7eC^nR<Lx~C9r}P7+~Ko6m^>KzdI#`X-5);~kV>sp#nh%dasbF7
z6t@-3fJR-TZjXLcdvx(O3*1EOIopgj-&Rg({G6^WsdVguSyNqNW1LkD;LjimnQiH5
z<rDzzBT8m(dbBn*8)}RJ#(2)D2<WVig$La-Nv5v7v7s>=_Dl3#V+u!Xa;qN{W@+hR
zu+u5a%c6U;hcO=$VnLWnkIx}w+kkEjm3-8Fmgj820(SP=FV`@5KsH(g7H7F7va<E$
zhHA;<!Qs2N!AJGvNjC514hK}%L4SsX_kiM7syT#gIYwU-=~J5oZJO_kzZ)H)e2S_)
zX?`^zr5<k@ytd91({=gt1kyOrRatccxyN0{-8q5Gtf%9a-Z!I%d!-rtNQEEkX3Bk^
zMQWBbjGly(ncdrl#y?fpo{+pc;~nT?b-ZT_S*Ix-;5s?ZAnTXfdOlm-K-W0+6R4`^
z1fucuAkMX2xS6VFP*xz&N_nc0`Bbyw3Wc)|kOLcmqi)@MFwHoqjYup1FTI80p|D!G
zctl%ct6KFqHo7uS^C$bcuyjwS>zh(;VVj1g{of94O#1V#txfnuG-QQM$t6uaVt^aY
zjkALWOiA1|)clw9X0L3L>Ta<Yu)!nS#$zEV{`=pc$z>#TY;a!7UeYaFOZoOc%L;F!
z<M(1`r|_Ms6PxK5ZBOK_zcshkm6`L7{V6$fNIoZdkIL5cGns@`h+a4M!axE}xv3v>
zN(fAm+R=zh)`&}gydM42cIlls7ZZL_k?cxJ0s?IGv;0<_^<1+lI(NxtI{(J^a!EH@
zrO5xrShD_jt#m1iS!#nvDrc<7y1h5+OPlqPbT;*Ud6-LH`xu|K9JviFK|eC~!{=H9
zvkx!j1iOfje!FA!liz4hOBwFEunC@aBnzd-$ny2c@|DO=E6{}%g@+Hwt!;=MODufu
ziv%$lz5^SM9ldgoAL?1LX`jW1oDf#$XBz>$DovC*4fuYdeaV6mwWc{rT5-(A2{or;
z++4T>E`pEAT#xhEp<X}lzGTdg89kJzg`1kzpM!sIcUjf^DclmhF{_X~2q`gHOj*zi
z<+cjUyK^`+4E7inlCD>!f4QN`>4q*IbPF1G#z)tCFj>GmCKsOyp!SMUOoAQoiI`Ze
z@51rpqV%@#spA;gAK%0;pnBs-cEd;0A6b`nVSmWS`^nSb%$8$ht3XoYfAhitA@A9~
zENv8~jWkb~{BZ+Ur4QnT`=iuV#y)-=$4NS~Fi1c2ZU#mAEHD}-1~|9Sy%|D`8G!EU
zTG)Gt=)L&h{B+T12V6h-?i@6)Gru|qE0j_k!rAN3LZ$Ksx(Jo&_OF~a`eki~ZsY1k
z1xV7bG5gLux)$Ay2w_eoKSykc7Ti^tjF`M#QC3s&6?y2A*K=%m{Kxx=G-LTLm>Q>Y
zrB8lmO&FAij_5bMo{jMu^1|^!cLB*4z<9k18mb+B@<r4fIK_@40Pg5>d(%~vf%zM~
zYsOwpQ)*U2Q4(v;sZRMSzjW;rG1y*e&{(_owdju7xCl#&N;W^KF<bklk5NDQ1|%5V
zU5vPBdg?*N5^=i&%NNmSI1c~{k_6bY7~|#QtR(w-KNb2!NPo8!$f>+$aR43HVjdpY
zXbAn3lYp`A-RNqdGVf6cvybyd`<h&v*GY#uB1tmkQk$V9=G`P=l*A<e!qIYttKBj_
zyJ#1D$a$sKJ}~OUpeyzAT6}<E8;eN~?@L^|*W5p!(F0DwhU8{w`unzMnfeB0+iLm!
zJ>}G!d#i47R{Ayi(IU6vM10UFn+4L^+(+)KN$B9dZw!+6oF8sP9BAhJ9W2R>TIcq*
zZBQwC^jd@FLOCJ@?Z-zTCzc2?*Xu;aO0Fr82(i&BO~cio1QA#L#Jc|FJ`EAvkYu1P
zd?T$^3ci+l>DvAYf0@C0O}U~QF~&Tv(_Ixb_d+QA(0k}IuDK6!Vg*W<w+GfyGQK>T
zngiS|>XvxzS{!(lkyVvMHtzucRQWO<j8>jbMkX(%ZmovTtUNEyY{{p?ts9^N1_N7h
z^KGJni{HK*j;O~wc}ip!Q_rF8yGqD|P;05YJNA5!mLJ7Z|JvxT$yecvRV$_Fr~aC(
z?u}hd{R@|4Y|4<4(*%7bG>Kg1H%zU)s@V4gK;M&#dK{>i<c+7<cIc%Lr4n9n?V17@
zW1`7P%fL)~9dYF$%Xt)or!#5R*lF35?8Mtrb~VjQ(`B0b&S$=bSLM5w*I_?6EdvNh
zO0Oou`lrt?&|Ul-<Y5#=bQxuNI-r~SX4&*@{(llkb8A|P6HrBPQ~fx7zTb5~CF+@M
z>b-A@X?wx?4OE`@u7Tp_hLwZP$bCisy#tI-VXHLBB>u!v>P_~fA-9kp@bk+6eL65k
z!&B0FX-|jP+2S{6t{(Gl(UriJ^Mi4JuD+5dO)BLh8yAS1mS0~%yZ5mBV?u^(y09wp
zsI=KA{B$8@5@dLcrE}n+g=<?U6lrqA1}3qh9#$?vQ(dLU7ClS0`}kP#ki66W#$F<Y
z(I5w@KL=B3zP;P9no>FJ$jJCs=I&y{<={rmzAHz=%``buSv;XaQfi&fI4NV#7}~Mp
z)+nfpT@%vY&9QTiX@Yt4MV?DS??PL0*{hXKIoVF?9wbh(Gpbhd@6h6?fuDGmbS>?T
z)`&G>-M`>y?n1do8K0JKT98%V)@pFJlfc~9xI-w%S7xrr%kxw`ynYXX4aY&R!k2t*
zeXzA}JzM%c;5Z8x$$$fWBVF0a4woZSS&Vw;qdYZ`EmK}8G3KT1fn47>uDkCf;flUl
zsq)0gUr>B$`ofsy0>HI#MrGStnGvEy@N`6Mo8H1wl5W+ejO89N_Yn=r{#chE%vpY0
zm!Ii&r?Nk=gf5@<w$xJ~S??37xOfsr$G9|Pard{Z2wIoBxGrysDweEUbr(sFjzAJq
zDo&ioGzpP~K`tAgaH~GMDTi-0Lt1ClKa*572*^S<p0Cwj?jw7iQgT$RLaI`WlBK;6
z%tkz5+vq1>5T{b|KOg${z#}AO-Iu|1@<6mLK?RyiZt_5U-`5SnwzjX00sii0uTxVO
zDTRXqrO~o=!cSS5Llu1SacZ8Ej!<eDcaA#Z>Y)A+K7{(p_IU4Ns=u2AZIqCDnBoh{
z73j;oMJ)7smY`nEar<gBE<)eXkG6k?asuB?WvmY(>{hJMo7S*VAh_hubO|chcCD7{
zuK#oMNv$p>tZClKfoEcAA`=%e2T=Zze$ZK(ZlzhhnDX!mcBMaJ5xWz2uN5t2#X$kU
zh1g9Nx^jlMAcgn(Grh?cOdDS<1(Z0sgL-_d3vqrl6|K0(P2@P_OQ3Q@hDjTuaAe4T
z5+egp=LC6ckab<&B?K6uJK;5A0q*!3hX8l)06Fkm?Fi2>IFnTrJRhoM)?x(os5Pp9
z5>(0=mO)*H<=WJNdfU;Sk?^R8LgNbPzIlrrkR{@42V7O|JPYdif&FL-p+g3uV3R8L
zg9>`*+g$;Xb#9Z?=HS@<DYNPWkrYwck*K0OznX)V^xWbxJ42Y0<t|GrI${$r{}QR$
zbWoMM<tR%L)Ks>MZs)#oX73O#NaX}^myJBeykgUaoMlMcY_{gwYA-3dOc2z5@p!W<
z60}s5o*!WMtU{Nza|<5^L5R=ic*t;1a>LwDG!2{pabTIohX*1Ay`zulNS^da*rm|z
zhsH$5mLHPacfiT5hNhU#V$*^STgCH`4fR4NTPL)usNhn4L%HyBu|~S{yGUO)gERN2
zu;WarFDP~d3#Gc4NTcwIix5w(f(o6FVm{w1bXY57^QdKf<21r6K;(#G{>iv0b-S)t
zvV1f8c3Nk0(VAr+#j1=N^*u!S)#B_<DzOlU4wFf<<aRVY%9V&0NQuVH3giU(IUyL*
ziiTi8mBlV^OQ8g9D==J%#6``9*zrZFAZcTy>-ue7FEH8XQuT0z<Dd!!#;?FiNa?Z1
z0^XbJD&p9A8|_Gtpt=MqIKRt|-hd#F=9i6|v3zBE!NZWH14Meh5b9Onq+NQ6(kR<p
z5rBzQKyF%Y4#pLw8_D9YLWX-zYQhC|1JIFycIz`F6a7hc>$7@0S3HgDvvU)1AG7iw
zu{iW11vLV&IbI?dJTL)RjYE4Fc4HHz<scbDRHw>YtP_yKyMWAFMp-cpkvEgK@)3fD
za%7%{IZEFzh2rhpb;$WcN4Kh$Xwz_5UpNu6XK90;E8QT6^JY@F(wtUuuH1DZHymDB
z`YAeS(`WD1A8MqI0~10u)H5~{XAA>uobwv#Zsi#*iUS}*9BQ5A$A(@;WV-xXJd%Cf
zlPu8L>;O^uecDen>N$G|-v15@@xlDXsq$5zmJF;ClNN5ma+g7-{Yy%Ba#+8|5MN4w
zFd+R}a6}njR#L>(H>L1HvZTdU;YJsltG$<f2jO+V>D(y)hroerz-bqm*u<6K%G}9@
z#y2tck+!G3EqBZ2KaK=Qf>QKT;z2{&547P|7IGlLhpajq2F2y@o+q3%++M6F^4rV~
zXJySr!kj#2JifJ89azEEpO>6<--_(`xheME1*P{s?KQEwf3|9N{?MrV0)`$)OnYrR
zxQ$X21VVe_Iexvuxe{Raz-J}2QIv4>eF5dhG)A|VYl`5f$j|h5R<E^^88On$Diw}}
z&HM{ME4q!6=<TiHEBmRz+tPtAPe1qs=V&C5alo>wR8MR3#HDeM+mw1>-@yT@r+?ED
zNADZh@!QR8Oss05AY2kY%kNK>gyKS<j)5zCiakavjHCJ;Hl-z>CCE6oen;evQoant
zXs6nVJ0NTHX{#3E`y3ifV)a^84KI6A=J?hE)N^!-7XIp07VWYot+$@<Q9|7|kBmq#
z8H*3?1uplQX57k9V9!|;DlM3CH0BDs6vaKrM1Evzb<oYG31y!C6~v|y;3cbT$${1R
zItI0qn)c_L8&>&|rD@xUja{PALA-l$rQ@L2J&rc)Ba3){GJHs`$%^{&NO;0BwA|4k
zpm7R<4H&g>P{w9AV>kA9Jzjud8@j6Xmgowydw`5cWWDoSI88x8Oyt(2D489#wVPEa
z4H&M$aw@IAM0{jXDlU@b`bqQ6`rYRbZoRp7VEN?_D<A=JN)i`^H!#-eX`(YjN&dsD
z2s_@%#onofoKX`H!?25j`7OU!yTP$N2*L0nZ)2BLsl1uRwLaQejkrZndP6+s>dT7a
zU!$m7nwMdR<!lpGn1a*Eer`D7-$Ad$&IGmHP>!kcTlBhU>h-qGJUbt#T#lIFJe`Qe
zOA+jjQQc&oxqhMJr}+r6iB{^<k;N@n2u2_Qn-IgcyE;m;$TTI3?s!9aQ#xBVNTn^B
z!Y4Iw5`&G#Tk4p2#byN-BPq&OQIZw^*k_x}AR5BA>TWlhen89lD7{ocJ#Y&`|BIQ8
zS^aVxHSR_3s{?F*!B5=Lo3BOLEK(C?SsGJLtkPFla!bOpUQbC`kFtvo3)fzcI$N~R
zYknm;wqKd=hJBZMN#7B*G@hiR4KifeUQ4o*RMSwF@;R+!Te=hT-#<F`==zg)CUzg%
z^~dy9?7nn)bu+Vo?XhinwfUQSh}ZO$T%PyBH~EXJ7>{xX<t~Uf;{m+^(b1H|QVn~R
zQZ(Jdxst2T59=qAq;==iDlUbJ<A`>IR{tp~^@;mmtr0hsUX8R5@`_AHnxJnfqlz*q
zqelUgo+*&O+oz2fB1&@5^A4<BE_W;?E;+rnw{rh3<I#~^VCFUKUiV$NT^)&kI^dJI
zDdE;X@{um(5=pjq))IyKH%}(LkhqgG6BC;W*lZ)WyswATlX2Je;4&aH&rgz|;k~G-
zK^NLt#!sS2>U3}iUUErHKIqbQ^kUJGgTt$971N=m#dRb9vq51_R(-W>Cl)USLg$+b
zJkD9QmAza7J|>eR?F16yLiX}0q-zD96gcywsm-M>{aI{9gDx)p`gJJnWT*}Km6Cs1
z(9Fy!P)>CU@3sDMo<)>SV9~<NDb(xcku6oeNDXDFVJ?roIE-P#0y*HyA|v<Jrrk!X
zX(|yUda5b_iqr-!=NC?+JOjsOvt_P2DboY>_dL$;a9{#ZL-&Br9)3NbZG)~1MPn0V
zbG!>Pat5(mjZ@aqQVOG?tMaF3p@-ERG7sZSvxXpqmzgsy9q>4hzAXy_ilNR+$@;*_
z%!Z>tOL1@=;<g_&=`E@Nbh`2AT;H_-JB{WIAanqROMYEEK{a!Te;w;~FBdayZ34L6
z5?$yr7>S&qF8Dg=(Adr)?YTM1$$<sI&@J>Y$nDPg0Il8Lms&u@mPMf)PX{MdAm5Gx
zxMT57WBCg!Ge49<Gxv0?Fa*$+2i3CEORUIQyrMFdkOPrqAqqS5ZdJ>|Ecnt*eV?YA
z6R4*$*_8QhBke`Xk1>HEjc~Tj2uM&`>d&GME{HxyfeyfrAL4b74}d@)9_~+Kza_#S
zmmoi&DvXzu0+SvSxsmMEl~FE*S<o~s0ro(aMJkJy6zUn1UN;sGI~DfyNq5?`5j&d3
zrid;QP=8&M>79So*RIJgpjoFHx=yw-$hY~f7I5g>-KO-afq~`;^TnnzUx#})x3tX6
z)x04<3_NhWD%w<fQF$y-NH=dBU{jItPi{7P9ae0#==mv6STs4xqiZtYl7h|tyEDb8
z6I+FRbE@mS0Y9J_XV@W5Dw=7(DY#naq{^-o1jmoMq^K%40isY(vI5GXx4+@nvyESX
zDxsVJl`5#G?RnU>K%)r|SKf3GArCGoI~0OXF@Y~sVvC^Pa^RBdf%`j5;D_!9_~atM
zFX%2u1=r3=>PjptcLH(#6XyhcUJX}`Zb^X7eM_|(a4hnIGKtwxP%%So&(zLKoI!@&
zlTWhC_D*ODPXrH|4zMj>x61}wcT~Bn2E88iy(O3l+P1p9)bt3I0r+HFod&#^w^`_3
zt_b84{@ud=5lAn5>%%V#Z1aAzJ!uDC99$R6W3oqHP`iGU9GgL`OI%WrsCU3Mr`C2}
z0?Gw!5rONU0B~4MZ)js>o^d2L$i8Fz79N;BU@A)iZ2~VhUB@<ljz1Cu@d4*{n^d1F
zucLRF7IhP+MiGmx975JQ_l)P?owJ76_VIl`HOFqJday`TL1Wgk4E$7pu6<s8rt(L7
zqgJ!V@;QKH9WSzg0_b*&Qu=f=z%QL`@a`vke3QrxjqE`M>0m;ur=9|WTZI~Z#sVZ0
zxiOXi!HM&N8gX!4*Lfz^8ANUj{CZ5g2CBzr)R=*O)vSk`7oPthp*fDwo0J6)8Qigo
zY5+BFsw!0fqdiI^&aoR#PRYC#j){yDAX&g0$C%WjCA8+vbW^D8@+UEwLYIQJPlcw+
zSK+c<Y1FtU^{FNxtm!4JX;GPW#}e3oaPctS!2ByO1yqUqzCXy!2W=?ufqJ4DnkZmd
zU&a`#+5e9s)}COO{NKEO)QF1qQOTDG`>z=RuN=z~tuOIvbC}ZpDRjs3%K+=?T#7}(
zLs1LTXV5eaN(C{y3iw*o6@}O?J6M1u5^iHX24ZvjU|jzErRp%cE3#$+puHti?KF#+
zJRMkfDWw8LL%gG)V$i1A^P6i!yL9+CS3n4KVEABoSqb*T9+H+ZFpO$V)3>a2WQQE8
zhw1OXscVnzoRd^=2fGxRLIr<puX?(rW+4hvgj;hgpqD<wf$MLTrT{pmsSDB)P~Coz
z9=n%jF5Fp#2&@lm^XWe<Rs!RwF1swq2>`NwQY&~(l7ff!TC$jcD!Q=6Z<;Luln)tO
zKkPZA$JTH8atxgzr+zz0ZhooDGJ5Ir`)4Mt1q&v5S5x3kPvgf=Z8H9kp(gCjaliaM
zXgV~Usa&b&0?wrs+l|ld|AU7jsQqp?Ji+^FIx&Gq{39NbXFCRS!SA@M_a!=iPpFHt
zU$-sGXcJBy(N@0RZO(F#xkZ-N5qaj~PN%#UgN57chURS3^OyY|Kf`k<uiZao24hW+
z<3v6(8`s<o;T@AYO=eP}#81W&UE&=JFPfOspu|rHAb8au{qG6RBj64rpk*^B7sd9s
zzKjee7#$?|F1S>fk<H<qGl(3c$Pc?>V2Qz0@1(%VOe14)xj2+kCOr~0jq?{`OD0O>
zW&`ue|4<M1Bvk@1{?0zX#^cnoUBA)6{f{`<z8dH3D%dAC>^YL%xvATBLofVvbBp+7
z{3X?F!>|2w$8m?w&=4T}wKKF<dIlKDZfAnHX|aOLT8FIPf8Yx5^~+d#9eKqYK!|@t
zbSuuV#P-eZy96#|iVO9?$2&DU^|HN7e)4}@e157dOAb$D9{AreH&2-mK(sVUI+#q#
zP*OcPT_$#v#L|U!7?5%`!pp_ejZAvkE>m=1x&DnRP;<EfkcEeO&akm`iu%udW5Iv?
zR@dZTazB6VW!C_g<a{Cl&gmic4~$z|rc7*)rt;X39+%V-`u329t8#j)H+S}?gQS<!
zA5t&xJJd{d5NB7C0jBn_WsGmXrgFP*2X(Ar%i)At|IzBvk4e7&N<%&Q1WjNrsr?V=
zga!j@{9uHI5sYAaSR;_ca@ar9#FxZzU^}ZPc%(jONxfz-|IFy9!g}JPo~-m25#T?5
zLsyR6JWB)*v0n3*KO-rra@0q0-_`eCZ$=B)Ngch8`+QG#R!0?uXct0pt1c-_wMyWe
zW1<p|z{*)fi$V1IleA_2iR&^9ly{7qX<$7TRS24}N7M`DRXs{aH>M45*MT$};DH-W
zpeb_jL&$t*0S+K5i$r00q7NX(;?i}(;q*50ievG)G={B)hSX7rcTXG=`Ov%~PAeo9
z*lB~U`)J1iZ2U*>`|>2vcWJY8?_EcgKnp}v7Ne2r>{ue8Kp-RhXcr`g+=Qjx#nSB9
zf+h6H6r>W05HpoN)(_Ezje@~?@GfQzU@8$K)>G*>a4dw`790<^`PxoXp$<F~S&G*#
zfX@2c-V)%z5x$+khe&xn!&K6r$9#+WPI^P?pvg3`8>Mk|Tp-e<bC_>N3m}#;Pq`-t
z=GYJn_tgS|wgt;Tw;zGau31_S91OwA5AR}X220}Xlv`{)SzsTvlKpI&_e!DG3tPG@
zfUFTG>eLc}7Te46PC&BX7N$-mlxTstpc3jS+ALRDfQmGtn@tJw<V<u(+YE(h)6Y_Z
zaki@dD$a6G<Vryt$n0QwdSEI$m}!crZN3CZV=pP_@*X5tRfUc?BLO>4ASUjyuz2=}
z!78J9{RjzKpZ?0Y1aZsRGlU!Ikzk!e9=!C_nV{+tw{g28>vsR6-%?uzq`I{j5*4o%
z-sq|7%LfdXS-a6be=nA+=0Rf>-&4km{?GEbVnN!o-CKu$FpdO*Zl`isj6d@ZJd~py
zOb&+9gW65-XBohK#|RZ|K8%0B+O|p>D@f0w!|HoK9Ht8EkOP6A#k#olb7u7bsX>#F
zA%`M3;dWA?pgl*F`)7?gd*qkHIhjSP*r2-$buS<?`=<d`#U2XSnAlwusAh*$mVBI=
zX#m^_#nY;E2o9QX?d~l~U;2L5!$AMH&nOcB;(7MS_QdSAGT5}J-j4sN|MA7+-u065
zLgNFC?Ip$U$-8nN0L8#_!#MD-A*o82(iWyvBP!OboZEUX>{og=BY>#yxY|AOacF~c
z?sNz*L7cH8SM)$wkxP0KlxqzTU)o+<(~GdC(RIJO&b@%=qWsrtft^-Uvmv0j4o)PH
z4gZS}_!Qq!G;X;mRCjz%5QPyGqu9va`Ibe!4sdqnp%|n@?YOO3eu_TdLRg7!r#Cqh
zgZ;~?->eNTS1D=dWAG`_A?Py3?JK<R7UL!C*B1_7%y!uYLtl?ibxIS6tP(>5<!OXg
zz*+}mWjcK6a5`7L@U*}<w;oi#QTjtufCv#5A!pxQCkTwlQLe}&nK@i<N|hNkO7o>r
z+bJ`7?Eqfl-Gl_GksDt6{(dp5ZW-qi<^}px;;RaT$v*t#R%C={0%WxP*UV;%p+bdj
z_~DfufUIq*B;ikeI06C0dTNT4M3i@@<-3uV!3gK0ib%^41gb`CBxpStfn0({u7@C2
z%CQMPyn>z;H8H5ZaZvN~Vo-hUfTz)hU-k+*q~S+Uh6W{c&Z3@qsR3aa$BewvSR1YN
z{t()iMTCD8-TTk8t2_^1?JZee*&T~Hy(nWfaweh93wyHnRC^XwF464afXVMZJ6kb1
z0oOvyv7D*UYV>T~2T>N8fM*e8x$ZI3GffGB?lUT_NUTF4g%0v5LA{QudADE7Mi(lI
z^WqoD&SI&&tuU=zb5EPHsvqV}o4c$M)nhbpU2?dmk^cN(Z4-;RQ^Rk>I3^JI8fZuW
z_f*xN-!ylcLl+<cUdf2%7uFNz6i`nAv~<!$WyYx9a-5EVQ2MF`er6&JY1779IVv;}
z@SP^LX!q8<g4~JBE-U6{39*GZudv(wuVPF77rXz_;}G*d4*f@{&krh>P6rzEfh>q5
z*?;UL|BnmwNN;TIUPZB`mmXux&zzMUj%)t7$ooI?{YNTt>jA@jP$1cVO_Kcl32|l0
zq-T5R-s=B2^grJGk7NIl)hC9^rC?8_KdxC_C%$f-Lo=lR?+J0mb)9Fs9IHn)l}q9<
zHE_VN_;o+xgm^VR&)~U}Z{S&1usu8EGo{Z5qI>KLi<yM9`esu>q>ZJ<<3Mxy&Q!Jo
zKy}mDhIN5*ne_v299GYEDwnz_3YP)HYHF(g`24YGokN%Fe{}gDhX$S#uFCx%_tuf#
z$}{=@V=TeJvqt`p9sgs||2T=|+0Ho3HyPI~dy#230Mr&CKzheM|J)}lW>VDZUPuMe
zSQMI!n=7Zz`L9>u!*j-|wn@+SMW)pNP*WuNz+1&(n?cMZxz+vI{=6tO6gO8)o%3I(
z!iRq+nJKpQ&-O*8<A7nM8`JzrT4ho4b6%;oQB*D!Q8^aRwr1(yXWKyQImOv*7G3e(
zIc`v2)O$o@Md_vH?Po`y-`ewT8I@TMhMZb7Uz$16E8_Dr?ra-w-C7qR22{aKx%Imh
zJ2oD|#b7zPY_mH@4cJ(1KvOx1&EK?<*(^TCk<DR|=_aF^1wN+{B39>8r<PB~f+I~v
z1vNjd4Rb4+#_Bm>+Q<f{5x&{jXQu9rgZ?!!0zb^BoqowIr17PRj@KJ>cd|_%TxQ$T
zxn0hXL=6>bfpDWnudfkOjYUTD?eq@+62?$5`=-fu#_3yVYLuNteHs05YgdQYkJqnX
z@9kH@-Z*R1+ePqbe0&r}gKMbtEs;aYf`(Js6ysKOQb@dNNT;bIX8eWaW^G%qGbl%!
z1MIQe#U-|5mNJ(8Z#k{(?R`;wWJNg=w}UZR;f(RDbE#%~ymzzD8=vL9zJ~RPQ${IG
z;@vu=KEuEK-jKqa(mbteV6Z&r+`z?W>hvf8soOyQTTCF&gxTMBMgQhX{`_hENyUiz
zZaHK56x6!~>VJZr-k3T)tf#rxf%uHlY)4El2}DY6|LP{+bV-GX)fq~XaSRxT-cK_5
z2ObrEzP8M^Eg2^0n?+q;qbo02dwTG_Ter(a<3!S~C*g_s$hwMil0|0?(Afrod7cPh
zi*9H%oR4El2~yk2wm%MzOO13`+fLYOpS&up?N<n_FdVbZ?@NdV5bfz+pz1NNhaXb#
ztU_g8Cj(Zqf=e<s@Rkza95|9_(A_-M$+Bi@;(0x76Nl(B3g^Pomm79xBTK-C-PYe`
ze$-92hpc`wzJI?cKMi6gh{J1dq8}WA=m++lu|=9z+z)TeZQdhBAtv{&ai%Tz!`pgz
zUAHGy!KPPQ40jP$G>Hev+9IUMdLlTW<F&5;PuR6Fy2;_u=A+5sa(dwn(ZGQst69tU
zO^d(_+ZL&=^hvDys4YFp)CQv-2ud}sSq?6y&SzI8ru-;kO@U?|KB<IxjMKaKaEv<f
z2<w~axq&*QSs=}5lguwC%x0X`CXH{LDy5Sk2i|z=*IlJ&`?9UdV;ggy?=$-#|L#RI
zOtE*=8ov)fzr#;}qWj6SpSFm3n-f|>M>(vV@!X>~C{jl`ES?q4sKB6*PzKPfCa9%v
zl*7iE$2~g3aC8BGD~-GPM+@U9hj~q6i~JUO2GHtRFl}Z21X|QYK8rNo=9Cst$tZ`l
zGmHDkPs9EN-mNsA=9m_nt;`IdO-;tL0PIjgvrTPJfs9?_YjdoD;4M9dRjt4zzdY)M
z2C@$AVNwO1ZomrZiq*;&Gl{P(8Oz`C#b30maIpRR;+N8RXt^M-6Lt*k=7_0qXiLoK
zOAA}jqbfZe_V>s-`5el<=?{9^&@NJ{)D~P<_u%qHnrByc$}Q)0%ZhH8yq}`IdV&2;
zh^oUa#oKT%VFzu`4A9A{wLdMX*R~681XTv`|GHkT96LFxEMkwRUg5b+9FDfWXW{Mp
zwUEf4KSNrR8=2vJQ2NongU4hj`Q3V|IMK7P^`7>Y)gzy$(z9_k2T>Y&NLhMZO!qs6
z)`@MDrCo^%>iGA@i1YCn4t?-`4pDv%*$#A1v<-RwC6Qqsoe`$P&wL}U)-FN`n_gO4
zBr`qC*&~H)V8xs$Nir@d(DOx6nwAs1z7xBgRIt{GTa1fV3ga7RrrFmoa=&x$8;V25
z#Z?M8Hni;F4;X;XZN>vFX&maaR4Kf>EQOHDK0h9WtR;8tv_6!G?|Z}QB#{CG^5Yy+
zEs+hwU!ApT_WYqL97o2(F{3k^ap9G$+38~Po0v;l0<m>;wwdli0mcCtXD{R#h&uaQ
z;<s?xdwjTlHgJnwiN+PT@1$gQZQcJ~9r1y+5P-#65Y(VK)i|+Pj}MiuA1tWU%Sw?#
zZ+})rSZH#(BkAeaKT}U88f8G(9)g8lEMuJE_UBQGO*Q}W)H0AKhIu=$e5T$-8FvyI
zV_V+T9Iqh5b>A14YOY+UmZ<Tg!l=yivZiP;fYd+5v&FjsRpnz0c@GZLG!z%WJ}S-?
zfBOyv2RK01xIA5w$j|-Kp<BZ~v706=b^V--YSKu}Q^Fba7+->8jpO*>yqMWGl2a2#
zwJfAga?okxzyB-$6Bp#9J_tuhQrXyLWk_wxcH<?hk1FuLeVgCgoZ=x+96U6M8e?zj
zeMZ@3tiTV~=_%q37x->}<!nq>mtTRN$}{+W;&%JL#?8wVDY__m?`wpSI4f=Cp+4kp
zxg2t1GNfe@BOZlo_7p@$r54liV}V+3Jg@LVi??f^;a>U}!`w%m&%*tkVEF12HyyP+
z)m!?S>4fds&hX8v+Hd5i2bt6F{K{xyH6pQg+)1-n5vLM`{_)J|MM*G<ZEYyX_mXT<
zC*7AW$8bc@&wsq^tjV_!=Y-5j{I8g@9K|@w&7Q>iKoo_<mFR2q&Ye-gObeGYD~fsx
z0vsP|HmW7Jm>h$nI(D_QVv5rP)mB<q&$BpJdluCjqzbG$vT+)jS?@Hyo1oQleGfo6
zz<%R{Uf!Kx`~CGq)eLQ#4k(U8hk(A4QYc+Do>?ZWB<|nM86A2L?5iw|)nJ2g$QvIf
zn*>_e#G7E4beK39ALddRefa92x%jQB%<@T?_z53%zyQT*FU<R|TF3+cUs%|K)xdal
zR~<WSc{J?7u{YCc@JzG;4=8x6>Z!Oq6gRbyN555gWOSYxZQ_pO19GtCJlOu-i6V$o
zYyVvZRa_`v=W@O-k)zh0#|kp;+3GtM<)6ExW*_6IWva(zdqb3V<l%Ve<+(vF<GF<s
zcF;;O2`r*jYj6r~A4;%AG)XVn3?@5?(H`+{+%$>NF53@kIk%0jk0;nJQitA`)2g+n
zinb{X_+6QMn(%%}0U2{nCgja`*neT`?70ilAj~S6!tq&R8&Hf3h{%v^FMQs6%RcZI
z-#g@H4TXBHtlw8Mno1UOG+FgLip8Db0YS7dRU*<;etpyM7PpNI?lPHiUbHZA0%BxB
z0JJ;d!=LfOBX1H8?v0z;momAyez{(Qcp932){7i+>U}ps2WRB-gYK4=*=~nB`#%%h
z=;mX-h@{pzu9V5sSul!j_|$(3&!%^y)E|1AkwY0is+wV`IuoKH@^(mYfYx2;A1(cu
z>tKVm$XlQB>QUF+tB`WQK;s&us9)IX+p~EIj46V>FwoEpABwX`!{~W>e@(NI;Gw_e
z&E)X${A)N!+eZBMt=r(4Z3tz(MHwyJJ6zj7K_*v~Vk6<hEI!rgxnZG<ByJ8efp3dn
zHe)Nn0VbEy62VJS^fUT?TXX}{;k(*a%a%LU=>fthoKnG^s;Xy@&&i!iznN6-xtiVX
z*y7Fk&^}sNA@scxc44FN1}Td>zpMZ+7pxqbZvg^M0C9Z5(hz|iXg}?MV#a!G`Q1;v
zJAvBxmHnqYOS)_FYi3JI5ledJL^?7p<}{uhe9{KyP@ZsJ(ubMoy6>l?BNNR@cl~Ej
z=pgj`^%=c>+%~W~&vFC8v`9<=(+j49{qW}nY@?*VoGWypxXnc!!8Y^Z*%+a93ETAO
z#?LYXQ5+lvk9E|x(17Dn@-PmQouxTJRtH7BWu~*W3nXqq<UMYY<ZP)L1Y{UN5Dk1U
z{`;8lywAscIDx7^!v8stTjpdA3G3zj7B(F-cT_(k%bKz1Cx*tjmWU?1#sdEQLV1LR
zKgBBbdt@ZJI{p4tBmIc1{fCuh$TKC@bEN4MgInQFMx#T*<C#Ba@>e|Eq5X#gs6EV~
z9b1Z~8&;Me74HAewM%;8XmynvFqEKMMhnIZYm}#$BDalrl9jnHBVChPeD`D!W|eBG
znELw7iTX=i>tk-rFE~F}&E)@VGaOHM=V1m4UW@i-#>3GY1q+~PU|@G+@V^&Z{(oI$
zozrQXRR*0X#2fzvemHOmeaNZp0%2U@_H1eV{nouD!p#-rgEQJ@Ci!9-YfJ0;hBB~I
zdjHDq0S_ELx##xUy-q6*GLmC4y_zx$o%6|%b#+b?aWi3a-)IjyQQ02X$LQGhr-$dO
z<uvoSPxypido9s7theW#D3n#_{TUCperU^0xHv*Q2P8pBkV$xbEey_}!u^}SbWv+X
zr4jf$V~27n@-)1crGH{j+!%>Y7H_!wgZM*SNpt#z<H*U%g7f<HmG>*&gLCV6!LhE|
z2+#fsd%q1s412YnCoTSPSFUAxnplzU`ze0S-)zuaNKV6h+XjC*0L}&=&8u{lZz)|6
zW7M}(Du5CBV!5Xt!vhZ_kyH96F_pId&vy*&e`XG}bDwI$jc{9V+$c7X3C%J~sQ;(2
zuZoJRSsKM%g1fsr1P?Y4+&#EMLXhAvxVr{-cXxLN_uxT-yZfDd=a+NVy$^S0RqyUz
z<y}<|d+qLaN8eR+6NLB!f$vDJ2Tv&wI2xRR+6q_MXk^nnFHse;2G@#u<ubBLaqiav
ze+4-LPtHV__Yniuk#|>jq%roGe90EO2*)uUV7x+MzeFz&zbj10p*jN3ZBoE0xdfz_
z$KADy!e`snjT#xI!6|`PLodRSC;G|DernVd@C(fXeOEXZ{gViUPAkSbi(|pF>=P#o
zkv#9uuJMnvw!QQI1pV@=Px$wmNCis))$rXA-m5(geytGR&0yj`yzHJmCy>`dTv&7H
zzWfk>kS+ccGojaAkuyyt%_nE=^#aSFvr)U)u9pgze5+v%k$q6E(F>ORbb7Az4l85X
zj2>5STt=E}PbLn0UxYw91cvNrCW#IzffsQYTC+EiBM8QIJvZhSK129J*PKT^%to!k
z`8Zdw%$q3=L_1srBt}`5kDZZ<BZf6EU*M$roC@YCkR4HL(3X+x;9VdD{eZhT&Ti%f
zI<dCCKYBEc1Z$v|5no{LuxT7|Yv8ou?O>ar1$~tu1^u!i7ziD}dTsO&Zm}DYd`GLn
zX(3%kTZ8mM`b#0hae*=pbqBWy5dwMa>*QP6bKB#xg=PeQ!C*vpfki&pC(4ezOr#A>
z3|9d?3E2d-1ik7f=t~0ZDfZ3mQSzNfefv-5%V;MME>H|;q`o{o0!B<VB+HN|Fg_Tr
zG*agA=;b4>H0Bl-VrL*nYYWs}4(6D#ih#9$OkyC#@cT<4SkrH(@QLZKr5)tIWy?Sv
zQI{3+vVk=JYgXo`BQ&6=(Z6{k5#~RKD4zdFMl8S<E5s0F0SC&mHN}$6fFg3M0hNpH
z$XCMJIq{7u3_($FP}N>bh~!`h0@2O#FdjcmE{1xMgHcn_9EEpzN51}zWwci4E7GV?
zv`1fnq>_|AxW^CFqnh-MwWV148_7tm3RH{`?(KkG2=^Fp1IF8p4L%@@g9b|;fplcq
z^%%L0)uU*(mPCtfwjFpxyCMb0JDIQiVQ2}41BIon<lbNPWPSCkG59}yn+qi-w_gG`
z=YC!g;M8D*p5gjH;@AX`4AC#gn4ws*l>|D2jldwea*6s0JL1Vr2@mF1F25TaMobRo
zh8Anf1D?A5s{t=q127u6A^qDxj+D_k9{j)1KH`$whk#R&bR;tt-D*H~MBMqW@=aia
zS~aN_DZoa2ja?-N`=biO6d2MWP37q8^@+-H1n}>8j=uj@1;DBOSBHP;#!VSw5LyMc
z4eVaxzwXulRJ9b^>bq8i;RNX}2u{`ePiKLDxgA9Puiq;FiZ%d?0i*Hwb$p?+f%@xT
zXs~~Qy9ojE+>~S^zX;>d!8M={W$H0}<8%4nGVr$s{UaUguXHSM$)HRS84;u6^vkHk
zNc~i`5Q+oUN(x5e1y`ScnXEP$lo3IN4fYO?`$Z`R4|q-gm1nz~V&(BRFO*A=dVZ%p
zXhw9gPiHy92{yo|KFt5l#YDEBuoaMt|APTl1HTAy?0f1*a$~CszpF@&(}SrET>;&M
zdy=!Vi#C$^iSggU8Oc@ImJ_G<Ul>rUek46$f__qMwT=MN&)<U9{>i6OnB<<cc#<1A
zN2XmDBlsFDpiE&6%wH*$J^zelUX9TIU56(yhrc4h4Aq+g%2eydjQ%xj{h=UBXT})9
z2hN`=FZfeM>yR~YhN{9c|C4@9HJv8#uS|vY;%6SZ@V=0LYmH7)O|_8Z@U2zli<F&q
zSB<pbt|Bmb^Khord`(z`Brj6E><O0htotWF3lFk9?oUDsmx4v#Qb@Jo@%_>tMo01%
zBXpQ}f9rs1l+k~cr@wsFk>&oC#D6P>HT{1p0Ip;O#{X^HUyld(|Ce(FeKS81LjFSp
zTt@nbiu&KFRQ{a`@E=sr|1OI8FOds*Q~(XTt<V#cpdZgL@?tsekJ>Ru{p01shvnMw
zR*?HN!A{zK+s19vF>=cA`ke5%cbRAAv&}urnVOIjP>3Y!CNvjAj;bogjmn?$no1f#
z>#o+Rv!QSA*PPuvE4b|0;acWebgzCcbnbKBMz3|#d%(e=HGqHR&A>S_x*RnVV$bHz
z;Fm`qmscuSsAkBR>vbdzJD(k1njvdVZ`-d;Bw@}Sor<U~hGh+*kSCiauECvIb|^_G
zLpMVXOj8)1Ddqn8XZnNgC!YD9PCTb`0HLA+w}0}ij7_eJGi_9n=3PtH(5(B(52~nQ
zxkI;=p^a+G^Hc65m%9D*Um%u-*l+n#&hVb?5uLB8$<v)Dmm+s=-7mbHx`6i5R8opO
zjTzW0xd#(Df@>!bfv0CVKGsvX7x2w!2zZAJY^Act-${7|a443h;SaDO7xL7}d^fxe
zi{yGOX5Y{kPPr@)>8plXG-EMi4mOuF#@eBpVTlYX?R$ZFq#7w6Zh*Pgf!(;VAM#+4
zdzyrL|G>O?M&ae5>t3^T{Hn?E24ce~SA$Uk+?;Hq_7aQuhE!5uEJ1FLSP2x-TA<|u
zBf~62v>+8kEjFjUDq2b?wiQP^Vr%UO3nPi-_&7w=T!eSr9v)r8x4zH6b3A0EeFJ~>
zcC_5e1%B0+>mZ$IkHi_%Gh5O9>o`X8@swUZ`%gx66a&JFm#U9kii*!M%lsey`Q96y
zWeLq0(Xzl+PPyI3k|E=*7opx_cH32UpmZ+N(W`7PM<{3Ww&D=n1(}JtPbj}G)C=CU
zemRr);t}K4bVF6A!bEq910e47+W#h~7yP<TD|#yOIX!fJ+JkggfdifM?J9kIDQLH&
z{(g;|3p?KjVWylN54PmJy-<ns?ED(V)N}>eA9{DB6ZzpCz<aMUC|C;3_E^pWR0ISV
zk|wW5!rd0hBs<}w9`y@W<mm$fuIPi!Me}>xzw#wt6QFL0c{8J%aLc@vg>QRv`|as&
zq~M$vuIrGp0=t9m=gg9&RnU{AISD%wifV<@X13P31NLeouM)Phm}4xt-L#Ur4><j1
zaz-;Uw@Eshg&_NWF>H)J*9c_->(#iUW^%AT3QBR|qi$^Ov2~4`al2)+nYrWU_da`b
zfatggosqJcu+QHLuTU*S4C%`(xevJGyUn>mW^!7+Hk7$zW^%Y5)^e>x@_Pk4UQknE
zBjL`ku3T+!IS4ye(T&{^!De`~fTF<D4_B_{$(&=GlBB(kT=`;5EkMTbWG+IlXoCJL
zSwMiMgT}7sw;gSRehrm|w3(bA`Z!Xy1gIip3KoxcfPl9F4VC#Js|$V`0T2;BszAsw
zMYn=09BAJ`IPt|tEIvDP%H&ZT5Wu?aK`)Y@Ies;$k1mzMPUuXqBr&rW3HPP<R@s>*
zUo5?q^y>NYPi=?P8;}<53&?6(vns?($qsUK)8A0?$~6GDwj-cC?*IS@n2L*{?nZ5i
z+XK^tPbJIgbVY%MB3GvF3AT`if3xI%cyXr%xpESEkqXOoNlnm;f($3Fgd^czgN}0_
zPTG?9zUZS5TK=ln@$m&u*sTs-N$BGYTCU$Ri;iii+yL?O#Yn(bDzOvZP-{uekOBhk
z95t|o2d$>(z|&LUY3A%(9N}TB>1%zWM{mUx(6yF6kyJG&;SHgdOjlz|>K@;rP4cD*
z_rcey<UCh=RF9PM!UJJIfJn}<_FL>sj$)hNu3j}?&5Kr5cAgSG>QiEQ$$@<&oOkc7
z+6@rw4nv36T|v9%nin1|6`%WwugpM@hWZUjzF0_0_|<7+`|cx6RbC#DgYX7ROJ!yX
zY+K*0n)A<@oP2#zcbGGu<RlN}J5<01)BLwzO!%l*CDPi_M%?tO!b5c_GdcLTFr(+#
z?*4n<Y|udtk#LXmYRto2go!y>7W{EDz#Ow%W)K57{FSHbGsdix(>&sKpPSk0GI9-)
z&s(?%=hZsL9C7o-e%X+LI`Q4RRqaQ721lNgJml_}02|fwf^~)*gxJbgcm+t{<SE_&
zzp~C3Gnai!R_D(b!#OfdhG!>KFGZ`-9~|+_d<xvN0c;%4Z<=kIa$AKy$=?CNjtVYi
z(<U9Wnnt+A0reBOZ>kxBy1@R{zEw&d<{;!Y@CIF7M#3p5hiGSwSWQ#kLW2?rP#@db
zn3c@At<s*t_6{REmP!rHs!ex06<--WNvO_$9F?5>i0tTQc#|&Xym%`jW?tgDdMnbG
z^&#_(*yBo+9>uyOO~xyc0n$vRO4oJBNHMt63Wo0uG6F`gK^)9{rQc+;7*B_;IQP`9
zxJzR8aFcR&875(pwMx!pv${?uuVj<PuXG|iVoFJwtIc=4<qK=Qc&W}!83Xos0Rg-v
zS<Kn}R@1GF>3i4UL@~Uzc!UDyg}S$PSLjSm6l2U@1OaNB<gGdIQ5CS!uI{@BB5*%f
z4PrJNwVI~Y7{9Ur1XQUOG8;}<P4kqAg7olF+ccBvJCbH{zS=;5mN*C-zG&2XQBj>+
z+vLRC6QY|vYW^SwHG^}loiK0r`A9;$OKzdgi;wF3iw!>Lp8aa05K!}i2M9P*%h%oj
zFJL@j|CMPZ98kDwsP+XWU(9p<GE#b8@^St5kQtzvBZ;H$=On)ExKSjR1t%>*J-%9G
z0s&W)8bN)e$B@1$TK?wGVQsUFUTqU*qY8Fh4o$)c0(hdRNS-0pp*R57j+N=-`_e}9
zr{N!o)|$<_N8f~3G(n0eBZR$XJ-uNjAjcEx@PwxMCZJ#wjg*ZZ{t12M8Pnm)>s9A^
zQ<51R19dL}rb)0_Jj$pq7i1q*?<d+1biZrI$A4pd)UjC3tmh(L{sMCO)5Dw!3#W~L
z_xxV=eALCVl_6|7d8Tu?R`#v|?0hSGD*yI_uP<)PA<(q<(U;X{v4OPynJukK@&Qy-
z{^3n;4gd_KYzVV>owf+foyM(*j+^!ftjuM?XbPzk$4CAu*@77#B1Ie@GRP=HieXFc
zF4;jEFD=PO9TQ3lp6HAfqTGNPrP}6{`7<a020e;YJgrZhY)|B=ctl`$jUA7Gl))X)
z1VdvibEp{j$qR-kaQ_qx#xg+MK~@>uL4{c6aA7cDfcyB=5hld(QgOj%pF2?FX)ax4
zk_W`Vz!J+GrbnTJIR}0cQ-e&<;>{iK<IUqj%yh6Rba2gOl7k>e>q<Udm3)L8&EMvg
zA;ob84<4w%9pqRc#<Rd(6$d<OR0quX;0IF~!fg>S06Sy32N=K|C35Rfcna%qX>#ju
z(SQO5QZT#`#}_?(pjNnq0RuHP({`yc)bC*l32p0aNPQej2r@iNNHRP&C=rS-n1{dz
zbl?5KO^7T!Ls+kLH-d|=+j_qCc$;uu?GJ)I<x=QEwdGqZ>ku&(Fr>d&E>ck3*zb*Q
zfiK7vfb7Ald!}uo?bYpWBkyOr3gzyeqgldGc-H>qRh*B+ZkAhFJ<ZUY$btS;y}!0R
z{i|WvVBYy3>W$hCMfqUG%Oz6!9fap!Hg$cLuM(2w`s|UqdDh6fcsqo>)ZB!;lpfT6
zSBG?y_&Dtv?cR;FQz}VKN_G)hN1=gF{)z4qeCj%Y&&!VN!hY4f@th%(g0AeZY;F`;
zd8%Dp(giLM+ITwY8Ls~L+S+8Z3co6{awos4ahh<d`~2m!y1{UEW{zY1GAw%9|ApUj
zKgI{T_E!+FdPnRnY9m(qXeP^J#rn3rd~$OzI{RjRwrh!_u{7&$$j`%@>~?f#5BTHO
zn(uZA^m_cMb8S@N*6~Vkq0{_L>dPamOM&-QY&Y9sp|F>Z_llO+(enV&ku?!`OMU0!
zW!&wpqiB_!XRRq6@cN!*`BwgSD~=M}6!+^Lc@{A#>J&<r&QqqSkbu{1|8gs_pT>Tz
zEklp=aD^X6H<773I^fVi`w;=K2&4zhi$oT9U!2f!gwt|(&~n(&a_G`>$UZQkmykSo
z9+~)eC9nn(YwAlILNvr5I#1p@CtfH94daMbU9b+Gt3EIe8WvtGgm>%i)f;q#?Ua8i
zcFPavD|M?6Z!U4x8|c0`ht|)(u*LSt?5kFLxJBwV_{~TE0v8lh{&HXL22|a<<_#iK
zeh^gmQl3F)c)<<YEZdIEv(ymEKd48_R%@xc=tr6=Zz<W1-%i2tQU4v>rx2utZJ_bM
z5tOZb`IWItVh~ucEjU=XM&=rhHgv9f6BA*7$tIYAv7-g^G5KbS9PPW;;SaIsO*bj5
zVb0h3@b`*s(ej5W#y6*JOyIZkDW=YBEsrV2mx{UwJdO8`k_$Ha7i6UO_`dFf+4rQf
z`^}Pva>lo|a6`?@X7!iwaJDj!H>_cb6D6}3Fq63Ocd0>9%}XVXHr0fACtyN>XwLS1
z>BB3dkIW!Cl>w~iEy*@ZuLLEI5alEcvYV{i+2FO9%2xrFv#&?+KzpKHgT8AiA;Y0-
z9L4+EY1aWDdMC+CJifI^Xp8@Fj}udtwGfxvpNkIGi{vd)n7lY3f?ZT#06Ksb)rX}{
z<bg`4bLO_U_u$M3ZR+>IdT({Z28sUqU30Jf)}zj9H=I%<P}!@xv;1&^1UTDJm|t#P
zvm-J9B<diVY8FfbPVXw1q$BKD_d8K_oJhER>kTNvUn|wXOi~q_I-A-pPitl2<5}ny
zL;2PYcR3ID=X?TtAM1}7NBdV@46N3*lG^GFkUDpI6N?}ZPeuBkmxT{~Hphg5B=M53
zWn*n*9D^0k1i5u=ed<X@a+y`o*Yx5d-nQ>*7_xie28_Btfw`#*UQ!ggwRu{9a8%Vk
zC^w~YmW?3<t$aTQR1K9tTI-;zJML75ch+wDKPBa;ZDvr`t<fTz7(ty{jB3Lu^+8gi
z*}AK*7JY3}w`=sZg*Yj}tq)Z#6>l|D$K1OLv>=|VC!Cqi!;#3Y(rj4!z=LT;wcsVf
zm1*fxr_Ev&3=CS=Ux;)^Cg5>Q%iUY!Ud&0fpZZC-pE*TW#!vDTBBw*oq#4{O3z%Yh
zi_JAJVM<Pj+as+?#O{JOcd1do#K%mGbT6bFeciv{ho3ka)U8r_OlH&ZZW}nM$ej?s
zcPllkZ6-=JahZ%UEx-NUnmFe8gg4lq!0#@@@EJOB68KZPW#9NIG=Xl6{RdWB=tuRj
z{YE<}lO0`JKHc#t&rs7;9TvXH0BDvX-HoUvUjDcdT!zg~UGu8MRfC1=8Z3?EflHKK
z)D-jF9bZ(X{<akBg(uz;bG1<!7TUo0(ggnR5@zzk$22-Px5hM<!Lq@c#bQL0>YSrk
zIL=+&j6igaCRp*p1eNZtuk+Q3Nb5;iY_>$+#Zyt*XyG_+12&ka_o-}RT*cOC$F5V~
zULBu~Qs%UPuNmQCcbbM*fQU74)lcvNjaT40PB3jnB}R(Vo=-UeDnj)6aBd^kSA>>4
zne&OL>zGW(QhQ-|E9x^Xrl()CqR*?(AKr#YfSc!Ymo9rRAM0#<GCp@6NZ-{a__W6y
zd)g<Q6e={0&>C_r3mFmg_{Kn@$k0Gn@j5j&r88Gf_7gJ`71mj(|B<dKi~nu+2Q!j^
zF{M|>=_TsM#+Ig#FgCh8WyYbgI$A+5BR&=mZ%kZr^(ftui6;twO>a!&dWDyRGx@{e
zDNw@XpeGieOaUb#cVI->Q3<o>V53%elso53z9;<%dPLYjR)I`3brV&Z%m>5BXzJp-
zBEVf?0woVeEgOSNBwd2Nbc32a^?lL6bk*)Oc*Bl3J7=37^=7hSbPV-f=%ty*=0oUD
zd_twju+e$^h!Y~L!^?q@f#}^9{Lg37KY^rpf~wDz%(MdsfimafXlm_%`zWRFXP71o
zh-b1VzjAwSc1!%@OEcSNkpN=G<yfYpxed$d_?wyX5x;kr4<s3*bkB)CM+{6WJ2FRc
zqS2^@Vqy7WCG^}E$0yMLqP7&u_(*<DX=G<8z!CO<-*_{hsH=BxhBVh2DU*WD9t0#+
zF@l0J(JYrgWtce9F<$wg@Gf{GgbN+E&!6#=&-mJVlG5z%bUr){GT9mG>6cmH@G2%N
zoy<cTzGk!d;ZG{Dh`|DbRJENx%B7qzFBZ_62ph<5E<{$N1*TDb_M9fKLN;h%Px&_1
zj75lA2LauhzS=xefC7#=CXW74l?Irw-?yONE9Yc9#_x<1WMeG1QdRu@IoG5>{WI=Z
z(xY%;#WY9mPo1+<_2_oOxRd7!N|{hA361`q7YK!2(}H~?I{q5C=Dp&gn>>RVF86eq
zs~ug<IZ)ClznWTG2X=g%T9e7@NCWJ570x-`4aP|SYsNqR{Vx@La>^+f9CX04Jx7Bj
z6q+sZFywkclza_&c!?bbL{N}AC2L~K^O*KqgM2PvEM&aZ97TEv&{DYdK}UgFERQxO
znWYShhoF_v6$NhVtG<-qZ9JWXLDy`N(Hv~?UG6Htl2&dABi&5*gXU0I7(u<g37S-p
z_!aa$&ct{muP!ko&X}2f89Y!PezV*%Dqbh8^rrUN{3`HMm!Cn#sZ%R5Wo2qoriL&b
zpkap?{i>qwbYy=1PW}#I!1X|vbXUD9YY3pDbhoS}yjsUb<~^I`#c8QlRxB8-K2?8O
zlC`HTDO|l_<E742epxE8sv!JDSFyh+esMcNp3qMT@ha6sm(57+&oFSH!SL!U#z%%*
zGhORoS$;CKr=@JMFUM03x1HTRl0J*s6cc^f(y!-JzqD+6j4T@|mN<!lXUYqKdh?;>
zD4^`mB%O93Wi7svg1t39dTjT*TQe7KqQxA@luYzGvh0<Kq;L^4k$R($hTm3K`-{<Z
zK!yhEs<c9q7(>g6LvtW7+GY+;9%znZSmzw^I)VIZGL5qG$-=WJKJ$8}1jh+gTRj)9
zqB9jMV}i8uqu%B3elifgw3oWcxaF0|owo0>s#4bCwTSwB)1`X-m-K}QktX#qEo70K
z*SZNWI-HHRXL(5-;8UPWLzWxFMn;TdXGxSg@?09aeT9wLehskl+rVZfgQ8`4R10D~
z1xR(=v>;BIa4!8<s5NRd;AKT@UM3pFHv4haDyJS+z?7Xxo;%DMi$rfGo^GtI_q9=r
z4eCBlOXP<z)lw+Mt0x)YD+AFVKz_^7um&R0<tcwtTu+wj;8dABS()=d{q=1|I+KXx
zuJ*Wj<Qjg-#TxL{d>ZJ3Vr$B4BjcroD3(`3tUHVsD^iK9MC9SOE!i4*D08xiaWX+X
zGrysn#T}o2O8ot7CdSIg*-o3VR&@{#aSde!>DNeL)OXZn<G7#{qp^be8x>RVxgw!q
zj<n^anNULbjdJ88M^Irjj>B8xR`a3e+$2|)WyS}~KbU~vJw2nJza+2rAK6Ksw%G;4
z?rX>+<0x=8)$ASCG(^qYb=djo652->fX}uAAi40G^MZnOpIOo^soG#Kx=MCswAq<l
zS^=t!>FlR~wRFDX*l+%8@d9s{a&8D!ELkjDLzN226Af``B${8DR=B^RH{Vke4NCM{
z2pXm>aoYixIG#R^8Z4K>UKh|kd`(eKRy>!M#pbVed?;zu=OoaSW~~X%_r7Z<UMeT$
zFksPSM;qPw6;z9kl*tCMYMh7^?qB-BBGNnk%qno$ZxoN-{&80&Lq<LYM{<y+JDO?K
zH*2S)hbmmmwR*XZ)c-k06@|%Fxv0KVB6Unm<53;hIZ%*0rz5Qr9d6Uq_dR@yZ+T(`
zM5GvnCL+{w2mox^%Mwvcsp$@9NaZhXW3dtD@H(nlrx`EF54EhpE~x^hUn5Z_%){%`
zDudEC3O9M=N*KAOvL@|R$_ZGchl~@$`PYk-7n_#G7aZB+UD(Xz)rWrbU)0QbAozrk
zHWdKb0=Oz@<kf5HZ0oO^6m3(D#eYSq)BntvLs2+k+mrLI84?kwa%FeN?+VzUC1WFy
z?il}#xi)Q*?HyTdTVxNlR2xL5)rA+Zr0T@jM@RIsp>DK&g%t~Xu|sXenm}@xuH1D_
zE%<$-0O^S50p^Bx*Gi*)v$RYroM(VAYO)=OBKoaPmGhZ7MD=83SHW|+^-q=vqREyy
z%G{ZtExh?e4ew-q%ZlVE!J4=}SH*<$&UiBcOv^?}iG*Egm&vh(m3Dg7<fP4zOTKeP
z1oLRXDzBo#<ptintUy^tNl8DwEg`oXgeBv*WYp7qg4JA*oeYp=BB@a>%GxIA@Wl(L
zTkST=!<F3MH#SzS``TJZqFOKY)6yG~mQj~q*fO!K-l>ZEPA6MJ&Jv{|_v;B-09u-R
zQ>j*$+|*t}o<#H1<B_c#R_03d0+-q#fd|v@IrKGZA$#M*LA^#R)_1(2aYBz@a*69B
z@jJRAPW}}22F1GEYb$jgerTH!HL-a>@V@jC0hq2ve}+|s)yj$Iq;};ZD%bSfMb;uM
zXS;wy)T{{_xj(0TdUb(zN@GqaTOTzHI6t3{{lpZz|7_F;Wn)-}FlEdC=z^dq2(^Mj
zmY-UbC|uX<9J!iy|M2uR=a1zeH7O6*$hA*P2c>W^PV<ynbI&>*R5d?oI2RBE+}YZr
zTNi1xB6JkoPCHjJ<2iG4F$>+hMSDtQ!LZ~s{hq;UJbG!Rf(&gb9|6@pMTdx0&oWp_
z2}jQC)S+(P;j*2=Cb8R5p0SEVJ{Q~~SDBChtCH7ZA_8ry*X2NJJtH8(!GBHKomc{Y
z9YCHvn(M})%Zf83QnW7=a$Q0JjDx#lyGHBfslu-1_Wo%QGWR<st$~1>BzC<pk^$14
zn7Z7|kGPbBcDMXNz_T{3edC*5w7e>l)ee?&x>COtAZmAp5n=U5TGd)&W`~`djOUhV
ztAmH&5JabJVif`EQ#dU841n$Ye$mM}jTiTO()x)w0h+mrihH-%u!&<mus8NKIqqp4
zYQ35;NN7Cgirfi?C-^5wZqT`A$b+DU*M?HqY&{?AE=qs{vfmhDV)!H8Qrh<lf*~##
zZp!I9NG=FJd=*UPZ<q9|<1n2=#ETZ33tmAy)5lo0e3CF(lTrSTKN%{w*4vg1`i7{~
zoIPe1yw7~<1?6u8GtTCgfvh+xy}IFCYfi~bfB0Ls@};JJ1r=O;3!K8+Q<U`AA^7#o
z?763AnpsT3GfTs4SSnc6LBHq3IxdoWF?%py9L<Vo2FXhK6}u4mFs^`00I#>p<}feG
z+iJGFPE!oeR8sJ)?{4Om1h4B$HAP823Tw)b<lp4C@LqlOBOtE$3Lq7mSWITC)lpI>
zwVBzjb333|$yqspku({4!GNWKfXBIZj0h=y?Bq1@XK8Oe@4&w7oeMhclzmTW?db3y
z0F%Z+2NWnQxqgZH#}Y~hNukY*loEdZk#CZ~a*<*RiJAXoi=8A(&q|o=rUEU7o1f`@
z-?YN2(FjNtx0gH{4md?0*uLV+q#oZQtWHq>0-LHx2;YQD$wEhKSx>=6LL1(SSXI&S
z^}wX~6cqeMXFdu*`LT*<S187mNQhJ(!GbRcI;dy;92;s*L#e>?!<`DTUPv5|Wh?Nc
zOnpo!;xv%&3+_r-o$g+A8O>SAGdG+qX8j=!<TZgWm1&778Sn^>U+82B*3tJPy^>NE
z9-O1kRlKUB!;iwt597K}pIZ#MY63%g@+Y0^Nyfj>F15oc^{zSJA!IC}G4BtlZ7d;X
z1;A@zk}<sBV{{FphwlMfHBj-8iPkhz)6z6U+ob8wTk)H!0o8nVT2XN;=_h$5B(5Kp
z_H?=~@_W+u^njBex7h&|P<t8Bd!KcEU{TKyLGQsFy;drcb#jp#NWnnL^uZ3~?fDG!
znR%<CYGuOxr!&r!rYHT7=m1%H58l<MgII4JlBx!tK8CjK+@_^ZmcrVGn!&^*Gk@r~
zXSF%!IqjxYG?V*1;D`(bU^y~NvpCspo1qqm4Av947l5?5!b+s6ttb2{{hj{P%ss!<
zG5&}wa}z1ic?+^DY1C>y5jMPfj4u_Du)Y9p4aWJUzC9et3vhrUu+{bTY~3Z)=GT_h
zcZS7Z*4Dc?B-jobQn+93VOt*pR^f_@7@gX5z+cbg8=E2BjhbsL=!x=6&@Z=^)7_Zx
z8cyh>TmdD=<Z)Pjs_yHTvMfKAd|uDRXI{qUp`%d530xU%qj&t!j^L%V5!8-;PLe%}
zO_L_N4)YFBz>X*k7h1L=?@ej`q6*p=@fTJ{IpkrntRt;`@-yW6{F!V*{mtx@#G%X5
zK5TjMj{s_6{?t<zIbpU#59`(!J-(w|GbWW=mlWXhqQ9kj#`5IS_T#QWRlj36HCu@3
zlxFW2!ZelAvmz&4`k09q_?q_~o`v*oogn_Re2G;xao<Vi#Bia*+?tF0n+DARNA7Bw
zG1TPZ`^eLJC4L;pJIz|e$xs!T`s7caM;_J@h1lwaZEKlSP)Dy>$CK)khaMNEZwU3H
z$Jc=?9iNXO8)Y#%DcsuP%Hx#Tt^)O$x7yOo!=1R-lJ(MKk&E21$9?X(1-K-vN`;ab
zm79-oo?q<dmD6=1ZTl-e(!&&_%Nex#+bD(3iy+~M6cH6t@+8SD5DwYbW9N@F%GC<^
zJSpIO0h~0C4E#8}=QH2MC0Sb(<w?>Ab(aLPT_>5VjAX>3(x|*Ik$BI#aqzwdx(QTa
z#HCM!uUKlH)T6FMPd{pxZrj-+^eTSZy`;W!zwPpya%IMcvr-Qf(yuImX4@D+NJC)J
zZo4QNOY%+2q@0_jiFOmM7O^Te@T&dVa|Bul&*56cXt6tE$;>z;c8zw~I!fAhuq*<u
z!0!eM;9{vA38A!JJvPYH4p&~&T~~amIVR=%Fc)=!VZjh`gYV+l?W=uyi_kD!Aftyy
zNP&-tZTvG_5~FqO@z-Nc%tzT_nmcAL$y;fy&{P!bpRPcpP^ZpTN@PH-N4J`j=b*<g
zH91<PUPYSo`sFu)-W#Yu6BK6`I%h<v;_w7{8zNxkh{suBKVwDEBAhO^TW_t(l1>Ny
zim=yN(Eh-nE70q3*9j)m(Czojs2WVBpyy_}>!#B5>~(gh+tbbL4tj*v=I#9Ks3&X3
z#T)XJ5OcD~JppVc@MH(c<2I~)a`XA6{M_eLs9X$!!gvH?pu3QcAAhun>qc%Er4h+g
z#|NN-IYpWpCEdVLbX<AEr@JasC%W#7p77GubGND8V<5>xr%J&nMJGj*gvg*ZB2zeu
z_lkEyiYN*KX;O}m<48We#qpe-d<1{;L#0~9kK&RY7w@w#@7CKS&C*Kd7C-^aj1>=1
zBjxnx&5F;C1dG;480!pWzAAI&G6q))$@IW0zQW9$bNS!1Mp7nKvkTl*lKU<fGMo|d
z-#rVPLMak`KH1?SI`HH$4dM>G_EbrBNZ9o_(a3tCI%BzF<&e1XLMe$K5h@2CrvFZ>
z!r8uJwgn=~&N5lFjPrjo9cc`7RQX!kt(?a9A-e?jBB82l7kxIu5Dxv1Ncz#{^^F1$
z{hZXMtt6tz00ZF`4l2$9CbJwdQc81p3ASBQ3!;aN^Me72p*D&$V)(h{WhY}7nFHwP
zVFJlpeXtlq8Uy$f=fe#Lk;h7~$i#<uX(-N=eT-&h72LP{$mCC7yfW1Z5uI6GFyG)Y
z4cAJxC+bizlI}r_Z+<3*`4<sLT8<IGrSgxt52C7<Y#3^u1L(Q#{uAXp&rs{R1~XEX
z3+wVfPNQ#-C=)V5+0G(rG!t28SBb5@MFaBHpB}c?<G#<WkYXHS^peiZhUd^t6QZfA
z`qr&~r1bjOQAYPcv_>Ecr6Ri6KZ6z@WeB}8+7ikEwG{W<2$h<2$(NOVg#<+wD64;r
z)+9LUSprStJL{~n2Xi#v`k<-}vje{!Vp5{6kM589)Hl_hPtNxCLqF!YHp!2i;Rq7=
z_2pB;0^>}f(G9|xOZZ8Au&%i<X6TBC*q0aDtDQeOL`%~P5p-r@y7Z8Yb1Qw^M?Ty<
z^u~i$XQ*&(OZt7VEvZ~_xk(E8K)qVd4>`28Zk0Vr-{-$kIcrqtz?jx**U$`|GDlFP
zS4i<{tI6pfODc-l({}ouePac<O1JQLxoPR2GdtsM3#66T_mI40YH~01DNU<KY#R3g
zqvFMwSz)&Y_yl;i3z?F(ef5Mn?af^T!#fwtpf%*}^Y7kS6TxS(&9JMo06Sn7$G$tE
zc(-5deUtj+IoOEbhRuD}CxH>XG=$!G1J~ZZ<Pws!OVnSv9=DK*Y=}JMAKDd$P-YT~
z%7_^MVjH`v>=mDo|D`Cl!G48XR<WPFCYfpI@R&KbIQUtWg^$=V-7Thp3)#=OZ$kwg
zpBjbRrm=2u#RjC0iFWCW4@B`8l9hq+uSKAFaOYF4%N*K{5RGYoD{#Y$5`@wZ)1?lA
z^Gs>sSo>q*-kAR+8kj>@TfW;nS$P?>RDuPczh)!4TPjKGVcW7m6XrpZBg^t4w9G%v
z?`y_tA*t~(cm<|SD<q$K5p~5CGH263Vn70kB`_<R3@L&(u$Ek&1lSa9(NByW5t2?H
zW7rB(nm|+a;@HZY^{PSWw?)feXz#DdldvsaNN+Pe2pY_O_xUKk{t5Pi-f8I%Dl0+t
z-2>!LR*n4+C}^-DpF*rCIWj9XVse$|F~bQ?QRAiZVVL?h77Y=-YJW-9NU!>#5pqp9
zWJ<Se9Huq@bo51e`3!Uh)X>Om5%3Ilj}*w16gt)BmlkrxSh7-98au?o82Eisi@*jS
zwRv!^@e;%M))hWg`Y_D+Mo@e@9@IxK<Jv;gRZ@MXFBI6tkmJeBj_`9IZ5%&b@*s19
zcoqr@>4$aX$M2lGD=EQ_jE5#kn%ZeJxP~gn%S;_8F0315p;Ex#br=xAdEW_T*AyXs
zU^5`tBfvm0aX2*ThP#<NIhVINt@T~g)6UZ}C^op<{NBzl0qumgB*r+6lAYJs+<sgP
z@P(Bt+}|C~H(@kDU-*oxeMFm#{nmw9)DmUBoA_(Pgi15-d^L=<OcL9vR0Qzlm4jhO
z(&lka^#NY?=QbL!DnH|txly!c;VnPDK>G^81_^#zNkQAzM8#7h!pP%1w=j>OzAux6
zo6jys9<PhIa5O0L4fNX}a%ECb3uG?GFQuKAIMwJjdvu&ohIdwvaL>@k5b<3WgR}tw
zow1J!_cw-=+c>3A5dv8q0t`1IhL|_ygmGjb9luw2zmg-+Ex6y3|3xT-P4{(e^dRNq
z3lm!R*l$pI-$WdK;2G*bVw5qZZBZ?*-rTC>5U!IBb-K11SAsk1mkzB|p4kwMwKfWT
z>iRFgu(W3gZw@SmZGSh)^|3Ijsg4$f1AvtiNoo;<P_m4(dA>=q`3W_0f$X7VCQEFK
zeUlQA>wWk@p-_nqtKLVXh!3d{L(+UKlM(2~4#6-ymz#PD<G$u!I)BRyjD@YRFY`~~
z1`!M5iAK%_<E&8rx?n!*APx%qaT{#*t9`cziL$VGKGDjY4e-Z01*QVs#+ulxr8CJ<
z**_(uAA>(!yH~f|t%}pz&_!3<ubb{VCH_m<oId{#;79#~F!zNjtIO@LRmNVWWr1pN
zsm8Vug8YjR$o(+$AlT-*t1I0vBYVFWWl~D)?bA9di=5J4GwLFrZBhO4@y9Fln<!Kk
zd)5$~<_(<FB0q8FNNe3UeNXX)9<X82n~^e<68(;iu{?*Ia?>FEnMWN^7stgX-&ubx
zSh)nq0{Zy)9Pe#<|5+RXHM_n(rEB@zTfCtSeDE&R3hf$Wk=)$Dr8EicDrBD*7yIdt
z0DHq@m8*%gLT^=^6X1^z%S5mJS&R<0oIZ!mA7zG5G<ZX?SCD>0<w67L;CM^CnErt<
z*RXht2z%O<qi<O9I~D8=P7sAyw-1XrnRu^wH87_p_gt;dG7RYNFNWk3C5p5`(BZ$h
z0V$-X=O#7`HGb@o)@J1EU&#%ZhwXfoqfZhVgW-*e*@-$OCe*ymuv5Cl@3)T@%Eqkx
z9S@d{p(Vy&4O>X2mkL`5&>Nzj901<5zhW{G8)(yu>qdMD4O5+$lkN|q*Ou<Z!M4jW
z0>--R^e$DR@WSp6jqOPH*I(?9EI34oVjWj(txLar(qdEcRaZvIkfDY<K1{r>E%*@!
z*>npRHoJmT)9Pz}DzI<3N#p{O<8-F@jg+cfN8GU>+cuQhsnnOV>pbadkHF2~UjaYl
zTl16D7@K1fEyvRq^H}%up>V-gngB;5I`F7$b!DKjstpzOlrR9&wcW(&7ZK8c$@jzN
zSzZUG>|*whJzKtOjVq*fc7=E`=v7ykW(gyxs6t+#`o{QScx!lw;EJpW2YQiZ)-Bg}
zB%=yJpB#-qgs{PF_?k*r`xUn9qZ{~9gj$|0-1F$0u}W80b;wI+$+~T8_ic`zXyAgc
zWD{pyk`nk+qmDO8n%Q0%c$Y(rU;&!e`lQ>d&_odtG1Xs$noYrJ+*1l^bl;<UTT2)R
zw~fj*>ITKitpZ%E;Tb+hC+t!#{~pFmXz*tz*CH2)^u2}~j&yhaE<UNv#^&IRG_Uh}
zH_45S>|xpm8CZhPq1<Djv$C;hU<^d{Oo3i=|7`z}eC|7D#9H5mNwa*pG3Qwh2{}B5
z5#%rYhTU@9?FB=^?p4q5Ag%adX)0SSIJc;?xI>RXsv!QYA8Xed&qgM-Wr}Jelj0p+
zBa*S+!YJdpA2&F(o#l5izZqW#Ea5884Im-<y<2}9LJKROSz(P(V$#-98^;7ru=g%P
z^3fhxIKx&_uvwzEjLS0UL$ei^YB<JLj53TGVv^n@N(Sy_6*o!@m38b67#E>{^1HrO
zSbUFJ3M0?L{}A~N2D+!M|9JjFyLd?aT7VFS_?wi>P<QmHH_1t6&g6jrs7=QP^>9p$
z9q)@}YF**C*aLnfM&`BEw#g=7Wl`us4_4gM2n;2pF8k#YR?a3hq5-G1*%*~GvidrD
zffA6I4>}fk?uo4mJ(S0rYLvTkRw)srRf1f$M7Fxt42fh?e$sw_M1}4gMkCJPK{12#
zp*F2L0HYFeX1v)t&`O&1)tl(RaQ2zzBld??LLcI?scVdtThuNdB|Btbs4d}fjfmba
z_Qxx!i#6Aqg<5NnJ){4R=0;<TD%8*k5KZ;Zx6jqM+rhpqO%AHhScF}N&wSsj?Z0Li
zbh6oMUz|cZymFR)!Tap3VMqGGgq^&JTQk>S<gsYui3kfcwaO#gK}C)UqONjB-mHPY
zgBh3vkUbukzn{(Dg1q;E8}DM~^g5j6-}E(8_YGz}-tF6Q`XL?q&r1r=%D)drK{~9T
z=M~&}Is*4qAH1upHkA!E!=~;p!kc`pS}$%o_b0owLbX3hPI<riAk!?)CXoHu;zDO%
zBlvI%zM+aUsP&r$p2%xoE1qEktW3QGg<s+GnSsD9VzX}q=5HN+AbU;E_qDu_KwCGC
z&>*X`Z=&xb#mS1^W`}-CU)(NATO#~qJDy)Gvvv0<rIHmloZfns3LU%I!cIT;(-Ry?
z95H>{ya*{cj&Nnmd>be)&b~Ku{9SvW0ep$TGkBRRgcsR2*7y1oR`^U7AIaB(&ot@%
z8(PkiOyA>x^n%sP3OK_yQ*5aHbbWu*f`569F5-ImD<;eH_p6-cCfl65v+Uh0H1K!6
z)1lwJpX=Li^lacsK>3%*60;0J&&7PC$L#L+)N5d?+uL}3<BxbD9U-L%gNL2{Nj7E=
z*^ZkH&t%evNO^~|h~g<WpRv_%O2Dm!AkQgLpQknCDR;sBN1$cOq|bnac(0-NgN}Xh
zeU{MsGF@ko=bx}^I???lh;eO!AMZgiS(l9Nf97IuEq<I|?~A&x%*mssZJ#`+Wcf%g
zu7cd2;tB<`#XF}uox9O@UL-6ZY@lA(Uw3(wB6>DB1kzfdr`pP)P1XsA%NDB95T4TR
z=z2XJqn5U{7J=ID4+9qij2!RVK}#g7uNz9tZw;Q_9>J<8hMwQ8oIkpMZ!g*`z!Odh
zL9>wKKh3c=Lmxxj$#H%AsGTO_73-Z5AXOP3bezbL!ncHQo8&ZSVxpA?yj~DD?|#!`
z^eo$+8hTp_3R*IJ9e69Zpncn4P{a{vf;g)r>VLUEE(fk_WcttXW=x$IqO;-1GX@W3
zKgH((A!r&EF5fQ<eVN(;p+UL=Jip+`1YS@3u6dc&x}9H3#@GUGOsSs-1AmJD#NP2$
zHBpa*P@-6a{P|{p^cn+9@TeHz>=HAkP<hs4so|e=?;b&b_Hgb3N;GR)NQOP8IFvQC
zshId@{|4$2JMT-rWg?QG#784eqyAtjGMLj${$=!z9%^j^T^j`ybO=2UP2`VppQneG
zH$6?Ls6}6~j1?So($|bSYuvJjFK)i7|8}6vKbGbAMk`EIqu_9JvaiQn#N;hHYga=y
zmg2Kod*>6QcC~kP+@FBws9ll2nSkZ_Dcc-X!pl6wBFmONf*XfocmrXduk4_0Y>LtT
z(sfd+slB5<0ZXIH>9)P$8E!^3rK@S->C0(j(kfpsUo!VDXO!c3zD3mBi1WMFt8svA
z$V{i+TPO0>`}>>l+Z*41T!Wi1;qi+3_eS9rmsafv@NL3HP!JF*5DBL~%s>t^GYcLL
z6JA~}c5ZG{bCZvpye1YOjg8IOO}ThDIXGCqJAE}X{r*)I^lg>>LkHf0=m&vSxlwc;
z2WnUu!;r;bNFwWMl-4@L&jme&We?|a<xNMpt#KKt>#2JdG1UqaKDkt16-a45NTWnG
z$fiq>{^-iskct_6c1>+SYn}u)9drOp#LTS<%}7Z)?X@zRGs}D1pta&nqfiNzg!}@f
zsh09>4-|TRBgeI7smjki5B8z$afcD#Ti?18r0oXOiLUx&I!XYrsO(}jHc+a%O9)C5
zL7F47#25Mud#E0{fp{+&b}P{{d9lg0@}o)4^c_D2(Z3pLVV*?y<&FU#P@M}IsSllx
z`#(gSX0x8mZ8nQJfm)9mkep@<hxpppassxl6b4aDLb-f8(X@k#Hw2`lhK6?_=KWs;
zUM%VJvlIu5p2JDA1immWBbOmeg12}+)<H28<a(qjE)Q4TW%jQb?Pr$I*{ycY>-zN1
zZD?9uxnHSHo+p<oUps&HyWZ>9m9rd8&I)24yBpy3Ool0sT^o*|89=Xj?65S<uwuur
zScVemVcvP?M*$7JuQzRjR~Hfr8{$82icXmD=70t-ass5!C&d4`@;E`(NBp1J7#||Y
t?1XY3O0xeu5Wv?W|IaTw;lzhU`2RC1l;vRI{!+q%{~_SGO7;Fb`ad8tK(zn>

delta 31507
zcmZ^qWmr_t8}~&-l$34|6p)r~5GiSCSW;=01?lEUcXuNxu`IQ8h;;X&OG<Ywoe#hN
z^Xhr=yf~lv&OPUxnfsn=;#_l``g=6QJsR*?3H=%IlP6DJJYf%B)roZ_JRwJW^5pjM
z!hW=xI9b>^b8-I1<oF@muJ^BGFM{s_$0bti<g1NVf<8jF1YWvuD47}XdA(-&ad(52
z@$n-I-_Vy0>H`bJ9KNrN)sd9`)QVUExj%spD=++#xKB2^A+s;^3@=8kIP*QgM)o;C
z+4`8ez?<Q17zH1Gx~u7=Wt}l9O-_=auSYcZJ8@EFScluPx$IVNBwj9_pFW&$@wsTP
zvYszNv5P{w=0~>tCiOQ#VH5s0FTX|(Wb*v=!};sCL2GWQ+UfsmOS|4<_S9m+)nbZY
zMJ?BaTyCvH;b2FePlnTTO-2v@GxjFYenG&uWK<~L@|fbUC7ds^1K-yJ&F%Dbn(VsY
zYYD@20u5s-26)Nphz};K4{j=dxGLN*TJ)6NA2c!vs?GbL{XZeBRYl82BV?0Z)q#n&
zdK9`p2Jto86PhQ9Qhs!a)aX>e>yN+N2VyF08S>cupAi!LRenD2h)E)a8*sxTvJwFP
zJbz*2h+V*IFI14v%lV?CY%^!Bfoe7C@WNN}@Ma8uzoa}zv!qNl+j*?5VM<Wg@4RU3
zH3M@;3@xKq+%Uj@y7T})VXNPiuC5b3DcZxFxlFAo;V_)enyJe_t|K`ElxjC-xC{_~
z5?luZDo9GWhCp@f;LGk(eI=?*u6GgP#~apkiE^)^b@3t^t^b~-EUE4!lN2e2X%NTH
ztrg>#3M&z6=J!eo47Y~wx!Y<lujdBtjFM_zE&1WM|67{Ck|i2A6`h*sdA&<4i<-+^
zk0`$L&v^FW=tn?r`)s!WkUq^%!6*k^`dZe|>PBR{hebB$lZ>!!glBgR6QHYTe{ti#
z1tuaeaHH+Wq0S+&;iW&g;sPW0=*m<BBd^I8d>Pb7TV!_hx+E`Qss9dT*NS{nh!m-l
zl#bR{yW14h{mmP!m>WuD6aR%BIZJ=<PZZ-FTy6JI?@(*hq`cS$VhzVjss%++&sP?r
zTTNTl=Z6Zso2U}gSZ;6R)eoM=wp6z~yL+9hm310jI4l;C;4`UcSho-d|8-9tF0U0Z
zwaFe<OtM#0+Jt`r+Mj<*p^!MVnNUpI$t3?~^UzgbLxB_)k-jvxf`!Pu^<{h`|Au-0
z>{2*wu8l>FT}T)PbbP13Vo+5-Q#hGl-o$x2As3W8^`cwmIeN42L4duv5LM(~u~b$d
zu4c}WP)tJY4ISp<SrLveR-*Ilh1tKbOtv)$CsCy~=(hFUQ$I54k3n3&$3m4~hquXJ
zGho|hvh~EL`WT;UGY(+Bz4B*=Qg!FOx%>l$uk%lvSWEb=0ZxV<oPqm>F}2qMc=37a
z{%0fn3^F(QzUt9%LZ_d@iCn+Qe7nWj$w%MBfAy`#z{83{$-)TUIO|Z#e|jJvkws>4
zZG<IoyP;g!J{4EFnJBM*3jfVZ8!XH7ZGECZUNYiXmPF>gStar4m%E=w{!#UqJgh#i
z9sT3mh1PPH-vGH>Z=-`e9;s>4nywwd_2YF;1(S)-`yWEiGmBk+yB!4_bp)<hjS%}z
zuE**m(s~c*(WPV*aYTw)b&=n;ZZbMF*3O%0c6-?n(Y@UBk|Ir?)n&%k^8253oUton
zQy&_?*_Xo}3$vwWE1+O5=YKzCEiC=>xWeYxgLFZD9>DzTfO=LP6*mw|oE9Y^%;piz
zpZ??P3XOciWZ@h!ce3`hn05@YLTBPKPTW{JSD!EY=5B)7=(o35o?B=R-{-G3a$ZfQ
zP%my2W4|zHkIf3sArZq>L7R=3y5v~fa=t84FovDbTYdj_Q)0%H-4yQMniQGfIR5us
z@KoWPSOg$Mw^v(znJ+LJmm&LNMx23rJ>R}cuzT<MgEED=IX2fRpE%`T>3Q>`_-(1t
z*68>G$CS&TJ{h&qg15CrL_MOn&gKe2`{NSKPAcC#&9#rJ^~VFD8-s*Lrg~x`6y^b<
zadv`syi~>?1I3k1wuElngjI8u<kpXyKFYCXhE)Lr5^CS7?EhpGoDJTy6$q*0B{K+X
zHTO`-CtMHY3#69JRbX;)nY^9tnm04sYU|JxboQkrb{H$&3q}K6wp!gLXi+9evj-*b
zhH*EtW7ZTDM}yfGYy;z>Li7C`#=(YXjjFUj?G=wl!#|T(HQFr>N2uke>N#moWH(R)
zds;x&upH(6)VF6;3is6dc~=b>6rqy3<Xw!$R}0%?eclzCnU<7bA$?|V=Ze5zGFh_S
zHovV1BviT$o;{0-*CosSYaVqU?DWh7E2f}QRdHe<6LDf~O!7Xo`JH(f!N%WrOv}84
zcM_%fb9DFt@=>e2$?tjS__^ZGEcpb&Do65xr)vX(W99OHI2HE@+p;tQJQ4pYZ0`kY
zu8-XI{Gyc{-(rw<i{1@=dlo;ou9k!fn&YriHJ-+xJ!xtq{`rroN%b4E%phksvpD<o
zTK=C8Sh=Qm3y!qdmoln67O9#3rZk;z)?Y_EZ5fTSEqT5zoj1NZRcFl=)%EEKJo2Q<
z1OmJlo%EILYt79M7HVyJA~%j->rx#8GNnEe+8QMn#FaxnMk$P}+mgw$CL$g!mDWKM
z{i!VW4_JQzLZYk?!=H`3k<IBJ$3A66KV^NXE3m*)Q>}k~*V{f>s>jMy@`^jzYjCFj
z1<W&xAoPvI1%ZP?U4lvK$*us;A-?(S954nO<T95!q18Q_3qRFqub?t$wr!Oc%vsc4
zwOnYdiR}GlYa?7xo+4tSKchX=Pa?mLv!NEEQwk@xz8ZJ2xE24!80=WOjMHv+{VoL-
zdiiu$nVODnAY#gZVWv2fcPv%Qg?8*B@iqaK)%2YDlyrz2Q9aq1K|}nODjIBF4rCBy
zc^ab|=Ws{_X$*Yft2E=^rhM>H=I3Pdgmdvyj{O!cdyTs}rlSLTUWMIM1&`|ehSP*l
z`eqj0qI*dUOBc{zm3uw$?}11uGel|r30~!gtga8#N`kStsZl)qoziTRjglrTwBAqp
z)z>29j?0Cd7nXcsO$Qbo31>t%-oWl6Sg6W_MlaePz%WZ<HmB=l<TV*j^QJTTFwl9{
zu`<+w7A)FZBw^XZEE?}Eb)NoJMXE-koKld_p12RsJ^#VZ5aYO#+1HK8UfGX1c1gr3
zEhazf(}<Z@WXvbAm1PQ?BOH-<&!9PznAM3*F(wmXm#dS!U2*<S6rDSMF0d%kD9QD7
ztwX+2?_O=)WK#S7U5mNz-iP}!oPgooZpRbO)i76)yUp9pd2zV{Lm}Cgs%A3=PlZBI
zdNw%6>e~-yzjazk_1k7@<i6q%^ve~zl<Ic#hmb(vbio2Gn@kYJ)ACUfre-?L2gkv(
z2S7}AM<j!J`Qcz!lJtz+1bBWhoA@o(jxUD`LAKoZdjUEJ(5q4{Pwj!fKP(>Rb6y|A
zRRUZgiFsUZgd88SH{c{`2gt%32T+2G(&Qsum1@=nWQkZvC!~qQ*%`EnN=f63!}%gV
z&B`>(np-n;G4SwzX}hSS^s;3bVyNMZhY<YD*s>sK<C~ac@B$~c;^P8NU07Wlo;pgO
zk9H;eBDcz4?uswjzQ96TAgl^|szR(M^MeVCBmWZ-!n=Cr6|tg=Qn+lAZT>XFwM~Am
z?CGow5czH@=*-xjKM9=wn}L;&`xnD=>-<RuR(^F00__ZPYXbCGj)NZdJdCGAsd~?X
zI^}pkI1fcSvCQlypd(2j<OYM3vsRh2!N;&N+xQECuAVAa=+w~Z%7sIHP+lyDPHNt_
zA~(x66AOOBqVRGKhIe)|90nXKlq!a11ao}VBMkN6uPw5Mj}5;QDgP&;V(36H3(j9)
zK=N02G1TQnQi#mYLd!m;nJzOukNDR?-zeMqV-tltbgiP&YC`}x*!=ba=4?F-hz|9-
zMKe5R8S0ihuu#HD%r?wSHmO0WEea|^w}Kfs?u$0jb|thsDx_#qS@Sr|4S!Va1+wQU
zU7Rv!HU;+AEF&BBi5d)^1sQe$p?`&Q@8&5^ol`AbQ|qs5A+GM@JG4VPwEMSQq{n0`
z^I(DtQ27}bc^6<mjDFKLcJ2*~AEN8PFzYfgIaZ`p_Nv3gMLIa|#LV@@3tPnP2=Kux
z1d$#xH=fhyD82Eq)s&glW`j^!7d_2dvM#URIT>vm(_$1ZHM2Xlx}txr2yWP!)o5Bi
z<%qb&i$TsjL86|63^|kCyrjobv=g=GVL8~>o{KeJ#(=wbCxh{LcO>a?K9g}xSn9A#
zBBCwI#iV+2CaCMd_WkgXPHrkZah83BU!~Qa00v&cjr5QvasYK_W_S!SEY|FtpI7$)
zH-A<-%+5UJMLp*j77^Voqy)rxy9L)(u38Ue;U*j_VN6F7jhpcsCd5rQ<hz#dP)7h)
z;~e!2kRlJQEL09iVoG8<;%ujW?lbZd)$=@LrfXcBn)Kgz&=f;f#y9;SB_jLCZ{Xi%
z1hgtLdNM&w3>*v^M8=Wdzk@qpUR!+-F}Skc^RV!HE1;fE7q6moT~J+GynLc282sV^
zNAuf_ReC_5r2I4DH-qfG10rroB%+E$6Ql&taDY5Ata>Niv^nh}vnhPW=qr?Sfp21j
zVTF(2zoqVyebc5GH5HRx;ZZK%dJu0)@G|35U6_oDOGDT}#;2OFw`?E>USxt<0i!|6
zKr=W(w$M61RQ9yW2SeE;y6;*M&aUY?`#2(}9!F#$_`ea!7jHw5p0Q;^AkH6eK>+Ay
z^w)>kshrk?8E0%k2-^7L%?N}uw#*28`QpI@ubiOk>0Ds9?rLxf+45fmQj9F13urg)
zF{nuPOg0{!t62Aed@DT{#70(_ZR%H}`2ID#=-|f)9HzCpwX`^&F}emBo$$vyxYAg<
z89DFmVN}qfEfoA>z~WQ4CJ4@W2h@Zy3|$FLUFm-rEwc1ck{P(97FnBexjNmFQ$POU
zQ+akQ<S^ceKR8QbR{qPlI^4JLS0CjUs*6M)auafrL!rsGls1{?8Vk{fynipzy08`{
zGbkm^ORwG}h+e08gg%(1tYK13u)8Z_VLrQ8bdo-FCY8CCr1wdg*_6~9!UVod5S;j@
zjwR<dxBq6BV_Vdm#UE!~bl8GaCS_6bSq;Rlj@RVpB!cgg#Nj$SU+-0NeOi8^WeijH
zTY<#ath|7}<-6SDx#ls7`QB!(wUO!rB~Rzd8^y(DnCLqPa1TSytq&dLdy)r9yWA7!
zIIZKWu~)fEX%Zd$zJ6BMV!&I6O4p^#O5pphgYqoJw>y<E@U3B<p<hl+F7~Zb7S+P>
zu~SmX>%jSYK#6e`x1jT(KzT}y$5qm79MQMdc{|D2VKRJ+r{vd>aYe(861CmvE0G&e
zV_CE6pF^6A-15ZdzVnml^W<1M@%$8Wxq-^M+^Ege9kpH&{n+VV2yBmFJ4|*jdi~CP
zcW>=cdooOH!d(p0JDwRiC9%3bVOgVa*hn|^QVrU)FWzMLAnnN|PAD1nRy)q7UJ>m%
zUFbT^w!K#6%`Wb;iP+|&Qq}yJ1u`2W%%z~0;8n>LSIN~cuC)^y;>$h@s8yazALgZ-
zOM=|9<C>5+X3sWs0ZU5ML)Avp!v?She))8F(+%9Cmw1wNbpF5Jh2BoH#d&lSd>*(u
z!N3wwIz=69a)i0^T?c|bFy1w6<e@UD&jraQDLq9`NtrT;&p*Nj6n>eeCRVsDqP4v`
zK5l?~{`dZf*U85@uuto?87mHzrn+-{Tu)yd<Hr<Q>2so*2X=1r^tkoDIFgTeLLn8z
zHLOvF6&Q=W#RFp}cjy+1YH>8Zkje=+)Fz*VS#;tA;cMJ@u-3zC2{43Gu@Iq>cu&ai
zii5<A{1?kPUd)fp_<NRK%Eb3Xv;hAUC&I2)k8pF)6l!^&3c5lscv_OL!|MuNqnwvi
zE_*-3KBWxy;T>W9WhyiNx(FPoE)_`o@A=R1iX*HM9<}67%JpZ?f?z(;3OU|D{)D;b
zrSUS|Bj~oop32c1NPdxl$_Y7(8S6^@f__e0Vzc`vXqht2P3oUthdxjd>7j!>s}m=P
zh)JDYRn|2YC3Q$+Zpm#I!Y#jSf-KU(i8n+nK)RG5g%Q;-9xZRxAWp;Y2qA7C*(`Fm
z;nSC+iA}VsSO)mcfxGmIFwB<`H_R27OWeCZMvd`HTwI5z@BWz;tB%3ut*+D(Sf?{J
z4XmPJqZLnab^@NW7*S;r@@)~=f5(~$)%|&&X2v9#)}mja`P){DtU^7Y^3e@k2HWXX
zAdPaQ0qjy{RInMypW%S$pOKAT3*GT2zsJA%wr){~A9B^K=d`pXsS?usiyh$u{)rj^
z{W4YmU$7W!ibDo6K&CnsO65iWbV~o}{M-#VYUUIwuJr6Y&Ttjyuc$-?x~fdMCRa5I
z${E$hmhOIRsf^rjzUS4O4Yo8|=m0czuX<%)=RE9^rB#3pJWI5fgPVUjmG3zuTyyYX
zw~kYyKGyQQ*CXKjw2jPTv>q=22PSupe2Lee<Amy9EEEP)<y}Vpj_mk^ahP6ses8KW
zjO4;Azx!>v@4bsu`rxDS9eE*Me2(k3pZXWx0Ar)P-*t2_(&gJy9Kw8g4+nUD6<HQh
zRiFu^k$msGUOs4;W_M53fp#W0Pgi)Rkwn1xTJ@B=&imUtxzpevQl0V;Q|QxX9YW&V
zpgf(TzUi`o${DN{o!Y?7VWwIg0$@3dVr$?57oWXCOwyy>hknl|JV9VPVNm|%eRO9s
ze7*vls2#~v`?X4hS#NgT5-@716XEhGGqgv*mCA>@pc*ap%^DS!C%!*yk`eG3{+idO
zaf|TI^E@fJMl?%L&r5bLNlVE=e8f`LCdn7nJaN|My;lw+gG64Zm@W<P7{|F7tZuW3
z(L=c|4Yem^nS*YB&n5VtRC6}JL{(zy_%N<I+kO-j$zM<EeDwYgK#>KX8qvqD{fME8
z5Bs(KWmoLg@DTOGVAXNMvp&gBu_gg4t4vWH=V`~Vn!b+a@?+RF{wn^~F>G=*6~Fkl
z;aRAAv3`&?;z%c5_WKM(qlkCpIF!Ql)+!|SVYup;>=}xuuS3M{wme{!uDFlu_$ZyC
zS90U=ZScO1McM~|t@9YB{ctD7wV6M~2CGw*2D=Kc74SV|cdpuI>&L(m*0UMw-)C}*
zsCS2*Tx`C@HYz0Ie#!QH<!<8&)61s9Nujh4o~*>?+HXEWseJi1YzdhSopFOy)vvlh
z7+EEFWFX8+kU;mk6QlmkKUM@jwB48=Fywx{7-ldVA#21oNF8g*C{Om;b%{>=Nyfl7
z!(-M>zF}o1*V?rtj~5xc6U{$K2&qVJc(bs1Bxm8$&|F>eg=eIz2t}EAM)n$gs39Yf
zoLmr)%Q@5MMNqHnMV-6_CrNIp$0Vx9q~2c+ceNaN#Lvcro(+6m5R=*p=V7Rik9|(X
z{E|2QM~!AmbG6)BFUxP$8MhV7#8ZbXrc)Q*r;CU%l>(nDBZ-=$mEy(Bcam$|lG!5#
zB(2?<$}J>^QdzXOKSLaHTSscmWhpJk;`G9S=vu}<)Kx_O44Ed8?*E#enL&NZwsXr*
z8%U_G76&qw<nq(M=BI1qZ@(evn&|3UWpF&9xuiWPT#-rS2tz<O+yk2W)=a<gE>eci
zdJyV-R^^0B>cbdQD=3Da7LROV87T?S)uh<=WzG$v-(CxL9B5od30<nCAVr6Li--3C
z%XUAlp)MGg{<Y3OlnKx57j@@spDHc7^G*$zz2ZUnM{=HyF<+7kj!u#F%-8xQ1ZYmo
zWWwk<AABtYUj~-@aUHzyz@^=8|1K)`cEIX9otmrWSPT48zK6~EC4L_vDG(xmfY$n)
z&J;|h2#_3}ZhpbFGQ(8@Csm)<9q~s2m3xq^cBwcLCI=_=p>+d0*q0{6jM7?|bo+O`
z89Ctf=JNs1(h4Q_*13*hv4aF?zeIx}L5TVOM#bG9!<2s!@huc!s`ws;bF$%dUw#%J
z6(PaSH&eLo;M6}?zjMb{O=1}1&u#>q%ou9Tef#t_G9s0Hf>y4YmkxwEBR1;+jbV#g
ztOH?YLQbOA#_vapFAK@z2aZ*1$tA2-6-#?5yof*+V|gC`RJN3-e_K=-McekathI!Q
z1q%Kcx5{W4PuJlerjXG+uh+4JWD5uGo^EU7Nq%<vdR!@~w9Q;&-b3ryFeot2WLRF;
zA4uZ=Gq$E_#jxD6Rxs-|P43(Sz?{U>He?wK1WNQ*++7z5vb2;VN7m4*=xiGZ;MgsQ
z__6M%6aG`Iv4cI=>l^Bh0wLd2t<@7hMo@~e2Z*-lPe)s-kHI6na<r$PL|i||i*z2z
z&!O_uv(utCxWTYgUxzFNlOJKwhxP=YfAMF=D>t;9%+%UaVD2P3<aVY4!e?TiNQ`k0
zcm@n;KTBL)UvPD!<!y-^-dlq#^z<L($L;M+Qh>*sHwY~xBq`p<4u)O6K>eh)DSU>C
z&~vxZGbYH=r9WxLGixChkA|m)(4|p*DaRlFP?6QeSvSeR>o+ZbN627-Mn8^>l#c1a
zmNpOHi99t4!O*?z+Y@&J)OsS>PlZzMuH}Qz5Iv52^i7O=v2c%IUusxVx1dt`r3P!2
zJ@%j*;}Prf%rA}~qQ*6Cs}Q)G*xw>`B#2!;{8!5<Kf<p;W!tEk{AS^C2Vt|qah-8g
zW{f6UTjt}kQs^G+c}dSNwBnrGG*RUG*KXetQQd^9uZ&R<q*(?KJkw?^MzKt#eeg~%
z!_Wy6d^=3zlIF!5_ghuQ`po3U&a!URazaKOM*H_{j?x~C_3rB7`x~F*iK&BiR|H3N
z825a4kVZNjVIitCqFUP}wd?wa$riGVvUf_?sX8xL^Pl(HfWy3C%sa~$R+!adaEqRN
zixU3G9#8zVT_|vIS~}g_*P62>ZhKAMPX9wme`z>)TfFYaF|lu3=Uh(41S;g`r;Tl^
z8I$%sj)`?)6*o0+ef?oMpRzni1?t6?y<hImFEMq-4%&ZY4qG06(D>o|JvqO2MWq+B
z)Iy|TNYrqAQ)%IBf!G{An$;=k@W`T0!UwvPPrIFa9cw_N&9}o*AHnP?rEla_c#U*I
z;w`*ON{-tdI8jCJweDI?rEM#pjm6f5fqv!uNE+q~_bG!)X;1sXEso1Z*7N4l(Aqzl
zGO&we1d11by=ao5<R~5^`$~cD^~2h|f{T4f9qnL3#i&!o;byVHt*;Z$w%kSguyS)(
z6IU%6zc7HGa+;4%p18%Rt+7>%Jy|o9u+>?Y@Y~ph0z`$0RT<ja&#`s-!uZJ*jvSY`
z!I`<ll6y0QQlhowtr*qTuv$^m!Pi4xKGGTTl@uJ!Aq(Q_zX3|`^BM1@J)2z2VE=fU
zD<E0>A1eQeEr7k3KN}P7@3XyOh}vcC{~LGs0mBkli^wh74j8Epn4|7l^tt|1T~`s7
z@4bZR2*Wd9KuG4^k19*3aJ<?Z`x6<FO}BBH&+@DKmvU-eYBik-S5stPBXq^OG;?$$
zMbS8&>3)f0l+#&Lk!!%MfpFs$%pVJ>eQPF#k!^Bj*7;#@Ul2;?O+~CPl7^gNH-3qG
zbo33VKNX>BJ1@j0S|`38J+>bBEW+|?p!(j}#d79ThL(U3Ld8TY%)+yBczNq<wNKI3
zM1tNmtEIfQL|XuXc<)wmGFr6{j|!^*tv2gAYjlygSmyC*wzK2tv*!0ImYdPvE7}^I
zyLsqMY%fXD3}}4+bXi|2Y_SY0=47+DC>*N*{w!KLZko%_t}#fy>Cg<8=MmFx+fj-g
z^#w4nu8Xv=w0E3(J)vd7f0fl)KC6`Z)P(rGrpG&n_ZaiFN0I!9f4XY@64ilAYVI=K
zNF<88c;kCY9N3oAuP6SEI759FBR>3igSYwtB_3<W@ic{IbkjS+g0D{8UNh4FJOtqb
zjJG2|46WuD{B3U&zwY<$ZF;x&fk?qJ4V$@!xAfq@<6a)Jk)+Yi!o!e0bwNb;(DHpg
z<Iw>d!~koQg9!4fE*m4)Ip{zOec#4ffe#0%Xg$D3hzuV;+2ZSt9K3`th3>6tSS#hJ
zj3aY@s34G`<2!YTl8<#$bprI7b<Y84_OqcWxDMu!Hc0eKp7k#LT&2mH%zD4fXMz&}
zsy3-(t8=4aZ?NUSAgG)|4utt7A`ZT<XM<XJ%rw_SU1AZ>@d@`OpyD7-WLE{;(TFli
zTRc=F)LP%s#biud{9=Nr4g*5f2w@jj(3Ngc1{?e^`kmrCqnQ<L{bu}}7%;+z(E3Qo
z?vEE2?7POiBcR>z3*K>+;O(z4oI}+O8f@WuQKyu~(2FyVd!I7Y;YZVpmyF-cYu3@}
zXR6Rm_*s`!tt*^z@8<W^x?#Can*0zSPARFmrKq#B1`2?WR0AnPTh8qrq!4;A+m_Nb
z3DP@6M)DILBN7jx;{<yLSVzETT*8{A**<pU{%lC#mxNirfL(PFe;4S4*anY}I;Mdn
ztp!OlKp1sIm}#J*1jW;B?!rxS*R<y!Gn1H*>Xcafso$+bD6t{7?bhl$Z>_CTB1y|t
zgEs~UIE?wF=6FBXnZrqu@<$0}0w2BcA)dCFb!g(UyXE#FZj(=diKjcNjD1U<1OvV?
z1z*peAfvu&dcQLJTyd;#D2_99wyupHW42FVP4=-|!&|);_^B*$|2(1>!doUoRhSc^
zGj38BUlBfrZ&=&N`DR9G{C<rauKNQrgKQZWV9~sJ0?MD8mIyj8I6tX&GVhy+<YWjx
z(p_Knn3bX`mk4wN=;|DIu&vD$>W+8VPH)JO$2(wa`8<`+4?!vAGMPWygGtdK2_ny+
z&yeP4=yjIXn$sOWpuqy#cR?QfVG=5Lg!v;{c+z$41o<P{>LCj{C4_l*BX5vC$<I~j
zYlF+&!z==^K2Tu{G0o5+#V+mC13%Vj+v<gl!ELGQHuK;>S?Ty!Q_o6~&MJBDqKx4B
z#2-e`jgKfPur9Oo4R!iLg{r?!aJ~1;Q){yy;uWNn_7|e@9nEUi+MW)5Ipbb$b&te4
zmc5ppO=+K1su3BY+sT263f6z<4*FS^VPEvIf=JjroL5Rh@(&4@EIsuD`k9$jV>M1?
zCgq0>({3Ap*PMr((9|a#YWErG8{LQGCMx%WW|-HDShpfMViER%7M>R-3qJOHZfTHw
z-`~?87O_03*50li8CUcd1H6c+XWKWgE;~9;?uGuD$ePs7LKVs~^HGG1U*)p$1f{Cj
z2j)fw=`nrPaKb(4j#e&B7IZ8)WA+gHK?tm6{a<4M!?OpRD??MhBiOR!b7Q=D+*UFu
z5V9BILwvFyC;Iv!aw6hV*6S%RCW<gX`HOAM+A^W?*$Z0CC@$jp5QMzH?%6A!HjN|0
z{#fbzw`x_qSUd&mo=P)z_%{PYr%yV{iEnZKAg${A>Z8mzaxLPQF?dl7fzUhe#xx4_
zTiqgHS(qTe1btQpYvU=GW$z9@8;8oyfHgOn%&Gatt0U26$Om`xvAmHvi?(zHR$?(p
z&2L^2%Tcrevn1Glsa!&DU;n|m+Q8}*o$?Ni5|5=ABpCiQfL#iFPbYJJrgn;*V?h1F
zhU1H6tI2!ZH0)CzkO01H3U4jVA6j}3l7g9LfY<3YB4L^Bm(cPqLBK#9%)D+-+&AP?
zj&Wxcb>~>YvqRXcVawi{c_Qwtba($;ZqRKLfmxccu<lV=E4S2rg%nYmFij(lhr|(<
z+>qr(Ug@wQb}Q~Bc>#mfeCol`8@?p&2{8~e`bdFtOvO>bj0mf&#ET(=Rioh~W_cb}
z;8VmGA4wY~`Mq$2|JIGrEzCc3b!9*7pT31x^H;y2(B3;*0u`p_OudYj#J{_-GFSWW
zlyf&?1TiI4GS}Ar=2Yefd1VqZw`|3j$AgJvM!P)5p2P%=F#dd?H{FV9CTxo^<rQyY
zp8fXXGPIi4L7tHeZ3!*I`|O6^+ZE4p6PQ~%KDYl$v&yyr$#otdvg4<4hWMaAbVN52
zL8)GMOheEvnjZwKour*4s7T(Y^A5*<T^9?q^=|t8x2~iyUU!?!x9Y_I0?pyMJ=*>7
zRsnA!sQGHk#796Oe@ci*BDB|MfOchtZaI60yW*k5Kl)erFV^L!%P*GgOih+~34j27
zcHQxGg7WCMia*w)n46!eov;heYsKBOm|6Z)@0IGYav>VZjt^+@S3_HR?)UtbfP7o~
z)GehVAE_uzmMVkti~wB^B<dO+FE0Hv0779mH1~T;|F|w`?h}^&2|nO)&EgmxFWupF
zz%!{@GuyeYyH|^+p8JjIg_hNy-T)E0zrk<ISB#qH=8`S6ZPbG@jX61EtM(o~I?Y4f
z&eq?N(8kYt4C=Knz462Iw$-l;7aBb2elf6S6cLj^VH1{c)h39HIU%_b6W>RR(cu1k
zz4&4*wfR|5YJRz4XujQze873C7V$C0im;1P-5>0BB@X%=E*z9y^!iefMlO&XR)eNq
zaSL#*==NQDa&hr)ZL)%>-?TN?KUA9dtT}LujEU#Q=o4qdDwYDST!sg&V}}rnVFMa+
zpKpXVn(gaTQd*Y2J%i8B3ptG!vQLaE=&Lg<Jxj;lS8NsmTM057QBKqDZ~Pd|tMAB6
zb^DiIF!ZkD@^b_EP{}UV;XlBBAplA1U}$)eS1(?sYpD47X54@{m2w)-6THIn@p>eD
z=w-DbVJg+vCZ<ukY5PbdwJz~=ua|pI@-z5N!FlgliH)!&0$-<%R9966M3syJ%|AgV
znZ^9`FH>7Bdsh-`ab;%6k2}T>H*oT8@8mN9TUF~wQ^D)`8)6;a?E{m@(hA%X-=^X*
zI)-weH!N?)Di7Wb;!d#!B88UTWmwq~a2~oW34!wA_KSZj;MOC5-8;B*5Fm)}s<l`)
z6kdNTvUKbcj}TbrGTm2%W-oeoaQi>*6!hCxt)DI=SXuhMcM5l4NM|I0L^}{_KZmQd
z4`|KKQcv{F3j}Xq0?PZF?V>)KHkSUS{Dt!ynW`;y_3?0u(*nfe!CjaGDG6}~@{C38
zdShG)y3mJIsB7t;9^JW#f#u{!sz4N$)O<@cq^r}1xY{1J4V3Y1N0J#cYP;(yIK_U0
z;0UiG>SO-#2twz&iw%-;i#iZEcI_<2M2@Piz9Uz%J)RSoMlRhXSJgLl=M*qClOm_$
zgSEAfRUXfgoXSFaxJp_+vZqd=BO~=VOYorK>sVd_-A)*7&!HSEhrx~&`?C^Dtn&_h
zQzovN<za_|+iVNx4))+5(#`ut{;R77TUGXRqTg(9x7XPD`MV?|;pEV}EM2mWgyz(Y
zJ9}~uRxprWWNAr;XGjS=U*D-Gy6&E!(5kqJKB!&NlSOx#GqpF6<!^>Y&5agLG($zo
zh3}O!D(0|iboyY$`XHruNQa7IFDQnGOu0=pVh7t`b#@#J%1_d4jSHPX(o9gT&Q3mu
ziofzj183Hy<TNko$!Ee5g8VUv2{`B`>IPZ@P{Gg9FAUV&ZT3A6+({Q;@Vog#b}vKl
zl$k(p!z3?AlyT!J!gxkIfu=TkaVBFg4dRkFoiidik=hI)kbfZZErBOf->ID{m5OIl
z_5U5q8Hpxd7&FG8D)pB1CdpEvxKrk8u!8sIs`%EqnWRLH7BfIcmS1d+KY>OsZ*2mT
zub}%I+*wKma5wbWL$QoP_^fyLgeRX8IQHz1LzdbZNJ$~G0QKlzmd#BxwzaHe3nAI~
zj-MMNXCAJ|uEDhtDL@aIM4tQ2tqM+9inkx$j#L<x&xzcXuX5#6xf;kS@`ByB>*teZ
zj>)F(njxgHipXup1%Vu01mkJc<M(fb!`FRnXb;H}1;El)&YP(1&f;pTqO(wR8jQ$U
zWi^spvfVeTe0^vJ5)IYuUpGG$gqM2+8>*^<5=ope7_C)w`bm;1;d1tK%EBOn5lCj~
zXRtRfXtm*U6T*1l+XN}){F1S_4{gBt#V28~i2@Ov$!ed?rWjFpqN@&M|CdZKSX2F5
zw-wQB7@%y;K-MvVk8GP?cRR5e5fnr4!`qYHf@PKz-9uzLLJqLQ{cy!eS1hR7sEgZ(
zid{oI{>tTsK4NL7xu2ja+YgaJjW(O0ZfR>Jg|gjus&7pp9NeR5iJAN#od)+nCThVJ
z=VEo5p6R~8v%0Beo|_kcq}~key)ng9VXuw-PGuc}Fqd8Y;QHucQzEG?M}bg`+oaQD
zj1C3eCelG*PD1F&V217*XY&WJq}4nX@W!YT{&N^pf36r_upZm9BqItZH939@cDIH&
zZaW_fPT51Vb+4a;V^jVncLe9)O&PQB#wOnkNdOTY!HW|}B8%K=1jScRHeZ-;%m!#l
zvBMVfVyp|Y#wrMxW^r_(>apENCEfMzCl$ge+gY2ky=<XTFuj93G3Y`9E2tWAeiXGJ
zl?<ZFYF}zhw5=217LPe7<OU_qIFqR$GAeRftlgS?sqfM^f^9gYMpmzRvo-BuCoS8+
zij#Npl8SEf+%Af?xqaR^_hOu5-OcF!qxVOj`(WdD4Ka;Au3T;E_B4*Pvu&qRpIR4A
zZT^Gnr`DUT&^V8aiTF6~c{KtOx7Hh$AHQQRo)l^SIi}6a!fIIx)FPfdlq$p8ZV0uN
zzTW>)P2!e=KaqqbIu>fJ8l1h^#RtHCkD|WV{;b+Pc>%?p8hsgl|H7#FW`N-69c1RQ
zBV#9VNzMt5$QN|J(4oanv>|yu-y7bpo>n1jhn7qsCZAgIyoBExW44hII&jgv2yaMj
zpGMLchBI%8LdAb2dj$ARWEdKWDa4=^GwG74X`DV0U6fFyH0_&{|BJr2BLT?zV*Z)&
zjkw0GV!PzSr8d<)vY{kB&EKNPAYDOGh`4?iXB(TWK|8MyQ?d%W^obe8I=-ULCQH~v
z)$w<4qFlT`<#3I+(R;Rkhz;uYjz156gfUk51z{Tr;UVMoySIx&r=Fi$Q@6*Tc+(pH
zFnRt5b%Z6%w(kif=l@3_xf!hD);{}A8eD^FlWR&o&+y2OVBP0G7Qy{l=j<6Mr;BWA
zm8yl4HLdt0sy=$-*sh>dM@o?hTg<nF7Ik|VI!quHy>T3-djCgR<jMMp!|Kux4$w{G
ztx1KEt_`f#eY;rEJG)H@sH~g)>wWs6sBLtyASRA`4=9=a*jtq=QChco=zCo@nbUEx
zeWU1oFOk=ke17Zup_27c7pDEkx2UBlZl3nofQ%@vpG_(2G%*iCKlcwd6@^|+8y}G6
z9w~gDi%U&7viWR~oSJ=fk*8MLZ6&3``UR{JJ{Fjv^&4@p?mS8+1)<B0wNugQOqF^B
zkeZ}rF)9s;)m-h!&jF#%^eBP2le%*YZEBiALa47EeCaZS74D{hC_OgOgd#=<K$H*o
zl<3j1H-7g)z<32KScmv7P<0}u?aJ^B|8betl8C)a%z&T2X}C*7*zVKKpW{NNk+-cv
z*CCvf$i3FP-iA8Hw~GxfW}jLewgFCv=Q~@o+Xj~ogkMbacX%JXJ{<O>qrj@pjo$>#
zPad}8nR-(ueOifFYu|ZAGoCTrb@4bcn$xzI9M+{u>K+LC<>kW9KUh%TeTeZd7KqbD
zbi7jpzwxlRizI~W=&L6jIVjE|FC&}~*Vd5deK+w~@cOvbyH6w_gD&@CKytzq3R!MJ
z<XWG8C?^ag^ed)%j@0IvHmO_ZY){~wmIk$i!cK6`3K6Pn0-;_~;K-(tAB&HxcGF0y
z#5mG@enShu4qw)gd{)5bRQd*~agc5_$lE`?mh%_dYy-h)Xwr^AY&d7iTiB=^q>Goq
z5NkQYACqk%j196s{Xu|e@*Km=xRe`byzSs?(bP};eJ8(l%i?Ww5YJKCc7?X&=3}|K
zaGaXWv2p}%%_f&(ws?O|$2-^K*WUN}Gs%H_SCKliV2Jg7P!PFmErMx7&20Z5PRvYO
z{!>o%jxa<x$~{x>ECW$|Voy|lj$gCcmU+GV+Iz936jsq(2m@kbHACy%+`M?fq0%c?
zS}t&!v65!pIkThEC|hqFiDUyvU!<<=j9aS*{|B%Wb8=pYwaP&u;j}fB=HFSuPbM3V
zkXifu3~dOk^PsF9X&ksPvtsLw%T!7-b55zO0WRC;Ppc5nnghSrhfHRy7-~#gLS-E}
zS$06s?9Mwc;3pN7`&$R?4kt95hL@RM`*8=LWTtAd?+EoB=rhUik^?_%a2J;9mhYb>
zR4zj6XO)^oK0{!sIA^l(He;S?_wiv~-C_~ytWc7d={uLJd%`;fs$!#if<Xlr>ezJx
zF^|bmOsy58E>vtZC)v<dCoEOWb-?jld9$<}ZUJ~7YObQD@u1mD-Zrf!3zUSNuzNzn
zHkjADZYz^BpRlp^9b8Cy-^ID_%ngWY_`kFSG&jg5Y(g`Qv^O5O+QEbtSuIl0eeSS@
zX2Bp&74OO8t@V9qH1fW}H#T?Uo+gX^87=y}j$7}{qQy8~Sy)Q3={y(J=?0C|@*M|G
zCW9Dep6=VMFIPmK;Xli9O9!34@(6D%IV}tNnw$q0RBEVBDTXuObbBjlaY5S_O2mK2
ztV_4BTWAkNzbvw4t&1j5nzXlojJ^_0)qubLxiADN4@qlczmP~7S8F4m2DMoXnxN<M
z)$g4Jp_TpUrC!20ybn@5t3c$$Tyq0IK#YhCkhGT1is?)tTrl5>Ftp4UWUx$=AoQ^Z
zm*1BZKPyg%Rp@-GpqM%4rLA`>Gjj~C?S(u)Qw+9kgXb(`48Cn(0q3WzSJR`B$P6Lw
zpW^Ea=|U_&Wo7nNvk0e|<oA`bNT)R#Azq)cW!kcY-n?Cu53l{bGJ+Q=$ov*qBnx-m
z_fwZ-%pvEIP`gO{E$5=4H#b0Uc1W5ZzCKX)@Y&mbclwp}Mp?OL!4F6tmdM;sO=g>Y
zt=YeFZJ-kPl$aG&$<KZIyNyyR*SXbsha4})LP)!pZo~Swj;o!_xO$8o<^?w%3m20-
zv97&gRqdBuc0-!lUV5356;M8)V!yGfKK=_t^EYxM2%b%fKoBG91uFLUs_KV+BP(Cp
zav}}_-9E@#u!yLL|AZHpvAbquNK%8=GSMUS!SDIuu#fDSt_B)Kb<i0|F6pL=q>6YY
zKQQpw-rKT~=8*4f_Mcm8@Xpl#m__iPUipu<LoY-ZKh6LWzhfFc`||vc{Qt2@9(hb!
z8W!)?D!a3z{>U=lBpQeKX3zi8`#*~C4aPKly5sqejM4S096Bro`yP=q(*GmT|LFWb
zX8uR*6LQhTuQSe3G!E62LcK8!GTO1#s~qabX8Rt1lGcu%=ptdVIO5Sx5(Qu7=%kaZ
zUExr-`cJE;#==+me~vufiMx~F=+^q&bw)_kII!71iv}jOz%v>%o7YZh)d&6@+WYsI
zQftpcbWwvua51JqOPuFF?o&DR8I&25|Hnn@|CkWlu*#t={y(C}0*@KZnZCK>lu|0D
zKaZUIAHDxa`TwziXwPFP$ts`5A$^B`B4+ld6BF{7a;7retyRvoPe#<ZpxHg22Bt2~
z^Iu_%YTYV7>)6{z^A7(&%xs|()8FHa=}HB+RwmcJM{{DcdjbtiL7eBm!WclcW|g01
z%>2>5!~Zv?!EjyqF`l~e%#ST%8zUB7bRrS$c{CR(KSoT~x%jb(<(`@q9+R*y5hPM|
zHkvB?J*R)|Jb!D=IR%$x+8R`Trc-X<(ES;kmwsbad+pS`0Mn-lsQ0hg9@w&U6)J?v
z%4V6~*r|_=R{7Td+yt!tq?D8k{ztY=_PG<6^&AU>N-f7)yP@QrN#Xi+Mb|6pxf2|?
zZw$mU#5Nafkn_Vn4Qx=U;XVxK&=;MkPqLaMz8k;M^Qril0~Rfpxi?maO+JjCQoJ1w
z_YJ1dq9!ZZvQ{<BlHz4sU7_alpHP4fw`?8zIXc>V^>YE|RQWw}<nrWZ11tOMHRC#&
z1P`j0?wuV}eqwek6SDQUVZM#*zBF6AGD}AlOuB#1c|_2olDl#UTU;kU*g%yYeE&*e
z7T9e>-Pen`j?*QpD9b{CEsk`t1g`XpGdFQ}rX1ra=J=-pB--`!DK^&xO_KMlnFFDN
z9dLqP0!!e^J1PpPkb9QG%<-@|YtLU!->Qk)4*p$&8Iue+$UI2iFLh6uJ&2+V?qmPl
zj$J<JOFWcAfq5qhw-6<i-PMpELkW&p{fznj;n*_gUW%H`kfSa=Q1>!-sl}S`o_sUC
z^hD<Pmz1L;!L-KlgJ0X7Bj4E5)YCY}fv_yGd_agcHL7RCEWY+vecD6#rhQWYKFNb6
zV}CBHXzHVzhh`;f^1`LXpNE#|8or~KHRuAP@9z^L%pi+HqKJ(azu$DbDib~F_3R{7
zpKqd)b)1XRcM;uKYfX)V_1wBP*5w0fC%stSJt5cJ;%S?{y!qkj!A7e_Rqo3;XKsiG
zPCmal`+{xBq?dg!jOPf})^*uCR<4q}VOo9`C%Zg;kbk;denvwuL%(%Yd6>!FrFJLm
z=3U|^;kQ7TIbHnTn*?8vW0U{SGq;@RTo)Hk0N2H#(!_0qncG{ED#Kq++#T1o^SMhy
zThIJtQEV}T`jyMGPY{?@qnJTug+h!(pJgL$UN_*H`@L$wU%9YFl<QYo>ffK9IogS)
zEn(K~zp|(L4Uq;KA;j6zi8gf^!)EEfVcWME3hrh4w;3Za;oFQM7||6x>|Q3)!!XiX
zyrZ~QLZ8FZp4&Mx-C%hB>qg4^2AOvCfqBA5HT%mj(8oEk>G=j_n!(__#zqQHLsC=G
zFo&5vh4WCFLGL`z24y<fyfVH??mzLhGQ5dtBO?s}f3+8O9!fVDop;(u;cW<LA{mC7
z+G9AgrGYIg)0-?eGSVMK@Tg7+Y8S^3x-y%73mSp(-$uOk8B}vRoI-aJC`eVLSpA8m
zhfR&1g_DI*fyv2?qWT<w`MsfxgwennmVlTgZ_rGp_u=@)W>$v$Vs2SoM1P?jTH4BE
z0xa12XwWMQFG&i|{7hg?9ud-72sHM7{8Pta;)3~oJYEx7m`lI-FNSUvc^Eb0Vv6Wn
zFMpA=6xiT&NZr^Btry#V?hZet;jP2W#-;m=dWt;$5jiY=Fw)|dg{P-+IG!(Wn!GY6
zCf$DT#|N7>ZsUQ(SF6clB#*+%W6DDY&?Oh8)-|`cpf+%&Tm9v)M&V4-dk~ikT3r2O
zcuc^1GTd#*n7bUUd&1u1!I*n9BA<gh*ovNLN0lU|JCV1B5<A}bCMJL5<!<Fu>Rx8n
zn!x<Nm+dO)h@UcDeeLpN_UAuK$CSQWI_rN{8>`HPR-;a;W8fkUlDb)2fBtR#1VBRq
z24$RXSqcstdxFN&D(B-Yfd|feKV~&(Egw|U)r64Kdr4N*hr$AdZ99Lun`A`<opmTi
z_Xqjkn?Q6+E;udZEO&VN0<}p-ho}pjo*h<Z^y<a)jx>d~(|VMmp2)o=X-8gBa*(^U
zp=jS*eRVr<q*n0kWZ?&9u7bN#0aT7N8OYrcE?#Lw?OwKvr?raLEt03II_E(BUYDS!
z&~V2qIx33ULq^`oqP_A6+Zf-6Zdj5WaN1K|+CfTNQ0R-THu*Dq6k-ZBh}Y%$G$;v|
zSc-K+v2W+goNCXTAFCt3%wn7CAMpyl0}MTr44iqs&L@0vZ;1N1Vm}0cos@bwof?Gg
zIlbeqaBbAy>yTxzZEB}@7j;v%B#U9d4F)tnQ*rN%{F47A`P7d`=TM^mCP@rZucq>R
zaLV%k%7I5QU2eK&Q|qgkBQRHj_gf=p3R$uy4E-;kiILlKjDv8KAwF$%TlK6UBk(1=
zG+H*%IvGX)k^Nr;(|v;hqT4r?qoxv1P%L6Twi{6hvcN4z8W|nT_!%k2v1niX4R1!Z
zaPE_L65sDIEnUR8&l#M&p9upI2(^LR%ETkgPP(9VsgbY|sXx>q4_#p%<gP+djjGZ)
zx;L~bOI?#T{k33K>Ama_v6c<K{LW80OK%1*!cN42e8Uh$39BrlnH|rOu*&9cqV0K|
z`kqy1iR6Y6B1qVn^{W4(J}dGYUcc@kg{02>a#NrB`z;Ks`Uzt1a^|@>l1%G<l-~AH
zirL<vSFD9+2J=FkmHQ;FCmz#6TnX?fEE)TRG)ftqq9*5q!k(V8e)mP&!!|WB?dSb~
z5dw&zYkfB^!mF-uvV&%jtFJefx_HS@@UXiMkC?nt$Cd0NXhX(XIhNsiG8I1x>#~2f
z$T()RvVRaEC-NBT-hxBEQyPbUBFWVW_f~qf+o;exzCUV#cZPq|-1Y{qsfJE&M-2ar
z$yPLlh{1TtsyFfv%|lPK_uh@%34fKi21ey!S6lo`aV2gWU49aKRHjo;GN1q9`{j%d
zvgn|p`ujAKRQi0!uB3c6tABIrE~&R);Oy+zl)hj3x;M4Kbv8*8A}-srfWGB`=@e<+
zKV_Fm?;x<2UcVpLKy_k1$JyV4<JrEC*Y8e#k~C+JYUEwhZ;*d2`L&<Op=k7A0ytir
zeJ{#I$u!8BYTZA!zsOfiVsd!*>s`c%#&(F<VY1oVK8b#1I%D<69A=7{9d2u<&+(Jk
zT}?Ce+#bCA*^4dh$4F`{b+!MBvns*D@uaMPbr}kuD5p))Tctmh&UqQ>*53{??N9t-
zHR;|ONlJd=qvuaQ7AoE+x)$~hDE)V=4p-H0b2|4-hO9MJbE^uwpSmi4N*@q-qp51i
zPIX!uAEp<M=b6L4K))GAjj2;3ZOPn6U#q#1Mt1f=D@M9z#Ib)~#jXF7Gxdp`evEVu
zFPn4L?%nG$1UK|@_a`?Vh0&w&j&gO2_k&K-^p~1~v~}A{SjdBIXhj#m(>JA#o*yb&
z$g?`pfTSPG)fP4HQI)PZ#w*o;OXsMTyY(m9K30FtF+rajI_la_;Y^vY?EDG7`DV~Z
zCOuYtSpFVG<MfRG7c<Hbb%p2Y25Fa$DY%N^H+}4dE4&JWsC={>s^un(9D{M>N}SaM
z=v5JhI*8gSDoL0!AD~Q6wVDQfu7+>HN!t+lv!GMZZk$=+@Uh%<+i=(&=#Tu-*~1t&
zfe)@v5_e2iH9^v+_$U_Qp)}Q(QTj>0)1)b){C0ZuK6pl1Y#9vru3jNQYap-mD+2aD
z6#w!V_la(zeRT9Dn^e4&lmr13`}>gp?sx;P?^wwCRaNT?$`gyYhF>S3<>;yol5_Xp
z8?=AsLm$s$$Iwg??WH(@uX_dEB_=af^JGr`l$}oDlx)fBL=@$nv+u%1DgAo8#@=40
zKbPeF_vOE7x5ScrRF|2XQwv2-HT|)d37%9f3pF(?8Z|X6NATDOJ)o9>!~{p9GIPUB
z?#l9bK-A8ybAvSM6z`}-n`$+1hq_mOIyj1E3yv=^mQTr*PYJ;CDGz^-VIHAa*2d`R
zWab@SU3hy4Md|Pq&e(hc2hl?(Lh5=cRwO50J+OpastI-jDfIg5<Qhd!rNxqdNmGbv
z1(u@mQV&~SW<B$xyi8x-41h^j1Y1KsfQdi`<ISYXY-!P^qk(r!Yi=w~b5Zm4UDBd^
z?w$9ff0od0T7WMPukC34RWR*xFi;F>x}B}q8|d$|O(lYJ$Np_n)%nFD=q9|#p`0b}
z$%NN0n}=BhXjJu$Zn9Dpi8o2p-)!>p$dB$)EV&#+xQ=^|3Vy}Cp7vzp#msJq1U46V
zL`QGP0hhsR;XR*Eh>l%H{fA0l9(hiE?+H!{^(>_oCZIVdk|Y0}gl)t-|HVCH8Jkmj
zGY64j^4Gc=1WVcYX4Epg<e?KRQL8`W9a%4hqu_P^Sd%*xY*R>b`J#Q(tc-fycGtM`
zx3`iCDDsPA@so)(^kFWwH;k<sRF_C$Y$t)C)RLJGl@^}5Ao0~U8`Lkm<(sM0DZHcq
z)7V$X#qn%=LJ01z!7aEG+}$O(ySv-q?lKVE-QC^YJvhOG1lOJX?t6Fd+uc8Q=2O+x
zHFb2(_e^(JPuCYZZ$<2RfQscfiY6{84}u3+5@Ioy6a9hL=w18<af{FvxF_^MSNwzU
z@8A{)10;VE=z3S;e33L8&@EZkvs&=QSh9Se!M32mm;Rj)H+rMqBt-r`VD(O<k?2aq
z<|5T0I`C~sPF>=LS|lx&7{y<1kYf5>1h*<s$wGVt$;3~EU19+JCPLH8;n%{|OW{5`
z$^l+XcLrL0jRBSr3rJ?rX<rQPg}30Jzz!hdQ}E}0l1jAK<T5VQ_n8EpOhl7)Vad{`
zF;9{g#W~s+2zv27dR;|<LSGg??a!S1Ut&AR2JA^arWs~d<~Oi32!n0|GsE^9Vp`<-
z8yz9r6HUTO0Qc3}&I=2`)(i1b>#AvIgb4uf`jRF_*ORgZ_v8cYk+To;p`F-@MjD-|
z%S^e3G-fY|jv@_?i*5}pHWw9#NrEh9WQAuPX3EY`f;K~)xWKK7pD};hiq^)>nLY;l
zLojh^>LUCeczDS|jh0PTgrpg7?eE&FX24Smu?kBLsL36mC7TM=fvALN{<IPBrB{B3
zs<wnWp~0WMm)n50_RA``585j1>u1TiaQMkj_fX4VVc=)}fBdU@5qsTs<ad((QV2!{
zm>Xc#a@In9L(qWEgtmdS18atG|HR|3@QEiN2ka}>dw^!|RxjQTlff4U!dlE$@KvNu
z*mE!dKkWHuzfXmBSIGa9xtjrWExM%R6<8(sGPriYMK6*8)m2n0Ej3M&kA_$`Ej24E
zypujqhSi!l&d^iU?90JFCP`k0!~CTHSz>1WNh<(k>CO|Zx}xr{s%UdFWm39;f17pw
zS=oIR0P!E*C?sF~AG;>25Pv1h6BohI#H?D9m|G9Z!?&rCxoM5w;ngh&+bx7=VS$2b
z^@-$iDLjkl1{~D%CPt4Lg?4HdKY#!Yopy;oBWV$`3jzfw(&(4?2P;vRQD`<&FPgo-
ztu+9iBUCUbObMO%4%9|%@sz+vdDuvyN4?oW6=+--o9Ie70kOHYC{nyN$%;sI*d|<?
z9GR1UrwG}!I|v;7U{7Es(h{OE;qYAAWHiVinQEU7ykbVdoifA^z&ykLR*azdMHW=U
z4bKiZj&EQm<v!4g2}f$vBg+SffQ&efcefa%`wI*%L4GhzQ_?Wm127ObCx4y4UDbaz
zXt4xo;BEn`Kqesl<;IsFqVWG1HdqJtZ`^`VrY4M)|5tgCROrzrygDS15q3eFP;GzF
zh{FRo=)y~YIDo)Q5aIaGaiG3`LAym{D-Wc@zjVt*<+=rd7GxX9y<i|ye|-YMdlK@1
zBPI=gl!y2-q!ZhT>K|_Q|KYd4qVN8S;fN`PJ@|sBg#OpRM1TDY$RRMvM|~0m<p3Yz
z6)Oxgk7@N=c`d#)FQ&hV<sa!k{!0HL$e)Y)<5ma>F9G(zCT8@rQ<Zon%Kwq7(w!I%
zbO`c5-l-l7Qiv(#`d3hbaP}dum8H6m-G;OZX9Mj9#uKpUPQ?dQT>xMM{~L>iK7Dis
zh_(M7f#J_r3#9>VgM417pTte<{;3QM*o$ZIrMAg{YKhWa@b_nBlK&mfO07v+No6qq
z8iBcrbPneBsSM}7H+?Vb*1?JP;9q#6sQtX04C0rlP0|9v<DVr6pb4S)M+#)~Kl`W9
z-v6n?BGLUnB0&rb>$6l-62C*?gEYWgovyN0;U-bx>I4Vj=a9!zL7L|PgwS{z1K9rp
zEGEy1{?{x_r<Db6FoeIkX0klk_mG6UTEhB}(P-cXl5d^Fy&mu?A16=0|GVrI#k5d)
zi80>sV`%bgnWjN~?;=wJYZH_#Vj8y@zd{v+iaCo2e?sfuJP>d7`M=W>h;N~m#;1RQ
z_;1D#G5jwDK$(mfG3dXH`|EKwg8z07`1$8~n12xg)c(mcWdBJO6ZoH0c>hU-^Pi%O
z{}MGrSQ5|$XztHpufkSx>DB5rl}4!o_why;Mn+;Wr+-cdP2;S5T5+vz(baF|{hj^W
z@ORSBv!Cj1_HH=`KaKz=SA`M?F&c!9x`X(r7(a-(SXjm~PN!~udBJzSb*60fZS8ld
zbTxERd1HG#c&|vb<s*y7MYQn_$6v}M2+0rIMf3Z3kIBGdh(%z?{rsBstPFdoB0!V-
zt}1(|DlMXkKfI1ZQ{Xr$n+umN31NZueIBDc|AZ~xY@Rq>Zix+$8e5QL$uw0!(im=4
z8sN=%xD~^enQrl!z9eB$xZoH8Pp<0R5hA9@dF_l6Pa$>ox-qLue`IUJlIFr_hO;g;
z!;<-@w9K*Fy&IMH3oCtr_v(Jv`8EHOtx03xy&@~0tY}36{6Xr~5Rm295s>x%UX7XZ
z7W1k5wJ-YPoZbl_vBfmZ_!483sm#tCu8$>cZIZBK4PnkQeUmfjvC#Vz-S7g_gQt<y
zlvalWqz{pcMwVz{!YYRQgMJW4oP)Q3Hfhf8vCxBiwnTTr1N|CQ>(dc-bz*tgr&sf!
zJ@v@gBTA4)>Oq=sj%|<d>k6FL20o&d@KIcRftj7z8O9VK%l4-Y&ElE)CG?l^kQgGW
zyYw%}XkS_e!%fxpAJ-@KXE-ARGd(Jw!wTNx`i~Y}c#J&MMy9jIUV+FlJo!G(@t!z9
zv$rWd0QtDRgyA#Wk&BJ2(Cn|In~aX=8*TeM&~YYG@k~EqedN0m#U!RCDWfPm5(M@y
zSpEpjjaV)KoUYQPI$W$!@)M>z6Nmo?3hf_}$vKvt9{*ojy14af>JVYYt{1je?|jj$
zkv2I;C5%YT>CtUYK4zQSqUWK@&LsA+p8nUV+a}%o<VU()N6<g=aPES_^+MXH1>d&m
zeFGf<IVHIG3)$EN#1g-=dOtYp+u~@pq`r8J>DxL2SnytNYR}EsN;$>qGY2dbiM9+e
z4_WY%C79`6a1pm`JL)oLEUu7FjoZ@ah@UEGA|K{H1Fb#v)jCt%%spFQ->|k6k~9g$
z_%sN|EUx6!hi@#zgWMMofFms93W47ByxDU*y5HaPCq9b@Q98Rtx?gSGe1<VE@u0dK
zxN(^V$j`Bf2g&c8V@w&ac>q#-9$BL1c6__z54obDE+2;Iaz-s?rF^OtJ6}@AIn$ne
z@=CMka#bYXfm6KVLBIZZip+fi(eFEl<%fU>u5LI@u$b{WCnmPbH2W>C>;!@jO+o$l
zO>~?rc%Azb+bNpU)BtqP&l6M8P*n%z0BY{6xgF<89H2TgUSoO%>9#Ze$c<KYWIj9S
z^P_TVtr3f>CkvJdb7s6-Do{6vc+iZ}g60-Ttu-CwC);*b4gS=#yn_e$#Mg5lqzP;$
zJQvVU+%@inD3Ec_i@H5+E?1_FFp|NT?bxY0ET0w!alQX8emkzk|FG(Y6X1A^Cmz)7
z$ammv6eanN^@^6*gWni@n5Ba$#>s@|6Kg~MWZN4<w>@~L=+mq-eNzPzs%tStw>^EQ
z=z?F+cQnJQ(H%6m^XK@-4ZW54ljb`f@Y0O!m{A9L$b7|>?(&xxHUC8R(9PT5jtveV
z(Lp&i|Cyb^6Dr6W2>>qQ=}tMdSLR$URVz*8JquoATt)t|lz33~9;iEgF4z3AvgTM5
zw7<VTdg<IQo87awPVE&km#f|;d{Z?<PuC-*UiXSsAY|{{gwZu%G25X-FLnv?7P#)j
zO;|LP>--)0wpUm7VUN=rhHt;cY>AGT7y#rA`0AW|Mv(mH$TO;K!;T+^HEoeM9rkvn
zPukV_`Ik6|+=Jhf?Q4F1ondsu#C(gI%gt$xjPwK9h7F<|h=%%d_&i4D@K9H|2vKj(
zbfcGdKdRSf5ih|v>GZikDB)BI*cA;mR5~K%S2DU!=dR+d8EecoT9R$T1qz|hcNh~9
z(NF-23Udv4L$=Z|uh>IX@u2xdc=GKY-+)7eyF{OnthwCmQ%qn34&u04P2FZx!UOGH
z=(&1yr+!(BNsrONn{*f13ub{3I0Znc+<z|D@6;Fg!iuL_d|)q?0@~*Bn|Xp22&J5Y
zO?;2;Tq#q~ARHa_&U(%`_l|}_RLU9a28>wDGTlK=h~OgP<#ii*ej~f|KDAzZz(K^T
zcptm@CLT0gVXw&#QW*9WWda=+F}={wz>}qb1n>}YSQZT>ry@|to0agueHV4^`d5U$
zX^rtgm;9HMuGoYJ&Y_QE6R552<e)<@anMF)>=MGE&L{nb+LLr^;D!{l3~<2pM-rG?
zN=-3iB2m|=Iz;X1#}#@=xg<BHQuI?pFV9Ch8|toZGaoIPcj!m&jr5Z4*h1=0O}(N-
zP5z{W2j-=qLy+9KGB)6h(Sfh5Y3=5)#jN;J(qRKGBDaKTgAYT2&{5eIUCxZfEMz(I
z1U4wbqz>zRPz!{xE4t|b`u(Hcsc^MExMY{Q<?)Aq;ZYf>xdn=ol=9@m3LM0Ctvhp1
z+5#cad>XI?gi&2YgC{NVAh%K)puNEXpB$p{joiKv-FAMg@spW&ke!N1vX8zm%!GTn
z7Vy&Opi2hP_{mOut78!c_yOYDWrZ=(f$OQSY^>pzJeLa?S^NehGH0`>;m*DePp9tT
z*-V=}<|t+n$63HNj=_y~9Htv4H%2m!bR;z{c4RRID$S%>Pa5Ci!{bCnFW|^Ti$!A&
zqYX<Nf894INT?gunEp0zVfOm5{(`mB8q4xCdrp#-Ow-ufgbK=}%Af8Vxf19SQkJMA
zOX6^|k+w3RP${@CmL;7lF_w=pht*gcmQGDFuwihJZcMJ893JWuZ2XQtCkoYW-MQU0
zj4Ck1yDe3&Z_9dY8ta@wyA~dU?&0O*_n&kwvRtc*=H^pr*Y*$fkGJQJmrH&=R-Pct
z;DJ6e7>S@i;JUB*yDXExd#qYN?bhH|i#}c=;-f|aW+~I}L^4oAg|%zB#f4KzY>;#V
z9K?>LgX?C+gDZ$V1qVqy1uH`jgzB&op@*zVJQZC8Z*q@=4}|6*$Ab0{<9VqW0!-v9
z!%XBmArrYAxyYUK@e{e~z!SOVAjUF}LrnB+Kt%^)tn)Ys)CQGJFi<<pL=Qo@o*3W;
zs_cSIgw8`vgb+mPiN#4YQH<m1!ZFCB_NwCPB3p#&sqaC>F2F=-6K*U&E!0HGghUg~
zIi4;80#pddW%9ws5~+pi$q^)hqPU4+gG!QwXe~lF@gC6R$Poeo2PBRNpx!U>yyU-w
z3rS){=1~A}QX-r1QX-wmfW**muu>wgxa5eA0_1YnD4=o_&o)E`D*A%+7(}6kU->^t
zsrVoynqGTQ2V5oPfmb#vfLDhv_{W7efXWd#5vD$rkLoMtj^}lY|IyG2*fyo!XP=Bm
zj-8Dmcd%`SZg`KF<6tT`iq4|5-8qB-vJS}iL~!I^c9q#gfFY|}u5+&*n(nXNWbfF^
zEr5QwJK9QysQ`~1wCJv^0Ehs0$lpjlR96Fn)ZYj)5xY4bm9KoRa)Nqbit*khM2H(H
zUA_{myv2NUoKVRL*tb)^hF)p+^X*#qzwP1=81Hrr<iG;RUbC(;NMA@>B(}bI@;Y(f
zI2CfO<9B_124o+<6c9!GaX$;+Zp;yh1Mm>pkU6%OUmgCSPt|aI6mu=!6a#+)t+ngv
zQ-H`#KKX}bKw5R#>RGkTw!I=u>?XHn`4+!&b{E<A%!WS_Jprr7{eV?3fe&%}QL;M+
zbNY+q=bzt?E``r#cq%LfY_ir>WxRdutGX2)53cu~0qcz!URH<iRV`}2AB(lPp0ZB2
zSU$>&eXzAu_&rCrQ*Y-9I}153WccsiM$fD)@vBRVyVjqtC#(+r)ROLn&ye1KU24~!
z{pfe5&1TECe7+Fk)#Sy?#^r6e<pFrOJf1?=I&;BPOdGBwhQ-BdLXi1k58v2D&-2yZ
z7)Dp30-{S{qYGg@?vrrDl5qHvaM+V@=#y|LUQ?hKkzV;+nT58cu!WImYl;}bw1!-`
zkGxo<Ju>?DBZ<^KI`&#<eVX=a)E@DM^b2m<WIF@)X@yEW3L-hnJQ^ZfN?o)Ed#)}a
zbgHf@F#W3fYra3a!u81SuF$@Eg~XM;+N)g`0>+Q3;I=ESS}Htp@-NjN>EU|54_S)M
zlzNEInPc*oIOy&|V`Qs13Jr-3F@AlG??(*DfMcZX%)c6d6DZ%?P<=(h{D_FWM8S3j
zY?5f<_NdGWeC?j<Id{;C)+OB0m=}op)_Xm)0>$O`c8EwYachq85xtkA^vW9f5#1WT
z0eFFzzQj)6YJd}{IN$SJ5}2WVje`5g@9(L+Vyw6YRGq%H(7dNd_T=qhe}A>b>?z!X
zFVFrMbcA_9$NgxC1eEUql&)t~Uu$S|>x53Z=7>)o${ycn-u)wq6t9EA)dv)OJ3O2n
zdT`(fF-n3wdBu1icAnx(*)q`{*lzt>0EkYEJ5OlYH9Jo<CEldBeAfVBdx#$DQ2YlH
zhJEI%%}8^+8H8*u-Wu3WuE!ujwws{dWyx<IfP=lA6|z)FKx7H6mu4+vJ8jyKGqIQY
zRmGG$<VxeK?^T9}-`tITUlJ`pxnFC3*REU@V7a!asVlGMPHzxE)CoW1u7y7fI6ySY
zfZ4a~bB5?VfAg^G3o1U|$V)*#G}4>d%$)wt=B({zRc;=1yy3>aSB5yboy0InHTfiL
zw$VsRS-*yAoS!V0%AV0o&&tkTno*?V<wu;#F(oHTu;6drIM<jkZEZS5Y#GmbGMUMt
zx_q<2p&)1LvRh1wA!FL5QOhI(V5M!V7j6{RWSpTbEGN#jVKr4vK!t1CU5?R-L4}yF
zCoDY}*2eTUj)T0T7Aoo16f<d)!y4@Uwmy|u2a_G#B}%a9RN5@JVN<qh1+EUUs`u3d
z1rhO3Myw!{I%SxBzcza=JQRx_|JkLe(iFNhK@h+C!0F_Kpdl$lT91_ua9$i~HmN-t
zp0I>Ke^y)vRn#e9YnAEFkXmZudQ3!TmRqSvxHxXfSMmrE3M{VHkQWDf*XpP~+9j{`
zg~Ej;<XTM9VoLoM2%F)uP-9ec_8o8W8M9iTFf&KA#cCgk6pQ+4UkLw$OCYvtIqXQ8
zX5vI216kqM0STfMUasmofOnJ+c|jtRS1YhAV^(x9z=)y5bQ}$TVSX(^*ltUNKyJor
zjhT?Zf_dr2uCskCLbO@(>G#~Y^N<ZdY^G0MRTE8OKAuwt7!nJ?@eT1zulT$5MsB(s
z1zA%XN@TJ8uU^Cij=SholkbaRDVey`cv>+~woJP6RB^z$r}uJRfa)3+Op3ht+jFyC
zk1~ymx>a|f?QIr6rx6!*@-AwHRO5(w_vfk1Vy?;&zK*-mlL`rWeZD4V8p?HT-!Xi8
zCuFc}1ur_*2CY%{8h=h5wwseoff?L7LZ>O!MKU+bKRTCljdt;)(~V!vq0m=zr`^)U
zMIJo3yGxq)y-(eJ0C5T<8!3PGN6ViaDenS_)<)#L&iSh^y5#CpIo3!se5MSXYfQnq
z_@QQLQ*PVWCzsak>KnO{8){52WYU$giH6IiLmPg`FqN0;K$%ZnbIw;(rX*Vla#w4K
zk9_au=CE~?7RJ+|hDWunuph5lWXrc#VAdY9+!(yF5H5U%1`PIYfirU?;$T2T>;@eC
zCihR^E9gl2D##<@rV@{ju^;hMDuF=$mJCk;ML!yWs^lI4QK2x=$il~m^lNh*MUuTp
zqewK>142YV)>we9kqb=U)hI)Pk2MV!N9HR1aAH|Rogp(n6A%Y8Nu+>|g_%a#IAZtu
zVvLzNvlG|Q3LtAk)V?-uq!S$-wJ3kU)Z}bpWRvNfiXtQBU~cr_23brgfsstGUdLKw
zfPvA>&7V#n8NnA(r#qI6BO4nVja;O77O|TwiGV;Zp+dbc=mg_vMBreA_BbUnCY5ZH
z$Vw=Cp5lqh#GN25OUf@x&&OW0y!`Xz)rEszSqxG(4<Lb&=I@`jG_KMS)!-$b#v!`!
z;l>v>B)G?gG;$=j>eJEy^W!H^W1yKoMV3Dy2k!25bMOQ#S~q3r61_g}x#X-7b6M)q
zVr%W_cMDSWDVCQb(;v3af_0x#bJL}tyF`<}m&LadloKXahJ=yB?~))MG&U-c4f-E4
zqfvaPD*-s`w3gF&STe|Rg;nP((%VRF++o-Ws3KrbjQN!D_H?A7a#Lck4s`J)A6AQ#
zzwj5pppmW%4lywa2%<mXlyR*}VO4h9wv~PD%1ym<nWjv9O#{x|DtkIjFD5fEhL{{A
zSFLie*n;aM-!=jp;0ks!BinYE1S+o37EMJbuL06!$qVcvu&s)F{pU!%7MKftvmVm@
zP9!Pe@D#sAVJC8c)9O-B@mwv9yQ8ZxEf@r(6%pi;iwAj$V&8Kq$<+5_`@uS6DyVDq
zZcIie)Yma=+IR9`T{cE1P3FE?B+0_}kFWCa8@t8L<drH)`t6AJ$<A1ig#;LNi{2M|
z^#WY3_`HUx(}#XIadzlaD!?4zABU{jrFIZ2r)zF0%{3Tl@bo(p&CqNh$;;i9utJk`
z>#jHvBb!=V+9Wrb#Q84O)4$xzQC*BtIdc?gwHr$|@ovOgX~v2z-dI%)OElHv<&-!4
zT%0dDT(qUJq~{+iM14#qPGu;(<>fH-lLg4Wh;3s9Bq_@jr<moY-R<TA-f$P2-U-yV
zU*MyU%-(S4>0Uh-Ki)GVjJ`neRJgVQcORXhX(%`Iy>v`9-epgZO|?VY+vO?fkGkda
zMjL7<8VWR9pj=zeed6C97wxJwu1Nm;faEE3l}Hk3@#1}w$&+hHLAdaE<+he*d;&PD
zW-J>%)6%{q7HOZ`>m6eUnay&uyq!3iO-mH0jV>E1g`C#j7sfepbTswbtc4*1=xhmY
zl_HpPrk_@g39Du3J+)?@6qPofRpfd&DzJTQ%F-$he2+ONIR0d*dYt`cMKygr*<a7o
z+SBuJ<{!Tc<j@&Yu;%Zai%j@2&<toN1gN(&Wic%7Q%<(i$uP$ycnN=%wKwA{X8(42
zT>-7c$Hh_!`{!X!&>Y@n*kJjG1=<27cXK609MC1`#X3$8>^E7B&#9JpGoi@y1Ap|X
z^72%SxZ_Y<1={ldhO-S{z|W!jobNyQRZqgre_3;Jruc@B*2T-=uPG_+w!Hu*az9>i
zmWOQy;~%F<14V_n8e<uWeYLQ&S#EiUB9vhl5>|`IR+IQk%ewM-Ey*P|xOO(Hh!$Uu
zS8ErI5iw869at@BP002+`q>S_#IW=NMJTh1;&76jSH+@J=W*pOFn0P%bw3HIVN22_
z@F8Fe7l_m4ox}^MAc~AsYa0T1qFvNZ>o*D2%*m`)Oj+r^l^AK2S|rwm&?|%$*%n&u
zo5HIucsP^uk+!ia*EW1@&}3L#w_oGMpQHDG5EGN=57exiU{5Un8Enb9x7EoN;(~qv
zT)a-z=ofLYy|w}8w6m?ZDUMOSs4dr?D|Ym5?V?(vCWPbIXxr;7HtYbz&W%Xj_sY|!
zQStTJcLdkFcnK&Mj(VmHNK_T&kJWNJ1+WvGHg6xc>fMFcN#{j7N)pb<NBb%s`+%>y
z6{M+S$c8W(pKrKGkntkPb_;q=P{r+u8nqV^(=a@_>PSJ|(n)v{Dj~Fc4*~B`Hlb6D
z6x)JWvM#=it0I+;mz)A9C=s)!x#65tRas0!!ybKtepd2z?k*nh3<PD^nc%z^H=^F~
z7P(GpvRTpdU+05ck#S;`;JQtjL{I2Cu$$uioEh!aX=kcf(<(jDeb#LVE@%03elm&G
zls@NVLLgojzhnz%YU@3vLk~@6`5-(jYD$m|fy`4Cw&Q+mDDw<p`8HtH?}1C(!NFsH
z)(FI<Ox~3I5je&*H9I&pq*I5#yec<xheU}y(6X>`Kqj`Io64mTjIVXv9Cz(Hbt|{S
z-F&q_{$O;aRW2{~XcDxY0Vk{D_o*JtFZ1)1X+4=Q`uIbZ3G{S^s!$hHj{jCDLAk{}
z&-Xj&x=4+pInPwU?uZ;P%B<y3G4kRh(-N6yWpjaE2%)plaNXDZBDWHEdDs(6J%gGn
zNITp*wCRUk<`YK{*vbo<YdHN<s_jn%M5~3AHO;AG&Pa*Y(ZtOb+x<lhWPngrVZnGr
zJ$H0{u}~1SL;Jbe+U)14RU}<Ak>?7_>PlTJS(OQeqhBfjuQi$K^g048H8sDb)0vbD
zCN^z<&t)uw&dL;JXYo1~o+D|aoI9>Y)pbGq_2J)4$GJbuGqetQ?rhX(zq!0*)-*S>
z&6Qnf&^wnhiP#@L`WjSMV-z>z`ZklgfBM~@hAYD88Bvd~=_ET*6vtw+e5x81s;w<P
zv#{$8j-~7XU_HS99@g8U#$?)I+0p3P<8&nBa$v{0xIT1SA8X6h)z{EwGS>NKCIgJW
zkn)TLCny=0p*+d5R3Sa)hmF=2ypzG&^`xiTM(VSa5X{&eU|Yaog?_+5cGmtwsNaLQ
zxLKJtSYQU_xrLmnUihm~_=DFKe$$uqDt$li+n*L*0Fs{H{DoRnF-Z$q_0zkB_<pRp
zM5u<|Wv=!bnj_@`)JPdAkRT4LiOFHOk^1VzCy|MHLz!2#7cAH`7LztwUE%e{G(6Ki
z#aSE5WF5u5%oT&IV`;e3b8eSw)vYTx!`Xp3Ht~fz&KRa(1LlC03xiR7qNsm$<Tmrj
zf$%#yV7~X=beg1fIE56e1bOz%f%{b{i6f{OqP`=UgMv6N$Rvd>o{W7s*auVJ7<72M
zvK}*)AXN@&>qB7W{1s;^Jb_mgJWs#mWL$2oZz43T5uYE3U(#ZXFk2yd0=jz2sC@-y
zd+X$9&nHoAX$-EuHZ`5Pqlkr(@__F`N6Co~Kv=WKE!(D_eJfWQ9YCN#W|2@d4PVPt
zm4&vhOa-?tpj3uf=HoWpE=AvGB7mCpiFS6Zf*naW<P{Ml`(#VR1c4HcN&$X|6<0eI
zy<j~lWJ{?#mZAyK#b4(pBD!<3IZ7M$V;*j+D(an-gYYD9A*%Yf^Fzi@!*Z$vmz;h#
zK$$<Bno8zwc9RbC%orpQz1K7Yd5AliPdBwYDca=d=$82!Z4TZU??q_>gW;3(Psc+s
z=2Tb1`?26u@e+P^7b#+R2UN=fYF)`V@~pWwnEUTC*i{E2NqQ+waP2q)>!{cqLJ#gb
z9zA+uiW0aw3}<u$LRQF+!R866=H$2%0KGs$9_P75T5l=IiP00c82OyzT(eRKK_pf0
zrdhMa*&!NxYDt=g78RpnxS3Uy9NM)FzBJw*@RDIlq73{hjp9FWbW~c)dJT)ZtXIw0
zw2;_*hLhzGYNrMn+`3Njj@<k8s7+wj5)(f;(?xe6V}HVnaM}iuFv@6t4)Vd{1r(tC
zwt}cuRNA{&G@ZP`HsQ7;Sk($o&P>ak3hi`Bqc$07tG{W^i^{5J#DC67rZ{6>w56&|
zfuh&11YM?SHaMp%m}w^$A_b;|V=OHm#*k0WGwC+^qt`d+FkI6$Lu|Q7SxCrOrSKF2
zTSa~^;8aRY7OQ`rGzW`~&WrUe1>hfC)#_u9g74+>@_Fjvj6RLY;3Y;?(8h!rsG&>t
zzoiFI@O~zAEzY<w_|4L`#qI(3tGGd8r_;@Vi<AGrH*1H>!-3*D;RZmo>;0Om@t&%^
z<WN`JZF^W&W*JiI9ek4=W%y!s>owrEgj3c%#sIgD3hk(yeF!fASE<!~2#6*_G8m*$
zoaR!@E<9A9-63pwwZ}n^#u6j%7(Avoexzc-o$Mf%pL#-(i!pm<DRQj7WN@~u*l;~w
zEg38{Z>Y*ZT1#EpmDZ-<6;<b5yvIAPgg%=djV}mVe{B`Viwe~Wz2F)jcT!X^-j^vM
zE@oX)fik;O>s?>1@J=jV2Mp#PjghgY@==v{sH3Dqe#@Zg--OOEdpjxg=J{0yw=At6
z)T|%(wB9%nvR%3r#Z@xus-GoAW#*aC8ChXXZ*LJ<j-O%msu7;kvB76`?3s0+So~2%
zjNN0eeYvRWDbH!m0sP4pE!)T6R$1<KMr95I$>V+(tT%c<qj{#B4ZvXugTs<7Yp7nt
zI`>&D{H2J1WfNJRgi-=0d|{%C!4<Cixtr>;|7X}k?2Jhy=~RwgAfSK}F2qQa&}K1V
zXJUh)%+%hbk8nKnHXX>S8K-g4Ta#W`7-vQUsDF<Aw%yPoYGdu36*@m>ZmWP2GxN;=
z`>MJM-_@x;rPQlq0^n=i$4VoA`=`l+zb*BwHj{L0Vt2LSyF+TInQD2*NhajDG3y8T
zxqyS*-7kAJ!`PQ&&@uq1xvYPNJ}G!n)4fvj6=BvAOwlGf1s$I78Kd8SEg|jQ8t3T4
zWsU?z5H&1r4^P06X|p-K8$~&(=T=CYvf9G89-4H$kcosg89)Z7C10-E*Idre3Y<>t
zXs2S?@llXE>J6ffz|ajRYjmeRwz$Bx%WQEoGZ=bcap=wBh1VLt06z1g8P@(f(*zP6
z_{pzC_3GSHbke3c;Sl6A@j5{{iqLYz{RhoRrGwKVjV}Uk)sYNj_ueLZ?YA!-EKX7P
zwr4-m$EgQ-O982m<MpE@apR$hr5|Upc9xwu8GgdNU(_Q;r_3}jSSRk+pll_MeJVBF
zn%RR5sED0B(AqM+wtJ6wun-{F#)S#1flC3{_9ma@g0bjyJyZ^*1()O#EXznGI&;*C
z8dVs(S2+ysiljAXanG1^I39rV(=M?*5<Cuf(%0dvDgZe!uJYKS!DMb^k!l})`q0(=
z<)<XiWrkJPIQ;Mv@kf}3G%+s(o;H2K%6qTR>&D83bkH#<(VrukWX1CRbq+z3ezOt;
z`TJ<zK-}Et0@^{@bhgP30m#9&Ema_7fkxMMS$mgJ*LfLbQi(xH;)A9QAj`lDT$mY(
zy92#F_){2MlB^XzfM&w$cisR^Wyms=)`4eVozjYCC(bIn$L}`t!H@?Zr|U=7&-7os
z?M@!00;jXO9#T5wQ5ql5j~Ft!n;wsY_EOvhx;<Wh|C#aKc~wD<9GU^B3CYCyC=1p2
z984E^XZs%VJ-|9%3*|+4GRHE7QIRo?%pFZ@vnzpB?*G8f2jr29?#GY9)fKxwO4G-;
z{kht_X54CVI=y%AbiZlpL42KqnKwz;LV1fP+G`BP6iw&9=pLIO`usUgT9HumKnbOx
z$&#aZkU-{j>+5ox%A&)Dz{l?o{`dQh0;+|E577S}*S#j#NoU2kE2W$)mo4E?f0EGn
zD=pAU>D|ZysR37<MPG_8Wq0Qd#Eh!vmzc;zwFNxLe+Wsnc7-;FgC}>Z+hD;uV&>8g
zVh!^3Rtt9O+Vna@O8c<8pu3~zUU+bPQV>41QiM9m*u|?x-J3_S2Cz!cQ<$|*Y6=#N
zHibJW*_QPvrmvvplzLtzRd*jC&qr})`^+FaG0xZt`~ge>HhtW7)+#NI(E=3JiBT*?
zXPZNNHB97ud~0<Zp}{(n0<O{@>p}!OavvEmw+r^r!!wo#?Uj!QX!t|EMLsgC3C^N(
z+!iA8O`#-8d}2v8N99yfihaw9#uC!?h*8CZZKQ8ReIG&7UoG96sz*Rgd5EHUuQSrG
zx`KyOcLKn#lzq#46!?B!gR0^^_)y>(7-PMM9uTXTYEiO$YEjtkCffcvK}voQo07B=
zvna}i9SRS>V2(P4zuQ5be6zM%MU-2tR)vk7>==P9EGQWx*M>6|h6thNH^SgUbp#cJ
z^`3~3JURl@{>#eXLO^S%D*UAZB01rTKcR6W84e&hxpf&;XP5l45Gff<dO<z~y;NnR
zAKnl(`ZDG+E>GE!4~FA-#BU81(sS2-&r2t+3huL%64m3`o_E2NS_A`Bfr>+mib*Ql
zBHdYn;Nm>wX@5&R5$8;MYiPCJHyW8mQCP(vzbK299tz5YU}?pT)tP4N?nxPX<uW4>
zs%!vz>*L=8z}O>(tf8ud3*7MYDvV-CaiWF-<(TcvH4)ZK<m&tI()YCRo#4D!PvBf!
z9GJPa24b#5c=o-tyXlEm=5%a5e_vg)7nH@m5y&-N@ln1SCnFdcGNY`t&6S}t>J?!?
zZ=NQ2vNovauAWtLD-PXaS$(AD+34!Tg(d(_SK$q+;5dh8TSmI)^I$A$TCqe@1BZ26
z1^TbrAK#0s4J1a|V`~$Ad|TVd>WeQ{SAyz@^X*9j%W+JCqyx!6pboGwat;nGQooX4
zXmi9QE-=AV?ngR4<H;OX?sY3pA%<;IZhgI&6gEh!bzg*lf`y3Ds;Xq?++e{D5#a?8
zKL=*lp`isB&<Vr(tpz08l+-=;Gm=e#f8CPbj|EfDr<BU;+hVYTX=&BayC{8EAU>8l
zr}3<{wSHZ#Sd8#hvTMq@QYA(2qS!o76z#fKE{c6)SzX>(jxu2|6aD@zbp12;a&Q6p
zGWhxg*sOgG=^jZ4maxLeLzoyuzXl4R7)e{A!4N5OXaF&J#D4Rz#0>gtH;RLjCBKIM
zE_>+Q=@&zdxp&vaQ^YUKxBdN$+c>d`oQmMQ<C{&MSu(>FeBIc^GD~a7K_Y!5vov^;
zvgX!H#?%;1!A9a8fhKd*edDz)ck1B!7A~mgbImO&!?MOYN2t{;ZNKP?&nX}PA2{4(
zs~F^0jp=(i=E~%Yi_Np^vx~q1R_ui3+F6NDj6%72Qg8ruis$ag51}Ce<!dg?580uf
zokrU=MI6Wz7|tQ=TXtLcmpM*PmpDi$@IRXYxFQKKT?GjuT7rUk3^AzC@}W8}%8K$7
zx}~#lG7W?MGFD%_BU1aCL(l^N8W;@t;0DxiC3%CiFuAd$kh_Qhf(DqB(`GWLH8!z!
z-`!&~JP3z^*NKNBnm_rrUNN2CP?Ito7U<kaXjf_RMcxq`^eLZkas4Sxi(HX%O@sut
zM^J<S3WLAe8RBx8R$J7g($2-5i(;#iMz*OcD5?vP45dlZ1Ek?TG+<Q#o8zv@4OvC^
zBhBjo#Y7AlLLtOmu;(&xYdJcr8Y@)U%dAFKHY2sxf|OsOh{-2)HKLYIBn2PRt?&iS
z7qRS4Ys&JdK<YzhdV-ec=ho8@Z~FeONQZgSOx55Q`u?}bt9UUFNmRl*m^kYGF#1p6
zh{B?ZIg-XWWV^-${L{OD5-#4UU0kG|-rYZH0xitXrbr*@12vA1d#4V@<WPCupO{UJ
z(?;<uD~Fcd*yHPlbg;%KmuE*!vSqM;E1AXI8e($V!$6JMsJlX`aX|C6uU&KBpNj2L
zrhF|kQ4uTXS>GEklR^Ziz_e8Er74<|T4fN%8APr<!?rd$A{n*=7$Oi3`sp?9_=Jds
z%Yy9}1YsS8K-Yc~2~2-{QA1}n&{S9dhF0g4&w<c9)gVSP(i}3PxLzxqL5`n2^d&W)
zsqVfyp3b|2KtrhTHaQ)w>a>59_b}1_PKZ7xXhe-o1xfm9-r*am1S+kDIp)mwVxlp5
zc-pHtlXvBMUDtG4K#5uyJRft-dWxK0=MZ}|qgsl?I5De@ofFjvo`GSSe|zhWnwp+o
z1AH6XCV?e((}i3^%aV(HLyij2F@K#nJfLrK+!P<plzuXXN#X*sWDJHJ!plQW9o-%F
zn_%T~J*Mu}_giBL)PO8q2PuWMBvoBga(ph|x5bY2?iC+7z`>aLQH$R5jY^BSUT4=^
z%Xa(TVa6j5ipXt>9?3IJ3yN=?c6d0+Gq7I~9nuhv6k~QJHzfV5MV<j9WEI9BwT4t5
z4ct1lh8(yrs!4eF6Z0(x+?Ko$FtA2RP#+qbTdHpb_6-VhyU@Qo3YDKS5T81?h8h9(
z`OX^knF$UH-~}6k_!f?qP4cb;_e}jr|4!|pe&wX)?R{-yy9fCNo~h>S>uI1KT=P6m
zxbp09kdquSzw~XB<gFU-3uuzAB)BB{h&tO{@O70L?swtNH^>KNhs3~_uO8un64Z~i
z<MnZkZekggxQUANtDob@x>I+SFkBQJU?I=Gwq^z*0x)jp?06s3zxRduZ)$kHT6kc+
z6SQ$x-<ca_VRpWRU)o;o!N$Wy2B1d_8t~aV@dF#(SbBlg#7gNK5FFUGmAV_R)*bzJ
zo>HL<<T_u`rGY`5+EOd+4G&T{$(hYhv4{asV)1vqI4D>PWYMI<Yv3;Saz+;w)Lmg1
zI@)B#fP0|}cI}K-(0OEDo~|*|j-9#<Lx*sH1_HyI+B&7(;U5erZ`|{g4z-P-n5vt-
z>+U7JKpV8Synrx!&t|n7526dO-uNYF=KGNsHJHbrJ>WQJAf>TLgpKMR^=!_5X57nk
za=!_&2-_gG4)KucI-UJQ{VvFhnNaB=o$YZ8s5f4sO{j{tIZVn7p{@~7ifCk+kJR-F
z&f}1>vo`DEB`u0mh*xa}rc@PCPB|w1g2^;?U?`Wan_aO<vB{gE(aO<X=a)`ABwvGZ
zd%O-IuOdbm#SBLx+v)6MHYWU%8PB>rBtww(sVRlalWS`Tn!j<opNK{r0i#w1*j&*D
zkkJ^}Is|LcUBpBhWy>5S<*aL2C0Vdai`KS;9u@kmA;<wm|5P60ahE!Ld7o{x`@L{?
zceMRGxLyH|X}kQcq#=?A;)Bl+f0{;V=>kT514<1e3#y4eJcKiKtUChM7xcE^jMdkj
zCdfs$I%VM<fvKrg8b@|5_0hcrxaBPrK!fOlY^`f=3~W2@g^=~=geC+-gEHJo?}ViV
zkbvCULHZ^&7@Cg))v)cz(k`WrhLOuL?d!lzX$?dL?&kg-X*d<s=K_2o#@g5`FLvJL
zin`g>Y$)(BZPdi;8gp-bWN)fc`u44QJD`?KyA#Hw*ot<sP1zZl7ch_o-krS$&|+Ib
zLaKEwTFB25AnA`K`|1jH%qbO!Er)k9&-C-t_XmiR1tN(_u!H`__o%Z^Mz#+QEMhgc
z=tc8~r-7%gVVv&v{(-AjFTcB<M<H~LA`~MTBpabcD^Jf1M4dsi*0y*gYQ(A8zY%X4
zPx#OXV8U%(1(235o?tFaUAx&805<U96=!F){MwqFPd8#$o9?$ub(RyCG=Z)yO?If&
zu;Eh^6pR_~QZ;CM&;G5&e#$TCc-<%791b=1RXKWHj1}5f@BXcJKNhQ_3cG1I9^mG%
zQM6Ah6d4bERP5ifA`Xu(PARqsQ6fyy)Vo4zHXu46j3m0^UR_uG+)qtGr=dq%fLxYj
zI$RV^x{66>#uJtg`wq+?aK|^I(xP7#4nv6Gju%Avh0oqjA3MsAzBSd`iu!61GY?mh
zKz|GFj|0A=>28H^4MEWv-`(I4H0x{Q9EY8S2j)#I6k771i6(H)Kg*{D-ZtBga#|oI
z8$?I~hP*Gec%Qzu_(!4b0yK4)9HMty#T?(4Z;Vjj=Qg{HPV#2xvR@zfd~>(}AN!8j
z5Gfur^GAgG7o=iXaob%kALgO;_Q`{oQUla@ry{4c_S;wT^LIrZSPH(UDJnBwEL<O;
zTgwRF=AVu}Hb7h+m>78P5{A%`C5O*+qEn8#ANz(H9vJx@I6aO40-Zal$0tWvAA4O{
z4B|c~@8%4dPlIho{IwqU5G+{|B_@np4@yK?Q4d{2okh?@+Fl1D);iIpCYe0m%LQ;x
zj9DI5CydxY`JA%qq=T_NPp#Y69R3Cun?9Ajp@*Mc9^2-ok<R+uO^sK$_8ojred@74
z8*Y!woM-s<FEY&mAXDF3!-4~QZgz0(LmvqAy$%+(`uXk>iuQ9JtijCavUwff(M!6d
zv%T=@w<>>ox}7YP@J^|ge4X|)xE>2L>FSE6BGT&IcU*kggs1YskwMP<RRMe3Vt>ZI
zjTyjKAoO%`YxMRVyw0!6c<EFf`m?Xx%R}GGyH?FmO?f@wz3#g2`t1EwWn07RC`4BQ
zfwTLmPCXWoql}=}aG3(#-FQ1|%(V4~$j54XuM0Vw=fyHuMxlq8QI2}J)~)bEeC9CU
z_buJ8K<{dvWvH@whK=RrfV^Rb=jfbPo@jN%Z>~E~ZMyfTbgFblMR2>!nk92L>s-SV
zO<ttWkMAY`Hks3?wg`2<mr)4?-j((fK(}X<%EjkCUH1L#56~nw=L`lxSD%g@vhU7U
zdu3*}_d=YHxBIxf!uF^4s8`6=9qW*9YH}r~_E&ie+w#2jLo9dJD{<wo+>!#~P7OHN
zDlkb#2($4xr~|!WD0a}Y0LI|=%N`j%H6vX8n%a0k>3bE{D#4LYgCsnJmrFN5q(#k4
zG~p@Lp**==$tW=Amo|aRk?4CC(gl2Ctm7=AD{Zmbf*Nqm;Nv0E(h8z32EgO!e;J<q
zEzWb18d28xBB`<tf89KuXUJJcE#`OAjy+FF%T0sbu_Bjrw$nQUAAYTz<L%~Ti-xTF
zGhrcM%|IZT@vYhT?v1eIVB&BkhKi~%qNZd!3B5xo#}pC5C(JC{nkkCSlw@R%>4-D`
zxP5$v#(o!hTD`fWvmpr+v)lPDtnmeEPBp2!eaTDbqA6vAvyT(VcEA$jG+AJFw=nAR
zQS@FbR5WnB2>dt?eEsP8i0=7-{?}r<(Eqg{aZ;t%8`|H6iE*$n_#;7!5*L3015*M^
zn)0Iqu(PnTo3b+-nXt1Pv2ik+a2XpJaWWfnau}JgnXz**GdMWgnixCSD$6OHF`;yl
zT@zJiYV#1GC`u_uJh=L+rD%bxuWU7{q4C^sGv03RhjQHVIX3XIcCemJ{koKsdk+*d
zbs-dGLx8a`ES&G)J=WpsLjE;$_nk62B!!(Gpiu%Ap>CNel>qI1w2o_RYi@0I9xK(C
z8w%AZf;AToNwyMTd!^myA3f==N>*{{y-o$eh%^x1MW4N5gp8O&6BBC<PPJ6p3od?I
zWfhk^%(1zvn0J`J$Ma21S`#8x=Jz)q%8X{?#@-SN&?Ckv=^V^$uFKhUQzcit?S#zE
z0iU>4C~|AdUH!s`P8;B#p6)m-7`V){68+@MRj+JQ;ayNNyUW5YB?qFjY9Q45@;KFu
z66&tMfw4=pTz#BOjE;!Zoxl4R#ATIJ{B)>{Cw!A1ov?&dPJceNWFrx1Uw6fFLd<ID
z%#Q!wQU!V--N3MF?jQ1X;Mkk(xM|{+prq4FtzthOTM-$56dPaSVW{X9P0T*qeZ`$%
zY7fUj%ORpi5N2DRJKOXs0O_s14$xBd2&O0l{s{x@f37#3ROQPI0s4-Uc6|k5|GjW>
z5{;kmKfU&T_~5-sQGTRE|92dK7FYiFt2b%V4|F@l|6foj%0NQ>rGx~%!$4ux=KFW=
Fe*vUlJwX5f

diff --git a/code/src/Shared/Win.Sfs.Shared/bin/Debug/netcoreapp5/Win.Sfs.Shared.dll b/code/src/Shared/Win.Sfs.Shared/bin/Debug/netcoreapp5/Win.Sfs.Shared.dll
index 6000666bb0358cf6000267a29a0e8586d570c177..0bd19b79346852072fc4cf87dfde02b0a39a3bac 100644
GIT binary patch
delta 211
zcmZoTz|wGlWkLr_VwK^)i9IrmauZjEGoGHz$XL&)GP#klp6S2YW+o=R?*f0AVp2AH
z8u_gCn(pn){33I+!_OIVysb+t*D^5r1~4%&Fw{(cD$Xd+y2Ol;Vaaq(2}WgU5r)b=
z&n3&e`&Ku8lhF=IV+5*lv5Il_cX6FwEy0*#1XZAY4ypiT+>e0Y&l{x77KQ1j1%C#b
t1p~b1K(@j}MKPe0rfW(vKAm15$!M~jPm1vuGn0b(c0oDD_ly$_*a1oQM6mz>

delta 258
zcmZoTz|wGlWkLrFM{nNzi9IrmK@(SoGyb2<$XL%9F}abkp2^sJGZT~EcLC)I?YDF8
zrn_x9{m^um^Ujpb4nJqe@y1wKU14DK4PatmVAwGIsW_uN>kTtTh8xp4B^Z_cZ4a$J
z^{n=V_ewuj^`$R6ZZHB>xmd-#oVx$njHNFZ?tDIbUCh&-=}&g80g}%)?tQ*{^7D1m
zp%Q+n<xXC~sU;;jsgB9X`K5U!)7>Q)Q;eX7YQqc#Iw53VPUy@3a~AjR<~6>lZVs{r
n0vthXg^7w{KyOU{D#7@4JD(KeFJ`6?^X-CijPDsI8n6QZYE5cM

diff --git a/code/src/Shared/Win.Sfs.Shared/bin/Debug/netcoreapp5/Win.Sfs.Shared.pdb b/code/src/Shared/Win.Sfs.Shared/bin/Debug/netcoreapp5/Win.Sfs.Shared.pdb
index 066047d2e4fd797e9f20cbadf21743554ed291b0..1fb666e5e2a766be57a80a73da8000fba34da20f 100644
GIT binary patch
delta 11066
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

delta 11385
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
b2UaP#ibM1Dg$??`%fyERu2>Y|c+l;CRxq7C

diff --git a/code/src/Shared/Win.Sfs.Shared/bin/Debug/netcoreapp5/Win.Utils.dll b/code/src/Shared/Win.Sfs.Shared/bin/Debug/netcoreapp5/Win.Utils.dll
index 77d84cd0c21ea51fca7cf2471443dadadfedffae..e5a978b72230637d3f99d6b070482edb5e993f21 100644
GIT binary patch
delta 202
zcmZn&X$YCn!D2uE$gzn%GK_H(SB5ikPG)4RXH1#g2qbMcGcwJW7I+@G_xeY3X8&$}
zts^cQecx{0AX~u9`(};bZU#o*044?ohN8*3it=oa>=_syDNYVjRFYoRr}BCJ>t!B0
zN&~-IN^btf2vp=^731vh;yU@TVw4e7{)Gip9%R_IeRi8=4>z&b6iKTaIsi35fwu#Y
kp)gTV4CtOTr4@{mHz=8G=2Q8_%#>iTSy1CW<3s~?0O0;eApigX

delta 250
zcmZn&X$YCn!NS(Udt_pd4CADUE5jLWCo?kEGtQXY2qX(PGcwJW7N{s<=gAXZ=hr_c
z#eGV;(2>m>WDA&i1ux2fW?=LUU}9ikST<Q#QJziAfq_9xX>yRFlK<?T_Dhbu*yh>j
zsr~z6(*kowpduHmn3q%cKbx`i<-(oMXRnKS+B5yht~EgN*~Y!kcTax4ZaP%LFSXps
zD>${JBq!A|IXS;HuViw+Vw4fo%$tr-Gl32$j+=8p=-k?urrY11^-Tp@4+Hfew!%b3
cF`yrelvXfq=2Q8_%rwPdv!KR%#)$^(0JkAzm;e9(

diff --git a/code/src/Shared/Win.Sfs.Shared/bin/Debug/netcoreapp5/Win.Utils.pdb b/code/src/Shared/Win.Sfs.Shared/bin/Debug/netcoreapp5/Win.Utils.pdb
index be4ac4968d4647877ffe789e205190aba3db3e73..aa15f20eb1f77c3ac88948a118974400c62c4255 100644
GIT binary patch
delta 1311
zcmZ9JeM}Q)9LJyMuCIW?g1oh1oDAruP+Cf%-6oR)L1=pjWg`M(9OcByo3s>|OlScG
z7v9XdF~wn(7a5yDMi7RJYcN|z)XglI{V}#V1(F3BMg_&OWY5(w%<l62etys0^ZP!}
zb9ZY9HVwhfLqu*G0Iz6D$_oGhL+v4t&Mpq@nXsm>r~^h<?|(sFInmi#|2BZ&J%E9a
z5zit1g1CSvg%GGA1}unmh)%@oh&TqpRty6vh?$73h+T;Pu+MSy9ETtq5rUVs5QHLy
zBPozx*P?9z9F%HtAkpDqmyQEw>XE&wXJ2rETF(VFu9^of>3Lw@Rr5hS$p<w^ZAd*x
z!=wO(3sATKg$q!)060k@SRmP)jSB}!==kh{Iv0h&kOt8hqMN<=NEjFuVX0VskrqQE
z90>w}j*G~1)joOwqR>?vNq0mKBnjYvBe(?ZIEQOQU9~s?d0<ROKt7n(?M8K|-hsSK
z??ir44=}bSkgLgj<QCF~{5a`A9;$a@yln_~TmuKr1CePCoDX&}PdH;-PC{B@5;M=$
z?G)xhjxaDdEFzY;<u=J3d3f1LR7_2^xQmb4By}CZUep<5+~3__4hR?~kLO$OwlUvk
zBib&7?Y$WD%<pz@pt5Q*Yky|{)w|?Zw%3%7^vel1BTD@>W~$71U=K|d(&oLCnJT3#
zX|vR5*$kN?nlAM1nDbCQzLVGYPSw-f_V@1z?gh0R*}pvZVQY2O`8UH7sY*K2R7xk5
zmsQcs6J9|0f9-ZYAstydeq}N3Pv@E7zErP4x1YP#@yL_mDVkbw*6{aY6%)q~P;NG4
z69LwTdf4BkY&n{Gc)F%}<naoT_=%H0(7mF`>ps7nPmtD<5~`qtX5QlaZywivmY8z>
zG?q8+v*lUNWN*i{;*L();M#*=&ag)OQE0!l_=K;4Hk+st(_uQPrjjnRn99p6FCNx@
zpZLRX+l_1Gs}rBM_Er~*7OIom*Onab^5UgF`x0l)O?d<us;QzP+Wh>J#aG5unoR}P
zO8Ui^hDf43H~)}#kZfHvUi3lF?>$3-ifGdf@n08a7uQ0inuAXnO5nHol^U!>?tpl8
zWXJYjo5<6rcHixEZuM=Ph<)_g^?h+GUcW8RE;0jxq$sbAU)wOz@O8sf!w-bS^2XH+
z#v#i7aWT6hdN8iNz42K5r{xd4Yt%E&1AY!BNGN*ge{GGCj7}H=XPF9NU`&iu7NL+v
zDWa5WscNTDVKmAMWk#B&3glFbvXGKR$z$ngnL?$MQ*v5GDP%HL3^n?#@N_cFXY$h>
zqB`gV+Ec9cvo_A!P1Y6|QN~Gs1Aw-5%-#c=HCXeK8wWyYPr;fynC~)@-Sg2r-8^fn
zjK4w4^MtlGEQc`})VOCfmysGmm}!Giz{fmcEoSRyl$nyP?0RIDtC0h}nS+_%NZ2*z
bF#9n+3Ws(%#@hmbR^!7$Lp+DK4*>rHzyg2D

delta 1408
zcmZXRdrVVT9LLYOx6i>8w9G02uPm|KklF(B3Pa07hUJz=1sA45DHp8P0&TH?8>Ku1
z93+sd(2Q-A4T*sT6e5G6LNcA(vI#DbsY|0v5QMR1$~Ku8vR}JDWbWR4zn|ZEea|`f
z*7V@X9^70+olimN)mVLDE<&h%WOvuKheJuWq`;M1RgQ4)TU(b}nj5VR2&1!zK;HrH
z05@WcC`_Ouz!G3T@G@`}=s^%Dj=(4t_&(4MoCG>u{Uk=2B!OChT|kU<N{os?7ElGK
zRtd*IBpOzd$e2u``eY8;YNa{IM7svKsD|dEFWof{t<XFqQ@Q&2s7b{~*Fbkb3!oL1
z0Kx?jE`V?WgbR>oiVy|Eb)P>ZYH_zoWOq}DI#MtUV|ZN;A4H(REyO;;I-n$=MS?I=
zCv$;3cb!8EfI@fOukrwTf+UE8Zjcf<aW_{BtFDt2hWRvw`A9_Xfx3uxfRE7Q;L9{3
zTr~w=qsjpvQ&oabs~q4(^f<v20q(mS4w8pXrZ`AGYG9vmE=79IpB<aEpPTO-nQQM8
zKWJ>5`QkJ1*^5`^M%lT(wtojUs2EG^J~d-D>luYsTUcT+vlqF^R*!?2<Nd~)X_;A?
zW0a(@y!b?yB|E3{!GeeF>^WilkMU8?_W7>S7@nhTPqt62QDe{^d5h8HF~+z;gUM`?
zYE7QcBPxfen2CF@aaEa$tS+u{Npw#?b#+=Zg+82ORwJ{n2^&MjYco<KHAc;G#>^OB
z$azXBtG#N{YX8Ph*tCMHGlk>gh4iAkRYDQ-Z1?=ZjZ4jJKTooA&DJ&r6}5g!@7vlI
zJx0q)y{MSz_Zm<9>3{HWxBV2;_p40xSj?vK#nQEFTB!@a^%Q&*dS-O7BFZ`N*FZ<>
zP2SGb?1D3zjE6m0HC=W#k-yElc8Qbf&hYV8Yc6NRwRwD-9PTJz8978ywKvvTL|@sJ
zbw3<^Ma>v>8ojQZNhmcl29pjx)PJv6wSx+9b{s&DGkYFY`2D=Mj_>OXI;M)8%ufy4
zv7}c_#(%t7ZP64IFh<w6j%JJsv)QQ2Eip4M1Qk=;_14+tpyhW$|Cq?I%VekSFa7kc
z=c8dkY=YkRlOf4<)=#i$?VYPeD8+4F!L--YqoL`iCAV|w^OJ{OHkH;r>kROcjon<m
zKgi|?6094Z|JAD1YNA?DEuubeFE)fU)!91|vuYMAwu^c%Y@X@g+lqNnftPNP3wt&n
z&>5r|W}V(7RhUf7@mzgbk|Dnk&iwy03zh%+wuITCl%D$Fq_3|`Pu(s1Ma;AYltoS2
z;xjBPCFEfzD-rsI?~=-b!lc0=^56)mJTx$Dmpm^dI4?pb57*{vwPCV+ZEjvzct}J@
zm`t9piPVJTF}d>4U4!Mq4-#=N>yzf#@(mtG${Cma4wg)~Ozbi_JCSxqoQbfFAZ*>Z
z?kG{e=_L-v*p^Dv4YMcH6Fqui9xZd3g8e>S$@9XM&BS5WUmc0P*tgXULID9?l|*GP
lJFk|kb8V&i)V+p-MXdk+vGovNIZxP{_>hZj;q2mm@jvlazzP5W

diff --git a/code/src/Shared/Win.Sfs.Shared/bin/Release/Win.Sfs.Shared.2.0.0.nupkg b/code/src/Shared/Win.Sfs.Shared/bin/Release/Win.Sfs.Shared.2.0.0.nupkg
index 6b386c056e14e09c4a62ff6896853be777bf2fb2..32ab27fda00ae785f1a24ee7be4ce5f5f41b9688 100644
GIT binary patch
delta 30310
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
QPj^zgeevPweE#+Pe>SG-egFUf

delta 30361
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

diff --git a/code/src/Shared/Win.Sfs.Shared/bin/Release/netcoreapp5/Win.Sfs.Shared.dll b/code/src/Shared/Win.Sfs.Shared/bin/Release/netcoreapp5/Win.Sfs.Shared.dll
index 0ac5364dac30fd758a030614864a593b7142a7f1..525d9664be7dfc181dac469eda9c24cf5bc2eec2 100644
GIT binary patch
delta 3598
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
G*!~|WhUv@z

delta 3656
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

diff --git a/code/src/Shared/Win.Sfs.Shared/bin/Release/netcoreapp5/Win.Sfs.Shared.pdb b/code/src/Shared/Win.Sfs.Shared/bin/Release/netcoreapp5/Win.Sfs.Shared.pdb
index 2833a7fddb51de5c209b8e253d4fe39d789c71d1..6bc3f94f4f570c6ca428d662cb675324bb9bc641 100644
GIT binary patch
delta 10776
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

delta 10518
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

diff --git a/code/src/Shared/Win.Sfs.Shared/bin/Release/netcoreapp5/Win.Utils.dll b/code/src/Shared/Win.Sfs.Shared/bin/Release/netcoreapp5/Win.Utils.dll
index c8ea88fcbd5e6569100d1b0739d54a59d10378c2..d92c4c9c629138ae52e87c256413770e213b6ace 100644
GIT binary patch
delta 784
zcmZXS&rcIU6vyA&ZKq3N%kI(^kaoKiC}2TAi3U^xEtqIPAchb^kwe*#DzYNQkoc>J
zAtXjZ8N(l-7cLUXUQF<So=nu3aN%S$z`+aZ&4dFw3nh>^hqv>--_Lt*GP8d>Q(g0S
zy`r-e4pvtiKs)l_-&uZ{e(J-y^inULU%*HBoTgYb7PvJG(sx`#p$ou9?pd)xMF8H&
z1#pr*QbKzjHGWGsm`o}PnOrR%ko!v5PRDHd(Tu|V$5=|(ekTv$w&7>RWf{`ObVEHR
z@bsg@k1o2w_ZEq4URia1=wS}q?2%%|j(aRNC7PFQA9&%^xW=?p4%LNe>F9J(#+>w0
zNw{GC5N@LM407!RuCnNYOZGvB8F$KfqF910c0m^*2LiyO1m6A31wlHO-7TMmRrrox
zI0xHEz+u}le`l{?U%Ft6=v)ZYkaf8;1z!n52rBloX=sK7^M;Oj<uH=*!ptj&<zrq2
zygBmBU9r+7eH#1IF*_XUn0<V`xN+OlPtW*DvieZg6$epj>7XxC)Wa#=oL%G4SCA(m
zr-DaGrP2EI(6_#To6!Sy4KWY0SoFwNPJj7Yv5(gKCv&Y-9uPFhIII4CSCv3mwbhp=
zia<-%8mo&g$qD6_GA3#~DiaK+!)l$A2SC=I!SsdtN}Rd>eg&|ji#;$TX)F*R?j``Y
zMyCS7`t{R|lN-+Q$l{m9c?F)7vVR9!8)MPV*0xwgPh3fiUelAw5xpfIHzr1tvA8j$
z)3rdfI#alQSjeW-z20mot7@LwjC{WFEzV{ft_QSMD?)>|Yn5hFn?h3z?(*DxlPQOO
IV!BrN2lIZVw*UYD

delta 762
zcmY+COHUI~6vxk*Y45b9Q#w;y3QRjgf%1}<(Hb8R5D+!UBN1Do6&FBMFjY`O;;V{r
zrQ+m<Pe5YgLW3C=CQ5=EaKQ&)p@|7BG%nP*&}gXM+jfC>aqc<)^Sl4toO{##fBT+H
z`&|`~Tm4-CJt)H1&xZTvLk*|RXK}2ch<ETNy~|>PqOgKGB~pZL2}Q+j02{f%<AE>&
zh^ayV7s(KVCZt9m*HcU;)x}J%ml;V<i{<TEUHDJuBv<O}lRkhesSrC*nR8Crn4Svn
z5Jb8zh0skm#CWNPovf@cir$u4k|E`co$_-w?XgbS-ih>u<52dRxr=nLR&AiRVJgDF
zv`kAJv({(FIC^`b(C&ew_F;*@BbHkuE(J@_3jsEo7I1?OVwo2<vy}{Gbgp1PAt2d4
zVhmox76xEHe6qe5yu_gg!4Cu>3R;wpbr$MiREWa4Y-I*F$+%Djm$Frktb%KKvW<~d
zu(+dF4X^S&=3@PkYdqei)%fJnuleqDY|SZ?#9O*oD|Zf}GO9{M-A&JHM@o}|Iw05$
z0kxpdi$WOuYT87;CF!!J?_%_j-9Yq#lSRM6Yx+&=#6h|*G*ie+WyoPbzVjw@#^Vr)
z+T<Y2fqT=+a3gma^(q(D%j#9x5K+C(aC#x!>|)jo5&@7dgrCcu@0;fVPxiA1h9phu
zI@xXk*w*PiJre3$F&8J+4!6(AU+8jX{VDq|(0%aispIXv$GYf--mxc7H238RZuevH
z*1*JSqSqN4Zs=*{W6rHHo*QOafPK{wqsDq{q>;8^(DFoni^5E+r9{7?*(Ch~cx0jr

diff --git a/code/src/Shared/Win.Sfs.Shared/bin/Release/netcoreapp5/Win.Utils.pdb b/code/src/Shared/Win.Sfs.Shared/bin/Release/netcoreapp5/Win.Utils.pdb
index 335d004bd2b881b787a050d4e4f8638d730ec801..6ab23ff302d0d28f7a1d62a249af8ce3d22f8535 100644
GIT binary patch
delta 1416
zcmZ9Ldr(w$6vxlqd-nyX7=g+Tc^4BVi*=WMxKKK>t{Utvg6m_X4ZU2hw6g5x?p;_-
z<slk6C^)wulObO`tSLn&AhKpd{xG#N%dtsK6UUi`j7HH>W5&*1vq66Mp7S}sbMN{7
zUh_NMM%1?xjRx0A5@5y_fKCd)3>Z6kzuQ|9z!0uu4quqD+zB@^$P?qm%d@RWgB0Kw
z2lg!<UlH~%q-TaMMFlKPKQuKy2emJ5-_+l=r?IXQ<zYDxuo@)Lggk(}jJ$=^5Cmip
z5(pr-Aj8PBNK!(;M2Q5lk;{<v$Y$hYWGpEG8%cl*Nx*a)0V!x{Xa=-bZ8#i|;I@(Q
zf}Mofm39i&qxIUw4^kMgOX1f@EQ7mt87OfH0CF%m<lsVM(bl1@cPLO?f#M1jSD?58
zLJlSDjr=dxh>e6(kv<7$B2>bU4g&K8K4O!@i3G_FB1w%=)PFfG=4XuQn}m33iG{UE
zFfVQv0gr9Cw;+qeopuFM8Hw$VXk-jpDjrKEnTqRiNm;DgjD<ogRTz7c*9b>0hpf96
zO-k?RJMoh+N+r|QOlrXr>%uq-=gx6^ogB}5xGa|S1-(4Q`ieOrRjRL4x(G^{l$??_
zhdv+GC+)h^9j4d!_t!<MwpFEWX-JM`TG)C2>^t7B5aKO<#>>9-I>!`q{slg7fDdTc
zK-5!#sw#Tdv6Q?|O^>ErJd|WC?_0TcS=-k)a=)m0$+$nid%<^UWmCs0<S~AxOwaM0
z{~48jy0+u+teY|Bk?VzrSCl`vSiNCTF*v<$^V;E?JL@aT556WyWvP|_4_hs#HC?xN
zd^xn_k8n%!;hfmcs7uYG<m~re$+o<sT6y%e$~@J|@Eq?h<8lH%FHXFi^N$;~x`3V*
zyyGC+nvHeaayEV&dbexj9&P;~EN|a;&r-PW;P4tcH|X&&MIJ69CUnT+#?0X(x<7p3
z^TM9^36I|BJJfKhw4qVk`S9;#>ZnEa{>-*u>7E29=XWz6_eO4Ei08ZkH}2oqbyxpM
z|32mUbEkawdq1f^R8g9Et77r)hqw2?Da+Etud@Dppg(4svw|rp;rveyAd9cW8(S3Q
zxv?@evuU4e&D(L)wWEnWC7W8WwSJtWH@MHK{_40g^l+xevhG2`Gct?Zo^g9o6Qo`3
zs{38D)K_bBKioV2Mq_wl!q(n7caNN1HSb>RZ^KuHNMF%9`BLGSJS#o+>G9X})|{*v
zs5wvX9GGinbQjs`&|K&DBO_mh&-6(7YlBA%b|3F9)~_xQ)QZH(<I1+`gdByMA|%z9
zg))W8Y|xlA+BCf;U7v2u(3oFl^(?C^*0LPO6zLd~v6#`O>*jC<t=??ZF*?r7=(Sq2
zi4ne0R8bi^lj+1l<=`U0n5Uj5b8ZOmT$z*zgUuygB=tn43<wzrEAko=gJQZ-bS<L$
zOmqXHyDCKIJLTeK%#5BO6y_VFU6{6qM7Kj|%io+z0!2-pkOZ12h<-ALW*HaaCyCXf
ZtYdzpK*(NNI@xB4m!X!0euB98e*q#)ol*b*

delta 1346
zcmY+De@qi+7{{OMk83NSIKaUe^MJ&<jn*sN3RY#dBFNeTr4}=XvMU^2@!Gmx1$9HD
zip~WUcYtippTTZHvlv;H8Rw5b+%(&wW`T?-L^pL&$9@RgaGN1}u0W>OKJVxIKJWW}
zpX<}Str6nVQKF5h{8SE*xe4Hq0w51iJ3~RQ-y@)e0nFhSGF?s>M6p=XMXurk<g-eE
z<93`|_<$SdrRVpY;4dyT?~eOfJTv}nq+rm{v8U~wCK;~f0|A8~gGOWv@*MIKGM*qH
zg^+<0S&2M={0Mmic^8=}BOpsAgBqj{*^j)9oGm9nFPEXq@2?OrhB1zzw4$38%Yhtj
zS>^B>1~l0e5XRVHlNOZFVN=4fs3zfpjf87at%7vB3Un9@#sUnBU5(~yG*_d!8qL*E
zY}Y^?{^W^A4(*TWeNnA}BX$Cp3H(Tp3VLVBek9T;RMRGNM$BhEHmAiTMX4#lDm4mU
z7<XN;VsC+r>Yz=H)I{}6dkiubLyJ30<y!o6bV@OzSS=<hGc-jea(S`2WZ6=&LYdQ~
zsw5OKGiFhgHn8!{`tF9R*AL&hAJg1%R8#PMfoW*pz3$Wb<e|NbtCB21)?fX`GLEg`
zf=dE^AtdOlg~{U{D*wujxyq6X^U7|ebu{q?-*>j3?Sl{dxbgWbFKAks<j0Sfu|d|y
zg}9(Tt6ES`yus!OW!)0L)zR`dF(x`ZXKx42C*Ln$do8R<<Q~0zuQFk@O<X`~Uzpl{
zk21~Z<5N5LE<9(a*T+-&3maSO|9q};b);(>_sK7G$%wd%Ov#zt-fW^y{MzH$&$OQ&
z-eej&`Pa#VotMdZWmTSb)^)dM<<{;ls$?C{vu>UfcazCeWttnQh%0HPll{WAWN*yZ
zw%kJ-|2?%zMzvg=-jMiJmv#Ghbt0vDx@oG+B`Ra+;0hS2=y|Xy?T5ncs?;Ifnv(ff
zYs++5qrCZQ!GRQK1MBf{!HGtiLwJqc>p~p%a?&HLq2};SKRwhve2w|zimQvJx7{4Q
z{&wtx&()TteCm<Uv|rA8!lTg3(^4=0cd%3D0n*bS|4$uL{;qbwZU6Y{syJc&_D6>^
z;^}jj$8YwE!>XcJr%!Y~yes@(_=9kST68QU?fS-@jY^eaaOd3pBfg5UYiCcTE^6w$
z^9}#L?fH}yUccTI^74Y-EC`&>&2K37*9Nfg6HZ%{Vw*a>qIs~M3ku$VAF`o3;9KkE
zxu9+;m7_Np^t6uAXB!wgM{j(Q<qWm8wK)t^!x-o18jaZuXUxN7uEEG~w2{tb-Nrn(
zffm)8%?ielNB6dBZWYFn&J99{^C^k*V2u?6W$DB-qGMiyc&6;FIVLITk_J{91ZmhI
z4M(K=kv?5R0zraU?r@679WOl<i%T|(G&rR@Wr~RthaHXDi30lN-1^WA>9FK#m+ILp
gF>+8SX2zv~ej12v<!cfxR1%42t(GV(2}$VlA6;{OY5)KL

diff --git a/code/src/Shared/Win.Sfs.Shared/obj/Debug/Win.Sfs.Shared.2.0.0.nuspec b/code/src/Shared/Win.Sfs.Shared/obj/Debug/Win.Sfs.Shared.2.0.0.nuspec
index fa9e8bae..7470c409 100644
--- a/code/src/Shared/Win.Sfs.Shared/obj/Debug/Win.Sfs.Shared.2.0.0.nuspec
+++ b/code/src/Shared/Win.Sfs.Shared/obj/Debug/Win.Sfs.Shared.2.0.0.nuspec
@@ -18,6 +18,6 @@
     </dependencies>
   </metadata>
   <files>
-    <file src="D:\长春项目\北京北汽结算项目\NewBJSettleAccount\BeiJinSettleAccount\code\src\Shared\Win.Sfs.Shared\bin\Debug\netcoreapp5\Win.Sfs.Shared.dll" target="lib\net5.0\Win.Sfs.Shared.dll" />
+    <file src="D:\CODE\BeiJinSettleAccount\code\src\Shared\Win.Sfs.Shared\bin\Debug\netcoreapp5\Win.Sfs.Shared.dll" target="lib\net5.0\Win.Sfs.Shared.dll" />
   </files>
 </package>
\ No newline at end of file
diff --git a/code/src/Shared/Win.Sfs.Shared/obj/Debug/netcoreapp5/Win.Sfs.Shared.GeneratedMSBuildEditorConfig.editorconfig b/code/src/Shared/Win.Sfs.Shared/obj/Debug/netcoreapp5/Win.Sfs.Shared.GeneratedMSBuildEditorConfig.editorconfig
index 68b3951e..41c701f5 100644
--- a/code/src/Shared/Win.Sfs.Shared/obj/Debug/netcoreapp5/Win.Sfs.Shared.GeneratedMSBuildEditorConfig.editorconfig
+++ b/code/src/Shared/Win.Sfs.Shared/obj/Debug/netcoreapp5/Win.Sfs.Shared.GeneratedMSBuildEditorConfig.editorconfig
@@ -8,4 +8,4 @@ build_property.PlatformNeutralAssembly =
 build_property.EnforceExtendedAnalyzerRules = 
 build_property._SupportedPlatformList = Linux,macOS,Windows
 build_property.RootNamespace = Win.Sfs.Shared
-build_property.ProjectDir = D:\长春项目\北京北汽结算项目\NewBJSettleAccount\BeiJinSettleAccount\code\src\Shared\Win.Sfs.Shared\
+build_property.ProjectDir = D:\CODE\BeiJinSettleAccount\code\src\Shared\Win.Sfs.Shared\
diff --git a/code/src/Shared/Win.Sfs.Shared/obj/Debug/netcoreapp5/Win.Sfs.Shared.assets.cache b/code/src/Shared/Win.Sfs.Shared/obj/Debug/netcoreapp5/Win.Sfs.Shared.assets.cache
index af86b3fc6d9cbc69675909c39a00566af8441968..e92d2da9e6893af98a69ea7a53ec6acd51acfd14 100644
GIT binary patch
delta 11982
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

delta 11958
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

diff --git a/code/src/Shared/Win.Sfs.Shared/obj/Debug/netcoreapp5/Win.Sfs.Shared.csproj.AssemblyReference.cache b/code/src/Shared/Win.Sfs.Shared/obj/Debug/netcoreapp5/Win.Sfs.Shared.csproj.AssemblyReference.cache
index dc4d6a850d9590919b0d2438928e803e878809c4..5732934fad5ed6081e50caf26a3effe3f171ec80 100644
GIT binary patch
delta 14487
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
ILWSi20gsuj-T(jq

delta 14816
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

diff --git a/code/src/Shared/Win.Sfs.Shared/obj/Debug/netcoreapp5/Win.Sfs.Shared.csproj.CoreCompileInputs.cache b/code/src/Shared/Win.Sfs.Shared/obj/Debug/netcoreapp5/Win.Sfs.Shared.csproj.CoreCompileInputs.cache
index b8637176..5819edd2 100644
--- a/code/src/Shared/Win.Sfs.Shared/obj/Debug/netcoreapp5/Win.Sfs.Shared.csproj.CoreCompileInputs.cache
+++ b/code/src/Shared/Win.Sfs.Shared/obj/Debug/netcoreapp5/Win.Sfs.Shared.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-ed642ce8f13672efffb52777c3a6e2e049c8c8a0
+207505d8295abecb2985ab9cc68f97b4e99da693
diff --git a/code/src/Shared/Win.Sfs.Shared/obj/Debug/netcoreapp5/Win.Sfs.Shared.csproj.FileListAbsolute.txt b/code/src/Shared/Win.Sfs.Shared/obj/Debug/netcoreapp5/Win.Sfs.Shared.csproj.FileListAbsolute.txt
index 7f81ebc4..8aa9d1eb 100644
--- a/code/src/Shared/Win.Sfs.Shared/obj/Debug/netcoreapp5/Win.Sfs.Shared.csproj.FileListAbsolute.txt
+++ b/code/src/Shared/Win.Sfs.Shared/obj/Debug/netcoreapp5/Win.Sfs.Shared.csproj.FileListAbsolute.txt
@@ -73,3 +73,18 @@ D:\长春项目\北京北汽结算项目\NewBJSettleAccount\BeiJinSettleAccount\
 D:\长春项目\北京北汽结算项目\NewBJSettleAccount\BeiJinSettleAccount\code\src\Shared\Win.Sfs.Shared\obj\Debug\netcoreapp5\refint\Win.Sfs.Shared.dll
 D:\长春项目\北京北汽结算项目\NewBJSettleAccount\BeiJinSettleAccount\code\src\Shared\Win.Sfs.Shared\obj\Debug\netcoreapp5\Win.Sfs.Shared.pdb
 D:\长春项目\北京北汽结算项目\NewBJSettleAccount\BeiJinSettleAccount\code\src\Shared\Win.Sfs.Shared\obj\Debug\netcoreapp5\ref\Win.Sfs.Shared.dll
+D:\CODE\BeiJinSettleAccount\code\src\Shared\Win.Sfs.Shared\bin\Debug\netcoreapp5\Win.Sfs.Shared.deps.json
+D:\CODE\BeiJinSettleAccount\code\src\Shared\Win.Sfs.Shared\bin\Debug\netcoreapp5\Win.Sfs.Shared.dll
+D:\CODE\BeiJinSettleAccount\code\src\Shared\Win.Sfs.Shared\bin\Debug\netcoreapp5\Win.Sfs.Shared.pdb
+D:\CODE\BeiJinSettleAccount\code\src\Shared\Win.Sfs.Shared\bin\Debug\netcoreapp5\Win.Utils.dll
+D:\CODE\BeiJinSettleAccount\code\src\Shared\Win.Sfs.Shared\bin\Debug\netcoreapp5\Win.Utils.pdb
+D:\CODE\BeiJinSettleAccount\code\src\Shared\Win.Sfs.Shared\obj\Debug\netcoreapp5\Win.Sfs.Shared.csproj.AssemblyReference.cache
+D:\CODE\BeiJinSettleAccount\code\src\Shared\Win.Sfs.Shared\obj\Debug\netcoreapp5\Win.Sfs.Shared.GeneratedMSBuildEditorConfig.editorconfig
+D:\CODE\BeiJinSettleAccount\code\src\Shared\Win.Sfs.Shared\obj\Debug\netcoreapp5\Win.Sfs.Shared.AssemblyInfoInputs.cache
+D:\CODE\BeiJinSettleAccount\code\src\Shared\Win.Sfs.Shared\obj\Debug\netcoreapp5\Win.Sfs.Shared.AssemblyInfo.cs
+D:\CODE\BeiJinSettleAccount\code\src\Shared\Win.Sfs.Shared\obj\Debug\netcoreapp5\Win.Sfs.Shared.csproj.CoreCompileInputs.cache
+D:\CODE\BeiJinSettleAccount\code\src\Shared\Win.Sfs.Shared\obj\Debug\netcoreapp5\Win.Sfs.Shared.csproj.CopyComplete
+D:\CODE\BeiJinSettleAccount\code\src\Shared\Win.Sfs.Shared\obj\Debug\netcoreapp5\Win.Sfs.Shared.dll
+D:\CODE\BeiJinSettleAccount\code\src\Shared\Win.Sfs.Shared\obj\Debug\netcoreapp5\refint\Win.Sfs.Shared.dll
+D:\CODE\BeiJinSettleAccount\code\src\Shared\Win.Sfs.Shared\obj\Debug\netcoreapp5\Win.Sfs.Shared.pdb
+D:\CODE\BeiJinSettleAccount\code\src\Shared\Win.Sfs.Shared\obj\Debug\netcoreapp5\ref\Win.Sfs.Shared.dll
diff --git a/code/src/Shared/Win.Sfs.Shared/obj/Debug/netcoreapp5/Win.Sfs.Shared.dll b/code/src/Shared/Win.Sfs.Shared/obj/Debug/netcoreapp5/Win.Sfs.Shared.dll
index 6000666bb0358cf6000267a29a0e8586d570c177..0bd19b79346852072fc4cf87dfde02b0a39a3bac 100644
GIT binary patch
delta 211
zcmZoTz|wGlWkLr_VwK^)i9IrmauZjEGoGHz$XL&)GP#klp6S2YW+o=R?*f0AVp2AH
z8u_gCn(pn){33I+!_OIVysb+t*D^5r1~4%&Fw{(cD$Xd+y2Ol;Vaaq(2}WgU5r)b=
z&n3&e`&Ku8lhF=IV+5*lv5Il_cX6FwEy0*#1XZAY4ypiT+>e0Y&l{x77KQ1j1%C#b
t1p~b1K(@j}MKPe0rfW(vKAm15$!M~jPm1vuGn0b(c0oDD_ly$_*a1oQM6mz>

delta 258
zcmZoTz|wGlWkLrFM{nNzi9IrmK@(SoGyb2<$XL%9F}abkp2^sJGZT~EcLC)I?YDF8
zrn_x9{m^um^Ujpb4nJqe@y1wKU14DK4PatmVAwGIsW_uN>kTtTh8xp4B^Z_cZ4a$J
z^{n=V_ewuj^`$R6ZZHB>xmd-#oVx$njHNFZ?tDIbUCh&-=}&g80g}%)?tQ*{^7D1m
zp%Q+n<xXC~sU;;jsgB9X`K5U!)7>Q)Q;eX7YQqc#Iw53VPUy@3a~AjR<~6>lZVs{r
n0vthXg^7w{KyOU{D#7@4JD(KeFJ`6?^X-CijPDsI8n6QZYE5cM

diff --git a/code/src/Shared/Win.Sfs.Shared/obj/Debug/netcoreapp5/Win.Sfs.Shared.pdb b/code/src/Shared/Win.Sfs.Shared/obj/Debug/netcoreapp5/Win.Sfs.Shared.pdb
index 066047d2e4fd797e9f20cbadf21743554ed291b0..1fb666e5e2a766be57a80a73da8000fba34da20f 100644
GIT binary patch
delta 11066
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

delta 11385
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
b2UaP#ibM1Dg$??`%fyERu2>Y|c+l;CRxq7C

diff --git a/code/src/Shared/Win.Sfs.Shared/obj/Debug/netcoreapp5/ref/Win.Sfs.Shared.dll b/code/src/Shared/Win.Sfs.Shared/obj/Debug/netcoreapp5/ref/Win.Sfs.Shared.dll
index 176a88a80a006163c5bd8256aaf0f427ef063fb9..375bf9802cf3b9fb85167fbf38cabeaafac45cd1 100644
GIT binary patch
delta 12
Tcmex=nyKLo(}c2(rCmz_D@6u&

delta 12
TcmZoT!}R|&(}c2(<(*3bDbEIX

diff --git a/code/src/Shared/Win.Sfs.Shared/obj/Debug/netcoreapp5/refint/Win.Sfs.Shared.dll b/code/src/Shared/Win.Sfs.Shared/obj/Debug/netcoreapp5/refint/Win.Sfs.Shared.dll
index 176a88a80a006163c5bd8256aaf0f427ef063fb9..375bf9802cf3b9fb85167fbf38cabeaafac45cd1 100644
GIT binary patch
delta 12
Tcmex=nyKLo(}c2(rCmz_D@6u&

delta 12
TcmZoT!}R|&(}c2(<(*3bDbEIX

diff --git a/code/src/Shared/Win.Sfs.Shared/obj/Release/Win.Sfs.Shared.2.0.0.nuspec b/code/src/Shared/Win.Sfs.Shared/obj/Release/Win.Sfs.Shared.2.0.0.nuspec
index 3ce47faf..5a0f4d1d 100644
--- a/code/src/Shared/Win.Sfs.Shared/obj/Release/Win.Sfs.Shared.2.0.0.nuspec
+++ b/code/src/Shared/Win.Sfs.Shared/obj/Release/Win.Sfs.Shared.2.0.0.nuspec
@@ -18,6 +18,6 @@
     </dependencies>
   </metadata>
   <files>
-    <file src="C:\Users\Administrator\Source\Repos\Win.Sfs.SmartSettlementSystem.PG\src\Shared\Win.Sfs.Shared\bin\Release\netcoreapp5\Win.Sfs.Shared.dll" target="lib\net5.0\Win.Sfs.Shared.dll" />
+    <file src="D:\CODE\BeiJinSettleAccount\code\src\Shared\Win.Sfs.Shared\bin\Release\netcoreapp5\Win.Sfs.Shared.dll" target="lib\net5.0\Win.Sfs.Shared.dll" />
   </files>
 </package>
\ No newline at end of file
diff --git a/code/src/Shared/Win.Sfs.Shared/obj/Release/netcoreapp5/Win.Sfs.Shared.GeneratedMSBuildEditorConfig.editorconfig b/code/src/Shared/Win.Sfs.Shared/obj/Release/netcoreapp5/Win.Sfs.Shared.GeneratedMSBuildEditorConfig.editorconfig
index de9298fa..41c701f5 100644
--- a/code/src/Shared/Win.Sfs.Shared/obj/Release/netcoreapp5/Win.Sfs.Shared.GeneratedMSBuildEditorConfig.editorconfig
+++ b/code/src/Shared/Win.Sfs.Shared/obj/Release/netcoreapp5/Win.Sfs.Shared.GeneratedMSBuildEditorConfig.editorconfig
@@ -3,8 +3,9 @@ build_property.TargetFramework = netcoreapp5
 build_property.TargetPlatformMinVersion = 
 build_property.UsingMicrosoftNETSdkWeb = 
 build_property.ProjectTypeGuids = 
-build_property.PublishSingleFile = 
-build_property.IncludeAllContentForSelfExtract = 
-build_property._SupportedPlatformList = Android,iOS,Linux,macOS,Windows
+build_property.InvariantGlobalization = 
+build_property.PlatformNeutralAssembly = 
+build_property.EnforceExtendedAnalyzerRules = 
+build_property._SupportedPlatformList = Linux,macOS,Windows
 build_property.RootNamespace = Win.Sfs.Shared
-build_property.ProjectDir = C:\Users\Administrator\Source\Repos\Win.Sfs.SmartSettlementSystem.PG\src\Shared\Win.Sfs.Shared\
+build_property.ProjectDir = D:\CODE\BeiJinSettleAccount\code\src\Shared\Win.Sfs.Shared\
diff --git a/code/src/Shared/Win.Sfs.Shared/obj/Release/netcoreapp5/Win.Sfs.Shared.assets.cache b/code/src/Shared/Win.Sfs.Shared/obj/Release/netcoreapp5/Win.Sfs.Shared.assets.cache
index 87a9932c98736d5b7f27c312d4a23f728fa1f0fe..79f2ea4498b6b3218b3690ce9621d79f0d45dd6a 100644
GIT binary patch
literal 137770
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
JB{zn|{{w<du$}+_

literal 111191
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
PVZqhKBvCn6z~cV_ehA`S

diff --git a/code/src/Shared/Win.Sfs.Shared/obj/Release/netcoreapp5/Win.Sfs.Shared.csproj.AssemblyReference.cache b/code/src/Shared/Win.Sfs.Shared/obj/Release/netcoreapp5/Win.Sfs.Shared.csproj.AssemblyReference.cache
index f5e894aea93a73e58fa9d4feab241bc197ee1a40..f0190f5233125dc9ee097192e94a3a9d7dfacba6 100644
GIT binary patch
literal 202276
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

literal 11
QcmeZu3JP{+WMlvW01Ze1dH?_b

diff --git a/code/src/Shared/Win.Sfs.Shared/obj/Release/netcoreapp5/Win.Sfs.Shared.csproj.CoreCompileInputs.cache b/code/src/Shared/Win.Sfs.Shared/obj/Release/netcoreapp5/Win.Sfs.Shared.csproj.CoreCompileInputs.cache
index 2c8a7236..3707f258 100644
--- a/code/src/Shared/Win.Sfs.Shared/obj/Release/netcoreapp5/Win.Sfs.Shared.csproj.CoreCompileInputs.cache
+++ b/code/src/Shared/Win.Sfs.Shared/obj/Release/netcoreapp5/Win.Sfs.Shared.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-4361bc171670f1fc07423ef01008f0dad4065a0e
+8a6f228ed99df16b22ecd182ac4900fcaf732b98
diff --git a/code/src/Shared/Win.Sfs.Shared/obj/Release/netcoreapp5/Win.Sfs.Shared.csproj.FileListAbsolute.txt b/code/src/Shared/Win.Sfs.Shared/obj/Release/netcoreapp5/Win.Sfs.Shared.csproj.FileListAbsolute.txt
index a82ab0a4..94bdc9d7 100644
--- a/code/src/Shared/Win.Sfs.Shared/obj/Release/netcoreapp5/Win.Sfs.Shared.csproj.FileListAbsolute.txt
+++ b/code/src/Shared/Win.Sfs.Shared/obj/Release/netcoreapp5/Win.Sfs.Shared.csproj.FileListAbsolute.txt
@@ -28,3 +28,18 @@ C:\Users\Administrator\Source\Repos\Win.Sfs.SmartSettlementSystem.PG\src\Shared\
 C:\Users\Administrator\Source\Repos\Win.Sfs.SmartSettlementSystem.PG\src\Shared\Win.Sfs.Shared\obj\Release\netcoreapp5\Win.Sfs.Shared.dll
 C:\Users\Administrator\Source\Repos\Win.Sfs.SmartSettlementSystem.PG\src\Shared\Win.Sfs.Shared\obj\Release\netcoreapp5\ref\Win.Sfs.Shared.dll
 C:\Users\Administrator\Source\Repos\Win.Sfs.SmartSettlementSystem.PG\src\Shared\Win.Sfs.Shared\obj\Release\netcoreapp5\Win.Sfs.Shared.pdb
+D:\CODE\BeiJinSettleAccount\code\src\Shared\Win.Sfs.Shared\bin\Release\netcoreapp5\Win.Sfs.Shared.deps.json
+D:\CODE\BeiJinSettleAccount\code\src\Shared\Win.Sfs.Shared\bin\Release\netcoreapp5\Win.Sfs.Shared.dll
+D:\CODE\BeiJinSettleAccount\code\src\Shared\Win.Sfs.Shared\bin\Release\netcoreapp5\Win.Sfs.Shared.pdb
+D:\CODE\BeiJinSettleAccount\code\src\Shared\Win.Sfs.Shared\bin\Release\netcoreapp5\Win.Utils.dll
+D:\CODE\BeiJinSettleAccount\code\src\Shared\Win.Sfs.Shared\bin\Release\netcoreapp5\Win.Utils.pdb
+D:\CODE\BeiJinSettleAccount\code\src\Shared\Win.Sfs.Shared\obj\Release\netcoreapp5\Win.Sfs.Shared.csproj.AssemblyReference.cache
+D:\CODE\BeiJinSettleAccount\code\src\Shared\Win.Sfs.Shared\obj\Release\netcoreapp5\Win.Sfs.Shared.GeneratedMSBuildEditorConfig.editorconfig
+D:\CODE\BeiJinSettleAccount\code\src\Shared\Win.Sfs.Shared\obj\Release\netcoreapp5\Win.Sfs.Shared.AssemblyInfoInputs.cache
+D:\CODE\BeiJinSettleAccount\code\src\Shared\Win.Sfs.Shared\obj\Release\netcoreapp5\Win.Sfs.Shared.AssemblyInfo.cs
+D:\CODE\BeiJinSettleAccount\code\src\Shared\Win.Sfs.Shared\obj\Release\netcoreapp5\Win.Sfs.Shared.csproj.CoreCompileInputs.cache
+D:\CODE\BeiJinSettleAccount\code\src\Shared\Win.Sfs.Shared\obj\Release\netcoreapp5\Win.Sfs.Shared.csproj.CopyComplete
+D:\CODE\BeiJinSettleAccount\code\src\Shared\Win.Sfs.Shared\obj\Release\netcoreapp5\Win.Sfs.Shared.dll
+D:\CODE\BeiJinSettleAccount\code\src\Shared\Win.Sfs.Shared\obj\Release\netcoreapp5\refint\Win.Sfs.Shared.dll
+D:\CODE\BeiJinSettleAccount\code\src\Shared\Win.Sfs.Shared\obj\Release\netcoreapp5\Win.Sfs.Shared.pdb
+D:\CODE\BeiJinSettleAccount\code\src\Shared\Win.Sfs.Shared\obj\Release\netcoreapp5\ref\Win.Sfs.Shared.dll
diff --git a/code/src/Shared/Win.Sfs.Shared/obj/Release/netcoreapp5/Win.Sfs.Shared.dll b/code/src/Shared/Win.Sfs.Shared/obj/Release/netcoreapp5/Win.Sfs.Shared.dll
index 0ac5364dac30fd758a030614864a593b7142a7f1..525d9664be7dfc181dac469eda9c24cf5bc2eec2 100644
GIT binary patch
delta 3598
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
G*!~|WhUv@z

delta 3656
zcmai03s6+o89wLS-FtWMU6j4c0s<m0_3{)f60xE&(wI~+$V0G#6?IiwbOlx(xfhp3
zV>H?}c*lxO9}`JCI-N<{Y-enn>1b;^>a=O>Ot5r_j9QyPYwOrZd{ylKpSuWVn#s=a
zzt8u-&K|b=E!*RM+v{y!IfGcA@~;rGf(pb}ZS3zom_#djPt?#yCZ$1IYleUpgefbV
zk)6ymA0cwqF~R=~@Rn>sb|m_zQ6lGhEECfcKm(gOoEjIG2r`e<f_N;iH3<ye)6LbX
z8S`g=7^9^C&508HsZX@5*sM0e|M}jqkajlOO-N$CoqR|MDImnn^p&Q6UVQK+Kw)}0
zP}Mf(-3UQ$TdZmy^ClBQ-FE*f@c0)2iBbh^G4R~QEOw^cwGu?;?5aR!R0356rp+cK
z`_cx;z;tv(F$39{cOAeoZ{!r<ECH*_aj=09XX1ik7%0=L&8bC6!Outilt+Cbsz+pQ
zv1>KpGku~prdyU8uxlC=>8}OJBdL<M287&2ES?t^gkx^0>uY%2YD!{SCd3cxOh>Cn
zVg~XtFD#W#v?OV3!I~{GM<h4qQ-)`H9BjszH7f&6V_xVv(ZY5+v^p>ir%Z%+J{u!x
z_2$B7(t|i)L0bnDZp7Dtb+1Qx{BosDrCI|T_=+#WsOIt&!zyH1%&B7fMv$1k38*Sq
zYj(!r!ughMejhmen}N7grfmV9yO3`g0idVgR^&z_P?a$)3n$XfbhNsdfo#nCjqx4h
z89@0auw6|+X6DAt+J)tgiQ9m-Zbw@;dNlYlWGlndJa!xb&&6}N?V2Cl!!hILpp{$F
zc7PeO(`ft>O61MsWLhz(MV4RCnk|1~zC_MI#FzLKTEGZX*uwNykhC03%JcxpOy9|A
z8&K*04yGME{@Nf=oD9D#)?^SACewk;=md&`$;H8}Vmex3Fvup|6g&bTcvHrE<|zC)
z^sJ-9gFR1}H3N)U!6zMm=etij#-xJQg?<=)zDR!aq~l#+gpM1Sj+Kvh+zm3*LqI2b
zjh%D}dcecK7@ui%7u~{p-HqpsJwUP7yhyKTg<g?O>J=;aOs{CNjz87wgjqAp)Z&C7
zCYaQhofN}^Qph*?3b>%JdNJ<H1JEqf_adhLDo~YK*V++_d&Fz)oOrtwl}>)U5Qa%z
z`;Zy?@i1lD9O&oLUkC{TEP51XAe;1f;V}Th#|xjX#GKAAD&RE;wVoQAY8!uQ;^3*_
z6}W9(2OuC)f{khUIMVV8rlZ+oV+Qg`L*)h7p1MFBi1+Z+P$$eV)Xc(J5_Sng4L?_W
zQ&2^6I_tl)^2ma;@LZ83&b^))ezs(uU4yUH5<4L!<av6P3ZT_;Z5h2rh16)`=h_SO
zWAg{krM~b>SU?F`NpErAWv;zMZ*wgjHdaE)=_g#v;o2%X%C)z7WCgv;wTr|Qm!4V<
zx%$A~Ob^l;hPf>C!*mV9I)2N2M`#__u5<1CbRE|oaIK%N=h{>njxPO)lrEB&6E854
z%+C2ID<Ws5%`BG0lX{?0cBBu)`taYDhp2hHtZ>SZj3J{khV(1uYh_8yub9JS8XYn(
zl_km#3$99(>?1?6xw$Nj4u!K<Rwo4a#_Mw^Sx;9lh6>1T(ngxudK%=K<!hj?Mto<*
zX4XJ|#I@e|(40nf1O4fw$PF|ci7Wz?4fI?@i?uhijr8M)CP>X}6SX~y`Syk%Z@pp<
z{;3?5E3|VyC9U*ag{37VRnk^^k!x1E0KLjJtFQpQ!L{8am4uZ5y%RZyC_Cv$<pj!3
zdM~1(uZ<2?P59dA$n=Pc&UX6y>Ir8%{jfT0_}4ku$@%7m_E_^j?N#Qw4$*wRBO$!G
zqn6RO@Tr&k#iCx}hXvCe0fzfB818Ei!@=%hxV34vDXB{x=SgOKjpI7~w74GRB#^^>
zA(;l_QZCzLgfj^T#28_5@dcJ4{9NvrV}yNVHqb}8Yo#2)7xlg~M%Yn&4q~$G6euaU
zY)=*H^9JNh!HAkhV}u3vA&~QmD9I6yWsNv<g!x6^vgHUk$3g+CDHQO6EEIO7Jrqg>
z%v&m)2}0shp>H0OGK3gquCf9^f8ng+prufRUnzwm4oY>rh$={s4sdwK3I!beCV&pI
zI-atQr>x^Cn|OjIUT70<uZg$UBwU?E#SG!s@_nTV@Pk8g6C`*~D&PqUI8XrqQBuHx
z0vss7fdU*TAmC-r5K@&4R{$V}<N!x7c%;E&44%y3Q#80YLl|)OxC}lg2XT=1Tn^$Q
zr^7S$C^3|n*?nD7lPoD8DdpjJ`gTrrwvo4OC8Uk~%*;LhzI~=+j-%Lod^|nzfNaX&
zlTXV3lE>sMr9xS+1eMduZ6(Ro7%n+6Tbx(IRyayng`=4bI-6O(e1e^l4+$55UzP{h
z0p$(yfpQS^Q8v{z%9g@kvuiYb^qpG^qYqt87&!YdX<6?dKRAEo?_)Q@eK&thqdQnK
zNv2-4nyNmp8ZykXe;@O9bE8A_sxLCt$7B#f-KOnU740zB+?q~}aQm&Twv0iVOeC*6
z)D_{V!yz<yh*PE@4VuE8MZs&}fVa^dI*Q?_*+fvR5bjJNYN*#K;gOLD8uBQ}yb6rn
z=h>8TNVHp#HzSeAEi9BoB20mgl)~5)caPoaRkK1J%tJgB#E|hs>gJLon!*`1^as04
z)gGt$=R2|Qj@p>naxa|@nhWpFUTJmcA<;5}>N=q{><gGp24YWvwhm)Ehh6a7ICMDT
zlpxnf;Kw0ag4Koj#@)Xr#7Lq;4eht0S5fBfRJ;GdM`I4(OLJa>bEu7&&imPi?%T}d
zyVKR1V0@~Cn`ZOfm~i&}UqweHzw+WGLd(h-JTJ$N+;-9#_KO-N7ms*lnqJ%U;H`Jx
z91xfHJ6`|xqZ&8-iXmj_g1YKfUrTG<l1<whw>P#1S{efWmbyy+&X$e7x(eS8e`{S$
z<MzDD&8>Nr+ZtK|mA*ir$+yk7Jy6-%8t`q)D_?e`Nv36UBj{_>Bj`{|y|3r1H;$GM
tX3qKKcZ+6bVm|A$80D1S)L2?@gei37<P;ZuAh4?9lkRBvKiQiv{SP|~2ND1P

diff --git a/code/src/Shared/Win.Sfs.Shared/obj/Release/netcoreapp5/Win.Sfs.Shared.pdb b/code/src/Shared/Win.Sfs.Shared/obj/Release/netcoreapp5/Win.Sfs.Shared.pdb
index 2833a7fddb51de5c209b8e253d4fe39d789c71d1..6bc3f94f4f570c6ca428d662cb675324bb9bc641 100644
GIT binary patch
delta 10776
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

delta 10518
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

diff --git a/code/src/Shared/Win.Sfs.Shared/obj/Release/netcoreapp5/ref/Win.Sfs.Shared.dll b/code/src/Shared/Win.Sfs.Shared/obj/Release/netcoreapp5/ref/Win.Sfs.Shared.dll
index 7a022168248037e2f9ee64351580210defdb3fab..aedd276b80ac8961d1eb8c14a7c0e110d328c0f7 100644
GIT binary patch
delta 726
zcmZXSO=}ZT6o%h>XL@adPLi1<L^S;%5`<JlDgi|;6{GbdS``aQBXrY^pc^&aSRE+s
zqR<uxDX0q<28$J(_JS^okVQ1q#G+V4#f6CALi7hjs@^%l66!1t^UV94_iW}*h2N<1
zsjJZq{w=6Ky&2#b(=mAa?daV2Wi7a}w^TV^C>|K`#ot}~UQ5c5{*%d-rrlbz8_%{1
z_*-O`FV&Q658|^9bmIY@GmQl?Pc(}cM2kd^oGBx5s9)Xc#$&u>n%Wv6a#0}~B$`8&
zXo6@SuZZ3dNh}e4bZSQNh$^VBRMEk`v(J>2VN2LXbctvg+ldYmeZUT)X`(OaB$|<W
z@Q0R2<F{~m6frEQc~kdhMl5iFt$~u7@y%r?9G+w)=YBYK-Lr=^&mPkR+N>UBl;hLt
zebKn9=B;FjGo*1vW0=(o4bH<==WF7EO4E4Skd{|duR*{~_NgyN+j>;n9sM==s`J#E
zQtz-QHJ%sv6ss>Zo?mO4?aNeJkoO`3E$c>O8(SInIJM4%Ozqt7XL)&X-?tzu%Dxka
z1HL@Y>0QX9U(THW)$#v7BFA06$uA<NJ;W_otXaKgxtZf!7@9D1&hW&O)298NSqM-R
w3E5}4p;YK1Wam8J-lbBH2G$D|XIaENQ};vmNf!UNp;Rxlpa~0dY;q|27jieC!vFvP

delta 701
zcmZoT!}R|&(}XfnE)@m{2ykU!@L^<OaH_U!-`G>aEHJI{$hU3Bt9+Lq5B_}eRl~K-
zf-LVDH~(j~Wai+K^Oa{~*dV*vfm54RjZuJM6AJ@_Bg1lrqm0Zz-bpZT1;a5$W<>#p
z2VmaH$rJgM-P3?}IWnwgI0csJ1M@a8oCfnQf_WPm&VYHhz`RWiXTiJ}FmE%%IWVtf
z@^8KaUO<c7fWoefXBc#tKo&s^zsjJ;1ad?^SnfK5KA1Nh%)7&22<EK-^Byx8gL!*5
zvkJUrR%T<+;NQT+#vm)RnaPadAKP{&F$M{SLqKv83y5@OJ2Y8Tq@Qua<fS6o^=u3Z
z!X7}?$7So7*%(gpwFAkiY9Rd^)WU#lZv_t~Muyoe6POtp%os|6<Z6~F%ph}TGK0)r
z1XKevVH4bhC(7Ai_4|=z&qGZ^u_cJ%js(Q$DR`6$DP92^hpq<UTqMVBUMQL<H(9_$
zhP_QfQl62)cC)I9Cl_Pc=6t*70*nhbhx>c-bCxkgu-G${F+^=%8TVTUGmUKN-oPZy
z#Ky<WCKSuXCMwj}z$DBd%*X*``Z5W{GEJ`U+h!=(=*uX~01|7o1TvV}gc(@a1RG<)
iB6oly{9xsxf{l?(d_e6CljHhjSwTt?H+S?`hyegi9iOxS

diff --git a/code/src/Shared/Win.Sfs.Shared/obj/Win.Sfs.Shared.csproj.nuget.dgspec.json b/code/src/Shared/Win.Sfs.Shared/obj/Win.Sfs.Shared.csproj.nuget.dgspec.json
index 197ea9b6..c40c581c 100644
--- a/code/src/Shared/Win.Sfs.Shared/obj/Win.Sfs.Shared.csproj.nuget.dgspec.json
+++ b/code/src/Shared/Win.Sfs.Shared/obj/Win.Sfs.Shared.csproj.nuget.dgspec.json
@@ -1,23 +1,24 @@
 {
   "format": 1,
   "restore": {
-    "D:\\长春项目\\北京北汽结算项目\\NewBJSettleAccount\\BeiJinSettleAccount\\code\\src\\Shared\\Win.Sfs.Shared\\Win.Sfs.Shared.csproj": {}
+    "D:\\CODE\\BeiJinSettleAccount\\code\\src\\Shared\\Win.Sfs.Shared\\Win.Sfs.Shared.csproj": {}
   },
   "projects": {
-    "D:\\长春项目\\北京北汽结算项目\\NewBJSettleAccount\\BeiJinSettleAccount\\code\\src\\Shared\\Win.Sfs.Shared\\Win.Sfs.Shared.csproj": {
+    "D:\\CODE\\BeiJinSettleAccount\\code\\src\\Shared\\Win.Sfs.Shared\\Win.Sfs.Shared.csproj": {
       "version": "2.0.0",
       "restore": {
-        "projectUniqueName": "D:\\长春项目\\北京北汽结算项目\\NewBJSettleAccount\\BeiJinSettleAccount\\code\\src\\Shared\\Win.Sfs.Shared\\Win.Sfs.Shared.csproj",
+        "projectUniqueName": "D:\\CODE\\BeiJinSettleAccount\\code\\src\\Shared\\Win.Sfs.Shared\\Win.Sfs.Shared.csproj",
         "projectName": "Win.Sfs.Shared",
-        "projectPath": "D:\\长春项目\\北京北汽结算项目\\NewBJSettleAccount\\BeiJinSettleAccount\\code\\src\\Shared\\Win.Sfs.Shared\\Win.Sfs.Shared.csproj",
-        "packagesPath": "C:\\Users\\44673\\.nuget\\packages\\",
-        "outputPath": "D:\\长春项目\\北京北汽结算项目\\NewBJSettleAccount\\BeiJinSettleAccount\\code\\src\\Shared\\Win.Sfs.Shared\\obj\\",
+        "projectPath": "D:\\CODE\\BeiJinSettleAccount\\code\\src\\Shared\\Win.Sfs.Shared\\Win.Sfs.Shared.csproj",
+        "packagesPath": "C:\\Users\\AIJXZ\\.nuget\\packages\\",
+        "outputPath": "D:\\CODE\\BeiJinSettleAccount\\code\\src\\Shared\\Win.Sfs.Shared\\obj\\",
         "projectStyle": "PackageReference",
         "fallbackFolders": [
-          "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder"
+          "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages"
         ],
         "configFilePaths": [
-          "C:\\Users\\44673\\AppData\\Roaming\\NuGet\\NuGet.Config",
+          "C:\\Users\\AIJXZ\\AppData\\Roaming\\NuGet\\NuGet.Config",
+          "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
           "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config"
         ],
         "originalTargetFrameworks": [
@@ -25,16 +26,14 @@
         ],
         "sources": {
           "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
-          "D:\\上海富维东阳工作\\设备管理\\localhost-nuget": {},
-          "D:\\长春项目\\北京北汽结算项目\\源代码\\nuget": {},
           "https://api.nuget.org/v3/index.json": {}
         },
         "frameworks": {
           "net5.0": {
             "targetAlias": "netcoreapp5",
             "projectReferences": {
-              "D:\\长春项目\\北京北汽结算项目\\NewBJSettleAccount\\BeiJinSettleAccount\\code\\src\\Shared\\Win.Utils\\Win.Utils.csproj": {
-                "projectPath": "D:\\长春项目\\北京北汽结算项目\\NewBJSettleAccount\\BeiJinSettleAccount\\code\\src\\Shared\\Win.Utils\\Win.Utils.csproj"
+              "D:\\CODE\\BeiJinSettleAccount\\code\\src\\Shared\\Win.Utils\\Win.Utils.csproj": {
+                "projectPath": "D:\\CODE\\BeiJinSettleAccount\\code\\src\\Shared\\Win.Utils\\Win.Utils.csproj"
               }
             }
           }
@@ -104,24 +103,25 @@
               "privateAssets": "all"
             }
           },
-          "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.302\\RuntimeIdentifierGraph.json"
+          "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.304\\RuntimeIdentifierGraph.json"
         }
       }
     },
-    "D:\\长春项目\\北京北汽结算项目\\NewBJSettleAccount\\BeiJinSettleAccount\\code\\src\\Shared\\Win.Utils\\Win.Utils.csproj": {
+    "D:\\CODE\\BeiJinSettleAccount\\code\\src\\Shared\\Win.Utils\\Win.Utils.csproj": {
       "version": "2.0.0",
       "restore": {
-        "projectUniqueName": "D:\\长春项目\\北京北汽结算项目\\NewBJSettleAccount\\BeiJinSettleAccount\\code\\src\\Shared\\Win.Utils\\Win.Utils.csproj",
+        "projectUniqueName": "D:\\CODE\\BeiJinSettleAccount\\code\\src\\Shared\\Win.Utils\\Win.Utils.csproj",
         "projectName": "Win.Utils",
-        "projectPath": "D:\\长春项目\\北京北汽结算项目\\NewBJSettleAccount\\BeiJinSettleAccount\\code\\src\\Shared\\Win.Utils\\Win.Utils.csproj",
-        "packagesPath": "C:\\Users\\44673\\.nuget\\packages\\",
-        "outputPath": "D:\\长春项目\\北京北汽结算项目\\NewBJSettleAccount\\BeiJinSettleAccount\\code\\src\\Shared\\Win.Utils\\obj\\",
+        "projectPath": "D:\\CODE\\BeiJinSettleAccount\\code\\src\\Shared\\Win.Utils\\Win.Utils.csproj",
+        "packagesPath": "C:\\Users\\AIJXZ\\.nuget\\packages\\",
+        "outputPath": "D:\\CODE\\BeiJinSettleAccount\\code\\src\\Shared\\Win.Utils\\obj\\",
         "projectStyle": "PackageReference",
         "fallbackFolders": [
-          "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder"
+          "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages"
         ],
         "configFilePaths": [
-          "C:\\Users\\44673\\AppData\\Roaming\\NuGet\\NuGet.Config",
+          "C:\\Users\\AIJXZ\\AppData\\Roaming\\NuGet\\NuGet.Config",
+          "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
           "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config"
         ],
         "originalTargetFrameworks": [
@@ -129,8 +129,6 @@
         ],
         "sources": {
           "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
-          "D:\\上海富维东阳工作\\设备管理\\localhost-nuget": {},
-          "D:\\长春项目\\北京北汽结算项目\\源代码\\nuget": {},
           "https://api.nuget.org/v3/index.json": {}
         },
         "frameworks": {
@@ -188,7 +186,7 @@
               "privateAssets": "all"
             }
           },
-          "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.302\\RuntimeIdentifierGraph.json"
+          "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.304\\RuntimeIdentifierGraph.json"
         }
       }
     }
diff --git a/code/src/Shared/Win.Sfs.Shared/obj/Win.Sfs.Shared.csproj.nuget.g.props b/code/src/Shared/Win.Sfs.Shared/obj/Win.Sfs.Shared.csproj.nuget.g.props
index f1aecf4a..9b133244 100644
--- a/code/src/Shared/Win.Sfs.Shared/obj/Win.Sfs.Shared.csproj.nuget.g.props
+++ b/code/src/Shared/Win.Sfs.Shared/obj/Win.Sfs.Shared.csproj.nuget.g.props
@@ -5,20 +5,20 @@
     <RestoreTool Condition=" '$(RestoreTool)' == '' ">NuGet</RestoreTool>
     <ProjectAssetsFile Condition=" '$(ProjectAssetsFile)' == '' ">$(MSBuildThisFileDirectory)project.assets.json</ProjectAssetsFile>
     <NuGetPackageRoot Condition=" '$(NuGetPackageRoot)' == '' ">$(UserProfile)\.nuget\packages\</NuGetPackageRoot>
-    <NuGetPackageFolders Condition=" '$(NuGetPackageFolders)' == '' ">C:\Users\44673\.nuget\packages\;C:\Program Files\dotnet\sdk\NuGetFallbackFolder</NuGetPackageFolders>
+    <NuGetPackageFolders Condition=" '$(NuGetPackageFolders)' == '' ">C:\Users\AIJXZ\.nuget\packages\;C:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages</NuGetPackageFolders>
     <NuGetProjectStyle Condition=" '$(NuGetProjectStyle)' == '' ">PackageReference</NuGetProjectStyle>
-    <NuGetToolVersion Condition=" '$(NuGetToolVersion)' == '' ">6.5.0</NuGetToolVersion>
+    <NuGetToolVersion Condition=" '$(NuGetToolVersion)' == '' ">6.6.0</NuGetToolVersion>
   </PropertyGroup>
   <ItemGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
-    <SourceRoot Include="C:\Users\44673\.nuget\packages\" />
-    <SourceRoot Include="C:\Program Files\dotnet\sdk\NuGetFallbackFolder\" />
+    <SourceRoot Include="C:\Users\AIJXZ\.nuget\packages\" />
+    <SourceRoot Include="C:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages\" />
   </ItemGroup>
   <ImportGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
     <Import Project="$(NuGetPackageRoot)microsoft.aspnetcore.razor.design\2.2.0\build\netstandard2.0\Microsoft.AspNetCore.Razor.Design.props" Condition="Exists('$(NuGetPackageRoot)microsoft.aspnetcore.razor.design\2.2.0\build\netstandard2.0\Microsoft.AspNetCore.Razor.Design.props')" />
     <Import Project="$(NuGetPackageRoot)microsoft.aspnetcore.mvc.razor.extensions\2.2.0\build\netstandard2.0\Microsoft.AspNetCore.Mvc.Razor.Extensions.props" Condition="Exists('$(NuGetPackageRoot)microsoft.aspnetcore.mvc.razor.extensions\2.2.0\build\netstandard2.0\Microsoft.AspNetCore.Mvc.Razor.Extensions.props')" />
   </ImportGroup>
   <PropertyGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
-    <PkgMicrosoft_CodeAnalysis_Analyzers Condition=" '$(PkgMicrosoft_CodeAnalysis_Analyzers)' == '' ">C:\Users\44673\.nuget\packages\microsoft.codeanalysis.analyzers\1.1.0</PkgMicrosoft_CodeAnalysis_Analyzers>
-    <PkgMicrosoft_AspNetCore_Razor_Design Condition=" '$(PkgMicrosoft_AspNetCore_Razor_Design)' == '' ">C:\Users\44673\.nuget\packages\microsoft.aspnetcore.razor.design\2.2.0</PkgMicrosoft_AspNetCore_Razor_Design>
+    <PkgMicrosoft_CodeAnalysis_Analyzers Condition=" '$(PkgMicrosoft_CodeAnalysis_Analyzers)' == '' ">C:\Users\AIJXZ\.nuget\packages\microsoft.codeanalysis.analyzers\1.1.0</PkgMicrosoft_CodeAnalysis_Analyzers>
+    <PkgMicrosoft_AspNetCore_Razor_Design Condition=" '$(PkgMicrosoft_AspNetCore_Razor_Design)' == '' ">C:\Users\AIJXZ\.nuget\packages\microsoft.aspnetcore.razor.design\2.2.0</PkgMicrosoft_AspNetCore_Razor_Design>
   </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/code/src/Shared/Win.Sfs.Shared/obj/project.assets.json b/code/src/Shared/Win.Sfs.Shared/obj/project.assets.json
index d20dee8d..931d96dc 100644
--- a/code/src/Shared/Win.Sfs.Shared/obj/project.assets.json
+++ b/code/src/Shared/Win.Sfs.Shared/obj/project.assets.json
@@ -10453,23 +10453,24 @@
     ]
   },
   "packageFolders": {
-    "C:\\Users\\44673\\.nuget\\packages\\": {},
-    "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder": {}
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\": {},
+    "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages": {}
   },
   "project": {
     "version": "2.0.0",
     "restore": {
-      "projectUniqueName": "D:\\长春项目\\北京北汽结算项目\\NewBJSettleAccount\\BeiJinSettleAccount\\code\\src\\Shared\\Win.Sfs.Shared\\Win.Sfs.Shared.csproj",
+      "projectUniqueName": "D:\\CODE\\BeiJinSettleAccount\\code\\src\\Shared\\Win.Sfs.Shared\\Win.Sfs.Shared.csproj",
       "projectName": "Win.Sfs.Shared",
-      "projectPath": "D:\\长春项目\\北京北汽结算项目\\NewBJSettleAccount\\BeiJinSettleAccount\\code\\src\\Shared\\Win.Sfs.Shared\\Win.Sfs.Shared.csproj",
-      "packagesPath": "C:\\Users\\44673\\.nuget\\packages\\",
-      "outputPath": "D:\\长春项目\\北京北汽结算项目\\NewBJSettleAccount\\BeiJinSettleAccount\\code\\src\\Shared\\Win.Sfs.Shared\\obj\\",
+      "projectPath": "D:\\CODE\\BeiJinSettleAccount\\code\\src\\Shared\\Win.Sfs.Shared\\Win.Sfs.Shared.csproj",
+      "packagesPath": "C:\\Users\\AIJXZ\\.nuget\\packages\\",
+      "outputPath": "D:\\CODE\\BeiJinSettleAccount\\code\\src\\Shared\\Win.Sfs.Shared\\obj\\",
       "projectStyle": "PackageReference",
       "fallbackFolders": [
-        "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder"
+        "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages"
       ],
       "configFilePaths": [
-        "C:\\Users\\44673\\AppData\\Roaming\\NuGet\\NuGet.Config",
+        "C:\\Users\\AIJXZ\\AppData\\Roaming\\NuGet\\NuGet.Config",
+        "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
         "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config"
       ],
       "originalTargetFrameworks": [
@@ -10477,16 +10478,14 @@
       ],
       "sources": {
         "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
-        "D:\\上海富维东阳工作\\设备管理\\localhost-nuget": {},
-        "D:\\长春项目\\北京北汽结算项目\\源代码\\nuget": {},
         "https://api.nuget.org/v3/index.json": {}
       },
       "frameworks": {
         "net5.0": {
           "targetAlias": "netcoreapp5",
           "projectReferences": {
-            "D:\\长春项目\\北京北汽结算项目\\NewBJSettleAccount\\BeiJinSettleAccount\\code\\src\\Shared\\Win.Utils\\Win.Utils.csproj": {
-              "projectPath": "D:\\长春项目\\北京北汽结算项目\\NewBJSettleAccount\\BeiJinSettleAccount\\code\\src\\Shared\\Win.Utils\\Win.Utils.csproj"
+            "D:\\CODE\\BeiJinSettleAccount\\code\\src\\Shared\\Win.Utils\\Win.Utils.csproj": {
+              "projectPath": "D:\\CODE\\BeiJinSettleAccount\\code\\src\\Shared\\Win.Utils\\Win.Utils.csproj"
             }
           }
         }
@@ -10556,7 +10555,7 @@
             "privateAssets": "all"
           }
         },
-        "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.302\\RuntimeIdentifierGraph.json"
+        "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.304\\RuntimeIdentifierGraph.json"
       }
     }
   }
diff --git a/code/src/Shared/Win.Sfs.Shared/obj/project.nuget.cache b/code/src/Shared/Win.Sfs.Shared/obj/project.nuget.cache
index 208c3acb..9bad0470 100644
--- a/code/src/Shared/Win.Sfs.Shared/obj/project.nuget.cache
+++ b/code/src/Shared/Win.Sfs.Shared/obj/project.nuget.cache
@@ -1,238 +1,238 @@
 {
   "version": 2,
-  "dgSpecHash": "gJcj6f1BIvdoKyR8SW7nS76ny2pppWcRKcyU3nMRIkGt+fxBAfvRxsfNsv1yKqPJrRya9ikyv1RbTIu3aO3NnQ==",
+  "dgSpecHash": "YxWkVDyhWFjf95al3WbSvLTD3Pa1UMd4u6VwOz5Yl6lkiH07Mi9tVwVsezzQ58LB8GI+hIKMra10XjH1QN894g==",
   "success": true,
-  "projectFilePath": "D:\\长春项目\\北京北汽结算项目\\NewBJSettleAccount\\BeiJinSettleAccount\\code\\src\\Shared\\Win.Sfs.Shared\\Win.Sfs.Shared.csproj",
+  "projectFilePath": "D:\\CODE\\BeiJinSettleAccount\\code\\src\\Shared\\Win.Sfs.Shared\\Win.Sfs.Shared.csproj",
   "expectedPackageFiles": [
-    "C:\\Users\\44673\\.nuget\\packages\\jetbrains.annotations\\2020.1.0\\jetbrains.annotations.2020.1.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\microsoft.aspnetcore.antiforgery\\2.2.0\\microsoft.aspnetcore.antiforgery.2.2.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\microsoft.aspnetcore.authentication.abstractions\\2.2.0\\microsoft.aspnetcore.authentication.abstractions.2.2.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\microsoft.aspnetcore.authentication.core\\2.2.0\\microsoft.aspnetcore.authentication.core.2.2.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\microsoft.aspnetcore.authorization\\5.0.0\\microsoft.aspnetcore.authorization.5.0.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\microsoft.aspnetcore.authorization.policy\\2.2.0\\microsoft.aspnetcore.authorization.policy.2.2.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\microsoft.aspnetcore.cors\\2.2.0\\microsoft.aspnetcore.cors.2.2.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\microsoft.aspnetcore.cryptography.internal\\2.2.0\\microsoft.aspnetcore.cryptography.internal.2.2.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\microsoft.aspnetcore.dataprotection\\2.2.0\\microsoft.aspnetcore.dataprotection.2.2.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\microsoft.aspnetcore.dataprotection.abstractions\\2.2.0\\microsoft.aspnetcore.dataprotection.abstractions.2.2.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\microsoft.aspnetcore.diagnostics.abstractions\\2.2.0\\microsoft.aspnetcore.diagnostics.abstractions.2.2.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\microsoft.aspnetcore.hosting.abstractions\\2.2.0\\microsoft.aspnetcore.hosting.abstractions.2.2.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\microsoft.aspnetcore.hosting.server.abstractions\\2.2.0\\microsoft.aspnetcore.hosting.server.abstractions.2.2.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\microsoft.aspnetcore.html.abstractions\\2.2.0\\microsoft.aspnetcore.html.abstractions.2.2.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\microsoft.aspnetcore.http\\2.2.0\\microsoft.aspnetcore.http.2.2.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\microsoft.aspnetcore.http.abstractions\\2.2.0\\microsoft.aspnetcore.http.abstractions.2.2.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\microsoft.aspnetcore.http.extensions\\2.2.0\\microsoft.aspnetcore.http.extensions.2.2.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\microsoft.aspnetcore.http.features\\2.2.0\\microsoft.aspnetcore.http.features.2.2.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\microsoft.aspnetcore.jsonpatch\\2.2.0\\microsoft.aspnetcore.jsonpatch.2.2.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\microsoft.aspnetcore.localization\\2.2.0\\microsoft.aspnetcore.localization.2.2.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\microsoft.aspnetcore.metadata\\5.0.0\\microsoft.aspnetcore.metadata.5.0.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\microsoft.aspnetcore.mvc\\2.2.0\\microsoft.aspnetcore.mvc.2.2.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\microsoft.aspnetcore.mvc.abstractions\\2.2.0\\microsoft.aspnetcore.mvc.abstractions.2.2.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\microsoft.aspnetcore.mvc.analyzers\\2.2.0\\microsoft.aspnetcore.mvc.analyzers.2.2.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\microsoft.aspnetcore.mvc.apiexplorer\\2.2.0\\microsoft.aspnetcore.mvc.apiexplorer.2.2.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\microsoft.aspnetcore.mvc.core\\2.2.0\\microsoft.aspnetcore.mvc.core.2.2.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\microsoft.aspnetcore.mvc.cors\\2.2.0\\microsoft.aspnetcore.mvc.cors.2.2.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\microsoft.aspnetcore.mvc.dataannotations\\2.2.0\\microsoft.aspnetcore.mvc.dataannotations.2.2.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\microsoft.aspnetcore.mvc.formatters.json\\2.2.0\\microsoft.aspnetcore.mvc.formatters.json.2.2.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\microsoft.aspnetcore.mvc.localization\\2.2.0\\microsoft.aspnetcore.mvc.localization.2.2.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\microsoft.aspnetcore.mvc.razor\\2.2.0\\microsoft.aspnetcore.mvc.razor.2.2.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\microsoft.aspnetcore.mvc.razor.extensions\\2.2.0\\microsoft.aspnetcore.mvc.razor.extensions.2.2.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\microsoft.aspnetcore.mvc.razorpages\\2.2.0\\microsoft.aspnetcore.mvc.razorpages.2.2.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\microsoft.aspnetcore.mvc.taghelpers\\2.2.0\\microsoft.aspnetcore.mvc.taghelpers.2.2.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\microsoft.aspnetcore.mvc.viewfeatures\\2.2.0\\microsoft.aspnetcore.mvc.viewfeatures.2.2.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\microsoft.aspnetcore.razor\\2.2.0\\microsoft.aspnetcore.razor.2.2.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\microsoft.aspnetcore.razor.design\\2.2.0\\microsoft.aspnetcore.razor.design.2.2.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\microsoft.aspnetcore.razor.language\\2.2.0\\microsoft.aspnetcore.razor.language.2.2.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\microsoft.aspnetcore.razor.runtime\\2.2.0\\microsoft.aspnetcore.razor.runtime.2.2.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\microsoft.aspnetcore.responsecaching.abstractions\\2.2.0\\microsoft.aspnetcore.responsecaching.abstractions.2.2.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\microsoft.aspnetcore.routing\\2.2.0\\microsoft.aspnetcore.routing.2.2.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\microsoft.aspnetcore.routing.abstractions\\2.2.0\\microsoft.aspnetcore.routing.abstractions.2.2.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\microsoft.aspnetcore.webutilities\\2.2.0\\microsoft.aspnetcore.webutilities.2.2.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\microsoft.codeanalysis.analyzers\\1.1.0\\microsoft.codeanalysis.analyzers.1.1.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\microsoft.codeanalysis.common\\2.8.0\\microsoft.codeanalysis.common.2.8.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\microsoft.codeanalysis.csharp\\2.8.0\\microsoft.codeanalysis.csharp.2.8.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\microsoft.codeanalysis.razor\\2.2.0\\microsoft.codeanalysis.razor.2.2.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\microsoft.csharp\\4.5.0\\microsoft.csharp.4.5.0.nupkg.sha512",
-    "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder\\microsoft.dotnet.platformabstractions\\2.1.0\\microsoft.dotnet.platformabstractions.2.1.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\microsoft.entityframeworkcore\\5.0.0\\microsoft.entityframeworkcore.5.0.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\microsoft.entityframeworkcore.abstractions\\5.0.0\\microsoft.entityframeworkcore.abstractions.5.0.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\microsoft.entityframeworkcore.analyzers\\5.0.0\\microsoft.entityframeworkcore.analyzers.5.0.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\microsoft.entityframeworkcore.relational\\5.0.0\\microsoft.entityframeworkcore.relational.5.0.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\microsoft.extensions.caching.abstractions\\5.0.0\\microsoft.extensions.caching.abstractions.5.0.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\microsoft.extensions.caching.memory\\5.0.0\\microsoft.extensions.caching.memory.5.0.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\microsoft.extensions.configuration\\5.0.0\\microsoft.extensions.configuration.5.0.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\microsoft.extensions.configuration.abstractions\\5.0.0\\microsoft.extensions.configuration.abstractions.5.0.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\microsoft.extensions.configuration.binder\\5.0.0\\microsoft.extensions.configuration.binder.5.0.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\microsoft.extensions.configuration.commandline\\5.0.0\\microsoft.extensions.configuration.commandline.5.0.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\microsoft.extensions.configuration.environmentvariables\\5.0.0\\microsoft.extensions.configuration.environmentvariables.5.0.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\microsoft.extensions.configuration.fileextensions\\5.0.0\\microsoft.extensions.configuration.fileextensions.5.0.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\microsoft.extensions.configuration.json\\5.0.0\\microsoft.extensions.configuration.json.5.0.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\microsoft.extensions.configuration.usersecrets\\5.0.0\\microsoft.extensions.configuration.usersecrets.5.0.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\microsoft.extensions.dependencyinjection\\5.0.0\\microsoft.extensions.dependencyinjection.5.0.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\microsoft.extensions.dependencyinjection.abstractions\\5.0.0\\microsoft.extensions.dependencyinjection.abstractions.5.0.0.nupkg.sha512",
-    "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder\\microsoft.extensions.dependencymodel\\2.1.0\\microsoft.extensions.dependencymodel.2.1.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\microsoft.extensions.fileproviders.abstractions\\5.0.0\\microsoft.extensions.fileproviders.abstractions.5.0.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\microsoft.extensions.fileproviders.composite\\5.0.0\\microsoft.extensions.fileproviders.composite.5.0.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\microsoft.extensions.fileproviders.embedded\\5.0.0\\microsoft.extensions.fileproviders.embedded.5.0.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\microsoft.extensions.fileproviders.physical\\5.0.0\\microsoft.extensions.fileproviders.physical.5.0.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\microsoft.extensions.filesystemglobbing\\5.0.0\\microsoft.extensions.filesystemglobbing.5.0.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\microsoft.extensions.hosting.abstractions\\5.0.0\\microsoft.extensions.hosting.abstractions.5.0.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\microsoft.extensions.localization\\5.0.0\\microsoft.extensions.localization.5.0.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\microsoft.extensions.localization.abstractions\\5.0.0\\microsoft.extensions.localization.abstractions.5.0.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\microsoft.extensions.logging\\5.0.0\\microsoft.extensions.logging.5.0.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\microsoft.extensions.logging.abstractions\\5.0.0\\microsoft.extensions.logging.abstractions.5.0.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\microsoft.extensions.objectpool\\2.2.0\\microsoft.extensions.objectpool.2.2.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\microsoft.extensions.options\\5.0.0\\microsoft.extensions.options.5.0.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\microsoft.extensions.options.configurationextensions\\5.0.0\\microsoft.extensions.options.configurationextensions.5.0.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\microsoft.extensions.primitives\\5.0.0\\microsoft.extensions.primitives.5.0.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\microsoft.extensions.webencoders\\2.2.0\\microsoft.extensions.webencoders.2.2.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\microsoft.net.http.headers\\2.2.0\\microsoft.net.http.headers.2.2.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\microsoft.netcore.platforms\\2.0.0\\microsoft.netcore.platforms.2.0.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\microsoft.netcore.targets\\1.1.0\\microsoft.netcore.targets.1.1.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\microsoft.openapi\\1.2.3\\microsoft.openapi.1.2.3.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\microsoft.win32.primitives\\4.3.0\\microsoft.win32.primitives.4.3.0.nupkg.sha512",
-    "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder\\microsoft.win32.registry\\4.5.0\\microsoft.win32.registry.4.5.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\microsoft.win32.systemevents\\4.5.0\\microsoft.win32.systemevents.4.5.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\netstandard.library\\1.6.1\\netstandard.library.1.6.1.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\newtonsoft.json\\12.0.3\\newtonsoft.json.12.0.3.nupkg.sha512",
-    "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder\\newtonsoft.json.bson\\1.0.1\\newtonsoft.json.bson.1.0.1.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\nito.asyncex.context\\5.0.0\\nito.asyncex.context.5.0.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\nito.asyncex.coordination\\5.0.0\\nito.asyncex.coordination.5.0.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\nito.asyncex.tasks\\5.0.0\\nito.asyncex.tasks.5.0.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\nito.collections.deque\\1.0.4\\nito.collections.deque.1.0.4.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\nito.disposables\\2.0.0\\nito.disposables.2.0.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\npoi\\2.5.2\\npoi.2.5.2.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\portable.bouncycastle\\1.8.6\\portable.bouncycastle.1.8.6.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\runtime.debian.8-x64.runtime.native.system.security.cryptography.openssl\\4.3.0\\runtime.debian.8-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\runtime.fedora.23-x64.runtime.native.system.security.cryptography.openssl\\4.3.0\\runtime.fedora.23-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\runtime.fedora.24-x64.runtime.native.system.security.cryptography.openssl\\4.3.0\\runtime.fedora.24-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\runtime.native.system\\4.3.0\\runtime.native.system.4.3.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\runtime.native.system.io.compression\\4.3.0\\runtime.native.system.io.compression.4.3.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\runtime.native.system.net.http\\4.3.0\\runtime.native.system.net.http.4.3.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\runtime.native.system.security.cryptography.apple\\4.3.0\\runtime.native.system.security.cryptography.apple.4.3.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\runtime.native.system.security.cryptography.openssl\\4.3.0\\runtime.native.system.security.cryptography.openssl.4.3.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\runtime.opensuse.13.2-x64.runtime.native.system.security.cryptography.openssl\\4.3.0\\runtime.opensuse.13.2-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\runtime.opensuse.42.1-x64.runtime.native.system.security.cryptography.openssl\\4.3.0\\runtime.opensuse.42.1-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\runtime.osx.10.10-x64.runtime.native.system.security.cryptography.apple\\4.3.0\\runtime.osx.10.10-x64.runtime.native.system.security.cryptography.apple.4.3.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\runtime.osx.10.10-x64.runtime.native.system.security.cryptography.openssl\\4.3.0\\runtime.osx.10.10-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\runtime.rhel.7-x64.runtime.native.system.security.cryptography.openssl\\4.3.0\\runtime.rhel.7-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\runtime.ubuntu.14.04-x64.runtime.native.system.security.cryptography.openssl\\4.3.0\\runtime.ubuntu.14.04-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\runtime.ubuntu.16.04-x64.runtime.native.system.security.cryptography.openssl\\4.3.0\\runtime.ubuntu.16.04-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\runtime.ubuntu.16.10-x64.runtime.native.system.security.cryptography.openssl\\4.3.0\\runtime.ubuntu.16.10-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\sharpziplib\\1.2.0\\sharpziplib.1.2.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\swashbuckle.aspnetcore.swagger\\5.6.3\\swashbuckle.aspnetcore.swagger.5.6.3.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\swashbuckle.aspnetcore.swaggergen\\5.6.3\\swashbuckle.aspnetcore.swaggergen.5.6.3.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\system.appcontext\\4.3.0\\system.appcontext.4.3.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\system.buffers\\4.5.0\\system.buffers.4.5.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\system.collections\\4.3.0\\system.collections.4.3.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\system.collections.concurrent\\4.3.0\\system.collections.concurrent.4.3.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\system.collections.immutable\\5.0.0\\system.collections.immutable.5.0.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\system.componentmodel.annotations\\5.0.0\\system.componentmodel.annotations.5.0.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\system.configuration.configurationmanager\\4.5.0\\system.configuration.configurationmanager.4.5.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\system.console\\4.3.0\\system.console.4.3.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\system.diagnostics.debug\\4.3.0\\system.diagnostics.debug.4.3.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\system.diagnostics.diagnosticsource\\5.0.0\\system.diagnostics.diagnosticsource.5.0.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\system.diagnostics.fileversioninfo\\4.3.0\\system.diagnostics.fileversioninfo.4.3.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\system.diagnostics.stacktrace\\4.3.0\\system.diagnostics.stacktrace.4.3.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\system.diagnostics.tools\\4.3.0\\system.diagnostics.tools.4.3.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\system.diagnostics.tracing\\4.3.0\\system.diagnostics.tracing.4.3.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\system.drawing.common\\4.5.0\\system.drawing.common.4.5.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\system.dynamic.runtime\\4.3.0\\system.dynamic.runtime.4.3.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\system.globalization\\4.3.0\\system.globalization.4.3.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\system.globalization.calendars\\4.3.0\\system.globalization.calendars.4.3.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\system.globalization.extensions\\4.3.0\\system.globalization.extensions.4.3.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\system.io\\4.3.0\\system.io.4.3.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\system.io.compression\\4.3.0\\system.io.compression.4.3.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\system.io.compression.zipfile\\4.3.0\\system.io.compression.zipfile.4.3.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\system.io.filesystem\\4.3.0\\system.io.filesystem.4.3.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\system.io.filesystem.primitives\\4.3.0\\system.io.filesystem.primitives.4.3.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\system.linq\\4.3.0\\system.linq.4.3.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\system.linq.dynamic.core\\1.1.5\\system.linq.dynamic.core.1.1.5.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\system.linq.expressions\\4.3.0\\system.linq.expressions.4.3.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\system.linq.queryable\\4.3.0\\system.linq.queryable.4.3.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\system.net.http\\4.3.0\\system.net.http.4.3.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\system.net.primitives\\4.3.0\\system.net.primitives.4.3.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\system.net.sockets\\4.3.0\\system.net.sockets.4.3.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\system.objectmodel\\4.3.0\\system.objectmodel.4.3.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\system.reflection\\4.3.0\\system.reflection.4.3.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\system.reflection.emit\\4.3.0\\system.reflection.emit.4.3.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\system.reflection.emit.ilgeneration\\4.3.0\\system.reflection.emit.ilgeneration.4.3.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\system.reflection.emit.lightweight\\4.3.0\\system.reflection.emit.lightweight.4.3.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\system.reflection.extensions\\4.3.0\\system.reflection.extensions.4.3.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\system.reflection.metadata\\1.4.2\\system.reflection.metadata.1.4.2.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\system.reflection.primitives\\4.3.0\\system.reflection.primitives.4.3.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\system.reflection.typeextensions\\4.3.0\\system.reflection.typeextensions.4.3.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\system.resources.resourcemanager\\4.3.0\\system.resources.resourcemanager.4.3.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\system.runtime\\4.3.0\\system.runtime.4.3.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\system.runtime.extensions\\4.3.0\\system.runtime.extensions.4.3.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\system.runtime.handles\\4.3.0\\system.runtime.handles.4.3.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\system.runtime.interopservices\\4.3.0\\system.runtime.interopservices.4.3.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\system.runtime.interopservices.runtimeinformation\\4.3.0\\system.runtime.interopservices.runtimeinformation.4.3.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\system.runtime.loader\\4.3.0\\system.runtime.loader.4.3.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\system.runtime.numerics\\4.3.0\\system.runtime.numerics.4.3.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\system.security.accesscontrol\\4.5.0\\system.security.accesscontrol.4.5.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\system.security.cryptography.algorithms\\4.3.0\\system.security.cryptography.algorithms.4.3.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\system.security.cryptography.cng\\4.5.0\\system.security.cryptography.cng.4.5.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\system.security.cryptography.csp\\4.3.0\\system.security.cryptography.csp.4.3.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\system.security.cryptography.encoding\\4.3.0\\system.security.cryptography.encoding.4.3.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\system.security.cryptography.openssl\\4.3.0\\system.security.cryptography.openssl.4.3.0.nupkg.sha512",
-    "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder\\system.security.cryptography.pkcs\\4.5.0\\system.security.cryptography.pkcs.4.5.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\system.security.cryptography.primitives\\4.3.0\\system.security.cryptography.primitives.4.3.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\system.security.cryptography.protecteddata\\4.5.0\\system.security.cryptography.protecteddata.4.5.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\system.security.cryptography.x509certificates\\4.3.0\\system.security.cryptography.x509certificates.4.3.0.nupkg.sha512",
-    "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder\\system.security.cryptography.xml\\4.5.0\\system.security.cryptography.xml.4.5.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\system.security.permissions\\4.5.0\\system.security.permissions.4.5.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\system.security.principal.windows\\4.5.0\\system.security.principal.windows.4.5.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\system.text.encoding\\4.3.0\\system.text.encoding.4.3.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\system.text.encoding.codepages\\4.3.0\\system.text.encoding.codepages.4.3.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\system.text.encoding.extensions\\4.3.0\\system.text.encoding.extensions.4.3.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\system.text.encodings.web\\4.5.0\\system.text.encodings.web.4.5.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\system.text.regularexpressions\\4.3.0\\system.text.regularexpressions.4.3.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\system.threading\\4.3.0\\system.threading.4.3.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\system.threading.tasks\\4.3.0\\system.threading.tasks.4.3.0.nupkg.sha512",
-    "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder\\system.threading.tasks.extensions\\4.5.1\\system.threading.tasks.extensions.4.5.1.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\system.threading.tasks.parallel\\4.3.0\\system.threading.tasks.parallel.4.3.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\system.threading.thread\\4.3.0\\system.threading.thread.4.3.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\system.threading.timer\\4.3.0\\system.threading.timer.4.3.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\system.valuetuple\\4.3.0\\system.valuetuple.4.3.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\system.xml.readerwriter\\4.3.0\\system.xml.readerwriter.4.3.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\system.xml.xdocument\\4.3.0\\system.xml.xdocument.4.3.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\system.xml.xmldocument\\4.3.0\\system.xml.xmldocument.4.3.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\system.xml.xpath\\4.3.0\\system.xml.xpath.4.3.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\system.xml.xpath.xdocument\\4.3.0\\system.xml.xpath.xdocument.4.3.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\timezoneconverter\\3.2.0\\timezoneconverter.3.2.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\volo.abp.auditing\\4.0.0\\volo.abp.auditing.4.0.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\volo.abp.authorization\\4.0.0\\volo.abp.authorization.4.0.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\volo.abp.caching\\4.0.0\\volo.abp.caching.4.0.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\volo.abp.core\\4.0.0\\volo.abp.core.4.0.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\volo.abp.data\\4.0.0\\volo.abp.data.4.0.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\volo.abp.ddd.application\\4.0.0\\volo.abp.ddd.application.4.0.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\volo.abp.ddd.application.contracts\\4.0.0\\volo.abp.ddd.application.contracts.4.0.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\volo.abp.ddd.domain\\4.0.0\\volo.abp.ddd.domain.4.0.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\volo.abp.entityframeworkcore\\4.0.0\\volo.abp.entityframeworkcore.4.0.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\volo.abp.eventbus\\4.0.0\\volo.abp.eventbus.4.0.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\volo.abp.exceptionhandling\\4.0.0\\volo.abp.exceptionhandling.4.0.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\volo.abp.features\\4.0.0\\volo.abp.features.4.0.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\volo.abp.guids\\4.0.0\\volo.abp.guids.4.0.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\volo.abp.http.abstractions\\4.0.0\\volo.abp.http.abstractions.4.0.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\volo.abp.json\\4.0.0\\volo.abp.json.4.0.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\volo.abp.localization\\4.0.0\\volo.abp.localization.4.0.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\volo.abp.localization.abstractions\\4.0.0\\volo.abp.localization.abstractions.4.0.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\volo.abp.multitenancy\\4.0.0\\volo.abp.multitenancy.4.0.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\volo.abp.objectextending\\4.0.0\\volo.abp.objectextending.4.0.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\volo.abp.objectmapping\\4.0.0\\volo.abp.objectmapping.4.0.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\volo.abp.security\\4.0.0\\volo.abp.security.4.0.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\volo.abp.serialization\\4.0.0\\volo.abp.serialization.4.0.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\volo.abp.settings\\4.0.0\\volo.abp.settings.4.0.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\volo.abp.specifications\\4.0.0\\volo.abp.specifications.4.0.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\volo.abp.threading\\4.0.0\\volo.abp.threading.4.0.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\volo.abp.timing\\4.0.0\\volo.abp.timing.4.0.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\volo.abp.uow\\4.0.0\\volo.abp.uow.4.0.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\volo.abp.validation\\4.0.0\\volo.abp.validation.4.0.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\volo.abp.validation.abstractions\\4.0.0\\volo.abp.validation.abstractions.4.0.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\volo.abp.virtualfilesystem\\4.0.0\\volo.abp.virtualfilesystem.4.0.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\microsoft.windowsdesktop.app.ref\\5.0.0\\microsoft.windowsdesktop.app.ref.5.0.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\microsoft.netcore.app.ref\\5.0.0\\microsoft.netcore.app.ref.5.0.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\microsoft.aspnetcore.app.ref\\5.0.0\\microsoft.aspnetcore.app.ref.5.0.0.nupkg.sha512"
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\jetbrains.annotations\\2020.1.0\\jetbrains.annotations.2020.1.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\microsoft.aspnetcore.antiforgery\\2.2.0\\microsoft.aspnetcore.antiforgery.2.2.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\microsoft.aspnetcore.authentication.abstractions\\2.2.0\\microsoft.aspnetcore.authentication.abstractions.2.2.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\microsoft.aspnetcore.authentication.core\\2.2.0\\microsoft.aspnetcore.authentication.core.2.2.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\microsoft.aspnetcore.authorization\\5.0.0\\microsoft.aspnetcore.authorization.5.0.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\microsoft.aspnetcore.authorization.policy\\2.2.0\\microsoft.aspnetcore.authorization.policy.2.2.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\microsoft.aspnetcore.cors\\2.2.0\\microsoft.aspnetcore.cors.2.2.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\microsoft.aspnetcore.cryptography.internal\\2.2.0\\microsoft.aspnetcore.cryptography.internal.2.2.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\microsoft.aspnetcore.dataprotection\\2.2.0\\microsoft.aspnetcore.dataprotection.2.2.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\microsoft.aspnetcore.dataprotection.abstractions\\2.2.0\\microsoft.aspnetcore.dataprotection.abstractions.2.2.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\microsoft.aspnetcore.diagnostics.abstractions\\2.2.0\\microsoft.aspnetcore.diagnostics.abstractions.2.2.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\microsoft.aspnetcore.hosting.abstractions\\2.2.0\\microsoft.aspnetcore.hosting.abstractions.2.2.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\microsoft.aspnetcore.hosting.server.abstractions\\2.2.0\\microsoft.aspnetcore.hosting.server.abstractions.2.2.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\microsoft.aspnetcore.html.abstractions\\2.2.0\\microsoft.aspnetcore.html.abstractions.2.2.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\microsoft.aspnetcore.http\\2.2.0\\microsoft.aspnetcore.http.2.2.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\microsoft.aspnetcore.http.abstractions\\2.2.0\\microsoft.aspnetcore.http.abstractions.2.2.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\microsoft.aspnetcore.http.extensions\\2.2.0\\microsoft.aspnetcore.http.extensions.2.2.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\microsoft.aspnetcore.http.features\\2.2.0\\microsoft.aspnetcore.http.features.2.2.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\microsoft.aspnetcore.jsonpatch\\2.2.0\\microsoft.aspnetcore.jsonpatch.2.2.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\microsoft.aspnetcore.localization\\2.2.0\\microsoft.aspnetcore.localization.2.2.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\microsoft.aspnetcore.metadata\\5.0.0\\microsoft.aspnetcore.metadata.5.0.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\microsoft.aspnetcore.mvc\\2.2.0\\microsoft.aspnetcore.mvc.2.2.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\microsoft.aspnetcore.mvc.abstractions\\2.2.0\\microsoft.aspnetcore.mvc.abstractions.2.2.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\microsoft.aspnetcore.mvc.analyzers\\2.2.0\\microsoft.aspnetcore.mvc.analyzers.2.2.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\microsoft.aspnetcore.mvc.apiexplorer\\2.2.0\\microsoft.aspnetcore.mvc.apiexplorer.2.2.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\microsoft.aspnetcore.mvc.core\\2.2.0\\microsoft.aspnetcore.mvc.core.2.2.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\microsoft.aspnetcore.mvc.cors\\2.2.0\\microsoft.aspnetcore.mvc.cors.2.2.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\microsoft.aspnetcore.mvc.dataannotations\\2.2.0\\microsoft.aspnetcore.mvc.dataannotations.2.2.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\microsoft.aspnetcore.mvc.formatters.json\\2.2.0\\microsoft.aspnetcore.mvc.formatters.json.2.2.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\microsoft.aspnetcore.mvc.localization\\2.2.0\\microsoft.aspnetcore.mvc.localization.2.2.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\microsoft.aspnetcore.mvc.razor\\2.2.0\\microsoft.aspnetcore.mvc.razor.2.2.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\microsoft.aspnetcore.mvc.razor.extensions\\2.2.0\\microsoft.aspnetcore.mvc.razor.extensions.2.2.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\microsoft.aspnetcore.mvc.razorpages\\2.2.0\\microsoft.aspnetcore.mvc.razorpages.2.2.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\microsoft.aspnetcore.mvc.taghelpers\\2.2.0\\microsoft.aspnetcore.mvc.taghelpers.2.2.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\microsoft.aspnetcore.mvc.viewfeatures\\2.2.0\\microsoft.aspnetcore.mvc.viewfeatures.2.2.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\microsoft.aspnetcore.razor\\2.2.0\\microsoft.aspnetcore.razor.2.2.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\microsoft.aspnetcore.razor.design\\2.2.0\\microsoft.aspnetcore.razor.design.2.2.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\microsoft.aspnetcore.razor.language\\2.2.0\\microsoft.aspnetcore.razor.language.2.2.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\microsoft.aspnetcore.razor.runtime\\2.2.0\\microsoft.aspnetcore.razor.runtime.2.2.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\microsoft.aspnetcore.responsecaching.abstractions\\2.2.0\\microsoft.aspnetcore.responsecaching.abstractions.2.2.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\microsoft.aspnetcore.routing\\2.2.0\\microsoft.aspnetcore.routing.2.2.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\microsoft.aspnetcore.routing.abstractions\\2.2.0\\microsoft.aspnetcore.routing.abstractions.2.2.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\microsoft.aspnetcore.webutilities\\2.2.0\\microsoft.aspnetcore.webutilities.2.2.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\microsoft.codeanalysis.analyzers\\1.1.0\\microsoft.codeanalysis.analyzers.1.1.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\microsoft.codeanalysis.common\\2.8.0\\microsoft.codeanalysis.common.2.8.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\microsoft.codeanalysis.csharp\\2.8.0\\microsoft.codeanalysis.csharp.2.8.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\microsoft.codeanalysis.razor\\2.2.0\\microsoft.codeanalysis.razor.2.2.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\microsoft.csharp\\4.5.0\\microsoft.csharp.4.5.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\microsoft.dotnet.platformabstractions\\2.1.0\\microsoft.dotnet.platformabstractions.2.1.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\microsoft.entityframeworkcore\\5.0.0\\microsoft.entityframeworkcore.5.0.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\microsoft.entityframeworkcore.abstractions\\5.0.0\\microsoft.entityframeworkcore.abstractions.5.0.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\microsoft.entityframeworkcore.analyzers\\5.0.0\\microsoft.entityframeworkcore.analyzers.5.0.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\microsoft.entityframeworkcore.relational\\5.0.0\\microsoft.entityframeworkcore.relational.5.0.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\microsoft.extensions.caching.abstractions\\5.0.0\\microsoft.extensions.caching.abstractions.5.0.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\microsoft.extensions.caching.memory\\5.0.0\\microsoft.extensions.caching.memory.5.0.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\microsoft.extensions.configuration\\5.0.0\\microsoft.extensions.configuration.5.0.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\microsoft.extensions.configuration.abstractions\\5.0.0\\microsoft.extensions.configuration.abstractions.5.0.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\microsoft.extensions.configuration.binder\\5.0.0\\microsoft.extensions.configuration.binder.5.0.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\microsoft.extensions.configuration.commandline\\5.0.0\\microsoft.extensions.configuration.commandline.5.0.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\microsoft.extensions.configuration.environmentvariables\\5.0.0\\microsoft.extensions.configuration.environmentvariables.5.0.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\microsoft.extensions.configuration.fileextensions\\5.0.0\\microsoft.extensions.configuration.fileextensions.5.0.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\microsoft.extensions.configuration.json\\5.0.0\\microsoft.extensions.configuration.json.5.0.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\microsoft.extensions.configuration.usersecrets\\5.0.0\\microsoft.extensions.configuration.usersecrets.5.0.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\microsoft.extensions.dependencyinjection\\5.0.0\\microsoft.extensions.dependencyinjection.5.0.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\microsoft.extensions.dependencyinjection.abstractions\\5.0.0\\microsoft.extensions.dependencyinjection.abstractions.5.0.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\microsoft.extensions.dependencymodel\\2.1.0\\microsoft.extensions.dependencymodel.2.1.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\microsoft.extensions.fileproviders.abstractions\\5.0.0\\microsoft.extensions.fileproviders.abstractions.5.0.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\microsoft.extensions.fileproviders.composite\\5.0.0\\microsoft.extensions.fileproviders.composite.5.0.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\microsoft.extensions.fileproviders.embedded\\5.0.0\\microsoft.extensions.fileproviders.embedded.5.0.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\microsoft.extensions.fileproviders.physical\\5.0.0\\microsoft.extensions.fileproviders.physical.5.0.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\microsoft.extensions.filesystemglobbing\\5.0.0\\microsoft.extensions.filesystemglobbing.5.0.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\microsoft.extensions.hosting.abstractions\\5.0.0\\microsoft.extensions.hosting.abstractions.5.0.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\microsoft.extensions.localization\\5.0.0\\microsoft.extensions.localization.5.0.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\microsoft.extensions.localization.abstractions\\5.0.0\\microsoft.extensions.localization.abstractions.5.0.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\microsoft.extensions.logging\\5.0.0\\microsoft.extensions.logging.5.0.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\microsoft.extensions.logging.abstractions\\5.0.0\\microsoft.extensions.logging.abstractions.5.0.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\microsoft.extensions.objectpool\\2.2.0\\microsoft.extensions.objectpool.2.2.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\microsoft.extensions.options\\5.0.0\\microsoft.extensions.options.5.0.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\microsoft.extensions.options.configurationextensions\\5.0.0\\microsoft.extensions.options.configurationextensions.5.0.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\microsoft.extensions.primitives\\5.0.0\\microsoft.extensions.primitives.5.0.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\microsoft.extensions.webencoders\\2.2.0\\microsoft.extensions.webencoders.2.2.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\microsoft.net.http.headers\\2.2.0\\microsoft.net.http.headers.2.2.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\microsoft.netcore.platforms\\2.0.0\\microsoft.netcore.platforms.2.0.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\microsoft.netcore.targets\\1.1.0\\microsoft.netcore.targets.1.1.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\microsoft.openapi\\1.2.3\\microsoft.openapi.1.2.3.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\microsoft.win32.primitives\\4.3.0\\microsoft.win32.primitives.4.3.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\microsoft.win32.registry\\4.5.0\\microsoft.win32.registry.4.5.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\microsoft.win32.systemevents\\4.5.0\\microsoft.win32.systemevents.4.5.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\netstandard.library\\1.6.1\\netstandard.library.1.6.1.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\newtonsoft.json\\12.0.3\\newtonsoft.json.12.0.3.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\newtonsoft.json.bson\\1.0.1\\newtonsoft.json.bson.1.0.1.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\nito.asyncex.context\\5.0.0\\nito.asyncex.context.5.0.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\nito.asyncex.coordination\\5.0.0\\nito.asyncex.coordination.5.0.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\nito.asyncex.tasks\\5.0.0\\nito.asyncex.tasks.5.0.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\nito.collections.deque\\1.0.4\\nito.collections.deque.1.0.4.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\nito.disposables\\2.0.0\\nito.disposables.2.0.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\npoi\\2.5.2\\npoi.2.5.2.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\portable.bouncycastle\\1.8.6\\portable.bouncycastle.1.8.6.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\runtime.debian.8-x64.runtime.native.system.security.cryptography.openssl\\4.3.0\\runtime.debian.8-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\runtime.fedora.23-x64.runtime.native.system.security.cryptography.openssl\\4.3.0\\runtime.fedora.23-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\runtime.fedora.24-x64.runtime.native.system.security.cryptography.openssl\\4.3.0\\runtime.fedora.24-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\runtime.native.system\\4.3.0\\runtime.native.system.4.3.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\runtime.native.system.io.compression\\4.3.0\\runtime.native.system.io.compression.4.3.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\runtime.native.system.net.http\\4.3.0\\runtime.native.system.net.http.4.3.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\runtime.native.system.security.cryptography.apple\\4.3.0\\runtime.native.system.security.cryptography.apple.4.3.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\runtime.native.system.security.cryptography.openssl\\4.3.0\\runtime.native.system.security.cryptography.openssl.4.3.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\runtime.opensuse.13.2-x64.runtime.native.system.security.cryptography.openssl\\4.3.0\\runtime.opensuse.13.2-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\runtime.opensuse.42.1-x64.runtime.native.system.security.cryptography.openssl\\4.3.0\\runtime.opensuse.42.1-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\runtime.osx.10.10-x64.runtime.native.system.security.cryptography.apple\\4.3.0\\runtime.osx.10.10-x64.runtime.native.system.security.cryptography.apple.4.3.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\runtime.osx.10.10-x64.runtime.native.system.security.cryptography.openssl\\4.3.0\\runtime.osx.10.10-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\runtime.rhel.7-x64.runtime.native.system.security.cryptography.openssl\\4.3.0\\runtime.rhel.7-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\runtime.ubuntu.14.04-x64.runtime.native.system.security.cryptography.openssl\\4.3.0\\runtime.ubuntu.14.04-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\runtime.ubuntu.16.04-x64.runtime.native.system.security.cryptography.openssl\\4.3.0\\runtime.ubuntu.16.04-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\runtime.ubuntu.16.10-x64.runtime.native.system.security.cryptography.openssl\\4.3.0\\runtime.ubuntu.16.10-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\sharpziplib\\1.2.0\\sharpziplib.1.2.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\swashbuckle.aspnetcore.swagger\\5.6.3\\swashbuckle.aspnetcore.swagger.5.6.3.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\swashbuckle.aspnetcore.swaggergen\\5.6.3\\swashbuckle.aspnetcore.swaggergen.5.6.3.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\system.appcontext\\4.3.0\\system.appcontext.4.3.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\system.buffers\\4.5.0\\system.buffers.4.5.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\system.collections\\4.3.0\\system.collections.4.3.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\system.collections.concurrent\\4.3.0\\system.collections.concurrent.4.3.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\system.collections.immutable\\5.0.0\\system.collections.immutable.5.0.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\system.componentmodel.annotations\\5.0.0\\system.componentmodel.annotations.5.0.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\system.configuration.configurationmanager\\4.5.0\\system.configuration.configurationmanager.4.5.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\system.console\\4.3.0\\system.console.4.3.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\system.diagnostics.debug\\4.3.0\\system.diagnostics.debug.4.3.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\system.diagnostics.diagnosticsource\\5.0.0\\system.diagnostics.diagnosticsource.5.0.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\system.diagnostics.fileversioninfo\\4.3.0\\system.diagnostics.fileversioninfo.4.3.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\system.diagnostics.stacktrace\\4.3.0\\system.diagnostics.stacktrace.4.3.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\system.diagnostics.tools\\4.3.0\\system.diagnostics.tools.4.3.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\system.diagnostics.tracing\\4.3.0\\system.diagnostics.tracing.4.3.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\system.drawing.common\\4.5.0\\system.drawing.common.4.5.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\system.dynamic.runtime\\4.3.0\\system.dynamic.runtime.4.3.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\system.globalization\\4.3.0\\system.globalization.4.3.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\system.globalization.calendars\\4.3.0\\system.globalization.calendars.4.3.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\system.globalization.extensions\\4.3.0\\system.globalization.extensions.4.3.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\system.io\\4.3.0\\system.io.4.3.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\system.io.compression\\4.3.0\\system.io.compression.4.3.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\system.io.compression.zipfile\\4.3.0\\system.io.compression.zipfile.4.3.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\system.io.filesystem\\4.3.0\\system.io.filesystem.4.3.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\system.io.filesystem.primitives\\4.3.0\\system.io.filesystem.primitives.4.3.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\system.linq\\4.3.0\\system.linq.4.3.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\system.linq.dynamic.core\\1.1.5\\system.linq.dynamic.core.1.1.5.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\system.linq.expressions\\4.3.0\\system.linq.expressions.4.3.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\system.linq.queryable\\4.3.0\\system.linq.queryable.4.3.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\system.net.http\\4.3.0\\system.net.http.4.3.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\system.net.primitives\\4.3.0\\system.net.primitives.4.3.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\system.net.sockets\\4.3.0\\system.net.sockets.4.3.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\system.objectmodel\\4.3.0\\system.objectmodel.4.3.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\system.reflection\\4.3.0\\system.reflection.4.3.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\system.reflection.emit\\4.3.0\\system.reflection.emit.4.3.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\system.reflection.emit.ilgeneration\\4.3.0\\system.reflection.emit.ilgeneration.4.3.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\system.reflection.emit.lightweight\\4.3.0\\system.reflection.emit.lightweight.4.3.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\system.reflection.extensions\\4.3.0\\system.reflection.extensions.4.3.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\system.reflection.metadata\\1.4.2\\system.reflection.metadata.1.4.2.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\system.reflection.primitives\\4.3.0\\system.reflection.primitives.4.3.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\system.reflection.typeextensions\\4.3.0\\system.reflection.typeextensions.4.3.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\system.resources.resourcemanager\\4.3.0\\system.resources.resourcemanager.4.3.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\system.runtime\\4.3.0\\system.runtime.4.3.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\system.runtime.extensions\\4.3.0\\system.runtime.extensions.4.3.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\system.runtime.handles\\4.3.0\\system.runtime.handles.4.3.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\system.runtime.interopservices\\4.3.0\\system.runtime.interopservices.4.3.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\system.runtime.interopservices.runtimeinformation\\4.3.0\\system.runtime.interopservices.runtimeinformation.4.3.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\system.runtime.loader\\4.3.0\\system.runtime.loader.4.3.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\system.runtime.numerics\\4.3.0\\system.runtime.numerics.4.3.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\system.security.accesscontrol\\4.5.0\\system.security.accesscontrol.4.5.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\system.security.cryptography.algorithms\\4.3.0\\system.security.cryptography.algorithms.4.3.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\system.security.cryptography.cng\\4.5.0\\system.security.cryptography.cng.4.5.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\system.security.cryptography.csp\\4.3.0\\system.security.cryptography.csp.4.3.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\system.security.cryptography.encoding\\4.3.0\\system.security.cryptography.encoding.4.3.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\system.security.cryptography.openssl\\4.3.0\\system.security.cryptography.openssl.4.3.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\system.security.cryptography.pkcs\\4.5.0\\system.security.cryptography.pkcs.4.5.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\system.security.cryptography.primitives\\4.3.0\\system.security.cryptography.primitives.4.3.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\system.security.cryptography.protecteddata\\4.5.0\\system.security.cryptography.protecteddata.4.5.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\system.security.cryptography.x509certificates\\4.3.0\\system.security.cryptography.x509certificates.4.3.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\system.security.cryptography.xml\\4.5.0\\system.security.cryptography.xml.4.5.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\system.security.permissions\\4.5.0\\system.security.permissions.4.5.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\system.security.principal.windows\\4.5.0\\system.security.principal.windows.4.5.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\system.text.encoding\\4.3.0\\system.text.encoding.4.3.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\system.text.encoding.codepages\\4.3.0\\system.text.encoding.codepages.4.3.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\system.text.encoding.extensions\\4.3.0\\system.text.encoding.extensions.4.3.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\system.text.encodings.web\\4.5.0\\system.text.encodings.web.4.5.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\system.text.regularexpressions\\4.3.0\\system.text.regularexpressions.4.3.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\system.threading\\4.3.0\\system.threading.4.3.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\system.threading.tasks\\4.3.0\\system.threading.tasks.4.3.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\system.threading.tasks.extensions\\4.5.1\\system.threading.tasks.extensions.4.5.1.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\system.threading.tasks.parallel\\4.3.0\\system.threading.tasks.parallel.4.3.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\system.threading.thread\\4.3.0\\system.threading.thread.4.3.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\system.threading.timer\\4.3.0\\system.threading.timer.4.3.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\system.valuetuple\\4.3.0\\system.valuetuple.4.3.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\system.xml.readerwriter\\4.3.0\\system.xml.readerwriter.4.3.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\system.xml.xdocument\\4.3.0\\system.xml.xdocument.4.3.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\system.xml.xmldocument\\4.3.0\\system.xml.xmldocument.4.3.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\system.xml.xpath\\4.3.0\\system.xml.xpath.4.3.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\system.xml.xpath.xdocument\\4.3.0\\system.xml.xpath.xdocument.4.3.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\timezoneconverter\\3.2.0\\timezoneconverter.3.2.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\volo.abp.auditing\\4.0.0\\volo.abp.auditing.4.0.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\volo.abp.authorization\\4.0.0\\volo.abp.authorization.4.0.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\volo.abp.caching\\4.0.0\\volo.abp.caching.4.0.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\volo.abp.core\\4.0.0\\volo.abp.core.4.0.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\volo.abp.data\\4.0.0\\volo.abp.data.4.0.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\volo.abp.ddd.application\\4.0.0\\volo.abp.ddd.application.4.0.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\volo.abp.ddd.application.contracts\\4.0.0\\volo.abp.ddd.application.contracts.4.0.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\volo.abp.ddd.domain\\4.0.0\\volo.abp.ddd.domain.4.0.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\volo.abp.entityframeworkcore\\4.0.0\\volo.abp.entityframeworkcore.4.0.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\volo.abp.eventbus\\4.0.0\\volo.abp.eventbus.4.0.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\volo.abp.exceptionhandling\\4.0.0\\volo.abp.exceptionhandling.4.0.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\volo.abp.features\\4.0.0\\volo.abp.features.4.0.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\volo.abp.guids\\4.0.0\\volo.abp.guids.4.0.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\volo.abp.http.abstractions\\4.0.0\\volo.abp.http.abstractions.4.0.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\volo.abp.json\\4.0.0\\volo.abp.json.4.0.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\volo.abp.localization\\4.0.0\\volo.abp.localization.4.0.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\volo.abp.localization.abstractions\\4.0.0\\volo.abp.localization.abstractions.4.0.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\volo.abp.multitenancy\\4.0.0\\volo.abp.multitenancy.4.0.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\volo.abp.objectextending\\4.0.0\\volo.abp.objectextending.4.0.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\volo.abp.objectmapping\\4.0.0\\volo.abp.objectmapping.4.0.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\volo.abp.security\\4.0.0\\volo.abp.security.4.0.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\volo.abp.serialization\\4.0.0\\volo.abp.serialization.4.0.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\volo.abp.settings\\4.0.0\\volo.abp.settings.4.0.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\volo.abp.specifications\\4.0.0\\volo.abp.specifications.4.0.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\volo.abp.threading\\4.0.0\\volo.abp.threading.4.0.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\volo.abp.timing\\4.0.0\\volo.abp.timing.4.0.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\volo.abp.uow\\4.0.0\\volo.abp.uow.4.0.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\volo.abp.validation\\4.0.0\\volo.abp.validation.4.0.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\volo.abp.validation.abstractions\\4.0.0\\volo.abp.validation.abstractions.4.0.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\volo.abp.virtualfilesystem\\4.0.0\\volo.abp.virtualfilesystem.4.0.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\microsoft.windowsdesktop.app.ref\\5.0.0\\microsoft.windowsdesktop.app.ref.5.0.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\microsoft.netcore.app.ref\\5.0.0\\microsoft.netcore.app.ref.5.0.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\microsoft.aspnetcore.app.ref\\5.0.0\\microsoft.aspnetcore.app.ref.5.0.0.nupkg.sha512"
   ],
   "logs": []
 }
\ No newline at end of file
diff --git a/code/src/Shared/Win.Utils/bin/Debug/Win.Utils.2.0.0.nupkg b/code/src/Shared/Win.Utils/bin/Debug/Win.Utils.2.0.0.nupkg
index 87cd05c38ccd743af8f8437c3c182a127993b427..3cc384c75d9c65d92df15f59b99e08bcdb723fe2 100644
GIT binary patch
delta 5679
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
C55e{T

delta 5693
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

diff --git a/code/src/Shared/Win.Utils/bin/Debug/netcoreapp5/Win.Utils.dll b/code/src/Shared/Win.Utils/bin/Debug/netcoreapp5/Win.Utils.dll
index 77d84cd0c21ea51fca7cf2471443dadadfedffae..e5a978b72230637d3f99d6b070482edb5e993f21 100644
GIT binary patch
delta 202
zcmZn&X$YCn!D2uE$gzn%GK_H(SB5ikPG)4RXH1#g2qbMcGcwJW7I+@G_xeY3X8&$}
zts^cQecx{0AX~u9`(};bZU#o*044?ohN8*3it=oa>=_syDNYVjRFYoRr}BCJ>t!B0
zN&~-IN^btf2vp=^731vh;yU@TVw4e7{)Gip9%R_IeRi8=4>z&b6iKTaIsi35fwu#Y
kp)gTV4CtOTr4@{mHz=8G=2Q8_%#>iTSy1CW<3s~?0O0;eApigX

delta 250
zcmZn&X$YCn!NS(Udt_pd4CADUE5jLWCo?kEGtQXY2qX(PGcwJW7N{s<=gAXZ=hr_c
z#eGV;(2>m>WDA&i1ux2fW?=LUU}9ikST<Q#QJziAfq_9xX>yRFlK<?T_Dhbu*yh>j
zsr~z6(*kowpduHmn3q%cKbx`i<-(oMXRnKS+B5yht~EgN*~Y!kcTax4ZaP%LFSXps
zD>${JBq!A|IXS;HuViw+Vw4fo%$tr-Gl32$j+=8p=-k?urrY11^-Tp@4+Hfew!%b3
cF`yrelvXfq=2Q8_%rwPdv!KR%#)$^(0JkAzm;e9(

diff --git a/code/src/Shared/Win.Utils/bin/Debug/netcoreapp5/Win.Utils.pdb b/code/src/Shared/Win.Utils/bin/Debug/netcoreapp5/Win.Utils.pdb
index be4ac4968d4647877ffe789e205190aba3db3e73..aa15f20eb1f77c3ac88948a118974400c62c4255 100644
GIT binary patch
delta 1311
zcmZ9JeM}Q)9LJyMuCIW?g1oh1oDAruP+Cf%-6oR)L1=pjWg`M(9OcByo3s>|OlScG
z7v9XdF~wn(7a5yDMi7RJYcN|z)XglI{V}#V1(F3BMg_&OWY5(w%<l62etys0^ZP!}
zb9ZY9HVwhfLqu*G0Iz6D$_oGhL+v4t&Mpq@nXsm>r~^h<?|(sFInmi#|2BZ&J%E9a
z5zit1g1CSvg%GGA1}unmh)%@oh&TqpRty6vh?$73h+T;Pu+MSy9ETtq5rUVs5QHLy
zBPozx*P?9z9F%HtAkpDqmyQEw>XE&wXJ2rETF(VFu9^of>3Lw@Rr5hS$p<w^ZAd*x
z!=wO(3sATKg$q!)060k@SRmP)jSB}!==kh{Iv0h&kOt8hqMN<=NEjFuVX0VskrqQE
z90>w}j*G~1)joOwqR>?vNq0mKBnjYvBe(?ZIEQOQU9~s?d0<ROKt7n(?M8K|-hsSK
z??ir44=}bSkgLgj<QCF~{5a`A9;$a@yln_~TmuKr1CePCoDX&}PdH;-PC{B@5;M=$
z?G)xhjxaDdEFzY;<u=J3d3f1LR7_2^xQmb4By}CZUep<5+~3__4hR?~kLO$OwlUvk
zBib&7?Y$WD%<pz@pt5Q*Yky|{)w|?Zw%3%7^vel1BTD@>W~$71U=K|d(&oLCnJT3#
zX|vR5*$kN?nlAM1nDbCQzLVGYPSw-f_V@1z?gh0R*}pvZVQY2O`8UH7sY*K2R7xk5
zmsQcs6J9|0f9-ZYAstydeq}N3Pv@E7zErP4x1YP#@yL_mDVkbw*6{aY6%)q~P;NG4
z69LwTdf4BkY&n{Gc)F%}<naoT_=%H0(7mF`>ps7nPmtD<5~`qtX5QlaZywivmY8z>
zG?q8+v*lUNWN*i{;*L();M#*=&ag)OQE0!l_=K;4Hk+st(_uQPrjjnRn99p6FCNx@
zpZLRX+l_1Gs}rBM_Er~*7OIom*Onab^5UgF`x0l)O?d<us;QzP+Wh>J#aG5unoR}P
zO8Ui^hDf43H~)}#kZfHvUi3lF?>$3-ifGdf@n08a7uQ0inuAXnO5nHol^U!>?tpl8
zWXJYjo5<6rcHixEZuM=Ph<)_g^?h+GUcW8RE;0jxq$sbAU)wOz@O8sf!w-bS^2XH+
z#v#i7aWT6hdN8iNz42K5r{xd4Yt%E&1AY!BNGN*ge{GGCj7}H=XPF9NU`&iu7NL+v
zDWa5WscNTDVKmAMWk#B&3glFbvXGKR$z$ngnL?$MQ*v5GDP%HL3^n?#@N_cFXY$h>
zqB`gV+Ec9cvo_A!P1Y6|QN~Gs1Aw-5%-#c=HCXeK8wWyYPr;fynC~)@-Sg2r-8^fn
zjK4w4^MtlGEQc`})VOCfmysGmm}!Giz{fmcEoSRyl$nyP?0RIDtC0h}nS+_%NZ2*z
bF#9n+3Ws(%#@hmbR^!7$Lp+DK4*>rHzyg2D

delta 1408
zcmZXRdrVVT9LLYOx6i>8w9G02uPm|KklF(B3Pa07hUJz=1sA45DHp8P0&TH?8>Ku1
z93+sd(2Q-A4T*sT6e5G6LNcA(vI#DbsY|0v5QMR1$~Ku8vR}JDWbWR4zn|ZEea|`f
z*7V@X9^70+olimN)mVLDE<&h%WOvuKheJuWq`;M1RgQ4)TU(b}nj5VR2&1!zK;HrH
z05@WcC`_Ouz!G3T@G@`}=s^%Dj=(4t_&(4MoCG>u{Uk=2B!OChT|kU<N{os?7ElGK
zRtd*IBpOzd$e2u``eY8;YNa{IM7svKsD|dEFWof{t<XFqQ@Q&2s7b{~*Fbkb3!oL1
z0Kx?jE`V?WgbR>oiVy|Eb)P>ZYH_zoWOq}DI#MtUV|ZN;A4H(REyO;;I-n$=MS?I=
zCv$;3cb!8EfI@fOukrwTf+UE8Zjcf<aW_{BtFDt2hWRvw`A9_Xfx3uxfRE7Q;L9{3
zTr~w=qsjpvQ&oabs~q4(^f<v20q(mS4w8pXrZ`AGYG9vmE=79IpB<aEpPTO-nQQM8
zKWJ>5`QkJ1*^5`^M%lT(wtojUs2EG^J~d-D>luYsTUcT+vlqF^R*!?2<Nd~)X_;A?
zW0a(@y!b?yB|E3{!GeeF>^WilkMU8?_W7>S7@nhTPqt62QDe{^d5h8HF~+z;gUM`?
zYE7QcBPxfen2CF@aaEa$tS+u{Npw#?b#+=Zg+82ORwJ{n2^&MjYco<KHAc;G#>^OB
z$azXBtG#N{YX8Ph*tCMHGlk>gh4iAkRYDQ-Z1?=ZjZ4jJKTooA&DJ&r6}5g!@7vlI
zJx0q)y{MSz_Zm<9>3{HWxBV2;_p40xSj?vK#nQEFTB!@a^%Q&*dS-O7BFZ`N*FZ<>
zP2SGb?1D3zjE6m0HC=W#k-yElc8Qbf&hYV8Yc6NRwRwD-9PTJz8978ywKvvTL|@sJ
zbw3<^Ma>v>8ojQZNhmcl29pjx)PJv6wSx+9b{s&DGkYFY`2D=Mj_>OXI;M)8%ufy4
zv7}c_#(%t7ZP64IFh<w6j%JJsv)QQ2Eip4M1Qk=;_14+tpyhW$|Cq?I%VekSFa7kc
z=c8dkY=YkRlOf4<)=#i$?VYPeD8+4F!L--YqoL`iCAV|w^OJ{OHkH;r>kROcjon<m
zKgi|?6094Z|JAD1YNA?DEuubeFE)fU)!91|vuYMAwu^c%Y@X@g+lqNnftPNP3wt&n
z&>5r|W}V(7RhUf7@mzgbk|Dnk&iwy03zh%+wuITCl%D$Fq_3|`Pu(s1Ma;AYltoS2
z;xjBPCFEfzD-rsI?~=-b!lc0=^56)mJTx$Dmpm^dI4?pb57*{vwPCV+ZEjvzct}J@
zm`t9piPVJTF}d>4U4!Mq4-#=N>yzf#@(mtG${Cma4wg)~Ozbi_JCSxqoQbfFAZ*>Z
z?kG{e=_L-v*p^Dv4YMcH6Fqui9xZd3g8e>S$@9XM&BS5WUmc0P*tgXULID9?l|*GP
lJFk|kb8V&i)V+p-MXdk+vGovNIZxP{_>hZj;q2mm@jvlazzP5W

diff --git a/code/src/Shared/Win.Utils/bin/Release/Win.Utils.2.0.0.nupkg b/code/src/Shared/Win.Utils/bin/Release/Win.Utils.2.0.0.nupkg
index 5dd18d93983ece6e070cffd3d747b6351204eafd..b41ff0eb7575c83ecf7128b75f3e5dde4ba91b80 100644
GIT binary patch
delta 5451
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%0DcAOm=Iif13;Ub5o{VIk
zW@YYiK&E+IjaGy4c95sjJ5lr2p%(-uZ$}$rJGpCNp($-Ie_vhocw<xFTi^7sS<i~@
ziBT5(8hR9W{pDO_6J$;bu5v^L%M^nMM5Ll;Xp0^|Xo1gNXC7*CZ%MEA7~B0h`ke!c
zqboo^*I#`yp9;jd8joUtyIV=wglZ%KMwUw#G7L89;>*uDw?gnHy0|}K|9M3JYv$fv
zc7yo~=BW=cv6cDz3?cuQWCkk_tdRg70fAM}1xl`qwV|;D<3?`R&z#CrD<)<Wm!(g3
z+Tt1=O_UI%fLfLS3}FpF$xQAuAAOfRAX@NsF|!|T9oJr?>t8zdg~y!xE?h5)hPz&2
z_EO~dt9z&_YrTQ1y6ULlhUj&G=X`dtC3I7RX>w=y9L3YHAdNV2PH!8@4lB&$5)gi6
z)@|qruRluOqeahREwG_sFf|%ZyMuXnwf6)`B7^j%%*`LMY9G=5O<3UPr1$v$uqwAk
z{n+RyPL%_{CF6q$TfY+ly%XRS;Nukr30jMY^79D`3-E)iM4wc|%97jF!^sNj>ZCpH
zyv$3~Nx2Up5?d~@`fk6agp<@wP=k-|#b^*^DjLD8z45v7_fOR-#No5HWO0Fx#>D%-
zZB9s+Gus@lqKFY<^r{@8>(_D;dcU&wy94i745kLAI$#7~YAFg`ibZ4cSyHVQilU>S
zfn3P*8Vt}(7=R30Qx4>Y9T-=OqhMtzS)6G&z<c(R-Y-r>W3YB|(d7`^SX7uo*%;I2
zYe_G$0z>sui0)KNitEITvfem)4*$C%%oO7kvhu0j)dgd+_II3%_BCK7_wIW;&PR>1
zK2uY99vCP7r_KYmiQ1J1u3pLexP&Z+DR~=Ds^kj1PEJ?M_?2JoW0;A4IdS7YgZ3f>
zQx2RSd=iQU$x7LELrDq{x^bsR>i3Y#ve`hMdWGNyF(_mzZrYck!RC8>*H79*2{H=*
zi-yd4vqvP=73PNkgK)07AN49O`k4!MhzL)w76raBaZmF4nJ91chLb!%ABU#%_D<}G
zPvD)~w4~p68D7Ii0BnS^&3BVGC*$|y@EGK^Dk>To%KxB8_z49s#y_76e@RJ$3W0+u
z8DIP#Oe1~*l58j_R8PZyTL~Jx3ylW&zqhRgs&`I5xn`dNLi%6#)9e=BOZkfNUjafx
aLDBjj4=NSci~lcDa1AQTXJ-`uocs@(4JCvC

delta 5463
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

diff --git a/code/src/Shared/Win.Utils/bin/Release/netcoreapp5/Win.Utils.dll b/code/src/Shared/Win.Utils/bin/Release/netcoreapp5/Win.Utils.dll
index c8ea88fcbd5e6569100d1b0739d54a59d10378c2..d92c4c9c629138ae52e87c256413770e213b6ace 100644
GIT binary patch
delta 784
zcmZXS&rcIU6vyA&ZKq3N%kI(^kaoKiC}2TAi3U^xEtqIPAchb^kwe*#DzYNQkoc>J
zAtXjZ8N(l-7cLUXUQF<So=nu3aN%S$z`+aZ&4dFw3nh>^hqv>--_Lt*GP8d>Q(g0S
zy`r-e4pvtiKs)l_-&uZ{e(J-y^inULU%*HBoTgYb7PvJG(sx`#p$ou9?pd)xMF8H&
z1#pr*QbKzjHGWGsm`o}PnOrR%ko!v5PRDHd(Tu|V$5=|(ekTv$w&7>RWf{`ObVEHR
z@bsg@k1o2w_ZEq4URia1=wS}q?2%%|j(aRNC7PFQA9&%^xW=?p4%LNe>F9J(#+>w0
zNw{GC5N@LM407!RuCnNYOZGvB8F$KfqF910c0m^*2LiyO1m6A31wlHO-7TMmRrrox
zI0xHEz+u}le`l{?U%Ft6=v)ZYkaf8;1z!n52rBloX=sK7^M;Oj<uH=*!ptj&<zrq2
zygBmBU9r+7eH#1IF*_XUn0<V`xN+OlPtW*DvieZg6$epj>7XxC)Wa#=oL%G4SCA(m
zr-DaGrP2EI(6_#To6!Sy4KWY0SoFwNPJj7Yv5(gKCv&Y-9uPFhIII4CSCv3mwbhp=
zia<-%8mo&g$qD6_GA3#~DiaK+!)l$A2SC=I!SsdtN}Rd>eg&|ji#;$TX)F*R?j``Y
zMyCS7`t{R|lN-+Q$l{m9c?F)7vVR9!8)MPV*0xwgPh3fiUelAw5xpfIHzr1tvA8j$
z)3rdfI#alQSjeW-z20mot7@LwjC{WFEzV{ft_QSMD?)>|Yn5hFn?h3z?(*DxlPQOO
IV!BrN2lIZVw*UYD

delta 762
zcmY+COHUI~6vxk*Y45b9Q#w;y3QRjgf%1}<(Hb8R5D+!UBN1Do6&FBMFjY`O;;V{r
zrQ+m<Pe5YgLW3C=CQ5=EaKQ&)p@|7BG%nP*&}gXM+jfC>aqc<)^Sl4toO{##fBT+H
z`&|`~Tm4-CJt)H1&xZTvLk*|RXK}2ch<ETNy~|>PqOgKGB~pZL2}Q+j02{f%<AE>&
zh^ayV7s(KVCZt9m*HcU;)x}J%ml;V<i{<TEUHDJuBv<O}lRkhesSrC*nR8Crn4Svn
z5Jb8zh0skm#CWNPovf@cir$u4k|E`co$_-w?XgbS-ih>u<52dRxr=nLR&AiRVJgDF
zv`kAJv({(FIC^`b(C&ew_F;*@BbHkuE(J@_3jsEo7I1?OVwo2<vy}{Gbgp1PAt2d4
zVhmox76xEHe6qe5yu_gg!4Cu>3R;wpbr$MiREWa4Y-I*F$+%Djm$Frktb%KKvW<~d
zu(+dF4X^S&=3@PkYdqei)%fJnuleqDY|SZ?#9O*oD|Zf}GO9{M-A&JHM@o}|Iw05$
z0kxpdi$WOuYT87;CF!!J?_%_j-9Yq#lSRM6Yx+&=#6h|*G*ie+WyoPbzVjw@#^Vr)
z+T<Y2fqT=+a3gma^(q(D%j#9x5K+C(aC#x!>|)jo5&@7dgrCcu@0;fVPxiA1h9phu
zI@xXk*w*PiJre3$F&8J+4!6(AU+8jX{VDq|(0%aispIXv$GYf--mxc7H238RZuevH
z*1*JSqSqN4Zs=*{W6rHHo*QOafPK{wqsDq{q>;8^(DFoni^5E+r9{7?*(Ch~cx0jr

diff --git a/code/src/Shared/Win.Utils/bin/Release/netcoreapp5/Win.Utils.pdb b/code/src/Shared/Win.Utils/bin/Release/netcoreapp5/Win.Utils.pdb
index 335d004bd2b881b787a050d4e4f8638d730ec801..6ab23ff302d0d28f7a1d62a249af8ce3d22f8535 100644
GIT binary patch
delta 1416
zcmZ9Ldr(w$6vxlqd-nyX7=g+Tc^4BVi*=WMxKKK>t{Utvg6m_X4ZU2hw6g5x?p;_-
z<slk6C^)wulObO`tSLn&AhKpd{xG#N%dtsK6UUi`j7HH>W5&*1vq66Mp7S}sbMN{7
zUh_NMM%1?xjRx0A5@5y_fKCd)3>Z6kzuQ|9z!0uu4quqD+zB@^$P?qm%d@RWgB0Kw
z2lg!<UlH~%q-TaMMFlKPKQuKy2emJ5-_+l=r?IXQ<zYDxuo@)Lggk(}jJ$=^5Cmip
z5(pr-Aj8PBNK!(;M2Q5lk;{<v$Y$hYWGpEG8%cl*Nx*a)0V!x{Xa=-bZ8#i|;I@(Q
zf}Mofm39i&qxIUw4^kMgOX1f@EQ7mt87OfH0CF%m<lsVM(bl1@cPLO?f#M1jSD?58
zLJlSDjr=dxh>e6(kv<7$B2>bU4g&K8K4O!@i3G_FB1w%=)PFfG=4XuQn}m33iG{UE
zFfVQv0gr9Cw;+qeopuFM8Hw$VXk-jpDjrKEnTqRiNm;DgjD<ogRTz7c*9b>0hpf96
zO-k?RJMoh+N+r|QOlrXr>%uq-=gx6^ogB}5xGa|S1-(4Q`ieOrRjRL4x(G^{l$??_
zhdv+GC+)h^9j4d!_t!<MwpFEWX-JM`TG)C2>^t7B5aKO<#>>9-I>!`q{slg7fDdTc
zK-5!#sw#Tdv6Q?|O^>ErJd|WC?_0TcS=-k)a=)m0$+$nid%<^UWmCs0<S~AxOwaM0
z{~48jy0+u+teY|Bk?VzrSCl`vSiNCTF*v<$^V;E?JL@aT556WyWvP|_4_hs#HC?xN
zd^xn_k8n%!;hfmcs7uYG<m~re$+o<sT6y%e$~@J|@Eq?h<8lH%FHXFi^N$;~x`3V*
zyyGC+nvHeaayEV&dbexj9&P;~EN|a;&r-PW;P4tcH|X&&MIJ69CUnT+#?0X(x<7p3
z^TM9^36I|BJJfKhw4qVk`S9;#>ZnEa{>-*u>7E29=XWz6_eO4Ei08ZkH}2oqbyxpM
z|32mUbEkawdq1f^R8g9Et77r)hqw2?Da+Etud@Dppg(4svw|rp;rveyAd9cW8(S3Q
zxv?@evuU4e&D(L)wWEnWC7W8WwSJtWH@MHK{_40g^l+xevhG2`Gct?Zo^g9o6Qo`3
zs{38D)K_bBKioV2Mq_wl!q(n7caNN1HSb>RZ^KuHNMF%9`BLGSJS#o+>G9X})|{*v
zs5wvX9GGinbQjs`&|K&DBO_mh&-6(7YlBA%b|3F9)~_xQ)QZH(<I1+`gdByMA|%z9
zg))W8Y|xlA+BCf;U7v2u(3oFl^(?C^*0LPO6zLd~v6#`O>*jC<t=??ZF*?r7=(Sq2
zi4ne0R8bi^lj+1l<=`U0n5Uj5b8ZOmT$z*zgUuygB=tn43<wzrEAko=gJQZ-bS<L$
zOmqXHyDCKIJLTeK%#5BO6y_VFU6{6qM7Kj|%io+z0!2-pkOZ12h<-ALW*HaaCyCXf
ZtYdzpK*(NNI@xB4m!X!0euB98e*q#)ol*b*

delta 1346
zcmY+De@qi+7{{OMk83NSIKaUe^MJ&<jn*sN3RY#dBFNeTr4}=XvMU^2@!Gmx1$9HD
zip~WUcYtippTTZHvlv;H8Rw5b+%(&wW`T?-L^pL&$9@RgaGN1}u0W>OKJVxIKJWW}
zpX<}Str6nVQKF5h{8SE*xe4Hq0w51iJ3~RQ-y@)e0nFhSGF?s>M6p=XMXurk<g-eE
z<93`|_<$SdrRVpY;4dyT?~eOfJTv}nq+rm{v8U~wCK;~f0|A8~gGOWv@*MIKGM*qH
zg^+<0S&2M={0Mmic^8=}BOpsAgBqj{*^j)9oGm9nFPEXq@2?OrhB1zzw4$38%Yhtj
zS>^B>1~l0e5XRVHlNOZFVN=4fs3zfpjf87at%7vB3Un9@#sUnBU5(~yG*_d!8qL*E
zY}Y^?{^W^A4(*TWeNnA}BX$Cp3H(Tp3VLVBek9T;RMRGNM$BhEHmAiTMX4#lDm4mU
z7<XN;VsC+r>Yz=H)I{}6dkiubLyJ30<y!o6bV@OzSS=<hGc-jea(S`2WZ6=&LYdQ~
zsw5OKGiFhgHn8!{`tF9R*AL&hAJg1%R8#PMfoW*pz3$Wb<e|NbtCB21)?fX`GLEg`
zf=dE^AtdOlg~{U{D*wujxyq6X^U7|ebu{q?-*>j3?Sl{dxbgWbFKAks<j0Sfu|d|y
zg}9(Tt6ES`yus!OW!)0L)zR`dF(x`ZXKx42C*Ln$do8R<<Q~0zuQFk@O<X`~Uzpl{
zk21~Z<5N5LE<9(a*T+-&3maSO|9q};b);(>_sK7G$%wd%Ov#zt-fW^y{MzH$&$OQ&
z-eej&`Pa#VotMdZWmTSb)^)dM<<{;ls$?C{vu>UfcazCeWttnQh%0HPll{WAWN*yZ
zw%kJ-|2?%zMzvg=-jMiJmv#Ghbt0vDx@oG+B`Ra+;0hS2=y|Xy?T5ncs?;Ifnv(ff
zYs++5qrCZQ!GRQK1MBf{!HGtiLwJqc>p~p%a?&HLq2};SKRwhve2w|zimQvJx7{4Q
z{&wtx&()TteCm<Uv|rA8!lTg3(^4=0cd%3D0n*bS|4$uL{;qbwZU6Y{syJc&_D6>^
z;^}jj$8YwE!>XcJr%!Y~yes@(_=9kST68QU?fS-@jY^eaaOd3pBfg5UYiCcTE^6w$
z^9}#L?fH}yUccTI^74Y-EC`&>&2K37*9Nfg6HZ%{Vw*a>qIs~M3ku$VAF`o3;9KkE
zxu9+;m7_Np^t6uAXB!wgM{j(Q<qWm8wK)t^!x-o18jaZuXUxN7uEEG~w2{tb-Nrn(
zffm)8%?ielNB6dBZWYFn&J99{^C^k*V2u?6W$DB-qGMiyc&6;FIVLITk_J{91ZmhI
z4M(K=kv?5R0zraU?r@679WOl<i%T|(G&rR@Wr~RthaHXDi30lN-1^WA>9FK#m+ILp
gF>+8SX2zv~ej12v<!cfxR1%42t(GV(2}$VlA6;{OY5)KL

diff --git a/code/src/Shared/Win.Utils/obj/Debug/Win.Utils.2.0.0.nuspec b/code/src/Shared/Win.Utils/obj/Debug/Win.Utils.2.0.0.nuspec
index 202f93a2..049f8fd3 100644
--- a/code/src/Shared/Win.Utils/obj/Debug/Win.Utils.2.0.0.nuspec
+++ b/code/src/Shared/Win.Utils/obj/Debug/Win.Utils.2.0.0.nuspec
@@ -13,6 +13,6 @@
     </dependencies>
   </metadata>
   <files>
-    <file src="D:\长春项目\北京北汽结算项目\NewBJSettleAccount\BeiJinSettleAccount\code\src\Shared\Win.Utils\bin\Debug\netcoreapp5\Win.Utils.dll" target="lib\net5.0\Win.Utils.dll" />
+    <file src="D:\CODE\BeiJinSettleAccount\code\src\Shared\Win.Utils\bin\Debug\netcoreapp5\Win.Utils.dll" target="lib\net5.0\Win.Utils.dll" />
   </files>
 </package>
\ No newline at end of file
diff --git a/code/src/Shared/Win.Utils/obj/Debug/netcoreapp5/Win.Utils.GeneratedMSBuildEditorConfig.editorconfig b/code/src/Shared/Win.Utils/obj/Debug/netcoreapp5/Win.Utils.GeneratedMSBuildEditorConfig.editorconfig
index 70f70bdd..627e7204 100644
--- a/code/src/Shared/Win.Utils/obj/Debug/netcoreapp5/Win.Utils.GeneratedMSBuildEditorConfig.editorconfig
+++ b/code/src/Shared/Win.Utils/obj/Debug/netcoreapp5/Win.Utils.GeneratedMSBuildEditorConfig.editorconfig
@@ -8,4 +8,4 @@ build_property.PlatformNeutralAssembly =
 build_property.EnforceExtendedAnalyzerRules = 
 build_property._SupportedPlatformList = Linux,macOS,Windows
 build_property.RootNamespace = Win.Utils
-build_property.ProjectDir = D:\长春项目\北京北汽结算项目\NewBJSettleAccount\BeiJinSettleAccount\code\src\Shared\Win.Utils\
+build_property.ProjectDir = D:\CODE\BeiJinSettleAccount\code\src\Shared\Win.Utils\
diff --git a/code/src/Shared/Win.Utils/obj/Debug/netcoreapp5/Win.Utils.assets.cache b/code/src/Shared/Win.Utils/obj/Debug/netcoreapp5/Win.Utils.assets.cache
index c0e9cd2eee45007fc342a23dfe3ba796181b9b2b..b86424896699c4b41e24465dff64adf5e3895df6 100644
GIT binary patch
delta 1005
zcmewtH7(jbz}wxChk=1XIsf4+m8)tS7f%(oj||Db^X8?H>HJye&gr^46uUQG_IsoN
zR0IWlKsw&pDkiizwWv78(bFp;YO;f1;KUhftPoC}knJQ!80Vjm^W;1vp7rGY!rYVZ
z!$s<ZOeWhgX+pK$<q4U50M1hs4V-Mx3^VCJv;O2&92S!=GQ(8=XPyq#H&IGrvYxo+
zWL<vS$&#!vd5~y4YdTzw;^a51d2pW6WIF+e$p_hBsu>lmCf^e<nH<Y*2vy@C=r{Qx
zyCRgQDC##klmo_txF!-R_n$d;b1CO!rh0G)#OURfrl*#~6eK2RC#I(s$ACi49T;Q*
zMfvGPiMa}HnK`M&3aUmH6&7ZyMwT(YnaM@@#rbI^3SpVWrHMHT!6l_BnfWon8Hq)y
zDKUPf?x`gKP{TlGaRM<~6hQ2p>?Y_jc{>lxk#~7YksQC27bXsJ{4ZW4$4@@Wrvz1r
z2+BCP2q@rOCx7FI>7OVC3cN(9JS5;^p*#n{emF~d@_WH9D6dYa8p`@7)CgyRl7lB)
zg~?<`5l1KwloW2md5WSiQ(?(KMhvF%KXbw4OJep=eGvCAN8-h^icaPb5}xe9&px@2
zRcNxYgdJQK<TH`Ut0jt&L~`U5!RkK<2uv2xkea+m(g`jL^0(k*8L0xe$QCHeK@j9y
z$;oxny>K~D@)MhEC)0)@!ZG=PtnB1kEuqPJvi@*ckZVLI?~v_763LO<2jwv;I8C0Z
tB|iDQj_Tw(1&PT=<;@{7n;8{&SfPsQgrq0ys&YYj|Cuc|m#A`a000B~K~?|&

delta 975
zcmbOh{V&Qrz}wxChk=3N<tDc0x*SiN&G)XI-{do|$A0N^<z-Ptij%(y|I7cKvgwop
zP!SaH0qJ;WtC-N@)S}`T6B9FY<H?OYeiNr^vO+j>giR;@(1UZVC#NwYcy5#LGpfPm
zOeWhg!L-d637>qJ2_~1%>o?hk875c2r$70RsP*J4%rN-^zTC+<ELu>L7^Ng8%kZa7
zmSlzLcqpScS(9CIav!S&T#e%7^%5eJ*rMP9#*;PJRVH@}a8EwS2GhtWr8N1TfY0Pu
zc0;H-pywt(WLJdpKn@G#fbk#>vzYt{NhEi3Dd%LSL~vll=;f8Br<TMNBqnDkrl%Ii
zfC5n;7<vIk`RPT8xe9KXIY7~r{E|GNs^XOF7{5~Y)DpMEoSY<}7PtJIl++@S9!?;}
z4E21dqvnf*O!nl3IVztQCJu9+7avTnfUh6!eNdRS!+FrqF`UdN08`8;1q&e^xH3@a
zltOu+kXa_^2<J&pu9cRYtRPef6#=G%$)|<f;5_Tefx-x03tZe}a-;~%l=&i4q2i#B
zZWo1#L%dQ6l><fpb1^3<4-);Flk>&vpdt@tbSKM8WWnV@o<sI(jN}5i++sKj<Tvrj
zCQ>Ss&#H(_mXdac$~5wTe6|eAdnjWzIZg&)(-ydXa1c&DFN+9b#mO;}ij${Fi%i}r
z*9lh#vPWWan2g%wcRF&DrzuEGzAJBzCOchPZt?<o+s*3~%2}XNbA+Y&-OzGg0iVU@
I9#t+50K8ckpa1{>

diff --git a/code/src/Shared/Win.Utils/obj/Debug/netcoreapp5/Win.Utils.csproj.AssemblyReference.cache b/code/src/Shared/Win.Utils/obj/Debug/netcoreapp5/Win.Utils.csproj.AssemblyReference.cache
index 76e7f2a713849ddcf455f43b023c7a12ecbb65e8..274feef0e64eb3f41a0f4d43896b3224e48b8154 100644
GIT binary patch
delta 12600
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
W(a_5@)Hi2=$B$!Stid$yBL4^eLL1@$

delta 12600
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
aCLDRqh=x9<p}si_JboMtV~wV92l+qU4EjC*

diff --git a/code/src/Shared/Win.Utils/obj/Debug/netcoreapp5/Win.Utils.csproj.CoreCompileInputs.cache b/code/src/Shared/Win.Utils/obj/Debug/netcoreapp5/Win.Utils.csproj.CoreCompileInputs.cache
index 08ca0818..5a01a970 100644
--- a/code/src/Shared/Win.Utils/obj/Debug/netcoreapp5/Win.Utils.csproj.CoreCompileInputs.cache
+++ b/code/src/Shared/Win.Utils/obj/Debug/netcoreapp5/Win.Utils.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-a4e72035fded0506db7de17e77433da7abe83383
+55c6c81ff183b96899eec34541a31f8b3f89817b
diff --git a/code/src/Shared/Win.Utils/obj/Debug/netcoreapp5/Win.Utils.csproj.FileListAbsolute.txt b/code/src/Shared/Win.Utils/obj/Debug/netcoreapp5/Win.Utils.csproj.FileListAbsolute.txt
index da92e8d0..308109e4 100644
--- a/code/src/Shared/Win.Utils/obj/Debug/netcoreapp5/Win.Utils.csproj.FileListAbsolute.txt
+++ b/code/src/Shared/Win.Utils/obj/Debug/netcoreapp5/Win.Utils.csproj.FileListAbsolute.txt
@@ -58,3 +58,15 @@ D:\长春项目\北京北汽结算项目\NewBJSettleAccount\BeiJinSettleAccount\
 D:\长春项目\北京北汽结算项目\NewBJSettleAccount\BeiJinSettleAccount\code\src\Shared\Win.Utils\obj\Debug\netcoreapp5\refint\Win.Utils.dll
 D:\长春项目\北京北汽结算项目\NewBJSettleAccount\BeiJinSettleAccount\code\src\Shared\Win.Utils\obj\Debug\netcoreapp5\Win.Utils.pdb
 D:\长春项目\北京北汽结算项目\NewBJSettleAccount\BeiJinSettleAccount\code\src\Shared\Win.Utils\obj\Debug\netcoreapp5\ref\Win.Utils.dll
+D:\CODE\BeiJinSettleAccount\code\src\Shared\Win.Utils\bin\Debug\netcoreapp5\Win.Utils.deps.json
+D:\CODE\BeiJinSettleAccount\code\src\Shared\Win.Utils\bin\Debug\netcoreapp5\Win.Utils.dll
+D:\CODE\BeiJinSettleAccount\code\src\Shared\Win.Utils\bin\Debug\netcoreapp5\Win.Utils.pdb
+D:\CODE\BeiJinSettleAccount\code\src\Shared\Win.Utils\obj\Debug\netcoreapp5\Win.Utils.csproj.AssemblyReference.cache
+D:\CODE\BeiJinSettleAccount\code\src\Shared\Win.Utils\obj\Debug\netcoreapp5\Win.Utils.GeneratedMSBuildEditorConfig.editorconfig
+D:\CODE\BeiJinSettleAccount\code\src\Shared\Win.Utils\obj\Debug\netcoreapp5\Win.Utils.AssemblyInfoInputs.cache
+D:\CODE\BeiJinSettleAccount\code\src\Shared\Win.Utils\obj\Debug\netcoreapp5\Win.Utils.AssemblyInfo.cs
+D:\CODE\BeiJinSettleAccount\code\src\Shared\Win.Utils\obj\Debug\netcoreapp5\Win.Utils.csproj.CoreCompileInputs.cache
+D:\CODE\BeiJinSettleAccount\code\src\Shared\Win.Utils\obj\Debug\netcoreapp5\Win.Utils.dll
+D:\CODE\BeiJinSettleAccount\code\src\Shared\Win.Utils\obj\Debug\netcoreapp5\refint\Win.Utils.dll
+D:\CODE\BeiJinSettleAccount\code\src\Shared\Win.Utils\obj\Debug\netcoreapp5\Win.Utils.pdb
+D:\CODE\BeiJinSettleAccount\code\src\Shared\Win.Utils\obj\Debug\netcoreapp5\ref\Win.Utils.dll
diff --git a/code/src/Shared/Win.Utils/obj/Debug/netcoreapp5/Win.Utils.dll b/code/src/Shared/Win.Utils/obj/Debug/netcoreapp5/Win.Utils.dll
index 77d84cd0c21ea51fca7cf2471443dadadfedffae..e5a978b72230637d3f99d6b070482edb5e993f21 100644
GIT binary patch
delta 202
zcmZn&X$YCn!D2uE$gzn%GK_H(SB5ikPG)4RXH1#g2qbMcGcwJW7I+@G_xeY3X8&$}
zts^cQecx{0AX~u9`(};bZU#o*044?ohN8*3it=oa>=_syDNYVjRFYoRr}BCJ>t!B0
zN&~-IN^btf2vp=^731vh;yU@TVw4e7{)Gip9%R_IeRi8=4>z&b6iKTaIsi35fwu#Y
kp)gTV4CtOTr4@{mHz=8G=2Q8_%#>iTSy1CW<3s~?0O0;eApigX

delta 250
zcmZn&X$YCn!NS(Udt_pd4CADUE5jLWCo?kEGtQXY2qX(PGcwJW7N{s<=gAXZ=hr_c
z#eGV;(2>m>WDA&i1ux2fW?=LUU}9ikST<Q#QJziAfq_9xX>yRFlK<?T_Dhbu*yh>j
zsr~z6(*kowpduHmn3q%cKbx`i<-(oMXRnKS+B5yht~EgN*~Y!kcTax4ZaP%LFSXps
zD>${JBq!A|IXS;HuViw+Vw4fo%$tr-Gl32$j+=8p=-k?urrY11^-Tp@4+Hfew!%b3
cF`yrelvXfq=2Q8_%rwPdv!KR%#)$^(0JkAzm;e9(

diff --git a/code/src/Shared/Win.Utils/obj/Debug/netcoreapp5/Win.Utils.pdb b/code/src/Shared/Win.Utils/obj/Debug/netcoreapp5/Win.Utils.pdb
index be4ac4968d4647877ffe789e205190aba3db3e73..aa15f20eb1f77c3ac88948a118974400c62c4255 100644
GIT binary patch
delta 1311
zcmZ9JeM}Q)9LJyMuCIW?g1oh1oDAruP+Cf%-6oR)L1=pjWg`M(9OcByo3s>|OlScG
z7v9XdF~wn(7a5yDMi7RJYcN|z)XglI{V}#V1(F3BMg_&OWY5(w%<l62etys0^ZP!}
zb9ZY9HVwhfLqu*G0Iz6D$_oGhL+v4t&Mpq@nXsm>r~^h<?|(sFInmi#|2BZ&J%E9a
z5zit1g1CSvg%GGA1}unmh)%@oh&TqpRty6vh?$73h+T;Pu+MSy9ETtq5rUVs5QHLy
zBPozx*P?9z9F%HtAkpDqmyQEw>XE&wXJ2rETF(VFu9^of>3Lw@Rr5hS$p<w^ZAd*x
z!=wO(3sATKg$q!)060k@SRmP)jSB}!==kh{Iv0h&kOt8hqMN<=NEjFuVX0VskrqQE
z90>w}j*G~1)joOwqR>?vNq0mKBnjYvBe(?ZIEQOQU9~s?d0<ROKt7n(?M8K|-hsSK
z??ir44=}bSkgLgj<QCF~{5a`A9;$a@yln_~TmuKr1CePCoDX&}PdH;-PC{B@5;M=$
z?G)xhjxaDdEFzY;<u=J3d3f1LR7_2^xQmb4By}CZUep<5+~3__4hR?~kLO$OwlUvk
zBib&7?Y$WD%<pz@pt5Q*Yky|{)w|?Zw%3%7^vel1BTD@>W~$71U=K|d(&oLCnJT3#
zX|vR5*$kN?nlAM1nDbCQzLVGYPSw-f_V@1z?gh0R*}pvZVQY2O`8UH7sY*K2R7xk5
zmsQcs6J9|0f9-ZYAstydeq}N3Pv@E7zErP4x1YP#@yL_mDVkbw*6{aY6%)q~P;NG4
z69LwTdf4BkY&n{Gc)F%}<naoT_=%H0(7mF`>ps7nPmtD<5~`qtX5QlaZywivmY8z>
zG?q8+v*lUNWN*i{;*L();M#*=&ag)OQE0!l_=K;4Hk+st(_uQPrjjnRn99p6FCNx@
zpZLRX+l_1Gs}rBM_Er~*7OIom*Onab^5UgF`x0l)O?d<us;QzP+Wh>J#aG5unoR}P
zO8Ui^hDf43H~)}#kZfHvUi3lF?>$3-ifGdf@n08a7uQ0inuAXnO5nHol^U!>?tpl8
zWXJYjo5<6rcHixEZuM=Ph<)_g^?h+GUcW8RE;0jxq$sbAU)wOz@O8sf!w-bS^2XH+
z#v#i7aWT6hdN8iNz42K5r{xd4Yt%E&1AY!BNGN*ge{GGCj7}H=XPF9NU`&iu7NL+v
zDWa5WscNTDVKmAMWk#B&3glFbvXGKR$z$ngnL?$MQ*v5GDP%HL3^n?#@N_cFXY$h>
zqB`gV+Ec9cvo_A!P1Y6|QN~Gs1Aw-5%-#c=HCXeK8wWyYPr;fynC~)@-Sg2r-8^fn
zjK4w4^MtlGEQc`})VOCfmysGmm}!Giz{fmcEoSRyl$nyP?0RIDtC0h}nS+_%NZ2*z
bF#9n+3Ws(%#@hmbR^!7$Lp+DK4*>rHzyg2D

delta 1408
zcmZXRdrVVT9LLYOx6i>8w9G02uPm|KklF(B3Pa07hUJz=1sA45DHp8P0&TH?8>Ku1
z93+sd(2Q-A4T*sT6e5G6LNcA(vI#DbsY|0v5QMR1$~Ku8vR}JDWbWR4zn|ZEea|`f
z*7V@X9^70+olimN)mVLDE<&h%WOvuKheJuWq`;M1RgQ4)TU(b}nj5VR2&1!zK;HrH
z05@WcC`_Ouz!G3T@G@`}=s^%Dj=(4t_&(4MoCG>u{Uk=2B!OChT|kU<N{os?7ElGK
zRtd*IBpOzd$e2u``eY8;YNa{IM7svKsD|dEFWof{t<XFqQ@Q&2s7b{~*Fbkb3!oL1
z0Kx?jE`V?WgbR>oiVy|Eb)P>ZYH_zoWOq}DI#MtUV|ZN;A4H(REyO;;I-n$=MS?I=
zCv$;3cb!8EfI@fOukrwTf+UE8Zjcf<aW_{BtFDt2hWRvw`A9_Xfx3uxfRE7Q;L9{3
zTr~w=qsjpvQ&oabs~q4(^f<v20q(mS4w8pXrZ`AGYG9vmE=79IpB<aEpPTO-nQQM8
zKWJ>5`QkJ1*^5`^M%lT(wtojUs2EG^J~d-D>luYsTUcT+vlqF^R*!?2<Nd~)X_;A?
zW0a(@y!b?yB|E3{!GeeF>^WilkMU8?_W7>S7@nhTPqt62QDe{^d5h8HF~+z;gUM`?
zYE7QcBPxfen2CF@aaEa$tS+u{Npw#?b#+=Zg+82ORwJ{n2^&MjYco<KHAc;G#>^OB
z$azXBtG#N{YX8Ph*tCMHGlk>gh4iAkRYDQ-Z1?=ZjZ4jJKTooA&DJ&r6}5g!@7vlI
zJx0q)y{MSz_Zm<9>3{HWxBV2;_p40xSj?vK#nQEFTB!@a^%Q&*dS-O7BFZ`N*FZ<>
zP2SGb?1D3zjE6m0HC=W#k-yElc8Qbf&hYV8Yc6NRwRwD-9PTJz8978ywKvvTL|@sJ
zbw3<^Ma>v>8ojQZNhmcl29pjx)PJv6wSx+9b{s&DGkYFY`2D=Mj_>OXI;M)8%ufy4
zv7}c_#(%t7ZP64IFh<w6j%JJsv)QQ2Eip4M1Qk=;_14+tpyhW$|Cq?I%VekSFa7kc
z=c8dkY=YkRlOf4<)=#i$?VYPeD8+4F!L--YqoL`iCAV|w^OJ{OHkH;r>kROcjon<m
zKgi|?6094Z|JAD1YNA?DEuubeFE)fU)!91|vuYMAwu^c%Y@X@g+lqNnftPNP3wt&n
z&>5r|W}V(7RhUf7@mzgbk|Dnk&iwy03zh%+wuITCl%D$Fq_3|`Pu(s1Ma;AYltoS2
z;xjBPCFEfzD-rsI?~=-b!lc0=^56)mJTx$Dmpm^dI4?pb57*{vwPCV+ZEjvzct}J@
zm`t9piPVJTF}d>4U4!Mq4-#=N>yzf#@(mtG${Cma4wg)~Ozbi_JCSxqoQbfFAZ*>Z
z?kG{e=_L-v*p^Dv4YMcH6Fqui9xZd3g8e>S$@9XM&BS5WUmc0P*tgXULID9?l|*GP
lJFk|kb8V&i)V+p-MXdk+vGovNIZxP{_>hZj;q2mm@jvlazzP5W

diff --git a/code/src/Shared/Win.Utils/obj/Debug/netcoreapp5/ref/Win.Utils.dll b/code/src/Shared/Win.Utils/obj/Debug/netcoreapp5/ref/Win.Utils.dll
index 3be2c45a83fef59a5c0cc5a2fd5eeac476683d16..c4d6571bed2768759e0836e84f99e7d8198e2687 100644
GIT binary patch
delta 10
Rcmexw-e57IY-4GcGyoiT1i%0Q

delta 10
RcmZp$_-{U;Y-4$+Gyofa1i=6R

diff --git a/code/src/Shared/Win.Utils/obj/Debug/netcoreapp5/refint/Win.Utils.dll b/code/src/Shared/Win.Utils/obj/Debug/netcoreapp5/refint/Win.Utils.dll
index 3be2c45a83fef59a5c0cc5a2fd5eeac476683d16..c4d6571bed2768759e0836e84f99e7d8198e2687 100644
GIT binary patch
delta 10
Rcmexw-e57IY-4GcGyoiT1i%0Q

delta 10
RcmZp$_-{U;Y-4$+Gyofa1i=6R

diff --git a/code/src/Shared/Win.Utils/obj/Release/Win.Utils.2.0.0.nuspec b/code/src/Shared/Win.Utils/obj/Release/Win.Utils.2.0.0.nuspec
index cbff3082..88772cf6 100644
--- a/code/src/Shared/Win.Utils/obj/Release/Win.Utils.2.0.0.nuspec
+++ b/code/src/Shared/Win.Utils/obj/Release/Win.Utils.2.0.0.nuspec
@@ -13,6 +13,6 @@
     </dependencies>
   </metadata>
   <files>
-    <file src="G:\TIANHE\src\Shared\Win.Utils\bin\Release\netcoreapp5\Win.Utils.dll" target="lib\net5.0\Win.Utils.dll" />
+    <file src="D:\CODE\BeiJinSettleAccount\code\src\Shared\Win.Utils\bin\Release\netcoreapp5\Win.Utils.dll" target="lib\net5.0\Win.Utils.dll" />
   </files>
 </package>
\ No newline at end of file
diff --git a/code/src/Shared/Win.Utils/obj/Release/netcoreapp5/Win.Utils.GeneratedMSBuildEditorConfig.editorconfig b/code/src/Shared/Win.Utils/obj/Release/netcoreapp5/Win.Utils.GeneratedMSBuildEditorConfig.editorconfig
index 84e13a36..627e7204 100644
--- a/code/src/Shared/Win.Utils/obj/Release/netcoreapp5/Win.Utils.GeneratedMSBuildEditorConfig.editorconfig
+++ b/code/src/Shared/Win.Utils/obj/Release/netcoreapp5/Win.Utils.GeneratedMSBuildEditorConfig.editorconfig
@@ -3,8 +3,9 @@ build_property.TargetFramework = netcoreapp5
 build_property.TargetPlatformMinVersion = 
 build_property.UsingMicrosoftNETSdkWeb = 
 build_property.ProjectTypeGuids = 
-build_property.PublishSingleFile = 
-build_property.IncludeAllContentForSelfExtract = 
-build_property._SupportedPlatformList = Android,iOS,Linux,macOS,Windows
+build_property.InvariantGlobalization = 
+build_property.PlatformNeutralAssembly = 
+build_property.EnforceExtendedAnalyzerRules = 
+build_property._SupportedPlatformList = Linux,macOS,Windows
 build_property.RootNamespace = Win.Utils
-build_property.ProjectDir = C:\Users\Administrator\Source\Repos\Win.Sfs.SmartSettlementSystem.PG\src\Shared\Win.Utils\
+build_property.ProjectDir = D:\CODE\BeiJinSettleAccount\code\src\Shared\Win.Utils\
diff --git a/code/src/Shared/Win.Utils/obj/Release/netcoreapp5/Win.Utils.assets.cache b/code/src/Shared/Win.Utils/obj/Release/netcoreapp5/Win.Utils.assets.cache
index d0cfbddb70a06660c904c1b5328e7890731a597f..2e3f2ef0c7dd5e386b260cc7fbbe581345e8c335 100644
GIT binary patch
literal 11670
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

literal 9907
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

diff --git a/code/src/Shared/Win.Utils/obj/Release/netcoreapp5/Win.Utils.csproj.AssemblyReference.cache b/code/src/Shared/Win.Utils/obj/Release/netcoreapp5/Win.Utils.csproj.AssemblyReference.cache
index f5e894aea93a73e58fa9d4feab241bc197ee1a40..274feef0e64eb3f41a0f4d43896b3224e48b8154 100644
GIT binary patch
literal 177441
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
ZhI1s2t5jgLI+h))bycVxNCB+a{{j1DOjZB@

literal 11
QcmeZu3JP{+WMlvW01Ze1dH?_b

diff --git a/code/src/Shared/Win.Utils/obj/Release/netcoreapp5/Win.Utils.csproj.CoreCompileInputs.cache b/code/src/Shared/Win.Utils/obj/Release/netcoreapp5/Win.Utils.csproj.CoreCompileInputs.cache
index 19ec8b07..341124e3 100644
--- a/code/src/Shared/Win.Utils/obj/Release/netcoreapp5/Win.Utils.csproj.CoreCompileInputs.cache
+++ b/code/src/Shared/Win.Utils/obj/Release/netcoreapp5/Win.Utils.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-6a22594e282714d78f06595dae485a1854c04150
+2677542b53154846c4624028c80c73e68df285b6
diff --git a/code/src/Shared/Win.Utils/obj/Release/netcoreapp5/Win.Utils.csproj.FileListAbsolute.txt b/code/src/Shared/Win.Utils/obj/Release/netcoreapp5/Win.Utils.csproj.FileListAbsolute.txt
index 2095d861..46e688f2 100644
--- a/code/src/Shared/Win.Utils/obj/Release/netcoreapp5/Win.Utils.csproj.FileListAbsolute.txt
+++ b/code/src/Shared/Win.Utils/obj/Release/netcoreapp5/Win.Utils.csproj.FileListAbsolute.txt
@@ -22,3 +22,15 @@ C:\Users\Administrator\Source\Repos\Win.Sfs.SmartSettlementSystem.PG\src\Shared\
 C:\Users\Administrator\Source\Repos\Win.Sfs.SmartSettlementSystem.PG\src\Shared\Win.Utils\obj\Release\netcoreapp5\Win.Utils.dll
 C:\Users\Administrator\Source\Repos\Win.Sfs.SmartSettlementSystem.PG\src\Shared\Win.Utils\obj\Release\netcoreapp5\ref\Win.Utils.dll
 C:\Users\Administrator\Source\Repos\Win.Sfs.SmartSettlementSystem.PG\src\Shared\Win.Utils\obj\Release\netcoreapp5\Win.Utils.pdb
+D:\CODE\BeiJinSettleAccount\code\src\Shared\Win.Utils\bin\Release\netcoreapp5\Win.Utils.deps.json
+D:\CODE\BeiJinSettleAccount\code\src\Shared\Win.Utils\bin\Release\netcoreapp5\Win.Utils.dll
+D:\CODE\BeiJinSettleAccount\code\src\Shared\Win.Utils\bin\Release\netcoreapp5\Win.Utils.pdb
+D:\CODE\BeiJinSettleAccount\code\src\Shared\Win.Utils\obj\Release\netcoreapp5\Win.Utils.csproj.AssemblyReference.cache
+D:\CODE\BeiJinSettleAccount\code\src\Shared\Win.Utils\obj\Release\netcoreapp5\Win.Utils.GeneratedMSBuildEditorConfig.editorconfig
+D:\CODE\BeiJinSettleAccount\code\src\Shared\Win.Utils\obj\Release\netcoreapp5\Win.Utils.AssemblyInfoInputs.cache
+D:\CODE\BeiJinSettleAccount\code\src\Shared\Win.Utils\obj\Release\netcoreapp5\Win.Utils.AssemblyInfo.cs
+D:\CODE\BeiJinSettleAccount\code\src\Shared\Win.Utils\obj\Release\netcoreapp5\Win.Utils.csproj.CoreCompileInputs.cache
+D:\CODE\BeiJinSettleAccount\code\src\Shared\Win.Utils\obj\Release\netcoreapp5\Win.Utils.dll
+D:\CODE\BeiJinSettleAccount\code\src\Shared\Win.Utils\obj\Release\netcoreapp5\refint\Win.Utils.dll
+D:\CODE\BeiJinSettleAccount\code\src\Shared\Win.Utils\obj\Release\netcoreapp5\Win.Utils.pdb
+D:\CODE\BeiJinSettleAccount\code\src\Shared\Win.Utils\obj\Release\netcoreapp5\ref\Win.Utils.dll
diff --git a/code/src/Shared/Win.Utils/obj/Release/netcoreapp5/Win.Utils.dll b/code/src/Shared/Win.Utils/obj/Release/netcoreapp5/Win.Utils.dll
index c8ea88fcbd5e6569100d1b0739d54a59d10378c2..d92c4c9c629138ae52e87c256413770e213b6ace 100644
GIT binary patch
delta 784
zcmZXS&rcIU6vyA&ZKq3N%kI(^kaoKiC}2TAi3U^xEtqIPAchb^kwe*#DzYNQkoc>J
zAtXjZ8N(l-7cLUXUQF<So=nu3aN%S$z`+aZ&4dFw3nh>^hqv>--_Lt*GP8d>Q(g0S
zy`r-e4pvtiKs)l_-&uZ{e(J-y^inULU%*HBoTgYb7PvJG(sx`#p$ou9?pd)xMF8H&
z1#pr*QbKzjHGWGsm`o}PnOrR%ko!v5PRDHd(Tu|V$5=|(ekTv$w&7>RWf{`ObVEHR
z@bsg@k1o2w_ZEq4URia1=wS}q?2%%|j(aRNC7PFQA9&%^xW=?p4%LNe>F9J(#+>w0
zNw{GC5N@LM407!RuCnNYOZGvB8F$KfqF910c0m^*2LiyO1m6A31wlHO-7TMmRrrox
zI0xHEz+u}le`l{?U%Ft6=v)ZYkaf8;1z!n52rBloX=sK7^M;Oj<uH=*!ptj&<zrq2
zygBmBU9r+7eH#1IF*_XUn0<V`xN+OlPtW*DvieZg6$epj>7XxC)Wa#=oL%G4SCA(m
zr-DaGrP2EI(6_#To6!Sy4KWY0SoFwNPJj7Yv5(gKCv&Y-9uPFhIII4CSCv3mwbhp=
zia<-%8mo&g$qD6_GA3#~DiaK+!)l$A2SC=I!SsdtN}Rd>eg&|ji#;$TX)F*R?j``Y
zMyCS7`t{R|lN-+Q$l{m9c?F)7vVR9!8)MPV*0xwgPh3fiUelAw5xpfIHzr1tvA8j$
z)3rdfI#alQSjeW-z20mot7@LwjC{WFEzV{ft_QSMD?)>|Yn5hFn?h3z?(*DxlPQOO
IV!BrN2lIZVw*UYD

delta 762
zcmY+COHUI~6vxk*Y45b9Q#w;y3QRjgf%1}<(Hb8R5D+!UBN1Do6&FBMFjY`O;;V{r
zrQ+m<Pe5YgLW3C=CQ5=EaKQ&)p@|7BG%nP*&}gXM+jfC>aqc<)^Sl4toO{##fBT+H
z`&|`~Tm4-CJt)H1&xZTvLk*|RXK}2ch<ETNy~|>PqOgKGB~pZL2}Q+j02{f%<AE>&
zh^ayV7s(KVCZt9m*HcU;)x}J%ml;V<i{<TEUHDJuBv<O}lRkhesSrC*nR8Crn4Svn
z5Jb8zh0skm#CWNPovf@cir$u4k|E`co$_-w?XgbS-ih>u<52dRxr=nLR&AiRVJgDF
zv`kAJv({(FIC^`b(C&ew_F;*@BbHkuE(J@_3jsEo7I1?OVwo2<vy}{Gbgp1PAt2d4
zVhmox76xEHe6qe5yu_gg!4Cu>3R;wpbr$MiREWa4Y-I*F$+%Djm$Frktb%KKvW<~d
zu(+dF4X^S&=3@PkYdqei)%fJnuleqDY|SZ?#9O*oD|Zf}GO9{M-A&JHM@o}|Iw05$
z0kxpdi$WOuYT87;CF!!J?_%_j-9Yq#lSRM6Yx+&=#6h|*G*ie+WyoPbzVjw@#^Vr)
z+T<Y2fqT=+a3gma^(q(D%j#9x5K+C(aC#x!>|)jo5&@7dgrCcu@0;fVPxiA1h9phu
zI@xXk*w*PiJre3$F&8J+4!6(AU+8jX{VDq|(0%aispIXv$GYf--mxc7H238RZuevH
z*1*JSqSqN4Zs=*{W6rHHo*QOafPK{wqsDq{q>;8^(DFoni^5E+r9{7?*(Ch~cx0jr

diff --git a/code/src/Shared/Win.Utils/obj/Release/netcoreapp5/Win.Utils.pdb b/code/src/Shared/Win.Utils/obj/Release/netcoreapp5/Win.Utils.pdb
index 335d004bd2b881b787a050d4e4f8638d730ec801..6ab23ff302d0d28f7a1d62a249af8ce3d22f8535 100644
GIT binary patch
delta 1416
zcmZ9Ldr(w$6vxlqd-nyX7=g+Tc^4BVi*=WMxKKK>t{Utvg6m_X4ZU2hw6g5x?p;_-
z<slk6C^)wulObO`tSLn&AhKpd{xG#N%dtsK6UUi`j7HH>W5&*1vq66Mp7S}sbMN{7
zUh_NMM%1?xjRx0A5@5y_fKCd)3>Z6kzuQ|9z!0uu4quqD+zB@^$P?qm%d@RWgB0Kw
z2lg!<UlH~%q-TaMMFlKPKQuKy2emJ5-_+l=r?IXQ<zYDxuo@)Lggk(}jJ$=^5Cmip
z5(pr-Aj8PBNK!(;M2Q5lk;{<v$Y$hYWGpEG8%cl*Nx*a)0V!x{Xa=-bZ8#i|;I@(Q
zf}Mofm39i&qxIUw4^kMgOX1f@EQ7mt87OfH0CF%m<lsVM(bl1@cPLO?f#M1jSD?58
zLJlSDjr=dxh>e6(kv<7$B2>bU4g&K8K4O!@i3G_FB1w%=)PFfG=4XuQn}m33iG{UE
zFfVQv0gr9Cw;+qeopuFM8Hw$VXk-jpDjrKEnTqRiNm;DgjD<ogRTz7c*9b>0hpf96
zO-k?RJMoh+N+r|QOlrXr>%uq-=gx6^ogB}5xGa|S1-(4Q`ieOrRjRL4x(G^{l$??_
zhdv+GC+)h^9j4d!_t!<MwpFEWX-JM`TG)C2>^t7B5aKO<#>>9-I>!`q{slg7fDdTc
zK-5!#sw#Tdv6Q?|O^>ErJd|WC?_0TcS=-k)a=)m0$+$nid%<^UWmCs0<S~AxOwaM0
z{~48jy0+u+teY|Bk?VzrSCl`vSiNCTF*v<$^V;E?JL@aT556WyWvP|_4_hs#HC?xN
zd^xn_k8n%!;hfmcs7uYG<m~re$+o<sT6y%e$~@J|@Eq?h<8lH%FHXFi^N$;~x`3V*
zyyGC+nvHeaayEV&dbexj9&P;~EN|a;&r-PW;P4tcH|X&&MIJ69CUnT+#?0X(x<7p3
z^TM9^36I|BJJfKhw4qVk`S9;#>ZnEa{>-*u>7E29=XWz6_eO4Ei08ZkH}2oqbyxpM
z|32mUbEkawdq1f^R8g9Et77r)hqw2?Da+Etud@Dppg(4svw|rp;rveyAd9cW8(S3Q
zxv?@evuU4e&D(L)wWEnWC7W8WwSJtWH@MHK{_40g^l+xevhG2`Gct?Zo^g9o6Qo`3
zs{38D)K_bBKioV2Mq_wl!q(n7caNN1HSb>RZ^KuHNMF%9`BLGSJS#o+>G9X})|{*v
zs5wvX9GGinbQjs`&|K&DBO_mh&-6(7YlBA%b|3F9)~_xQ)QZH(<I1+`gdByMA|%z9
zg))W8Y|xlA+BCf;U7v2u(3oFl^(?C^*0LPO6zLd~v6#`O>*jC<t=??ZF*?r7=(Sq2
zi4ne0R8bi^lj+1l<=`U0n5Uj5b8ZOmT$z*zgUuygB=tn43<wzrEAko=gJQZ-bS<L$
zOmqXHyDCKIJLTeK%#5BO6y_VFU6{6qM7Kj|%io+z0!2-pkOZ12h<-ALW*HaaCyCXf
ZtYdzpK*(NNI@xB4m!X!0euB98e*q#)ol*b*

delta 1346
zcmY+De@qi+7{{OMk83NSIKaUe^MJ&<jn*sN3RY#dBFNeTr4}=XvMU^2@!Gmx1$9HD
zip~WUcYtippTTZHvlv;H8Rw5b+%(&wW`T?-L^pL&$9@RgaGN1}u0W>OKJVxIKJWW}
zpX<}Str6nVQKF5h{8SE*xe4Hq0w51iJ3~RQ-y@)e0nFhSGF?s>M6p=XMXurk<g-eE
z<93`|_<$SdrRVpY;4dyT?~eOfJTv}nq+rm{v8U~wCK;~f0|A8~gGOWv@*MIKGM*qH
zg^+<0S&2M={0Mmic^8=}BOpsAgBqj{*^j)9oGm9nFPEXq@2?OrhB1zzw4$38%Yhtj
zS>^B>1~l0e5XRVHlNOZFVN=4fs3zfpjf87at%7vB3Un9@#sUnBU5(~yG*_d!8qL*E
zY}Y^?{^W^A4(*TWeNnA}BX$Cp3H(Tp3VLVBek9T;RMRGNM$BhEHmAiTMX4#lDm4mU
z7<XN;VsC+r>Yz=H)I{}6dkiubLyJ30<y!o6bV@OzSS=<hGc-jea(S`2WZ6=&LYdQ~
zsw5OKGiFhgHn8!{`tF9R*AL&hAJg1%R8#PMfoW*pz3$Wb<e|NbtCB21)?fX`GLEg`
zf=dE^AtdOlg~{U{D*wujxyq6X^U7|ebu{q?-*>j3?Sl{dxbgWbFKAks<j0Sfu|d|y
zg}9(Tt6ES`yus!OW!)0L)zR`dF(x`ZXKx42C*Ln$do8R<<Q~0zuQFk@O<X`~Uzpl{
zk21~Z<5N5LE<9(a*T+-&3maSO|9q};b);(>_sK7G$%wd%Ov#zt-fW^y{MzH$&$OQ&
z-eej&`Pa#VotMdZWmTSb)^)dM<<{;ls$?C{vu>UfcazCeWttnQh%0HPll{WAWN*yZ
zw%kJ-|2?%zMzvg=-jMiJmv#Ghbt0vDx@oG+B`Ra+;0hS2=y|Xy?T5ncs?;Ifnv(ff
zYs++5qrCZQ!GRQK1MBf{!HGtiLwJqc>p~p%a?&HLq2};SKRwhve2w|zimQvJx7{4Q
z{&wtx&()TteCm<Uv|rA8!lTg3(^4=0cd%3D0n*bS|4$uL{;qbwZU6Y{syJc&_D6>^
z;^}jj$8YwE!>XcJr%!Y~yes@(_=9kST68QU?fS-@jY^eaaOd3pBfg5UYiCcTE^6w$
z^9}#L?fH}yUccTI^74Y-EC`&>&2K37*9Nfg6HZ%{Vw*a>qIs~M3ku$VAF`o3;9KkE
zxu9+;m7_Np^t6uAXB!wgM{j(Q<qWm8wK)t^!x-o18jaZuXUxN7uEEG~w2{tb-Nrn(
zffm)8%?ielNB6dBZWYFn&J99{^C^k*V2u?6W$DB-qGMiyc&6;FIVLITk_J{91ZmhI
z4M(K=kv?5R0zraU?r@679WOl<i%T|(G&rR@Wr~RthaHXDi30lN-1^WA>9FK#m+ILp
gF>+8SX2zv~ej12v<!cfxR1%42t(GV(2}$VlA6;{OY5)KL

diff --git a/code/src/Shared/Win.Utils/obj/Release/netcoreapp5/ref/Win.Utils.dll b/code/src/Shared/Win.Utils/obj/Release/netcoreapp5/ref/Win.Utils.dll
index ff1327a0a13942982f7d337cdeb51f65c85c2da1..5d90d84074552c5e8289ce3e842eaa5d02bc813c 100644
GIT binary patch
delta 153
zcmexw-e57IOpKRHg#iKrTp1XA7+DyuoqK+8V|NL&z;FMpO-)BM-FlXYxj8(k{<~R_
z<sIYZzpUv@5{d#0T|ixq49pDj49tuI3}Rp&>*N{^SwS;~YKBUnh&Dql0~^CGrnb$i
iIF@o@7&kdyxQ0)MgH2Q@kVz<%iJ47^WAjU4F%AGW{VJyb

delta 152
zcmZp$_-{U;Oq5H70RjSC85n#RSs4BleCgWQQ^G8;>Du!bx2EwsY|vc0f~`Mw+h#$Q
z_l%qWv!*dgFbXh;0d+YtFf+(AFe?f$bb)y+lWRF-1=$#OF;y~{F;p|u0##`<G;Uta
iv6KtLxXB5^HGCY*Y(fScY@$MeOhTbdn_mfwaR2~Vc`IlD

diff --git a/code/src/Shared/Win.Utils/obj/Win.Utils.csproj.nuget.dgspec.json b/code/src/Shared/Win.Utils/obj/Win.Utils.csproj.nuget.dgspec.json
index a55ef809..26c23f14 100644
--- a/code/src/Shared/Win.Utils/obj/Win.Utils.csproj.nuget.dgspec.json
+++ b/code/src/Shared/Win.Utils/obj/Win.Utils.csproj.nuget.dgspec.json
@@ -1,23 +1,24 @@
 {
   "format": 1,
   "restore": {
-    "D:\\长春项目\\北京北汽结算项目\\NewBJSettleAccount\\BeiJinSettleAccount\\code\\src\\Shared\\Win.Utils\\Win.Utils.csproj": {}
+    "D:\\CODE\\BeiJinSettleAccount\\code\\src\\Shared\\Win.Utils\\Win.Utils.csproj": {}
   },
   "projects": {
-    "D:\\长春项目\\北京北汽结算项目\\NewBJSettleAccount\\BeiJinSettleAccount\\code\\src\\Shared\\Win.Utils\\Win.Utils.csproj": {
+    "D:\\CODE\\BeiJinSettleAccount\\code\\src\\Shared\\Win.Utils\\Win.Utils.csproj": {
       "version": "2.0.0",
       "restore": {
-        "projectUniqueName": "D:\\长春项目\\北京北汽结算项目\\NewBJSettleAccount\\BeiJinSettleAccount\\code\\src\\Shared\\Win.Utils\\Win.Utils.csproj",
+        "projectUniqueName": "D:\\CODE\\BeiJinSettleAccount\\code\\src\\Shared\\Win.Utils\\Win.Utils.csproj",
         "projectName": "Win.Utils",
-        "projectPath": "D:\\长春项目\\北京北汽结算项目\\NewBJSettleAccount\\BeiJinSettleAccount\\code\\src\\Shared\\Win.Utils\\Win.Utils.csproj",
-        "packagesPath": "C:\\Users\\44673\\.nuget\\packages\\",
-        "outputPath": "D:\\长春项目\\北京北汽结算项目\\NewBJSettleAccount\\BeiJinSettleAccount\\code\\src\\Shared\\Win.Utils\\obj\\",
+        "projectPath": "D:\\CODE\\BeiJinSettleAccount\\code\\src\\Shared\\Win.Utils\\Win.Utils.csproj",
+        "packagesPath": "C:\\Users\\AIJXZ\\.nuget\\packages\\",
+        "outputPath": "D:\\CODE\\BeiJinSettleAccount\\code\\src\\Shared\\Win.Utils\\obj\\",
         "projectStyle": "PackageReference",
         "fallbackFolders": [
-          "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder"
+          "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages"
         ],
         "configFilePaths": [
-          "C:\\Users\\44673\\AppData\\Roaming\\NuGet\\NuGet.Config",
+          "C:\\Users\\AIJXZ\\AppData\\Roaming\\NuGet\\NuGet.Config",
+          "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
           "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config"
         ],
         "originalTargetFrameworks": [
@@ -25,8 +26,6 @@
         ],
         "sources": {
           "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
-          "D:\\上海富维东阳工作\\设备管理\\localhost-nuget": {},
-          "D:\\长春项目\\北京北汽结算项目\\源代码\\nuget": {},
           "https://api.nuget.org/v3/index.json": {}
         },
         "frameworks": {
@@ -84,7 +83,7 @@
               "privateAssets": "all"
             }
           },
-          "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.302\\RuntimeIdentifierGraph.json"
+          "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.304\\RuntimeIdentifierGraph.json"
         }
       }
     }
diff --git a/code/src/Shared/Win.Utils/obj/Win.Utils.csproj.nuget.g.props b/code/src/Shared/Win.Utils/obj/Win.Utils.csproj.nuget.g.props
index 1ab7de77..50301f3c 100644
--- a/code/src/Shared/Win.Utils/obj/Win.Utils.csproj.nuget.g.props
+++ b/code/src/Shared/Win.Utils/obj/Win.Utils.csproj.nuget.g.props
@@ -5,12 +5,12 @@
     <RestoreTool Condition=" '$(RestoreTool)' == '' ">NuGet</RestoreTool>
     <ProjectAssetsFile Condition=" '$(ProjectAssetsFile)' == '' ">$(MSBuildThisFileDirectory)project.assets.json</ProjectAssetsFile>
     <NuGetPackageRoot Condition=" '$(NuGetPackageRoot)' == '' ">$(UserProfile)\.nuget\packages\</NuGetPackageRoot>
-    <NuGetPackageFolders Condition=" '$(NuGetPackageFolders)' == '' ">C:\Users\44673\.nuget\packages\;C:\Program Files\dotnet\sdk\NuGetFallbackFolder</NuGetPackageFolders>
+    <NuGetPackageFolders Condition=" '$(NuGetPackageFolders)' == '' ">C:\Users\AIJXZ\.nuget\packages\;C:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages</NuGetPackageFolders>
     <NuGetProjectStyle Condition=" '$(NuGetProjectStyle)' == '' ">PackageReference</NuGetProjectStyle>
-    <NuGetToolVersion Condition=" '$(NuGetToolVersion)' == '' ">6.5.0</NuGetToolVersion>
+    <NuGetToolVersion Condition=" '$(NuGetToolVersion)' == '' ">6.6.0</NuGetToolVersion>
   </PropertyGroup>
   <ItemGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
-    <SourceRoot Include="C:\Users\44673\.nuget\packages\" />
-    <SourceRoot Include="C:\Program Files\dotnet\sdk\NuGetFallbackFolder\" />
+    <SourceRoot Include="C:\Users\AIJXZ\.nuget\packages\" />
+    <SourceRoot Include="C:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages\" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/code/src/Shared/Win.Utils/obj/project.assets.json b/code/src/Shared/Win.Utils/obj/project.assets.json
index ad3af5d4..763239fb 100644
--- a/code/src/Shared/Win.Utils/obj/project.assets.json
+++ b/code/src/Shared/Win.Utils/obj/project.assets.json
@@ -623,23 +623,24 @@
     ]
   },
   "packageFolders": {
-    "C:\\Users\\44673\\.nuget\\packages\\": {},
-    "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder": {}
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\": {},
+    "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages": {}
   },
   "project": {
     "version": "2.0.0",
     "restore": {
-      "projectUniqueName": "D:\\长春项目\\北京北汽结算项目\\NewBJSettleAccount\\BeiJinSettleAccount\\code\\src\\Shared\\Win.Utils\\Win.Utils.csproj",
+      "projectUniqueName": "D:\\CODE\\BeiJinSettleAccount\\code\\src\\Shared\\Win.Utils\\Win.Utils.csproj",
       "projectName": "Win.Utils",
-      "projectPath": "D:\\长春项目\\北京北汽结算项目\\NewBJSettleAccount\\BeiJinSettleAccount\\code\\src\\Shared\\Win.Utils\\Win.Utils.csproj",
-      "packagesPath": "C:\\Users\\44673\\.nuget\\packages\\",
-      "outputPath": "D:\\长春项目\\北京北汽结算项目\\NewBJSettleAccount\\BeiJinSettleAccount\\code\\src\\Shared\\Win.Utils\\obj\\",
+      "projectPath": "D:\\CODE\\BeiJinSettleAccount\\code\\src\\Shared\\Win.Utils\\Win.Utils.csproj",
+      "packagesPath": "C:\\Users\\AIJXZ\\.nuget\\packages\\",
+      "outputPath": "D:\\CODE\\BeiJinSettleAccount\\code\\src\\Shared\\Win.Utils\\obj\\",
       "projectStyle": "PackageReference",
       "fallbackFolders": [
-        "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder"
+        "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages"
       ],
       "configFilePaths": [
-        "C:\\Users\\44673\\AppData\\Roaming\\NuGet\\NuGet.Config",
+        "C:\\Users\\AIJXZ\\AppData\\Roaming\\NuGet\\NuGet.Config",
+        "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
         "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config"
       ],
       "originalTargetFrameworks": [
@@ -647,8 +648,6 @@
       ],
       "sources": {
         "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
-        "D:\\上海富维东阳工作\\设备管理\\localhost-nuget": {},
-        "D:\\长春项目\\北京北汽结算项目\\源代码\\nuget": {},
         "https://api.nuget.org/v3/index.json": {}
       },
       "frameworks": {
@@ -706,7 +705,7 @@
             "privateAssets": "all"
           }
         },
-        "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.302\\RuntimeIdentifierGraph.json"
+        "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.304\\RuntimeIdentifierGraph.json"
       }
     }
   }
diff --git a/code/src/Shared/Win.Utils/obj/project.nuget.cache b/code/src/Shared/Win.Utils/obj/project.nuget.cache
index 23e87341..2cad829f 100644
--- a/code/src/Shared/Win.Utils/obj/project.nuget.cache
+++ b/code/src/Shared/Win.Utils/obj/project.nuget.cache
@@ -1,26 +1,26 @@
 {
   "version": 2,
-  "dgSpecHash": "lH+UtLLYZsY4lIF68in5MTT49KPy8Oa5KekBT5PwCKJdrUFeLsA+iMRum9xirPC7IUUSXodS0M/nKmvT3Im73w==",
+  "dgSpecHash": "/s0O/G1fvmGIgzlfjHQ1mMCF4/OyM97pp2HaI56WAq6nZmbhnGfrZpOCy9XfMZWFSuewPbda3y0gRzHPdJF3rw==",
   "success": true,
-  "projectFilePath": "D:\\长春项目\\北京北汽结算项目\\NewBJSettleAccount\\BeiJinSettleAccount\\code\\src\\Shared\\Win.Utils\\Win.Utils.csproj",
+  "projectFilePath": "D:\\CODE\\BeiJinSettleAccount\\code\\src\\Shared\\Win.Utils\\Win.Utils.csproj",
   "expectedPackageFiles": [
-    "C:\\Users\\44673\\.nuget\\packages\\microsoft.netcore.platforms\\2.0.0\\microsoft.netcore.platforms.2.0.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\microsoft.openapi\\1.2.3\\microsoft.openapi.1.2.3.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\microsoft.win32.systemevents\\4.5.0\\microsoft.win32.systemevents.4.5.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\npoi\\2.5.2\\npoi.2.5.2.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\portable.bouncycastle\\1.8.6\\portable.bouncycastle.1.8.6.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\sharpziplib\\1.2.0\\sharpziplib.1.2.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\swashbuckle.aspnetcore.swagger\\5.6.3\\swashbuckle.aspnetcore.swagger.5.6.3.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\swashbuckle.aspnetcore.swaggergen\\5.6.3\\swashbuckle.aspnetcore.swaggergen.5.6.3.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\system.configuration.configurationmanager\\4.5.0\\system.configuration.configurationmanager.4.5.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\system.drawing.common\\4.5.0\\system.drawing.common.4.5.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\system.security.accesscontrol\\4.5.0\\system.security.accesscontrol.4.5.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\system.security.cryptography.protecteddata\\4.5.0\\system.security.cryptography.protecteddata.4.5.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\system.security.permissions\\4.5.0\\system.security.permissions.4.5.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\system.security.principal.windows\\4.5.0\\system.security.principal.windows.4.5.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\microsoft.windowsdesktop.app.ref\\5.0.0\\microsoft.windowsdesktop.app.ref.5.0.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\microsoft.netcore.app.ref\\5.0.0\\microsoft.netcore.app.ref.5.0.0.nupkg.sha512",
-    "C:\\Users\\44673\\.nuget\\packages\\microsoft.aspnetcore.app.ref\\5.0.0\\microsoft.aspnetcore.app.ref.5.0.0.nupkg.sha512"
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\microsoft.netcore.platforms\\2.0.0\\microsoft.netcore.platforms.2.0.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\microsoft.openapi\\1.2.3\\microsoft.openapi.1.2.3.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\microsoft.win32.systemevents\\4.5.0\\microsoft.win32.systemevents.4.5.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\npoi\\2.5.2\\npoi.2.5.2.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\portable.bouncycastle\\1.8.6\\portable.bouncycastle.1.8.6.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\sharpziplib\\1.2.0\\sharpziplib.1.2.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\swashbuckle.aspnetcore.swagger\\5.6.3\\swashbuckle.aspnetcore.swagger.5.6.3.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\swashbuckle.aspnetcore.swaggergen\\5.6.3\\swashbuckle.aspnetcore.swaggergen.5.6.3.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\system.configuration.configurationmanager\\4.5.0\\system.configuration.configurationmanager.4.5.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\system.drawing.common\\4.5.0\\system.drawing.common.4.5.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\system.security.accesscontrol\\4.5.0\\system.security.accesscontrol.4.5.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\system.security.cryptography.protecteddata\\4.5.0\\system.security.cryptography.protecteddata.4.5.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\system.security.permissions\\4.5.0\\system.security.permissions.4.5.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\system.security.principal.windows\\4.5.0\\system.security.principal.windows.4.5.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\microsoft.windowsdesktop.app.ref\\5.0.0\\microsoft.windowsdesktop.app.ref.5.0.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\microsoft.netcore.app.ref\\5.0.0\\microsoft.netcore.app.ref.5.0.0.nupkg.sha512",
+    "C:\\Users\\AIJXZ\\.nuget\\packages\\microsoft.aspnetcore.app.ref\\5.0.0\\microsoft.aspnetcore.app.ref.5.0.0.nupkg.sha512"
   ],
   "logs": []
 }
\ No newline at end of file
diff --git a/code/src/SmartFactorySuite.sln b/code/src/SmartFactorySuite.sln
index 0841cf10..24b494e7 100644
--- a/code/src/SmartFactorySuite.sln
+++ b/code/src/SmartFactorySuite.sln
@@ -1,6 +1,6 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.29728.190
+# Visual Studio Version 17
+VisualStudioVersion = 17.6.33815.320
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Gateways", "Gateways", "{593B8559-1521-4E54-A7DF-7F58E5F6EA86}"
 EndProject
@@ -64,6 +64,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BaseService.HttpApi", "Modu
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BaseService.HttpApi.Client", "Modules\BaseService\BaseService.HttpApi.Client\BaseService.HttpApi.Client.csproj", "{1913786D-E64D-48E4-98A7-42C3BCA9C282}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AuthServer.Host", "AuthServer\AuthServer.Host\AuthServer.Host.csproj", "{4C7A0E8B-2DBC-4E76-8F68-0DD200CE88E7}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -154,6 +156,10 @@ Global
 		{1913786D-E64D-48E4-98A7-42C3BCA9C282}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{1913786D-E64D-48E4-98A7-42C3BCA9C282}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{1913786D-E64D-48E4-98A7-42C3BCA9C282}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4C7A0E8B-2DBC-4E76-8F68-0DD200CE88E7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4C7A0E8B-2DBC-4E76-8F68-0DD200CE88E7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4C7A0E8B-2DBC-4E76-8F68-0DD200CE88E7}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4C7A0E8B-2DBC-4E76-8F68-0DD200CE88E7}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -184,6 +190,7 @@ Global
 		{56B50817-0F64-4CD8-814D-CA3827F40FFB} = {B55F5923-5FDE-4BEB-9E81-BE270D5909A1}
 		{65DEB438-557B-4268-8EC6-25A9A2ED6FE1} = {B55F5923-5FDE-4BEB-9E81-BE270D5909A1}
 		{1913786D-E64D-48E4-98A7-42C3BCA9C282} = {B55F5923-5FDE-4BEB-9E81-BE270D5909A1}
+		{4C7A0E8B-2DBC-4E76-8F68-0DD200CE88E7} = {BD0465F1-50F8-4913-8B01-7C2E44CEED27}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {CAAF5A4A-B83D-4CCD-BF50-58035AD87837}

From a0c180b2bbee0e34734772e87b3277acedde938c Mon Sep 17 00:00:00 2001
From: wanggang <76527413@qq.com>
Date: Thu, 6 Jul 2023 17:48:01 +0800
Subject: [PATCH 7/9] update

---
 .../Controllers/GenericController.cs          |   9 +-
 .../ClosedXmlExportImportService.cs           | 126 ++++++++++++------
 .../ExportImport/IExportImportService.cs      |   2 +-
 .../Monitor/MonitorHostedService.cs           |   2 +-
 .../src/WTA/wwwroot/components/list/index.js  |  60 ++++++---
 docs/demo/src/WTA/wwwroot/request/index.js    |  15 ++-
 docs/demo/src/WTA/wwwroot/signalr/index.js    |  10 +-
 7 files changed, 150 insertions(+), 74 deletions(-)

diff --git a/docs/demo/src/WTA.Shared/Controllers/GenericController.cs b/docs/demo/src/WTA.Shared/Controllers/GenericController.cs
index 751810b6..cea4d81c 100644
--- a/docs/demo/src/WTA.Shared/Controllers/GenericController.cs
+++ b/docs/demo/src/WTA.Shared/Controllers/GenericController.cs
@@ -197,10 +197,17 @@ public class GenericController<TEntity, TModel, TListModel, TSearchModel, TImpor
 
     [Consumes("multipart/form-data")]
     [HttpPost, Multiple, Order(-2), HtmlClass("el-button--primary")]
-    public virtual IActionResult Import([Required] IFormFile importexcelfile, bool partial = false, bool replace = false)
+    public virtual IActionResult Import([Required] IFormFile file, bool partial = false, bool replace = false)
     {
         try
         {
+            var exportImportService = this.HttpContext.RequestServices.GetRequiredService<IExportImportService>();
+            var list = exportImportService.Import<TImportModel>(file.OpenReadStream());
+            list.ForEach(item =>
+            {
+                this.Repository.Insert(item.ToObject<TEntity>());
+            });
+            this.Repository.SaveChanges();
             return NoContent();
         }
         catch (Exception ex)
diff --git a/docs/demo/src/WTA.Shared/ExportImport/ClosedXmlExportImportService.cs b/docs/demo/src/WTA.Shared/ExportImport/ClosedXmlExportImportService.cs
index c8924169..4f735756 100644
--- a/docs/demo/src/WTA.Shared/ExportImport/ClosedXmlExportImportService.cs
+++ b/docs/demo/src/WTA.Shared/ExportImport/ClosedXmlExportImportService.cs
@@ -37,7 +37,7 @@ public class ClosedXmlExportImportService : IExportImportService
             var ws = workbook.Worksheets.Add(name);
             //
             var type = typeof(TExportModel);
-            var propertyList = GetPropertiesForImportModel(type);
+            var propertyList = GetProperties(type);
             var rowIndex = 1;
             for (var i = 0; i < propertyList.Length; i++)
             {
@@ -53,8 +53,9 @@ public class ClosedXmlExportImportService : IExportImportService
                 {
                     var property = propertyList[i];
                     var columnIndex = i + 1;
+                    var value = property.GetValue(model)?.ToString();
                     var cell = ws.Cell(rowIndex, columnIndex);
-                    cell.Value = property.GetValue(model)?.ToString();
+                    SetCell(model, cell, property);
                 }
             });
             //
@@ -81,7 +82,7 @@ public class ClosedXmlExportImportService : IExportImportService
         var name = type.GetDisplayName();
         var fileName = $"{name}_导入模板.xlsx";
         var ws = workbook.Worksheets.Add(name);
-        var properties = GetPropertiesForImportModel(type);
+        var properties = GetProperties(type);
         for (var i = 0; i < properties.Length; i++)
         {
             var property = properties[i];
@@ -99,15 +100,15 @@ public class ClosedXmlExportImportService : IExportImportService
         return result;
     }
 
-    public IList<TImportModel> Import<TImportModel>(byte[] bytes)
+    public IList<TImportModel> Import<TImportModel>(Stream stream)
     {
         try
         {
             var result = new List<TImportModel>();
             //
-            using var workbook = new XLWorkbook(new MemoryStream(bytes));
+            using var workbook = new XLWorkbook(stream);
             var type = typeof(TImportModel);
-            var properties = GetPropertiesForImportModel(type).ToDictionary(o => o.GetCustomAttribute<ImporterHeaderAttribute>()?.Name ?? o.GetCustomAttribute<DisplayAttribute>()?.Name ?? o.Name);
+            var properties = GetProperties(type).ToDictionary(o => o.GetCustomAttribute<ImporterHeaderAttribute>()?.Name ?? o.GetDisplayName() ?? o.Name);
             var name = type.GetCustomAttribute<DisplayAttribute>()?.Name ?? typeof(TImportModel).Name;
             var ws = workbook.Worksheets.FirstOrDefault();
             if (ws != null)
@@ -121,40 +122,12 @@ public class ClosedXmlExportImportService : IExportImportService
                     {
                         var columnIndex = j + 1;
                         var cell = row.Cell(columnIndex);
-                        var value = cell.Value;
-                        if (value.ToString() != "")
+                        var headerName = ws.Cell(1, columnIndex).Value.ToString().Trim();
+
+                        var value = cell.Value.ToString().Trim();
+                        if (!string.IsNullOrEmpty(value) && properties.TryGetValue(headerName, out var property))
                         {
-                            var headerName = ws.Cell(1, columnIndex).Value.ToString().Trim();
-                            properties.TryGetValue(headerName, out var property);
-                            if (property != null)
-                            {
-                                var propertyType = property.PropertyType;
-                                if (propertyType.IsEnum)
-                                {
-                                    var enumValue = Enum.GetNames(propertyType)
-                                         .Select(o => new KeyValuePair<string, Enum>(o, (Enum)Enum.Parse(propertyType, o)))
-                                         .Where(o => o.Value.GetDisplayName() == value.ToString())
-                                         .Select(o => o.Value)
-                                         .FirstOrDefault();
-                                    property.SetValue(model, enumValue);
-                                }
-                                else if (propertyType.Name == nameof(Boolean))
-                                {
-                                    if (value.GetText() == "是")
-                                    {
-                                        property.SetValue(model, true);
-                                    }
-                                    else
-                                    {
-                                        property.SetValue(model, false);
-                                    }
-                                }
-                                else
-                                {
-                                    var propertyValue = Convert.ChangeType(value.ToString(), propertyType, CultureInfo.InvariantCulture);
-                                    property.SetValue(model, propertyValue);
-                                }
-                            }
+                            SetProperty(model, property, value);
                         }
                     }
                     result.Add(model);
@@ -169,10 +142,79 @@ public class ClosedXmlExportImportService : IExportImportService
         }
     }
 
-    private static PropertyInfo[] GetPropertiesForImportModel(Type type)
+    private static PropertyInfo[] GetProperties(Type type)
     {
-        return type.GetProperties(BindingFlags.Instance | BindingFlags.Public | BindingFlags.GetProperty)
-             .Where(o => o.GetCustomAttribute<ImporterHeaderAttribute>(true) == null || !o.GetCustomAttribute<ImporterHeaderAttribute>()!.IsIgnore)
+        var properties = type.GetProperties(BindingFlags.Instance | BindingFlags.Public | BindingFlags.GetProperty);
+        return properties
+             .Where(o => o.PropertyType == typeof(string) || o.PropertyType.IsNullableType() || o.PropertyType.IsValueType)
+             .Where(o => !o.GetCustomAttributes<ScaffoldColumnAttribute>(true).Any())
+             .Where(o => !o.GetCustomAttributes<ImporterHeaderAttribute>(true).Any() || !o.GetCustomAttribute<ImporterHeaderAttribute>(true)!.IsIgnore)
              .ToArray();
     }
+
+    /// <summary>
+    /// 导出设置单元格
+    /// </summary>
+    private static void SetCell<TExportModel>(TExportModel? model, IXLCell cell, PropertyInfo property)
+    {
+        var propertyType = property.PropertyType.GetUnderlyingType();
+        var value = property.GetValue(model)?.ToString()?.Trim();
+        if (string.IsNullOrEmpty(value))
+        {
+            return;
+        }
+        if (propertyType == typeof(bool))
+        {
+            cell.Value = (bool)property.GetValue(model)! ? "是" : "否";
+        }
+        else if (propertyType.IsEnum)
+        {
+            cell.Value = (Enum.Parse(propertyType, value) as Enum)?.GetDisplayName();
+        }
+        else if (propertyType == typeof(DateTime))
+        {
+            cell.Value = ((DateTime)property.GetValue(model)!).ToString("yyyy-MM-dd HH:mm:ss", CultureInfo.InvariantCulture);
+        }
+        else
+        {
+            cell.Value = value;
+        }
+    }
+
+    /// <summary>
+    /// 导入设置属性值
+    /// </summary>
+    private static void SetProperty<TImopotModel>(TImopotModel model, PropertyInfo property, string value)
+    {
+        var propertyType = property.PropertyType.GetUnderlyingType();
+        if (propertyType.IsEnum)
+        {
+            var enumValue = Enum.GetNames(propertyType)
+                 .Select(o => new KeyValuePair<string, Enum>(o, (Enum)Enum.Parse(propertyType, o)))
+                 .Where(o => o.Value.GetDisplayName() == value.ToString())
+                 .Select(o => o.Value)
+                 .FirstOrDefault();
+            property.SetValue(model, enumValue);
+        }
+        else if (propertyType == typeof(bool))
+        {
+            if (value == "是")
+            {
+                property.SetValue(model, true);
+            }
+            else
+            {
+                property.SetValue(model, false);
+            }
+        }
+        else if (propertyType == typeof(Guid))
+        {
+            property.SetValue(model, Guid.Parse(value));
+        }
+        else
+        {
+            var propertyValue = Convert.ChangeType(value.ToString(), propertyType, CultureInfo.InvariantCulture);
+            property.SetValue(model, propertyValue);
+        }
+    }
 }
diff --git a/docs/demo/src/WTA.Shared/ExportImport/IExportImportService.cs b/docs/demo/src/WTA.Shared/ExportImport/IExportImportService.cs
index adb43efc..864de43d 100644
--- a/docs/demo/src/WTA.Shared/ExportImport/IExportImportService.cs
+++ b/docs/demo/src/WTA.Shared/ExportImport/IExportImportService.cs
@@ -8,5 +8,5 @@ public interface IExportImportService
 
     FileContentResult GetImportTemplate<TImportModel>();
 
-    IList<TImportModel> Import<TImportModel>(byte[] bytes);
+    IList<TImportModel> Import<TImportModel>(Stream stream);
 }
diff --git a/docs/demo/src/WTA.Shared/Monitor/MonitorHostedService.cs b/docs/demo/src/WTA.Shared/Monitor/MonitorHostedService.cs
index 3dc51c33..f138bc5c 100644
--- a/docs/demo/src/WTA.Shared/Monitor/MonitorHostedService.cs
+++ b/docs/demo/src/WTA.Shared/Monitor/MonitorHostedService.cs
@@ -34,7 +34,7 @@ public class MonitorHostedService : IHostedService
                 {
                     Debug.WriteLine(ex.ToString());
                 }
-                await Task.Delay(1000 * 1).ConfigureAwait(false);
+                await Task.Delay(5000 * 1).ConfigureAwait(false);
             }
         }, cancellationToken);
         return Task.CompletedTask;
diff --git a/docs/demo/src/WTA/wwwroot/components/list/index.js b/docs/demo/src/WTA/wwwroot/components/list/index.js
index 441f14fc..9da96e1a 100644
--- a/docs/demo/src/WTA/wwwroot/components/list/index.js
+++ b/docs/demo/src/WTA/wwwroot/components/list/index.js
@@ -194,7 +194,7 @@ export default {
       v-model="dialogVisible"
       align-center
       destroy-on-close
-      style="width:auto;min-width:300px;max-width:700px;"
+      style="width:auto;min-width:500px;max-width:1000px;"
     >
       <template #header> <span class="el-dialog__title"> {{editFormTitle}} </span> </template>
       <el-row v-loading="editFormloading">
@@ -214,7 +214,7 @@ export default {
               />
             </template>
             <template v-else-if="editFormMode==='export'">
-              <el-form :model="exportModel" style="height:100%;">
+              <el-form :model="exportModel">
                 <el-form-item :label="$t('全部')">
                   <el-switch v-model="exportModel.includeAll" />
                 </el-form-item>
@@ -224,9 +224,9 @@ export default {
               </el-form>
             </template>
             <template v-else-if="editFormMode==='import'">
-              <el-form :model="importModel" style="height:100%;">
+              <el-form :model="importModel" inline>
                 <el-form-item :label="$t('部分成功')">
-                  <el-switch v-model="importModel.partal" />
+                  <el-switch v-model="importModel.partial" />
                 </el-form-item>
                 <el-form-item :label="$t('全部替换')">
                   <el-switch v-model="importModel.replace" />
@@ -235,9 +235,17 @@ export default {
                   <el-link type="primary" @click="getImportTemplate">{{$t('下载')}}</el-link>
                 </el-form-item>
                 <el-form-item :label="$t('文件')">
-                  <el-upload drag v-model="importModel.file" :auto-upload="false">
+                  <el-upload
+                    ref="uploadRef"
+                    drag
+                    accept=".xlsx"
+                    :disabled="fileList.length===1"
+                    :limit="1"
+                    :auto-upload="false"
+                    :on-change="handleChange"
+                  >
                     <el-icon class="el-icon--upload"><ep-upload-filled /></el-icon>
-                    <div class="el-upload__text">{{$t('拖放文件到此处或')}} <em>{{$t('点击上传')}}</em></div>
+                    <div class="el-upload__text">{{$t('拖放文件或')}} <em>{{$t('点击上传')}}</em></div>
                   </el-upload>
                 </el-form-item>
               </el-form>
@@ -320,6 +328,7 @@ export default {
       children: "children",
     });
     const tableRef = ref(null);
+    const uploadRef = ref(null);
     const columns = ref([]);
     const filterDrawer = ref(false);
     const subDrawer = ref(false);
@@ -353,9 +362,8 @@ export default {
     const importModel = reactive({
       partial: true,
       replace: false,
-      template: null,
-      file: null,
     });
+    const fileList = ref([]);
     const getSortModel = (model) => {
       model.orderBy
         .split(",")
@@ -466,6 +474,7 @@ export default {
         //import
         const url = `${baseUrl}/${item.path}`;
         editFormTitle.value = `${t(item.path)}${schema.value?.title}`;
+        fileList.value = [];
         dialogVisible.value = true;
       } else if (item === "filter") {
         editFormTitle.value = t("自定义查询");
@@ -504,14 +513,20 @@ export default {
         delete postData.query["id"];
         const url = `${baseUrl}/${editFormMode.value}?${qs.stringify(exportModel)}`;
         const response = await post(url, postData);
-        const downloadUrl = window.URL.createObjectURL(response.data);
-        const filename = response.filename;
-        let link = document.createElement("a");
-        link.href = downloadUrl;
-        link.download = filename;
-        link.click();
-        window.URL.revokeObjectURL(downloadUrl);
+        download(response);
         dialogVisible.value = false;
+      } else if (editFormMode.value === "import") {
+        editFormloading.value = true;
+        const url = `${baseUrl}/${editFormMode.value}`;
+        const formData = new FormData();
+        formData.append("partial", importModel.partial);
+        formData.append("replace", importModel.replace);
+        formData.append("file", fileList.value[0]?.raw);
+        console.log(uploadRef.value);
+        const response = await post(url, formData);
+        editFormloading.value = false;
+        dialogVisible.value = false;
+        await load(indexUrl);
       } else if (editFormMode.value === "filter") {
         await load(indexUrl);
         dialogVisible.value = false;
@@ -547,9 +562,7 @@ export default {
         logic: "and",
       });
     };
-    const getImportTemplate = async () => {
-      const url = `${baseUrl}/${editFormMode.value}`;
-      const response = await get(url);
+    const download = (response) => {
       const downloadUrl = window.URL.createObjectURL(response.data);
       const filename = response.filename;
       let link = document.createElement("a");
@@ -558,6 +571,14 @@ export default {
       link.click();
       window.URL.revokeObjectURL(downloadUrl);
     };
+    const getImportTemplate = async () => {
+      const url = `${baseUrl}/${editFormMode.value}`;
+      const response = await get(url);
+      download(response);
+    };
+    const handleChange = (uploadFile, uploadFiles) => {
+      fileList.value = uploadFiles;
+    };
     onMounted(async () => {
       pushQueryList();
       const vm = (await get(indexUrl)).data;
@@ -575,6 +596,7 @@ export default {
     return {
       treeProps,
       tableRef,
+      uploadRef,
       tableLoading,
       columns,
       showColumn,
@@ -609,6 +631,8 @@ export default {
       showList,
       subListQuery,
       pushQueryList,
+      fileList,
+      handleChange,
     };
   },
 };
diff --git a/docs/demo/src/WTA/wwwroot/request/index.js b/docs/demo/src/WTA/wwwroot/request/index.js
index 7ebaee4f..09027d7f 100644
--- a/docs/demo/src/WTA/wwwroot/request/index.js
+++ b/docs/demo/src/WTA/wwwroot/request/index.js
@@ -78,20 +78,23 @@ const get = async (url, data, options, withoutToken = false, withoutCulture = fa
 
 const post = async (url, data, options, withoutToken = false, withoutCulture = false) => {
   url = getUrl(url, withoutCulture);
-  const defaultOptions = {
+  let defaultOptions = {
     method: "POST",
-    headers: {
-      "Content-Type": "application/json",
-    },
+    headers: {},
   };
+  if (!(data instanceof FormData)) {
+    defaultOptions.headers["Content-Type"] = "application/json";
+  }
   if (options) {
     Object.assign(defaultOptions, options);
   }
   if (data && !defaultOptions.body) {
-    if (defaultOptions.headers["Content-Type"] === "application/x-www-form-urlencoded") {
+    if (defaultOptions.headers["Content-Type"]?.startsWith("application/x-www-form-urlencoded")) {
       defaultOptions.body = qs.stringify(data);
-    } else {
+    } else if (defaultOptions.headers["Content-Type"]?.startsWith("application/json")) {
       defaultOptions.body = JSON.stringify(data);
+    } else {
+      defaultOptions.body = data;
     }
   }
   if (!withoutToken) {
diff --git a/docs/demo/src/WTA/wwwroot/signalr/index.js b/docs/demo/src/WTA/wwwroot/signalr/index.js
index 7259ac04..12fb4963 100644
--- a/docs/demo/src/WTA/wwwroot/signalr/index.js
+++ b/docs/demo/src/WTA/wwwroot/signalr/index.js
@@ -7,11 +7,10 @@ let connectionId = null;
 const connection = new signalR.HubConnectionBuilder()
   .withUrl("./api/hub", {
     accessTokenFactory: () => {
-      const appStore = useAppStore();
-      return appStore.token;
+      return useAppStore().token;
     },
   })
-  .withAutomaticReconnect()
+  //.withAutomaticReconnect()
   .build();
 const connect = async () => {
   if (await isLogin()) {
@@ -21,9 +20,10 @@ const connect = async () => {
         .then(function () {
           console.log("signalr connected");
         })
-        .catch(function (error) {
+        .catch(async function (error) {
           console.log(error);
-          //setTimeout(connect, 5000);
+          await isLogin();
+          setTimeout(connect, 5000);
         });
     }
   }

From 07377461482b8f1894151b975c9d18a044c4c59e Mon Sep 17 00:00:00 2001
From: wanggang <76527413@qq.com>
Date: Thu, 6 Jul 2023 18:12:14 +0800
Subject: [PATCH 8/9] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=9B=BE=E6=A0=87?=
 =?UTF-8?q?=E7=BC=93=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/WTA/wwwroot/components/icon/index.js   | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/docs/demo/src/WTA/wwwroot/components/icon/index.js b/docs/demo/src/WTA/wwwroot/components/icon/index.js
index 35757c36..28253593 100644
--- a/docs/demo/src/WTA/wwwroot/components/icon/index.js
+++ b/docs/demo/src/WTA/wwwroot/components/icon/index.js
@@ -1,5 +1,6 @@
 import html from "html";
 import { onMounted, ref } from "vue";
+import { useAppStore } from "../../store/index.js";
 
 export default {
   template: html`<template v-if="name.indexOf('ep-')===0">
@@ -19,10 +20,19 @@ export default {
       if (!props.name.startsWith("ep-")) {
         try {
           const url = `./assets/icons/${props.name}.svg`;
-          const response = await fetch(url);
-          if (response.ok && response.status === 200) {
-            svg.value = await response.text();
-          }
+          navigator.locks.request(url, async () => {
+            const appStore = useAppStore();
+            if (appStore.cache.has(url)) {
+              svg.value = appStore.cache.get(url);
+            } else {
+              const response = await fetch(url);
+              if (response.ok && response.status === 200) {
+                svg.value = await response.text();
+                appStore.cache.set(url, svg.value);
+              }
+            }
+          });
+          c;
         } catch (error) {
           console.log(error);
           if (!svg.value) {

From 1c2946500765850db29fa7d216f5e55e2e4de888 Mon Sep 17 00:00:00 2001
From: wanggang <76527413@qq.com>
Date: Fri, 7 Jul 2023 11:16:54 +0800
Subject: [PATCH 9/9] update

---
 .../src/WTA.Shared/Attributes/OneToOneAttribute.cs | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 docs/demo/src/WTA.Shared/Attributes/OneToOneAttribute.cs

diff --git a/docs/demo/src/WTA.Shared/Attributes/OneToOneAttribute.cs b/docs/demo/src/WTA.Shared/Attributes/OneToOneAttribute.cs
new file mode 100644
index 00000000..1c9a4bf5
--- /dev/null
+++ b/docs/demo/src/WTA.Shared/Attributes/OneToOneAttribute.cs
@@ -0,0 +1,14 @@
+namespace WTA.Shared.Attributes;
+
+[AttributeUsage(AttributeTargets.Property)]
+public class OneToOneAttribute<TEntity> : Attribute, ITypeAttribute
+{
+    public Type Type { get; set; } = null!;
+    public string? Property { get; }
+
+    public OneToOneAttribute(string? property = null)
+    {
+        this.Type = typeof(TEntity);
+        this.Property = property;
+    }
+}