修改了部分businessType，直供件等的导出，分页增加一页可看十个数据，消除部分报错和空格

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

@@ -371,7 +371,7 @@ export default {
     const config = reactive(props.config);
     // 分页
     const pageModel = reactive({
-      sizeList: [1, 50, 100],
+      sizeList: [1, 10, 50, 100],
       pageIndex: 1,
       pageSize: 10,
       total: 0,

code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/bj/settlement/bj_pub_can_detail_service.js

@@ -11,8 +11,8 @@ const schema = {
       type: "string",
     },
     version: {
-      title: "版本",
-      type: "int",
+      title: "期间",
+      type: "string",
     },
     price: {
       title: "单价",

code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/in/settlement/in_pub_can_sa_detail_service.js

@@ -11,8 +11,8 @@ const schema = {
       type: "string",
     },
     version: {
-      title: "版本",
-      type: "int",
+      title: "期间",
+      type: "string",
     },
     price: {
       title: "单价",

code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-bbac/input/bbac_se_detail_service.js

@@ -153,8 +153,8 @@ export default function () {
             default: [
               {
                 logic: "and",
-                column: "version",
-                action: "equal",
+                column: "wmsBillNum",
+                action: "like",
                 value: null,
                 readOnly: true,
               },

code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-bbac/settlement/bbac_ba_service.js

@@ -51,16 +51,18 @@ const schema = {
   },
 };
 
-const queryUrl = "settleaccount/b-bAC_BA_SERVICE/main-query";
-const exportUrl = "settleaccount/b-bAC_BA_SERVICE/export";
-const invoiceUrl = "settleaccount/b-bAC_BA_SERVICE/generate-invoice";
-const rejectUrl = "settleaccount/b-bAC_BA_SERVICE/reject";
-const receivedUrl = "/api/settleaccount/h-bPO_BA_SERVICE/received";
+const queryUrl = "settleaccount/bbac_ba_service/main-query";
+const exportUrl = "settleaccount/bbac_ba_service/export";
+const invoiceUrl = "settleaccount/bbac_ba_service/generate-invoice";
+const receivedUrl = "settleaccount/bbac_ba_service/received";
+const rejectUrl = "settleaccount/bbac_ba_service/reject";
+const reissueUrl = "settleaccount/bbac_ba_service/reissue-invoice";
 const queryMethod = "POST";
 const exportMethod = "POST";
 const invoiceMethod = "POST";
-const rejectMethod = "POST";
 const receivedMethod = "POST";
+const rejectMethod = "POST";
+const reissueMethod = "POST";
 
 export default function () {
   return {
@@ -123,12 +125,14 @@ export default function () {
     edit: {
       exportUrl,
       invoiceUrl,
-      rejectUrl,
       receivedUrl,
+      rejectUrl,
+      reissueUrl,
       exportMethod,
       invoiceMethod,
-      rejectMethod,
       receivedMethod,
+      rejectMethod,
+      reissueMethod,
       schema: schema,
     },
   };

code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-bbac/settlement/bbac_can_sa_detail_service.js

@@ -11,8 +11,8 @@ const schema = {
       type: "string",
     },
     version: {
-      title: "版本",
-      type: "int",
+      title: "期间",
+      type: "string",
     },
     price: {
       title: "单价",

code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-hbpo/input/hbpo_se_detail_service.js

@@ -152,8 +152,8 @@ export default function () {
             default: [
               {
                 logic: "and",
-                column: "version",
-                action: "equal",
+                column: "wmsBillNum",
+                action: "like",
                 value: null,
                 readOnly: true,
               },

code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-hbpo/input/hbpo_se_edi_service.js

@@ -46,9 +46,8 @@ const schema = {
   },
 };
 
-const baseUrl = "settleaccount/code-setting";
-const queryUrl = `${baseUrl}/get-list`;
-const exportUrl = `${baseUrl}/export`;
+const queryUrl = "settleaccount/hbpo_se_edi_service/get-list";
+const exportUrl = "settleaccount/hbpo_se_edi_service/export";
 const queryMethod = "POST";
 const exportMethod = "POST";
 

code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-hbpo/settlement/hbpo_ba_service.js

@@ -51,17 +51,18 @@ const schema = {
   },
 };
 
-const baseUrl = "settleaccount/h-bPO_BA_SERVICE";
-const queryUrl = `${baseUrl}/main-query`;
-const detailsUrl = `${baseUrl}/get/%s`;
-const exportUrl = `${baseUrl}/export`;
-const invoiceUrl = "settleaccount/h-bPO_BA_SERVICE/generate-invoice";
-const receivedUrl = "settleaccount/h-bPO_BA_SERVICE/received";
+const queryUrl = "settleaccount/hbpo_ba_service/main-query";
+const exportUrl = "settleaccount/hbpo_ba_service/export";
+const invoiceUrl = "settleaccount/hbpo_ba_service/generate-invoice";
+const receivedUrl = "settleaccount/hbpo_ba_service/received";
+const rejectUrl = "settleaccount/hbpo_ba_service/reject";
+const reissueUrl = "settleaccount/hbpo_ba_service/reissue-invoice";
 const queryMethod = "POST";
-const detailsMethod = "POST";
 const exportMethod = "POST";
 const invoiceMethod = "POST";
 const receivedMethod = "POST";
+const rejectMethod = "POST";
+const reissueMethod = "POST";
 
 export default function () {
   return {
@@ -122,14 +123,16 @@ export default function () {
       schema: schema,
     },
     edit: {
-      detailsUrl,
       exportUrl,
       invoiceUrl,
       receivedUrl,
-      detailsMethod,
+      rejectUrl,
+      reissueUrl,
       exportMethod,
       invoiceMethod,
       receivedMethod,
+      rejectMethod,
+      reissueMethod,
       schema: schema,
     },
   };

code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-hbpo/settlement/hbpo_can_sa_detail_service.js

@@ -11,8 +11,8 @@ const schema = {
       type: "string",
     },
     version: {
-      title: "版本",
-      type: "int",
+      title: "期间",
+      type: "string",
     },
     price: {
       title: "单价",

code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jit/settlement/jit_pub_can_sa_detail_service.js

@@ -11,8 +11,8 @@ const schema = {
       type: "string",
     },
     version: {
-      title: "版本",
-      type: "int",
+      title: "期间",
+      type: "string",
     },
     price: {
       title: "单价",

code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/job-service.js

@@ -11,7 +11,6 @@ const stateName = {
     { label: "等待执行", value: "Enqueued" },
   ],
 };
-
 const schema = {
   title: "数据对比",
   type: "object",
@@ -108,6 +107,10 @@ export default function () {
           sorting: {
             hidden: true,
           },
+          businessType: {
+            hidden: true,
+            default: 0,
+          },
         },
       },
     },

code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/material.js

@@ -2,28 +2,12 @@ const schema = {
   title: "物料主数据",
   type: "object",
   properties: {
-    factory: {
-      title: "工厂",
-      type: "string",
-    },
     materialCode: {
-      title: "物料号",
+      title: "厂内物料号",
       type: "string",
     },
     materialDesc: {
-      title: "物料描述",
-      type: "string",
-    },
-    unit: {
-      title: "基本计量单位",
-      type: "string",
-    },
-    estimateType: {
-      title: "估价类",
-      type: "string",
-    },
-    estimateTypeDesc: {
-      title: "估价类描述",
+      title: "厂内物料描述",
       type: "string",
     },
   },

code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/price-list-app-service-bj.js

@@ -3,7 +3,7 @@ const schema = {
   type: "object",
   properties: {
     lu: {
-      title: "零件号",
+      title: "客户零件号",
       type: "string",
     },
     price: {

code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/price-list.js

@@ -5,7 +5,7 @@ const schema = {
   type: "object",
   properties: {
     lu: {
-      title: "零件号",
+      title: "销售零件号",
       type: "string",
     },
     price: {
@@ -79,7 +79,7 @@ export default function () {
             default: [
               {
                 logic: "and",
-                column: "version",
+                column: "lu",
                 action: "like",
                 value: null,
                 readOnly: true,

code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/pub_sa_detail_service.js

@@ -119,6 +119,10 @@ export default function () {
           sorting: {
             hidden: true,
           },
+          businessType: {
+            hidden: true,
+            default: 0,
+          },
         },
       },
     },

code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/pub_sa_service.js

@@ -73,6 +73,10 @@ export default function () {
           sorting: {
             hidden: true,
           },
+          businessType: {
+            hidden: true,
+            default: 0,
+          },
         },
       },
     },

code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/pub_se_detail_service.js

@@ -118,8 +118,8 @@ export default function () {
             default: [
               {
                 logic: "and",
-                column: "version",
-                action: "equal",
+                column: "wmsBillNum",
+                action: "like",
                 value: null,
                 readOnly: true,
               },

code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/tb_re-parts-relationship_service.js

@@ -5,15 +5,15 @@ const schema = {
   type: "object",
   properties: {
     lu: {
-      title: "客户零件号",
+      title: "客户物料号",
       type: "string",
     },
     repLU: {
-      title: "替换客户零件号",
+      title: "替换客户物料号",
       type: "string",
     },
     businessType: {
-      title: "业务类型",
+      title: "业务分类",
       input: "select",
       options: businessTypes,
     },

code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/bj/contrast/bj_pub_sa_detail_jobservice.js

@@ -11,6 +11,8 @@ export default {
     const onCommand = async (item, rows) => {
       console.log(item.path, item, rows);
     };
+    config.query.schema.properties.name.default = "备件结算与发运数据对比";
+    config.query.schema.properties.businessType.default = 7;
     return { config, onCommand };
   },
 };

code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/bj/input/bj_pub_sa_detail_service.js

@@ -9,6 +9,7 @@ export default {
     const onCommand = async (item, rows) => {
       console.log(item.path, item, rows);
     };
+    config.query.schema.properties.businessType.default=7;
     return { config, onCommand };
   },
 };

code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/bj/input/bj_pub_sa_service.js

@@ -10,6 +10,7 @@ export default {
     const onCommand = async (item, rows) => {
       console.log(item.path, item, rows);
     };
+    config.query.schema.properties.businessType.default=7;
     return { config, onCommand };
   },
 };

code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/in/contrast/in_pub_sa_detail_jobservice.js

@@ -11,6 +11,8 @@ export default {
     const onCommand = async (item, rows) => {
       console.log(item.path, item, rows);
     };
+    config.query.schema.properties.businessType.default = 8;
+    config.query.schema.properties.name.default = "印度件结算与发运数据对比";
     return { config, onCommand };
   },
 };

code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/in/input/in_pub_sa_detail_service.js

@@ -10,6 +10,7 @@ export default {
     const onCommand = async (item, rows) => {
       console.log(item.path, item, rows);
     };
+    config.query.schema.properties.businessType.default = 8;
     return { config, onCommand };
   },
 };

code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/in/input/in_pub_sa_service.js

@@ -10,6 +10,7 @@ export default {
     const onCommand = async (item, rows) => {
       console.log(item.path, item, rows);
     };
+    config.query.schema.properties.businessType.default = 8;
     return { config, onCommand };
   },
 };

code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/invoice/invoice_map_group.js

@@ -59,30 +59,31 @@ export default {
     const model = ref({
       invoicE_WAIT_DETAIL: [
         {
-          version: 11111,
+          version: 1111,
           invbillNum: "INV230725142640-001",
           inGroupNum: "INV2023",
           lu: "lu",
-          price: 11111,
-          qty: 11111,
-          amt: 11111,
+          price: 1111,
+          qty: 1111,
+          amt: 1111,
           bussiessType: "bussiessType",
         },
         {
-          version: 22222,
+          version: 2222,
           invbillNum: "INV230725142640-002",
           inGroupNum: "INV2023",
           lu: "lu",
-          price: 22222,
-          qty: 22222,
-          amt: 22222,
+          price: 2222,
+          qty: 2222,
+          amt: 2222,
           bussiessType: "bussiessType",
         },
       ],
-      invoicE_MAP_GROUP: [{ version: "version" }],
+      invoicE_MAP_GROUP: [
+        { version: 1111, invbillNum: "INV230725142640-001", inGroupNum: "INV2023", settleGroupNum: "1111", amt: 1111 },
+      ],
       invoicE_NOT_SETTLE: [{ version: "version" }],
     });
-
     const onCommand = async (item, rows) => {
       drawer.value = true;
       loading.value = true;

code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jit/contrast/bbac_jit_pub_sa_detail_jobservice.js

@@ -11,6 +11,8 @@ export default {
     const onCommand = async (item, rows) => {
       console.log(item.path, item, rows);
     };
+    config.query.schema.properties.businessType.default = 3;
+    config.query.schema.properties.name.default = "直供件BBAC结算与发运数据对比";
     return { config, onCommand };
   },
 };

code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jit/contrast/hbpo_jit_pub_sa_detail_jobservice.js

@@ -7,10 +7,12 @@ export default {
   template: html`<app-list :config="config" @command="onCommand" />`,
   setup() {
     const config = useConfig();
-    config.query.schema.title = "发运与结算二次";
+    config.query.schema.title = "发运与结算";
     const onCommand = async (item, rows) => {
       console.log(item.path, item, rows);
     };
+    config.query.schema.properties.businessType.default = 4;
+    config.query.schema.properties.name.default = "直供件HBPO结算与发运数据对比";
     return { config, onCommand };
   },
-};
+};

code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jit/input/bbac_jit_pub_sa_detail_service.js

@@ -10,6 +10,7 @@ export default {
     const onCommand = async (item, rows) => {
       console.log(item.path, item, rows);
     };
+    config.query.schema.properties.businessType.default = 3;
     return { config, onCommand };
   },
 };

code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jit/input/bbac_jit_pub_sa_service.js

@@ -10,6 +10,7 @@ export default {
     const onCommand = async (item, rows) => {
       console.log(item.path, item, rows);
     };
+    config.query.schema.properties.businessType.default = 3;
     return { config, onCommand };
   },
 };

code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jit/input/hbpo_jit_pub_sa_detail_service.js

@@ -10,6 +10,7 @@ export default {
     const onCommand = async (item, rows) => {
       console.log(item.path, item, rows);
     };
+    config.query.schema.properties.businessType.default = 4;
     return { config, onCommand };
   },
 };

code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jit/input/hbpo_jit_pub_sa_service.js

@@ -10,6 +10,7 @@ export default {
     const onCommand = async (item, rows) => {
       console.log(item.path, item, rows);
     };
+    config.query.schema.properties.businessType.default = 4;
     return { config, onCommand };
   },
 };