Merge branch 'master' of http://dev.ccwin-in.com:3000/BoXu.Zheng/BeiJinSettleAccount

code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/components/form/form-input.js

@@ -29,7 +29,7 @@ export default {
           <el-option v-for="item in options" :key="item.key" :label="item.label" :value="item.value" />
         </el-select>
       </template>
-      <template v-if="getInput(schema)==='month'">
+      <template v-else-if="getInput(schema)==='month'">
         <el-date-picker v-model="model[prop]" :type="schema.input" :value-format="schema.format" />
       </template>
       <el-input
@@ -122,7 +122,7 @@ export default {
       } else if (props.schema.url) {
         try {
           const url = `${props.schema.url}`;
-          const result = await request(url, null, { method: "GET" });
+          const result = await request(url, null, { method: "POST" });
           options.value = result.data?.items.map((o) => ({
             value: o[props.schema.value],
             label: o[props.schema.label],

code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/bj/contrast/bj_second_pub_sa_detail_jobservice.js

@@ -0,0 +1,132 @@
+const schema = {
+  title: "通用代码",
+  type: "object",
+  properties: {
+    project: {
+      title: "项目",
+      type: "string",
+      readOnly: true,
+      showForList: true,
+      rules: [
+        {
+          required: true,
+        },
+      ],
+    },
+    value: {
+      title: "值",
+      type: "string",
+      readOnly: true,
+      showForList: true,
+      rules: [
+        {
+          required: true,
+        },
+      ],
+    },
+    description: {
+      title: "描述",
+      type: "string",
+      input: "textarea",
+      showForList: true,
+      rules: [
+        {
+          required: true,
+        },
+        { max: 60 },
+      ],
+    },
+  },
+};
+
+const baseUrl = "settleaccount/code-setting";
+const queryUrl = `${baseUrl}/get-list`;
+const detailsUrl = `${baseUrl}/get/%s`;
+const createUrl = `${baseUrl}/create`;
+const updateUrl = `${baseUrl}/update/%s`;
+const deleteUrl = `${baseUrl}/delete-list`;
+const importUrl = `${baseUrl}/code-setting-upload-excel-import`;
+const exportUrl = `${baseUrl}/export`;
+const queryMethod = "POST";
+const detailsMethod = "POST";
+const createMethod = "POST";
+const updateMethod = "POST";
+const deleteMethod = "POST";
+const importMethod = "POST";
+const exportMethod = "POST";
+
+export default function () {
+  return {
+    query: {
+      url: queryUrl,
+      method: queryMethod,
+      hasFilter: true,
+      schema: {
+        title: "通用代码",
+        type: "object",
+        properties: {
+          filters: {
+            title: "项目",
+            type: "array",
+            hidden: true,
+            items: {
+              type: "object",
+              properties: {
+                logic: {
+                  type: "int",
+                },
+                column: {
+                  type: "string",
+                },
+                action: {
+                  type: "int",
+                },
+                value: {
+                  type: "string",
+                },
+              },
+            },
+            default: [
+              {
+                logic: "and",
+                column: "project",
+                action: "like",
+                value: null,
+                readOnly: true,
+              },
+            ],
+          },
+          skipCount: {
+            hidden: true,
+            default: 0,
+          },
+          maxResultCount: {
+            hidden: true,
+            default: 10,
+          },
+          sorting: {
+            hidden: true,
+          },
+        },
+      },
+    },
+    table: {
+      schema: schema,
+    },
+    edit: {
+      detailsUrl,
+      createUrl,
+      updateUrl,
+      deleteUrl,
+      importUrl,
+      exportUrl,
+      detailsMethod,
+      createMethod,
+      updateMethod,
+      deleteMethod,
+      importMethod,
+      exportMethod,
+      schema: schema,
+    },
+  };
+}

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

@@ -0,0 +1,132 @@
+const schema = {
+  title: "JIS结算数据",
+  type: "object",
+  properties: {
+    project: {
+      title: "项目",
+      type: "string",
+      readOnly: true,
+      showForList: true,
+      rules: [
+        {
+          required: true,
+        },
+      ],
+    },
+    value: {
+      title: "值",
+      type: "string",
+      readOnly: true,
+      showForList: true,
+      rules: [
+        {
+          required: true,
+        },
+      ],
+    },
+    description: {
+      title: "描述",
+      type: "string",
+      input: "textarea",
+      showForList: true,
+      rules: [
+        {
+          required: true,
+        },
+        { max: 60 },
+      ],
+    },
+  },
+};
+
+const baseUrl = "settleaccount/bbac_sa_detail_service";
+const queryUrl = `${baseUrl}/get-list`;
+const detailsUrl = `${baseUrl}/get/%s`;
+const createUrl = `${baseUrl}/create`;
+const updateUrl = `${baseUrl}/update/%s`;
+const deleteUrl = `${baseUrl}/delete-list`;
+const importUrl = `${baseUrl}/code-setting-upload-excel-import`;
+const exportUrl = `${baseUrl}/export`;
+const queryMethod = "POST";
+const detailsMethod = "POST";
+const createMethod = "POST";
+const updateMethod = "POST";
+const deleteMethod = "POST";
+const importMethod = "POST";
+const exportMethod = "POST";
+
+export default function () {
+  return {
+    query: {
+      url: queryUrl,
+      method: queryMethod,
+      hasFilter: true,
+      schema: {
+        title: "JIS结算数据",
+        type: "object",
+        properties: {
+          filters: {
+            title: "项目",
+            type: "array",
+            hidden: true,
+            items: {
+              type: "object",
+              properties: {
+                logic: {
+                  type: "int",
+                },
+                column: {
+                  type: "string",
+                },
+                action: {
+                  type: "int",
+                },
+                value: {
+                  type: "string",
+                },
+              },
+            },
+            default: [
+              {
+                logic: "and",
+                column: "project",
+                action: "like",
+                value: null,
+                readOnly: true,
+              },
+            ],
+          },
+          skipCount: {
+            hidden: true,
+            default: 0,
+          },
+          maxResultCount: {
+            hidden: true,
+            default: 10,
+          },
+          sorting: {
+            hidden: true,
+          },
+        },
+      },
+    },
+    table: {
+      schema: schema,
+    },
+    edit: {
+      detailsUrl,
+      createUrl,
+      updateUrl,
+      deleteUrl,
+      importUrl,
+      exportUrl,
+      detailsMethod,
+      createMethod,
+      updateMethod,
+      deleteMethod,
+      importMethod,
+      exportMethod,
+      schema: schema,
+    },
+  };
+}

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

@@ -0,0 +1,132 @@
+const schema = {
+  title: "JIS结算数据",
+  type: "object",
+  properties: {
+    project: {
+      title: "项目",
+      type: "string",
+      readOnly: true,
+      showForList: true,
+      rules: [
+        {
+          required: true,
+        },
+      ],
+    },
+    value: {
+      title: "值",
+      type: "string",
+      readOnly: true,
+      showForList: true,
+      rules: [
+        {
+          required: true,
+        },
+      ],
+    },
+    description: {
+      title: "描述",
+      type: "string",
+      input: "textarea",
+      showForList: true,
+      rules: [
+        {
+          required: true,
+        },
+        { max: 60 },
+      ],
+    },
+  },
+};
+
+const baseUrl = "settleaccount/bbac_sa_service";
+const queryUrl = `${baseUrl}/get-list`;
+const detailsUrl = `${baseUrl}/get/%s`;
+const createUrl = `${baseUrl}/create`;
+const updateUrl = `${baseUrl}/update/%s`;
+const deleteUrl = `${baseUrl}/delete-list`;
+const importUrl = `${baseUrl}/code-setting-upload-excel-import`;
+const exportUrl = `${baseUrl}/export`;
+const queryMethod = "POST";
+const detailsMethod = "POST";
+const createMethod = "POST";
+const updateMethod = "POST";
+const deleteMethod = "POST";
+const importMethod = "POST";
+const exportMethod = "POST";
+
+export default function () {
+  return {
+    query: {
+      url: queryUrl,
+      method: queryMethod,
+      hasFilter: true,
+      schema: {
+        title: "JIS结算数据",
+        type: "object",
+        properties: {
+          filters: {
+            title: "项目",
+            type: "array",
+            hidden: true,
+            items: {
+              type: "object",
+              properties: {
+                logic: {
+                  type: "int",
+                },
+                column: {
+                  type: "string",
+                },
+                action: {
+                  type: "int",
+                },
+                value: {
+                  type: "string",
+                },
+              },
+            },
+            default: [
+              {
+                logic: "and",
+                column: "project",
+                action: "like",
+                value: null,
+                readOnly: true,
+              },
+            ],
+          },
+          skipCount: {
+            hidden: true,
+            default: 0,
+          },
+          maxResultCount: {
+            hidden: true,
+            default: 10,
+          },
+          sorting: {
+            hidden: true,
+          },
+        },
+      },
+    },
+    table: {
+      schema: schema,
+    },
+    edit: {
+      detailsUrl,
+      createUrl,
+      updateUrl,
+      deleteUrl,
+      importUrl,
+      exportUrl,
+      detailsMethod,
+      createMethod,
+      updateMethod,
+      deleteMethod,
+      importMethod,
+      exportMethod,
+      schema: schema,
+    },
+  };
+}

code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/bj/input/bj_pub_se_detail_service.js

@@ -0,0 +1,132 @@
+const schema = {
+  title: "JIS发运数据",
+  type: "object",
+  properties: {
+    version: {
+      title: "版本",
+      type: "string",
+    },
+    shippingDate: {
+      title: "发货时间",
+      type: "string",
+      input: "datetime",
+    },
+    wmsBillNum: {
+      title: "发运单号",
+      type: "string",
+    },
+    lu: {
+      title: "零件号",
+      type: "string",
+    },
+    pn: {
+      title: "生产号",
+      type: "string",
+    },
+    keyCode: {
+      title: "组合键值(LU+PN)",
+      type: "string",
+    },
+    qty: {
+      title: "数量",
+      type: "number",
+    },
+    seqNumber: {
+      title: "日顺序号",
+      type: "string",
+    },
+    assemblyCode: {
+      title: "小总成号",
+      type: "string",
+    },
+    injectionCode: {
+      title: "注塑码",
+      type: "string",
+    },
+    beginDate: {
+      title: "订单时间",
+      type: "string",
+      input: "datetime",
+    },
+  },
+};
+
+const baseUrl = "settleaccount/bbac_se_detail_service";
+const queryUrl = `${baseUrl}/get-list`;
+// const deleteUrl = `${baseUrl}/delete-list`;
+const importUrl = `${baseUrl}/import`;
+const exportUrl = `${baseUrl}/export`;
+const queryMethod = "POST";
+// const deleteMethod = "POST";
+const importMethod = "POST";
+const exportMethod = "POST";
+
+export default function () {
+  return {
+    query: {
+      url: queryUrl,
+      method: queryMethod,
+      hasFilter: true,
+      schema: {
+        title: "JIS发运数据",
+        type: "object",
+        properties: {
+          filters: {
+            title: "项目",
+            type: "array",
+            hidden: true,
+            items: {
+              type: "object",
+              properties: {
+                logic: {
+                  type: "int",
+                },
+                column: {
+                  type: "string",
+                },
+                action: {
+                  type: "int",
+                },
+                value: {
+                  type: "string",
+                },
+              },
+            },
+            default: [
+              {
+                logic: "and",
+                column: "version",
+                action: "like",
+                value: null,
+                readOnly: true,
+              },
+            ],
+          },
+          skipCount: {
+            hidden: true,
+            default: 0,
+          },
+          maxResultCount: {
+            hidden: true,
+            default: 10,
+          },
+          sorting: {
+            hidden: true,
+          },
+        },
+      },
+    },
+    table: {
+      schema: schema,
+    },
+    edit: {
+      // deleteUrl,
+      importUrl,
+      exportUrl,
+      // deleteMethod,
+      importMethod,
+      exportMethod,
+      schema: schema,
+    },
+  };
+}

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

@@ -0,0 +1,126 @@
+const schema = {
+  title: "可结算单明细",
+  type: "object",
+  properties: {
+    settleBillNum: {
+      title: "关联结算单号",
+      type: "int",
+    },
+    site: {
+      title: "工厂地点",
+      type: "string",
+    },
+    version: {
+      title: "版本",
+      type: "int",
+    },
+    price: {
+      title: "单价",
+      type: "decimal",
+    },
+    billNum: {
+      title: "结算单号",
+      type: "string",
+    },
+    settleDate: {
+      title: "结算日期",
+      type: "DateTime",
+    },
+    settleInvGroupNumDate: {
+      title: "发票组号",
+      type: "string",
+    },
+    lu: {
+      title: "零件号",
+      type: "string",
+    },
+    materialDesc: {
+      title: "物料描述",
+      type: "string",
+    },
+    pn: {
+      title: "生产号",
+      type: "string",
+    },
+    qty: {
+      title: "结算数量",
+      type: "decimal",
+    },
+    groupNumy: {
+      title: "结算分组号",
+      type: "string",
+    },
+  },
+};
+
+const baseUrl = "settleaccount/hbpo_can_sa_detail_service";
+const queryUrl = `${baseUrl}/get-list`;
+const detailsUrl = `${baseUrl}/get/%s`;
+const queryMethod = "POST";
+const detailsMethod = "POST";
+
+export default function () {
+  return {
+    query: {
+      url: queryUrl,
+      method: queryMethod,
+      hasFilter: true,
+      schema: {
+        title: "发票分组号明细",
+        type: "object",
+        properties: {
+          filters: {
+            title: "项目",
+            type: "array",
+            hidden: true,
+            items: {
+              type: "object",
+              properties: {
+                logic: {
+                  type: "int",
+                },
+                column: {
+                  type: "string",
+                },
+                action: {
+                  type: "int",
+                },
+                value: {
+                  type: "string",
+                },
+              },
+            },
+            default: [
+              {
+                logic: "and",
+                column: "billNum",
+                action: "like",
+                value: null,
+                readOnly: true,
+              },
+            ],
+          },
+          skipCount: {
+            hidden: true,
+            default: 0,
+          },
+          maxResultCount: {
+            hidden: true,
+            default: 10,
+          },
+          sorting: {
+            hidden: true,
+          },
+        },
+      },
+    },
+    table: {
+      schema: schema,
+    },
+    edit: {
+      detailsUrl,
+      detailsMethod,
+      schema: schema,
+    },
+  };
+}

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

@@ -0,0 +1,128 @@
+import version from "../../version.js";
+import { state2, state3 } from "../../state.js";
+
+const schema = {
+  title: "商务审批",
+  type: "object",
+  properties: {
+    settleBillNum: {
+      title: "关联结算单号",
+      type: "string",
+    },
+    site: {
+      title: "工厂地点",
+      type: "string",
+    },
+    version,
+    state2,
+    price: {
+      title: "单价",
+      type: "decimal",
+    },
+    billNum: {
+      title: "结算单号",
+      type: "string",
+    },
+
+    settleDate: {
+      title: "结算日期",
+      type: "DateTime",
+    },
+    invGroupNum: {
+      title: "发票分组号",
+      type: "string",
+    },
+    lu: {
+      title: "零件号",
+      type: "string",
+    },
+    pn: {
+      title: "生产号",
+      type: "string",
+    },
+    qty: {
+      title: "结算数量",
+      type: "decimal",
+    },
+    groupNum: {
+      title: "结算分组号",
+      type: "string",
+    },
+  },
+};
+
+const baseUrl = "settleaccount/bbac_ba_service";
+const queryUrl = `${baseUrl}/main-query`;
+const detailsUrl = `${baseUrl}/get/%s`;
+const exportUrl = `${baseUrl}/export`;
+const queryMethod = "POST";
+const detailsMethod = "POST";
+const exportMethod = "POST";
+
+export default function () {
+  return {
+    query: {
+      url: queryUrl,
+      method: queryMethod,
+      hasFilter: true,
+      schema: {
+        title: "商务审批",
+        type: "object",
+        properties: {
+          filters: {
+            title: "项目",
+            type: "array",
+            hidden: true,
+            items: {
+              type: "object",
+              properties: {
+                logic: {
+                  type: "int",
+                },
+                column: {
+                  type: "string",
+                },
+                action: {
+                  type: "int",
+                },
+                value: {
+                  type: "string",
+                },
+              },
+            },
+            default: [
+              {
+                logic: "and",
+                column: "version",
+                action: "equal",
+                value: null,
+                readOnly: true,
+              },
+            ],
+          },
+          skipCount: {
+            hidden: true,
+            default: 0,
+          },
+          maxResultCount: {
+            hidden: true,
+            default: 10,
+          },
+          sorting: {
+            hidden: true,
+          },
+        },
+      },
+    },
+    table: {
+      schema: schema,
+    },
+    edit: {
+      detailsUrl,
+      exportUrl,
+      detailsMethod,
+      exportMethod,
+      schema: schema,
+    },
+  };
+}

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

@@ -0,0 +1,100 @@
+import version from "../../version.js";
+import state from "../../state.js";
+
+const schema = {
+  title: "发票分组号",
+  type: "object",
+  properties: {
+    version,
+    billNum: {
+      title: "结算单据",
+      type: "string",
+    },
+    settleBillNum: {
+      title: "关联结算单号",
+      type: "string",
+    },
+    state,
+    invGroupNum: {
+      title: "发票分组号",
+      type: "string",
+    },
+  },
+};
+
+const baseUrl = "settleaccount/bbac_can_sa_service";
+const queryUrl = `${baseUrl}/main-query`;
+const detailsUrl = `${baseUrl}/get/%s`;
+const exportUrl = `${baseUrl}/export`;
+const queryMethod = "POST";
+const detailsMethod = "POST";
+const exportMethod = "POST";
+
+export default function () {
+  return {
+    query: {
+      url: queryUrl,
+      method: queryMethod,
+      hasFilter: true,
+      schema: {
+        title: "发票分组号",
+        type: "object",
+        properties: {
+          filters: {
+            title: "项目",
+            type: "array",
+            hidden: true,
+            items: {
+              type: "object",
+              properties: {
+                logic: {
+                  type: "int",
+                },
+                column: {
+                  type: "string",
+                },
+                action: {
+                  type: "int",
+                },
+                value: {
+                  type: "string",
+                },
+              },
+            },
+            default: [
+              {
+                logic: "and",
+                column: "version",
+                action: "equal",
+                value: null,
+                readOnly: true,
+              },
+            ],
+          },
+          skipCount: {
+            hidden: true,
+            default: 0,
+          },
+          maxResultCount: {
+            hidden: true,
+            default: 10,
+          },
+          sorting: {
+            hidden: true,
+          },
+        },
+      },
+    },
+    table: {
+      schema: schema,
+    },
+    edit: {
+      detailsUrl,
+      exportUrl,
+      detailsMethod,
+      exportMethod,
+
+      schema: schema,
+    },
+  };
+}

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

@@ -0,0 +1,126 @@
+import version from "../../version.js";
+
+const schema = {
+  title: "不可结算单",
+  type: "object",
+  properties: {
+    settleBillNum: {
+      title: "关联结算单号",
+      type: "string",
+    },
+    site: {
+      title: "工厂地点",
+      type: "string",
+    },
+    version,
+    price: {
+      title: "单价",
+      type: "decimal",
+    },
+    billNum: {
+      title: "结算单号",
+      type: "string",
+    },
+
+    settleDate: {
+      title: "结算日期",
+      type: "DateTime",
+    },
+    invGroupNum: {
+      title: "发票分组号",
+      type: "string",
+    },
+    lu: {
+      title: "零件号",
+      type: "string",
+    },
+    pn: {
+      title: "生产号",
+      type: "string",
+    },
+    qty: {
+      title: "结算数量",
+      type: "decimal",
+    },
+    groupNum: {
+      title: "结算分组号",
+      type: "string",
+    },
+  },
+};
+
+const baseUrl = "settleaccount/bbac_not_sa_service";
+const queryUrl = `${baseUrl}/detail-query`;
+const detailsUrl = `${baseUrl}/get/%s`;
+const exportUrl = `${baseUrl}/export`;
+const queryMethod = "POST";
+const detailsMethod = "POST";
+const exportMethod = "POST";
+
+export default function () {
+  return {
+    query: {
+      url: queryUrl,
+      method: queryMethod,
+      hasFilter: true,
+      schema: {
+        title: "不可结算单",
+        type: "object",
+        properties: {
+          filters: {
+            title: "项目",
+            type: "array",
+            hidden: true,
+            items: {
+              type: "object",
+              properties: {
+                logic: {
+                  type: "int",
+                },
+                column: {
+                  type: "string",
+                },
+                action: {
+                  type: "int",
+                },
+                value: {
+                  type: "string",
+                },
+              },
+            },
+            default: [
+              {
+                logic: "and",
+                column: "version",
+                action: "equal",
+                value: null,
+                readOnly: true,
+              },
+            ],
+          },
+          skipCount: {
+            hidden: true,
+            default: 0,
+          },
+          maxResultCount: {
+            hidden: true,
+            default: 10,
+          },
+          sorting: {
+            hidden: true,
+          },
+        },
+      },
+    },
+    table: {
+      schema: schema,
+    },
+    edit: {
+      detailsUrl,
+      exportUrl,
+      detailsMethod,
+      exportMethod,
+      schema: schema,
+    },
+  };
+}

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

@@ -0,0 +1,103 @@
+import version from "../../version.js";
+import { state2, state3 } from "../../state.js";
+
+const schema = {
+  title: "寄售库库存扣减审批",
+  type: "object",
+  properties: {
+    version,
+    state3,
+    billNum: {
+      title: "结算单号",
+      type: "string",
+    },
+    settleBillNum: {
+      title: "关联结算单号",
+      type: "string",
+    },
+    invGroupNum: {
+      title: "发票分组号",
+      type: "string",
+    },
+    site: {
+      title: "地点",
+      type: "string",
+    },
+  },
+};
+
+const baseUrl = "settleaccount/bbac_pd_service";
+const queryUrl = `${baseUrl}/main-query`;
+const detailsUrl = `${baseUrl}/get/%s`;
+const exportUrl = `${baseUrl}/export`;
+const queryMethod = "POST";
+const detailsMethod = "POST";
+const exportMethod = "POST";
+
+export default function () {
+  return {
+    query: {
+      url: queryUrl,
+      method: queryMethod,
+      hasFilter: true,
+      schema: {
+        title: "不可结算单",
+        type: "object",
+        properties: {
+          filters: {
+            title: "项目",
+            type: "array",
+            hidden: true,
+            items: {
+              type: "object",
+              properties: {
+                logic: {
+                  type: "int",
+                },
+                column: {
+                  type: "string",
+                },
+                action: {
+                  type: "int",
+                },
+                value: {
+                  type: "string",
+                },
+              },
+            },
+            default: [
+              {
+                logic: "and",
+                column: "version",
+                action: "equal",
+                value: null,
+                readOnly: true,
+              },
+            ],
+          },
+          skipCount: {
+            hidden: true,
+            default: 0,
+          },
+          maxResultCount: {
+            hidden: true,
+            default: 10,
+          },
+          sorting: {
+            hidden: true,
+          },
+        },
+      },
+    },
+    table: {
+      schema: schema,
+    },
+    edit: {
+      detailsUrl,
+      exportUrl,
+      detailsMethod,
+      exportMethod,
+      schema: schema,
+    },
+  };
+}

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

@@ -0,0 +1,132 @@
+const schema = {
+  title: "通用代码",
+  type: "object",
+  properties: {
+    project: {
+      title: "项目",
+      type: "string",
+      readOnly: true,
+      showForList: true,
+      rules: [
+        {
+          required: true,
+        },
+      ],
+    },
+    value: {
+      title: "值",
+      type: "string",
+      readOnly: true,
+      showForList: true,
+      rules: [
+        {
+          required: true,
+        },
+      ],
+    },
+    description: {
+      title: "描述",
+      type: "string",
+      input: "textarea",
+      showForList: true,
+      rules: [
+        {
+          required: true,
+        },
+        { max: 60 },
+      ],
+    },
+  },
+};
+
+const baseUrl = "settleaccount/code-setting";
+const queryUrl = `${baseUrl}/get-list`;
+const detailsUrl = `${baseUrl}/get/%s`;
+const createUrl = `${baseUrl}/create`;
+const updateUrl = `${baseUrl}/update/%s`;
+const deleteUrl = `${baseUrl}/delete-list`;
+const importUrl = `${baseUrl}/code-setting-upload-excel-import`;
+const exportUrl = `${baseUrl}/export`;
+const queryMethod = "POST";
+const detailsMethod = "POST";
+const createMethod = "POST";
+const updateMethod = "POST";
+const deleteMethod = "POST";
+const importMethod = "POST";
+const exportMethod = "POST";
+
+export default function () {
+  return {
+    query: {
+      url: queryUrl,
+      method: queryMethod,
+      hasFilter: true,
+      schema: {
+        title: "通用代码",
+        type: "object",
+        properties: {
+          filters: {
+            title: "项目",
+            type: "array",
+            hidden: true,
+            items: {
+              type: "object",
+              properties: {
+                logic: {
+                  type: "int",
+                },
+                column: {
+                  type: "string",
+                },
+                action: {
+                  type: "int",
+                },
+                value: {
+                  type: "string",
+                },
+              },
+            },
+            default: [
+              {
+                logic: "and",
+                column: "project",
+                action: "like",
+                value: null,
+                readOnly: true,
+              },
+            ],
+          },
+          skipCount: {
+            hidden: true,
+            default: 0,
+          },
+          maxResultCount: {
+            hidden: true,
+            default: 10,
+          },
+          sorting: {
+            hidden: true,
+          },
+        },
+      },
+    },
+    table: {
+      schema: schema,
+    },
+    edit: {
+      detailsUrl,
+      createUrl,
+      updateUrl,
+      deleteUrl,
+      importUrl,
+      exportUrl,
+      detailsMethod,
+      createMethod,
+      updateMethod,
+      deleteMethod,
+      importMethod,
+      exportMethod,
+      schema: schema,
+    },
+  };
+}

code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/in/contrast/in_second_pub_sa_detail_jobservice.js

@@ -0,0 +1,132 @@
+const schema = {
+  title: "通用代码",
+  type: "object",
+  properties: {
+    project: {
+      title: "项目",
+      type: "string",
+      readOnly: true,
+      showForList: true,
+      rules: [
+        {
+          required: true,
+        },
+      ],
+    },
+    value: {
+      title: "值",
+      type: "string",
+      readOnly: true,
+      showForList: true,
+      rules: [
+        {
+          required: true,
+        },
+      ],
+    },
+    description: {
+      title: "描述",
+      type: "string",
+      input: "textarea",
+      showForList: true,
+      rules: [
+        {
+          required: true,
+        },
+        { max: 60 },
+      ],
+    },
+  },
+};
+
+const baseUrl = "settleaccount/code-setting";
+const queryUrl = `${baseUrl}/get-list`;
+const detailsUrl = `${baseUrl}/get/%s`;
+const createUrl = `${baseUrl}/create`;
+const updateUrl = `${baseUrl}/update/%s`;
+const deleteUrl = `${baseUrl}/delete-list`;
+const importUrl = `${baseUrl}/code-setting-upload-excel-import`;
+const exportUrl = `${baseUrl}/export`;
+const queryMethod = "POST";
+const detailsMethod = "POST";
+const createMethod = "POST";
+const updateMethod = "POST";
+const deleteMethod = "POST";
+const importMethod = "POST";
+const exportMethod = "POST";
+
+export default function () {
+  return {
+    query: {
+      url: queryUrl,
+      method: queryMethod,
+      hasFilter: true,
+      schema: {
+        title: "通用代码",
+        type: "object",
+        properties: {
+          filters: {
+            title: "项目",
+            type: "array",
+            hidden: true,
+            items: {
+              type: "object",
+              properties: {
+                logic: {
+                  type: "int",
+                },
+                column: {
+                  type: "string",
+                },
+                action: {
+                  type: "int",
+                },
+                value: {
+                  type: "string",
+                },
+              },
+            },
+            default: [
+              {
+                logic: "and",
+                column: "project",
+                action: "like",
+                value: null,
+                readOnly: true,
+              },
+            ],
+          },
+          skipCount: {
+            hidden: true,
+            default: 0,
+          },
+          maxResultCount: {
+            hidden: true,
+            default: 10,
+          },
+          sorting: {
+            hidden: true,
+          },
+        },
+      },
+    },
+    table: {
+      schema: schema,
+    },
+    edit: {
+      detailsUrl,
+      createUrl,
+      updateUrl,
+      deleteUrl,
+      importUrl,
+      exportUrl,
+      detailsMethod,
+      createMethod,
+      updateMethod,
+      deleteMethod,
+      importMethod,
+      exportMethod,
+      schema: schema,
+    },
+  };
+}

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

@@ -0,0 +1,132 @@
+const schema = {
+  title: "JIS结算数据",
+  type: "object",
+  properties: {
+    project: {
+      title: "项目",
+      type: "string",
+      readOnly: true,
+      showForList: true,
+      rules: [
+        {
+          required: true,
+        },
+      ],
+    },
+    value: {
+      title: "值",
+      type: "string",
+      readOnly: true,
+      showForList: true,
+      rules: [
+        {
+          required: true,
+        },
+      ],
+    },
+    description: {
+      title: "描述",
+      type: "string",
+      input: "textarea",
+      showForList: true,
+      rules: [
+        {
+          required: true,
+        },
+        { max: 60 },
+      ],
+    },
+  },
+};
+
+const baseUrl = "settleaccount/bbac_sa_detail_service";
+const queryUrl = `${baseUrl}/get-list`;
+const detailsUrl = `${baseUrl}/get/%s`;
+const createUrl = `${baseUrl}/create`;
+const updateUrl = `${baseUrl}/update/%s`;
+const deleteUrl = `${baseUrl}/delete-list`;
+const importUrl = `${baseUrl}/code-setting-upload-excel-import`;
+const exportUrl = `${baseUrl}/export`;
+const queryMethod = "POST";
+const detailsMethod = "POST";
+const createMethod = "POST";
+const updateMethod = "POST";
+const deleteMethod = "POST";
+const importMethod = "POST";
+const exportMethod = "POST";
+
+export default function () {
+  return {
+    query: {
+      url: queryUrl,
+      method: queryMethod,
+      hasFilter: true,
+      schema: {
+        title: "JIS结算数据",
+        type: "object",
+        properties: {
+          filters: {
+            title: "项目",
+            type: "array",
+            hidden: true,
+            items: {
+              type: "object",
+              properties: {
+                logic: {
+                  type: "int",
+                },
+                column: {
+                  type: "string",
+                },
+                action: {
+                  type: "int",
+                },
+                value: {
+                  type: "string",
+                },
+              },
+            },
+            default: [
+              {
+                logic: "and",
+                column: "project",
+                action: "like",
+                value: null,
+                readOnly: true,
+              },
+            ],
+          },
+          skipCount: {
+            hidden: true,
+            default: 0,
+          },
+          maxResultCount: {
+            hidden: true,
+            default: 10,
+          },
+          sorting: {
+            hidden: true,
+          },
+        },
+      },
+    },
+    table: {
+      schema: schema,
+    },
+    edit: {
+      detailsUrl,
+      createUrl,
+      updateUrl,
+      deleteUrl,
+      importUrl,
+      exportUrl,
+      detailsMethod,
+      createMethod,
+      updateMethod,
+      deleteMethod,
+      importMethod,
+      exportMethod,
+      schema: schema,
+    },
+  };
+}

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

@@ -0,0 +1,132 @@
+const schema = {
+  title: "JIS结算数据",
+  type: "object",
+  properties: {
+    project: {
+      title: "项目",
+      type: "string",
+      readOnly: true,
+      showForList: true,
+      rules: [
+        {
+          required: true,
+        },
+      ],
+    },
+    value: {
+      title: "值",
+      type: "string",
+      readOnly: true,
+      showForList: true,
+      rules: [
+        {
+          required: true,
+        },
+      ],
+    },
+    description: {
+      title: "描述",
+      type: "string",
+      input: "textarea",
+      showForList: true,
+      rules: [
+        {
+          required: true,
+        },
+        { max: 60 },
+      ],
+    },
+  },
+};
+
+const baseUrl = "settleaccount/bbac_sa_service";
+const queryUrl = `${baseUrl}/get-list`;
+const detailsUrl = `${baseUrl}/get/%s`;
+const createUrl = `${baseUrl}/create`;
+const updateUrl = `${baseUrl}/update/%s`;
+const deleteUrl = `${baseUrl}/delete-list`;
+const importUrl = `${baseUrl}/code-setting-upload-excel-import`;
+const exportUrl = `${baseUrl}/export`;
+const queryMethod = "POST";
+const detailsMethod = "POST";
+const createMethod = "POST";
+const updateMethod = "POST";
+const deleteMethod = "POST";
+const importMethod = "POST";
+const exportMethod = "POST";
+
+export default function () {
+  return {
+    query: {
+      url: queryUrl,
+      method: queryMethod,
+      hasFilter: true,
+      schema: {
+        title: "JIS结算数据",
+        type: "object",
+        properties: {
+          filters: {
+            title: "项目",
+            type: "array",
+            hidden: true,
+            items: {
+              type: "object",
+              properties: {
+                logic: {
+                  type: "int",
+                },
+                column: {
+                  type: "string",
+                },
+                action: {
+                  type: "int",
+                },
+                value: {
+                  type: "string",
+                },
+              },
+            },
+            default: [
+              {
+                logic: "and",
+                column: "project",
+                action: "like",
+                value: null,
+                readOnly: true,
+              },
+            ],
+          },
+          skipCount: {
+            hidden: true,
+            default: 0,
+          },
+          maxResultCount: {
+            hidden: true,
+            default: 10,
+          },
+          sorting: {
+            hidden: true,
+          },
+        },
+      },
+    },
+    table: {
+      schema: schema,
+    },
+    edit: {
+      detailsUrl,
+      createUrl,
+      updateUrl,
+      deleteUrl,
+      importUrl,
+      exportUrl,
+      detailsMethod,
+      createMethod,
+      updateMethod,
+      deleteMethod,
+      importMethod,
+      exportMethod,
+      schema: schema,
+    },
+  };
+}

code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/in/input/in_pub_se_detail_service.js

@@ -0,0 +1,132 @@
+const schema = {
+  title: "JIS发运数据",
+  type: "object",
+  properties: {
+    version: {
+      title: "版本",
+      type: "string",
+    },
+    shippingDate: {
+      title: "发货时间",
+      type: "string",
+      input: "datetime",
+    },
+    wmsBillNum: {
+      title: "发运单号",
+      type: "string",
+    },
+    lu: {
+      title: "零件号",
+      type: "string",
+    },
+    pn: {
+      title: "生产号",
+      type: "string",
+    },
+    keyCode: {
+      title: "组合键值(LU+PN)",
+      type: "string",
+    },
+    qty: {
+      title: "数量",
+      type: "number",
+    },
+    seqNumber: {
+      title: "日顺序号",
+      type: "string",
+    },
+    assemblyCode: {
+      title: "小总成号",
+      type: "string",
+    },
+    injectionCode: {
+      title: "注塑码",
+      type: "string",
+    },
+    beginDate: {
+      title: "订单时间",
+      type: "string",
+      input: "datetime",
+    },
+  },
+};
+
+const baseUrl = "settleaccount/bbac_se_detail_service";
+const queryUrl = `${baseUrl}/get-list`;
+// const deleteUrl = `${baseUrl}/delete-list`;
+const importUrl = `${baseUrl}/import`;
+const exportUrl = `${baseUrl}/export`;
+const queryMethod = "POST";
+// const deleteMethod = "POST";
+const importMethod = "POST";
+const exportMethod = "POST";
+
+export default function () {
+  return {
+    query: {
+      url: queryUrl,
+      method: queryMethod,
+      hasFilter: true,
+      schema: {
+        title: "JIS发运数据",
+        type: "object",
+        properties: {
+          filters: {
+            title: "项目",
+            type: "array",
+            hidden: true,
+            items: {
+              type: "object",
+              properties: {
+                logic: {
+                  type: "int",
+                },
+                column: {
+                  type: "string",
+                },
+                action: {
+                  type: "int",
+                },
+                value: {
+                  type: "string",
+                },
+              },
+            },
+            default: [
+              {
+                logic: "and",
+                column: "version",
+                action: "like",
+                value: null,
+                readOnly: true,
+              },
+            ],
+          },
+          skipCount: {
+            hidden: true,
+            default: 0,
+          },
+          maxResultCount: {
+            hidden: true,
+            default: 10,
+          },
+          sorting: {
+            hidden: true,
+          },
+        },
+      },
+    },
+    table: {
+      schema: schema,
+    },
+    edit: {
+      // deleteUrl,
+      importUrl,
+      exportUrl,
+      // deleteMethod,
+      importMethod,
+      exportMethod,
+      schema: schema,
+    },
+  };
+}

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

@@ -0,0 +1,128 @@
+import version from "../../version.js";
+import { state2, state3 } from "../../state.js";
+
+const schema = {
+  title: "商务审批",
+  type: "object",
+  properties: {
+    settleBillNum: {
+      title: "关联结算单号",
+      type: "string",
+    },
+    site: {
+      title: "工厂地点",
+      type: "string",
+    },
+    version,
+    state2,
+    price: {
+      title: "单价",
+      type: "decimal",
+    },
+    billNum: {
+      title: "结算单号",
+      type: "string",
+    },
+
+    settleDate: {
+      title: "结算日期",
+      type: "DateTime",
+    },
+    invGroupNum: {
+      title: "发票分组号",
+      type: "string",
+    },
+    lu: {
+      title: "零件号",
+      type: "string",
+    },
+    pn: {
+      title: "生产号",
+      type: "string",
+    },
+    qty: {
+      title: "结算数量",
+      type: "decimal",
+    },
+    groupNum: {
+      title: "结算分组号",
+      type: "string",
+    },
+  },
+};
+
+const baseUrl = "settleaccount/bbac_ba_service";
+const queryUrl = `${baseUrl}/main-query`;
+const detailsUrl = `${baseUrl}/get/%s`;
+const exportUrl = `${baseUrl}/export`;
+const queryMethod = "POST";
+const detailsMethod = "POST";
+const exportMethod = "POST";
+
+export default function () {
+  return {
+    query: {
+      url: queryUrl,
+      method: queryMethod,
+      hasFilter: true,
+      schema: {
+        title: "商务审批",
+        type: "object",
+        properties: {
+          filters: {
+            title: "项目",
+            type: "array",
+            hidden: true,
+            items: {
+              type: "object",
+              properties: {
+                logic: {
+                  type: "int",
+                },
+                column: {
+                  type: "string",
+                },
+                action: {
+                  type: "int",
+                },
+                value: {
+                  type: "string",
+                },
+              },
+            },
+            default: [
+              {
+                logic: "and",
+                column: "version",
+                action: "equal",
+                value: null,
+                readOnly: true,
+              },
+            ],
+          },
+          skipCount: {
+            hidden: true,
+            default: 0,
+          },
+          maxResultCount: {
+            hidden: true,
+            default: 10,
+          },
+          sorting: {
+            hidden: true,
+          },
+        },
+      },
+    },
+    table: {
+      schema: schema,
+    },
+    edit: {
+      detailsUrl,
+      exportUrl,
+      detailsMethod,
+      exportMethod,
+      schema: schema,
+    },
+  };
+}

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

@@ -0,0 +1,126 @@
+const schema = {
+  title: "可结算单明细",
+  type: "object",
+  properties: {
+    settleBillNum: {
+      title: "关联结算单号",
+      type: "int",
+    },
+    site: {
+      title: "工厂地点",
+      type: "string",
+    },
+    version: {
+      title: "版本",
+      type: "int",
+    },
+    price: {
+      title: "单价",
+      type: "decimal",
+    },
+    billNum: {
+      title: "结算单号",
+      type: "string",
+    },
+    settleDate: {
+      title: "结算日期",
+      type: "DateTime",
+    },
+    settleInvGroupNumDate: {
+      title: "发票组号",
+      type: "string",
+    },
+    lu: {
+      title: "零件号",
+      type: "string",
+    },
+    materialDesc: {
+      title: "物料描述",
+      type: "string",
+    },
+    pn: {
+      title: "生产号",
+      type: "string",
+    },
+    qty: {
+      title: "结算数量",
+      type: "decimal",
+    },
+    groupNumy: {
+      title: "结算分组号",
+      type: "string",
+    },
+  },
+};
+
+const baseUrl = "settleaccount/hbpo_can_sa_detail_service";
+const queryUrl = `${baseUrl}/get-list`;
+const detailsUrl = `${baseUrl}/get/%s`;
+const queryMethod = "POST";
+const detailsMethod = "POST";
+
+export default function () {
+  return {
+    query: {
+      url: queryUrl,
+      method: queryMethod,
+      hasFilter: true,
+      schema: {
+        title: "发票分组号明细",
+        type: "object",
+        properties: {
+          filters: {
+            title: "项目",
+            type: "array",
+            hidden: true,
+            items: {
+              type: "object",
+              properties: {
+                logic: {
+                  type: "int",
+                },
+                column: {
+                  type: "string",
+                },
+                action: {
+                  type: "int",
+                },
+                value: {
+                  type: "string",
+                },
+              },
+            },
+            default: [
+              {
+                logic: "and",
+                column: "billNum",
+                action: "like",
+                value: null,
+                readOnly: true,
+              },
+            ],
+          },
+          skipCount: {
+            hidden: true,
+            default: 0,
+          },
+          maxResultCount: {
+            hidden: true,
+            default: 10,
+          },
+          sorting: {
+            hidden: true,
+          },
+        },
+      },
+    },
+    table: {
+      schema: schema,
+    },
+    edit: {
+      detailsUrl,
+      detailsMethod,
+      schema: schema,
+    },
+  };
+}

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

@@ -0,0 +1,100 @@
+import version from "../../version.js";
+import state from "../../state.js";
+
+const schema = {
+  title: "发票分组号",
+  type: "object",
+  properties: {
+    version,
+    billNum: {
+      title: "结算单据",
+      type: "string",
+    },
+    settleBillNum: {
+      title: "关联结算单号",
+      type: "string",
+    },
+    state,
+    invGroupNum: {
+      title: "发票分组号",
+      type: "string",
+    },
+  },
+};
+
+const baseUrl = "settleaccount/bbac_can_sa_service";
+const queryUrl = `${baseUrl}/main-query`;
+const detailsUrl = `${baseUrl}/get/%s`;
+const exportUrl = `${baseUrl}/export`;
+const queryMethod = "POST";
+const detailsMethod = "POST";
+const exportMethod = "POST";
+
+export default function () {
+  return {
+    query: {
+      url: queryUrl,
+      method: queryMethod,
+      hasFilter: true,
+      schema: {
+        title: "发票分组号",
+        type: "object",
+        properties: {
+          filters: {
+            title: "项目",
+            type: "array",
+            hidden: true,
+            items: {
+              type: "object",
+              properties: {
+                logic: {
+                  type: "int",
+                },
+                column: {
+                  type: "string",
+                },
+                action: {
+                  type: "int",
+                },
+                value: {
+                  type: "string",
+                },
+              },
+            },
+            default: [
+              {
+                logic: "and",
+                column: "version",
+                action: "equal",
+                value: null,
+                readOnly: true,
+              },
+            ],
+          },
+          skipCount: {
+            hidden: true,
+            default: 0,
+          },
+          maxResultCount: {
+            hidden: true,
+            default: 10,
+          },
+          sorting: {
+            hidden: true,
+          },
+        },
+      },
+    },
+    table: {
+      schema: schema,
+    },
+    edit: {
+      detailsUrl,
+      exportUrl,
+      detailsMethod,
+      exportMethod,
+
+      schema: schema,
+    },
+  };
+}

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

@@ -0,0 +1,126 @@
+import version from "../../version.js";
+
+const schema = {
+  title: "不可结算单",
+  type: "object",
+  properties: {
+    settleBillNum: {
+      title: "关联结算单号",
+      type: "string",
+    },
+    site: {
+      title: "工厂地点",
+      type: "string",
+    },
+    version,
+    price: {
+      title: "单价",
+      type: "decimal",
+    },
+    billNum: {
+      title: "结算单号",
+      type: "string",
+    },
+
+    settleDate: {
+      title: "结算日期",
+      type: "DateTime",
+    },
+    invGroupNum: {
+      title: "发票分组号",
+      type: "string",
+    },
+    lu: {
+      title: "零件号",
+      type: "string",
+    },
+    pn: {
+      title: "生产号",
+      type: "string",
+    },
+    qty: {
+      title: "结算数量",
+      type: "decimal",
+    },
+    groupNum: {
+      title: "结算分组号",
+      type: "string",
+    },
+  },
+};
+
+const baseUrl = "settleaccount/bbac_not_sa_service";
+const queryUrl = `${baseUrl}/detail-query`;
+const detailsUrl = `${baseUrl}/get/%s`;
+const exportUrl = `${baseUrl}/export`;
+const queryMethod = "POST";
+const detailsMethod = "POST";
+const exportMethod = "POST";
+
+export default function () {
+  return {
+    query: {
+      url: queryUrl,
+      method: queryMethod,
+      hasFilter: true,
+      schema: {
+        title: "不可结算单",
+        type: "object",
+        properties: {
+          filters: {
+            title: "项目",
+            type: "array",
+            hidden: true,
+            items: {
+              type: "object",
+              properties: {
+                logic: {
+                  type: "int",
+                },
+                column: {
+                  type: "string",
+                },
+                action: {
+                  type: "int",
+                },
+                value: {
+                  type: "string",
+                },
+              },
+            },
+            default: [
+              {
+                logic: "and",
+                column: "version",
+                action: "equal",
+                value: null,
+                readOnly: true,
+              },
+            ],
+          },
+          skipCount: {
+            hidden: true,
+            default: 0,
+          },
+          maxResultCount: {
+            hidden: true,
+            default: 10,
+          },
+          sorting: {
+            hidden: true,
+          },
+        },
+      },
+    },
+    table: {
+      schema: schema,
+    },
+    edit: {
+      detailsUrl,
+      exportUrl,
+      detailsMethod,
+      exportMethod,
+      schema: schema,
+    },
+  };
+}

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

@@ -0,0 +1,103 @@
+import version from "../../version.js";
+import { state2, state3 } from "../../state.js";
+
+const schema = {
+  title: "寄售库库存扣减审批",
+  type: "object",
+  properties: {
+    version,
+    state3,
+    billNum: {
+      title: "结算单号",
+      type: "string",
+    },
+    settleBillNum: {
+      title: "关联结算单号",
+      type: "string",
+    },
+    invGroupNum: {
+      title: "发票分组号",
+      type: "string",
+    },
+    site: {
+      title: "地点",
+      type: "string",
+    },
+  },
+};
+
+const baseUrl = "settleaccount/bbac_pd_service";
+const queryUrl = `${baseUrl}/main-query`;
+const detailsUrl = `${baseUrl}/get/%s`;
+const exportUrl = `${baseUrl}/export`;
+const queryMethod = "POST";
+const detailsMethod = "POST";
+const exportMethod = "POST";
+
+export default function () {
+  return {
+    query: {
+      url: queryUrl,
+      method: queryMethod,
+      hasFilter: true,
+      schema: {
+        title: "不可结算单",
+        type: "object",
+        properties: {
+          filters: {
+            title: "项目",
+            type: "array",
+            hidden: true,
+            items: {
+              type: "object",
+              properties: {
+                logic: {
+                  type: "int",
+                },
+                column: {
+                  type: "string",
+                },
+                action: {
+                  type: "int",
+                },
+                value: {
+                  type: "string",
+                },
+              },
+            },
+            default: [
+              {
+                logic: "and",
+                column: "version",
+                action: "equal",
+                value: null,
+                readOnly: true,
+              },
+            ],
+          },
+          skipCount: {
+            hidden: true,
+            default: 0,
+          },
+          maxResultCount: {
+            hidden: true,
+            default: 10,
+          },
+          sorting: {
+            hidden: true,
+          },
+        },
+      },
+    },
+    table: {
+      schema: schema,
+    },
+    edit: {
+      detailsUrl,
+      exportUrl,
+      detailsMethod,
+      exportMethod,
+      schema: schema,
+    },
+  };
+}

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

@@ -0,0 +1,107 @@
+import version from "../../version.js";
+import { state2, state3 } from "../../state.js";
+
+const schema = {
+  title: "财务管理审核",
+  type: "object",
+  properties: {
+    version,
+    state2,
+    realnvBillNum: {
+      title: "实际纸质发票号",
+      type: "string",
+    },
+    amt: {
+      title: "未税金额",
+      type: "decimal",
+    },
+    taxAmt: {
+      title: "税后金额",
+      type: "decimal",
+    },
+    invGroupNum: {
+      title: "发票分组号",
+      type: "string",
+    },
+    fileName: {
+      title: "开票Excel文件",
+      type: "string",
+    },
+    businessType: {
+      title: "业务类别",
+      type: "EnumBusinessType",
+    },
+  },
+};
+
+const baseUrl = "settleaccount/invoice_service";
+const queryUrl = `${baseUrl}/main-query`;
+const importUrl = `${baseUrl}/invoice_service-upload-excel-import`;
+const queryMethod = "POST";
+const importMethod = "POST";
+
+export default function () {
+  return {
+    query: {
+      url: queryUrl,
+      method: queryMethod,
+      hasFilter: true,
+      schema: {
+        title: "财务管理审核",
+        type: "object",
+        properties: {
+          filters: {
+            title: "项目",
+            type: "array",
+            hidden: true,
+            items: {
+              type: "object",
+              properties: {
+                logic: {
+                  type: "int",
+                },
+                column: {
+                  type: "string",
+                },
+                action: {
+                  type: "int",
+                },
+                value: {
+                  type: "string",
+                },
+              },
+            },
+            default: [
+              {
+                logic: "and",
+                column: "version",
+                action: "equal",
+                value: null,
+                readOnly: true,
+              },
+            ],
+          },
+          skipCount: {
+            hidden: true,
+            default: 0,
+          },
+          maxResultCount: {
+            hidden: true,
+            default: 10,
+          },
+          sorting: {
+            hidden: true,
+          },
+        },
+      },
+    },
+    table: {
+      schema: schema,
+    },
+    edit: {
+      importUrl,
+      importMethod,
+      schema: schema,
+    },
+  };
+}

code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-bbac/contrast/bbac_sa_detail_jobservice.js

@@ -0,0 +1,137 @@
+const schema = {
+  title: "期间设置",
+  type: "object",
+  properties: {
+    year: {
+      title: "年度",
+      type: "string",
+      hidden: true,
+      showForList: true,
+      rules: [
+        {
+          required: true,
+        },
+      ],
+    },
+    period: {
+      title: "期间",
+      type: "string",
+      hidden: true,
+      showForList: true,
+      rules: [
+        {
+          required: true,
+        },
+      ],
+    },
+    version: {
+      title: "版本",
+      type: "string",
+      input: "month",
+      format: "YYYYMM",
+      showForList: true,
+      watch: "(model,value)=>{model.year=value.substr(0,4);model.period=value.substr(4,2);}",
+      rules: [
+        {
+          required: true,
+          trigger: "blur",
+        },
+      ],
+    },
+    state: {
+      title: "状态",
+      type: "boolean",
+      showForList: true,
+      default: true,
+      rules: [
+        {
+          required: true,
+        },
+      ],
+    },
+  },
+};
+
+const baseUrl = "settleaccount/centralized-control";
+const queryUrl = `${baseUrl}/get-list`;
+const detailsUrl = `${baseUrl}/get/%s`;
+const createUrl = `${baseUrl}/create`;
+const updateUrl = `${baseUrl}/update/%s`;
+const deleteUrl = `${baseUrl}/delete-list`;
+const queryMethod = "POST";
+const detailsMethod = "POST";
+const createMethod = "POST";
+const updateMethod = "POST";
+const deleteMethod = "POST";
+
+export default function () {
+  return {
+    baseUrl,
+    query: {
+      url: queryUrl,
+      method: queryMethod,
+      hasFilter: true,
+      schema: {
+        title: "期间设置",
+        type: "object",
+        properties: {
+          filters: {
+            type: "array",
+            hidden: true,
+            items: {
+              type: "object",
+              properties: {
+                logic: {
+                  type: "int",
+                },
+                column: {
+                  type: "string",
+                },
+                action: {
+                  type: "int",
+                },
+                value: {
+                  type: "string",
+                },
+              },
+            },
+            default: [
+              {
+                logic: "and",
+                column: "year",
+                action: "like",
+                value: null,
+                readOnly: true,
+              },
+            ],
+          },
+          skipCount: {
+            hidden: true,
+            default: 0,
+          },
+          maxResultCount: {
+            hidden: true,
+            default: 10,
+          },
+          sorting: {
+            hidden: true,
+          },
+        },
+      },
+    },
+    table: {
+      schema: schema,
+    },
+    edit: {
+      detailsUrl,
+      createUrl,
+      updateUrl,
+      deleteUrl,
+      detailsMethod,
+      createMethod,
+      updateMethod,
+      deleteMethod,
+      schema: schema,
+    },
+  };
+}

code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-bbac/contrast/first_bbac_sa_detail_jobservice.js

@@ -0,0 +1,137 @@
+const schema = {
+  title: "期间设置",
+  type: "object",
+  properties: {
+    year: {
+      title: "年度",
+      type: "string",
+      hidden: true,
+      showForList: true,
+      rules: [
+        {
+          required: true,
+        },
+      ],
+    },
+    period: {
+      title: "期间",
+      type: "string",
+      hidden: true,
+      showForList: true,
+      rules: [
+        {
+          required: true,
+        },
+      ],
+    },
+    version: {
+      title: "版本",
+      type: "string",
+      input: "month",
+      format: "YYYYMM",
+      showForList: true,
+      watch: "(model,value)=>{model.year=value.substr(0,4);model.period=value.substr(4,2);}",
+      rules: [
+        {
+          required: true,
+          trigger: "blur",
+        },
+      ],
+    },
+    state: {
+      title: "状态",
+      type: "boolean",
+      showForList: true,
+      default: true,
+      rules: [
+        {
+          required: true,
+        },
+      ],
+    },
+  },
+};
+
+const baseUrl = "settleaccount/centralized-control";
+const queryUrl = `${baseUrl}/get-list`;
+const detailsUrl = `${baseUrl}/get/%s`;
+const createUrl = `${baseUrl}/create`;
+const updateUrl = `${baseUrl}/update/%s`;
+const deleteUrl = `${baseUrl}/delete-list`;
+const queryMethod = "POST";
+const detailsMethod = "POST";
+const createMethod = "POST";
+const updateMethod = "POST";
+const deleteMethod = "POST";
+
+export default function () {
+  return {
+    baseUrl,
+    query: {
+      url: queryUrl,
+      method: queryMethod,
+      hasFilter: true,
+      schema: {
+        title: "期间设置",
+        type: "object",
+        properties: {
+          filters: {
+            type: "array",
+            hidden: true,
+            items: {
+              type: "object",
+              properties: {
+                logic: {
+                  type: "int",
+                },
+                column: {
+                  type: "string",
+                },
+                action: {
+                  type: "int",
+                },
+                value: {
+                  type: "string",
+                },
+              },
+            },
+            default: [
+              {
+                logic: "and",
+                column: "year",
+                action: "like",
+                value: null,
+                readOnly: true,
+              },
+            ],
+          },
+          skipCount: {
+            hidden: true,
+            default: 0,
+          },
+          maxResultCount: {
+            hidden: true,
+            default: 10,
+          },
+          sorting: {
+            hidden: true,
+          },
+        },
+      },
+    },
+    table: {
+      schema: schema,
+    },
+    edit: {
+      detailsUrl,
+      createUrl,
+      updateUrl,
+      deleteUrl,
+      detailsMethod,
+      createMethod,
+      updateMethod,
+      deleteMethod,
+      schema: schema,
+    },
+  };
+}

code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-bbac/contrast/second_bbac_sa_detail_jobservice.js

@@ -0,0 +1,137 @@
+const schema = {
+  title: "期间设置",
+  type: "object",
+  properties: {
+    year: {
+      title: "年度",
+      type: "string",
+      hidden: true,
+      showForList: true,
+      rules: [
+        {
+          required: true,
+        },
+      ],
+    },
+    period: {
+      title: "期间",
+      type: "string",
+      hidden: true,
+      showForList: true,
+      rules: [
+        {
+          required: true,
+        },
+      ],
+    },
+    version: {
+      title: "版本",
+      type: "string",
+      input: "month",
+      format: "YYYYMM",
+      showForList: true,
+      watch: "(model,value)=>{model.year=value.substr(0,4);model.period=value.substr(4,2);}",
+      rules: [
+        {
+          required: true,
+          trigger: "blur",
+        },
+      ],
+    },
+    state: {
+      title: "状态",
+      type: "boolean",
+      showForList: true,
+      default: true,
+      rules: [
+        {
+          required: true,
+        },
+      ],
+    },
+  },
+};
+
+const baseUrl = "settleaccount/centralized-control";
+const queryUrl = `${baseUrl}/get-list`;
+const detailsUrl = `${baseUrl}/get/%s`;
+const createUrl = `${baseUrl}/create`;
+const updateUrl = `${baseUrl}/update/%s`;
+const deleteUrl = `${baseUrl}/delete-list`;
+const queryMethod = "POST";
+const detailsMethod = "POST";
+const createMethod = "POST";
+const updateMethod = "POST";
+const deleteMethod = "POST";
+
+export default function () {
+  return {
+    baseUrl,
+    query: {
+      url: queryUrl,
+      method: queryMethod,
+      hasFilter: true,
+      schema: {
+        title: "期间设置",
+        type: "object",
+        properties: {
+          filters: {
+            type: "array",
+            hidden: true,
+            items: {
+              type: "object",
+              properties: {
+                logic: {
+                  type: "int",
+                },
+                column: {
+                  type: "string",
+                },
+                action: {
+                  type: "int",
+                },
+                value: {
+                  type: "string",
+                },
+              },
+            },
+            default: [
+              {
+                logic: "and",
+                column: "year",
+                action: "like",
+                value: null,
+                readOnly: true,
+              },
+            ],
+          },
+          skipCount: {
+            hidden: true,
+            default: 0,
+          },
+          maxResultCount: {
+            hidden: true,
+            default: 10,
+          },
+          sorting: {
+            hidden: true,
+          },
+        },
+      },
+    },
+    table: {
+      schema: schema,
+    },
+    edit: {
+      detailsUrl,
+      createUrl,
+      updateUrl,
+      deleteUrl,
+      detailsMethod,
+      createMethod,
+      updateMethod,
+      deleteMethod,
+      schema: schema,
+    },
+  };
+}

code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-bbac/contrast/third_bbac_sa_detail_jobservice.js

@@ -0,0 +1,137 @@
+const schema = {
+  title: "期间设置",
+  type: "object",
+  properties: {
+    year: {
+      title: "年度",
+      type: "string",
+      hidden: true,
+      showForList: true,
+      rules: [
+        {
+          required: true,
+        },
+      ],
+    },
+    period: {
+      title: "期间",
+      type: "string",
+      hidden: true,
+      showForList: true,
+      rules: [
+        {
+          required: true,
+        },
+      ],
+    },
+    version: {
+      title: "版本",
+      type: "string",
+      input: "month",
+      format: "YYYYMM",
+      showForList: true,
+      watch: "(model,value)=>{model.year=value.substr(0,4);model.period=value.substr(4,2);}",
+      rules: [
+        {
+          required: true,
+          trigger: "blur",
+        },
+      ],
+    },
+    state: {
+      title: "状态",
+      type: "boolean",
+      showForList: true,
+      default: true,
+      rules: [
+        {
+          required: true,
+        },
+      ],
+    },
+  },
+};
+
+const baseUrl = "settleaccount/centralized-control";
+const queryUrl = `${baseUrl}/get-list`;
+const detailsUrl = `${baseUrl}/get/%s`;
+const createUrl = `${baseUrl}/create`;
+const updateUrl = `${baseUrl}/update/%s`;
+const deleteUrl = `${baseUrl}/delete-list`;
+const queryMethod = "POST";
+const detailsMethod = "POST";
+const createMethod = "POST";
+const updateMethod = "POST";
+const deleteMethod = "POST";
+
+export default function () {
+  return {
+    baseUrl,
+    query: {
+      url: queryUrl,
+      method: queryMethod,
+      hasFilter: true,
+      schema: {
+        title: "期间设置",
+        type: "object",
+        properties: {
+          filters: {
+            type: "array",
+            hidden: true,
+            items: {
+              type: "object",
+              properties: {
+                logic: {
+                  type: "int",
+                },
+                column: {
+                  type: "string",
+                },
+                action: {
+                  type: "int",
+                },
+                value: {
+                  type: "string",
+                },
+              },
+            },
+            default: [
+              {
+                logic: "and",
+                column: "year",
+                action: "like",
+                value: null,
+                readOnly: true,
+              },
+            ],
+          },
+          skipCount: {
+            hidden: true,
+            default: 0,
+          },
+          maxResultCount: {
+            hidden: true,
+            default: 10,
+          },
+          sorting: {
+            hidden: true,
+          },
+        },
+      },
+    },
+    table: {
+      schema: schema,
+    },
+    edit: {
+      detailsUrl,
+      createUrl,
+      updateUrl,
+      deleteUrl,
+      detailsMethod,
+      createMethod,
+      updateMethod,
+      deleteMethod,
+      schema: schema,
+    },
+  };
+}

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

@@ -53,11 +53,11 @@ const schema = {
 
 const baseUrl = "settleaccount/bbac_se_detail_service";
 const queryUrl = `${baseUrl}/get-list`;
-const deleteUrl = `${baseUrl}/delete-list`;
+// const deleteUrl = `${baseUrl}/delete-list`;
 const importUrl = `${baseUrl}/import`;
 const exportUrl = `${baseUrl}/export`;
 const queryMethod = "POST";
-const deleteMethod = "POST";
+// const deleteMethod = "POST";
 const importMethod = "POST";
 const exportMethod = "POST";
 
@@ -120,10 +120,10 @@ export default function () {
       schema: schema,
     },
     edit: {
-      deleteUrl,
+      // deleteUrl,
       importUrl,
       exportUrl,
-      deleteMethod,
+      // deleteMethod,
       importMethod,
       exportMethod,
       schema: schema,

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

@@ -1,5 +1,8 @@
+import version from "../../version.js";
+import { state2, state3 } from "../../state.js";
+
 const schema = {
-  title: "不可结算单",
+  title: "商务审批",
   type: "object",
   properties: {
     settleBillNum: {
@@ -10,10 +13,8 @@ const schema = {
       title: "工厂地点",
       type: "string",
     },
-    version: {
-      title: "版本",
-      type: "int",
-    },
+    version,
+    state2,
     price: {
       title: "单价",
       type: "decimal",
@@ -51,12 +52,8 @@ const schema = {
 };
 
 const baseUrl = "settleaccount/bbac_ba_service";
-const queryUrl = `${baseUrl}/get-list`;
+const queryUrl = `${baseUrl}/main-query`;
 const detailsUrl = `${baseUrl}/get/%s`;
-const createUrl = `${baseUrl}/create`;
-const updateUrl = `${baseUrl}/update/%s`;
-const deleteUrl = `${baseUrl}/delete-list`;
-const importUrl = `${baseUrl}/code-setting-upload-excel-import`;
 const exportUrl = `${baseUrl}/export`;
 const queryMethod = "POST";
 const detailsMethod = "POST";
@@ -69,7 +66,7 @@ export default function () {
       method: queryMethod,
       hasFilter: true,
       schema: {
-        title: "不可结算单",
+        title: "商务审批",
         type: "object",
         properties: {
           filters: {
@@ -96,8 +93,8 @@ export default function () {
             default: [
               {
                 logic: "and",
-                column: "billNum",
-                action: "like",
+                column: "version",
+                action: "equal",
                 value: null,
                 readOnly: true,
               },

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

@@ -54,10 +54,8 @@ const schema = {
 };
 
 const baseUrl = "settleaccount/bbac_can_sa_detail_service";
-const queryUrl = `${baseUrl}/get-list`;
-const detailsUrl = `${baseUrl}/get/%s`;
+const queryUrl = `${baseUrl}/detail-query`;
 const queryMethod = "POST";
-const detailsMethod = "POST";
 
 export default function () {
   return {
@@ -118,8 +116,6 @@ export default function () {
       schema: schema,
     },
     edit: {
-      detailsUrl,
-      detailsMethod,
       schema: schema,
     },
   };

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

@@ -1,11 +1,11 @@
+import version from "../../version.js";
+import state from "../../state.js";
+
 const schema = {
   title: "发票分组号",
   type: "object",
   properties: {
-    version: {
-      title: "期间",
-      type: "int",
-    },
+    version,
     billNum: {
       title: "结算单据",
       type: "string",
@@ -14,10 +14,7 @@ const schema = {
       title: "关联结算单号",
       type: "string",
     },
-    state: {
-      title: "状态",
-      type: "string",
-    },
+    state,
     invGroupNum: {
       title: "发票分组号",
       type: "string",
@@ -26,12 +23,8 @@ const schema = {
 };
 
 const baseUrl = "settleaccount/bbac_can_sa_service";
-const queryUrl = `${baseUrl}/get-list`;
+const queryUrl = `${baseUrl}/main-query`;
 const detailsUrl = `${baseUrl}/get/%s`;
-const createUrl = `${baseUrl}/create`;
-const updateUrl = `${baseUrl}/update/%s`;
-const deleteUrl = `${baseUrl}/delete-list`;
-const importUrl = `${baseUrl}/code-setting-upload-excel-import`;
 const exportUrl = `${baseUrl}/export`;
 const queryMethod = "POST";
 const detailsMethod = "POST";
@@ -71,8 +64,8 @@ export default function () {
             default: [
               {
                 logic: "and",
-                column: "billNum",
-                action: "like",
+                column: "version",
+                action: "equal",
                 value: null,
                 readOnly: true,
               },
@@ -100,6 +93,7 @@ export default function () {
       exportUrl,
       detailsMethod,
       exportMethod,
+
       schema: schema,
     },
   };

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

@@ -1,3 +1,5 @@
+import version from "../../version.js";
+
 const schema = {
   title: "不可结算单",
   type: "object",
@@ -10,10 +12,7 @@ const schema = {
       title: "工厂地点",
       type: "string",
     },
-    version: {
-      title: "版本",
-      type: "int",
-    },
+    version,
     price: {
       title: "单价",
       type: "decimal",
@@ -51,7 +50,7 @@ const schema = {
 };
 
 const baseUrl = "settleaccount/bbac_not_sa_service";
-const queryUrl = `${baseUrl}/get-list`;
+const queryUrl = `${baseUrl}/detail-query`;
 const detailsUrl = `${baseUrl}/get/%s`;
 const exportUrl = `${baseUrl}/export`;
 const queryMethod = "POST";
@@ -92,8 +91,8 @@ export default function () {
             default: [
               {
                 logic: "and",
-                column: "billNum",
-                action: "like",
+                column: "version",
+                action: "equal",
                 value: null,
                 readOnly: true,
               },

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

@@ -1,11 +1,12 @@
+import version from "../../version.js";
+import {state2,state3} from "../../state.js";
+
 const schema = {
   title: "寄售库库存扣减审批",
   type: "object",
   properties: {
-    version: {
-      title: "期间",
-      type: "int",
-    },
+    version,
+    state3,
     billNum: {
       title: "结算单号",
       type: "string",
@@ -26,12 +27,8 @@ const schema = {
 };
 
 const baseUrl = "settleaccount/bbac_pd_service";
-const queryUrl = `${baseUrl}/get-list`;
+const queryUrl = `${baseUrl}/main-query`;
 const detailsUrl = `${baseUrl}/get/%s`;
-const createUrl = `${baseUrl}/create`;
-const updateUrl = `${baseUrl}/update/%s`;
-const deleteUrl = `${baseUrl}/delete-list`;
-const importUrl = `${baseUrl}/code-setting-upload-excel-import`;
 const exportUrl = `${baseUrl}/export`;
 const queryMethod = "POST";
 const detailsMethod = "POST";
@@ -71,8 +68,8 @@ export default function () {
             default: [
               {
                 logic: "and",
-                column: "billNum",
-                action: "like",
+                column: "version",
+                action: "equal",
                 value: null,
                 readOnly: true,
               },

code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-hbpo/contrast/first_hbpo_sa_detail_service.js

@@ -0,0 +1,137 @@
+const schema = {
+  title: "期间设置",
+  type: "object",
+  properties: {
+    year: {
+      title: "年度",
+      type: "string",
+      hidden: true,
+      showForList: true,
+      rules: [
+        {
+          required: true,
+        },
+      ],
+    },
+    period: {
+      title: "期间",
+      type: "string",
+      hidden: true,
+      showForList: true,
+      rules: [
+        {
+          required: true,
+        },
+      ],
+    },
+    version: {
+      title: "版本",
+      type: "string",
+      input: "month",
+      format: "YYYYMM",
+      showForList: true,
+      watch: "(model,value)=>{model.year=value.substr(0,4);model.period=value.substr(4,2);}",
+      rules: [
+        {
+          required: true,
+          trigger: "blur",
+        },
+      ],
+    },
+    state: {
+      title: "状态",
+      type: "boolean",
+      showForList: true,
+      default: true,
+      rules: [
+        {
+          required: true,
+        },
+      ],
+    },
+  },
+};
+
+const baseUrl = "settleaccount/centralized-control";
+const queryUrl = `${baseUrl}/get-list`;
+const detailsUrl = `${baseUrl}/get/%s`;
+const createUrl = `${baseUrl}/create`;
+const updateUrl = `${baseUrl}/update/%s`;
+const deleteUrl = `${baseUrl}/delete-list`;
+const queryMethod = "POST";
+const detailsMethod = "POST";
+const createMethod = "POST";
+const updateMethod = "POST";
+const deleteMethod = "POST";
+
+export default function () {
+  return {
+    baseUrl,
+    query: {
+      url: queryUrl,
+      method: queryMethod,
+      hasFilter: true,
+      schema: {
+        title: "期间设置",
+        type: "object",
+        properties: {
+          filters: {
+            type: "array",
+            hidden: true,
+            items: {
+              type: "object",
+              properties: {
+                logic: {
+                  type: "int",
+                },
+                column: {
+                  type: "string",
+                },
+                action: {
+                  type: "int",
+                },
+                value: {
+                  type: "string",
+                },
+              },
+            },
+            default: [
+              {
+                logic: "and",
+                column: "year",
+                action: "like",
+                value: null,
+                readOnly: true,
+              },
+            ],
+          },
+          skipCount: {
+            hidden: true,
+            default: 0,
+          },
+          maxResultCount: {
+            hidden: true,
+            default: 10,
+          },
+          sorting: {
+            hidden: true,
+          },
+        },
+      },
+    },
+    table: {
+      schema: schema,
+    },
+    edit: {
+      detailsUrl,
+      createUrl,
+      updateUrl,
+      deleteUrl,
+      detailsMethod,
+      createMethod,
+      updateMethod,
+      deleteMethod,
+      schema: schema,
+    },
+  };
+}

code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-hbpo/contrast/hbpo_sa_detail_service.js

@@ -0,0 +1,137 @@
+const schema = {
+  title: "期间设置",
+  type: "object",
+  properties: {
+    year: {
+      title: "年度",
+      type: "string",
+      hidden: true,
+      showForList: true,
+      rules: [
+        {
+          required: true,
+        },
+      ],
+    },
+    period: {
+      title: "期间",
+      type: "string",
+      hidden: true,
+      showForList: true,
+      rules: [
+        {
+          required: true,
+        },
+      ],
+    },
+    version: {
+      title: "版本",
+      type: "string",
+      input: "month",
+      format: "YYYYMM",
+      showForList: true,
+      watch: "(model,value)=>{model.year=value.substr(0,4);model.period=value.substr(4,2);}",
+      rules: [
+        {
+          required: true,
+          trigger: "blur",
+        },
+      ],
+    },
+    state: {
+      title: "状态",
+      type: "boolean",
+      showForList: true,
+      default: true,
+      rules: [
+        {
+          required: true,
+        },
+      ],
+    },
+  },
+};
+
+const baseUrl = "settleaccount/centralized-control";
+const queryUrl = `${baseUrl}/get-list`;
+const detailsUrl = `${baseUrl}/get/%s`;
+const createUrl = `${baseUrl}/create`;
+const updateUrl = `${baseUrl}/update/%s`;
+const deleteUrl = `${baseUrl}/delete-list`;
+const queryMethod = "POST";
+const detailsMethod = "POST";
+const createMethod = "POST";
+const updateMethod = "POST";
+const deleteMethod = "POST";
+
+export default function () {
+  return {
+    baseUrl,
+    query: {
+      url: queryUrl,
+      method: queryMethod,
+      hasFilter: true,
+      schema: {
+        title: "期间设置",
+        type: "object",
+        properties: {
+          filters: {
+            type: "array",
+            hidden: true,
+            items: {
+              type: "object",
+              properties: {
+                logic: {
+                  type: "int",
+                },
+                column: {
+                  type: "string",
+                },
+                action: {
+                  type: "int",
+                },
+                value: {
+                  type: "string",
+                },
+              },
+            },
+            default: [
+              {
+                logic: "and",
+                column: "year",
+                action: "like",
+                value: null,
+                readOnly: true,
+              },
+            ],
+          },
+          skipCount: {
+            hidden: true,
+            default: 0,
+          },
+          maxResultCount: {
+            hidden: true,
+            default: 10,
+          },
+          sorting: {
+            hidden: true,
+          },
+        },
+      },
+    },
+    table: {
+      schema: schema,
+    },
+    edit: {
+      detailsUrl,
+      createUrl,
+      updateUrl,
+      deleteUrl,
+      detailsMethod,
+      createMethod,
+      updateMethod,
+      deleteMethod,
+      schema: schema,
+    },
+  };
+}

code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-hbpo/contrast/second_hbpo_sa_detail_service.js

@@ -0,0 +1,137 @@
+const schema = {
+  title: "期间设置",
+  type: "object",
+  properties: {
+    year: {
+      title: "年度",
+      type: "string",
+      hidden: true,
+      showForList: true,
+      rules: [
+        {
+          required: true,
+        },
+      ],
+    },
+    period: {
+      title: "期间",
+      type: "string",
+      hidden: true,
+      showForList: true,
+      rules: [
+        {
+          required: true,
+        },
+      ],
+    },
+    version: {
+      title: "版本",
+      type: "string",
+      input: "month",
+      format: "YYYYMM",
+      showForList: true,
+      watch: "(model,value)=>{model.year=value.substr(0,4);model.period=value.substr(4,2);}",
+      rules: [
+        {
+          required: true,
+          trigger: "blur",
+        },
+      ],
+    },
+    state: {
+      title: "状态",
+      type: "boolean",
+      showForList: true,
+      default: true,
+      rules: [
+        {
+          required: true,
+        },
+      ],
+    },
+  },
+};
+
+const baseUrl = "settleaccount/centralized-control";
+const queryUrl = `${baseUrl}/get-list`;
+const detailsUrl = `${baseUrl}/get/%s`;
+const createUrl = `${baseUrl}/create`;
+const updateUrl = `${baseUrl}/update/%s`;
+const deleteUrl = `${baseUrl}/delete-list`;
+const queryMethod = "POST";
+const detailsMethod = "POST";
+const createMethod = "POST";
+const updateMethod = "POST";
+const deleteMethod = "POST";
+
+export default function () {
+  return {
+    baseUrl,
+    query: {
+      url: queryUrl,
+      method: queryMethod,
+      hasFilter: true,
+      schema: {
+        title: "期间设置",
+        type: "object",
+        properties: {
+          filters: {
+            type: "array",
+            hidden: true,
+            items: {
+              type: "object",
+              properties: {
+                logic: {
+                  type: "int",
+                },
+                column: {
+                  type: "string",
+                },
+                action: {
+                  type: "int",
+                },
+                value: {
+                  type: "string",
+                },
+              },
+            },
+            default: [
+              {
+                logic: "and",
+                column: "year",
+                action: "like",
+                value: null,
+                readOnly: true,
+              },
+            ],
+          },
+          skipCount: {
+            hidden: true,
+            default: 0,
+          },
+          maxResultCount: {
+            hidden: true,
+            default: 10,
+          },
+          sorting: {
+            hidden: true,
+          },
+        },
+      },
+    },
+    table: {
+      schema: schema,
+    },
+    edit: {
+      detailsUrl,
+      createUrl,
+      updateUrl,
+      deleteUrl,
+      detailsMethod,
+      createMethod,
+      updateMethod,
+      deleteMethod,
+      schema: schema,
+    },
+  };
+}

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

@@ -53,11 +53,11 @@ const schema = {
 
 const baseUrl = "settleaccount/hbpo_se_detail_service";
 const queryUrl = `${baseUrl}/get-list`;
-const deleteUrl = `${baseUrl}/delete-list`;
+// const deleteUrl = `${baseUrl}/delete-list`;
 const importUrl = `${baseUrl}/import`;
 const exportUrl = `${baseUrl}/export`;
 const queryMethod = "POST";
-const deleteMethod = "POST";
+// const deleteMethod = "POST";
 const importMethod = "POST";
 const exportMethod = "POST";
 
@@ -120,10 +120,10 @@ export default function () {
       schema: schema,
     },
     edit: {
-      deleteUrl,
+      // deleteUrl,
       importUrl,
       exportUrl,
-      deleteMethod,
+      // deleteMethod,
       importMethod,
       exportMethod,
       schema: schema,

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

@@ -1,7 +1,11 @@
+import version from "../../version.js";
+import { state2, state3 } from "../../state.js";
+
 const schema = {
   title: "不可结算单",
   type: "object",
   properties: {
+    state2,
     settleBillNum: {
       title: "关联结算单号",
       type: "string",
@@ -10,10 +14,7 @@ const schema = {
       title: "工厂地点",
       type: "string",
     },
-    version: {
-      title: "版本",
-      type: "int",
-    },
+    version,
     price: {
       title: "单价",
       type: "decimal",
@@ -51,12 +52,8 @@ const schema = {
 };
 
 const baseUrl = "settleaccount/hbpo_ba_service";
-const queryUrl = `${baseUrl}/get-list`;
+const queryUrl = `${baseUrl}/main-query`;
 const detailsUrl = `${baseUrl}/get/%s`;
-const createUrl = `${baseUrl}/create`;
-const updateUrl = `${baseUrl}/update/%s`;
-const deleteUrl = `${baseUrl}/delete-list`;
-const importUrl = `${baseUrl}/code-setting-upload-excel-import`;
 const exportUrl = `${baseUrl}/export`;
 const queryMethod = "POST";
 const detailsMethod = "POST";
@@ -96,8 +93,8 @@ export default function () {
             default: [
               {
                 logic: "and",
-                column: "billNum",
-                action: "like",
+                column: "version",
+                action: "equal",
                 value: null,
                 readOnly: true,
               },

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

@@ -1,11 +1,12 @@
+import version from "../../version.js";
+import state from "../../state.js";
+
 const schema = {
   title: "可结算单",
   type: "object",
   properties: {
-    version: {
-      title: "期间",
-      type: "int",
-    },
+    version,
+    state,
     billNum: {
       title: "结算单据",
       type: "string",
@@ -14,10 +15,6 @@ const schema = {
       title: "关联结算单号",
       type: "string",
     },
-    state: {
-      title: "状态",
-      type: "string",
-    },
     invGroupNum: {
       title: "发票分组号",
       type: "string",
@@ -26,12 +23,8 @@ const schema = {
 };
 
 const baseUrl = "settleaccount/hbpo_can_sa_service";
-const queryUrl = `${baseUrl}/get-list`;
+const queryUrl = `${baseUrl}/main-query`;
 const detailsUrl = `${baseUrl}/get/%s`;
-const createUrl = `${baseUrl}/create`;
-const updateUrl = `${baseUrl}/update/%s`;
-const deleteUrl = `${baseUrl}/delete-list`;
-const importUrl = `${baseUrl}/code-setting-upload-excel-import`;
 const exportUrl = `${baseUrl}/export`;
 const queryMethod = "POST";
 const detailsMethod = "POST";
@@ -71,8 +64,8 @@ export default function () {
             default: [
               {
                 logic: "and",
-                column: "billNum",
-                action: "like",
+                column: "version",
+                action: "equal",
                 value: null,
                 readOnly: true,
               },

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

@@ -1,3 +1,5 @@
+import version from "../../version.js";
+
 const schema = {
   title: "不可结算单",
   type: "object",
@@ -10,10 +12,7 @@ const schema = {
       title: "工厂地点",
       type: "string",
     },
-    version: {
-      title: "版本",
-      type: "int",
-    },
+    version,
     price: {
       title: "单价",
       type: "decimal",
@@ -51,7 +50,7 @@ const schema = {
 };
 
 const baseUrl = "settleaccount/bbac_not_sa_service";
-const queryUrl = `${baseUrl}/get-list`;
+const queryUrl = `${baseUrl}/main-query`;
 const detailsUrl = `${baseUrl}/get/%s`;
 const exportUrl = `${baseUrl}/export`;
 const queryMethod = "POST";
@@ -92,8 +91,8 @@ export default function () {
             default: [
               {
                 logic: "and",
-                column: "billNum",
-                action: "like",
+                column: "version",
+                action: "equal",
                 value: null,
                 readOnly: true,
               },

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

@@ -1,11 +1,12 @@
+import version from "../../version.js";
+import { state2, state3 } from "../../state.js";
+
 const schema = {
   title: "寄售库库存扣减审批",
   type: "object",
   properties: {
-    version: {
-      title: "期间",
-      type: "int",
-    },
+    version,
+    state3,
     billNum: {
       title: "结算单号",
       type: "string",
@@ -71,8 +72,8 @@ export default function () {
             default: [
               {
                 logic: "and",
-                column: "billNum",
-                action: "like",
+                column: "version",
+                action: "equal",
                 value: null,
                 readOnly: true,
               },

code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jit/contrast/jit_pub_sa_detail_jobservice.js

@@ -0,0 +1,132 @@
+const schema = {
+  title: "通用代码",
+  type: "object",
+  properties: {
+    project: {
+      title: "项目",
+      type: "string",
+      readOnly: true,
+      showForList: true,
+      rules: [
+        {
+          required: true,
+        },
+      ],
+    },
+    value: {
+      title: "值",
+      type: "string",
+      readOnly: true,
+      showForList: true,
+      rules: [
+        {
+          required: true,
+        },
+      ],
+    },
+    description: {
+      title: "描述",
+      type: "string",
+      input: "textarea",
+      showForList: true,
+      rules: [
+        {
+          required: true,
+        },
+        { max: 60 },
+      ],
+    },
+  },
+};
+
+const baseUrl = "settleaccount/code-setting";
+const queryUrl = `${baseUrl}/get-list`;
+const detailsUrl = `${baseUrl}/get/%s`;
+const createUrl = `${baseUrl}/create`;
+const updateUrl = `${baseUrl}/update/%s`;
+const deleteUrl = `${baseUrl}/delete-list`;
+const importUrl = `${baseUrl}/code-setting-upload-excel-import`;
+const exportUrl = `${baseUrl}/export`;
+const queryMethod = "POST";
+const detailsMethod = "POST";
+const createMethod = "POST";
+const updateMethod = "POST";
+const deleteMethod = "POST";
+const importMethod = "POST";
+const exportMethod = "POST";
+
+export default function () {
+  return {
+    query: {
+      url: queryUrl,
+      method: queryMethod,
+      hasFilter: true,
+      schema: {
+        title: "通用代码",
+        type: "object",
+        properties: {
+          filters: {
+            title: "项目",
+            type: "array",
+            hidden: true,
+            items: {
+              type: "object",
+              properties: {
+                logic: {
+                  type: "int",
+                },
+                column: {
+                  type: "string",
+                },
+                action: {
+                  type: "int",
+                },
+                value: {
+                  type: "string",
+                },
+              },
+            },
+            default: [
+              {
+                logic: "and",
+                column: "project",
+                action: "like",
+                value: null,
+                readOnly: true,
+              },
+            ],
+          },
+          skipCount: {
+            hidden: true,
+            default: 0,
+          },
+          maxResultCount: {
+            hidden: true,
+            default: 10,
+          },
+          sorting: {
+            hidden: true,
+          },
+        },
+      },
+    },
+    table: {
+      schema: schema,
+    },
+    edit: {
+      detailsUrl,
+      createUrl,
+      updateUrl,
+      deleteUrl,
+      importUrl,
+      exportUrl,
+      detailsMethod,
+      createMethod,
+      updateMethod,
+      deleteMethod,
+      importMethod,
+      exportMethod,
+      schema: schema,
+    },
+  };
+}

code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jit/contrast/jit_second_pub_sa_detail_jobservice.js

@@ -0,0 +1,132 @@
+const schema = {
+  title: "通用代码",
+  type: "object",
+  properties: {
+    project: {
+      title: "项目",
+      type: "string",
+      readOnly: true,
+      showForList: true,
+      rules: [
+        {
+          required: true,
+        },
+      ],
+    },
+    value: {
+      title: "值",
+      type: "string",
+      readOnly: true,
+      showForList: true,
+      rules: [
+        {
+          required: true,
+        },
+      ],
+    },
+    description: {
+      title: "描述",
+      type: "string",
+      input: "textarea",
+      showForList: true,
+      rules: [
+        {
+          required: true,
+        },
+        { max: 60 },
+      ],
+    },
+  },
+};
+
+const baseUrl = "settleaccount/code-setting";
+const queryUrl = `${baseUrl}/get-list`;
+const detailsUrl = `${baseUrl}/get/%s`;
+const createUrl = `${baseUrl}/create`;
+const updateUrl = `${baseUrl}/update/%s`;
+const deleteUrl = `${baseUrl}/delete-list`;
+const importUrl = `${baseUrl}/code-setting-upload-excel-import`;
+const exportUrl = `${baseUrl}/export`;
+const queryMethod = "POST";
+const detailsMethod = "POST";
+const createMethod = "POST";
+const updateMethod = "POST";
+const deleteMethod = "POST";
+const importMethod = "POST";
+const exportMethod = "POST";
+
+export default function () {
+  return {
+    query: {
+      url: queryUrl,
+      method: queryMethod,
+      hasFilter: true,
+      schema: {
+        title: "通用代码",
+        type: "object",
+        properties: {
+          filters: {
+            title: "项目",
+            type: "array",
+            hidden: true,
+            items: {
+              type: "object",
+              properties: {
+                logic: {
+                  type: "int",
+                },
+                column: {
+                  type: "string",
+                },
+                action: {
+                  type: "int",
+                },
+                value: {
+                  type: "string",
+                },
+              },
+            },
+            default: [
+              {
+                logic: "and",
+                column: "project",
+                action: "like",
+                value: null,
+                readOnly: true,
+              },
+            ],
+          },
+          skipCount: {
+            hidden: true,
+            default: 0,
+          },
+          maxResultCount: {
+            hidden: true,
+            default: 10,
+          },
+          sorting: {
+            hidden: true,
+          },
+        },
+      },
+    },
+    table: {
+      schema: schema,
+    },
+    edit: {
+      detailsUrl,
+      createUrl,
+      updateUrl,
+      deleteUrl,
+      importUrl,
+      exportUrl,
+      detailsMethod,
+      createMethod,
+      updateMethod,
+      deleteMethod,
+      importMethod,
+      exportMethod,
+      schema: schema,
+    },
+  };
+}

code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jit/input/jit_jit_pub_sa_service.js

@@ -0,0 +1,132 @@
+const schema = {
+  title: "JIS结算数据",
+  type: "object",
+  properties: {
+    project: {
+      title: "项目",
+      type: "string",
+      readOnly: true,
+      showForList: true,
+      rules: [
+        {
+          required: true,
+        },
+      ],
+    },
+    value: {
+      title: "值",
+      type: "string",
+      readOnly: true,
+      showForList: true,
+      rules: [
+        {
+          required: true,
+        },
+      ],
+    },
+    description: {
+      title: "描述",
+      type: "string",
+      input: "textarea",
+      showForList: true,
+      rules: [
+        {
+          required: true,
+        },
+        { max: 60 },
+      ],
+    },
+  },
+};
+
+const baseUrl = "settleaccount/bbac_sa_service";
+const queryUrl = `${baseUrl}/get-list`;
+const detailsUrl = `${baseUrl}/get/%s`;
+const createUrl = `${baseUrl}/create`;
+const updateUrl = `${baseUrl}/update/%s`;
+const deleteUrl = `${baseUrl}/delete-list`;
+const importUrl = `${baseUrl}/code-setting-upload-excel-import`;
+const exportUrl = `${baseUrl}/export`;
+const queryMethod = "POST";
+const detailsMethod = "POST";
+const createMethod = "POST";
+const updateMethod = "POST";
+const deleteMethod = "POST";
+const importMethod = "POST";
+const exportMethod = "POST";
+
+export default function () {
+  return {
+    query: {
+      url: queryUrl,
+      method: queryMethod,
+      hasFilter: true,
+      schema: {
+        title: "JIS结算数据",
+        type: "object",
+        properties: {
+          filters: {
+            title: "项目",
+            type: "array",
+            hidden: true,
+            items: {
+              type: "object",
+              properties: {
+                logic: {
+                  type: "int",
+                },
+                column: {
+                  type: "string",
+                },
+                action: {
+                  type: "int",
+                },
+                value: {
+                  type: "string",
+                },
+              },
+            },
+            default: [
+              {
+                logic: "and",
+                column: "project",
+                action: "like",
+                value: null,
+                readOnly: true,
+              },
+            ],
+          },
+          skipCount: {
+            hidden: true,
+            default: 0,
+          },
+          maxResultCount: {
+            hidden: true,
+            default: 10,
+          },
+          sorting: {
+            hidden: true,
+          },
+        },
+      },
+    },
+    table: {
+      schema: schema,
+    },
+    edit: {
+      detailsUrl,
+      createUrl,
+      updateUrl,
+      deleteUrl,
+      importUrl,
+      exportUrl,
+      detailsMethod,
+      createMethod,
+      updateMethod,
+      deleteMethod,
+      importMethod,
+      exportMethod,
+      schema: schema,
+    },
+  };
+}

code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jit/input/jit_pub_sa_detail_service.js

@@ -0,0 +1,132 @@
+const schema = {
+  title: "JIS结算数据",
+  type: "object",
+  properties: {
+    project: {
+      title: "项目",
+      type: "string",
+      readOnly: true,
+      showForList: true,
+      rules: [
+        {
+          required: true,
+        },
+      ],
+    },
+    value: {
+      title: "值",
+      type: "string",
+      readOnly: true,
+      showForList: true,
+      rules: [
+        {
+          required: true,
+        },
+      ],
+    },
+    description: {
+      title: "描述",
+      type: "string",
+      input: "textarea",
+      showForList: true,
+      rules: [
+        {
+          required: true,
+        },
+        { max: 60 },
+      ],
+    },
+  },
+};
+
+const baseUrl = "settleaccount/bbac_sa_detail_service";
+const queryUrl = `${baseUrl}/get-list`;
+const detailsUrl = `${baseUrl}/get/%s`;
+const createUrl = `${baseUrl}/create`;
+const updateUrl = `${baseUrl}/update/%s`;
+const deleteUrl = `${baseUrl}/delete-list`;
+const importUrl = `${baseUrl}/code-setting-upload-excel-import`;
+const exportUrl = `${baseUrl}/export`;
+const queryMethod = "POST";
+const detailsMethod = "POST";
+const createMethod = "POST";
+const updateMethod = "POST";
+const deleteMethod = "POST";
+const importMethod = "POST";
+const exportMethod = "POST";
+
+export default function () {
+  return {
+    query: {
+      url: queryUrl,
+      method: queryMethod,
+      hasFilter: true,
+      schema: {
+        title: "JIS结算数据",
+        type: "object",
+        properties: {
+          filters: {
+            title: "项目",
+            type: "array",
+            hidden: true,
+            items: {
+              type: "object",
+              properties: {
+                logic: {
+                  type: "int",
+                },
+                column: {
+                  type: "string",
+                },
+                action: {
+                  type: "int",
+                },
+                value: {
+                  type: "string",
+                },
+              },
+            },
+            default: [
+              {
+                logic: "and",
+                column: "project",
+                action: "like",
+                value: null,
+                readOnly: true,
+              },
+            ],
+          },
+          skipCount: {
+            hidden: true,
+            default: 0,
+          },
+          maxResultCount: {
+            hidden: true,
+            default: 10,
+          },
+          sorting: {
+            hidden: true,
+          },
+        },
+      },
+    },
+    table: {
+      schema: schema,
+    },
+    edit: {
+      detailsUrl,
+      createUrl,
+      updateUrl,
+      deleteUrl,
+      importUrl,
+      exportUrl,
+      detailsMethod,
+      createMethod,
+      updateMethod,
+      deleteMethod,
+      importMethod,
+      exportMethod,
+      schema: schema,
+    },
+  };
+}

code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jit/input/jit_pub_se_detail_service.js

@@ -0,0 +1,132 @@
+const schema = {
+  title: "JIS发运数据",
+  type: "object",
+  properties: {
+    version: {
+      title: "版本",
+      type: "string",
+    },
+    shippingDate: {
+      title: "发货时间",
+      type: "string",
+      input: "datetime",
+    },
+    wmsBillNum: {
+      title: "发运单号",
+      type: "string",
+    },
+    lu: {
+      title: "零件号",
+      type: "string",
+    },
+    pn: {
+      title: "生产号",
+      type: "string",
+    },
+    keyCode: {
+      title: "组合键值(LU+PN)",
+      type: "string",
+    },
+    qty: {
+      title: "数量",
+      type: "number",
+    },
+    seqNumber: {
+      title: "日顺序号",
+      type: "string",
+    },
+    assemblyCode: {
+      title: "小总成号",
+      type: "string",
+    },
+    injectionCode: {
+      title: "注塑码",
+      type: "string",
+    },
+    beginDate: {
+      title: "订单时间",
+      type: "string",
+      input: "datetime",
+    },
+  },
+};
+
+const baseUrl = "settleaccount/bbac_se_detail_service";
+const queryUrl = `${baseUrl}/get-list`;
+// const deleteUrl = `${baseUrl}/delete-list`;
+const importUrl = `${baseUrl}/import`;
+const exportUrl = `${baseUrl}/export`;
+const queryMethod = "POST";
+// const deleteMethod = "POST";
+const importMethod = "POST";
+const exportMethod = "POST";
+
+export default function () {
+  return {
+    query: {
+      url: queryUrl,
+      method: queryMethod,
+      hasFilter: true,
+      schema: {
+        title: "JIS发运数据",
+        type: "object",
+        properties: {
+          filters: {
+            title: "项目",
+            type: "array",
+            hidden: true,
+            items: {
+              type: "object",
+              properties: {
+                logic: {
+                  type: "int",
+                },
+                column: {
+                  type: "string",
+                },
+                action: {
+                  type: "int",
+                },
+                value: {
+                  type: "string",
+                },
+              },
+            },
+            default: [
+              {
+                logic: "and",
+                column: "version",
+                action: "like",
+                value: null,
+                readOnly: true,
+              },
+            ],
+          },
+          skipCount: {
+            hidden: true,
+            default: 0,
+          },
+          maxResultCount: {
+            hidden: true,
+            default: 10,
+          },
+          sorting: {
+            hidden: true,
+          },
+        },
+      },
+    },
+    table: {
+      schema: schema,
+    },
+    edit: {
+      // deleteUrl,
+      importUrl,
+      exportUrl,
+      // deleteMethod,
+      importMethod,
+      exportMethod,
+      schema: schema,
+    },
+  };
+}

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

@@ -0,0 +1,126 @@
+const schema = {
+  title: "可结算单明细",
+  type: "object",
+  properties: {
+    settleBillNum: {
+      title: "关联结算单号",
+      type: "int",
+    },
+    site: {
+      title: "工厂地点",
+      type: "string",
+    },
+    version: {
+      title: "版本",
+      type: "int",
+    },
+    price: {
+      title: "单价",
+      type: "decimal",
+    },
+    billNum: {
+      title: "结算单号",
+      type: "string",
+    },
+    settleDate: {
+      title: "结算日期",
+      type: "DateTime",
+    },
+    settleInvGroupNumDate: {
+      title: "发票组号",
+      type: "string",
+    },
+    lu: {
+      title: "零件号",
+      type: "string",
+    },
+    materialDesc: {
+      title: "物料描述",
+      type: "string",
+    },
+    pn: {
+      title: "生产号",
+      type: "string",
+    },
+    qty: {
+      title: "结算数量",
+      type: "decimal",
+    },
+    groupNumy: {
+      title: "结算分组号",
+      type: "string",
+    },
+  },
+};
+
+const baseUrl = "settleaccount/hbpo_can_sa_detail_service";
+const queryUrl = `${baseUrl}/get-list`;
+const detailsUrl = `${baseUrl}/get/%s`;
+const queryMethod = "POST";
+const detailsMethod = "POST";
+
+export default function () {
+  return {
+    query: {
+      url: queryUrl,
+      method: queryMethod,
+      hasFilter: true,
+      schema: {
+        title: "发票分组号明细",
+        type: "object",
+        properties: {
+          filters: {
+            title: "项目",
+            type: "array",
+            hidden: true,
+            items: {
+              type: "object",
+              properties: {
+                logic: {
+                  type: "int",
+                },
+                column: {
+                  type: "string",
+                },
+                action: {
+                  type: "int",
+                },
+                value: {
+                  type: "string",
+                },
+              },
+            },
+            default: [
+              {
+                logic: "and",
+                column: "billNum",
+                action: "like",
+                value: null,
+                readOnly: true,
+              },
+            ],
+          },
+          skipCount: {
+            hidden: true,
+            default: 0,
+          },
+          maxResultCount: {
+            hidden: true,
+            default: 10,
+          },
+          sorting: {
+            hidden: true,
+          },
+        },
+      },
+    },
+    table: {
+      schema: schema,
+    },
+    edit: {
+      detailsUrl,
+      detailsMethod,
+      schema: schema,
+    },
+  };
+}

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

@@ -0,0 +1,128 @@
+import version from "../../version.js";
+import { state2, state3 } from "../../state.js";
+
+const schema = {
+  title: "商务审批",
+  type: "object",
+  properties: {
+    settleBillNum: {
+      title: "关联结算单号",
+      type: "string",
+    },
+    site: {
+      title: "工厂地点",
+      type: "string",
+    },
+    version,
+    state2,
+    price: {
+      title: "单价",
+      type: "decimal",
+    },
+    billNum: {
+      title: "结算单号",
+      type: "string",
+    },
+
+    settleDate: {
+      title: "结算日期",
+      type: "DateTime",
+    },
+    invGroupNum: {
+      title: "发票分组号",
+      type: "string",
+    },
+    lu: {
+      title: "零件号",
+      type: "string",
+    },
+    pn: {
+      title: "生产号",
+      type: "string",
+    },
+    qty: {
+      title: "结算数量",
+      type: "decimal",
+    },
+    groupNum: {
+      title: "结算分组号",
+      type: "string",
+    },
+  },
+};
+
+const baseUrl = "settleaccount/bbac_ba_service";
+const queryUrl = `${baseUrl}/main-query`;
+const detailsUrl = `${baseUrl}/get/%s`;
+const exportUrl = `${baseUrl}/export`;
+const queryMethod = "POST";
+const detailsMethod = "POST";
+const exportMethod = "POST";
+
+export default function () {
+  return {
+    query: {
+      url: queryUrl,
+      method: queryMethod,
+      hasFilter: true,
+      schema: {
+        title: "商务审批",
+        type: "object",
+        properties: {
+          filters: {
+            title: "项目",
+            type: "array",
+            hidden: true,
+            items: {
+              type: "object",
+              properties: {
+                logic: {
+                  type: "int",
+                },
+                column: {
+                  type: "string",
+                },
+                action: {
+                  type: "int",
+                },
+                value: {
+                  type: "string",
+                },
+              },
+            },
+            default: [
+              {
+                logic: "and",
+                column: "version",
+                action: "equal",
+                value: null,
+                readOnly: true,
+              },
+            ],
+          },
+          skipCount: {
+            hidden: true,
+            default: 0,
+          },
+          maxResultCount: {
+            hidden: true,
+            default: 10,
+          },
+          sorting: {
+            hidden: true,
+          },
+        },
+      },
+    },
+    table: {
+      schema: schema,
+    },
+    edit: {
+      detailsUrl,
+      exportUrl,
+      detailsMethod,
+      exportMethod,
+      schema: schema,
+    },
+  };
+}

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

@@ -0,0 +1,100 @@
+import version from "../../version.js";
+import state from "../../state.js";
+
+const schema = {
+  title: "发票分组号",
+  type: "object",
+  properties: {
+    version,
+    billNum: {
+      title: "结算单据",
+      type: "string",
+    },
+    settleBillNum: {
+      title: "关联结算单号",
+      type: "string",
+    },
+    state,
+    invGroupNum: {
+      title: "发票分组号",
+      type: "string",
+    },
+  },
+};
+
+const baseUrl = "settleaccount/bbac_can_sa_service";
+const queryUrl = `${baseUrl}/main-query`;
+const detailsUrl = `${baseUrl}/get/%s`;
+const exportUrl = `${baseUrl}/export`;
+const queryMethod = "POST";
+const detailsMethod = "POST";
+const exportMethod = "POST";
+
+export default function () {
+  return {
+    query: {
+      url: queryUrl,
+      method: queryMethod,
+      hasFilter: true,
+      schema: {
+        title: "发票分组号",
+        type: "object",
+        properties: {
+          filters: {
+            title: "项目",
+            type: "array",
+            hidden: true,
+            items: {
+              type: "object",
+              properties: {
+                logic: {
+                  type: "int",
+                },
+                column: {
+                  type: "string",
+                },
+                action: {
+                  type: "int",
+                },
+                value: {
+                  type: "string",
+                },
+              },
+            },
+            default: [
+              {
+                logic: "and",
+                column: "version",
+                action: "equal",
+                value: null,
+                readOnly: true,
+              },
+            ],
+          },
+          skipCount: {
+            hidden: true,
+            default: 0,
+          },
+          maxResultCount: {
+            hidden: true,
+            default: 10,
+          },
+          sorting: {
+            hidden: true,
+          },
+        },
+      },
+    },
+    table: {
+      schema: schema,
+    },
+    edit: {
+      detailsUrl,
+      exportUrl,
+      detailsMethod,
+      exportMethod,
+
+      schema: schema,
+    },
+  };
+}

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

@@ -0,0 +1,126 @@
+import version from "../../version.js";
+
+const schema = {
+  title: "不可结算单",
+  type: "object",
+  properties: {
+    settleBillNum: {
+      title: "关联结算单号",
+      type: "string",
+    },
+    site: {
+      title: "工厂地点",
+      type: "string",
+    },
+    version,
+    price: {
+      title: "单价",
+      type: "decimal",
+    },
+    billNum: {
+      title: "结算单号",
+      type: "string",
+    },
+
+    settleDate: {
+      title: "结算日期",
+      type: "DateTime",
+    },
+    invGroupNum: {
+      title: "发票分组号",
+      type: "string",
+    },
+    lu: {
+      title: "零件号",
+      type: "string",
+    },
+    pn: {
+      title: "生产号",
+      type: "string",
+    },
+    qty: {
+      title: "结算数量",
+      type: "decimal",
+    },
+    groupNum: {
+      title: "结算分组号",
+      type: "string",
+    },
+  },
+};
+
+const baseUrl = "settleaccount/bbac_not_sa_service";
+const queryUrl = `${baseUrl}/detail-query`;
+const detailsUrl = `${baseUrl}/get/%s`;
+const exportUrl = `${baseUrl}/export`;
+const queryMethod = "POST";
+const detailsMethod = "POST";
+const exportMethod = "POST";
+
+export default function () {
+  return {
+    query: {
+      url: queryUrl,
+      method: queryMethod,
+      hasFilter: true,
+      schema: {
+        title: "不可结算单",
+        type: "object",
+        properties: {
+          filters: {
+            title: "项目",
+            type: "array",
+            hidden: true,
+            items: {
+              type: "object",
+              properties: {
+                logic: {
+                  type: "int",
+                },
+                column: {
+                  type: "string",
+                },
+                action: {
+                  type: "int",
+                },
+                value: {
+                  type: "string",
+                },
+              },
+            },
+            default: [
+              {
+                logic: "and",
+                column: "version",
+                action: "equal",
+                value: null,
+                readOnly: true,
+              },
+            ],
+          },
+          skipCount: {
+            hidden: true,
+            default: 0,
+          },
+          maxResultCount: {
+            hidden: true,
+            default: 10,
+          },
+          sorting: {
+            hidden: true,
+          },
+        },
+      },
+    },
+    table: {
+      schema: schema,
+    },
+    edit: {
+      detailsUrl,
+      exportUrl,
+      detailsMethod,
+      exportMethod,
+      schema: schema,
+    },
+  };
+}

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

@@ -0,0 +1,103 @@
+import version from "../../version.js";
+import { state2, state3 } from "../../state.js";
+
+const schema = {
+  title: "寄售库库存扣减审批",
+  type: "object",
+  properties: {
+    version,
+    state3,
+    billNum: {
+      title: "结算单号",
+      type: "string",
+    },
+    settleBillNum: {
+      title: "关联结算单号",
+      type: "string",
+    },
+    invGroupNum: {
+      title: "发票分组号",
+      type: "string",
+    },
+    site: {
+      title: "地点",
+      type: "string",
+    },
+  },
+};
+
+const baseUrl = "settleaccount/bbac_pd_service";
+const queryUrl = `${baseUrl}/main-query`;
+const detailsUrl = `${baseUrl}/get/%s`;
+const exportUrl = `${baseUrl}/export`;
+const queryMethod = "POST";
+const detailsMethod = "POST";
+const exportMethod = "POST";
+
+export default function () {
+  return {
+    query: {
+      url: queryUrl,
+      method: queryMethod,
+      hasFilter: true,
+      schema: {
+        title: "不可结算单",
+        type: "object",
+        properties: {
+          filters: {
+            title: "项目",
+            type: "array",
+            hidden: true,
+            items: {
+              type: "object",
+              properties: {
+                logic: {
+                  type: "int",
+                },
+                column: {
+                  type: "string",
+                },
+                action: {
+                  type: "int",
+                },
+                value: {
+                  type: "string",
+                },
+              },
+            },
+            default: [
+              {
+                logic: "and",
+                column: "version",
+                action: "equal",
+                value: null,
+                readOnly: true,
+              },
+            ],
+          },
+          skipCount: {
+            hidden: true,
+            default: 0,
+          },
+          maxResultCount: {
+            hidden: true,
+            default: 10,
+          },
+          sorting: {
+            hidden: true,
+          },
+        },
+      },
+    },
+    table: {
+      schema: schema,
+    },
+    edit: {
+      detailsUrl,
+      exportUrl,
+      detailsMethod,
+      exportMethod,
+      schema: schema,
+    },
+  };
+}

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

@@ -0,0 +1,14 @@
+const options = [
+  { value: 0, label: "未结状态" },
+  { value: 1, label: "已开票" },
+  { value: 2, label: "商务已审核" },
+  { value: 3, label: "财务已审核" },
+  { value: 4, label: "客户已收票" },
+  { value: 5, label: "已扣减" },
+];
+const state = { title: "状态", type: "string", input: "select", options };
+const state2 = Object.assign(Object.assign({}, state), { options: options.filter((a) => a.value > 0) });
+const state3 = Object.assign(Object.assign({}, state), { options: options.filter((a) => a.value > 3) });
+
+export default state;
+export { state2, state3 };

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

@@ -0,0 +1,8 @@
+export default {
+  title: "期间",
+  type: "string",
+  input: "select",
+  url: "settleaccount/centralized-control/get-all",
+  value: "version",
+  label: "version",
+};

code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/router/business.js

@@ -108,15 +108,15 @@ export default [
                   isTop: true,
                 },
               },
-              {
-                path: "delete",
-                meta: {
-                  type: "button",
-                  title: "删除",
-                  icon: "file",
-                  isTop: true,
-                },
-              },
+              // {
+              //   path: "delete",
+              //   meta: {
+              //     type: "button",
+              //     title: "删除",
+              //     icon: "file",
+              //     isTop: true,
+              //   },
+              // },
               {
                 path: "import",
                 meta: {
@@ -195,7 +195,7 @@ export default [
                 },
               },
               {
-                path: "exportEDIJob",
+                path: "export",
                 meta: {
                   type: "button",
                   title: "生成对比",
@@ -213,7 +213,7 @@ export default [
                 },
               },
               {
-                path: "download",
+                path: "export",
                 meta: {
                   type: "button",
                   title: "下载",
@@ -223,7 +223,7 @@ export default [
             ],
           },
           {
-            path: "bbac_sa_detail_jobservice",
+            path: "first_bbac_sa_detail_jobservice",
             meta: {
               type: "page",
               title: "EDI、发运与结算比对",
@@ -240,7 +240,7 @@ export default [
                 },
               },
               {
-                path: "exportEDIJob",
+                path: "export",
                 meta: {
                   type: "button",
                   title: "生成对比",
@@ -258,7 +258,7 @@ export default [
                 },
               },
               {
-                path: "download",
+                path: "export",
                 meta: {
                   type: "button",
                   title: "下载",
@@ -268,7 +268,7 @@ export default [
             ],
           },
           {
-            path: "bbac_sa_detail_jobservice",
+            path: "second_bbac_sa_detail_jobservice",
             meta: {
               type: "page",
               title: "发运与结算数据二次比对",
@@ -285,7 +285,7 @@ export default [
                 },
               },
               {
-                path: "exportEDIJob",
+                path: "export",
                 meta: {
                   type: "button",
                   title: "生成对比",
@@ -303,7 +303,7 @@ export default [
                 },
               },
               {
-                path: "download",
+                path: "export",
                 meta: {
                   type: "button",
                   title: "下载",
@@ -313,7 +313,7 @@ export default [
             ],
           },
           {
-            path: "bbac_sa_detail_jobservice",
+            path: "third_bbac_sa_detail_jobservice",
             meta: {
               type: "page",
               title: "买单件发运与结算数据三次比对",
@@ -330,7 +330,7 @@ export default [
                 },
               },
               {
-                path: "exportEDIJob",
+                path: "export",
                 meta: {
                   type: "button",
                   title: "生成对比",
@@ -348,7 +348,7 @@ export default [
                 },
               },
               {
-                path: "download",
+                path: "export",
                 meta: {
                   type: "button",
                   title: "下载",
@@ -502,10 +502,10 @@ export default [
                 },
               },
               {
-                path: "generateInvoice ",
+                path: "received ",
                 meta: {
                   type: "button",
-                  title: "生成发票数据",
+                  title: "客户已收票",
                   icon: "file",
                   isTop: true,
                   pattern: "paged",
@@ -674,15 +674,15 @@ export default [
                   isTop: true,
                 },
               },
-              {
-                path: "delete",
-                meta: {
-                  type: "button",
-                  title: "删除",
-                  icon: "file",
-                  isTop: true,
-                },
-              },
+              // {
+              //   path: "delete",
+              //   meta: {
+              //     type: "button",
+              //     title: "删除",
+              //     icon: "file",
+              //     isTop: true,
+              //   },
+              // },
               {
                 path: "import",
                 meta: {
@@ -761,7 +761,7 @@ export default [
                 },
               },
               {
-                path: "exportEDIJob",
+                path: "export",
                 meta: {
                   type: "button",
                   title: "生成对比",
@@ -779,7 +779,7 @@ export default [
                 },
               },
               {
-                path: "download",
+                path: "export",
                 meta: {
                   type: "button",
                   title: "下载",
@@ -789,7 +789,7 @@ export default [
             ],
           },
           {
-            path: "hbpo_sa_detail_jobservice",
+            path: "first_hbpo_sa_detail_jobservice",
             meta: {
               type: "page",
               title: "EDI、发运与结算比对",
@@ -806,7 +806,7 @@ export default [
                 },
               },
               {
-                path: "exportEDIJob",
+                path: "export",
                 meta: {
                   type: "button",
                   title: "生成对比",
@@ -824,7 +824,7 @@ export default [
                 },
               },
               {
-                path: "download",
+                path: "export",
                 meta: {
                   type: "button",
                   title: "下载",
@@ -834,7 +834,7 @@ export default [
             ],
           },
           {
-            path: "hbpo_sa_detail_jobservice",
+            path: "second_hbpo_sa_detail_jobservice",
             meta: {
               type: "page",
               title: "发运与结算数据二次比对",
@@ -851,7 +851,7 @@ export default [
                 },
               },
               {
-                path: "exportEDIJob",
+                path: "export",
                 meta: {
                   type: "button",
                   title: "生成对比",
@@ -869,7 +869,7 @@ export default [
                 },
               },
               {
-                path: "download",
+                path: "export",
                 meta: {
                   type: "button",
                   title: "下载",
@@ -1023,10 +1023,10 @@ export default [
                 },
               },
               {
-                path: "generateInvoice ",
+                path: "received ",
                 meta: {
                   type: "button",
-                  title: "生成发票数据",
+                  title: "客户已收票",
                   icon: "file",
                   isTop: true,
                   pattern: "paged",
@@ -1104,7 +1104,7 @@ export default [
         },
         children: [
           {
-            path: "jit_pub_sa_service",
+            path: "jit_jit_pub_sa_service",
             meta: {
               type: "page",
               title: "结算数据",
@@ -1132,7 +1132,7 @@ export default [
             ],
           },
           {
-            path: "pub_sa_detail_service",
+            path: "jit_pub_sa_detail_service",
             meta: {
               type: "page",
               title: "结算数据明细",
@@ -1180,7 +1180,7 @@ export default [
             ],
           },
           {
-            path: "pub_se_detail_service",
+            path: "jit_pub_se_detail_service",
             meta: {
               type: "page",
               title: "发运数据",
@@ -1196,15 +1196,15 @@ export default [
                   isTop: true,
                 },
               },
-              {
-                path: "delete",
-                meta: {
-                  type: "button",
-                  title: "删除",
-                  icon: "file",
-                  isTop: true,
-                },
-              },
+              // {
+              //   path: "delete",
+              //   meta: {
+              //     type: "button",
+              //     title: "删除",
+              //     icon: "file",
+              //     isTop: true,
+              //   },
+              // },
               {
                 path: "import",
                 meta: {
@@ -1237,7 +1237,7 @@ export default [
         },
         children: [
           {
-            path: "pub_sa_detail_jobservice",
+            path: "jit_pub_sa_detail_jobservice",
             meta: {
               type: "page",
               title: "发运与结算比对",
@@ -1254,7 +1254,7 @@ export default [
                 },
               },
               {
-                path: "exportEDIJob",
+                path: "export",
                 meta: {
                   type: "button",
                   title: "生成对比",
@@ -1272,7 +1272,7 @@ export default [
                 },
               },
               {
-                path: "download",
+                path: "export",
                 meta: {
                   type: "button",
                   title: "下载",
@@ -1282,7 +1282,7 @@ export default [
             ],
           },
           {
-            path: "pub_sa_detail_jobservice",
+            path: "jit_second_pub_sa_detail_jobservice",
             meta: {
               type: "page",
               title: "发运与结算二次比对",
@@ -1299,7 +1299,7 @@ export default [
                 },
               },
               {
-                path: "exportEDIJob",
+                path: "export",
                 meta: {
                   type: "button",
                   title: "生成对比",
@@ -1317,7 +1317,7 @@ export default [
                 },
               },
               {
-                path: "download",
+                path: "export",
                 meta: {
                   type: "button",
                   title: "下载",
@@ -1337,7 +1337,7 @@ export default [
         },
         children: [
           {
-            path: "pub_can_sa_service",
+            path: "jit_pub_can_sa_service",
             meta: {
               type: "page",
               title: "可结算单",
@@ -1376,7 +1376,7 @@ export default [
             ],
           },
           {
-            path: "pub_not_sa_service",
+            path: "jit_pub_not_sa_service",
             meta: {
               type: "page",
               title: "不可结算单",
@@ -1415,7 +1415,7 @@ export default [
             ],
           },
           {
-            path: "pub_ba_service",
+            path: "jit_pub_ba_service",
             meta: {
               type: "page",
               title: "商务审批",
@@ -1451,10 +1451,10 @@ export default [
                 },
               },
               {
-                path: "generateInvoice ",
+                path: "received ",
                 meta: {
                   type: "button",
-                  title: "生成发票数据",
+                  title: "客户已收票",
                   icon: "file",
                   isTop: true,
                   pattern: "paged",
@@ -1463,7 +1463,7 @@ export default [
             ],
           },
           {
-            path: "pub_pd_service",
+            path: "jit_pub_pd_service",
             meta: {
               type: "page",
               title: "寄售库库存扣减审批",
@@ -1532,7 +1532,7 @@ export default [
         },
         children: [
           {
-            path: "pub_sa_service",
+            path: "bj_pub_sa_service",
             meta: {
               type: "page",
               title: "结算数据",
@@ -1560,7 +1560,7 @@ export default [
             ],
           },
           {
-            path: "pub_sa_detail_service",
+            path: "bj_pub_sa_detail_service",
             meta: {
               type: "page",
               title: "结算数据明细",
@@ -1608,7 +1608,7 @@ export default [
             ],
           },
           {
-            path: "pub_se_detail_service",
+            path: "bj_pub_se_detail_service",
             meta: {
               type: "page",
               title: "发运数据",
@@ -1624,15 +1624,15 @@ export default [
                   isTop: true,
                 },
               },
-              {
-                path: "delete",
-                meta: {
-                  type: "button",
-                  title: "删除",
-                  icon: "file",
-                  isTop: true,
-                },
-              },
+              // {
+              //   path: "delete",
+              //   meta: {
+              //     type: "button",
+              //     title: "删除",
+              //     icon: "file",
+              //     isTop: true,
+              //   },
+              // },
               {
                 path: "import",
                 meta: {
@@ -1665,7 +1665,7 @@ export default [
         },
         children: [
           {
-            path: "pub_sa_detail_jobservice",
+            path: "bj_pub_sa_detail_jobservice",
             meta: {
               type: "page",
               title: "发运与结算比对",
@@ -1682,7 +1682,7 @@ export default [
                 },
               },
               {
-                path: "exportEDIJob",
+                path: "export",
                 meta: {
                   type: "button",
                   title: "生成对比",
@@ -1700,7 +1700,7 @@ export default [
                 },
               },
               {
-                path: "download",
+                path: "export",
                 meta: {
                   type: "button",
                   title: "下载",
@@ -1710,7 +1710,7 @@ export default [
             ],
           },
           {
-            path: "pub_sa_detail_jobservice",
+            path: "bj_second_pub_sa_detail_jobservice",
             meta: {
               type: "page",
               title: "发运与结算二次比对",
@@ -1727,7 +1727,7 @@ export default [
                 },
               },
               {
-                path: "exportEDIJob",
+                path: "export",
                 meta: {
                   type: "button",
                   title: "生成对比",
@@ -1745,7 +1745,7 @@ export default [
                 },
               },
               {
-                path: "download",
+                path: "export",
                 meta: {
                   type: "button",
                   title: "下载",
@@ -1765,7 +1765,7 @@ export default [
         },
         children: [
           {
-            path: "pub_can_sa_service",
+            path: "bj_pub_can_sa_service",
             meta: {
               type: "page",
               title: "可结算单",
@@ -1804,7 +1804,7 @@ export default [
             ],
           },
           {
-            path: "pub_not_sa_service",
+            path: "bj_pub_not_sa_service",
             meta: {
               type: "page",
               title: "不可结算单",
@@ -1831,7 +1831,7 @@ export default [
                 },
               },
               {
-                path: "generateSettlementOrder",
+                path: "bj_generateSettlementOrder",
                 meta: {
                   type: "button",
                   title: "生成可结算单",
@@ -1843,7 +1843,7 @@ export default [
             ],
           },
           {
-            path: "pub_ba_service",
+            path: "bj_pub_ba_service",
             meta: {
               type: "page",
               title: "商务审批",
@@ -1879,10 +1879,10 @@ export default [
                 },
               },
               {
-                path: "generateInvoice ",
+                path: "received ",
                 meta: {
                   type: "button",
-                  title: "生成发票数据",
+                  title: "客户已收票",
                   icon: "file",
                   isTop: true,
                   pattern: "paged",
@@ -1891,7 +1891,7 @@ export default [
             ],
           },
           {
-            path: "pub_pd_service",
+            path: "bj_pub_pd_service",
             meta: {
               type: "page",
               title: "寄售库库存扣减审批",
@@ -1960,7 +1960,7 @@ export default [
         },
         children: [
           {
-            path: "pub_sa_service",
+            path: "in_pub_sa_service",
             meta: {
               type: "page",
               title: "结算数据",
@@ -1988,7 +1988,7 @@ export default [
             ],
           },
           {
-            path: "pub_sa_detail_service",
+            path: "in_pub_sa_detail_service",
             meta: {
               type: "page",
               title: "结算数据明细",
@@ -2036,7 +2036,7 @@ export default [
             ],
           },
           {
-            path: "pub_se_detail_service",
+            path: "in_pub_se_detail_service",
             meta: {
               type: "page",
               title: "发运数据",
@@ -2052,15 +2052,15 @@ export default [
                   isTop: true,
                 },
               },
-              {
-                path: "delete",
-                meta: {
-                  type: "button",
-                  title: "删除",
-                  icon: "file",
-                  isTop: true,
-                },
-              },
+              // {
+              //   path: "delete",
+              //   meta: {
+              //     type: "button",
+              //     title: "删除",
+              //     icon: "file",
+              //     isTop: true,
+              //   },
+              // },
               {
                 path: "import",
                 meta: {
@@ -2093,7 +2093,7 @@ export default [
         },
         children: [
           {
-            path: "pub_sa_detail_jobservice",
+            path: "in_pub_sa_detail_jobservice",
             meta: {
               type: "page",
               title: "发运与结算比对",
@@ -2110,7 +2110,7 @@ export default [
                 },
               },
               {
-                path: "exportEDIJob",
+                path: "export",
                 meta: {
                   type: "button",
                   title: "生成对比",
@@ -2128,7 +2128,7 @@ export default [
                 },
               },
               {
-                path: "download",
+                path: "export",
                 meta: {
                   type: "button",
                   title: "下载",
@@ -2138,7 +2138,7 @@ export default [
             ],
           },
           {
-            path: "pub_sa_detail_jobservice",
+            path: "in_second_pub_sa_detail_jobservice",
             meta: {
               type: "page",
               title: "发运与结算二次比对",
@@ -2155,7 +2155,7 @@ export default [
                 },
               },
               {
-                path: "exportEDIJob",
+                path: "export",
                 meta: {
                   type: "button",
                   title: "生成对比",
@@ -2173,7 +2173,7 @@ export default [
                 },
               },
               {
-                path: "download",
+                path: "export",
                 meta: {
                   type: "button",
                   title: "下载",
@@ -2193,7 +2193,7 @@ export default [
         },
         children: [
           {
-            path: "pub_can_sa_service",
+            path: "in_pub_can_sa_service",
             meta: {
               type: "page",
               title: "可结算单",
@@ -2232,7 +2232,7 @@ export default [
             ],
           },
           {
-            path: "pub_not_sa_service",
+            path: "in_pub_not_sa_service",
             meta: {
               type: "page",
               title: "不可结算单",
@@ -2271,7 +2271,7 @@ export default [
             ],
           },
           {
-            path: "pub_ba_service",
+            path: "in_pub_ba_service",
             meta: {
               type: "page",
               title: "商务审批",
@@ -2307,10 +2307,10 @@ export default [
                 },
               },
               {
-                path: "generateInvoice ",
+                path: "received ",
                 meta: {
                   type: "button",
-                  title: "生成发票数据",
+                  title: "客户已收票",
                   icon: "file",
                   isTop: true,
                   pattern: "paged",
@@ -2319,7 +2319,7 @@ export default [
             ],
           },
           {
-            path: "pub_pd_service",
+            path: "in_pub_pd_service",
             meta: {
               type: "page",
               title: "寄售库库存扣减审批",
@@ -2372,15 +2372,15 @@ export default [
   },
 
   {
-    path: "inspect",
+    path: "invoice",
     meta: {
       type: "group",
-      title: "商务审核",
+      title: "财务审核",
       icon: "folder",
     },
     children: [
       {
-        path: "invoice_grp_dto",
+        path: "invoice_service",
         meta: {
           type: "page",
           title: "财务管理审核",
@@ -2437,6 +2437,66 @@ export default [
           },
         ],
       },
+      {
+        path: "invoice_wait_detail",
+        meta: {
+          type: "page",
+          title: "待开票明细",
+          icon: "file",
+          isHidden: true,
+        },
+        children: [
+          {
+            path: "query",
+            meta: {
+              type: "button",
+              title: "查询",
+              icon: "file",
+              isTop: true,
+            },
+          },
+        ],
+      },
+      {
+        path: "invoice_map_group",
+        meta: {
+          type: "page",
+          title: "发票和结算分组对应关系表",
+          icon: "file",
+          isHidden: true,
+        },
+        children: [
+          {
+            path: "query",
+            meta: {
+              type: "button",
+              title: "查询",
+              icon: "file",
+              isTop: true,
+            },
+          },
+        ],
+      },
+      {
+        path: "invoice_not_settle",
+        meta: {
+          type: "page",
+          title: "不可开票明细清单",
+          icon: "file",
+          isHidden: true,
+        },
+        children: [
+          {
+            path: "query",
+            meta: {
+              type: "button",
+              title: "查询",
+              icon: "file",
+              isTop: true,
+            },
+          },
+        ],
+      },
     ],
   },
   //实际采购成本，不知道起什么名

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

@@ -0,0 +1,15 @@
+import AppList from "../../../components/list/index.js";
+import html from "html";
+import useConfig from "../../../models/bj/contrast/bj_pub_sa_detail_jobservice.js";
+
+export default {
+  components: { AppList },
+  template: html`<app-list :config="config" @command="onCommand" />`,
+  setup() {
+    const config = useConfig();
+    const onCommand = async (item, rows) => {
+      console.log(item.path, item, rows);
+    };
+    return { config, onCommand };
+  },
+};

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

@@ -0,0 +1,15 @@
+import AppList from "../../../components/list/index.js";
+import html from "html";
+import useConfig from "../../../models/bj/contrast/bj_second_pub_sa_detail_jobservice.js";
+
+export default {
+  components: { AppList },
+  template: html`<app-list :config="config" @command="onCommand" />`,
+  setup() {
+    const config = useConfig();
+    const onCommand = async (item, rows) => {
+      console.log(item.path, item, rows);
+    };
+    return { config, onCommand };
+  },
+};

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

@@ -0,0 +1,15 @@
+import AppList from "../../../components/list/index.js";
+import html from "html";
+import useConfig from "../../../models/bj/input/bj_pub_sa_detail_service.js";
+
+export default {
+  components: { AppList },
+  template: html`<app-list :config="config" @command="onCommand" />`,
+  setup() {
+    const config = useConfig();
+    const onCommand = async (item, rows) => {
+      console.log(item.path, item, rows);
+    };
+    return { config, onCommand };
+  },
+};

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

@@ -0,0 +1,15 @@
+import AppList from "../../../components/list/index.js";
+import html from "html";
+import useConfig from "../../../models/bj/input/bj_pub_sa_service.js";
+
+export default {
+  components: { AppList },
+  template: html`<app-list :config="config" @command="onCommand" />`,
+  setup() {
+    const config = useConfig();
+    const onCommand = async (item, rows) => {
+      console.log(item.path, item, rows);
+    };
+    return { config, onCommand };
+  },
+};

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

@@ -0,0 +1,15 @@
+import AppList from "../../../components/list/index.js";
+import html from "html";
+import useConfig from "../../../models/bj/input/bj_pub_se_detail_service.js";
+
+export default {
+  components: { AppList },
+  template: html`<app-list :config="config" @command="onCommand" />`,
+  setup() {
+    const config = useConfig();
+    const onCommand = async (item, rows) => {
+      console.log(item.path, item, rows);
+    };
+    return { config, onCommand };
+  },
+};

code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/bj/settlement/bj_pub_ba_service.js

@@ -0,0 +1,15 @@
+import AppList from "../../../components/list/index.js";
+import html from "html";
+import useConfig from "../../../models/bj/settlement/bj_pub_ba_service.js";
+
+export default {
+  components: { AppList },
+  template: html`<app-list :config="config" @command="onCommand" />`,
+  setup() {
+    const config = useConfig();
+    const onCommand = async (item, rows) => {
+      console.log(item.path, item, rows);
+    };
+    return { config, onCommand };
+  },
+};

code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/bj/settlement/bj_pub_can_sa_detail_service.js

@@ -0,0 +1,15 @@
+import AppList from "../../../components/list/index.js";
+import html from "html";
+import useConfig from "../../../models/bj/settlement/bj_pub_ba_detail_service.js";
+
+export default {
+  components: { AppList },
+  template: html`<app-list :config="config" @command="onCommand" />`,
+  setup() {
+    const config = useConfig();
+    const onCommand = async (item, rows) => {
+      console.log(item.path, item, rows);
+    };
+    return { config, onCommand };
+  },
+};

code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/bj/settlement/bj_pub_can_sa_service.js

@@ -0,0 +1,15 @@
+import AppList from "../../../components/list/index.js";
+import html from "html";
+import useConfig from "../../../models/bj/settlement/bj_pub_can_sa_service.js";
+
+export default {
+  components: { AppList },
+  template: html`<app-list :config="config" @command="onCommand" />`,
+  setup() {
+    const config = useConfig();
+    const onCommand = async (item, rows) => {
+      console.log(item.path, item, rows);
+    };
+    return { config, onCommand };
+  },
+};

code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/bj/settlement/bj_pub_not_sa_service.js

@@ -0,0 +1,15 @@
+import AppList from "../../../components/list/index.js";
+import html from "html";
+import useConfig from "../../../models/bj/settlement/bj_pub_not_sa_service.js";
+
+export default {
+  components: { AppList },
+  template: html`<app-list :config="config" @command="onCommand" />`,
+  setup() {
+    const config = useConfig();
+    const onCommand = async (item, rows) => {
+      console.log(item.path, item, rows);
+    };
+    return { config, onCommand };
+  },
+};

code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/bj/settlement/bj_pub_pd_service.js

@@ -0,0 +1,15 @@
+import AppList from "../../../components/list/index.js";
+import html from "html";
+import useConfig from "../../../models/bj/settlement/bj_pub_pd_service.js";
+
+export default {
+  components: { AppList },
+  template: html`<app-list :config="config" @command="onCommand" />`,
+  setup() {
+    const config = useConfig();
+    const onCommand = async (item, rows) => {
+      console.log(item.path, item, rows);
+    };
+    return { config, onCommand };
+  },
+};

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

@@ -0,0 +1,15 @@
+import AppList from "../../../components/list/index.js";
+import html from "html";
+import useConfig from "../../../models/in/contrast/in_pub_sa_detail_jobservice.js";
+
+export default {
+  components: { AppList },
+  template: html`<app-list :config="config" @command="onCommand" />`,
+  setup() {
+    const config = useConfig();
+    const onCommand = async (item, rows) => {
+      console.log(item.path, item, rows);
+    };
+    return { config, onCommand };
+  },
+};

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

@@ -0,0 +1,15 @@
+import AppList from "../../../components/list/index.js";
+import html from "html";
+import useConfig from "../../../models/in/contrast/in_second_pub_sa_detail_jobservice.js";
+
+export default {
+  components: { AppList },
+  template: html`<app-list :config="config" @command="onCommand" />`,
+  setup() {
+    const config = useConfig();
+    const onCommand = async (item, rows) => {
+      console.log(item.path, item, rows);
+    };
+    return { config, onCommand };
+  },
+};

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

@@ -0,0 +1,15 @@
+import AppList from "../../../components/list/index.js";
+import html from "html";
+import useConfig from "../../../models/in/input/in_pub_sa_detail_service.js";
+
+export default {
+  components: { AppList },
+  template: html`<app-list :config="config" @command="onCommand" />`,
+  setup() {
+    const config = useConfig();
+    const onCommand = async (item, rows) => {
+      console.log(item.path, item, rows);
+    };
+    return { config, onCommand };
+  },
+};

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

@@ -0,0 +1,15 @@
+import AppList from "../../../components/list/index.js";
+import html from "html";
+import useConfig from "../../../models/in/input/in_pub_sa_service.js";
+
+export default {
+  components: { AppList },
+  template: html`<app-list :config="config" @command="onCommand" />`,
+  setup() {
+    const config = useConfig();
+    const onCommand = async (item, rows) => {
+      console.log(item.path, item, rows);
+    };
+    return { config, onCommand };
+  },
+};

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

@@ -0,0 +1,15 @@
+import AppList from "../../../components/list/index.js";
+import html from "html";
+import useConfig from "../../../models/in/input/in_pub_se_detail_service.js";
+
+export default {
+  components: { AppList },
+  template: html`<app-list :config="config" @command="onCommand" />`,
+  setup() {
+    const config = useConfig();
+    const onCommand = async (item, rows) => {
+      console.log(item.path, item, rows);
+    };
+    return { config, onCommand };
+  },
+};

code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/in/settlement/in_pub_ba_service.js

@@ -0,0 +1,15 @@
+import AppList from "../../../components/list/index.js";
+import html from "html";
+import useConfig from "../../../models/in/settlement/in_pub_ba_service.js";
+
+export default {
+  components: { AppList },
+  template: html`<app-list :config="config" @command="onCommand" />`,
+  setup() {
+    const config = useConfig();
+    const onCommand = async (item, rows) => {
+      console.log(item.path, item, rows);
+    };
+    return { config, onCommand };
+  },
+};

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

@@ -0,0 +1,15 @@
+import AppList from "../../../components/list/index";
+import html from "html";
+import useConfig from "../../../models/in/settlement/in_pub_can_sa_detail_service.js";
+
+export default {
+  components: { AppList },
+  template: html`<app-list :config="config" @command="onCommand" />`,
+  setup() {
+    const config = useConfig();
+    const onCommand = async (item, rows) => {
+      console.log(item.path, item, rows);
+    };
+    return { config, onCommand };
+  },
+};

code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/in/settlement/in_pub_can_sa_service.js

@@ -0,0 +1,15 @@
+import AppList from "../../../components/list/index.js";
+import html from "html";
+import useConfig from "../../../models/in/settlement/in_pub_can_sa_service.js";
+
+export default {
+  components: { AppList },
+  template: html`<app-list :config="config" @command="onCommand" />`,
+  setup() {
+    const config = useConfig();
+    const onCommand = async (item, rows) => {
+      console.log(item.path, item, rows);
+    };
+    return { config, onCommand };
+  },
+};

code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/in/settlement/in_pub_not_sa_service.js

@@ -0,0 +1,15 @@
+import AppList from "../../../components/list/index.js";
+import html from "html";
+import useConfig from "../../../models/in/settlement/in_pub_not_sa_service.js";
+
+export default {
+  components: { AppList },
+  template: html`<app-list :config="config" @command="onCommand" />`,
+  setup() {
+    const config = useConfig();
+    const onCommand = async (item, rows) => {
+      console.log(item.path, item, rows);
+    };
+    return { config, onCommand };
+  },
+};

code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/in/settlement/in_pub_pd_service.js

@@ -0,0 +1,15 @@
+import AppList from "../../../components/list/index.js";
+import html from "html";
+import useConfig from "../../../models/in/settlement/in_pub_pd_service.js";
+
+export default {
+  components: { AppList },
+  template: html`<app-list :config="config" @command="onCommand" />`,
+  setup() {
+    const config = useConfig();
+    const onCommand = async (item, rows) => {
+      console.log(item.path, item, rows);
+    };
+    return { config, onCommand };
+  },
+};

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

@@ -0,0 +1,15 @@
+import AppList from "../../../components/list/index.js";
+import html from "html";
+import useConfig from "../../../models/invoice/invoice_service.js";
+
+export default {
+  components: { AppList },
+  template: html`<app-list :config="config" @command="onCommand" />`,
+  setup() {
+    const config = useConfig();
+    const onCommand = async (item, rows) => {
+      console.log(item.path, item, rows);
+    };
+    return { config, onCommand };
+  },
+};

code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jis-bbac/contrast/bbac_sa_detail_jobservice.js

@@ -1,6 +1,6 @@
 import AppList from "../../../components/list/index.js";
 import html from "html";
-import useConfig from "../../../models/bbac_sa_detail_jobservice.js";
+import useConfig from "../../../models/jis-bbac/contrast/bbac_sa_detail_jobservice.js";
 
 export default {
   components: { AppList },

code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jis-bbac/contrast/first_bbac_sa_detail_jobservice.js

@@ -0,0 +1,15 @@
+import AppList from "../../../components/list/index.js";
+import html from "html";
+import useConfig from "../../../models/jis-bbac/contrast/first_bbac_sa_detail_jobservice.js";
+
+export default {
+  components: { AppList },
+  template: html`<app-list :config="config" @command="onCommand" />`,
+  setup() {
+    const config = useConfig();
+    const onCommand = async (item, rows) => {
+      console.log(item.path, item, rows);
+    };
+    return { config, onCommand };
+  },
+};

code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jis-bbac/contrast/second_bbac_sa_detail_jobservice.js

@@ -0,0 +1,15 @@
+import AppList from "../../../components/list/index.js";
+import html from "html";
+import useConfig from "../../../models/jis-bbac/contrast/second_bbac_sa_detail_jobservice.js";
+
+export default {
+  components: { AppList },
+  template: html`<app-list :config="config" @command="onCommand" />`,
+  setup() {
+    const config = useConfig();
+    const onCommand = async (item, rows) => {
+      console.log(item.path, item, rows);
+    };
+    return { config, onCommand };
+  },
+};

code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jis-bbac/contrast/third_bbac_sa_detail_jobservice.js

@@ -0,0 +1,15 @@
+import AppList from "../../../components/list/index.js";
+import html from "html";
+import useConfig from "../../../models/jis-bbac/contrast/third_bbac_sa_detail_jobservice.js";
+
+export default {
+  components: { AppList },
+  template: html`<app-list :config="config" @command="onCommand" />`,
+  setup() {
+    const config = useConfig();
+    const onCommand = async (item, rows) => {
+      console.log(item.path, item, rows);
+    };
+    return { config, onCommand };
+  },
+};

code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jis-hbpo/contrast/first_hbpo_sa_detail_jobservice.js

@@ -0,0 +1,15 @@
+import AppList from "../../../components/list/index.js";
+import html from "html";
+import useConfig from "../../../models/jis-hbpo/contrast/first_hbpo_sa_detail_service.js";
+
+export default {
+  components: { AppList },
+  template: html`<app-list :config="config" @command="onCommand" />`,
+  setup() {
+    const config = useConfig();
+    const onCommand = async (item, rows) => {
+      console.log(item.path, item, rows);
+    };
+    return { config, onCommand };
+  },
+};

code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jis-hbpo/contrast/hbpo_sa_detail_jobservice.js

@@ -0,0 +1,15 @@
+import AppList from "../../../components/list/index.js";
+import html from "html";
+import useConfig from "../../../models/jis-hbpo/contrast/hbpo_sa_detail_service.js";
+
+export default {
+  components: { AppList },
+  template: html`<app-list :config="config" @command="onCommand" />`,
+  setup() {
+    const config = useConfig();
+    const onCommand = async (item, rows) => {
+      console.log(item.path, item, rows);
+    };
+    return { config, onCommand };
+  },
+};

code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jis-hbpo/contrast/second_hbpo_sa_detail_jobservice.js

@@ -0,0 +1,15 @@
+import AppList from "../../../components/list/index.js";
+import html from "html";
+import useConfig from "../../../models/jis-hbpo/contrast/second_hbpo_sa_detail_service.js";
+
+export default {
+  components: { AppList },
+  template: html`<app-list :config="config" @command="onCommand" />`,
+  setup() {
+    const config = useConfig();
+    const onCommand = async (item, rows) => {
+      console.log(item.path, item, rows);
+    };
+    return { config, onCommand };
+  },
+};

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

@@ -0,0 +1,15 @@
+import AppList from "../../../components/list/index.js";
+import html from "html";
+import useConfig from "../../../models/jit/contrast/jit_pub_sa_detail_jobservice.js";
+
+export default {
+  components: { AppList },
+  template: html`<app-list :config="config" @command="onCommand" />`,
+  setup() {
+    const config = useConfig();
+    const onCommand = async (item, rows) => {
+      console.log(item.path, item, rows);
+    };
+    return { config, onCommand };
+  },
+};

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

@@ -0,0 +1,15 @@
+import AppList from "../../../components/list/index.js";
+import html from "html";
+import useConfig from "../../../models/jit/contrast/jit_second_pub_sa_detail_jobservice.js";
+
+export default {
+  components: { AppList },
+  template: html`<app-list :config="config" @command="onCommand" />`,
+  setup() {
+    const config = useConfig();
+    const onCommand = async (item, rows) => {
+      console.log(item.path, item, rows);
+    };
+    return { config, onCommand };
+  },
+};

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

@@ -0,0 +1,15 @@
+import AppList from "../../../components/list/index.js";
+import html from "html";
+import useConfig from "../../../models/jit/input/jit_jit_pub_sa_service.js";
+
+export default {
+  components: { AppList },
+  template: html`<app-list :config="config" @command="onCommand" />`,
+  setup() {
+    const config = useConfig();
+    const onCommand = async (item, rows) => {
+      console.log(item.path, item, rows);
+    };
+    return { config, onCommand };
+  },
+};

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

@@ -0,0 +1,15 @@
+import AppList from "../../../components/list/index.js";
+import html from "html";
+import useConfig from "../../../models/jit/input/jit_pub_sa_service.js";
+
+export default {
+  components: { AppList },
+  template: html`<app-list :config="config" @command="onCommand" />`,
+  setup() {
+    const config = useConfig();
+    const onCommand = async (item, rows) => {
+      console.log(item.path, item, rows);
+    };
+    return { config, onCommand };
+  },
+};

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

@@ -0,0 +1,15 @@
+import AppList from "../../../components/list/index.js";
+import html from "html";
+import useConfig from "../../../models/jit/input/jit_pub_se_detail_service.js";
+
+export default {
+  components: { AppList },
+  template: html`<app-list :config="config" @command="onCommand" />`,
+  setup() {
+    const config = useConfig();
+    const onCommand = async (item, rows) => {
+      console.log(item.path, item, rows);
+    };
+    return { config, onCommand };
+  },
+};

code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jit/settlement/jit_pub_ba_service.js

@@ -0,0 +1,15 @@
+import AppList from "../../../components/list/index.js";
+import html from "html";
+import useConfig from "../../../models/jit/settlement/jit_pub_ba_service.js";
+
+export default {
+  components: { AppList },
+  template: html`<app-list :config="config" @command="onCommand" />`,
+  setup() {
+    const config = useConfig();
+    const onCommand = async (item, rows) => {
+      console.log(item.path, item, rows);
+    };
+    return { config, onCommand };
+  },
+};

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

@@ -0,0 +1,15 @@
+import AppList from "../../../components/list/index.js";
+import html from "html";
+import useConfig from "../../../models/jit/settlement/jit_pub_ba_detail_service.js";
+
+export default {
+  components: { AppList },
+  template: html`<app-list :config="config" @command="onCommand" />`,
+  setup() {
+    const config = useConfig();
+    const onCommand = async (item, rows) => {
+      console.log(item.path, item, rows);
+    };
+    return { config, onCommand };
+  },
+};

code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jit/settlement/jit_pub_can_sa_service.js

@@ -0,0 +1,15 @@
+import AppList from "../../../components/list/index.js";
+import html from "html";
+import useConfig from "../../../models/jit/settlement/jit_pub_can_sa_service.js";
+
+export default {
+  components: { AppList },
+  template: html`<app-list :config="config" @command="onCommand" />`,
+  setup() {
+    const config = useConfig();
+    const onCommand = async (item, rows) => {
+      console.log(item.path, item, rows);
+    };
+    return { config, onCommand };
+  },
+};

code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jit/settlement/jit_pub_not_sa_service.js

@@ -0,0 +1,15 @@
+import AppList from "../../../components/list/index.js";
+import html from "html";
+import useConfig from "../../../models/jit/settlement/jit_pub_not_sa_service.js";
+
+export default {
+  components: { AppList },
+  template: html`<app-list :config="config" @command="onCommand" />`,
+  setup() {
+    const config = useConfig();
+    const onCommand = async (item, rows) => {
+      console.log(item.path, item, rows);
+    };
+    return { config, onCommand };
+  },
+};

code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jit/settlement/jit_pub_pd_service.js

@@ -0,0 +1,15 @@
+import AppList from "../../../components/list/index.js";
+import html from "html";
+import useConfig from "../../../models/jit/settlement/jit_pub_pd_service.js";
+
+export default {
+  components: { AppList },
+  template: html`<app-list :config="config" @command="onCommand" />`,
+  setup() {
+    const config = useConfig();
+    const onCommand = async (item, rows) => {
+      console.log(item.path, item, rows);
+    };
+    return { config, onCommand };
+  },
+};

code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/ExportReports/ErrorExportDto.cs

@@ -1,4 +1,4 @@
-// 闻荫智慧工厂管理套件
+// 闻荫智慧工厂管理套件
 //  Copyright (c) 闻荫科技 www.ccwin-in.com
 
 using Magicodes.ExporterAndImporter.Core;
@@ -11,6 +11,90 @@ using Win.Sfs.Shared.Enums;
 
 namespace Win.Sfs.SettleAccount.ExportReports
 {
+    /// <summary>
+    /// 错误信息说明
+    /// </summary>
+    public class ERR_EXP_DTO : EntityDto
+    {
+
+        public ERR_EXP_DTO()
+        {
+        }
+
+        public ERR_EXP_DTO(string version, string customCode, string type, string model, string itemCode, string itemDesc, string message, string remark)
+        {
+            Version = version;
+            CustomCode = customCode;
+            Type = type;
+            Model = model;
+            ItemCode = itemCode;
+            ItemDesc = itemDesc;
+            Message = message;
+            Remark = remark;
+        }
+
+        /// <summary>
+        /// 版本
+        /// </summary>
+        [Display(Name = "版本")]
+        public string Version { set; get; }
+
+
+        /// <summary>
+        /// 客户代码
+        /// </summary>
+
+        [Display(Name = "客户代码")]
+        public string CustomCode { get; set; }
+
+        /// <summary>
+        /// 影响类型
+        /// </summary>
+
+        [Display(Name = "错误类型")]
+        public string Type { get; set; }
+
+        /// <summary>
+        /// 问题模块
+        /// </summary>
+
+        [Display(Name = "问题模块")]
+        public string Model { get; set; }
+
+        /// <summary>
+        /// 物料号
+        /// </summary>
+        [Display(Name = "物料号")]
+
+        public string ItemCode { get; set; }
+
+        /// <summary>
+        /// 物料描述
+        /// </summary>
+        [Display(Name = "物料描述")]
+
+        public string ItemDesc { get; set; }
+
+        /// <summary>
+        /// 错误信息
+        /// </summary>
+
+        [Display(Name = "提醒信息")]
+        public string Message { get; set; }
+
+        /// <summary>
+        /// 金额差异
+        /// </summary>
+
+        [Display(Name = "备注")]
+        public string Remark { get; set; }
+
+
+    }
+
+
+
+
     /// <summary>
     /// 错误信息说明
     /// </summary>
@@ -91,4 +175,4 @@ namespace Win.Sfs.SettleAccount.ExportReports
 
 
     }
-}
+}

code/src/Modules/SettleAccount/src/SettleAccount.Application/Bases/BASE_SERVICE.cs

@@ -1,4 +1,4 @@
-using Shouldly;
+using Shouldly;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -23,7 +23,7 @@ namespace Win.Sfs.SettleAccount.Bases
     {
      
 
-        protected readonly IExcelImportAppService _excelImportService;
+        private readonly IExcelImportAppService _excelImportService;
 
         protected readonly ISnowflakeIdGenerator _snowflakeIdGenerator;
 
@@ -50,7 +50,7 @@ namespace Win.Sfs.SettleAccount.Bases
         /// <param name="errorList"></param>
         /// <param name="fileName"></param>
         /// <returns></returns>
-        protected async Task<string> ExportErrorReportAsync(List<ErrorExportDto> errorList, string fileName = "")
+        protected async Task<string> ExportErrorReportAsync(List<ERR_EXP_DTO> errorList, string fileName = "")
         {
             //没有信息返回成功
             if (errorList == null || errorList.Count == 0)

code/src/Modules/SettleAccount/src/SettleAccount.Application/Bases/BA_SERVICE.cs

@@ -1,7 +1,10 @@
-using Magicodes.ExporterAndImporter.Core;
+using EFCore.BulkExtensions;
+using Magicodes.ExporterAndImporter.Core;
 using Magicodes.ExporterAndImporter.Csv;
 using Magicodes.ExporterAndImporter.Excel;
 using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.SignalR;
+using NPOI.SS.Formula.Functions;
 using SettleAccount.Bases;
 using SettleAccount.Domain.BQ;
 using Shouldly;
@@ -19,6 +22,7 @@ using Win.Abp.Snowflakes;
 using Win.Sfs.BaseData.ImportExcelCommon;
 using Win.Sfs.SettleAccount.Constant;
 using Win.Sfs.SettleAccount.Entities.BQ.Dtos;
+using Win.Sfs.SettleAccount.Entities.BQ.Managers;
 using Win.Sfs.SettleAccount.ExcelImporter;
 using Win.Sfs.SettleAccount.ExportReports;
 using Win.Sfs.Shared.RepositoryBase;
@@ -31,6 +35,12 @@ namespace Win.Sfs.SettleAccount.Bases
         private readonly INormalEfCoreRepository<INVOICE_WAIT_DETAIL, Guid> _wRepository;
         private readonly INormalEfCoreRepository<INVOICE_NOT_SETTLE, Guid> _sRepository;
         private readonly INormalEfCoreRepository<INVOICE_MAP_GROUP, Guid> _mRepository;
+        private readonly CAN_SA_MNG<PUB_CAN_SA, PUB_CAN_SA_DETAIL> _pubMng;
+        private readonly CAN_SA_MNG<BBAC_CAN_SA, BBAC_CAN_SA_DETAIL> _bbacMng;
+        private readonly CAN_SA_MNG<HBPO_CAN_SA, HBPO_CAN_SA_DETAIL> _hbpoMng;
+        private readonly INV_MNG _invMng;
+
+
         //private readonly INormalEfCoreRepository<TEntityDetail, Guid> _detailRepository;
         private readonly IExcelImportAppService _excelImportService;
   
@@ -40,8 +50,11 @@ namespace Win.Sfs.SettleAccount.Bases
             INormalEfCoreRepository<INVOICE_WAIT_DETAIL, Guid> wRepository,
             INormalEfCoreRepository<INVOICE_NOT_SETTLE, Guid> sRepository,
             INormalEfCoreRepository<INVOICE_MAP_GROUP, Guid> mRepository,
-            IExcelImportAppService excelImportService
-       
+            IExcelImportAppService excelImportService,
+            CAN_SA_MNG<PUB_CAN_SA, PUB_CAN_SA_DETAIL> pubMng,
+            CAN_SA_MNG<BBAC_CAN_SA, BBAC_CAN_SA_DETAIL> bbacMng,
+            CAN_SA_MNG<HBPO_CAN_SA, HBPO_CAN_SA_DETAIL> hbpoMng,
+            INV_MNG invMng
             //INormalEfCoreRepository<TEntityDetail, Guid> detailRepository
 
             )
@@ -51,7 +64,12 @@ namespace Win.Sfs.SettleAccount.Bases
             _repository = repository;
             _wRepository = wRepository;
             _mRepository = mRepository;
-            _sRepository = sRepository; 
+            _sRepository = sRepository;
+            _pubMng = pubMng;
+            _bbacMng = bbacMng;
+            _hbpoMng = hbpoMng;
+            _invMng = invMng;
+            
         }
 
         /// <summary>
@@ -154,11 +172,22 @@ namespace Win.Sfs.SettleAccount.Bases
         }
 
 
-     
 
 
-        protected virtual async Task<string> RuleAsync(INVOICE_GRP_REQ_DTO input)
+        [HttpPost]
+        public virtual async Task<string> ReceivedAsync(INVOICE_GRP_REQ_DTO input)
         {
+            var entity=await _invMng.GetMainAsync(input.InvGroupNum);
+            if (entity != null)
+            {
+                bool flag = await _invMng.ReceivedAsync(entity.InvGroupNum);
+                if (flag == true)
+                {
+                    await _invMng.SetForwardState(entity, InvoiceBillState.客户已收票);
+                }
+            }
+         
+           
             return ApplicationConsts.SuccessStr;
 
         }

code/src/Modules/SettleAccount/src/SettleAccount.Application/Bases/CAN_SA_SERVICE.cs

@@ -1,4 +1,4 @@
-using AutoMapper;
+using AutoMapper;
 using Magicodes.ExporterAndImporter.Core;
 using Magicodes.ExporterAndImporter.Csv;
 using Magicodes.ExporterAndImporter.Excel;
@@ -54,7 +54,6 @@ namespace Win.Sfs.SettleAccount.Bases
             _repository = repository;
             _detailRepository = detailRepository;
 
-
         }
         /// <summary>
         ///查询明细 

code/src/Modules/SettleAccount/src/SettleAccount.Application/Bases/PD_SERVICE.cs

@@ -1,8 +1,9 @@
-using AutoMapper;
+using AutoMapper;
 using Magicodes.ExporterAndImporter.Core;
 using Magicodes.ExporterAndImporter.Csv;
 using Magicodes.ExporterAndImporter.Excel;
 using Microsoft.AspNetCore.Mvc;
+using Microsoft.EntityFrameworkCore;
 using SettleAccount.Bases;
 using Shouldly;
 using System;
@@ -141,9 +142,20 @@ namespace Win.Sfs.SettleAccount.Bases
             return ApplicationConsts.SuccessStr;
 
         }
+        public virtual async Task<TEntity> GetMainByBillNum(string billNum)
+        {
+            return await _repository.Where(p=>p.InvGroupNum == billNum).FirstOrDefaultAsync();    
+        }
+
+        public virtual async Task<List<TEntityDetail>> GetDetailByBillNum(string billNum)
+        {
+            return await _detailRepository.Where(p => p.InvGroupNum == billNum).ToListAsync();
+        }
+
+
+
 
 
-      
 
 
 

code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/BBAC_BA_SERVICE.cs

@@ -1,4 +1,4 @@
-using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Components;
 using SettleAccount.Domain.BQ;
 using System;
@@ -9,6 +9,7 @@ using System.Threading.Tasks;
 using Volo.Abp.Application.Services;
 using Win.Sfs.BaseData.ImportExcelCommon;
 using Win.Sfs.SettleAccount.Bases;
+using Win.Sfs.SettleAccount.Entities.BQ.Managers;
 using Win.Sfs.Shared.RepositoryBase;
 
 namespace Win.Sfs.SettleAccount.Entities.BQ
@@ -20,9 +21,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
     [Route("api/settleaccount/bbac_ba_service")]
     public class BBAC_BA_SERVICE : BA_SERVICE
     {
-        public BBAC_BA_SERVICE(INormalEfCoreRepository<INVOICE_GRP, Guid> repository, INormalEfCoreRepository<INVOICE_WAIT_DETAIL, Guid> wRepository,
-            INormalEfCoreRepository<INVOICE_NOT_SETTLE, Guid> sRepository, INormalEfCoreRepository<INVOICE_MAP_GROUP, Guid> mRepository, IExcelImportAppService excelImportService)
-            : base(repository, wRepository, sRepository, mRepository, excelImportService)
+        public BBAC_BA_SERVICE(INormalEfCoreRepository<INVOICE_GRP, Guid> repository, INormalEfCoreRepository<INVOICE_WAIT_DETAIL, Guid> wRepository, INormalEfCoreRepository<INVOICE_NOT_SETTLE, Guid> sRepository, INormalEfCoreRepository<INVOICE_MAP_GROUP, Guid> mRepository, IExcelImportAppService excelImportService, CAN_SA_MNG<PUB_CAN_SA, PUB_CAN_SA_DETAIL> pubMng, CAN_SA_MNG<BBAC_CAN_SA, BBAC_CAN_SA_DETAIL> bbacMng, CAN_SA_MNG<HBPO_CAN_SA, HBPO_CAN_SA_DETAIL> hbpoMng, INV_MNG invMng) : base(repository, wRepository, sRepository, mRepository, excelImportService, pubMng, bbacMng, hbpoMng, invMng)
         {
         }
     }

code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/BBAC_NOT_SA_SERVICE.cs

@@ -1,4 +1,4 @@
-using EFCore.BulkExtensions;
+using EFCore.BulkExtensions;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using SettleAccount.Domain.BQ;
@@ -46,7 +46,9 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
                 billNum: billNum,
                 settleBillNum: string.Empty,
                 state: SettleBillState.未结状态,
-                invGroupNum: billNum
+                invGroupNum: billNum,
+                site:entitys.FirstOrDefault().Site
+               
                 );
 
             List<BBAC_CAN_SA_DETAIL> ls = new List<BBAC_CAN_SA_DETAIL>();
@@ -70,6 +72,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
 
                     );
             }
+           
             await _detailRepository.DbContext.BulkInsertAsync(ls);
             await _detailRepository.DbContext.BulkDeleteAsync(entitys);
             await _detailRepository.DbContext.BulkInsertAsync(new List<BBAC_CAN_SA>() { bbac});

code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/HBPO_BA_SERVICE.cs

@@ -1,4 +1,4 @@
-using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Components;
 using SettleAccount.Domain.BQ;
 using System;
@@ -9,6 +9,7 @@ using System.Threading.Tasks;
 using Volo.Abp.Application.Services;
 using Win.Sfs.BaseData.ImportExcelCommon;
 using Win.Sfs.SettleAccount.Bases;
+using Win.Sfs.SettleAccount.Entities.BQ.Managers;
 using Win.Sfs.Shared.RepositoryBase;
 
 namespace Win.Sfs.SettleAccount.Entities.BQ
@@ -17,7 +18,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
     [Route("api/settleaccount/hbpo_ba_service")]
     public class HBPO_BA_SERVICE : BA_SERVICE
     {
-        public HBPO_BA_SERVICE(INormalEfCoreRepository<INVOICE_GRP, Guid> repository, INormalEfCoreRepository<INVOICE_WAIT_DETAIL, Guid> wRepository, INormalEfCoreRepository<INVOICE_NOT_SETTLE, Guid> sRepository, INormalEfCoreRepository<INVOICE_MAP_GROUP, Guid> mRepository, IExcelImportAppService excelImportService) : base(repository, wRepository, sRepository, mRepository, excelImportService)
+        public HBPO_BA_SERVICE(INormalEfCoreRepository<INVOICE_GRP, Guid> repository, INormalEfCoreRepository<INVOICE_WAIT_DETAIL, Guid> wRepository, INormalEfCoreRepository<INVOICE_NOT_SETTLE, Guid> sRepository, INormalEfCoreRepository<INVOICE_MAP_GROUP, Guid> mRepository, IExcelImportAppService excelImportService, CAN_SA_MNG<PUB_CAN_SA, PUB_CAN_SA_DETAIL> pubMng, CAN_SA_MNG<BBAC_CAN_SA, BBAC_CAN_SA_DETAIL> bbacMng, CAN_SA_MNG<HBPO_CAN_SA, HBPO_CAN_SA_DETAIL> hbpoMng, INV_MNG invMng) : base(repository, wRepository, sRepository, mRepository, excelImportService, pubMng, bbacMng, hbpoMng, invMng)
         {
         }
     }

code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/HBPO_NOT_SA_SERVICE.cs

@@ -1,4 +1,4 @@
-using EFCore.BulkExtensions;
+using EFCore.BulkExtensions;
 using Microsoft.AspNetCore.Authorization;
 
 using Microsoft.AspNetCore.Mvc;
@@ -42,7 +42,8 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
                 billNum: billNum,
                 settleBillNum: string.Empty,
                 state: SettleBillState.未结状态,
-                invGroupNum: billNum
+                invGroupNum: billNum,
+                site:entitys.FirstOrDefault().Site
                 );
 
             List<HBPO_CAN_SA_DETAIL> ls = new List<HBPO_CAN_SA_DETAIL>();