From 25faf70c5f6c46f036ad6ae00b57d69361282099 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: Wed, 9 Aug 2023 16:24:18 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A1=B5=E9=9D=A2=E7=BB=93?=
 =?UTF-8?q?=E6=9E=84=EF=BC=8C=E6=9B=B4=E6=94=B9=E8=BF=9B=E5=85=A5=E7=95=8C?=
 =?UTF-8?q?=E9=9D=A2version=E7=A9=BA=E5=80=BC=E6=9F=A5=E8=AF=A2=E6=89=80?=
 =?UTF-8?q?=E6=9C=89=EF=BC=8C=E6=90=9C=E7=B4=A2=E6=9D=A1=E4=BB=B6=E5=8F=AF?=
 =?UTF-8?q?=E4=BB=A5=E6=B8=85=E7=A9=BA=E6=95=B0=E6=8D=AE=EF=BC=8C=E5=AF=84?=
 =?UTF-8?q?=E5=94=AE=E5=BA=93=E7=9A=84=E5=AD=97=E6=AE=B5=E9=87=8D=E6=96=B0?=
 =?UTF-8?q?=E4=BF=AE=E6=AD=A3=EF=BC=8C=E6=89=8B=E5=8A=A8=E5=90=8C=E6=AD=A5?=
 =?UTF-8?q?=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wwwroot/components/form/form-input.js     |    2 +-
 .../wwwroot/components/list/index.js          |    4 +
 .../wwwroot/models/bbac-edi-se-compare.js     |    4 +-
 .../wwwroot/models/hbpo-edi-se-compare.js     |    5 +-
 .../wwwroot/models/inventory/adjust.js        |   15 +-
 .../wwwroot/models/inventory/backup.js        |    6 +-
 .../wwwroot/models/inventory/balance.js       |    6 +-
 .../wwwroot/models/inventory/inventory.js     |    8 +-
 .../wwwroot/models/inventory/log.js           |   26 +-
 .../wwwroot/models/inventory/vmi.js           |   14 +-
 .../models/invoice/invoice_map_group.js       |    8 +-
 .../models/jis-bbac/input/bbac_sa_service.js  |    5 +-
 .../jis-bbac/input/bbac_se_detail_service.js  |   16 +-
 .../models/jis-hbpo/input/hbpo_sa_service.js  |    5 +-
 .../jis-hbpo/input/hbpo_se_detail_service.js  |   15 +-
 .../wwwroot/models/job-service.js             |    4 +-
 .../wwwroot/models/version.js                 |    2 +-
 .../wwwroot/router/business.js                | 1775 ++++++++---------
 .../jit-hbpo/input/hbpo_jit_pub_sa_service.js |    4 +-
 19 files changed, 955 insertions(+), 969 deletions(-)

diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/components/form/form-input.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/components/form/form-input.js
index 0670a999..f09cacdd 100644
--- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/components/form/form-input.js
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/components/form/form-input.js
@@ -76,7 +76,7 @@ export default {
       </template>
       <template v-else>
         <el-input
-          :clearable="!!schema.clearable"
+          clearable
           :disabled="getDisabled()"
           :placeholder="schema.title"
           v-model="model[prop]"
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 a5d9a0c8..9f85f0e8 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
@@ -618,6 +618,10 @@ export default {
         } finally {
           editFormloading.value = false;
         }
+      } else if (item.path === "sync") {
+        const url = config.edit.syncUrl;
+        const method = config.edit.syncMethod;
+        await request(url, null, { method });
       } else if (item === "filter") {
         editFormTitle.value = t("自定义查询");
         dialogVisible.value = true;
diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/bbac-edi-se-compare.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/bbac-edi-se-compare.js
index 550041be..3e460c5f 100644
--- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/bbac-edi-se-compare.js
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/bbac-edi-se-compare.js
@@ -55,12 +55,12 @@ export default function () {
       url: queryUrl,
       method: queryMethod,
       autoSubmit: true,
-      disableQueryOnLoad: true,
+      disableQueryOnLoad: false,
       schema: {
         title: "数据对比",
         type: "object",
         properties: {
-          type: Object.assign({ defaultSelected: true }, version),
+          type: Object.assign({ defaultSelected: false }, version),
           name: {
             type: "string",
             default: null,
diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/hbpo-edi-se-compare.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/hbpo-edi-se-compare.js
index 66f792e1..6723abbe 100644
--- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/hbpo-edi-se-compare.js
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/hbpo-edi-se-compare.js
@@ -54,14 +54,13 @@ export default function () {
     query: {
       url: queryUrl,
       method: queryMethod,
-
       autoSubmit: true,
-      disableQueryOnLoad: true,
+      disableQueryOnLoad: false,
       schema: {
         title: "数据对比",
         type: "object",
         properties: {
-          type: Object.assign({ defaultSelected: true }, version),
+          type: Object.assign({ defaultSelected: false }, version),
           name: {
             type: "string",
             default: null,
diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/inventory/adjust.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/inventory/adjust.js
index 01d5910d..46340bed 100644
--- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/inventory/adjust.js
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/inventory/adjust.js
@@ -4,6 +4,11 @@ const schema = {
   title: "库存事务日志",
   type: "object",
   properties: {
+    logType: {
+      title: "库存事务分类",
+      type: "string",
+      hidden: true,
+    },
     changedNumber: {
       title: "变动单号",
       type: "string",
@@ -11,7 +16,7 @@ const schema = {
     changedTime: {
       title: "变动时间",
       type: "string",
-      input: "dateTime",
+      input: "datetime",
     },
     changedType,
     changedBy: {
@@ -91,6 +96,7 @@ export default function () {
         title: "通用代码",
         type: "object",
         properties: {
+          logTypes: { type: "array", hidden: true, default: ["Type500", "Type600"] },
           filters: {
             title: "项目",
             type: "array",
@@ -162,6 +168,13 @@ export default function () {
                 value: null,
                 readOnly: true,
               },
+              // {
+              //   logic: "and",
+              //   column: "logType",
+              //   action: "in",
+              //   value: "Type500, Type600",
+              //   readOnly: true,
+              // },
             ],
           },
           skipCount: {
diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/inventory/backup.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/inventory/backup.js
index e0b82612..e2dda639 100644
--- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/inventory/backup.js
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/inventory/backup.js
@@ -73,7 +73,7 @@ export default function () {
               },
               {
                 logic: "and",
-                column: "lu",
+                column: "partCode",
                 action: "like",
                 value: null,
                 readOnly: true,
@@ -88,14 +88,14 @@ export default function () {
               {
                 logic: "and",
                 column: "codeType",
-                action: "like",
+                action: "equal",
                 value: null,
                 readOnly: true,
               },
               {
                 logic: "and",
                 column: "billType",
-                action: "like",
+                action: "equal",
                 value: null,
                 readOnly: true,
               },
diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/inventory/balance.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/inventory/balance.js
index 7cb02e44..5c441cfd 100644
--- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/inventory/balance.js
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/inventory/balance.js
@@ -59,7 +59,7 @@ export default function () {
               },
               {
                 logic: "and",
-                column: "lu",
+                column: "partCode",
                 action: "like",
                 value: null,
                 readOnly: true,
@@ -74,14 +74,14 @@ export default function () {
               {
                 logic: "and",
                 column: "codeType",
-                action: "like",
+                action: "equal",
                 value: null,
                 readOnly: true,
               },
               {
                 logic: "and",
                 column: "billType",
-                action: "like",
+                action: "equal",
                 value: null,
                 readOnly: true,
               },
diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/inventory/inventory.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/inventory/inventory.js
index edc500a9..bbd77d6b 100644
--- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/inventory/inventory.js
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/inventory/inventory.js
@@ -33,9 +33,9 @@ const options4 = [
   { value: "In", label: "入库" },
   { value: "Out", label: "出库" },
 ];
-const billType = { title: "发货类型", type: "number", input: "select", options: options1 };
-const codeType = { title: "生产码类型", type: "string", input: "select", options: options2 };
-const subBillType = { title: "发货子类型", type: "number", input: "select", options: options3 };
-const changedType = { title: "变动类型", type: "string", input: "select", options: options4 };
+const billType = { title: "发货类型", type: "number", input: "select", options: options1, clearable: true };
+const codeType = { title: "生产码类型", type: "string", input: "select", options: options2, clearable: true };
+const subBillType = { title: "发货子类型", type: "number", input: "select", options: options3, clearable: true };
+const changedType = { title: "变动类型", type: "string", input: "select", options: options4, clearable: true };
 
 export { billType, codeType, subBillType, changedType };
diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/inventory/log.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/inventory/log.js
index 55bc5f3e..de7b6072 100644
--- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/inventory/log.js
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/inventory/log.js
@@ -14,7 +14,7 @@ const schema = {
     changedTime: {
       title: "变动时间",
       type: "string",
-      input: "dateTime",
+      input: "datetime",
     },
     changedType,
     changedBy: {
@@ -22,7 +22,7 @@ const schema = {
       type: "string",
     },
     partCode: {
-      title: "实扣厂内零件号",
+      title: "LU零件号",
       type: "string",
     },
     partCode2: {
@@ -45,10 +45,7 @@ const schema = {
       title: "结算生产码",
       type: "string",
     },
-    codeType: {
-      title: "生产码类型",
-      type: "string",
-    },
+    codeType,
     billType,
     subBillType,
     qty: {
@@ -126,6 +123,7 @@ export default function () {
         title: "通用代码",
         type: "object",
         properties: {
+          // logTypes: { type: "array", hidden: true, default: ["Type200", "Type400"] },
           filters: {
             title: "项目",
             type: "array",
@@ -157,42 +155,42 @@ export default function () {
               },
               {
                 logic: "and",
-                column: "createdDate",
+                column: "billTime",
                 action: "like",
                 value: null,
                 readOnly: true,
               },
               {
                 logic: "and",
-                column: "lu",
-                action: "like",
+                column: "billType",
+                action: "equal",
                 value: null,
                 readOnly: true,
               },
               {
                 logic: "and",
-                column: "tmpe4",
+                column: "vinCode",
                 action: "like",
                 value: null,
                 readOnly: true,
               },
               {
                 logic: "and",
-                column: "vinCode",
-                action: "like",
+                column: "codeType",
+                action: "equal",
                 value: null,
                 readOnly: true,
               },
               {
                 logic: "and",
-                column: "codeType",
+                column: "partCode",
                 action: "like",
                 value: null,
                 readOnly: true,
               },
               {
                 logic: "and",
-                column: "proType",
+                column: "orderNum",
                 action: "like",
                 value: null,
                 readOnly: true,
diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/inventory/vmi.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/inventory/vmi.js
index 676754e2..676820e7 100644
--- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/inventory/vmi.js
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/inventory/vmi.js
@@ -10,18 +10,22 @@ export default function () {
       //   hidden: true,
       //   showForList: false,
       // },
-      lu: {
-        title: "LU零件号",
-        type: "string",
-      },
+      // lu: {
+      //   title: "LU零件号",
+      //   type: "string",
+      // },
       partCode: {
-        title: "客户零件号",
+        title: "LU零件号",
         type: "string",
       },
       vinCode: {
         title: "生产码",
         type: "string",
       },
+      customerPartCode: {
+        title: "客户零件号",
+        type: "string",
+      },
       codeType,
       billType,
       qty: {
diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/invoice/invoice_map_group.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/invoice/invoice_map_group.js
index 5a91b60f..a97f8124 100644
--- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/invoice/invoice_map_group.js
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/invoice/invoice_map_group.js
@@ -16,10 +16,10 @@ const schema = {
       type: "string",
       link: true,
     },
-    settleGroupNum: {
-      title: "结算分组号",
-      type: "string",
-    },
+    // settleGroupNum: {
+    //   title: "结算分组号",
+    //   type: "string",
+    // },
     amt: {
       title: "金额",
       type: "decimal",
diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-bbac/input/bbac_sa_service.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-bbac/input/bbac_sa_service.js
index 4fa76483..94c4624d 100644
--- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-bbac/input/bbac_sa_service.js
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-bbac/input/bbac_sa_service.js
@@ -30,10 +30,9 @@ const schema = {
   },
 };
 
-const baseUrl = "settleaccount/bbac_sa_service";
 const queryUrl = "settleaccount/bbac_sa_service/get-list";
-const deleteUrl = `${baseUrl}/delete-list`;
-const importUrl = `${baseUrl}/import`;
+const deleteUrl = "settleaccount/bbac_sa_service/delete-list";
+const importUrl = "settleaccount/bbac_sa_service/import";
 const queryMethod = "POST";
 const deleteMethod = "POST";
 const importMethod = "POST";
diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-bbac/input/bbac_se_detail_service.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-bbac/input/bbac_se_detail_service.js
index 192746e9..f315f7c6 100644
--- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-bbac/input/bbac_se_detail_service.js
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-bbac/input/bbac_se_detail_service.js
@@ -111,15 +111,11 @@ const schema = {
 };
 
 const queryUrl = "settleaccount/bbac_se_detail_service/get-list";
-// const deleteUrl = `${baseUrl}/delete-list`;
-// const importUrl = `${baseUrl}/import`;
 const exportUrl = "settleaccount/bbac_se_detail_service/export";
-const invokeUrl = "settleaccount/bbacse-sync/invoke";
+const syncUrl = "settleaccount/bbacse-sync/invoke";
 const queryMethod = "POST";
-// const deleteMethod = "POST";
-// const importMethod = "POST";
 const exportMethod = "POST";
-const invokeMethod = "POST";
+const syncMethod = "POST";
 
 export default function () {
   return {
@@ -180,14 +176,10 @@ export default function () {
       schema: schema,
     },
     edit: {
-      // deleteUrl,
-      // importUrl,
       exportUrl,
-      invokeUrl,
-      // deleteMethod,
-      // importMethod,
+      syncUrl,
       exportMethod,
-      invokeMethod,
+      syncMethod,
       schema: schema,
     },
   };
diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-hbpo/input/hbpo_sa_service.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-hbpo/input/hbpo_sa_service.js
index a2023300..1614c8bb 100644
--- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-hbpo/input/hbpo_sa_service.js
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-hbpo/input/hbpo_sa_service.js
@@ -28,10 +28,9 @@ const schema = {
   },
 };
 
-const baseUrl = "settleaccount/hbpo_sa_service";
 const queryUrl = "settleaccount/hbpo_sa_service/get-list";
-const deleteUrl = `${baseUrl}/delete-list`;
-const importUrl = `${baseUrl}/import`;
+const deleteUrl = "settleaccount/hbpo_sa_service/delete-list";
+const importUrl = "settleaccount/hbpo_sa_service/import";
 const queryMethod = "POST";
 const deleteMethod = "POST";
 const importMethod = "POST";
diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-hbpo/input/hbpo_se_detail_service.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-hbpo/input/hbpo_se_detail_service.js
index 0745d238..ffc920ec 100644
--- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-hbpo/input/hbpo_se_detail_service.js
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-hbpo/input/hbpo_se_detail_service.js
@@ -1,5 +1,3 @@
-import version from "../../version.js";
-
 const schema = {
   title: "JIS发运数据",
   type: "object",
@@ -112,13 +110,12 @@ const schema = {
   },
 };
 
-const baseUrl = "settleaccount/hbpo_se_detail_service";
-const queryUrl = `${baseUrl}/get-list`;
-const exportUrl = `${baseUrl}/export`;
-const invokeUrl = "settleaccount/hbpose-sync/invoke";
+const queryUrl = "settleaccount/hbpo_se_detail_service/get-list";
+const exportUrl = "settleaccount/hbpo_se_detail_service/export";
+const syncUrl = "settleaccount/hbpose-sync/invoke";
 const queryMethod = "POST";
 const exportMethod = "POST";
-const invokeMethod = "POST";
+const syncMethod = "POST";
 
 export default function () {
   return {
@@ -180,9 +177,9 @@ export default function () {
     },
     edit: {
       exportUrl,
-      invokeUrl,
+      syncUrl,
       exportMethod,
-      invokeMethod,
+      syncMethod,
       schema: schema,
     },
   };
diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/job-service.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/job-service.js
index f4777357..bdc4b2fb 100644
--- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/job-service.js
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/job-service.js
@@ -55,12 +55,12 @@ export default function () {
       url: queryUrl,
       method: queryMethod,
       autoSubmit: true,
-      disableQueryOnLoad: true,
+      disableQueryOnLoad: false,
       schema: {
         title: "数据对比",
         type: "object",
         properties: {
-          type: Object.assign({ defaultSelected: true }, version),
+          type: Object.assign({ defaultSelected: false }, version),
           name: {
             type: "string",
             default: null,
diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/version.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/version.js
index 0bb02076..f4e26bd0 100644
--- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/version.js
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/version.js
@@ -5,5 +5,5 @@ export default {
   url: "settleaccount/centralized-control/get-all",
   value: "version",
   label: "version",
-  clearable: false,
+  clearable: true,
 };
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 dfb576c7..901fabd9 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
@@ -1507,7 +1507,7 @@ export default [
                 path: "hbpo_jit_pub_sa_service",
                 meta: {
                   type: "page",
-                  title: "BBAC结算数据",
+                  title: "HBPO结算数据",
                   icon: "file",
                 },
                 children: [
@@ -1544,7 +1544,7 @@ export default [
                 path: "hbpo_jit_pub_sa_detail_service",
                 meta: {
                   type: "page",
-                  title: "BBAC结算数据明细",
+                  title: "HBPO结算数据明细",
                   icon: "file",
                   isHidden: true,
                 },
@@ -1574,7 +1574,7 @@ export default [
                 path: "hbpo_jit_pub_se_detail_service",
                 meta: {
                   type: "page",
-                  title: "BBAC发运数据",
+                  title: "HBPO发运数据",
                   icon: "file",
                 },
                 children: [
@@ -1622,7 +1622,7 @@ export default [
                 path: "hbpo_jit_pub_sa_detail_jobservice",
                 meta: {
                   type: "page",
-                  title: "BBAC发运与结算比对",
+                  title: "HBPO发运与结算比对",
                   icon: "file",
                 },
                 children: [
@@ -1934,413 +1934,662 @@ export default [
     ],
   },
   {
-    path: "bj",
+    path: "md",
     meta: {
       type: "group",
-      title: "备件",
+      title: "买单件",
       icon: "folder",
     },
     children: [
       {
-        path: "input",
+        path: "md-bbac",
         meta: {
           type: "group",
-          title: "数据输入",
+          title: "BBAC",
           icon: "folder",
         },
         children: [
           {
-            path: "bj_pub_sa_service",
+            path: "input",
             meta: {
-              type: "page",
-              title: "结算数据",
+              type: "group",
+              title: "数据输入",
               icon: "file",
             },
             children: [
               {
-                path: "query",
-                meta: {
-                  type: "button",
-                  title: "查询",
-                  icon: "file",
-                  isTop: true,
-                },
-              },
-              {
-                path: "import",
-                meta: {
-                  type: "button",
-                  title: "导入",
-                  icon: "file",
-                  isTop: true,
-                },
-              },
-              {
-                path: "delete",
+                path: "bbac_md_pub_sa_service",
                 meta: {
-                  type: "button",
-                  title: "删除",
+                  type: "page",
+                  title: "结算数据",
                   icon: "file",
-                  isTop: true,
                 },
+                children: [
+                  {
+                    path: "query",
+                    meta: {
+                      type: "button",
+                      title: "查询",
+                      icon: "file",
+                      isTop: true,
+                    },
+                  },
+                  {
+                    path: "import",
+                    meta: {
+                      type: "button",
+                      title: "导入",
+                      icon: "file",
+                      isTop: true,
+                    },
+                  },
+                  {
+                    path: "delete",
+                    meta: {
+                      type: "button",
+                      title: "删除",
+                      icon: "file",
+                      isTop: true,
+                    },
+                  },
+                  {
+                    path: "export",
+                    meta: {
+                      type: "button",
+                      title: "导出",
+                      icon: "file",
+                      isTop: true,
+                      pattern: "paged",
+                    },
+                  },
+                ],
               },
-            ],
-          },
-          {
-            path: "bj_pub_sa_detail_service",
-            meta: {
-              type: "page",
-              title: "结算数据明细",
-              icon: "file",
-              isHidden: true,
-            },
-            children: [
               {
-                path: "query",
+                path: "bbac_md_pub_sa_detail_service",
                 meta: {
-                  type: "button",
-                  title: "查询",
+                  type: "page",
+                  title: "结算数据明细",
                   icon: "file",
-                  isTop: true,
+                  isHidden: true,
                 },
+                children: [
+                  {
+                    path: "query",
+                    meta: {
+                      type: "button",
+                      title: "查询",
+                      icon: "file",
+                      isTop: true,
+                    },
+                  },
+                  {
+                    path: "export",
+                    meta: {
+                      type: "button",
+                      title: "导出",
+                      icon: "file",
+                      isTop: true,
+                      pattern: "paged",
+                    },
+                  },
+                ],
               },
               {
-                path: "export",
+                path: "bbac_md_pub_se_detail_service",
                 meta: {
-                  type: "button",
-                  title: "导出",
+                  type: "page",
+                  title: "发运数据",
                   icon: "file",
-                  isTop: true,
-                  pattern: "paged",
                 },
+                children: [
+                  {
+                    path: "query",
+                    meta: {
+                      type: "button",
+                      title: "查询",
+                      icon: "file",
+                      isTop: true,
+                    },
+                  },
+                  {
+                    path: "export",
+                    meta: {
+                      type: "button",
+                      title: "导出",
+                      icon: "file",
+                      isTop: true,
+                      pattern: "paged",
+                    },
+                  },
+                  {
+                    path: "sync",
+                    meta: {
+                      type: "button",
+                      title: "手动同步",
+                      icon: "file",
+                      isTop: true,
+                    },
+                  },
+                ],
               },
             ],
           },
           {
-            path: "bj_pub_se_detail_service",
+            path: "contrast",
             meta: {
-              type: "page",
-              title: "发运数据",
+              type: "group",
+              title: "数据对比",
               icon: "file",
             },
             children: [
               {
-                path: "query",
-                meta: {
-                  type: "button",
-                  title: "查询",
-                  icon: "file",
-                  isTop: true,
-                },
-              },
-              {
-                path: "sync",
-                meta: {
-                  type: "button",
-                  title: "手动同步",
-                  icon: "file",
-                  isTop: true,
-                },
-              },
-              {
-                path: "export",
+                path: "bbac_md_pub_sa_detail_jobservice",
                 meta: {
-                  type: "button",
-                  title: "导出",
+                  type: "page",
+                  title: "发运与结算比对",
                   icon: "file",
-                  isTop: true,
-                  pattern: "paged",
                 },
+                children: [
+                  {
+                    path: "query",
+                    meta: {
+                      type: "button",
+                      title: "查询",
+                      icon: "file",
+                      isTop: true,
+                    },
+                  },
+                  {
+                    path: "compare",
+                    meta: {
+                      type: "button",
+                      title: "生成对比",
+                      icon: "file",
+                      isTop: true,
+                    },
+                  },
+                  {
+                    path: "delete",
+                    meta: {
+                      type: "button",
+                      title: "删除",
+                      icon: "file",
+                      isTop: true,
+                    },
+                  },
+                  {
+                    path: "update-data",
+                    meta: {
+                      type: "button",
+                      title: "更新结算数据状态",
+                      icon: "file",
+                      isTop: true,
+                    },
+                  },
+                  {
+                    path: "export",
+                    meta: {
+                      type: "button",
+                      title: "下载",
+                      icon: "file",
+                      pattern: "paged",
+                    },
+                  },
+                ],
               },
             ],
           },
         ],
       },
       {
-        path: "contrast",
+        path: "md-hbpo",
         meta: {
           type: "group",
-          title: "数据对比",
+          title: "HBPO",
           icon: "folder",
         },
         children: [
           {
-            path: "bj_pub_sa_detail_jobservice",
+            path: "input",
             meta: {
-              type: "page",
-              title: "发运与结算比对",
+              type: "group",
+              title: "数据输入",
               icon: "file",
-              // businessType: "BeiJian",
             },
             children: [
               {
-                path: "query",
+                path: "hbpo_md_pub_sa_service",
                 meta: {
-                  type: "button",
-                  title: "查询",
+                  type: "page",
+                  title: "结算数据",
                   icon: "file",
-                  isTop: true,
-                },
-              },
-              {
-                path: "compare",
-                meta: {
-                  type: "button",
-                  title: "生成对比",
-                  icon: "file",
-                  isTop: true,
-                },
-              },
-              {
-                path: "delete",
-                meta: {
-                  type: "button",
-                  title: "删除",
-                  icon: "file",
-                  isTop: true,
-                },
-              },
-              {
-                path: "update-data",
-                meta: {
-                  type: "button",
-                  title: "更新结算数据状态",
-                  icon: "file",
-                  isTop: true,
-                },
-              },
-              {
-                path: "export",
-                meta: {
-                  type: "button",
-                  title: "下载",
-                  icon: "file",
-                  pattern: "paged",
-                },
-              },
-            ],
-          },
-        ],
-      },
-      {
-        path: "settlement",
-        meta: {
-          type: "group",
-          title: "结算开票",
-          icon: "folder",
-        },
-        children: [
-          {
-            path: "bj_pub_can_sa_service",
-            meta: {
-              type: "page",
-              title: "可结算单",
-              icon: "file",
-            },
-            children: [
-              {
-                path: "query",
-                meta: {
-                  type: "button",
-                  title: "查询",
-                  icon: "file",
-                  isTop: true,
                 },
+                children: [
+                  {
+                    path: "query",
+                    meta: {
+                      type: "button",
+                      title: "查询",
+                      icon: "file",
+                      isTop: true,
+                    },
+                  },
+                  {
+                    path: "import",
+                    meta: {
+                      type: "button",
+                      title: "导入",
+                      icon: "file",
+                      isTop: true,
+                    },
+                  },
+                  {
+                    path: "delete",
+                    meta: {
+                      type: "button",
+                      title: "删除",
+                      icon: "file",
+                      isTop: true,
+                    },
+                  },
+                  {
+                    path: "export",
+                    meta: {
+                      type: "button",
+                      title: "导出",
+                      icon: "file",
+                      isTop: true,
+                      pattern: "paged",
+                    },
+                  },
+                ],
               },
               {
-                path: "export",
+                path: "hbpo_md_pub_sa_detail_service",
                 meta: {
-                  type: "button",
-                  title: "导出",
+                  type: "page",
+                  title: "结算数据明细",
                   icon: "file",
-                  isTop: true,
-                  pattern: "paged",
+                  isHidden: true,
                 },
+                children: [
+                  {
+                    path: "query",
+                    meta: {
+                      type: "button",
+                      title: "查询",
+                      icon: "file",
+                      isTop: true,
+                    },
+                  },
+                  {
+                    path: "export",
+                    meta: {
+                      type: "button",
+                      title: "导出",
+                      icon: "file",
+                      isTop: true,
+                      pattern: "paged",
+                    },
+                  },
+                ],
               },
               {
-                path: "generateInvoice",
+                path: "hbpo_md_pub_se_detail_service",
                 meta: {
-                  type: "button",
-                  title: "生成发票数据",
+                  type: "page",
+                  title: "发运数据",
                   icon: "file",
-                  isTop: true,
-                  pattern: "paged",
                 },
+                children: [
+                  {
+                    path: "query",
+                    meta: {
+                      type: "button",
+                      title: "查询",
+                      icon: "file",
+                      isTop: true,
+                    },
+                  },
+                  {
+                    path: "export",
+                    meta: {
+                      type: "button",
+                      title: "导出",
+                      icon: "file",
+                      isTop: true,
+                      pattern: "paged",
+                    },
+                  },
+                  {
+                    path: "sync",
+                    meta: {
+                      type: "button",
+                      title: "手动同步",
+                      icon: "file",
+                      isTop: true,
+                    },
+                  },
+                ],
               },
             ],
           },
           {
-            path: "bj_pub_not_sa_service",
+            path: "contrast",
             meta: {
-              type: "page",
-              title: "不可结算单",
+              type: "group",
+              title: "数据对比",
               icon: "file",
             },
             children: [
               {
-                path: "query",
-                meta: {
-                  type: "button",
-                  title: "查询",
-                  icon: "file",
-                  isTop: true,
-                },
-              },
-              {
-                path: "export",
-                meta: {
-                  type: "button",
-                  title: "导出",
-                  icon: "file",
-                  isTop: true,
-                  pattern: "paged",
-                },
-              },
-              {
-                path: "bj_generateSettlementOrder",
+                path: "hbpo_md_pub_sa_detail_jobservice",
                 meta: {
-                  type: "button",
-                  title: "生成可结算单",
+                  type: "page",
+                  title: "发运与结算比对",
                   icon: "file",
-                  isTop: true,
-                  pattern: "paged",
                 },
+                children: [
+                  {
+                    path: "query",
+                    meta: {
+                      type: "button",
+                      title: "查询",
+                      icon: "file",
+                      isTop: true,
+                    },
+                  },
+                  {
+                    path: "compare",
+                    meta: {
+                      type: "button",
+                      title: "生成对比",
+                      icon: "file",
+                      isTop: true,
+                    },
+                  },
+                  {
+                    path: "delete",
+                    meta: {
+                      type: "button",
+                      title: "删除",
+                      icon: "file",
+                      isTop: true,
+                    },
+                  },
+                  {
+                    path: "update-data",
+                    meta: {
+                      type: "button",
+                      title: "更新结算数据状态",
+                      icon: "file",
+                      isTop: true,
+                    },
+                  },
+                  {
+                    path: "export",
+                    meta: {
+                      type: "button",
+                      title: "下载",
+                      icon: "file",
+                      pattern: "paged",
+                    },
+                  },
+                ],
               },
             ],
           },
           {
-            path: "bj_pub_ba_service",
+            path: "settlement",
             meta: {
-              type: "page",
-              title: "商务审批",
-              icon: "file",
+              type: "group",
+              title: "结算开票",
+              icon: "folder",
             },
             children: [
               {
-                path: "query",
-                meta: {
-                  type: "button",
-                  title: "查询",
-                  icon: "file",
-                  isTop: true,
-                },
-              },
-              {
-                path: "reject",
-                meta: {
-                  type: "button",
-                  title: "退回",
-                  icon: "file",
-                  isTop: true,
-                },
-              },
-              {
-                path: "export",
-                meta: {
-                  type: "button",
-                  title: "导出",
-                  icon: "file",
-                  isTop: true,
-                  pattern: "paged",
-                },
-              },
-              {
-                path: "received ",
+                path: "hbpo_md_pub_can_sa_service",
                 meta: {
-                  type: "button",
-                  title: "客户已收票",
+                  type: "page",
+                  title: "可结算单",
                   icon: "file",
-                  isTop: true,
-                  pattern: "paged",
                 },
+                children: [
+                  {
+                    path: "query",
+                    meta: {
+                      type: "button",
+                      title: "查询",
+                      icon: "file",
+                      isTop: true,
+                    },
+                  },
+                  {
+                    path: "export",
+                    meta: {
+                      type: "button",
+                      title: "导出",
+                      icon: "file",
+                      isTop: true,
+                      pattern: "paged",
+                    },
+                  },
+                  {
+                    path: "generateInvoice",
+                    meta: {
+                      type: "button",
+                      title: "生成发票数据",
+                      icon: "file",
+                      isTop: true,
+                      pattern: "paged",
+                    },
+                  },
+                ],
               },
-            ],
-          },
-          {
-            path: "bj_pub_ba_detail_service",
-            meta: {
-              type: "page",
-              title: "商务审批明细",
-              icon: "file",
-              isHidden: true,
-            },
-            children: [
               {
-                path: "query",
+                path: "hbpo_md_pub_can_sa_detail_service",
                 meta: {
-                  type: "button",
-                  title: "查询",
+                  type: "page",
+                  title: "可结算单明细",
                   icon: "file",
-                  isTop: true,
+                  isHidden: true,
                 },
+                children: [
+                  {
+                    path: "query",
+                    meta: {
+                      type: "button",
+                      title: "查询",
+                      icon: "file",
+                      isTop: true,
+                    },
+                  },
+                  {
+                    path: "export",
+                    meta: {
+                      type: "button",
+                      title: "导出",
+                      icon: "file",
+                      isTop: true,
+                      pattern: "paged",
+                    },
+                  },
+                ],
               },
-            ],
-          },
-          {
-            path: "bj_pub_pd_service",
-            meta: {
-              type: "page",
-              title: "寄售库库存扣减审批",
-              icon: "file",
-            },
-            children: [
               {
-                path: "query",
+                path: "hbpo_md_pub_not_sa_service",
                 meta: {
-                  type: "button",
-                  title: "查询",
+                  type: "page",
+                  title: "不可结算单",
                   icon: "file",
-                  isTop: true,
                 },
+                children: [
+                  {
+                    path: "query",
+                    meta: {
+                      type: "button",
+                      title: "查询",
+                      icon: "file",
+                      isTop: true,
+                    },
+                  },
+                  {
+                    path: "export",
+                    meta: {
+                      type: "button",
+                      title: "导出",
+                      icon: "file",
+                      isTop: true,
+                      pattern: "paged",
+                    },
+                  },
+                  {
+                    path: "generateSettlementOrder",
+                    meta: {
+                      type: "button",
+                      title: "生成可结算单",
+                      icon: "file",
+                      isTop: true,
+                      pattern: "paged",
+                    },
+                  },
+                ],
               },
               {
-                path: "reject",
+                path: "hbpo_md_pub_ba_service",
                 meta: {
-                  type: "button",
-                  title: "退回",
+                  type: "page",
+                  title: "商务审批",
                   icon: "file",
-                  isTop: true,
                 },
+                children: [
+                  {
+                    path: "query",
+                    meta: {
+                      type: "button",
+                      title: "查询",
+                      icon: "file",
+                      isTop: true,
+                    },
+                  },
+                  {
+                    path: "reject",
+                    meta: {
+                      type: "button",
+                      title: "退回",
+                      icon: "file",
+                      isTop: true,
+                    },
+                  },
+                  {
+                    path: "export",
+                    meta: {
+                      type: "button",
+                      title: "导出",
+                      icon: "file",
+                      isTop: true,
+                      pattern: "paged",
+                    },
+                  },
+                  {
+                    path: "received ",
+                    meta: {
+                      type: "button",
+                      title: "客户已收票",
+                      icon: "file",
+                      isTop: true,
+                      pattern: "paged",
+                    },
+                  },
+                ],
               },
               {
-                path: "export",
+                path: "hbpo_md_pub_ba_detail_service",
                 meta: {
-                  type: "button",
-                  title: "导出",
+                  type: "page",
+                  title: "商务审批明细",
                   icon: "file",
-                  isTop: true,
-                  pattern: "paged",
+                  isHidden: true,
                 },
+                children: [
+                  {
+                    path: "query",
+                    meta: {
+                      type: "button",
+                      title: "查询",
+                      icon: "file",
+                      isTop: true,
+                    },
+                  },
+                ],
               },
               {
-                path: "approvalPassed ",
+                path: "hbpo_md_pub_pd_service",
                 meta: {
-                  type: "button",
-                  title: "审核通过",
+                  type: "page",
+                  title: "寄售库库存扣减审批",
                   icon: "file",
-                  isTop: true,
-                  pattern: "paged",
                 },
+                children: [
+                  {
+                    path: "query",
+                    meta: {
+                      type: "button",
+                      title: "查询",
+                      icon: "file",
+                      isTop: true,
+                    },
+                  },
+                  {
+                    path: "reject",
+                    meta: {
+                      type: "button",
+                      title: "退回",
+                      icon: "file",
+                      isTop: true,
+                    },
+                  },
+                  {
+                    path: "export",
+                    meta: {
+                      type: "button",
+                      title: "导出",
+                      icon: "file",
+                      isTop: true,
+                      pattern: "paged",
+                    },
+                  },
+                  {
+                    path: "approvalPassed ",
+                    meta: {
+                      type: "button",
+                      title: "审核通过",
+                      icon: "file",
+                      isTop: true,
+                      pattern: "paged",
+                    },
+                  },
+                ],
               },
-            ],
-          },
-          {
-            path: "bj_pub_pd_detail_service",
-            meta: {
-              type: "page",
-              title: "寄售库库存扣减审批明细",
-              icon: "file",
-              isHidden: true,
-            },
-            children: [
               {
-                path: "query",
+                path: "hbpo_md_pub_pd_detail_service",
                 meta: {
-                  type: "button",
-                  title: "查询",
+                  type: "page",
+                  title: "寄售库库存扣减审批明细",
                   icon: "file",
-                  isTop: true,
+                  isHidden: true,
                 },
+                children: [
+                  {
+                    path: "query",
+                    meta: {
+                      type: "button",
+                      title: "查询",
+                      icon: "file",
+                      isTop: true,
+                    },
+                  },
+                ],
               },
             ],
           },
@@ -2349,10 +2598,10 @@ export default [
     ],
   },
   {
-    path: "in",
+    path: "bj",
     meta: {
       type: "group",
-      title: "印度件",
+      title: "备件",
       icon: "folder",
     },
     children: [
@@ -2365,7 +2614,7 @@ export default [
         },
         children: [
           {
-            path: "in_pub_sa_service",
+            path: "bj_pub_sa_service",
             meta: {
               type: "page",
               title: "结算数据",
@@ -2402,7 +2651,7 @@ export default [
             ],
           },
           {
-            path: "in_pub_sa_detail_service",
+            path: "bj_pub_sa_detail_service",
             meta: {
               type: "page",
               title: "结算数据明细",
@@ -2432,7 +2681,7 @@ export default [
             ],
           },
           {
-            path: "in_pub_se_detail_service",
+            path: "bj_pub_se_detail_service",
             meta: {
               type: "page",
               title: "发运数据",
@@ -2480,11 +2729,12 @@ export default [
         },
         children: [
           {
-            path: "in_pub_sa_detail_jobservice",
+            path: "bj_pub_sa_detail_jobservice",
             meta: {
               type: "page",
               title: "发运与结算比对",
               icon: "file",
+              // businessType: "BeiJian",
             },
             children: [
               {
@@ -2545,7 +2795,7 @@ export default [
         },
         children: [
           {
-            path: "in_pub_can_sa_service",
+            path: "bj_pub_can_sa_service",
             meta: {
               type: "page",
               title: "可结算单",
@@ -2584,7 +2834,7 @@ export default [
             ],
           },
           {
-            path: "in_pub_not_sa_service",
+            path: "bj_pub_not_sa_service",
             meta: {
               type: "page",
               title: "不可结算单",
@@ -2611,7 +2861,7 @@ export default [
                 },
               },
               {
-                path: "generateSettlementOrder",
+                path: "bj_generateSettlementOrder",
                 meta: {
                   type: "button",
                   title: "生成可结算单",
@@ -2623,7 +2873,7 @@ export default [
             ],
           },
           {
-            path: "in_pub_ba_service",
+            path: "bj_pub_ba_service",
             meta: {
               type: "page",
               title: "商务审批",
@@ -2671,7 +2921,7 @@ export default [
             ],
           },
           {
-            path: "in_pub_ba_detail_service",
+            path: "bj_pub_ba_detail_service",
             meta: {
               type: "page",
               title: "商务审批明细",
@@ -2691,10 +2941,165 @@ export default [
             ],
           },
           {
-            path: "in_pub_pd_service",
+            path: "bj_pub_pd_service",
+            meta: {
+              type: "page",
+              title: "寄售库库存扣减审批",
+              icon: "file",
+            },
+            children: [
+              {
+                path: "query",
+                meta: {
+                  type: "button",
+                  title: "查询",
+                  icon: "file",
+                  isTop: true,
+                },
+              },
+              {
+                path: "reject",
+                meta: {
+                  type: "button",
+                  title: "退回",
+                  icon: "file",
+                  isTop: true,
+                },
+              },
+              {
+                path: "export",
+                meta: {
+                  type: "button",
+                  title: "导出",
+                  icon: "file",
+                  isTop: true,
+                  pattern: "paged",
+                },
+              },
+              {
+                path: "approvalPassed ",
+                meta: {
+                  type: "button",
+                  title: "审核通过",
+                  icon: "file",
+                  isTop: true,
+                  pattern: "paged",
+                },
+              },
+            ],
+          },
+          {
+            path: "bj_pub_pd_detail_service",
+            meta: {
+              type: "page",
+              title: "寄售库库存扣减审批明细",
+              icon: "file",
+              isHidden: true,
+            },
+            children: [
+              {
+                path: "query",
+                meta: {
+                  type: "button",
+                  title: "查询",
+                  icon: "file",
+                  isTop: true,
+                },
+              },
+            ],
+          },
+        ],
+      },
+    ],
+  },
+  {
+    path: "in",
+    meta: {
+      type: "group",
+      title: "印度件",
+      icon: "folder",
+    },
+    children: [
+      {
+        path: "input",
+        meta: {
+          type: "group",
+          title: "数据输入",
+          icon: "folder",
+        },
+        children: [
+          {
+            path: "in_pub_sa_service",
+            meta: {
+              type: "page",
+              title: "结算数据",
+              icon: "file",
+            },
+            children: [
+              {
+                path: "query",
+                meta: {
+                  type: "button",
+                  title: "查询",
+                  icon: "file",
+                  isTop: true,
+                },
+              },
+              {
+                path: "import",
+                meta: {
+                  type: "button",
+                  title: "导入",
+                  icon: "file",
+                  isTop: true,
+                },
+              },
+              {
+                path: "delete",
+                meta: {
+                  type: "button",
+                  title: "删除",
+                  icon: "file",
+                  isTop: true,
+                },
+              },
+            ],
+          },
+          {
+            path: "in_pub_sa_detail_service",
+            meta: {
+              type: "page",
+              title: "结算数据明细",
+              icon: "file",
+              isHidden: true,
+            },
+            children: [
+              {
+                path: "query",
+                meta: {
+                  type: "button",
+                  title: "查询",
+                  icon: "file",
+                  isTop: true,
+                },
+              },
+              {
+                path: "export",
+                meta: {
+                  type: "button",
+                  title: "导出",
+                  icon: "file",
+                  isTop: true,
+                  pattern: "paged",
+                },
+              },
+            ],
+          },
+          {
+            path: "in_pub_se_detail_service",
             meta: {
               type: "page",
-              title: "寄售库库存扣减审批",
+              title: "发运数据",
               icon: "file",
             },
             children: [
@@ -2708,10 +3113,10 @@ export default [
                 },
               },
               {
-                path: "reject",
+                path: "sync",
                 meta: {
                   type: "button",
-                  title: "退回",
+                  title: "手动同步",
                   icon: "file",
                   isTop: true,
                 },
@@ -2726,25 +3131,24 @@ export default [
                   pattern: "paged",
                 },
               },
-              {
-                path: "approvalPassed ",
-                meta: {
-                  type: "button",
-                  title: "审核通过",
-                  icon: "file",
-                  isTop: true,
-                  pattern: "paged",
-                },
-              },
             ],
           },
+        ],
+      },
+      {
+        path: "contrast",
+        meta: {
+          type: "group",
+          title: "数据对比",
+          icon: "folder",
+        },
+        children: [
           {
-            path: "in_pub_pd_detail_service",
+            path: "in_pub_sa_detail_jobservice",
             meta: {
               type: "page",
-              title: "寄售库库存扣减审批明细",
+              title: "发运与结算比对",
               icon: "file",
-              isHidden: true,
             },
             children: [
               {
@@ -2756,670 +3160,265 @@ export default [
                   isTop: true,
                 },
               },
-            ],
-          },
-        ],
-      },
-    ],
-  },
-  //不知道自主起的名字
-  {
-    path: "md",
-    meta: {
-      type: "group",
-      title: "买单件",
-      icon: "folder",
-    },
-    children: [
-      {
-        path: "md-hbpo",
-        meta: {
-          type: "group",
-          title: "HBPO",
-          icon: "folder",
-        },
-        children: [
-          {
-            path: "input",
-            meta: {
-              type: "group",
-              title: "数据输入",
-              icon: "file",
-            },
-            children: [
               {
-                path: "hbpo_md_pub_sa_service",
+                path: "compare",
                 meta: {
-                  type: "page",
-                  title: "结算数据",
+                  type: "button",
+                  title: "生成对比",
                   icon: "file",
+                  isTop: true,
                 },
-                children: [
-                  {
-                    path: "query",
-                    meta: {
-                      type: "button",
-                      title: "查询",
-                      icon: "file",
-                      isTop: true,
-                    },
-                  },
-                  {
-                    path: "import",
-                    meta: {
-                      type: "button",
-                      title: "导入",
-                      icon: "file",
-                      isTop: true,
-                    },
-                  },
-                  {
-                    path: "delete",
-                    meta: {
-                      type: "button",
-                      title: "删除",
-                      icon: "file",
-                      isTop: true,
-                    },
-                  },
-                  {
-                    path: "export",
-                    meta: {
-                      type: "button",
-                      title: "导出",
-                      icon: "file",
-                      isTop: true,
-                      pattern: "paged",
-                    },
-                  },
-                ],
               },
               {
-                path: "hbpo_md_pub_sa_detail_service",
+                path: "delete",
                 meta: {
-                  type: "page",
-                  title: "结算数据明细",
+                  type: "button",
+                  title: "删除",
                   icon: "file",
-                  isHidden: true,
+                  isTop: true,
                 },
-                children: [
-                  {
-                    path: "query",
-                    meta: {
-                      type: "button",
-                      title: "查询",
-                      icon: "file",
-                      isTop: true,
-                    },
-                  },
-                  {
-                    path: "export",
-                    meta: {
-                      type: "button",
-                      title: "导出",
-                      icon: "file",
-                      isTop: true,
-                      pattern: "paged",
-                    },
-                  },
-                ],
               },
               {
-                path: "hbpo_md_pub_se_detail_service",
+                path: "update-data",
                 meta: {
-                  type: "page",
-                  title: "发运数据",
+                  type: "button",
+                  title: "更新结算数据状态",
                   icon: "file",
+                  isTop: true,
+                },
+              },
+              {
+                path: "export",
+                meta: {
+                  type: "button",
+                  title: "下载",
+                  icon: "file",
+                  pattern: "paged",
                 },
-                children: [
-                  {
-                    path: "query",
-                    meta: {
-                      type: "button",
-                      title: "查询",
-                      icon: "file",
-                      isTop: true,
-                    },
-                  },
-                  {
-                    path: "export",
-                    meta: {
-                      type: "button",
-                      title: "导出",
-                      icon: "file",
-                      isTop: true,
-                      pattern: "paged",
-                    },
-                  },
-                  {
-                    path: "sync",
-                    meta: {
-                      type: "button",
-                      title: "手动同步",
-                      icon: "file",
-                      isTop: true,
-                    },
-                  },
-                ],
               },
             ],
           },
+        ],
+      },
+      {
+        path: "settlement",
+        meta: {
+          type: "group",
+          title: "结算开票",
+          icon: "folder",
+        },
+        children: [
           {
-            path: "contrast",
+            path: "in_pub_can_sa_service",
             meta: {
-              type: "group",
-              title: "数据对比",
+              type: "page",
+              title: "可结算单",
               icon: "file",
             },
             children: [
               {
-                path: "hbpo_md_pub_sa_detail_jobservice",
+                path: "query",
                 meta: {
-                  type: "page",
-                  title: "发运与结算比对",
+                  type: "button",
+                  title: "查询",
                   icon: "file",
+                  isTop: true,
+                },
+              },
+              {
+                path: "export",
+                meta: {
+                  type: "button",
+                  title: "导出",
+                  icon: "file",
+                  isTop: true,
+                  pattern: "paged",
+                },
+              },
+              {
+                path: "generateInvoice",
+                meta: {
+                  type: "button",
+                  title: "生成发票数据",
+                  icon: "file",
+                  isTop: true,
+                  pattern: "paged",
                 },
-                children: [
-                  {
-                    path: "query",
-                    meta: {
-                      type: "button",
-                      title: "查询",
-                      icon: "file",
-                      isTop: true,
-                    },
-                  },
-                  {
-                    path: "compare",
-                    meta: {
-                      type: "button",
-                      title: "生成对比",
-                      icon: "file",
-                      isTop: true,
-                    },
-                  },
-                  {
-                    path: "delete",
-                    meta: {
-                      type: "button",
-                      title: "删除",
-                      icon: "file",
-                      isTop: true,
-                    },
-                  },
-                  {
-                    path: "update-data",
-                    meta: {
-                      type: "button",
-                      title: "更新结算数据状态",
-                      icon: "file",
-                      isTop: true,
-                    },
-                  },
-                  {
-                    path: "export",
-                    meta: {
-                      type: "button",
-                      title: "下载",
-                      icon: "file",
-                      pattern: "paged",
-                    },
-                  },
-                ],
               },
             ],
           },
           {
-            path: "settlement",
+            path: "in_pub_not_sa_service",
             meta: {
-              type: "group",
-              title: "结算开票",
-              icon: "folder",
+              type: "page",
+              title: "不可结算单",
+              icon: "file",
             },
             children: [
               {
-                path: "hbpo_md_pub_can_sa_service",
+                path: "query",
                 meta: {
-                  type: "page",
-                  title: "可结算单",
+                  type: "button",
+                  title: "查询",
                   icon: "file",
+                  isTop: true,
                 },
-                children: [
-                  {
-                    path: "query",
-                    meta: {
-                      type: "button",
-                      title: "查询",
-                      icon: "file",
-                      isTop: true,
-                    },
-                  },
-                  {
-                    path: "export",
-                    meta: {
-                      type: "button",
-                      title: "导出",
-                      icon: "file",
-                      isTop: true,
-                      pattern: "paged",
-                    },
-                  },
-                  {
-                    path: "generateInvoice",
-                    meta: {
-                      type: "button",
-                      title: "生成发票数据",
-                      icon: "file",
-                      isTop: true,
-                      pattern: "paged",
-                    },
-                  },
-                ],
               },
               {
-                path: "hbpo_md_pub_can_sa_detail_service",
+                path: "export",
                 meta: {
-                  type: "page",
-                  title: "可结算单明细",
+                  type: "button",
+                  title: "导出",
                   icon: "file",
-                  isHidden: true,
+                  isTop: true,
+                  pattern: "paged",
                 },
-                children: [
-                  {
-                    path: "query",
-                    meta: {
-                      type: "button",
-                      title: "查询",
-                      icon: "file",
-                      isTop: true,
-                    },
-                  },
-                  {
-                    path: "export",
-                    meta: {
-                      type: "button",
-                      title: "导出",
-                      icon: "file",
-                      isTop: true,
-                      pattern: "paged",
-                    },
-                  },
-                ],
               },
               {
-                path: "hbpo_md_pub_not_sa_service",
+                path: "generateSettlementOrder",
                 meta: {
-                  type: "page",
-                  title: "不可结算单",
+                  type: "button",
+                  title: "生成可结算单",
                   icon: "file",
+                  isTop: true,
+                  pattern: "paged",
                 },
-                children: [
-                  {
-                    path: "query",
-                    meta: {
-                      type: "button",
-                      title: "查询",
-                      icon: "file",
-                      isTop: true,
-                    },
-                  },
-                  {
-                    path: "export",
-                    meta: {
-                      type: "button",
-                      title: "导出",
-                      icon: "file",
-                      isTop: true,
-                      pattern: "paged",
-                    },
-                  },
-                  {
-                    path: "generateSettlementOrder",
-                    meta: {
-                      type: "button",
-                      title: "生成可结算单",
-                      icon: "file",
-                      isTop: true,
-                      pattern: "paged",
-                    },
-                  },
-                ],
               },
+            ],
+          },
+          {
+            path: "in_pub_ba_service",
+            meta: {
+              type: "page",
+              title: "商务审批",
+              icon: "file",
+            },
+            children: [
               {
-                path: "hbpo_md_pub_ba_service",
+                path: "query",
                 meta: {
-                  type: "page",
-                  title: "商务审批",
+                  type: "button",
+                  title: "查询",
                   icon: "file",
+                  isTop: true,
                 },
-                children: [
-                  {
-                    path: "query",
-                    meta: {
-                      type: "button",
-                      title: "查询",
-                      icon: "file",
-                      isTop: true,
-                    },
-                  },
-                  {
-                    path: "reject",
-                    meta: {
-                      type: "button",
-                      title: "退回",
-                      icon: "file",
-                      isTop: true,
-                    },
-                  },
-                  {
-                    path: "export",
-                    meta: {
-                      type: "button",
-                      title: "导出",
-                      icon: "file",
-                      isTop: true,
-                      pattern: "paged",
-                    },
-                  },
-                  {
-                    path: "received ",
-                    meta: {
-                      type: "button",
-                      title: "客户已收票",
-                      icon: "file",
-                      isTop: true,
-                      pattern: "paged",
-                    },
-                  },
-                ],
               },
               {
-                path: "hbpo_md_pub_ba_detail_service",
+                path: "reject",
                 meta: {
-                  type: "page",
-                  title: "商务审批明细",
+                  type: "button",
+                  title: "退回",
                   icon: "file",
-                  isHidden: true,
+                  isTop: true,
                 },
-                children: [
-                  {
-                    path: "query",
-                    meta: {
-                      type: "button",
-                      title: "查询",
-                      icon: "file",
-                      isTop: true,
-                    },
-                  },
-                ],
               },
               {
-                path: "hbpo_md_pub_pd_service",
+                path: "export",
                 meta: {
-                  type: "page",
-                  title: "寄售库库存扣减审批",
+                  type: "button",
+                  title: "导出",
                   icon: "file",
-                },
-                children: [
-                  {
-                    path: "query",
-                    meta: {
-                      type: "button",
-                      title: "查询",
-                      icon: "file",
-                      isTop: true,
-                    },
-                  },
-                  {
-                    path: "reject",
-                    meta: {
-                      type: "button",
-                      title: "退回",
-                      icon: "file",
-                      isTop: true,
-                    },
-                  },
-                  {
-                    path: "export",
-                    meta: {
-                      type: "button",
-                      title: "导出",
-                      icon: "file",
-                      isTop: true,
-                      pattern: "paged",
-                    },
-                  },
-                  {
-                    path: "approvalPassed ",
-                    meta: {
-                      type: "button",
-                      title: "审核通过",
-                      icon: "file",
-                      isTop: true,
-                      pattern: "paged",
-                    },
-                  },
-                ],
+                  isTop: true,
+                  pattern: "paged",
+                },
               },
               {
-                path: "hbpo_md_pub_pd_detail_service",
+                path: "received ",
                 meta: {
-                  type: "page",
-                  title: "寄售库库存扣减审批明细",
+                  type: "button",
+                  title: "客户已收票",
                   icon: "file",
-                  isHidden: true,
+                  isTop: true,
+                  pattern: "paged",
                 },
-                children: [
-                  {
-                    path: "query",
-                    meta: {
-                      type: "button",
-                      title: "查询",
-                      icon: "file",
-                      isTop: true,
-                    },
-                  },
-                ],
               },
             ],
           },
-        ],
-      },
-      {
-        path: "md-bbac",
-        meta: {
-          type: "group",
-          title: "BBAC",
-          icon: "folder",
-        },
-        children: [
           {
-            path: "input",
+            path: "in_pub_ba_detail_service",
             meta: {
-              type: "group",
-              title: "数据输入",
+              type: "page",
+              title: "商务审批明细",
               icon: "file",
+              isHidden: true,
             },
             children: [
               {
-                path: "bbac_md_pub_sa_service",
+                path: "query",
                 meta: {
-                  type: "page",
-                  title: "结算数据",
+                  type: "button",
+                  title: "查询",
                   icon: "file",
+                  isTop: true,
                 },
-                children: [
-                  {
-                    path: "query",
-                    meta: {
-                      type: "button",
-                      title: "查询",
-                      icon: "file",
-                      isTop: true,
-                    },
-                  },
-                  {
-                    path: "import",
-                    meta: {
-                      type: "button",
-                      title: "导入",
-                      icon: "file",
-                      isTop: true,
-                    },
-                  },
-                  {
-                    path: "delete",
-                    meta: {
-                      type: "button",
-                      title: "删除",
-                      icon: "file",
-                      isTop: true,
-                    },
-                  },
-                  {
-                    path: "export",
-                    meta: {
-                      type: "button",
-                      title: "导出",
-                      icon: "file",
-                      isTop: true,
-                      pattern: "paged",
-                    },
-                  },
-                ],
               },
+            ],
+          },
+          {
+            path: "in_pub_pd_service",
+            meta: {
+              type: "page",
+              title: "寄售库库存扣减审批",
+              icon: "file",
+            },
+            children: [
               {
-                path: "bbac_md_pub_sa_detail_service",
+                path: "query",
                 meta: {
-                  type: "page",
-                  title: "结算数据明细",
+                  type: "button",
+                  title: "查询",
                   icon: "file",
-                  isHidden: true,
+                  isTop: true,
                 },
-                children: [
-                  {
-                    path: "query",
-                    meta: {
-                      type: "button",
-                      title: "查询",
-                      icon: "file",
-                      isTop: true,
-                    },
-                  },
-                  {
-                    path: "export",
-                    meta: {
-                      type: "button",
-                      title: "导出",
-                      icon: "file",
-                      isTop: true,
-                      pattern: "paged",
-                    },
-                  },
-                ],
               },
               {
-                path: "bbac_md_pub_se_detail_service",
+                path: "reject",
                 meta: {
-                  type: "page",
-                  title: "发运数据",
+                  type: "button",
+                  title: "退回",
                   icon: "file",
+                  isTop: true,
+                },
+              },
+              {
+                path: "export",
+                meta: {
+                  type: "button",
+                  title: "导出",
+                  icon: "file",
+                  isTop: true,
+                  pattern: "paged",
+                },
+              },
+              {
+                path: "approvalPassed ",
+                meta: {
+                  type: "button",
+                  title: "审核通过",
+                  icon: "file",
+                  isTop: true,
+                  pattern: "paged",
                 },
-                children: [
-                  {
-                    path: "query",
-                    meta: {
-                      type: "button",
-                      title: "查询",
-                      icon: "file",
-                      isTop: true,
-                    },
-                  },
-                  {
-                    path: "export",
-                    meta: {
-                      type: "button",
-                      title: "导出",
-                      icon: "file",
-                      isTop: true,
-                      pattern: "paged",
-                    },
-                  },
-                  {
-                    path: "sync",
-                    meta: {
-                      type: "button",
-                      title: "手动同步",
-                      icon: "file",
-                      isTop: true,
-                    },
-                  },
-                ],
               },
             ],
           },
           {
-            path: "contrast",
+            path: "in_pub_pd_detail_service",
             meta: {
-              type: "group",
-              title: "数据对比",
+              type: "page",
+              title: "寄售库库存扣减审批明细",
               icon: "file",
+              isHidden: true,
             },
             children: [
               {
-                path: "bbac_md_pub_sa_detail_jobservice",
+                path: "query",
                 meta: {
-                  type: "page",
-                  title: "发运与结算比对",
+                  type: "button",
+                  title: "查询",
                   icon: "file",
+                  isTop: true,
                 },
-                children: [
-                  {
-                    path: "query",
-                    meta: {
-                      type: "button",
-                      title: "查询",
-                      icon: "file",
-                      isTop: true,
-                    },
-                  },
-                  {
-                    path: "compare",
-                    meta: {
-                      type: "button",
-                      title: "生成对比",
-                      icon: "file",
-                      isTop: true,
-                    },
-                  },
-                  {
-                    path: "delete",
-                    meta: {
-                      type: "button",
-                      title: "删除",
-                      icon: "file",
-                      isTop: true,
-                    },
-                  },
-                  {
-                    path: "update-data",
-                    meta: {
-                      type: "button",
-                      title: "更新结算数据状态",
-                      icon: "file",
-                      isTop: true,
-                    },
-                  },
-                  {
-                    path: "export",
-                    meta: {
-                      type: "button",
-                      title: "下载",
-                      icon: "file",
-                      pattern: "paged",
-                    },
-                  },
-                ],
               },
             ],
           },
@@ -3658,7 +3657,7 @@ export default [
         path: "log",
         meta: {
           type: "page",
-          title: "库存事物查询",
+          title: "库存事务查询",
           icon: "file",
         },
         children: [
@@ -3757,24 +3756,6 @@ export default [
               isTop: true,
             },
           },
-          {
-            path: "update",
-            meta: {
-              type: "button",
-              title: "编辑",
-              icon: "file",
-              isTop: true,
-            },
-          },
-          {
-            path: "import",
-            meta: {
-              type: "button",
-              title: "导入",
-              icon: "file",
-              isTop: true,
-            },
-          },
         ],
       },
     ],
diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jit/jit-hbpo/input/hbpo_jit_pub_sa_service.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jit/jit-hbpo/input/hbpo_jit_pub_sa_service.js
index 7d08dc0b..9a85c81d 100644
--- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jit/jit-hbpo/input/hbpo_jit_pub_sa_service.js
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jit/jit-hbpo/input/hbpo_jit_pub_sa_service.js
@@ -1,6 +1,6 @@
 import AppList from "../../../../components/list/index.js";
 import html from "html";
-import useConfig from "../../../../models/pub_sa_detail_service.js";
+import useConfig from "../../../../models/pub_sa_service.js";
 
 export default {
   components: { AppList },
@@ -13,4 +13,4 @@ export default {
     config.query.schema.properties.businessType.default = "ZhiGongJianHBPO";
     return { config, onCommand };
   },
-};
\ No newline at end of file
+};