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

code/src/Modules/BaseService/BaseService.Application/UserManagement/RoleAppService.cs

@@ -0,0 +1,84 @@
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Mvc;
+using Omu.ValueInjecter;
+using Volo.Abp.Application.Dtos;
+using Volo.Abp.Application.Services;
+using Volo.Abp.Identity;
+
+namespace BaseService.UserManagement
+{
+    [Route("api/[controller]/[action]")]
+    [Authorize(IdentityPermissions.Roles.Default)]
+    public class RoleAppService : ApplicationService
+    {
+        private IdentityRoleManager _roleManager { get; }
+        private IIdentityRoleRepository _repository { get; }
+
+        public RoleAppService(IdentityRoleManager roleManager, IIdentityRoleRepository roleRepository)
+        {
+            _roleManager = roleManager;
+            _repository = roleRepository;
+        }
+
+        [HttpGet]
+        public async Task<ListResultDto<IdentityRoleDto>> GetAllAsync()
+        {
+            var items = await _repository.GetListAsync().ConfigureAwait(false);
+            var dtos = ObjectMapper.Map<List<IdentityRole>, List<IdentityRoleDto>>(items);
+            return new ListResultDto<IdentityRoleDto>(dtos);
+        }
+
+        [HttpGet]
+        public async Task<PagedResultDto<IdentityRoleDto>> GetListAsync(GetIdentityRolesInput input)
+        {
+            var totalCount = await _repository.GetCountAsync(input.Filter).ConfigureAwait(false);
+            var items = await _repository.GetListAsync(input.Sorting, input.MaxResultCount, input.SkipCount,
+               input.Filter).ConfigureAwait(false);
+            var dtos = ObjectMapper.Map<List<IdentityRole>, List<IdentityRoleDto>>(items);
+            return new PagedResultDto<IdentityRoleDto>(totalCount, dtos);
+        }
+
+        [HttpGet("{id}")]
+        [Authorize(IdentityPermissions.Roles.Delete)]
+        public async Task<IdentityRoleDto> Details(Guid id)
+        {
+            var role = await _roleManager.GetByIdAsync(id).ConfigureAwait(false);
+            var dto = ObjectMapper.Map<IdentityRole, IdentityRoleDto>(role);
+            return dto;
+        }
+
+        [HttpPost]
+        [Authorize(IdentityPermissions.Roles.Create)]
+        public async Task<IdentityRoleDto> CreateAsync(IdentityRoleCreateDto input)
+        {
+            var role = new IdentityRole(GuidGenerator.Create(), input.Name);
+            role.InjectFrom(input);
+            await _roleManager.CreateAsync(role).ConfigureAwait(false);
+            var dto = ObjectMapper.Map<IdentityRole, IdentityRoleDto>(role);
+            return dto;
+        }
+
+        [HttpPut("{id}")]
+        [Authorize(IdentityPermissions.Roles.Update)]
+        public async Task<IdentityRoleDto> UpdateAsync(Guid id, IdentityRoleUpdateDto input)
+        {
+            var role = await _roleManager.GetByIdAsync(id).ConfigureAwait(false);
+            role.InjectFrom(input);
+            await _roleManager.UpdateAsync(role).ConfigureAwait(false);
+            var dto = ObjectMapper.Map<IdentityRole, IdentityRoleDto>(role);
+            return dto;
+        }
+
+        [HttpDelete("{id}")]
+        [Authorize(IdentityPermissions.Roles.Delete)]
+        public async Task<IActionResult> Delete(Guid id)
+        {
+            var role = await _roleManager.GetByIdAsync(id).ConfigureAwait(false);
+            await _roleManager.DeleteAsync(role).ConfigureAwait(false);
+            return new OkResult();
+        }
+    }
+}

code/src/Modules/BaseService/BaseService.Application/UserManagement/UserAppService.cs

@@ -1,4 +1,4 @@
-using BaseService.BaseData;
+using BaseService.BaseData;
 using BaseService.BaseData.Permissions.Dto;
 using BaseService.RelationBaseData;
 using BaseService.RelationData.Dto;
@@ -408,5 +408,14 @@ namespace BaseService.Systems.UserManagement
 
             return dto;
         }
+
+        [HttpDelete("{id}")]
+        [Authorize(IdentityPermissions.Roles.Delete)]
+        public async Task<IActionResult> Delete(Guid id)
+        {
+            var entity = await UserManager.GetByIdAsync(id).ConfigureAwait(false);
+            await UserManager.DeleteAsync(entity).ConfigureAwait(false);
+            return new OkResult();
+        }
     }
-}
+}

code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/SettleAccount.HttpApi.Host.csproj

@@ -88,6 +88,7 @@
 
   <ItemGroup>
     <Folder Include="wwwroot\" />
+    <Folder Include="wwwroot\files\vmi\" />
   </ItemGroup>
 
   <ProjectExtensions><VisualStudio><UserProperties appsettings_1json__JsonSchema="" /></VisualStudio></ProjectExtensions>

code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/assets/demo/html.js

@@ -0,0 +1,9 @@
+export default function html(strings, ...values) {
+  let output = "";
+  let index;
+  for (index = 0; index < values.length; index += 1) {
+    output += strings[index] + values[index];
+  }
+  output += strings[index];
+  return output;
+}

code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/assets/demo/index.html

@@ -0,0 +1,85 @@
+<!DOCTYPE html>
+<html>
+
+<head>
+  <meta charset="utf-8" />
+  <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+  <base href="./" />
+  <title></title>
+  <style>
+    body {
+      margin: 0;
+      padding: 0;
+    }
+
+    body * {
+      box-sizing: border-box;
+    }
+
+    #app {
+      width: 100vw;
+      height: 100vh;
+      overflow-y: scroll;
+      display: flex;
+    }
+
+    #app>ul {
+      margin: 0;
+      padding: 0;
+      list-style: none;
+      width: 200px;
+      border: 1px solid gray;
+    }
+
+    #app>ul>li {
+      padding: .5em;
+    }
+
+    #app>iframe {
+      width: calc(100vw - 200px);
+    }
+  </style>
+</head>
+
+<body>
+  <div id="app"></div>
+  <script type="importmap">
+    {
+      "imports": {
+        "vue": "./lib/vue.esm-browser.js",
+        "vue-router": "./lib/vue-router.esm-browser.js",
+        "pinia": "./lib/pinia.esm-browser.js"
+      }
+    }
+  </script>
+  <script>
+    window.process = { env: { NODE_ENV: 'production' } };
+  </script>
+  <script type="module">
+    import { createApp, ref } from "vue";
+
+    const app = createApp({
+      template: `<ul>
+          <li v-for="item in links"><a href="javascript:;" @click="load(item.href)">{{item.text}}</a></li>
+        </ul>
+        <iframe :src="src" frameborder="0" />`,
+      setup() {
+        const links = [
+          { text: "组件基础", href: "./pages/component.html" }
+        ];
+        const src = ref("");
+        function load(href) {
+          src.value = href;
+        }
+        return {
+          links,
+          src,
+          load
+        }
+      }
+    });
+    app.mount("#app");
+  </script>
+</body>
+
+</html>

code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/assets/demo/pages/component.html

@@ -0,0 +1,96 @@
+<!DOCTYPE html>
+<html>
+
+<head>
+  <meta charset="utf-8" />
+  <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+  <base href="./" />
+  <title>双向绑定</title>
+</head>
+
+<body>
+  <div id="app"></div>
+  <script type="importmap">
+    {
+      "imports": {
+        "vue": "../lib/vue.esm-browser.js",
+        "vue-router": "../lib/vue-router.esm-browser.js",
+        "pinia": "../lib/pinia.esm-browser.js"
+      }
+    }
+  </script>
+  <script>
+    window.process = { env: { NODE_ENV: 'production' } };
+  </script>
+  <script type="module">
+    import { createApp, ref, reactive, watch, onMounted } from "vue";
+
+    const simpleComponent = {
+      components: {},//组件注册
+      template: `<label>子组件:<input type="text" v-model="model.value"></label>
+      <button @click="onClick">click</button>`,
+      props: ['modelValue'],
+      emit: ["update:modelValue"],
+      setup(props, context) {
+        const model = reactive(props.modelValue);
+        watch(model, (value) => context.emit('update:modelValue', value));
+
+        const childMethod = () => {
+          alert('child method');
+        }
+
+        const callback = (result) => {
+          alert(`paretn method callback: ${result}`);
+        }
+        const onClick = () => {
+          context.emit('click', 'call parent method from child', callback)
+        };
+
+        context.expose({ childMethod });
+        return {
+          model,
+          childMethod,
+          onClick
+        };
+      }
+    };
+
+    const appComponent = {
+      components: { simpleComponent },
+      template: `<label>父组件:<input type="text" v-model="model.value" /></label>
+      <button @click="onClick">click</button>
+      <simple-component ref="childRef" v-model="model" @click="parentMethod" />`,
+      props: ['modelValue'],
+      setup(props, context) {
+        const childRef = ref(null);
+        const model = reactive({
+          value: "test"
+        });
+        const onClick = () => {
+          console.log(props, context);
+          childRef.value.childMethod();
+        };
+        const parentMethod = (o, callback) => {
+          alert(o);
+          callback('from parent');
+        };
+
+        onMounted(() => {
+          console.log(childRef.value)
+        });
+
+        return {
+          model,
+          childRef,
+          onClick,
+          parentMethod
+        };
+      }
+    };
+
+    const app = createApp(appComponent);
+    app.mount("#app");
+  </script>
+</body>
+
+</html>

code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/assets/docs/vue.md

@@ -0,0 +1,6 @@
+# vue 3
+
+```javascript
+ import { createApp } from "vue";
+ createApp().mount("#app");
+```

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

@@ -122,7 +122,7 @@ export default {
       } else if (props.schema.url) {
         try {
           const url = `${props.schema.url}`;
-          const result = await request(url, null, { method: "POST" });
+          const result = await request(url, null, { method: props.schema.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/components/list/index.js

@@ -589,7 +589,7 @@ export default {
         await load();
       } else if (item.path === "export") {
         //export
-        if (item.pattern === "paged") {
+        if (item.meta.pattern === "paged") {
           const url = config.edit.exportUrl;
           const method = config.edit.exportMethod;
           const postData = buildQuery();
@@ -597,6 +597,8 @@ export default {
           if (!response.errors) {
             window.open(getUrl(`settleaccount/getblobfile/download/${response.data}`));
           }
+        } else {
+          console.log(item);
         }
       } else if (item.path === "compare") {
         exportModel.value = defaultExportModel;
@@ -654,9 +656,10 @@ export default {
             }
             const method = editFormMode.value === "create" ? config.edit.createMethod : config.edit.updateMethod;
             const response = await request(url, editFormModel.value, { method });
-            if (!response.errors) {
+            if (response.errors) {
               ElMessageBox.alert(`错误：${response.errors?.error?.message}`, `代码：${response.errors?.error?.code}`);
               //model.errors = response.errors; //??
+            } else {
               await load();
               editFormMode.value = null;
               dialogVisible.value = false;

code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/bbac-edi-se-compare.js

@@ -0,0 +1,128 @@
+import version from "./version.js";
+
+const stateName = {
+  title: "状态",
+  type: "string",
+  input: "select",
+  options: [
+    { label: "执行完成(任务成功)", value: "Succeeded" },
+    { label: "执行完成(任务失败)", value: "Failed" },
+    { label: "执行中", value: "Processing" },
+    { label: "等待执行", value: "Enqueued" },
+  ],
+};
+
+const schema = {
+  title: "数据对比",
+  type: "object",
+  properties: {
+    type: {
+      title: "版本号",
+      type: "string",
+    },
+    taskId: {
+      title: "单据流水号",
+      type: "string",
+    },
+    email: {
+      title: "创建人",
+      type: "string",
+    },
+    createdAt: {
+      title: "创建时间",
+      type: "DateTime",
+    },
+    remark: {
+      title: "说明",
+      type: "string",
+    },
+    stateName,
+  },
+};
+
+const queryUrl = "settleaccount/Job/list";
+const deleteUrl = "settleaccount/Job/delete";
+const exportUrl = "settleaccount/pub_sa_detail_service/export";
+const compareUrl = "settleaccount/edi-se-compare/bbacedi-se-compare";
+const queryMethod = "POST";
+const deleteMethod = "POST";
+const exportMethod = "POST";
+const compareMethod = "POST";
+
+export default function () {
+  return {
+    query: {
+      url: queryUrl,
+      method: queryMethod,
+
+      autoSubmit: true,
+      disableQueryOnLoad: true,
+      schema: {
+        title: "数据对比",
+        type: "object",
+        properties: {
+          type: Object.assign({ defaultSelected: true }, version),
+          name: {
+            type: "string",
+            default: null,
+            hidden: true,
+          },
+          stateName,
+          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: {
+      deleteUrl,
+      exportUrl,
+      compareUrl,
+      deleteMethod,
+      exportMethod,
+      compareMethod,
+      schema: schema,
+    },
+  };
+}

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

@@ -18,23 +18,33 @@ const schema = {
       title: "组件描述",
       type: "string",
     },
+    childItemUom: {
+      title: "组件计量单位",
+      type: "string",
+    },
     qty: {
-      title: "用量",
+      title: "组件数量",
-      type: "number",
+      type: "decimal",
     },
     bomType: {
       title: "结构类型",
       type: "string",
     },
-    effectiveTime: {
+    operateProcess: {
-      title: "生效时间",
+      title: "工序",
+      type: "int",
+    },
+    scrapPercent: {
+      title: "废品率",
       type: "string",
-      input: "date",
     },
-    effectiveTime: {
+    issuePosition: {
-      title: "失效时间",
+      title: "子物品消耗位置",
       type: "string",
-      input: "date",
+    },
+    bomLevel: {
+      title: "结构层级",
+      type: "int",
     },
   },
 };

code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/hbpo-edi-se-compare.js

@@ -0,0 +1,128 @@
+import version from "./version.js";
+
+const stateName = {
+  title: "状态",
+  type: "string",
+  input: "select",
+  options: [
+    { label: "执行完成(任务成功)", value: "Succeeded" },
+    { label: "执行完成(任务失败)", value: "Failed" },
+    { label: "执行中", value: "Processing" },
+    { label: "等待执行", value: "Enqueued" },
+  ],
+};
+
+const schema = {
+  title: "数据对比",
+  type: "object",
+  properties: {
+    type: {
+      title: "版本号",
+      type: "string",
+    },
+    taskId: {
+      title: "单据流水号",
+      type: "string",
+    },
+    email: {
+      title: "创建人",
+      type: "string",
+    },
+    createdAt: {
+      title: "创建时间",
+      type: "DateTime",
+    },
+    remark: {
+      title: "说明",
+      type: "string",
+    },
+    stateName,
+  },
+};
+
+const queryUrl = "settleaccount/Job/list";
+const deleteUrl = "settleaccount/Job/delete";
+const exportUrl = "settleaccount/pub_sa_detail_service/export";
+const compareUrl = "settleaccount/edi-se-compare/hbpoedi-se-compare";
+const queryMethod = "POST";
+const deleteMethod = "POST";
+const exportMethod = "POST";
+const compareMethod = "POST";
+
+export default function () {
+  return {
+    query: {
+      url: queryUrl,
+      method: queryMethod,
+
+      autoSubmit: true,
+      disableQueryOnLoad: true,
+      schema: {
+        title: "数据对比",
+        type: "object",
+        properties: {
+          type: Object.assign({ defaultSelected: true }, version),
+          name: {
+            type: "string",
+            default: null,
+            hidden: true,
+          },
+          stateName,
+          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: {
+      deleteUrl,
+      exportUrl,
+      compareUrl,
+      deleteMethod,
+      exportMethod,
+      compareMethod,
+      schema: schema,
+    },
+  };
+}

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

@@ -1,4 +1,4 @@
-import version from "../../version";
+import version from "../../version.js";
 
 const schema = {
   title: "JIS结算数据",

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

@@ -1,46 +1,78 @@
 const schema = {
-  title: "通用代码",
+  title: "寄售库存",
   type: "object",
   properties: {
-    project: {
+    id: {
-      title: "项目",
+      type: "string",
-      type: "string",
+      hidden: true,
-      readOnly: true,
-      showForList: true,
-      rules: [
-        {
-          required: true,
-        },
-      ],
     },
-    value: {
+    erpToLoc: {
-      title: "值",
+      title: "ERP库位",
       type: "string",
-      readOnly: true,
-      showForList: true,
-      rules: [
-        {
-          required: true,
-        },
-      ],
     },
-    description: {
+    lu: {
-      title: "描述",
+      title: "LU零件号",
+      type: "string",
+    },
+    partCode: {
+      title: "客户零件号",
+      type: "string",
+    },
+    vinCode: {
+      title: "生产码",
+      type: "string",
+    },
+    codeType: {
+      title: "生产码类型",
+      type: "string",
+    },
+    proType: {
+      title: "发货类型",
+      type: "string",
+    },
+    qty: {
+      title: "数量",
+      type: "string",
+    },
+    shippingDate: {
+      title: "发运日期",
+      type: "string",
+      input: "date",
+    },
+    creationTime: {
+      title: "订单日期",
+      type: "string",
+      input: "date",
+    },
+    seqNumber: {
+      title: "EDI顺序号",
+      type: "string",
+    },
+    tmpe4: {
+      title: "客户订单号",
+      type: "string",
+    },
+    uniqueCode: {
+      title: "塑件唯一码",
+      type: "string",
+    },
+    matchNumber: {
+      title: "EDI总成号",
+      type: "string",
+    },
+    pjsNum: {
+      title: "PJIS生产顺序号",
+      type: "string",
+    },
+    desc: {
+      title: "备注",
       type: "string",
-      input: "textarea",
-      showForList: true,
-      rules: [
-        {
-          required: true,
-        },
-        { max: 60 },
-      ],
     },
   },
 };
 
-const baseUrl = "settleaccount/code-setting";
+const baseUrl = "settleaccount/vmi";
-const queryUrl = `${baseUrl}/get-list`;
+const queryUrl = `${baseUrl}/balance`;
 const detailsUrl = `${baseUrl}/get/%s`;
 const createUrl = `${baseUrl}/create`;
 const updateUrl = `${baseUrl}/update/%s`;
@@ -62,7 +94,7 @@ export default function () {
       method: queryMethod,
       hasFilter: true,
       schema: {
-        title: "通用代码",
+        title: "寄售库存",
         type: "object",
         properties: {
           filters: {
@@ -89,7 +121,7 @@ export default function () {
             default: [
               {
                 logic: "and",
-                column: "project",
+                column: "erpToLoc",
                 action: "like",
                 value: null,
                 readOnly: true,

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

@@ -1,5 +1,5 @@
-import version from "../version.js";
+import version from "../version";
-import { state2, state3 } from "../state.js";
+import { state2, state3 } from "../state";
 const schema = {
   title: "财务审核",
   type: "object",
@@ -33,16 +33,8 @@ const schema = {
   },
 };
 
-const queryUrl = "settleaccount/invoice_service/main-query";
+const queryUrl = "settleaccount/invoice_service/detail_queryUrl";
-const exportUrl = "settleaccount/invoice_service/export";
-const rejectUrl = "settleaccount/invoice_service/reject";
-const passedUrl = "settleaccount/invoice_service/approval-passed";
-const sync_qadUrl = "settleaccount/invoice_service/sync_qad";
 const queryMethod = "POST";
-const exportMethod = "POST";
-const rejectMethod = "POST";
-const passedMethod = "POST";
-const sync_qadMethod = "POST";
 
 export default function () {
   return {
@@ -103,14 +95,6 @@ export default function () {
       schema: schema,
     },
     edit: {
-      exportUrl,
-      rejectUrl,
-      passedUrl,
-      sync_qadUrl,
-      exportMethod,
-      rejectMethod,
-      passedMethod,
-      sync_qadMethod,
       schema: schema,
     },
   };

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

@@ -1,59 +1,48 @@
+import version from "../version.js";
+import { state2, state3 } from "../state.js";
+
 const schema = {
   title: "通用代码",
   type: "object",
   properties: {
-    project: {
+    version,
-      title: "项目",
+    invbillNum: {
+      title: "系统生成发票号",
       type: "string",
-      readOnly: true,
-      showForList: true,
-      rules: [
-        {
-          required: true,
-        },
-      ],
     },
-    value: {
+    invGroupNum: {
-      title: "值",
+      title: "发票分组号",
       type: "string",
-      readOnly: true,
-      showForList: true,
-      rules: [
-        {
-          required: true,
-        },
-      ],
     },
-    description: {
+    settleGroupNum: {
-      title: "描述",
+      title: "结算分组号",
+      type: "string",
+    },
+    amt: {
+      title: "金额",
+      type: "decimal",
+    },
+    state2,
+    Extend1: {
+      title: "扩展字段1",
+      type: "string",
+    },
+    Extend2: {
+      title: "扩展字段2",
       type: "string",
-      input: "textarea",
-      showForList: true,
-      rules: [
-        {
-          required: true,
-        },
-        { max: 60 },
-      ],
     },
   },
 };
-
+const queryUrl = "settleaccount/invoice_service/main-query";
-const baseUrl = "settleaccount/code-setting";
+const exportUrl = "settleaccount/invoice_service/export";
-const queryUrl = `${baseUrl}/get-list`;
+const rejectUrl = "settleaccount/invoice_service/reject";
-const detailsUrl = `${baseUrl}/get/%s`;
+const passedUrl = "settleaccount/invoice_service/approval-passed";
-const createUrl = `${baseUrl}/create`;
+const sync_qadUrl = "settleaccount/invoice_service/sync_qad";
-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";
+const rejectMethod = "POST";
+const passedMethod = "POST";
+const sync_qadMethod = "POST";
 
 export default function () {
   return {
@@ -89,8 +78,8 @@ export default function () {
             default: [
               {
                 logic: "and",
-                column: "project",
+                column: "version",
-                action: "like",
+                action: "equal",
                 value: null,
                 readOnly: true,
               },
@@ -114,18 +103,14 @@ export default function () {
       schema: schema,
     },
     edit: {
-      detailsUrl,
-      createUrl,
-      updateUrl,
-      deleteUrl,
-      importUrl,
       exportUrl,
-      detailsMethod,
+      rejectUrl,
-      createMethod,
+      passedUrl,
-      updateMethod,
+      sync_qadUrl,
-      deleteMethod,
-      importMethod,
       exportMethod,
+      rejectMethod,
+      passedMethod,
+      sync_qadMethod,
       schema: schema,
     },
   };

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

@@ -1,45 +1,42 @@
+import version from "../version.js";
+
 const schema = {
   title: "通用代码",
   type: "object",
   properties: {
-    project: {
+    version,
-      title: "项目",
+    inGroupNum:{
-      type: "string",
+      title:"发票分组号",
-      readOnly: true,
+      type:"string",
-      showForList: true,
-      rules: [
-        {
-          required: true,
-        },
-      ],
     },
-    value: {
+    settleGroupNum:{
-      title: "值",
+      title:"结算分组号",
-      type: "string",
+      type:"string",
-      readOnly: true,
-      showForList: true,
-      rules: [
-        {
-          required: true,
-        },
-      ],
     },
-    description: {
+    lu:{
-      title: "描述",
+      title:"可结算分组号",
-      type: "string",
+      type:"string",
-      input: "textarea",
+    },
-      showForList: true,
+    lu1:{
-      rules: [
+      title:"不可结算分组号",
-        {
+      type:"string",
-          required: true,
+    },
-        },
+    qty:{
-        { max: 60 },
+      title:"数量",
-      ],
+      type:"decimal",
+    },
+    extend1:{
+      title:"扩展字段1",
+      type:"string",
+    },
+    extend2:{
+      title:"扩展字段2",
+      type:"string",
     },
   },
 };
 
-const queryUrl = `${baseUrl}/get-list`;
+const queryUrl = "settleaccount/invoice_service/detail_queryUrl";
 const queryMethod = "POST";
 
 export default function () {
@@ -101,18 +98,6 @@ export default function () {
       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/invoice/invoice_wait_detail.js

@@ -1,59 +1,59 @@
+import version from "../version.js";
+
 const schema = {
   title: "通用代码",
   type: "object",
   properties: {
-    project: {
+    version,
-      title: "项目",
+    invbillNum: {
+      title: "发票号",
       type: "string",
-      readOnly: true,
-      showForList: true,
-      rules: [
-        {
-          required: true,
-        },
-      ],
     },
-    value: {
+    inGroupNum: {
-      title: "值",
+      title: "发票分组号",
       type: "string",
-      readOnly: true,
-      showForList: true,
-      rules: [
-        {
-          required: true,
-        },
-      ],
     },
-    description: {
+    lu: {
-      title: "描述",
+      title: "可结算分组号",
+      type: "string",
+    },
+    price: {
+      title: "单价",
+      type: "decimal",
+    },
+    qty: {
+      title: "数量",
+      type: "decimal",
+    },
+    amt: {
+      title: "金额",
+      type: "decimal",
+    },
+    bussiessType: {
+      title: "业务分类",
+      type: "EnumBusinessType",
+    },
+    extend1: {
+      title: "扩展字段1",
+      type: "string",
+    },
+    extend2: {
+      title: "扩展字段2",
+      type: "string",
+    },
+    extend3: {
+      title: "扩展字段3",
+      type: "string",
+    },
+    extend4: {
+      title: "扩展字段4",
       type: "string",
-      input: "textarea",
-      showForList: true,
-      rules: [
-        {
-          required: true,
-        },
-        { max: 60 },
-      ],
     },
   },
 };
 
-const baseUrl = "settleaccount/code-setting";
+const queryUrl = "settleaccount/invoice_service/detail_queryUrl";
-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 {
@@ -114,18 +114,6 @@ export default function () {
       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/jis-bbac/input/bbac_sa_detail_service.js

@@ -39,21 +39,9 @@ const schema = {
   },
 };
 
-const baseUrl = "settleaccount/bbac_sa_detail_service";
+const queryUrl = "settleaccount/bbac_sa_service/detail_query";
-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 {
@@ -114,18 +102,6 @@ export default function () {
       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/jis-bbac/input/bbac_sa_service.js

@@ -43,17 +43,13 @@ const schema = {
 };
 
 const baseUrl = "settleaccount/bbac_sa_service";
-const queryUrl = `${baseUrl}/get-list`;
+const queryUrl = "settleaccount/bbac_sa_service/get-list";
-const detailsUrl = `${baseUrl}/get/%s`;
+const createUrl = "settleaccount/bbac_sa_service/create";
-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";
@@ -117,15 +113,11 @@ export default function () {
       schema: schema,
     },
     edit: {
-      detailsUrl,
       createUrl,
-      updateUrl,
       deleteUrl,
       importUrl,
       exportUrl,
-      detailsMethod,
       createMethod,
-      updateMethod,
       deleteMethod,
       importMethod,
       exportMethod,

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

@@ -50,11 +50,10 @@ const schema = {
   },
 };
 
-const baseUrl = "settleaccount/bbac_se_detail_service";
+const queryUrl = "settleaccount/bbac_se_detail_service/get-list";
-const queryUrl = `${baseUrl}/get-list`;
 // const deleteUrl = `${baseUrl}/delete-list`;
 // const importUrl = `${baseUrl}/import`;
-const exportUrl = `${baseUrl}/export`;
+const exportUrl = "settleaccount/bbac_se_detail_service/export";
 const queryMethod = "POST";
 // const deleteMethod = "POST";
 // const importMethod = "POST";

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

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

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

@@ -113,8 +113,6 @@ export default function () {
       schema: schema,
     },
     edit: {
-        queryUrl,
-      queryMethod,
       schema: schema,
     },
   };

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

@@ -53,8 +53,7 @@ const schema = {
   },
 };
 
-const baseUrl = "settleaccount/bbac_can_sa_detail_service";
+const queryUrl = "settleaccount/bbac_can_sa_service/detail-query";
-const queryUrl = `${baseUrl}/detail-query`;
 const queryMethod = "POST";
 
 export default function () {

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

@@ -49,10 +49,9 @@ const schema = {
   },
 };
 
-const baseUrl = "settleaccount/bbac_not_sa_service";
+const queryUrl = "settleaccount/bbac_not_sa_service/detail-query";
-const queryUrl = `${baseUrl}/detail-query`;
+const exportUrl = "settleaccount/bbac_not_sa_service/export";
-const exportUrl = `${baseUrl}/export`;
+const settlementUrl = "settleaccount/bbac_not_sa_service/generate-settlement-order";
-const settlementUrl="settleaccount/bbac_not_sa_service/generate-settlement-order";
 const queryMethod = "POST";
 const exportMethod = "POST";
 const settlementMethod = "POST";

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

@@ -27,12 +27,8 @@ const schema = {
 };
 
 const baseUrl = "settleaccount/bbac_pd_service";
-const queryUrl = `${baseUrl}/main-query`;
+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 {
@@ -93,10 +89,6 @@ export default function () {
       schema: schema,
     },
     edit: {
-      detailsUrl,
-      exportUrl,
-      detailsMethod,
-      exportMethod,
       schema: schema,
     },
   };

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

@@ -1,5 +1,5 @@
 import version from "../../version.js";
-import {state2,state3} from "../../state.js";
+import { state2, state3 } from "../../state.js";
 
 const schema = {
   title: "寄售库库存扣减审批",
@@ -29,7 +29,7 @@ const schema = {
 const queryUrl = "settleaccount/b-bAC_PD_SERVICE/main-query";
 const exportUrl = "settleaccount/b-bAC_PD_SERVICE/export";
 const rejectUrl = "settleaccount/b-bAC_PD_SERVICE/reject";
-const passedUrl = "settleaccount/b-bAC_PD_SERVICE/approval-passed"
+const passedUrl = "settleaccount/b-bAC_PD_SERVICE/approval-passed";
 const queryMethod = "POST";
 const exportMethod = "POST";
 const rejectMethod = "POST";

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

@@ -39,21 +39,9 @@ const schema = {
   },
 };
 
-const baseUrl = "settleaccount/hbpo_sa_detail_service";
+const baseUrl = "settleaccount/hbpo_sa_service";
-const queryUrl = `${baseUrl}/get-list`;
+const queryUrl = `${baseUrl}detail_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";
-const createMethod = "POST";
-const updateMethod = "POST";
-const deleteMethod = "POST";
-const importMethod = "POST";
-const exportMethod = "POST";
 
 export default function () {
   return {
@@ -114,18 +102,6 @@ export default function () {
       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/jis-hbpo/input/hbpo_se_detail_service.js

@@ -115,7 +115,6 @@ export default function () {
       schema: schema,
     },
     edit: {
-      importUrl,
       exportUrl,
       exportMethod,
       schema: schema,

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

@@ -52,12 +52,10 @@ const schema = {
 };
 
 const baseUrl = "settleaccount/hbpo_ba_service";
-const queryUrl = `${baseUrl}/main-query`;
+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 {
@@ -118,10 +116,8 @@ export default function () {
       schema: schema,
     },
     edit: {
-      detailsUrl,
+      queryUrl,
-      exportUrl,
+      queryMethod,
-      detailsMethod,
-      exportMethod,
       schema: schema,
     },
   };

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

@@ -53,11 +53,9 @@ const schema = {
   },
 };
 
-const baseUrl = "settleaccount/hbpo_can_sa_detail_service";
+const baseUrl = "settleaccount/hbpo_can_sa_service";
-const queryUrl = `${baseUrl}/get-list`;
+const queryUrl = `${baseUrl}/detail_query`;
-const detailsUrl = `${baseUrl}/get/%s`;
 const queryMethod = "POST";
-const detailsMethod = "POST";
 
 export default function () {
   return {
@@ -118,8 +116,8 @@ export default function () {
       schema: schema,
     },
     edit: {
-      detailsUrl,
+      queryUrl,
-      detailsMethod,
+      queryMethod,
       schema: schema,
     },
   };

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

@@ -49,9 +49,8 @@ const schema = {
   },
 };
 
-const baseUrl = "settleaccount/bbac_not_sa_service";
+const queryUrl = "settleaccount/hbpo_not_sa_service/detail-query";
-const queryUrl = `${baseUrl}/main-query`;
+const exportUrl = "settleaccount/hbpo_not_sa_service/export";
-const exportUrl = `${baseUrl}/export`;
 const settlementUrl = "settleaccount/hbpo_not_sa_service/generate-settlement-order";
 const queryMethod = "POST";
 const exportMethod = "POST";

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

@@ -27,16 +27,8 @@ const schema = {
 };
 
 const baseUrl = "settleaccount/hbpo_pd_service";
-const queryUrl = `${baseUrl}/get-list`;
+const queryUrl = `${baseUrl}/detail_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";
-const exportMethod = "POST";
 
 export default function () {
   return {
@@ -97,10 +89,8 @@ export default function () {
       schema: schema,
     },
     edit: {
-      detailsUrl,
+      queryUrl,
-      exportUrl,
+      queryMethod,
-      detailsMethod,
-      exportMethod,
       schema: schema,
     },
   };

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

@@ -26,14 +26,14 @@ const schema = {
   },
 };
 
-const queryUrl = "settleaccount/h-bPO_PD_SERVICE/get-list";
+const queryUrl = "settleaccount/h-bPO_PD_SERVICE/main-query";
 const exportUrl = "settleaccount/h-bPO_PD_SERVICE/export";
 const passedUrl = "settleaccount/h-bPO_PD_SERVICE/approval-passed";
 const rejectUrl = "settleaccount/h-bPO_PD_SERVICE/reject";
 const queryMethod = "POST";
 const exportMethod = "POST";
 const passedMethod = "POST";
-const rejectMethod="POST";
+const rejectMethod = "POST";
 
 export default function () {
   return {

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

@@ -83,10 +83,8 @@ export default function () {
       schema: schema,
     },
     edit: {
-      queryUrl,
       importUrl,
       exportUrl,
-      queryMethod,
       importMethod,
       exportMethod,
       schema: schema,

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

@@ -89,9 +89,7 @@ export default function () {
       schema: schema,
     },
     edit: {
-      queryUrl,
       exportUrl,
-      queryMethod,
       exportMethod,
       schema: schema,
     },

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

@@ -87,10 +87,8 @@ export default function () {
       schema: schema,
     },
     edit: {
-      queryUrl,
       importUrl,
       exportUrl,
-      queryMethod,
       importMethod,
       exportMethod,
       schema: schema,

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

@@ -99,10 +99,8 @@ export default function () {
       schema: schema,
     },
     edit: {
-      queryUrl,
       importUrl,
       exportUrl,
-      queryMethod,
       importMethod,
       exportMethod,
       schema: schema,

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

@@ -0,0 +1,138 @@
+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",
+    },
+    businessType: {
+      title: "业务分类",
+      type: "EnumBusinessType",
+    },
+    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",
+    },
+    keycode: {
+      title: "键值",
+      type: "string",
+    },
+    qty: {
+      title: "结算数量",
+      type: "decimal",
+    },
+    groupNum: {
+      title: "结算分组号",
+      type: "decimal",
+    },
+    entend1: {
+      title: "扩展1",
+      type: "string",
+    },
+    entend2: {
+      title: "扩展2",
+      type: "string",
+    },
+    entend3: {
+      title: "扩展3",
+      type: "string",
+    },
+  },
+};
+
+const queryUrl = "settleaccount/p-uB_BA_SERVICE/detail-query";
+const queryMethod = "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: {
+      schema: schema,
+    },
+  };
+}

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

@@ -0,0 +1,154 @@
+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",
+    },
+    businessType: {
+      title: "业务分类",
+      type: "EnumBusinessType",
+    },
+    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",
+    },
+    keycode: {
+      title: "键值",
+      type: "string",
+    },
+    qty: {
+      title: "结算数量",
+      type: "decimal",
+    },
+    groupNum: {
+      title: "结算分组号",
+      type: "decimal",
+    },
+    entend1: {
+      title: "扩展1",
+      type: "string",
+    },
+    entend2: {
+      title: "扩展2",
+      type: "string",
+    },
+    entend3: {
+      title: "扩展3",
+      type: "string",
+    },
+  },
+};
+
+const queryUrl = "settleaccount/p-uB_BA_SERVICE/main-query";
+const exportUrl = "settleaccount/p-uB_BA_SERVICE/export";
+const invoiceUrl = "settleaccount/p-uB_BA_SERVICE/generate-invoice";
+const rejectUrl = "settleaccount/p-uB_BA_SERVICE/reject";
+const receivedUrl = "settleaccount/p-uB_BA_SERVICE/received";
+const queryMethod = "POST";
+const exportMethod = "POST";
+const invoiceMethod = "POST";
+const rejectMethod = "POST";
+const receivedMethod = "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: {
+      exportUrl,
+      invoiceUrl,
+      rejectUrl,
+      receivedUrl,
+      exportMethod,
+      invoiceMethod,
+      rejectMethod,
+      receivedMethod,
+      schema: schema,
+    },
+  };
+}

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

@@ -0,0 +1,126 @@
+import version from "./version.js";
+import state from "./state.js";
+
+const schema = {
+  title: "结算数据",
+  type: "object",
+  properties: {
+    state,
+    settleBillNum: {
+      title: "关联结算单号",
+      type: "string",
+    },
+    site: {
+      title: "工厂地点",
+      type: "string",
+    },
+    businessType: {
+      title: "业务分类",
+      type: "EnumBusinessType",
+    },
+    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",
+    },
+    keycode: {
+      title: "键值",
+      type: "string",
+    },
+    qty: {
+      title: "结算数量",
+      type: "decimal",
+    },
+    groupNum: {
+      title: "结算分组号",
+      type: "decimal",
+    },
+  },
+};
+
+const queryUrl = "settleaccount/pub_can_sa_service/detail-query";
+const queryMethod = "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: {
+      schema: schema,
+    },
+  };
+}

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

@@ -0,0 +1,102 @@
+import version from "./version.js";
+import state from "./state.js";
+
+const schema = {
+  title: "结算数据",
+  type: "object",
+  properties: {
+    version,
+    state,
+    settleBillNum: {
+      title: "关联结算单号",
+      type: "string",
+    },
+    billNum: {
+      title: "结算单号",
+      type: "string",
+    },
+    invGroupNum: {
+      title: "发票分组号",
+      type: "string",
+    },
+    businessType: {
+      title: "业务分类",
+      type: "EnumBusinessType",
+    },
+  },
+};
+
+const queryUrl = "settleaccount/pub_can_sa_service/main-query";
+const exportUrl = "settleaccount/pub_can_sa_service/export";
+const invoiceUrl = "settleaccount/pub_can_sa_service/generate-invoice";
+const queryMethod = "POST";
+const exportMethod = "POST";
+const invoiceMethod = "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: {
+      exportUrl,
+      invoiceUrl,
+      exportMethod,
+      invoiceMethod,
+      schema: schema,
+    },
+  };
+}

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

@@ -0,0 +1,144 @@
+import version from "./version.js";
+
+const schema = {
+  title: "结算数据",
+  type: "object",
+  properties: {
+    settleBillNum: {
+      title: "关联结算单号",
+      type: "string",
+    },
+    site: {
+      title: "工厂地点",
+      type: "string",
+    },
+    businessType: {
+      title: "业务分类",
+      type: "EnumBusinessType",
+    },
+    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",
+    },
+    keycode: {
+      title: "键值",
+      type: "string",
+    },
+    qty: {
+      title: "结算数量",
+      type: "decimal",
+    },
+    groupNum: {
+      title: "结算分组号",
+      type: "decimal",
+    },
+    entend1: {
+      title: "扩展1",
+      type: "string",
+    },
+    entend2: {
+      title: "扩展2",
+      type: "string",
+    },
+    entend3: {
+      title: "扩展3",
+      type: "string",
+    },
+  },
+};
+
+const queryUrl = "settleaccount/pub_not_sa_service/detail-query";
+const exportUrl = "settleaccount/pub_not_sa_service/export";
+const settlementUrl = "settleaccount/pub_not_sa_service/generate-settlement-order";
+const queryMethod = "POST";
+const exportMethod = "POST";
+const settlementMethod = "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: {
+      exportUrl,
+      settlementUrl,
+      exportMethod,
+      settlementMethod,
+      schema: schema,
+    },
+  };
+}

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

@@ -0,0 +1,99 @@
+import version from "./version.js";
+import { state2, state3 } from "./state.js";
+
+const schema = {
+  title: "结算数据",
+  type: "object",
+  properties: {
+    site: {
+        title: "工厂地点",
+        type: "string",
+      },
+    version,
+    billNum: {
+      title: "结算单号",
+      type: "string",
+    },
+    qty: {
+        title: "结算单号",
+        type: "decimal",
+      },
+      price: {
+        title: "结算单号",
+        type: "decimal",
+      },
+      invGroupNum: {
+        title: "结算单号",
+        type: "string",
+      },
+
+  },
+};
+
+const queryUrl = "settleaccount/p-uB_PD_SERVICE/detail-query";
+const queryMethod = "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: {
+      schema: schema,
+    },
+  };
+}

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

@@ -0,0 +1,110 @@
+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",
+    },
+    businessType: {
+      title: "业务类型",
+      type: "EnumBusinessType",
+    },
+  },
+};
+
+const queryUrl = "settleaccount/p-uB_PD_SERVICE/main-query";
+const exportUrl = "settleaccount/p-uB_PD_SERVICE/export";
+const passedUrl = "settleaccount/p-uB_PD_SERVICE/approval-passed";
+const rejectUrl = "settleaccount/p-uB_BA_SERVICE/reject";
+const queryMethod = "POST";
+const exportMethod = "POST";
+const passedMethod = "POST";
+const rejectMethod = "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: {
+      exportUrl,
+      passedUrl,
+      rejectUrl,
+      exportMethod,
+      passedMethod,
+      rejectMethod,
+      schema: schema,
+    },
+  };
+}

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

@@ -0,0 +1,136 @@
+import version from "./version.js";
+import state from "./state.js";
+
+const schema = {
+  title: "结算数据",
+  type: "object",
+  properties: {
+    version,
+    state,
+    keyCode: {
+      title: "LU+ASN单号",
+      type: "string",
+    },
+    billNum: {
+      title: "关联结算单号",
+      type: "string",
+    },
+    lu: {
+      title: "零件号",
+      type: "string",
+    },
+    pn: {
+      title: "发货单号",
+      type: "string",
+    },
+    site: {
+      title: "工厂地点",
+      type: "string",
+    },
+    qty: {
+      title: "结算数量",
+      type: "decimal",
+    },
+    price: {
+      title: "单价",
+      type: "decimal",
+    },
+    invGroupNum: {
+      title: "发票分组号",
+      type: "string",
+    },
+    settleDate: {
+      title: "结算日期（收货日期",
+      type: "Datetime",
+    },
+    extend1: {
+      title: "扩展字段1",
+      type: "string",
+    },
+    extend2: {
+      title: "扩展字段2",
+      type: "string",
+    },
+    extend3: {
+      title: "扩展字段3",
+      type: "string",
+    },
+    groupNum: {
+      title: "结算分组",
+      type: "string",
+    },
+  },
+};
+
+const queryUrl = "settleaccount/pub_sa_detail_service/get-list";
+const exportUrl = "settleaccount/pub_sa_detail_service/export";
+const queryMethod = "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: {
+      deleteUrl,
+      exportUrl,
+      deleteMethod,
+      exportMethod,
+      schema: schema,
+    },
+  };
+}

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

@@ -0,0 +1,90 @@
+import version from "./version.js";
+import state from "./state.js";
+
+const schema = {
+  title: "结算数据",
+  type: "object",
+  properties: {
+    version,
+    state,
+    billNum: {
+      title: "结算单号",
+      type: "string",
+    },
+  },
+};
+
+const queryUrl = "settleaccount/pub_sa_service/get-list";
+const deleteUrl = "settleaccount/pub_sa_service/delete";
+const importUrl = "settleaccount/pub_sa_service/import-by-business-type";
+const queryMethod = "POST";
+const deleteMethod = "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: {
+      deleteUrl,
+      importUrl,
+      deleteMethod,
+      importMethod,
+      schema: schema,
+    },
+  };
+}

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

@@ -0,0 +1,122 @@
+import version from "./version.js";
+import state from "./state.js";
+
+const schema = {
+  title: "结算数据",
+  type: "object",
+  properties: {
+    version,
+    state,
+    shippingDate: {
+      title: "发货时间",
+      type: "DateTime",
+    },
+    wmsBillNum: {
+      title: "发运单号",
+      type: "string",
+    },
+    lu: {
+      title: "零件号",
+      type: "string",
+    },
+    pn: {
+      title: "生产号",
+      type: "string",
+    },
+    keyCode: {
+      title: "组合键值（LU+PN）",
+      type: "string",
+    },
+    qty: {
+      title: "数量",
+      type: "decimal",
+    },
+    seqNumber: {
+      title: "日顺序号",
+      type: "string",
+    },
+    assemblyCode: {
+      title: "小总成号",
+      type: "string",
+    },
+    injectionCode: {
+      title: "注塑码",
+      type: "string",
+    },
+    beginDate: {
+      title: "订单时间",
+      type: "DateTime",
+    },
+  },
+};
+
+const queryUrl = "settleaccount/pub_se_detail_service/get-list";
+const exportUrl = "settleaccount/pub_se_detail_service/export";
+const queryMethod = "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: {
+      exportUrl,
+      exportMethod,
+      schema: schema,
+    },
+  };
+}

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

@@ -79,10 +79,8 @@ export default function () {
       schema: schema,
     },
     edit: {
-      queryUrl,
       importUrl,
       exportUrl,
-      queryMethod,
       importMethod,
       exportMethod,
       schema: schema,

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

@@ -6,6 +6,7 @@ const schema = {
       title: "角色名",
       type: "string",
       showForList: true,
+      readOnly: true,
       rules: [
         {
           required: true,
@@ -19,20 +20,22 @@ const schema = {
   },
 };
 
-const queryUrl = "identity/roles";
+const queryUrl = "role/get-list";
-const deletetUrl = "identity/roles/{id}";
+const detailsUrl = "role/details/%s";
-const updateUrl = "identity/roles/{id}";
+const deleteUrl = "role/delete/%s";
-const createUrl = "identity/roles/{id}";
+const updateUrl = "role/update/%s";
+const createUrl = "role/create";
 const queryMethod = "GET";
-const deletetMethod = "DELETE";
+const detailsMethod = "GET";
+const deleteMethod = "DELETE";
 const updateMethod = "PUT";
-const createMethod = "GET";
+const createMethod = "POST";
 
 export default function () {
   return {
     query: {
-      url: "identity/roles",
+      url: queryUrl,
-      method: "GET",
+      method: queryMethod,
       schema: {
         title: "用户",
         type: "object",
@@ -56,12 +59,12 @@ export default function () {
       schema: schema,
     },
     edit: {
-      queryUrl,
+      detailsUrl,
-      deletetUrl,
+      deleteUrl,
       updateUrl,
       createUrl,
-      queryMethod,
+      detailsMethod,
-      deletetMethod,
+      deleteMethod,
       updateMethod,
       createMethod,
       schema: schema,

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

@@ -11,4 +11,4 @@ const state2 = Object.assign(Object.assign({}, state), { options: options.filter
 const state3 = Object.assign(Object.assign({}, state), { options: options.filter((a) => a.value > 3) });
 
 export default state;
-export { state2, state3 };
+export { state2, state3 };

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

@@ -87,10 +87,8 @@ export default function () {
       schema: schema,
     },
     edit: {
-      queryUrl,
       importUrl,
       exportUrl,
-      queryMethod,
       importMethod,
       exportMethod,
       schema: schema,

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

@@ -69,7 +69,8 @@ const schema = {
       type: "array",
       input: "select",
       multiple: true,
-      url: "identity/roles/all",
+      url: "role/get-all",
+      method: "get",
       value: "name",
       label: "name",
       items: {
@@ -84,7 +85,7 @@ const queryUrl = `${baseUrl}`;
 const detailsUrl = `${baseUrl}/%s`;
 const createUrl = `${baseUrl}`;
 const updateUrl = `${baseUrl}/%s`;
-const deleteUrl = "identity/users/%s";
+const deleteUrl = `${baseUrl}/%s`;
 const queryMethod = "GET";
 const detailsMethod = "GET";
 const createMethod = "POST";

code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/router/base-data.js

@@ -86,17 +86,18 @@ export default [
               isTop: true,
             },
           },
-          {
+          // {
-            path: "update",
+          //   path: "update",
-            meta: {
+          //   meta: {
-              type: "button",
+          //     type: "button",
-              title: "编辑",
+          //     title: "编辑",
-              icon: "file",
+          //     icon: "file",
-              htmlClass: "el-button--primary",
+          //     htmlClass: "el-button--primary",
-              permission: "AbpIdentity.Users.Update",
+          //     permission: "AbpIdentity.Users.Update",
-              disabled: `(o) => o.isStatic`,
+          //     disabled: `(o) => o.isStatic`,
-            },
+             
-          },
+          //   },
+          // },
           {
             path: "delete",
             meta: {

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

@@ -259,6 +259,15 @@ export default [
                   isTop: true,
                 },
               },
+              {
+                path: "update-data",
+                meta: {
+                  type: "button",
+                  title: "更新结算数据状态",
+                  icon: "file",
+                  isTop: true,
+                },
+              },
               {
                 path: "export",
                 meta: {
@@ -375,7 +384,7 @@ export default [
             path: "bbac_can_sa_service",
             meta: {
               type: "page",
-              title: "BBAC发票分组号",
+              title: "可结算单",
               icon: "file",
             },
             children: [
@@ -869,6 +878,15 @@ export default [
                   isTop: true,
                 },
               },
+              {
+                path: "update-data",
+                meta: {
+                  type: "button",
+                  title: "更新结算数据状态",
+                  icon: "file",
+                  isTop: true,
+                },
+              },
               {
                 path: "export",
                 meta: {
@@ -1359,6 +1377,15 @@ export default [
                   isTop: true,
                 },
               },
+              {
+                path: "update-data",
+                meta: {
+                  type: "button",
+                  title: "更新结算数据状态",
+                  icon: "file",
+                  isTop: true,
+                },
+              },
               {
                 path: "export",
                 meta: {
@@ -1829,6 +1856,15 @@ export default [
                   isTop: true,
                 },
               },
+              {
+                path: "update-data",
+                meta: {
+                  type: "button",
+                  title: "更新结算数据状态",
+                  icon: "file",
+                  isTop: true,
+                },
+              },
               {
                 path: "export",
                 meta: {
@@ -2299,6 +2335,15 @@ export default [
                   isTop: true,
                 },
               },
+              {
+                path: "update-data",
+                meta: {
+                  type: "button",
+                  title: "更新结算数据状态",
+                  icon: "file",
+                  isTop: true,
+                },
+              },
               {
                 path: "export",
                 meta: {
@@ -2593,7 +2638,7 @@ export default [
     },
     children: [
       {
-        path: "invoice_service",
+        path: "invoice_map_group",
         meta: {
           type: "page",
           title: "财务审核",
@@ -2648,6 +2693,14 @@ export default [
               pattern: "paged",
             },
           },
+          {
+            path: "reopen",
+            meta: {
+              type: "button",
+              title: "重开",
+              icon: "file",
+            },
+          },
         ],
       },
       {
@@ -2671,10 +2724,10 @@ export default [
         ],
       },
       {
-        path: "invoice_map_group",
+        path: "invoice_grp",
         meta: {
           type: "page",
-          title: "发票和结算分组对应关系表",
+          title: "发票分组",
           icon: "file",
           isHidden: true,
         },
@@ -2719,6 +2772,7 @@ export default [
       type: "group",
       title: "实际采购成本",
       icon: "folder",
+      isHidden: true,
     },
     children: [
       {
@@ -2727,6 +2781,7 @@ export default [
           type: "page",
           title: "实际采购成本",
           icon: "file",
+          isHidden: true,
         },
         children: [
           {
@@ -2813,7 +2868,7 @@ export default [
         path: "record",
         meta: {
           type: "page",
-          title: "库存事务查询",
+          title: "库存事物查询",
           icon: "file",
         },
         children: [
@@ -2836,6 +2891,16 @@ export default [
               pattern: "paged",
             },
           },
+          {
+            path: "data-export",
+            meta: {
+              type: "button",
+              title: "补货数据导出",
+              icon: "file",
+              isTop: true,
+              pattern: "paged",
+            },
+          },
         ],
       },
       {

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

@@ -7,7 +7,7 @@ export default {
   template: html`<app-list :config="config" @command="onCommand" />`,
   setup() {
     const config = useConfig();
-    config.query.schema.title = "发运与结算对比";
+    config.query.schema.title = "发运与结算";
     const onCommand = async (item, rows) => {
       console.log(item.path, item, rows);
     };

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

@@ -7,7 +7,7 @@ export default {
   template: html`<app-list :config="config" @command="onCommand" />`,
   setup() {
     const config = useConfig();
-    config.query.schema.title = "发运与结算二次对比";
+    config.query.schema.title = "发运与结算二次";
     const onCommand = async (item, rows) => {
       console.log(item.path, item, rows);
     };

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

@@ -1,7 +1,6 @@
 import AppList from "../../../components/list/index.js";
 import html from "html";
-import useConfig from "../../../models/bj/input/bj_pub_sa_detail_service.js";
+import useConfig from "../../../models/pub_sa_detail_service.js";
-
 export default {
   components: { AppList },
   template: html`<app-list :config="config" @command="onCommand" />`,

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

@@ -1,6 +1,6 @@
 import AppList from "../../../components/list/index.js";
 import html from "html";
-import useConfig from "../../../models/bj/input/bj_pub_sa_service.js";
+import useConfig from "../../../models/pub_sa_service.js";
 
 export default {
   components: { AppList },

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

@@ -1,6 +1,6 @@
 import AppList from "../../../components/list/index.js";
 import html from "html";
-import useConfig from "../../../models/bj/input/bj_pub_se_detail_service.js";
+import useConfig from "../../../models/pub_se_detail_service.js";
 
 export default {
   components: { AppList },

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

@@ -1,6 +1,6 @@
 import AppList from "../../../components/list/index.js";
 import html from "html";
-import useConfig from "../../../models/bj/settlement/bj_pub_ba_detail_service.js";
+import useConfig from "../../../models/pub_ba_detail_service.js";
 
 export default {
   components: { AppList },

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

@@ -1,6 +1,6 @@
 import AppList from "../../../components/list/index.js";
 import html from "html";
-import useConfig from "../../../models/bj/settlement/bj_pub_ba_service.js";
+import useConfig from "../../../models/pub_ba_service.js";
 
 export default {
   components: { AppList },

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

@@ -1,6 +1,6 @@
 import AppList from "../../../components/list/index.js";
 import html from "html";
-import useConfig from "../../../models/bj/settlement/bj_pub_can_detail_service.js";
+import useConfig from "../../../models/pub_can_sa_detail_service.js";
 
 export default {
   components: { AppList },

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

@@ -1,12 +1,13 @@
 import AppList from "../../../components/list/index.js";
 import html from "html";
-import useConfig from "../../../models/bj/settlement/bj_pub_can_sa_service.js";
+import useConfig from "../../../models/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);
     };

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

@@ -1,6 +1,6 @@
 import AppList from "../../../components/list/index.js";
 import html from "html";
-import useConfig from "../../../models/bj/settlement/bj_pub_not_sa_service.js";
+import useConfig from "../../../models/pub_not_sa_service.js";
 
 export default {
   components: { AppList },

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

@@ -1,6 +1,6 @@
 import AppList from "../../../components/list/index.js";
 import html from "html";
-import useConfig from "../../../models/bj/settlement/bj_pub_pd_detail_service.js";
+import useConfig from "../../../models/pub_pd_detail_service.js";
 
 export default {
   components: { AppList },

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

@@ -1,6 +1,6 @@
 import AppList from "../../../components/list/index.js";
 import html from "html";
-import useConfig from "../../../models/bj/settlement/bj_pub_pd_service.js";
+import useConfig from "../../../models/pub_pd_service.js";
 
 export default {
   components: { AppList },

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

@@ -7,7 +7,7 @@ export default {
   template: html`<app-list :config="config" @command="onCommand" />`,
   setup() {
     const config = useConfig();
-    config.query.schema.title = "发运与结算对比";
+    config.query.schema.title = "发运与结算";
     const onCommand = async (item, rows) => {
       console.log(item.path, item, rows);
     };

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

@@ -7,7 +7,7 @@ export default {
   template: html`<app-list :config="config" @command="onCommand" />`,
   setup() {
     const config = useConfig();
-    config.query.schema.title = "发运与结算二次对比";
+    config.query.schema.title = "发运与结算二次";
     const onCommand = async (item, rows) => {
       console.log(item.path, item, rows);
     };

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

@@ -1,6 +1,6 @@
 import AppList from "../../../components/list/index.js";
 import html from "html";
-import useConfig from "../../../models/in/input/in_pub_sa_detail_service.js";
+import useConfig from "../../../models/pub_sa_detail_service.js";
 
 export default {
   components: { AppList },

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

@@ -1,6 +1,6 @@
 import AppList from "../../../components/list/index.js";
 import html from "html";
-import useConfig from "../../../models/in/input/in_pub_sa_service.js";
+import useConfig from "../../../models/pub_sa_service.js";
 
 export default {
   components: { AppList },

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

@@ -1,6 +1,6 @@
 import AppList from "../../../components/list/index.js";
 import html from "html";
-import useConfig from "../../../models/in/input/in_pub_se_detail_service.js";
+import useConfig from "../../../models/pub_se_detail_service.js";
 
 export default {
   components: { AppList },

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

@@ -1,6 +1,6 @@
 import AppList from "../../../components/list/index.js";
 import html from "html";
-import useConfig from "../../../models/in/settlement/in_pub_ba_detail_service.js";
+import useConfig from "../../../models/pub_ba_detail_service.js";
 
 export default {
   components: { AppList },

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

@@ -1,6 +1,6 @@
 import AppList from "../../../components/list/index.js";
 import html from "html";
-import useConfig from "../../../models/in/settlement/in_pub_ba_service.js";
+import useConfig from "../../../models/pub_ba_service.js";
 
 export default {
   components: { AppList },

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

@@ -1,6 +1,6 @@
 import AppList from "../../../components/list/index";
 import html from "html";
-import useConfig from "../../../models/in/settlement/in_pub_can_sa_detail_service.js";
+import useConfig from "../../../models/pub_can_sa_detail_service.js";
 
 export default {
   components: { AppList },

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

@@ -1,6 +1,6 @@
 import AppList from "../../../components/list/index.js";
 import html from "html";
-import useConfig from "../../../models/in/settlement/in_pub_can_sa_service.js";
+import useConfig from "../../../models/pub_can_sa_service.js";
 
 export default {
   components: { AppList },

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

@@ -1,6 +1,6 @@
 import AppList from "../../../components/list/index.js";
 import html from "html";
-import useConfig from "../../../models/in/settlement/in_pub_not_sa_service.js";
+import useConfig from "../../../models/pub_not_sa_service.js";
 
 export default {
   components: { AppList },

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

@@ -1,6 +1,6 @@
 import AppList from "../../../components/list/index.js";
 import html from "html";
-import useConfig from "../../../models/in/settlement/in_pub_pd_detail_service.js";
+import useConfig from "../../../models/pub_pd_detail_service.js";
 
 export default {
   components: { AppList },

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

@@ -1,6 +1,6 @@
 import AppList from "../../../components/list/index.js";
 import html from "html";
-import useConfig from "../../../models/in/settlement/in_pub_pd_service.js";
+import useConfig from "../../../models/pub_pd_service.js";
 
 export default {
   components: { AppList },

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

@@ -1,13 +1,13 @@
 import AppList from "../../../components/list/index.js";
 import html from "html";
-import useConfig from "../../../models/job-service.js";
+import useConfig from "../../../models/bbac-edi-se-compare.js";
 
 export default {
   components: { AppList },
   template: html`<app-list :config="config" @command="onCommand" />`,
   setup() {
     const config = useConfig();
-    config.query.schema.title = "EDI与发运数据对比";
+    config.query.schema.title = "EDI与发运数据";
     const onCommand = async (item, rows) => {
       console.log(item.path, item, rows);
     };

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

@@ -7,7 +7,7 @@ export default {
   template: html`<app-list :config="config" @command="onCommand" />`,
   setup() {
     const config = useConfig();
-    config.query.schema.title = "EDI、发运与结算对比";
+    config.query.schema.title = "EDI、发运与结算";
     const onCommand = async (item, rows) => {
       console.log(item.path, item, rows);
     };

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

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

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

@@ -7,7 +7,7 @@ export default {
   template: html`<app-list :config="config" @command="onCommand" />`,
   setup() {
     const config = useConfig();
-    config.query.schema.title = "买单件发运与结算数据三次对比";
+    config.query.schema.title = "买单件发运与结算数据三次";
     const onCommand = async (item, rows) => {
       console.log(item.path, item, rows);
     };

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

@@ -7,7 +7,7 @@ export default {
   template: html`<app-list :config="config" @command="onCommand" />`,
   setup() {
     const config = useConfig();
-    config.query.schema.title = "EDI、发运与结算对比";
+    config.query.schema.title = "EDI、发运与结算";
     const onCommand = async (item, rows) => {
       console.log(item.path, item, rows);
     };

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

@@ -1,13 +1,13 @@
 import AppList from "../../../components/list/index.js";
 import html from "html";
-import useConfig from "../../../models/job-service.js";
+import useConfig from "../../../models/hbpo-edi-se-compare.js";
 
 export default {
   components: { AppList },
   template: html`<app-list :config="config" @command="onCommand" />`,
   setup() {
     const config = useConfig();
-    config.query.schema.title = "EDI与发运数据对比";
+    config.query.schema.title = "EDI与发运数据";
     const onCommand = async (item, rows) => {
       console.log(item.path, item, rows);
     };

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

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

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

@@ -7,7 +7,7 @@ export default {
   template: html`<app-list :config="config" @command="onCommand" />`,
   setup() {
     const config = useConfig();
-    config.query.schema.title = "发运与结算对比";
+    config.query.schema.title = "发运与结算";
     const onCommand = async (item, rows) => {
       console.log(item.path, item, rows);
     };

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

@@ -7,7 +7,7 @@ export default {
   template: html`<app-list :config="config" @command="onCommand" />`,
   setup() {
     const config = useConfig();
-    config.query.schema.title = "发运与结算二次对比";
+    config.query.schema.title = "发运与结算二次";
     const onCommand = async (item, rows) => {
       console.log(item.path, item, rows);
     };

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

@@ -1,6 +1,6 @@
 import AppList from "../../../components/list/index.js";
 import html from "html";
-import useConfig from "../../../models/jit/input/jit_jit_pub_sa_service.js";
+import useConfig from "../../../models/pub_sa_service.js";
 
 export default {
   components: { AppList },

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

@@ -1,6 +1,6 @@
 import AppList from "../../../components/list/index.js";
 import html from "html";
-import useConfig from "../../../models/jit/input/jit_pub_sa_service.js";
+import useConfig from "../../../models/pub_sa_detail_service.js";
 
 export default {
   components: { AppList },

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

@@ -1,6 +1,6 @@
 import AppList from "../../../components/list/index.js";
 import html from "html";
-import useConfig from "../../../models/jit/input/jit_pub_se_detail_service.js";
+import useConfig from "../../../models/pub_se_detail_service.js";
 
 export default {
   components: { AppList },

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

@@ -1,6 +1,6 @@
 import AppList from "../../../components/list/index.js";
 import html from "html";
-import useConfig from "../../../models/jit/settlement/jit_pub_ba_detail_service";
+import useConfig from "../../../models/pub_ba_detail_service";
 
 export default {
   components: { AppList },

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

@@ -1,6 +1,6 @@
 import AppList from "../../../components/list/index.js";
 import html from "html";
-import useConfig from "../../../models/jit/settlement/jit_pub_ba_service.js";
+import useConfig from "../../../models/pub_ba_service.js";
 
 export default {
   components: { AppList },

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

@@ -1,6 +1,6 @@
 import AppList from "../../../components/list/index.js";
 import html from "html";
-import useConfig from "../../../models/jit/settlement/jit_pub_can_sa_detail_service";
+import useConfig from "../../../models/pub_can_sa_detail_service.js";
 
 export default {
   components: { AppList },

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

@@ -1,6 +1,6 @@
 import AppList from "../../../components/list/index.js";
 import html from "html";
-import useConfig from "../../../models/jit/settlement/jit_pub_can_sa_service.js";
+import useConfig from "../../../models/pub_can_sa_service.js";
 
 export default {
   components: { AppList },

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

@@ -1,6 +1,6 @@
 import AppList from "../../../components/list/index.js";
 import html from "html";
-import useConfig from "../../../models/jit/settlement/jit_pub_not_sa_service.js";
+import useConfig from "../../../models/pub_not_sa_service.js";
 
 export default {
   components: { AppList },