From ced766378c043bca6271df8cd36b9363055a0a25 Mon Sep 17 00:00:00 2001
From: mahao <hao.ma@ccwin-in.com>
Date: Wed, 23 Aug 2023 14:58:59 +0800
Subject: [PATCH 01/14] fb

---
 .../Entities/BQ/Dtos/BBAC_SA_DTO.cs                             | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/BBAC_SA_DTO.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/BBAC_SA_DTO.cs
index bff87824..0381c8bd 100644
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/BBAC_SA_DTO.cs
+++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/BBAC_SA_DTO.cs
@@ -129,7 +129,7 @@ public class BBAC_SA_DETAIL_IMPORT_DTO
     /// 结算日期
     /// </summary>
     [Display(Name = "Posting Date")]
-    [ImporterHeader(Name = "Posting Date", Format = "yyyy/MM/dd HH:mm:ss")]
+    [ImporterHeader(Name = "Posting Date")]
     public DateTime SettleDate { set; get; }
 
     /// <summary>

From f45e4b72dcb75d58c287f81b4a3b25f88a2e0f3d Mon Sep 17 00:00:00 2001
From: wanggang <76527413@qq.com>
Date: Wed, 23 Aug 2023 15:22:44 +0800
Subject: [PATCH 02/14] update

---
 .../wwwroot/models/settle/inventory-detail.js | 38 +------------------
 .../wwwroot/models/settle/inventory.js        |  8 ----
 .../wwwroot/router/business.js                |  8 ++--
 3 files changed, 5 insertions(+), 49 deletions(-)

diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/settle/inventory-detail.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/settle/inventory-detail.js
index 9ef56e43..7dd7cf09 100644
--- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/settle/inventory-detail.js
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/settle/inventory-detail.js
@@ -71,43 +71,7 @@ export default function (businessType) {
                 },
               },
             },
-            default: [
-              {
-                logic: "and",
-                column: "version",
-                action: "equal",
-                value: null,
-                readOnly: true,
-              },
-              {
-                logic: "and",
-                column: "billNum",
-                action: "equal",
-                value: null,
-                readOnly: true,
-              },
-              {
-                logic: "and",
-                column: "settleBillNum",
-                action: "equal",
-                value: null,
-                readOnly: true,
-              },
-              {
-                logic: "and",
-                column: "invGroupNum",
-                action: "equal",
-                value: null,
-                readOnly: true,
-              },
-              {
-                logic: "and",
-                column: "state",
-                action: "equal",
-                value: null,
-                readOnly: true,
-              },
-            ],
+            default: [],
           },
           skipCount: {
             hidden: true,
diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/settle/inventory.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/settle/inventory.js
index d5bc6874..c5724164 100644
--- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/settle/inventory.js
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/settle/inventory.js
@@ -20,7 +20,6 @@ const schema = {
     invGroupNum: {
       title: "发票分组号",
       type: "string",
-      link: true,
     },
     site: {
       title: "地点",
@@ -95,13 +94,6 @@ export default function (businessType) {
                 value: null,
                 readOnly: true,
               },
-              {
-                logic: "and",
-                column: "settleBillNum",
-                action: "equal",
-                value: null,
-                readOnly: true,
-              },
               {
                 logic: "and",
                 column: "invGroupNum",
diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/router/business.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/router/business.js
index e86414c7..e73239a3 100644
--- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/router/business.js
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/router/business.js
@@ -224,10 +224,10 @@ export default [
           {
             ...createRoute("settlement", "title=结算开票"),
             children: [
-              createUsableSettleList("hbpo_jit_pub_can_sa_service", "ZhiGongJianBBAC", "hbpo", "直供件-HBPO 可结算单"),
-              createUnableSettleList("hbpo_jit_pub_not_sa_service", "ZhiGongJianBBAC", "hbpo", "直供件-HBPO 不可结算明细"),
-              createCommerceCheckList("hbpo_jit_pub_ba_service", "ZhiGongJianBBAC", "hbpo", "直供件-HBPO 商务审批"),
-              createVmiOutCheckList("hbpo_jit_pub_pd_service", "ZhiGongJianBBAC", "hbpo", "直供件-HBPO 寄售库库存扣减审批"),
+              createUsableSettleList("hbpo_jit_pub_can_sa_service", "ZhiGongJianHBPO", "hbpo", "直供件-HBPO 可结算单"),
+              createUnableSettleList("hbpo_jit_pub_not_sa_service", "ZhiGongJianHBPO", "hbpo", "直供件-HBPO 不可结算明细"),
+              createCommerceCheckList("hbpo_jit_pub_ba_service", "ZhiGongJianHBPO", "hbpo", "直供件-HBPO 商务审批"),
+              createVmiOutCheckList("hbpo_jit_pub_pd_service", "ZhiGongJianHBPO", "hbpo", "直供件-HBPO 寄售库库存扣减审批"),
             ],
           },
         ],

From 73721015a72f703e0a624b8231c4b506dcc90d9d Mon Sep 17 00:00:00 2001
From: wanggang <76527413@qq.com>
Date: Wed, 23 Aug 2023 15:23:16 +0800
Subject: [PATCH 03/14] update

---
 .../host/SettleAccount.HttpApi.Host/appsettings.json            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 7c9c32ad..28279f84 100644
--- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/appsettings.json
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/appsettings.json
@@ -70,7 +70,7 @@
 
 
   "AuthServer": {
-    "Authority": "http://localhost:44378",
+    "Authority": "http://dev.ccwin-in.com:10582",
     "ClientId": "basic-web",
     "ClientSecret": "1q2w3e*"
   },

From 3e57f464b40384e549bbf58264d049b64a8aed76 Mon Sep 17 00:00:00 2001
From: mahao <hao.ma@ccwin-in.com>
Date: Wed, 23 Aug 2023 15:31:54 +0800
Subject: [PATCH 04/14] q

---
 .../Entities/BQ/Dtos/BBAC_SA_DTO.cs                            | 2 +-
 .../SettleAccountApplicationAutoMapperProfile.cs               | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/BBAC_SA_DTO.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/BBAC_SA_DTO.cs
index 0381c8bd..9c94a1fc 100644
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/BBAC_SA_DTO.cs
+++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/BBAC_SA_DTO.cs
@@ -130,7 +130,7 @@ public class BBAC_SA_DETAIL_IMPORT_DTO
     /// </summary>
     [Display(Name = "Posting Date")]
     [ImporterHeader(Name = "Posting Date")]
-    public DateTime SettleDate { set; get; }
+    public string SettleDate { set; get; }
 
     /// <summary>
     /// 结算分组号
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/SettleAccountApplicationAutoMapperProfile.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/SettleAccountApplicationAutoMapperProfile.cs
index 23e97577..db713adb 100644
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/SettleAccountApplicationAutoMapperProfile.cs
+++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/SettleAccountApplicationAutoMapperProfile.cs
@@ -1025,7 +1025,8 @@ namespace Win.Sfs.SettleAccount
                 .ForMember(x => x.SettleBillNum, y => y.MapFrom(d => d.BillNum));
             CreateMap<BBAC_SA_DETAIL, BBAC_SA_DETAIL_EXPORT_DTO>();
 
-            CreateMap<BBAC_SA_DETAIL_IMPORT_DTO, BBAC_SA_DETAIL>();
+            CreateMap<BBAC_SA_DETAIL_IMPORT_DTO, BBAC_SA_DETAIL>()
+                .ForMember(x => x.SettleDate, y => y.MapFrom(y => DateTime.ParseExact(y.SettleDate, "dd.MM.yyyy", System.Globalization.CultureInfo.CurrentCulture)));
         }
 
         /// <summary>

From 61b874053198f763b68eba2799ae0e41dbb37aac Mon Sep 17 00:00:00 2001
From: mahao <hao.ma@ccwin-in.com>
Date: Wed, 23 Aug 2023 16:07:41 +0800
Subject: [PATCH 05/14] 1

---
 .../Entities/BQ/BBAC_SA_SERVICE.cs                       | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/BBAC_SA_SERVICE.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/BBAC_SA_SERVICE.cs
index 51b74e00..64b353b1 100644
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/BBAC_SA_SERVICE.cs
+++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/BBAC_SA_SERVICE.cs
@@ -140,6 +140,15 @@ public class BBAC_SA_SERVICE : SettleAccountApplicationBase<BBAC_SA>
 
         importBBACSaDetails.ForEach(importBBACSaDetail =>
         {
+            List<string> lus = importBBACSaDetail.LU.Split("    ").ToList();
+            importBBACSaDetail.LU = lus[0].Replace(" ", "");
+            if (lus.Count > 1)
+            {
+                lus.RemoveAt(0);
+                var luAssemble = lus.Select(t => t.Replace(" ", ""));
+                importBBACSaDetail.LU += luAssemble.Aggregate("      ", (current, index) => current + index);
+            }
+
             importBBACSaDetail.Version = bbacSaImportRequestDto.Version;
             importBBACSaDetail.Site = Site;
         });

From 88554f8921f5b41f9b492c122228e41f257a2ed8 Mon Sep 17 00:00:00 2001
From: mahao <hao.ma@ccwin-in.com>
Date: Wed, 23 Aug 2023 16:17:49 +0800
Subject: [PATCH 06/14] 1

---
 .../Entities/BQ/BBAC_SA_SERVICE.cs                | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/BBAC_SA_SERVICE.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/BBAC_SA_SERVICE.cs
index 64b353b1..98f9a181 100644
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/BBAC_SA_SERVICE.cs
+++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/BBAC_SA_SERVICE.cs
@@ -340,7 +340,7 @@ public class BBAC_SA_SERVICE : SettleAccountApplicationBase<BBAC_SA>
         var bbacSa = new BBAC_SA()
         {
             BillNum = bbacSaBillNum,
-            State = "1",
+            State = "0",
             BusinessType = _businessType,
             Site = Site
         };
@@ -408,8 +408,8 @@ public class BBAC_SA_SERVICE : SettleAccountApplicationBase<BBAC_SA>
         #endregion
 
         #region 添加入库
-        await _bbacSaRepository.InsertAsync(bbacSa);
-        await _bbacSaDetailRepository.DbContext.BulkInsertAsync(bbacSaDetails);
+        await _bbacSaRepository.InsertAsync(bbacSa).ConfigureAwait(false);
+        await _bbacSaDetailRepository.DbContext.BulkInsertAsync(bbacSaDetails).ConfigureAwait(false);
         if (bbacCanSaDetails.Count > 0)
         {
             bbacCanSaDetails.ForEach(bbacCanSaDetail =>
@@ -418,8 +418,8 @@ public class BBAC_SA_SERVICE : SettleAccountApplicationBase<BBAC_SA>
                 bbacCanSaDetail.BusinessType = _businessType;
             });
 
-            await _bbacCanSaRepository.InsertAsync(bbacCanSa);
-            await _bbacCanSaDetailRepository.DbContext.BulkInsertAsync(bbacCanSaDetails);
+            await _bbacCanSaRepository.InsertAsync(bbacCanSa).ConfigureAwait(false);
+            await _bbacCanSaDetailRepository.DbContext.BulkInsertAsync(bbacCanSaDetails).ConfigureAwait(false);
         }
         if (bbacNotSaDetails.Count > 0)
         {
@@ -428,7 +428,7 @@ public class BBAC_SA_SERVICE : SettleAccountApplicationBase<BBAC_SA>
                 bbacNotSaDetail.BusinessType = _businessType;
             });
 
-            await _bbacNotSaDetailRepository.InsertManyAsync(bbacNotSaDetails);
+            await _bbacNotSaDetailRepository.DbContext.BulkInsertAsync(bbacNotSaDetails).ConfigureAwait(false);
         }
         if (materialRelationships.Count > 0)
         {
@@ -452,8 +452,7 @@ public class BBAC_SA_SERVICE : SettleAccountApplicationBase<BBAC_SA>
         List<BBAC_CAN_SA_DETAIL> bbacCanSaDetails = new List<BBAC_CAN_SA_DETAIL>();
         //不可结算
         List<BBAC_NOT_SA_DETAIL> bbacNotSaDetails = new List<BBAC_NOT_SA_DETAIL>();
-        var bbacSaEntity = await _bbacSaRepository.FirstOrDefaultAsync(t => t.Id.Equals(id)).ConfigureAwait(false);
-        //var bbacSaEntity = await _bbacSaRepository.FindAsync(id).ConfigureAwait(false);
+        var bbacSaEntity = await _bbacSaRepository.FindAsync(id).ConfigureAwait(false);
         if (bbacSaEntity != null)
         {
             //结算单据

From a371eb47dffda8b10c8b8685139125bfa9bdf50e Mon Sep 17 00:00:00 2001
From: mahao <hao.ma@ccwin-in.com>
Date: Wed, 23 Aug 2023 16:20:13 +0800
Subject: [PATCH 07/14] 1

---
 .../Entities/BQ/HBPO_SA_SERVICE.cs                       | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/HBPO_SA_SERVICE.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/HBPO_SA_SERVICE.cs
index 049a53e3..f73ca271 100644
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/HBPO_SA_SERVICE.cs
+++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/HBPO_SA_SERVICE.cs
@@ -118,6 +118,15 @@ public class HBPO_SA_SERVICE : SettleAccountApplicationBase<HBPO_SA>
 
         importHBOPSaDetails.ForEach(importHBOPSaDetail =>
         {
+            importHBOPSaDetail.SetId(GuidGenerator.Create());
+            var lus = importHBOPSaDetail.LU.Split("    ").ToList();
+            importHBOPSaDetail.LU = lus[0].Replace(" ", "");
+            if (lus.Count > 1)
+            {
+                lus.RemoveAt(0);
+                var luAssemble = lus.Select(t => t.Replace(" ", ""));
+                importHBOPSaDetail.LU += luAssemble.Aggregate("      ", (current, index) => current + index);
+            }
             importHBOPSaDetail.Version = hbpoSaImportRequestDto.Version;
         });
 

From f5e27ac7c4a241e36aed0de3402017f22ce75a77 Mon Sep 17 00:00:00 2001
From: wanggang <76527413@qq.com>
Date: Wed, 23 Aug 2023 16:28:55 +0800
Subject: [PATCH 08/14] update

---
 .../wwwroot/components/list/index.js                 |  4 ++--
 .../wwwroot/models/input/jie-suan.js                 |  2 +-
 .../wwwroot/models/settle/commerce.js                |  9 ++++++++-
 .../wwwroot/router/base-data.js                      |  4 ++--
 .../wwwroot/router/business.js                       | 12 +++++++++---
 .../wwwroot/router/utils.js                          |  9 ++++++---
 .../wwwroot/styles/site.css                          |  2 +-
 7 files changed, 29 insertions(+), 13 deletions(-)

diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/components/list/index.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/components/list/index.js
index 01a11f72..1b8e7e4e 100644
--- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/components/list/index.js
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/components/list/index.js
@@ -36,7 +36,7 @@ export default {
                   :class="item.meta.htmlClass??'el-button--primary'"
                   v-if="item.meta.isTop"
                   @click="click(item,selectedRows)"
-                  :disabled="item.meta.disabled && item.meta.disabled.constructor === Function && item.meta.disabled(selectedRows,queryModel)"
+                  v-show="item.meta.disabled && item.meta.disabled.constructor === Function && item.meta.disabled(selectedRows,queryModel)"
                 >
                   <el-icon v-if="item.meta.icon"><svg-icon :name="item.meta.icon" /></el-icon>
                   <span>{{item.meta.title}}</span>
@@ -127,7 +127,7 @@ export default {
                       :class="item.meta.htmlClass??'el-button--primary'"
                       v-if="!item.meta.isTop"
                       @click="click(item,[scope.row])"
-                      :disabled="item.meta.disabled && item.meta.disabled(scope.row)"
+                      v-show="item.meta.disabled && item.meta.disabled(scope.row)"
                     >
                       <el-icon v-if="item.meta.icon"><svg-icon :name="item.meta.icon" /></el-icon>
                       <span>{{item.meta.title}}</span>
diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/input/jie-suan.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/input/jie-suan.js
index 50b2b2c5..3244527f 100644
--- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/input/jie-suan.js
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/input/jie-suan.js
@@ -68,7 +68,7 @@ const querySchema = {
 export default function (businessType, meta) {
   let service = null;
   let detailService = null;
-  if (businessType === "JisBBAC") {
+  if (businessType === "JisBBAC" || businessType === "MaiDanJianBBAC" || businessType === "MaiDanJianHBPO") {
     service = "bbac_sa_service";
     detailService = "bbac_sa_detail_service";
   } else if (businessType === "JisHBPO") {
diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/settle/commerce.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/settle/commerce.js
index 51f184b8..3da777b9 100644
--- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/settle/commerce.js
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/settle/commerce.js
@@ -33,7 +33,7 @@ const schema = {
     invoiceState: {
       title: "发票状态",
       type: "string",
-      input: "select",
+      input: "tabs",
       options: [
         { value: 1, label: "正常" },
         { value: 2, label: "报废" },
@@ -116,6 +116,13 @@ export default function (businessType, type) {
                 value: null,
                 readOnly: true,
               },
+              {
+                logic: "and",
+                column: "invoiceState",
+                action: "equal",
+                value: null,
+                readOnly: true,
+              },
             ],
           },
           skipCount: {
diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/router/base-data.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/router/base-data.js
index 66603861..3c149eeb 100644
--- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/router/base-data.js
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/router/base-data.js
@@ -10,13 +10,13 @@ export default [
           createButton("query", "title=查询&isTop=true"),
           createButton("create", "title=新建&isTop=true"),
           createButton("update", "title=编辑"),
-          createButton("delete", "title=删除&disabled=o=>o.userName==='admin'"),
+          createButton("delete", "title=删除", (o) => o.userName !== "admin"),
           createButton("reset-password", "title=重置密码&method=PUT"),
         ],
       },
       {
         ...createPage("role", "title=角色管理"),
-        children: [createButton("query", "title=查询&isTop=true"), createButton("create", "title=新建&isTop=true"), createButton("delete", "title=删除&disabled=o => o.isStatic")],
+        children: [createButton("query", "title=查询&isTop=true"), createButton("create", "title=新建&isTop=true"), createButton("delete", "title=删除", (o) => o.isStatic)],
       },
       {
         ...createPage("material", "title=物料主数据"),
diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/router/business.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/router/business.js
index e73239a3..e47960be 100644
--- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/router/business.js
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/router/business.js
@@ -2,16 +2,21 @@ import createRoute, { createPage, createButton } from "./utils.js";
 
 // #region 数据输入
 function createInputJieSuanShuju(path, business, client, title = "结算数据") {
-  return {
+  const routes = {
     ...createPage(path, `title=${title}&businessType=${business}&client=${client}`),
     component: "/input/jie-suan",
     children: [
       createButton("query", "title=查询&isTop=true"),
-      createButton("import", "title=导入&isTop=true"),
+      //createButton("import", "title=导入&isTop=true"),
       createButton("export", "title=导出&pattern=row&key=billNum"),
-      createButton("delete", "title=删除&isTop=true"),
+      //createButton("delete", "title=删除&isTop=true"),
     ],
   };
+  if (business !== "MaiDanJianBBAC" && business !== "MaiDanJianHBPO") {
+    routes.children.push(createButton("import", "title=导入&isTop=true"));
+    routes.children.push(createButton("delete", "title=删除&isTop=true"));
+  }
+  return routes;
 }
 
 function createInputFaYunShuJu(path, business, client, title = "发运数据") {
@@ -341,6 +346,7 @@ export default [
           createButton("import", "title=导入开票文件&isTop=true"),
           createButton("approval", "title=财务审核通过&isTop=true"),
           createButton("export-group", "title=导出发票分组&pattern=paged"),
+          createButton("approval", "title=发票重开"),
           createButton("reject", "title=退回&isTop=true"),
           createButton("sync", "title=同步到QAD&isTop=true"),
         ],
diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/router/utils.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/router/utils.js
index ceb85c08..f943c439 100644
--- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/router/utils.js
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/router/utils.js
@@ -25,12 +25,15 @@ function createPage(path, meta = null, component = null) {
   };
 }
 
-function createButton(path, meta = null, component = null) {
-  return {
+function createButton(path, meta = null, show = null) {
+  const result = {
     path,
-    component,
     meta: Object.assign(createDefaultRoute("button", "file"), qs.parse(meta)),
   };
+  if (show) {
+    result.meta.show = show;
+  }
+  return result;
 }
 
 export default createRoute;
diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/styles/site.css b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/styles/site.css
index 146479e7..cd348c82 100644
--- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/styles/site.css
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/styles/site.css
@@ -96,7 +96,7 @@ a.logo {
 }
 
 .el-form--inline .el-form-item__content {
-  width: 192px;
+  min-width: 192px;
   /* height: 32px; */
 }
 

From 5fbc080924efe5749859caf2ca24e4e1b061e01e Mon Sep 17 00:00:00 2001
From: wanggang <76527413@qq.com>
Date: Wed, 23 Aug 2023 16:31:48 +0800
Subject: [PATCH 09/14] up

---
 .../wwwroot/components/list/index.js                          | 4 ++--
 .../SettleAccount.HttpApi.Host/wwwroot/router/base-data.js    | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/components/list/index.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/components/list/index.js
index 1b8e7e4e..01a11f72 100644
--- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/components/list/index.js
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/components/list/index.js
@@ -36,7 +36,7 @@ export default {
                   :class="item.meta.htmlClass??'el-button--primary'"
                   v-if="item.meta.isTop"
                   @click="click(item,selectedRows)"
-                  v-show="item.meta.disabled && item.meta.disabled.constructor === Function && item.meta.disabled(selectedRows,queryModel)"
+                  :disabled="item.meta.disabled && item.meta.disabled.constructor === Function && item.meta.disabled(selectedRows,queryModel)"
                 >
                   <el-icon v-if="item.meta.icon"><svg-icon :name="item.meta.icon" /></el-icon>
                   <span>{{item.meta.title}}</span>
@@ -127,7 +127,7 @@ export default {
                       :class="item.meta.htmlClass??'el-button--primary'"
                       v-if="!item.meta.isTop"
                       @click="click(item,[scope.row])"
-                      v-show="item.meta.disabled && item.meta.disabled(scope.row)"
+                      :disabled="item.meta.disabled && item.meta.disabled(scope.row)"
                     >
                       <el-icon v-if="item.meta.icon"><svg-icon :name="item.meta.icon" /></el-icon>
                       <span>{{item.meta.title}}</span>
diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/router/base-data.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/router/base-data.js
index 3c149eeb..66603861 100644
--- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/router/base-data.js
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/router/base-data.js
@@ -10,13 +10,13 @@ export default [
           createButton("query", "title=查询&isTop=true"),
           createButton("create", "title=新建&isTop=true"),
           createButton("update", "title=编辑"),
-          createButton("delete", "title=删除", (o) => o.userName !== "admin"),
+          createButton("delete", "title=删除&disabled=o=>o.userName==='admin'"),
           createButton("reset-password", "title=重置密码&method=PUT"),
         ],
       },
       {
         ...createPage("role", "title=角色管理"),
-        children: [createButton("query", "title=查询&isTop=true"), createButton("create", "title=新建&isTop=true"), createButton("delete", "title=删除", (o) => o.isStatic)],
+        children: [createButton("query", "title=查询&isTop=true"), createButton("create", "title=新建&isTop=true"), createButton("delete", "title=删除&disabled=o => o.isStatic")],
       },
       {
         ...createPage("material", "title=物料主数据"),

From 5b69f311239c12972bacfa9a74e3a7f939379c79 Mon Sep 17 00:00:00 2001
From: mahao <hao.ma@ccwin-in.com>
Date: Wed, 23 Aug 2023 16:50:28 +0800
Subject: [PATCH 10/14] =?UTF-8?q?BBAC=E6=9C=9F=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Entities/BQ/BBAC_SA_SERVICE.cs            | 43 ++++++++++++-------
 .../Entities/BQ/HBPO_SA_SERVICE.cs            | 10 ++++-
 2 files changed, 36 insertions(+), 17 deletions(-)

diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/BBAC_SA_SERVICE.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/BBAC_SA_SERVICE.cs
index 98f9a181..511fdf03 100644
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/BBAC_SA_SERVICE.cs
+++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/BBAC_SA_SERVICE.cs
@@ -83,12 +83,6 @@ public class BBAC_SA_SERVICE : SettleAccountApplicationBase<BBAC_SA>
     /// </summary>
     private readonly EnumBusinessType _businessType = EnumBusinessType.JisBBAC;
 
-    /// <summary>
-    /// 地点
-    /// </summary>
-    [Display(Name = "地点")]
-    public string Site { get; set; }
-
     /// <summary>
     /// 构造
     /// </summary>
@@ -116,6 +110,15 @@ public class BBAC_SA_SERVICE : SettleAccountApplicationBase<BBAC_SA>
         _tbRePartsRelationshipRepository = tbRePartsRelationshipRepository;
     }
 
+    /// <summary>
+    /// 地点
+    /// </summary>
+    public string Site { get; set; }
+    /// <summary>
+    /// 期间
+    /// </summary>
+    public int Version { get; set; }
+
     #region 导入、导出
     /// <summary>
     /// 导入
@@ -124,6 +127,7 @@ public class BBAC_SA_SERVICE : SettleAccountApplicationBase<BBAC_SA>
     public async Task<IActionResult> ImportAsync([FromForm] BBACSaImportRequestDto bbacSaImportRequestDto)
     {
         Site = bbacSaImportRequestDto.Site;
+        Version = bbacSaImportRequestDto.Version;
         #region 导入数据转换、数据校验
         ExportImporter _exportImporter = new ExportImporter();
         var importDtos = await _exportImporter.UploadExcelImport<BBAC_SA_DETAIL_IMPORT_DTO>(bbacSaImportRequestDto.Files, _excelImportService).ConfigureAwait(false);
@@ -149,7 +153,7 @@ public class BBAC_SA_SERVICE : SettleAccountApplicationBase<BBAC_SA>
                 importBBACSaDetail.LU += luAssemble.Aggregate("      ", (current, index) => current + index);
             }
 
-            importBBACSaDetail.Version = bbacSaImportRequestDto.Version;
+            importBBACSaDetail.Version = Version;
             importBBACSaDetail.Site = Site;
         });
 
@@ -206,8 +210,13 @@ public class BBAC_SA_SERVICE : SettleAccountApplicationBase<BBAC_SA>
     [HttpPost]
     public async Task<PagedResultDto<BBAC_SA_DTO>> GetListAsync(RequestDto input)
     {
-        var entities = await _bbacSaRepository.GetListByFilterAsync(input.Filters, input.Sorting, input.MaxResultCount, input.SkipCount, true);
-        var totalCount = await _bbacSaRepository.GetCountByFilterAsync(input.Filters);
+        var businessTypeFilterConditions = input.Filters.FindAll(t => t.Column.ToLower() == "businesstype");
+        businessTypeFilterConditions.ForEach(t =>
+        {
+            t.Value = EnumBusinessType.JisBBAC.ToString();
+        });
+        var entities = await _bbacSaRepository.GetListByFilterAsync(input.Filters, input.Sorting, input.MaxResultCount, input.SkipCount, true).ConfigureAwait(false);
+        var totalCount = await _bbacSaRepository.GetCountByFilterAsync(input.Filters).ConfigureAwait(false);
         var dtos = ObjectMapper.Map<List<BBAC_SA>, List<BBAC_SA_DTO>>(entities);
         return new PagedResultDto<BBAC_SA_DTO>(totalCount, dtos);
     }
@@ -307,23 +316,23 @@ public class BBAC_SA_SERVICE : SettleAccountApplicationBase<BBAC_SA>
         //删除
         if (bbacSas.Any())
         {
-            await _bbacSaRepository.DeleteManyAsync(bbacSas);
+            await _bbacSaRepository.DeleteManyAsync(bbacSas).ConfigureAwait(false);
         }
         if (bbacSaDetails.Any())
         {
-            await _bbacSaDetailRepository.DbContext.BulkDeleteAsync(bbacSaDetails);
+            await _bbacSaDetailRepository.DbContext.BulkDeleteAsync(bbacSaDetails).ConfigureAwait(false);
         }
         if (bbacCanSas.Any())
         {
-            await _bbacCanSaRepository.DeleteManyAsync(bbacCanSas);
+            await _bbacCanSaRepository.DeleteManyAsync(bbacCanSas).ConfigureAwait(false);
         }
         if (bbacCanSaDetails.Any())
         {
-            await _bbacCanSaDetailRepository.DbContext.BulkDeleteAsync(bbacCanSaDetails);
+            await _bbacCanSaDetailRepository.DbContext.BulkDeleteAsync(bbacCanSaDetails).ConfigureAwait(false);
         }
         if (bbacNotSaDetails.Any())
         {
-            await _bbacNotSaDetailRepository.DbContext.BulkDeleteAsync(bbacNotSaDetails);
+            await _bbacNotSaDetailRepository.DbContext.BulkDeleteAsync(bbacNotSaDetails).ConfigureAwait(false);
         }
     }
     #endregion
@@ -342,7 +351,8 @@ public class BBAC_SA_SERVICE : SettleAccountApplicationBase<BBAC_SA>
             BillNum = bbacSaBillNum,
             State = "0",
             BusinessType = _businessType,
-            Site = Site
+            Site = Site,
+            Version = Version
         };
         //可结算单号
         var bbacCanSaBillNum = OrderNumberGenerator.GenerateOrderNumber("C");
@@ -354,7 +364,8 @@ public class BBAC_SA_SERVICE : SettleAccountApplicationBase<BBAC_SA>
             SettleBillNum = bbacSaBillNum,
             State = SettleBillState.未结状态,
             BusinessType = _businessType,
-            Site = Site
+            Site = Site,
+            Version = Version
         };
         //可结算明细
         var bbacCanSaDetails = new List<BBAC_CAN_SA_DETAIL>();
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/HBPO_SA_SERVICE.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/HBPO_SA_SERVICE.cs
index f73ca271..317d971f 100644
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/HBPO_SA_SERVICE.cs
+++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/HBPO_SA_SERVICE.cs
@@ -104,6 +104,11 @@ public class HBPO_SA_SERVICE : SettleAccountApplicationBase<HBPO_SA>
         _tbRePartsRelationshipRepository = tbRePartsRelationshipRepository;
     }
 
+    /// <summary>
+    /// 期间
+    /// </summary>
+    public int Version { get; set; }
+
     #region 导入、导出
     /// <summary>
     /// 导入
@@ -111,6 +116,7 @@ public class HBPO_SA_SERVICE : SettleAccountApplicationBase<HBPO_SA>
     [HttpPost]
     public async Task<IActionResult> ImportAsync([FromForm] HBPOSaImportRequestDto hbpoSaImportRequestDto)
     {
+        Version = hbpoSaImportRequestDto.Version;
         #region 导入数据转换、数据校验
         ExportImporter _exportImporter = new ExportImporter();
         var result = await _exportImporter.UploadExcelImport<HBPO_SA_DETAIL_IMPORT_DTO>(hbpoSaImportRequestDto.Files, _excelImportService).ConfigureAwait(false);
@@ -127,7 +133,7 @@ public class HBPO_SA_SERVICE : SettleAccountApplicationBase<HBPO_SA>
                 var luAssemble = lus.Select(t => t.Replace(" ", ""));
                 importHBOPSaDetail.LU += luAssemble.Aggregate("      ", (current, index) => current + index);
             }
-            importHBOPSaDetail.Version = hbpoSaImportRequestDto.Version;
+            importHBOPSaDetail.Version = Version;
         });
 
         //Site包含CN1 亦庄
@@ -272,6 +278,7 @@ public class HBPO_SA_SERVICE : SettleAccountApplicationBase<HBPO_SA>
             State = "1",
             BusinessType = _businessType,
             Site = site,
+            Version = Version
         };
         //可结算单号
         var hbpoCanSaBillNum = OrderNumberGenerator.GenerateOrderNumber("C");
@@ -284,6 +291,7 @@ public class HBPO_SA_SERVICE : SettleAccountApplicationBase<HBPO_SA>
             State = SettleBillState.未结状态,
             BusinessType = _businessType,
             Site = site,
+            Version = Version
         };
         //可结算明细
         var hbpoCanSaDetails = new List<HBPO_CAN_SA_DETAIL>();

From 37ca0cf49190df94929dd775f6689494b0dbd3a1 Mon Sep 17 00:00:00 2001
From: wanggang <76527413@qq.com>
Date: Wed, 23 Aug 2023 16:52:58 +0800
Subject: [PATCH 11/14] update

---
 .../wwwroot/components/list/index.js                          | 3 ++-
 .../wwwroot/models/input/jie-suan-detail.js                   | 4 ++--
 .../wwwroot/models/input/jie-suan.js                          | 4 ++--
 .../SettleAccount.HttpApi.Host/wwwroot/router/business.js     | 2 +-
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/components/list/index.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/components/list/index.js
index 01a11f72..0475a916 100644
--- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/components/list/index.js
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/components/list/index.js
@@ -33,9 +33,10 @@ export default {
               </app-form>
               <template v-for="item in buttons">
                 <el-button
-                  :class="item.meta.htmlClass??'el-button--primary'"
                   v-if="item.meta.isTop"
                   @click="click(item,selectedRows)"
+                  :class="item.meta.htmlClass??'el-button--primary'"
+                  v-show="true||!item.meta.show||item.meta.show(selectedRows,queryModel)"
                   :disabled="item.meta.disabled && item.meta.disabled.constructor === Function && item.meta.disabled(selectedRows,queryModel)"
                 >
                   <el-icon v-if="item.meta.icon"><svg-icon :name="item.meta.icon" /></el-icon>
diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/input/jie-suan-detail.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/input/jie-suan-detail.js
index 55743492..2ff91133 100644
--- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/input/jie-suan-detail.js
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/input/jie-suan-detail.js
@@ -39,9 +39,9 @@ const schema = {
 
 export default function (businessType) {
   let service = null;
-  if (businessType === "JisBBAC") {
+  if (businessType === "JisBBAC" || businessType === "MaiDanJianBBAC") {
     service = "bbac_sa_detail_service";
-  } else if (businessType === "JisHBPO") {
+  } else if (businessType === "JisHBPO" || businessType === "MaiDanJianHBPO") {
     service = "hbpo_sa_detail_service";
   } else {
     service = "pub_sa_detail_service";
diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/input/jie-suan.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/input/jie-suan.js
index 3244527f..4b857028 100644
--- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/input/jie-suan.js
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/input/jie-suan.js
@@ -68,10 +68,10 @@ const querySchema = {
 export default function (businessType, meta) {
   let service = null;
   let detailService = null;
-  if (businessType === "JisBBAC" || businessType === "MaiDanJianBBAC" || businessType === "MaiDanJianHBPO") {
+  if (businessType === "JisBBAC" || businessType === "MaiDanJianBBAC") {
     service = "bbac_sa_service";
     detailService = "bbac_sa_detail_service";
-  } else if (businessType === "JisHBPO") {
+  } else if (businessType === "JisHBPO" || businessType === "MaiDanJianHBPO") {
     service = "hbpo_sa_service";
     detailService = "hbpo_sa_detail_service";
   } else {
diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/router/business.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/router/business.js
index e47960be..c3c8d845 100644
--- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/router/business.js
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/router/business.js
@@ -343,7 +343,7 @@ export default [
         component: "/settle/finance",
         children: [
           createButton("query", "title=查询&isTop=true"),
-          createButton("import", "title=导入开票文件&isTop=true"),
+          createButton("import", "title=导入开票文件&isTop=true", "(a, b) => false"),
           createButton("approval", "title=财务审核通过&isTop=true"),
           createButton("export-group", "title=导出发票分组&pattern=paged"),
           createButton("approval", "title=发票重开"),

From 4752aadcf52d91e0c422a20559da9a2663d80b37 Mon Sep 17 00:00:00 2001
From: mahao <hao.ma@ccwin-in.com>
Date: Wed, 23 Aug 2023 17:20:10 +0800
Subject: [PATCH 12/14] =?UTF-8?q?=E4=B9=B0=E5=8D=95=E4=BB=B6BBAC=E7=BB=93?=
 =?UTF-8?q?=E7=AE=97=E5=88=97=E8=A1=A8=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Entities/BQ/Dtos/HBPO_SA_DTO.cs           |  45 +++-
 .../Entities/BQ/Dtos/PUB_SA_DTO.cs            |  46 ----
 .../Entities/BQ/HBPO_SA_SERVICE.cs            | 224 ++++++++++++------
 .../Entities/BQ/PUB_SA_SERVICE.cs             |  40 ----
 ...ttleAccountApplicationAutoMapperProfile.cs |   2 +-
 5 files changed, 193 insertions(+), 164 deletions(-)

diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/HBPO_SA_DTO.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/HBPO_SA_DTO.cs
index bd781f4e..41019532 100644
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/HBPO_SA_DTO.cs
+++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/HBPO_SA_DTO.cs
@@ -107,7 +107,10 @@ public class HBPOSaImportRequestDto
     /// 文件
     /// </summary>
     public IFormFileCollection Files { get; set; }
-
+    /// <summary>
+    /// 业务类别
+    /// </summary>
+    public EnumBusinessType BusinessType { get; set; }
     /// <summary>
     /// 期间
     /// </summary>
@@ -175,6 +178,46 @@ public class HBPO_SA_DETAIL_IMPORT_DTO
     public string PN { get; set; }
 }
 
+/// <summary>
+/// 买单件HBPO导入
+/// </summary>
+public class MaiDanJianHBPOImportDto
+{
+    /// <summary>
+    /// 结算日期
+    /// </summary>
+    [Display(Name = "买单日期")]
+    [ImporterHeader(Name = "买单日期")]
+    public DateTime SettleDate { set; get; }
+    /// <summary>
+    /// 客户零件号
+    /// </summary>
+    [Display(Name = "零件号")]
+    [Required(ErrorMessage = "{0}不能为空")]
+    [ImporterHeader(Name = "零件号")]
+    public string LU { get; set; }
+    /// <summary>
+    /// 生产号
+    /// </summary>
+    [Display(Name = "现产品生产号")]
+    [ImporterHeader(Name = "现产品生产号")]
+    [Required(ErrorMessage = "{0}不能为空")]
+    public string PN { get; set; }
+    /// <summary>
+    /// 数量
+    /// </summary>
+    [Display(Name = "数量")]
+    [ImporterHeader(Name = "数量")]
+    public decimal Qty { get; set; }
+    /// <summary>
+    /// 结算分组号
+    /// </summary>
+    [Display(Name = "五联单号")]
+    [ImporterHeader(Name = "五联单号")]
+    [Required(ErrorMessage = "{0}不能为空")]
+    public string GroupNum { get; set; }
+}
+
 /// <summary>
 /// 结算明细导出请求
 /// </summary>
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/PUB_SA_DTO.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/PUB_SA_DTO.cs
index e805ef29..028e8307 100644
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/PUB_SA_DTO.cs
+++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/PUB_SA_DTO.cs
@@ -57,12 +57,10 @@ public class PUB_SAImportRequestDto
     /// 文件
     /// </summary>
     public IFormFileCollection Files { get; set; }
-
     /// <summary>
     /// 业务类别
     /// </summary>
     public EnumBusinessType BusinessType { get; set; }
-
     /// <summary>
     /// 期间
     /// </summary>
@@ -165,50 +163,6 @@ public class ZhiGongJianHBPOImportDto
     public string GroupNum { get; set; }
 }
 
-/// <summary>
-/// 买单件HBPO导入
-/// </summary>
-public class MaiDanJianHBPOImportDto
-{
-    /// <summary>
-    /// 结算日期
-    /// </summary>
-    [Display(Name = "买单日期")]
-    [ImporterHeader(Name = "买单日期")]
-    public DateTime SettleDate { set; get; }
-
-    /// <summary>
-    /// 客户零件号
-    /// </summary>
-    [Display(Name = "零件号")]
-    [Required(ErrorMessage = "{0}不能为空")]
-    [ImporterHeader(Name = "零件号")]
-    public string LU { get; set; }
-
-    /// <summary>
-    /// 生产号
-    /// </summary>
-    [Display(Name = "现产品生产号")]
-    [ImporterHeader(Name = "现产品生产号")]
-    [Required(ErrorMessage = "{0}不能为空")]
-    public string PN { get; set; }
-
-    /// <summary>
-    /// 数量
-    /// </summary>
-    [Display(Name = "数量")]
-    [ImporterHeader(Name = "数量")]
-    public decimal Qty { get; set; }
-
-    /// <summary>
-    /// 结算分组号
-    /// </summary>
-    [Display(Name = "五联单号")]
-    [ImporterHeader(Name = "五联单号")]
-    [Required(ErrorMessage = "{0}不能为空")]
-    public string GroupNum { get; set; }
-}
-
 /// <summary>
 /// 备件导入
 /// </summary>
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/HBPO_SA_SERVICE.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/HBPO_SA_SERVICE.cs
index 317d971f..ede465f8 100644
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/HBPO_SA_SERVICE.cs
+++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/HBPO_SA_SERVICE.cs
@@ -1,7 +1,9 @@
 using System;
 using System.Collections.Generic;
+using System.Globalization;
 using System.Linq;
 using System.Threading.Tasks;
+using DocumentFormat.OpenXml.Bibliography;
 using EFCore.BulkExtensions;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Http;
@@ -116,78 +118,20 @@ public class HBPO_SA_SERVICE : SettleAccountApplicationBase<HBPO_SA>
     [HttpPost]
     public async Task<IActionResult> ImportAsync([FromForm] HBPOSaImportRequestDto hbpoSaImportRequestDto)
     {
+        IActionResult result = new JsonResult(new { Code = 400 });
         Version = hbpoSaImportRequestDto.Version;
-        #region 导入数据转换、数据校验
-        ExportImporter _exportImporter = new ExportImporter();
-        var result = await _exportImporter.UploadExcelImport<HBPO_SA_DETAIL_IMPORT_DTO>(hbpoSaImportRequestDto.Files, _excelImportService).ConfigureAwait(false);
-        var importHBOPSaDetails = ObjectMapper.Map<List<HBPO_SA_DETAIL_IMPORT_DTO>, List<HBPO_SA_DETAIL>>(result);
-
-        importHBOPSaDetails.ForEach(importHBOPSaDetail =>
-        {
-            importHBOPSaDetail.SetId(GuidGenerator.Create());
-            var lus = importHBOPSaDetail.LU.Split("    ").ToList();
-            importHBOPSaDetail.LU = lus[0].Replace(" ", "");
-            if (lus.Count > 1)
-            {
-                lus.RemoveAt(0);
-                var luAssemble = lus.Select(t => t.Replace(" ", ""));
-                importHBOPSaDetail.LU += luAssemble.Aggregate("      ", (current, index) => current + index);
-            }
-            importHBOPSaDetail.Version = Version;
-        });
-
-        //Site包含CN1 亦庄
-        //Site包含CN5 顺义
-        var importCN1HBOPSaDetails = importHBOPSaDetails.FindAll(t => t.Site.Contains("CN1"));
-        var importCN5HBOPSaDetails = importHBOPSaDetails.FindAll(t => t.Site.Contains("CN5"));
-
-        //数据校验
-        var checkList = new List<ErrorExportDto>();
-        //结算分组号
-        var hbpoSaGroupNums = importHBOPSaDetails.Select(t => t.GroupNum).Distinct();
-        //已存在的结算分组号
-        var havHBPOSaGroupNums = (await _hbpoSaDetailRepository.GetListAsync(t => hbpoSaGroupNums.Contains(t.GroupNum))).Select(t => t.GroupNum).Distinct();
-        if (havHBPOSaGroupNums.Any() == true)
+        switch (hbpoSaImportRequestDto.BusinessType)
         {
-            foreach (var item in havHBPOSaGroupNums)
-            {
-                checkList.Add(new ErrorExportDto(string.Empty, string.Empty, string.Empty, string.Empty, string.Empty, string.Empty, $"结算分组号{item}已存在", string.Empty));
-            }
+            case EnumBusinessType.JisHBPO:
+                result = await ImportJisHBPOAsync(hbpoSaImportRequestDto.Files).ConfigureAwait(false);
+                break;
+            case EnumBusinessType.MaiDanJianHBPO:
+                result = await ImportMaiDanJianHBPOAsync(hbpoSaImportRequestDto.Files).ConfigureAwait(false);
+                break;
+            default:
+                break;
         }
-
-        if (!checkList.Any())
-        {
-            //验证客户对应厂内零件号是否存在
-            //导入的零件号集合
-            var importPubSaLUs = (importCN1HBOPSaDetails.Select(t => t.LU).Union(importCN5HBOPSaDetails.Select(t => t.LU))).Distinct();
-            var materialRelationshipEntitys = await _materialRelationshipRepository.GetListAsync(t => importPubSaLUs.Contains(t.SettleMaterialCode)).ConfigureAwait(false);
-            var materialRelationshipEntitySettleMaterialCodes = materialRelationshipEntitys.Select(t => t.SettleMaterialCode).Distinct();
-
-            //不存在的客户零件号（差集）
-            var noExistSettleMaterialCodes = importPubSaLUs.Except(materialRelationshipEntitySettleMaterialCodes);
-            noExistSettleMaterialCodes.ForEach(t =>
-            {
-                checkList.Add(new ErrorExportDto(string.Empty, string.Empty, string.Empty, string.Empty, string.Empty, string.Empty, $"客户零件号【{t}】对应厂内零件号系统中不存在", string.Empty));
-            });
-        }
-
-        if (checkList.Count > 0)
-        {
-            string fileName = await ExportErrorReportAsync(checkList);
-            return new JsonResult(new { Code = ApplicationConsts.ImportFailCode, fileName = fileName });
-        }
-        #endregion
-
-        if (importCN1HBOPSaDetails.Any())
-        {
-            await SaDataHandleAsync(importCN1HBOPSaDetails, "CN1");
-        }
-        if (importCN5HBOPSaDetails.Any())
-        {
-            await SaDataHandleAsync(importCN5HBOPSaDetails, "CN5");
-        }
-
-        return new JsonResult(new { Code = 200, Message = "导入成功" });
+        return result;
     }
     #endregion
 
@@ -264,6 +208,74 @@ public class HBPO_SA_SERVICE : SettleAccountApplicationBase<HBPO_SA>
     #endregion
 
     #region 私有方法
+    /// <summary>
+    /// JisHBPO导入
+    /// </summary>
+    private async Task<IActionResult> ImportJisHBPOAsync([FromForm] IFormFileCollection files)
+    {
+        ExportImporter _exportImporter = new ExportImporter();
+        var result = await _exportImporter.UploadExcelImport<HBPO_SA_DETAIL_IMPORT_DTO>(files, _excelImportService).ConfigureAwait(false);
+        var importHBOPSaDetails = ObjectMapper.Map<List<HBPO_SA_DETAIL_IMPORT_DTO>, List<HBPO_SA_DETAIL>>(result);
+
+        HandleSaDetails(importHBOPSaDetails);
+
+        //Site包含CN1 亦庄
+        //Site包含CN5 顺义
+        var importCN1HBOPSaDetails = importHBOPSaDetails.FindAll(t => t.Site.Contains("CN1"));
+        var importCN5HBOPSaDetails = importHBOPSaDetails.FindAll(t => t.Site.Contains("CN5"));
+
+        #region 数据校验
+        var checkList = await CheckAsync(importHBOPSaDetails).ConfigureAwait(false);
+        if (checkList.Count > 0)
+        {
+            string fileName = await ExportErrorReportAsync(checkList).ConfigureAwait(false);
+            return new JsonResult(new { Code = ApplicationConsts.ImportFailCode, fileName = fileName });
+        }
+        #endregion
+
+        if (importCN1HBOPSaDetails.Any())
+        {
+            await SaDataHandleAsync(importCN1HBOPSaDetails, "CN1").ConfigureAwait(false);
+        }
+        if (importCN5HBOPSaDetails.Any())
+        {
+            await SaDataHandleAsync(importCN5HBOPSaDetails, "CN5").ConfigureAwait(false);
+        }
+
+        return new JsonResult(new { Code = 200, Message = "导入成功" });
+    }
+
+    /// <summary>
+    /// 买单件HBPO导入
+    /// </summary>
+    private async Task<IActionResult> ImportMaiDanJianHBPOAsync([FromForm] IFormFileCollection files)
+    {
+        #region 导入数据转换
+        var exportImporter = new ExportImporter();
+        var importResults = await exportImporter.UploadExcelImport<MaiDanJianHBPOImportDto>(files, _excelImportService).ConfigureAwait(false);
+        var importMaiDanHBPOSaDetails = ObjectMapper.Map<List<MaiDanJianHBPOImportDto>, List<HBPO_SA_DETAIL>>(importResults);
+        #endregion
+
+        if (!importMaiDanHBPOSaDetails.Any())
+        {
+            return new JsonResult(new { Code = 200, Message = "导入成功" });
+        }
+
+        HandleSaDetails(importMaiDanHBPOSaDetails);
+
+        #region 数据校验
+        var checkList = await CheckAsync(importMaiDanHBPOSaDetails).ConfigureAwait(false);
+        if (checkList.Count > 0)
+        {
+            string fileName = await ExportErrorReportAsync(checkList).ConfigureAwait(false);
+            return new JsonResult(new { Code = ApplicationConsts.ImportFailCode, fileName = fileName });
+        }
+        #endregion
+
+        await SaDataHandleAsync(importMaiDanHBPOSaDetails, "").ConfigureAwait(false);
+        return new JsonResult(new { Code = 200, Message = "导入成功" });
+    }
+
     /// <summary>
     /// 结算数据处理
     /// </summary>
@@ -275,7 +287,7 @@ public class HBPO_SA_SERVICE : SettleAccountApplicationBase<HBPO_SA>
         var hbpoSa = new HBPO_SA()
         {
             BillNum = hbpoSaBillNum,
-            State = "1",
+            State = "0",
             BusinessType = _businessType,
             Site = site,
             Version = Version
@@ -374,15 +386,15 @@ public class HBPO_SA_SERVICE : SettleAccountApplicationBase<HBPO_SA>
     private async Task<(List<HBPO_SA> hbpoSas, List<HBPO_SA_DETAIL> hbpoSaDetails, List<HBPO_CAN_SA> hbpoCanSas, List<HBPO_CAN_SA_DETAIL> hbpoCanSaDetails, List<HBPO_NOT_SA_DETAIL> hbpoNotSaDetails)> GetHBPOSaDelItemsAsync(Guid id)
     {
         //结算主表
-        List<HBPO_SA> hbpoSas = new List<HBPO_SA>();
+        var hbpoSas = new List<HBPO_SA>();
         //结算明细
-        List<HBPO_SA_DETAIL> hbpoSaDetails = new List<HBPO_SA_DETAIL>();
+        var hbpoSaDetails = new List<HBPO_SA_DETAIL>();
         //可结算主表
-        List<HBPO_CAN_SA> hbpoCanSas = new List<HBPO_CAN_SA>();
+        var hbpoCanSas = new List<HBPO_CAN_SA>();
         //可结算明细
-        List<HBPO_CAN_SA_DETAIL> hbpoCanSaDetails = new List<HBPO_CAN_SA_DETAIL>();
+        var hbpoCanSaDetails = new List<HBPO_CAN_SA_DETAIL>();
         //不可结算
-        List<HBPO_NOT_SA_DETAIL> hbpoNotSaDetails = new List<HBPO_NOT_SA_DETAIL>();
+        var hbpoNotSaDetails = new List<HBPO_NOT_SA_DETAIL>();
 
         var hbpoSaEntity = await _hbpoSaRepository.FirstOrDefaultAsync(t => t.Id.Equals(id)).ConfigureAwait(false);
         if (hbpoSaEntity != null)
@@ -390,7 +402,7 @@ public class HBPO_SA_SERVICE : SettleAccountApplicationBase<HBPO_SA>
             //结算单据
             string hbpoSaBillNum = hbpoSaEntity.BillNum;
 
-            hbpoCanSas = await _hbpoCanSaRepository.GetListAsync(t => t.SettleBillNum == hbpoSaBillNum);
+            hbpoCanSas = await _hbpoCanSaRepository.GetListAsync(t => t.SettleBillNum == hbpoSaBillNum).ConfigureAwait(false);
             //验证可结算主表状态
             if (hbpoCanSas.Any() && hbpoCanSas.Any(t => t.State != SettleBillState.未结状态))
             {
@@ -405,5 +417,65 @@ public class HBPO_SA_SERVICE : SettleAccountApplicationBase<HBPO_SA>
 
         return (hbpoSas, hbpoSaDetails, hbpoCanSas, hbpoCanSaDetails, hbpoNotSaDetails);
     }
+
+    /// <summary>
+    /// 结算数据处理
+    /// </summary>
+    private void HandleSaDetails(List<HBPO_SA_DETAIL> hbpoSaDetails)
+    {
+        hbpoSaDetails.ForEach(hbpoSaDetail =>
+        {
+            hbpoSaDetail.SetId(GuidGenerator.Create());
+            var lus = hbpoSaDetail.LU.Split("    ").ToList();
+            hbpoSaDetail.LU = lus[0].Replace(" ", "");
+            if (lus.Count > 1)
+            {
+                lus.RemoveAt(0);
+                var luAssemble = lus.Select(t => t.Replace(" ", ""));
+                hbpoSaDetail.LU += luAssemble.Aggregate("      ", (current, index) => current + index);
+            }
+            hbpoSaDetail.Version = Version;
+        });
+    }
+
+    /// <summary>
+    /// 数据校验
+    /// </summary>
+    private async Task<List<ErrorExportDto>> CheckAsync(List<HBPO_SA_DETAIL> hbpoSaDetails)
+    {
+        #region 数据校验
+        //数据校验
+        var checkList = new List<ErrorExportDto>();
+        //结算分组号
+        var saGroupNums = hbpoSaDetails.Select(t => t.GroupNum).Distinct();
+        //已存在的结算分组号
+        var havPubSaGroupNums = (await _hbpoSaDetailRepository.GetListAsync(t => saGroupNums.Contains(t.GroupNum))).Select(t => t.GroupNum).Distinct();
+        if (havPubSaGroupNums.Any() == true)
+        {
+            foreach (var item in havPubSaGroupNums)
+            {
+                checkList.Add(new ErrorExportDto(string.Empty, string.Empty, string.Empty, string.Empty, string.Empty, string.Empty, $"结算分组号{item}已存在", string.Empty));
+            }
+        }
+
+        if (!checkList.Any())
+        {
+            //验证客户对应厂内零件号是否存在
+            //导入的零件号集合
+            var importSaLUs = hbpoSaDetails.Select(t => t.LU).Distinct();
+            var materialRelationshipEntitys = await _materialRelationshipRepository.GetListAsync(t => importSaLUs.Contains(t.SettleMaterialCode)).ConfigureAwait(false);
+            var materialRelationshipEntitySettleMaterialCodes = materialRelationshipEntitys.Select(t => t.SettleMaterialCode).Distinct();
+
+            //不存在的客户零件号（差集）
+            var noExistSettleMaterialCodes = importSaLUs.Except(materialRelationshipEntitySettleMaterialCodes);
+            noExistSettleMaterialCodes.ForEach(t =>
+            {
+                checkList.Add(new ErrorExportDto(string.Empty, string.Empty, string.Empty, string.Empty, string.Empty, string.Empty, $"客户零件号【{t}】对应厂内零件号系统中不存在", string.Empty));
+            });
+        }
+
+        return checkList;
+        #endregion
+    }
     #endregion
 }
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/PUB_SA_SERVICE.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/PUB_SA_SERVICE.cs
index 9fd1a10a..5097acda 100644
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/PUB_SA_SERVICE.cs
+++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/PUB_SA_SERVICE.cs
@@ -127,23 +127,12 @@ public class PUB_SA_SERVICE : SettleAccountApplicationBase<PUB_SA>
         _version = pubSaImportRequestDto.Version;
         switch (pubSaImportRequestDto.BusinessType)
         {
-            case EnumBusinessType.None:
-                break;
-            case EnumBusinessType.JisBBAC:
-                break;
-            case EnumBusinessType.JisHBPO:
-                break;
             case EnumBusinessType.ZhiGongJianBBAC:
                 result = await ImportZhiGongJianBBACAsync(pubSaImportRequestDto.Files).ConfigureAwait(false);
                 break;
             case EnumBusinessType.ZhiGongJianHBPO:
                 result = await ImportZhiGongJianHBPOAsync(pubSaImportRequestDto.Files).ConfigureAwait(false);
                 break;
-            case EnumBusinessType.MaiDanJianBBAC:
-                break;
-            case EnumBusinessType.MaiDanJianHBPO:
-                result = await ImportMaiDanJianHBPOAsync(pubSaImportRequestDto.Files).ConfigureAwait(false);
-                break;
             case EnumBusinessType.BeiJian:
                 result = await ImportBeiJianAsync(pubSaImportRequestDto.Files).ConfigureAwait(false);
                 break;
@@ -296,35 +285,6 @@ public class PUB_SA_SERVICE : SettleAccountApplicationBase<PUB_SA>
         return await SaDataHandleAsync(importPubSaDetails, EnumBusinessType.ZhiGongJianHBPO).ConfigureAwait(false);
     }
 
-    /// <summary>
-    /// 买单件HBPO导入
-    /// </summary>
-    private async Task<IActionResult> ImportMaiDanJianHBPOAsync([FromForm] IFormFileCollection files)
-    {
-        #region 导入数据转换
-        ExportImporter _exportImporter = new ExportImporter();
-        var importResults = await _exportImporter.UploadExcelImport<MaiDanJianHBPOImportDto>(files, _excelImportService).ConfigureAwait(false);
-
-        var importPubSaDetails = ObjectMapper.Map<List<MaiDanJianHBPOImportDto>, List<PUB_SA_DETAIL>>(importResults);
-        #endregion
-
-        if (!importPubSaDetails.Any())
-        {
-            return new JsonResult(new { Code = 200, Message = "导入成功" });
-        }
-
-        #region 数据校验
-        var checkList = await CheckAsync(importPubSaDetails);
-        if (checkList.Count > 0)
-        {
-            string fileName = await ExportErrorReportAsync(checkList);
-            return new JsonResult(new { Code = ApplicationConsts.ImportFailCode, fileName = fileName });
-        }
-        #endregion
-
-        return await SaDataHandleAsync(importPubSaDetails, EnumBusinessType.BeiJian).ConfigureAwait(false);
-    }
-
     /// <summary>
     /// 备件导入
     /// </summary>
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/SettleAccountApplicationAutoMapperProfile.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/SettleAccountApplicationAutoMapperProfile.cs
index db713adb..37704e7f 100644
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/SettleAccountApplicationAutoMapperProfile.cs
+++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/SettleAccountApplicationAutoMapperProfile.cs
@@ -1069,6 +1069,7 @@ namespace Win.Sfs.SettleAccount
             CreateMap<HBPO_SA_DETAIL, HBPO_SA_DETAIL_EXPORT_DTO>();
 
             CreateMap<HBPO_SA_DETAIL_IMPORT_DTO, HBPO_SA_DETAIL>();
+            CreateMap<MaiDanJianHBPOImportDto, HBPO_SA_DETAIL>();
         }
 
         /// <summary>
@@ -1103,7 +1104,6 @@ namespace Win.Sfs.SettleAccount
 
             CreateMap<ZhiGongJianBBACImportDto, PUB_SA_DETAIL>();
             CreateMap<ZhiGongJianHBPOImportDto, PUB_SA_DETAIL>();
-            CreateMap<MaiDanJianHBPOImportDto, PUB_SA_DETAIL>();
             CreateMap<BeiJianImportDto, PUB_SA_DETAIL>()
                 .ForMember(x => x.ExtraProperties, y => y.MapFrom(d =>
                 new Dictionary<string, object>()

From 747250cd7158346d384f7b3b17fcfefb3451b1c7 Mon Sep 17 00:00:00 2001
From: wanggang <76527413@qq.com>
Date: Wed, 23 Aug 2023 19:05:56 +0800
Subject: [PATCH 13/14] up

---
 .../wwwroot/components/list/index.js          |  3 +-
 .../wwwroot/models/input/jie-suan.js          |  2 +-
 .../wwwroot/models/settle/finance.js          |  3 +-
 .../wwwroot/router/business.js                | 41 ++++++++++++++++---
 .../wwwroot/router/index.js                   |  2 +-
 .../Entities/BQ/VmiAppService.cs              |  5 +--
 6 files changed, 42 insertions(+), 14 deletions(-)

diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/components/list/index.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/components/list/index.js
index 0475a916..edad5ec0 100644
--- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/components/list/index.js
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/components/list/index.js
@@ -36,7 +36,7 @@ export default {
                   v-if="item.meta.isTop"
                   @click="click(item,selectedRows)"
                   :class="item.meta.htmlClass??'el-button--primary'"
-                  v-show="true||!item.meta.show||item.meta.show(selectedRows,queryModel)"
+                  v-show="!item.meta.show||item.meta.show(selectedRows,queryModel)"
                   :disabled="item.meta.disabled && item.meta.disabled.constructor === Function && item.meta.disabled(selectedRows,queryModel)"
                 >
                   <el-icon v-if="item.meta.icon"><svg-icon :name="item.meta.icon" /></el-icon>
@@ -127,6 +127,7 @@ export default {
                     <el-button
                       :class="item.meta.htmlClass??'el-button--primary'"
                       v-if="!item.meta.isTop"
+                      v-show="!item.meta.show||item.meta.show(scope.row,queryModel)"
                       @click="click(item,[scope.row])"
                       :disabled="item.meta.disabled && item.meta.disabled(scope.row)"
                     >
diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/input/jie-suan.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/input/jie-suan.js
index 4b857028..1269bd3e 100644
--- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/input/jie-suan.js
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/input/jie-suan.js
@@ -5,7 +5,7 @@ const schema = {
   type: "object",
   properties: {
     version,
-    state,
+    //state,
     billNum: {
       title: "结算单号",
       type: "string",
diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/settle/finance.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/settle/finance.js
index 319a70f2..fd8ec2b8 100644
--- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/settle/finance.js
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/settle/finance.js
@@ -1,8 +1,7 @@
 //财务审核
 import version from "../version.js";
 import { state2 } from "../state.js";
-import businessType from "../businessType.js";
-import invoiceState from "../invoiceState.js";
+import { businessType, invoiceState } from "../_options.js";
 
 const state = Object.assign({}, state2);
 state.input = "tabs";
diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/router/business.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/router/business.js
index c3c8d845..b6b0be71 100644
--- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/router/business.js
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/router/business.js
@@ -90,10 +90,27 @@ function createCommerceCheckList(path, business, client, title = "商务审批")
     component: "/settle/commerce",
     children: [
       createButton("query", "title=查询&isTop=true"),
-      createButton("approval", "title=商务审核通过&isTop=true"),
-      createButton("reject", "title=退回"),
+      createButton(
+        "approval",
+        "title=商务审核通过&isTop=true",
+        (_, q) => q.filters.some((o) => o.column === "state" && o.value === 1) && q.filters.some((o) => o.column === "invoiceState" && o.value === 1)
+      ),
+      createButton(
+        "reject",
+        "title=退回",
+        (_, q) => q.filters.some((o) => o.column === "state" && o.value === 1) && q.filters.some((o) => o.column === "invoiceState" && o.value === 1)
+      ),
       createButton("export-group", "title=导出发票分组&pattern=paged"),
-      createButton("receive", "title=客户已收票&isTop=true"),
+      createButton(
+        "receive",
+        "title=客户已收票&isTop=true",
+        (_, q) => q.filters.some((o) => o.column === "state" && o.value === 3) && q.filters.some((o) => o.column === "invoiceState" && o.value === 1)
+      ),
+      createButton(
+        "bao-fei",
+        "title=报废&isTop=true",
+        (_, q) => q.filters.some((o) => o.column === "state" && (o.value === 3 || o.value === 4)) && q.filters.some((o) => o.column === "invoiceState" && o.value === 1)
+      ),
     ],
   };
 }
@@ -343,11 +360,23 @@ export default [
         component: "/settle/finance",
         children: [
           createButton("query", "title=查询&isTop=true"),
-          createButton("import", "title=导入开票文件&isTop=true", "(a, b) => false"),
-          createButton("approval", "title=财务审核通过&isTop=true"),
+          createButton(
+            "import",
+            "title=导入开票文件&isTop=true",
+            (_, q) => q.filters.some((o) => o.column === "state" && o.value === 3) && q.filters.some((o) => o.column === "invoiceState" && o.value === 1)
+          ),
+          createButton(
+            "approval",
+            "title=财务审核通过&isTop=true",
+            (_, q) => q.filters.some((o) => o.column === "state" && o.value === 2) && q.filters.some((o) => o.column === "invoiceState" && o.value === 1)
+          ),
           createButton("export-group", "title=导出发票分组&pattern=paged"),
           createButton("approval", "title=发票重开"),
-          createButton("reject", "title=退回&isTop=true"),
+          createButton(
+            "reject",
+            "title=退回&isTop=true",
+            (_, q) => q.filters.some((o) => o.column === "state" && o.value === 2) && q.filters.some((o) => o.column === "invoiceState" && o.value === 1)
+          ),
           createButton("sync", "title=同步到QAD&isTop=true"),
         ],
       },
diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/router/index.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/router/index.js
index 9604ce6b..44cbc3d3 100644
--- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/router/index.js
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/router/index.js
@@ -85,7 +85,7 @@ const refreshRouter = async () => {
   await connect();
   const appStore = useAppStore();
   const permissions = appStore.user.permissions;
-  const serverRoutes = JSON.parse(JSON.stringify(remoteRoutes));
+  const serverRoutes = Object.assign([], remoteRoutes);
   const setPermission = (list, parent = null) => {
     list.forEach((o) => {
       // full path
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/VmiAppService.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/VmiAppService.cs
index 316d9ef4..53786407 100644
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/VmiAppService.cs
+++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/VmiAppService.cs
@@ -162,12 +162,11 @@ public class VmiAppService : ApplicationService, IJobService, ITransientDependen
         try
         {
             var now = DateTime.Now;
-            var time = now.ToString("yyyy-MM-dd_HH:mm");
-            var table = $"Set_VmiBalance_{time}";
+            var table = $"Set_VmiBalance_{now.ToString("yyyy_MM_dd_HH_mm_ss")}";
             var snapshot = db.Set<VmiSnapshot>().Where(o => o.Name == table).FirstOrDefault();
             if (snapshot == null)
             {
-                snapshot = new VmiSnapshot { Name = time, Start = now, Description = table };
+                snapshot = new VmiSnapshot { Name = now.ToString("yyyy-MM-dd HH:mm:ss"), Start = now, Description = table };
                 db.Set<VmiSnapshot>().Add(snapshot);
                 db.SaveChanges();
                 var result = db.Database.ExecuteSqlRaw($"select * into {table}  from Set_VmiBalance;");

From ca2528452cbb28f11f2cfb5af7c8af55d4e72413 Mon Sep 17 00:00:00 2001
From: wanggang <76527413@qq.com>
Date: Thu, 24 Aug 2023 08:23:00 +0800
Subject: [PATCH 14/14] up

---
 .../wwwroot/views/settle/_check.js                         | 6 ++++--
 .../wwwroot/views/settle/commerce.js                       | 6 ++++--
 .../wwwroot/views/settle/finance.js                        | 7 +++++--
 3 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/settle/_check.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/settle/_check.js
index bf663539..d2a3c757 100644
--- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/settle/_check.js
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/settle/_check.js
@@ -42,7 +42,9 @@ export default {
       <template #footer>
         <span class="dialog-footer">
           <el-button type="primary" @click="show=false"> 返回 </el-button>
-          <el-button type="primary" @click="showSetupDialog" v-if="isBusiness&&data.invbillNum&&model.adJ_DETAIL.length===0"> 重开发票 </el-button>
+          <el-button type="primary" @click="showSetupDialog" v-if="isBusiness&&data.invbillNum&&model.adJ_DETAIL.length===0&&row.invoiceState===1&&(row.state===3||row.state===4)">
+            重开发票号
+          </el-button>
         </span>
       </template>
     </el-drawer>
@@ -173,7 +175,7 @@ export default {
       background: yellow;
     }
   </style>`,
-  props: ["modelValue", "data", "isBusiness", "businessType"],
+  props: ["modelValue", "row", "data", "isBusiness", "businessType"],
   emit: ["update:modelValue"],
   setup(props, context) {
     const show = ref(props.modelValue);
diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/settle/commerce.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/settle/commerce.js
index 554545cd..318f61f5 100644
--- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/settle/commerce.js
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/settle/commerce.js
@@ -9,10 +9,11 @@ import AppCheck from "./_check.js";
 export default {
   components: { AppList, AppCheck },
   template: html`<app-list ref="appListRef" :config="config" @command="onCommand" />
-    <app-check v-if="visable" v-model="visable" :businessType="businessType" :data="data" :isBusiness="true" />`,
+    <app-check v-if="visable" v-model="visable" :businessType="businessType" :row="row" :data="data" :isBusiness="true" />`,
   setup() {
     const appListRef = ref(null);
     const visable = ref(false);
+    const row = ref(null);
     const data = ref(null);
     const route = useRoute();
     const businessType = route.meta.businessType;
@@ -50,11 +51,12 @@ export default {
           }
         });
       } else if (item.path === "invbillNum" || item.path === "invGroupNum") {
+        row.value = rows[0];
         data.value = { [item.path]: rows[0][item.path] };
         visable.value = true;
       }
       console.log(item.path, item, rows);
     };
-    return { appListRef, config, onCommand, visable, data, businessType };
+    return { appListRef, config, onCommand, visable, row, data, businessType };
   },
 };
diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/settle/finance.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/settle/finance.js
index f03f849b..10734a21 100644
--- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/settle/finance.js
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/settle/finance.js
@@ -8,10 +8,12 @@ import AppCheck from "./_check.js";
 
 export default {
   components: { AppList, AppCheck },
-  template: html`<app-list ref="appListRef" :config="config" @command="onCommand" /> <app-check v-if="visable" v-model="visable" :businessType="businessType" :data="data" />`,
+  template: html`<app-list ref="appListRef" :config="config" @command="onCommand" />
+    <app-check v-if="visable" v-model="visable" :businessType="businessType" :row="row" :data="data" />`,
   setup() {
     const appListRef = ref(null);
     const visable = ref(false);
+    const row = ref(null);
     const data = ref(null);
     const route = useRoute();
     const businessType = route.meta.businessType;
@@ -49,11 +51,12 @@ export default {
           }
         });
       } else if (item.path === "invbillNum" || item.path === "invGroupNum") {
+        row.value = rows[0];
         data.value = { [item.path]: rows[0][item.path] };
         visable.value = true;
       }
       console.log(item.path, item, rows);
     };
-    return { appListRef, config, onCommand, visable, data, businessType };
+    return { appListRef, config, onCommand, visable, row, data, businessType };
   },
 };