From e94326ada8158442cb7c2069922bcff69fbf64b9 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: Fri, 11 Aug 2023 08:54:51 +0800
Subject: [PATCH] =?UTF-8?q?1.=E6=9B=B4=E6=94=B9=E5=88=97=E5=90=8D=EF=BC=8C?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=90=9C=E7=B4=A2=E5=90=8D=E7=A7=B0=202.?=
 =?UTF-8?q?=E5=95=86=E5=8A=A1=E5=AE=A1=E6=A0=B8=E9=A1=B5=E9=9D=A2=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E5=AD=97=E6=AE=B5=E6=8C=89=E7=85=A7=E8=B4=A2=E5=8A=A1?=
 =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E9=A1=B5=E9=9D=A2=E5=86=99=203.=E5=9F=BA?=
 =?UTF-8?q?=E7=A1=80=E4=BF=A1=E6=81=AF=E9=A1=B5=E9=9D=A2=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=E8=B0=83=E6=95=B4=EF=BC=88=E5=B7=B2=E5=AE=8C?=
 =?UTF-8?q?=E6=88=90=EF=BC=89=EF=BC=8C=E9=A6=96=E9=A1=B5=E5=AF=BC=E5=85=A5?=
 =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E5=8A=A0=E5=85=A5=E6=96=B0=E7=9A=84=E6=A8=A1?=
 =?UTF-8?q?=E6=9D=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wwwroot/assets/导入模版.zip           | Bin 4233543 -> 4241719 bytes
 .../wwwroot/components/form/form-input.js     |   2 +-
 .../wwwroot/models/inventory/adjust.js        | 102 ++++++++----------
 .../wwwroot/models/inventory/inventory.js     |  46 ++++++--
 .../wwwroot/models/inventory/log.js           |  89 ++++++++-------
 .../wwwroot/models/inventory/vmi.js           |  12 ++-
 .../wwwroot/models/invoiceState.js            |   8 ++
 .../jis-bbac/settlement/bbac_ba_service.js    |  55 ++++------
 .../jis-hbpo/settlement/hbpo_ba_service.js    |  55 ++++------
 .../wwwroot/models/pub_ba_service.js          |  77 +++++--------
 .../tb_re-parts-relationship_service.js       |   4 +-
 .../wwwroot/models/tb_relationship.js         |  16 +--
 .../wwwroot/router/base-data.js               |   2 +-
 .../wwwroot/router/business.js                |   2 +-
 .../wwwroot/views/inventory/log.js            |  41 ++++++-
 .../settlement/hbpo_jit_pub_ba_service.js     |   4 +-
 16 files changed, 267 insertions(+), 248 deletions(-)
 create mode 100644 code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/invoiceState.js

diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/assets/导入模版.zip b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/assets/导入模版.zip
index d2dfbf51b4223eed9b259b7547db3e15cf5f8264..d3b5cbddf0c90626e59d04ee9867e73f87d65323 100644
GIT binary patch
delta 8907
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
C?cZYn

delta 854
zcmZwDUr19?90%~<xo&E%Hvc=_)@Hk#=AXI#%)jYQG!PvVeMqpO(nI(nh!tprFB%B-
zVk|g?MEDR%FX2LWAA0Da@*yI<FA+kJEQmzJUPOHHyDjjJ?!A1@;am=1zW0~-J1ecn
zXQjD_Iv-IPNRR^tFhVZmK|Y*<0x-d8I0I&|Kp_-CF_b_lltDREfE6mC3T&?;s{J-2
z(HC-b&nH6;I15g2K{cEMH^|@tFVsLSoQFE7hX!Z_A2fj<F2F^&1eYNI&Cmj^&<5?$
z0au_Cx*(WHhWO_RDaRn9tGw#%2j`=>fk{D%4X9T02xT5udJ~(gyhbjd%!!eeu6vK}
z+n#-AnOi4oY(Z^r><_1MO7S(H76;Y`zbxN981gZi9AP9=^xth4_Tp<cF}lV*S=sKz
z=;L2c|IZdnW%d?hI$XS8<CPX!la!parzc#eZTY9CcR?>HQ&7B79ai(OCd5MGb%J}d
z+H}=Fi1g{T*+}qC78GU$O>SyJnqM}Fy(xe8yne5!7Prp4#IVAzBIQLY<%T9@$`la(
z9|1Y5OYf}){mJYoyfu0<^q(`I20uRZ9FE0_zCCATq7F@T(RPsDZ7KUJyT0l1JJZ^M
fEsaf-gmr#4_SIQY-XAvRregB&-ZKy>PdHA;K@jFA

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 f09cacdd..969aef8e 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
@@ -30,7 +30,7 @@ export default {
           <el-option v-for="item in options" :key="item.key" :label="item.label" :value="item.value" />
         </el-select>
       </template>
-      <template v-else-if="getInput(schema)==='month'">
+      <template v-else-if="getInput(schema)==='month'||getInput(schema)==='datetime'">
         <el-date-picker v-model="model[prop]" :type="schema.input" :value-format="schema.format" />
       </template>
       <template v-else-if="getInput(schema)==='number'">
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 1e3125d5..6ea67113 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
@@ -1,4 +1,4 @@
-import { billType, codeType, changedType, subBillType } from "./inventory.js";
+import { billType, codeType, subBillType } from "./inventory.js";
 
 const schema = {
   title: "寄售库存调整",
@@ -7,30 +7,26 @@ const schema = {
     logType: {
       title: "库存事务分类",
       type: "string",
+      default: "Type500",
       hidden: true,
     },
-    changedNumber: {
-      title: "变动单号",
+    changedType: {
+      title: "变动类型",
       type: "string",
-      rules: [
-        {
-          required: true,
-        },
-      ],
+      default: "in",
+      hidden: true,
     },
-    changedTime: {
-      title: "变动时间",
+    partCode: {
+      title: "LU零件号",
       type: "string",
-      input: "datetime",
       rules: [
         {
           required: true,
         },
       ],
     },
-    changedType,
-    changedBy: {
-      title: "变动人",
+    customerPartCode: {
+      title: "客户零件号",
       type: "string",
       rules: [
         {
@@ -38,26 +34,25 @@ const schema = {
         },
       ],
     },
-    partCode: {
-      title: "调整LU零件号",
-      type: "string",
+    codeType,
+    billType,
+    qty: {
+      title: "数量",
+      type: "number",
+      input: "number",
       rules: [
         {
           required: true,
         },
       ],
     },
-    customerPartCode: {
-      title: "调整客户零件号",
+    billTime: {
+      title: "发运日期",
       type: "string",
-      rules: [
-        {
-          required: true,
-        },
-      ],
+      input: "datetime",
     },
-    orderNum: {
-      title: "EDI原始订单号",
+    changedNumber: {
+      title: "变动单号",
       type: "string",
       rules: [
         {
@@ -65,39 +60,27 @@ const schema = {
         },
       ],
     },
-    billType,
-    subBillType,
-    reMark: {
-      title: "备注",
+    changedTime: {
+      title: "变动时间",
       type: "string",
-      input: "textarea",
-      rules: [
-        {
-          required: true,
-        },
-      ],
+      input: "datetime",
     },
-    vinCode: {
-      title: "调整生产码",
+    deliverTime: {
+      title: "订单日期",
       type: "string",
-      rules: [
-        {
-          required: true,
-        },
-      ],
+      input: "datetime",
     },
-    codeType,
-    qty: {
-      title: "数量",
-      type: "number",
+    erpToLoc: {
+      title: "ERP库位",
+      type: "string",
       rules: [
         {
           required: true,
         },
       ],
     },
-    billTime: {
-      title: "发运日期",
+    orderNum: {
+      title: "EDI原始订单号",
       type: "string",
       rules: [
         {
@@ -105,8 +88,8 @@ const schema = {
         },
       ],
     },
-    billNum: {
-      title: "WMS发运单号",
+    changedBy: {
+      title: "变动人",
       type: "string",
       rules: [
         {
@@ -114,18 +97,23 @@ const schema = {
         },
       ],
     },
-    deliverTime: {
-      title: "订单日期",
+    subBillType,
+    reMark: {
+      title: "备注",
+      type: "string",
+      input: "textarea",
+    },
+    vinCode: {
+      title: "EDI订单生产码",
       type: "string",
-      input: "datetime",
       rules: [
         {
           required: true,
         },
       ],
     },
-    erpToLoc: {
-      title: "ERP库位",
+    billNum: {
+      title: "WMS发运单号",
       type: "string",
       rules: [
         {
@@ -139,7 +127,7 @@ const schema = {
 const baseUrl = "settleaccount/vmi";
 const queryUrl = `${baseUrl}/log`;
 const detailsUrl = `${baseUrl}/get/%s`;
-const createUrl = `${baseUrl}/create`;
+const createUrl = "settleaccount/vmi/edit-balance";
 const updateUrl = `${baseUrl}/update/%s`;
 const deleteUrl = `${baseUrl}/delete-list`;
 const importUrl = `${baseUrl}/code-setting-upload-excel-import`;
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 bbd77d6b..a7db5810 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
@@ -29,13 +29,41 @@ const options3 = [
   { value: 9, label: "JIT直供件BBAC" },
   { value: 10, label: "JIT直供件HBPO" },
 ];
-const options4 = [
-  { value: "In", label: "入库" },
-  { value: "Out", label: "出库" },
-];
-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 };
+const billType = {
+  title: "发货类型",
+  type: "number",
+  input: "select",
+  options: options1,
+  clearable: true,
+  rules: [
+    {
+      required: true,
+    },
+  ],
+};
+const codeType = {
+  title: "生产码类型",
+  type: "string",
+  input: "select",
+  options: options2,
+  clearable: true,
+  rules: [
+    {
+      required: true,
+    },
+  ],
+};
+const subBillType = {
+  title: "发货子类型",
+  type: "number",
+  input: "select",
+  options: options3,
+  clearable: true,
+  rules: [
+    {
+      required: true,
+    },
+  ],
+};
 
-export { billType, codeType, subBillType, changedType };
+export { billType, codeType, subBillType };
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 de7b6072..6003865a 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
@@ -1,4 +1,4 @@
-import { billType, codeType, changedType, subBillType } from "./inventory.js";
+import { billType, codeType, subBillType } from "./inventory.js";
 
 //变动单据号、发生时间、生产码类型、、订单号、库位、变动数、EDI顺序号、备注、变动类型（In、Out标识）、发货类型（JIS\JIT\买单件\备件等）、
 //实扣LU零件号、实扣客户零件号、结算LU零件号、结算客户零件号、实扣生产码、结算生产码
@@ -7,47 +7,16 @@ const schema = {
   title: "库存事务日志",
   type: "object",
   properties: {
-    changedNumber: {
-      title: "变动单号",
-      type: "string",
-    },
-    changedTime: {
-      title: "变动时间",
-      type: "string",
-      input: "datetime",
-    },
-    changedType,
-    changedBy: {
-      title: "变动人",
-      type: "string",
-    },
     partCode: {
       title: "LU零件号",
       type: "string",
     },
-    partCode2: {
-      title: "结算厂内零件号",
-      type: "string",
-    },
     customerPartCode: {
-      title: "结算客户零件号",
-      type: "string",
-    },
-    realCode: {
-      title: "WMS实发生产码",
-      type: "string",
-    },
-    vinCode: {
-      title: "EDI订单生产码",
-      type: "string",
-    },
-    settlementVinCode: {
-      title: "结算生产码",
+      title: "客户零件号",
       type: "string",
     },
     codeType,
     billType,
-    subBillType,
     qty: {
       title: "数量",
       type: "number",
@@ -62,6 +31,10 @@ const schema = {
       type: "string",
       input: "datetime",
     },
+    erpToLoc: {
+      title: "ERP库位",
+      type: "string",
+    },
     seq: {
       title: "EDI顺序号",
       type: "string",
@@ -82,14 +55,40 @@ const schema = {
       title: "PJIS生产顺序号",
       type: "string",
     },
+    changedNumber: {
+      title: "变动单号",
+      type: "string",
+    },
+    changedTime: {
+      title: "变动时间",
+      type: "string",
+      input: "datetime",
+    },
+    changedBy: {
+      title: "变动人",
+      type: "string",
+    },
+    partCode2: {
+      title: "结算厂内零件号",
+      type: "string",
+    },
+    realCode: {
+      title: "WMS实发生产码",
+      type: "string",
+    },
+    vinCode: {
+      title: "EDI订单生产码",
+      type: "string",
+    },
+    settlementVinCode: {
+      title: "结算生产码",
+      type: "string",
+    },
+    subBillType,
     isReplenished: {
       title: "是否补货",
       type: "boolean",
     },
-    erpToLoc: {
-      title: "ERP库位",
-      type: "string",
-    },
     configcode: {
       title: "配置码",
       type: "string",
@@ -156,10 +155,24 @@ export default function () {
               {
                 logic: "and",
                 column: "billTime",
-                action: "like",
+                action: "BiggerThanOrEqual",
+                value: null,
+                readOnly: true,
+              },
+              {
+                logic: "and",
+                column: "billTime",
+                action: "SmallThanOrEqual",
                 value: null,
                 readOnly: true,
               },
+              {
+                logic: "and",
+                column: "isReplenished",
+                action: "equal",
+                value: true,
+                readOnly: true,
+              },
               {
                 logic: "and",
                 column: "billType",
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 676820e7..38fb16aa 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
@@ -18,10 +18,6 @@ export default function () {
         title: "LU零件号",
         type: "string",
       },
-      vinCode: {
-        title: "生产码",
-        type: "string",
-      },
       customerPartCode: {
         title: "客户零件号",
         type: "string",
@@ -83,6 +79,14 @@ export default function () {
         title: "WMS实发生产码",
         type: "string",
       },
+      vinCode: {
+        title: "EDI订单生产码",
+        type: "string",
+      },
+      settlementVinCode: {
+        title: "结算生产码",
+        type: "string",
+      },
     },
   };
 }
diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/invoiceState.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/invoiceState.js
new file mode 100644
index 00000000..757c5a4e
--- /dev/null
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/invoiceState.js
@@ -0,0 +1,8 @@
+const options1 = [
+  { value: 1, label: "正常" },
+  { value: 2, label: "报废" },
+  { value: 3, label: "提交" },
+];
+
+const invoiceState = { title: "发票状态", type: "string", input: "select", options: options1 };
+export default invoiceState;
diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-bbac/settlement/bbac_ba_service.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-bbac/settlement/bbac_ba_service.js
index f21cfc8b..9b6e048e 100644
--- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-bbac/settlement/bbac_ba_service.js
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-bbac/settlement/bbac_ba_service.js
@@ -1,51 +1,42 @@
 import version from "../../version.js";
-import { state2, state3 } from "../../state.js";
+import { state2 as state, state3 } from "../../state.js";
+import businessType from "../../businessType.js";
+import invoiceState from "../../invoiceState.js";
 
 const schema = {
   title: "商务审批",
   type: "object",
   properties: {
-    settleBillNum: {
-      title: "关联结算单号",
+    version,
+    realnvBillNum: {
+      title: "金税发票号",
       type: "string",
     },
-    site: {
-      title: "工厂地点",
+    invbillNum: {
+      title: "系统发票号",
       type: "string",
     },
-    version,
-    state2,
-    price: {
-      title: "单价",
-      type: "decimal",
+    amt: {
+      title: "未税金额",
+      type: "number",
     },
-    billNum: {
-      title: "结算单号",
-      type: "string",
-    },
-
-    settleDate: {
-      title: "结算日期",
-      type: "DateTime",
+    taxAmt: {
+      title: "税后金额",
+      type: "number",
     },
     invGroupNum: {
       title: "发票分组号",
-      type: "string",
-    },
-    lu: {
-      title: "零件号",
-      type: "string",
-    },
-    pn: {
-      title: "生产号",
-      type: "string",
+      type: "number",
     },
-    qty: {
-      title: "结算数量",
-      type: "decimal",
+    businessType,
+    state,
+    invoiceState,
+    taxDiff: {
+      title: "发票税后尾差",
+      type: "number",
     },
-    groupNum: {
-      title: "结算分组号",
+    clientCode: {
+      title: "客户代码",
       type: "string",
     },
   },
diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-hbpo/settlement/hbpo_ba_service.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-hbpo/settlement/hbpo_ba_service.js
index e650bc13..48623a4b 100644
--- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-hbpo/settlement/hbpo_ba_service.js
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-hbpo/settlement/hbpo_ba_service.js
@@ -1,51 +1,42 @@
 import version from "../../version.js";
-import { state2, state3 } from "../../state.js";
+import { state2 as state, state3 } from "../../state.js";
+import businessType from "../../businessType.js";
+import invoiceState from "../../invoiceState.js";
 
 const schema = {
   title: "不可结算单",
   type: "object",
   properties: {
-    state2,
-    settleBillNum: {
-      title: "关联结算单号",
+    version,
+    realnvBillNum: {
+      title: "金税发票号",
       type: "string",
     },
-    site: {
-      title: "工厂地点",
+    invbillNum: {
+      title: "系统发票号",
       type: "string",
     },
-    version,
-    price: {
-      title: "单价",
-      type: "decimal",
+    amt: {
+      title: "未税金额",
+      type: "number",
     },
-    billNum: {
-      title: "结算单号",
-      type: "string",
-    },
-
-    settleDate: {
-      title: "结算日期",
-      type: "DateTime",
+    taxAmt: {
+      title: "税后金额",
+      type: "number",
     },
     invGroupNum: {
       title: "发票分组号",
-      type: "string",
-    },
-    lu: {
-      title: "零件号",
-      type: "string",
-    },
-    pn: {
-      title: "生产号",
-      type: "string",
+      type: "number",
     },
-    qty: {
-      title: "结算数量",
-      type: "decimal",
+    businessType,
+    state,
+    invoiceState,
+    taxDiff: {
+      title: "发票税后尾差",
+      type: "number",
     },
-    groupNum: {
-      title: "结算分组号",
+    clientCode: {
+      title: "客户代码",
       type: "string",
     },
   },
diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/pub_ba_service.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/pub_ba_service.js
index 8cf85bad..3837dc64 100644
--- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/pub_ba_service.js
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/pub_ba_service.js
@@ -1,75 +1,46 @@
 import version from "./version.js";
-import { state2, state3 } from "./state.js";
+import { state2 as state, state3 } from "./state.js";
+import businessType from "./businessType.js";
+import invoiceState from "./invoiceState.js";
 
 const schema = {
-  title: "结算数据",
+  title: "不可结算单",
   type: "object",
   properties: {
-    settleBillNum: {
-      title: "关联结算单号",
+    version,
+    realnvBillNum: {
+      title: "金税发票号",
       type: "string",
     },
-    site: {
-      title: "工厂地点",
+    invbillNum: {
+      title: "系统发票号",
       type: "string",
     },
-    businessType: {
-      title: "业务分类",
-      type: "EnumBusinessType",
-    },
-    version,
-    state2,
-    price: {
-      title: "价格",
-      type: "decimal",
-    },
-    billNum: {
-      title: "结算单号",
-      type: "string",
+    amt: {
+      title: "未税金额",
+      type: "number",
     },
-    settleDate: {
-      title: "下线日期",
-      type: "DateTime",
+    taxAmt: {
+      title: "税后金额",
+      type: "number",
     },
     invGroupNum: {
       title: "发票分组号",
-      type: "string",
-    },
-    lu: {
-      title: "零件号",
-      type: "string",
-    },
-    pn: {
-      title: "发货单号",
-      type: "string",
-    },
-    keycode: {
-      title: "键值",
-      type: "string",
+      type: "number",
     },
-    qty: {
-      title: "结算数量",
-      type: "decimal",
+    businessType,
+    state,
+    invoiceState,
+    taxDiff: {
+      title: "发票税后尾差",
+      type: "number",
     },
-    groupNum: {
-      title: "结算分组号",
-      type: "decimal",
-    },
-    entend1: {
-      title: "扩展1",
-      type: "string",
-    },
-    entend2: {
-      title: "扩展2",
-      type: "string",
-    },
-    entend3: {
-      title: "扩展3",
+    clientCode: {
+      title: "客户代码",
       type: "string",
     },
   },
 };
-
 const queryUrl = "settleaccount/pub_ba_service/main-query";
 const exportUrl = "settleaccount/pub_ba_service/export";
 const invoiceUrl = "settleaccount/pub_ba_service/generate-invoice";
diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/tb_re-parts-relationship_service.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/tb_re-parts-relationship_service.js
index 857f469d..6f1f678e 100644
--- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/tb_re-parts-relationship_service.js
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/tb_re-parts-relationship_service.js
@@ -5,11 +5,11 @@ const schema = {
   type: "object",
   properties: {
     lu: {
-      title: "客户物料号",
+      title: "厂内物料号",
       type: "string",
     },
     repLU: {
-      title: "替换客户物料号",
+      title: "替换厂内物料号",
       type: "string",
     },
     businessType: {
diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/tb_relationship.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/tb_relationship.js
index a6375733..b92ce4c5 100644
--- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/tb_relationship.js
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/tb_relationship.js
@@ -3,7 +3,7 @@ const schema = {
   type: "object",
   properties: {
     project: {
-      title: "项目",
+      title: "业务类别",
       type: "string",
       readOnly: true,
       showForList: true,
@@ -14,7 +14,7 @@ const schema = {
       ],
     },
     value: {
-      title: "值",
+      title: "库位",
       type: "string",
       readOnly: true,
       showForList: true,
@@ -24,18 +24,6 @@ const schema = {
         },
       ],
     },
-    description: {
-      title: "描述",
-      type: "string",
-      input: "textarea",
-      showForList: true,
-      rules: [
-        {
-          required: true,
-        },
-        { max: 60 },
-      ],
-    },
   },
 };
 
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 efcebaba..81e25892 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
@@ -245,7 +245,7 @@ export default [
         path: "tb_re-parts-relationship_service",
         meta: {
           type: "page",
-          title: "客户替换件关系",
+          title: "厂内替换件关系",
           icon: "file",
           children: [
             {
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 6ddd780d..dcf18f4b 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
@@ -3671,7 +3671,7 @@ export default [
             },
           },
           {
-            path: "data-export",
+            path: "dataExport",
             meta: {
               type: "button",
               title: "补货数据导出",
diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/inventory/log.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/inventory/log.js
index fa9c49da..e47f63fa 100644
--- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/inventory/log.js
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/inventory/log.js
@@ -1,15 +1,52 @@
 import AppList from "../../../components/list/index.js";
 import html from "html";
 import useConfig from "../../../models/inventory/log.js";
+import { reactive, ref } from "vue";
+import request from "../../request/index.js";
+import { schemaToModel } from "../../utils/index.js";
 
 export default {
   components: { AppList },
-  template: html`<app-list :config="config" @command="onCommand" />`,
+  template: html`<app-list :config="config" @command="onCommand" />
+    <el-dialog v-model="dialog" width="45%" title="补货数据导出">
+      <el-form :model="exportModel" style="height:100%;">
+        <el-form-item label="" label-width="100px">
+          开始时间<el-date-picker v-model="exportModel.startDatetime" value-format="YYYY-MM-DD" />
+          <span style="margin:0 .5em;">-</span>
+          结束时间<el-date-picker v-model="exportModel.endDatetime" value-format="YYYY-MM-DD" />
+        </el-form-item>
+        <el-button type="primary" @click="openDialog" style="margin-left: 10px;">确定</el-button>
+      </el-form>
+    </el-dialog> `,
   setup() {
+    const defaultExportModel = {
+      startDatetime: "",
+      endDatetime: "",
+    };
+    const exportModel = ref(defaultExportModel);
     const config = useConfig();
+    const dialog = ref(false);
+    const prop = ref("");
+    const queryModel = ref(schemaToModel(config.query.schema));
+    function buildQuery() {
+      const postData = JSON.parse(JSON.stringify(queryModel.value));
+      return postData;
+    }
+    const openDialog = async () => {
+      // const url = 
+      // const method = 
+      // const postData = buildQuery();
+      const response = await request(url, postData, { method });
+      if (!response.errors) {
+        window.open(getUrl(`settleaccount/getblobfile/download/${response.data}`));
+      }
+      dialog.value = false;
+    };
     const onCommand = async (item, rows) => {
+      prop.value = item.path;
+      dialog.value = true;
       console.log(item.path, item, rows);
     };
-    return { config, onCommand };
+    return { config, onCommand, dialog, prop, exportModel, openDialog };
   },
 };
diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jit/jit-hbpo/settlement/hbpo_jit_pub_ba_service.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jit/jit-hbpo/settlement/hbpo_jit_pub_ba_service.js
index 27a2214b..4d572447 100644
--- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jit/jit-hbpo/settlement/hbpo_jit_pub_ba_service.js
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jit/jit-hbpo/settlement/hbpo_jit_pub_ba_service.js
@@ -1,6 +1,6 @@
 import AppList from "../../../../components/list/index.js";
 import html from "html";
-import useConfig from "../../../../models/pub_ba_detail_service.js";
+import useConfig from "../../../../models/pub_ba_service.js";
 
 export default {
   components: { AppList },
@@ -12,4 +12,4 @@ export default {
     };
     return { config, onCommand };
   },
-};
\ No newline at end of file
+};