增加role

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

@@ -1,7 +1,10 @@
+import version from "../../version.js";
+
 const schema = {
   title: "JIS结算数据",
   type: "object",
   properties: {
+    version,
     project: {
       title: "项目",
       type: "string",
@@ -89,8 +92,8 @@ export default function () {
             default: [
               {
                 logic: "and",
-                column: "project",
+                column: "version",
-                action: "like",
+                action: "equal",
                 value: null,
                 readOnly: true,
               },

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

@@ -1,11 +1,10 @@
+import version from "../../version.js";
+
 const schema = {
   title: "JIS发运数据",
   type: "object",
   properties: {
-    version: {
+    version,
-      title: "版本",
-      type: "string",
-    },
     shippingDate: {
       title: "发货时间",
       type: "string",
@@ -96,7 +95,7 @@ export default function () {
               {
                 logic: "and",
                 column: "version",
-                action: "like",
+                action: "equal",
                 value: null,
                 readOnly: true,
               },

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

@@ -1,19 +1,20 @@
+import version from "../../version.js";
+import { state2, state3 } from "../../state.js";
+
 const schema = {
-  title: "可结算单明细",
+  title: "商务审批",
   type: "object",
   properties: {
     settleBillNum: {
       title: "关联结算单号",
-      type: "int",
+      type: "string",
     },
     site: {
       title: "工厂地点",
       type: "string",
     },
-    version: {
+    version,
-      title: "版本",
+    state2,
-      type: "int",
-    },
     price: {
       title: "单价",
       type: "decimal",
@@ -22,22 +23,19 @@ const schema = {
       title: "结算单号",
       type: "string",
     },
+
     settleDate: {
       title: "结算日期",
       type: "DateTime",
     },
-    settleInvGroupNumDate: {
+    invGroupNum: {
-      title: "发票组号",
+      title: "发票分组号",
       type: "string",
     },
     lu: {
       title: "零件号",
       type: "string",
     },
-    materialDesc: {
-      title: "物料描述",
-      type: "string",
-    },
     pn: {
       title: "生产号",
       type: "string",
@@ -46,18 +44,20 @@ const schema = {
       title: "结算数量",
       type: "decimal",
     },
-    groupNumy: {
+    groupNum: {
       title: "结算分组号",
       type: "string",
     },
   },
 };
 
-const baseUrl = "settleaccount/hbpo_can_sa_detail_service";
+const baseUrl = "settleaccount/bbac_ba_service";
-const queryUrl = `${baseUrl}/get-list`;
+const queryUrl = `${baseUrl}/main-query`;
 const detailsUrl = `${baseUrl}/get/%s`;
+const exportUrl = `${baseUrl}/export`;
 const queryMethod = "POST";
 const detailsMethod = "POST";
+const exportMethod = "POST";
 
 export default function () {
   return {
@@ -66,7 +66,7 @@ export default function () {
       method: queryMethod,
       hasFilter: true,
       schema: {
-        title: "发票分组号明细",
+        title: "商务审批",
         type: "object",
         properties: {
           filters: {
@@ -93,8 +93,8 @@ export default function () {
             default: [
               {
                 logic: "and",
-                column: "billNum",
+                column: "version",
-                action: "like",
+                action: "equal",
                 value: null,
                 readOnly: true,
               },
@@ -119,7 +119,9 @@ export default function () {
     },
     edit: {
       detailsUrl,
+      exportUrl,
       detailsMethod,
+      exportMethod,
       schema: schema,
     },
   };

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

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

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

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

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

@@ -1,7 +1,10 @@
+import version from "../../version";
+
 const schema = {
   title: "JIS结算数据",
   type: "object",
   properties: {
+    version,
     project: {
       title: "项目",
       type: "string",
@@ -89,8 +92,8 @@ export default function () {
             default: [
               {
                 logic: "and",
-                column: "project",
+                column: "version",
-                action: "like",
+                action: "equal",
                 value: null,
                 readOnly: true,
               },

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

@@ -1,11 +1,10 @@
+import version from "../../version.js";
+
 const schema = {
   title: "JIS发运数据",
   type: "object",
   properties: {
-    version: {
+    version,
-      title: "版本",
-      type: "string",
-    },
     shippingDate: {
       title: "发货时间",
       type: "string",
@@ -96,7 +95,7 @@ export default function () {
               {
                 logic: "and",
                 column: "version",
-                action: "like",
+                action: "equal",
                 value: null,
                 readOnly: true,
               },

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

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

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

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

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

@@ -39,21 +39,8 @@ const schema = {
   },
 };
 
-const baseUrl = "settleaccount/code-setting";
 const queryUrl = `${baseUrl}/get-list`;
-const detailsUrl = `${baseUrl}/get/%s`;
-const createUrl = `${baseUrl}/create`;
-const updateUrl = `${baseUrl}/update/%s`;
-const deleteUrl = `${baseUrl}/delete-list`;
-const importUrl = `${baseUrl}/code-setting-upload-excel-import`;
-const exportUrl = `${baseUrl}/export`;
 const queryMethod = "POST";
-const detailsMethod = "POST";
-const createMethod = "POST";
-const updateMethod = "POST";
-const deleteMethod = "POST";
-const importMethod = "POST";
-const exportMethod = "POST";
 
 export default function () {
   return {

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

@@ -33,19 +33,16 @@ const schema = {
   },
 };
 
-const baseUrl = "settleaccount/invoice_service";
+const queryUrl = "settleaccount/invoice_service/main-query";
-const queryUrl = `${baseUrl}/get-list`;
+const exportUrl = "settleaccount/invoice_service/export";
-const detailsUrl = `${baseUrl}/get/%s`;
+const rejectUrl = "settleaccount/invoice_service/reject";
-const createUrl = `${baseUrl}/create`;
+const passedUrl = "settleaccount/invoice_service/approval-passed";
-const updateUrl = `${baseUrl}/update/%s`;
+const sync_qadUrl = "settleaccount/invoice_service/sync_qad";
-const deleteUrl = `${baseUrl}/delete-list`;
-const exportUrl = `${baseUrl}/export`;
 const queryMethod = "POST";
-const detailsMethod = "POST";
-const createMethod = "POST";
-const updateMethod = "POST";
-const deleteMethod = "POST";
 const exportMethod = "POST";
+const rejectMethod = "POST";
+const passedMethod = "POST";
+const sync_qadMethod = "POST";
 
 export default function () {
   return {
@@ -106,16 +103,14 @@ export default function () {
       schema: schema,
     },
     edit: {
-      detailsUrl,
-      createUrl,
-      updateUrl,
-      deleteUrl,
       exportUrl,
-      detailsMethod,
+      rejectUrl,
-      createMethod,
+      passedUrl,
-      updateMethod,
+      sync_qadUrl,
-      deleteMethod,
       exportMethod,
+      rejectMethod,
+      passedMethod,
+      sync_qadMethod,
       schema: schema,
     },
   };

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

@@ -1,7 +1,10 @@
+import version from "../../version.js";
+
 const schema = {
   title: "JIS结算数据",
   type: "object",
   properties: {
+    version,
     project: {
       title: "项目",
       type: "string",
@@ -89,8 +92,8 @@ export default function () {
             default: [
               {
                 logic: "and",
-                column: "project",
+                column: "version",
-                action: "like",
+                action: "equal",
                 value: null,
                 readOnly: true,
               },

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

@@ -1,11 +1,10 @@
+import version from "../../version.js";
+
 const schema = {
   title: "JIS发运数据",
   type: "object",
   properties: {
-    version: {
+    version,
-      title: "版本",
-      type: "string",
-    },
     shippingDate: {
       title: "发货时间",
       type: "string",
@@ -54,11 +53,11 @@ const schema = {
 const baseUrl = "settleaccount/bbac_se_detail_service";
 const queryUrl = `${baseUrl}/get-list`;
 // const deleteUrl = `${baseUrl}/delete-list`;
-const importUrl = `${baseUrl}/import`;
+// const importUrl = `${baseUrl}/import`;
 const exportUrl = `${baseUrl}/export`;
 const queryMethod = "POST";
 // const deleteMethod = "POST";
-const importMethod = "POST";
+// const importMethod = "POST";
 const exportMethod = "POST";
 
 export default function () {
@@ -96,7 +95,7 @@ export default function () {
               {
                 logic: "and",
                 column: "version",
-                action: "like",
+                action: "equal",
                 value: null,
                 readOnly: true,
               },
@@ -121,10 +120,10 @@ export default function () {
     },
     edit: {
       // deleteUrl,
-      importUrl,
+      // importUrl,
       exportUrl,
       // deleteMethod,
-      importMethod,
+      // importMethod,
       exportMethod,
       schema: schema,
     },

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

@@ -1,3 +1,5 @@
+import version from "../../version.js";
+
 const schema = {
   title: "EDI数据",
   type: "object",
@@ -6,10 +8,7 @@ const schema = {
       title: "LU+生产码",
       type: "string",
     },
-    version: {
+    version,
-      title: "期间",
-      type: "string",
-    },
     lu: {
       title: "零件号",
       type: "string",
@@ -49,18 +48,8 @@ const schema = {
 
 const baseUrl = "settleaccount/bbac_se_edi_service";
 const queryUrl = `${baseUrl}/get-list`;
-const detailsUrl = `${baseUrl}/get/%s`;
-const createUrl = `${baseUrl}/create`;
-const updateUrl = `${baseUrl}/update/%s`;
-const deleteUrl = `${baseUrl}/delete-list`;
-const importUrl = `${baseUrl}/code-setting-upload-excel-import`;
 const exportUrl = `${baseUrl}/export`;
 const queryMethod = "POST";
-const detailsMethod = "POST";
-const createMethod = "POST";
-const updateMethod = "POST";
-const deleteMethod = "POST";
-const importMethod = "POST";
 const exportMethod = "POST";
 
 export default function () {
@@ -98,7 +87,7 @@ export default function () {
               {
                 logic: "and",
                 column: "version",
-                action: "like",
+                action: "equal",
                 value: null,
                 readOnly: true,
               },
@@ -122,17 +111,7 @@ 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/settlement/bbac_ba_detail_service.js

@@ -0,0 +1,121 @@
+import version from "../../version.js";
+import { state2, state3 } from "../../state.js";
+
+const schema = {
+  title: "商务审批",
+  type: "object",
+  properties: {
+    settleBillNum: {
+      title: "关联结算单号",
+      type: "string",
+    },
+    site: {
+      title: "工厂地点",
+      type: "string",
+    },
+    version,
+    state2,
+    price: {
+      title: "单价",
+      type: "decimal",
+    },
+    billNum: {
+      title: "结算单号",
+      type: "string",
+    },
+
+    settleDate: {
+      title: "结算日期",
+      type: "DateTime",
+    },
+    invGroupNum: {
+      title: "发票分组号",
+      type: "string",
+    },
+    lu: {
+      title: "零件号",
+      type: "string",
+    },
+    pn: {
+      title: "生产号",
+      type: "string",
+    },
+    qty: {
+      title: "结算数量",
+      type: "decimal",
+    },
+    groupNum: {
+      title: "结算分组号",
+      type: "string",
+    },
+  },
+};
+
+const queryUrl = "settleaccount/b-bAC_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: {
+        queryUrl,
+      queryMethod,
+      schema: schema,
+    },
+  };
+}

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

@@ -51,13 +51,16 @@ const schema = {
   },
 };
 
-const baseUrl = "settleaccount/bbac_ba_service";
+const queryUrl = "settleaccount/b-bAC_BA_SERVICE/main-query";
-const queryUrl = `${baseUrl}/main-query`;
+const exportUrl = "settleaccount/b-bAC_BA_SERVICE/export";
-const detailsUrl = `${baseUrl}/get/%s`;
+const invoiceUrl = "settleaccount/b-bAC_BA_SERVICE/generate-invoice";
-const exportUrl = `${baseUrl}/export`;
+const rejectUrl = "settleaccount/b-bAC_BA_SERVICE/reject";
+const receivedUrl = "/api/settleaccount/h-bPO_BA_SERVICE/received";
 const queryMethod = "POST";
-const detailsMethod = "POST";
 const exportMethod = "POST";
+const invoiceMethod = "POST";
+const rejectMethod = "POST";
+const receivedMethod = "POST";
 
 export default function () {
   return {
@@ -118,10 +121,14 @@ export default function () {
       schema: schema,
     },
     edit: {
-      detailsUrl,
       exportUrl,
-      detailsMethod,
+      invoiceUrl,
+      rejectUrl,
+      receivedUrl,
       exportMethod,
+      invoiceMethod,
+      rejectMethod,
+      receivedMethod,
       schema: schema,
     },
   };

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

@@ -22,13 +22,12 @@ const schema = {
   },
 };
 
-const baseUrl = "settleaccount/bbac_can_sa_service";
+const queryUrl = "settleaccount/bbac_can_sa_service/main-query";
-const queryUrl = `${baseUrl}/main-query`;
+const exportUrl = "settleaccount/bbac_can_sa_service/export";
-const detailsUrl = `${baseUrl}/get/%s`;
+const invoiceUrl = "settleaccount/bbac_can_sa_service/generate-invoice";
-const exportUrl = `${baseUrl}/export`;
 const queryMethod = "POST";
-const detailsMethod = "POST";
 const exportMethod = "POST";
+const invoiceMethod = "POST";
 
 export default function () {
   return {
@@ -89,11 +88,10 @@ export default function () {
       schema: schema,
     },
     edit: {
-      detailsUrl,
       exportUrl,
-      detailsMethod,
+      invoiceUrl,
       exportMethod,
-
+      invoiceMethod,
       schema: schema,
     },
   };

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

@@ -51,11 +51,11 @@ const schema = {
 
 const baseUrl = "settleaccount/bbac_not_sa_service";
 const queryUrl = `${baseUrl}/detail-query`;
-const detailsUrl = `${baseUrl}/get/%s`;
 const exportUrl = `${baseUrl}/export`;
+const settlementUrl="settleaccount/bbac_not_sa_service/generate-settlement-order";
 const queryMethod = "POST";
-const detailsMethod = "POST";
 const exportMethod = "POST";
+const settlementMethod = "POST";
 
 export default function () {
   return {
@@ -116,10 +116,10 @@ export default function () {
       schema: schema,
     },
     edit: {
-      detailsUrl,
       exportUrl,
-      detailsMethod,
+      settlementUrl,
       exportMethod,
+      settlementMethod,
       schema: schema,
     },
   };

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

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

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

@@ -26,13 +26,14 @@ const schema = {
   },
 };
 
-const baseUrl = "settleaccount/bbac_pd_service";
+const queryUrl = "settleaccount/b-bAC_PD_SERVICE/main-query";
-const queryUrl = `${baseUrl}/main-query`;
+const exportUrl = "settleaccount/b-bAC_PD_SERVICE/export";
-const detailsUrl = `${baseUrl}/get/%s`;
+const rejectUrl = "settleaccount/b-bAC_PD_SERVICE/reject";
-const exportUrl = `${baseUrl}/export`;
+const passedUrl = "settleaccount/b-bAC_PD_SERVICE/approval-passed"
 const queryMethod = "POST";
-const detailsMethod = "POST";
 const exportMethod = "POST";
+const rejectMethod = "POST";
+const passedMethod = "POST";
 
 export default function () {
   return {
@@ -93,10 +94,12 @@ export default function () {
       schema: schema,
     },
     edit: {
-      detailsUrl,
       exportUrl,
-      detailsMethod,
+      rejectUrl,
+      passedUrl,
       exportMethod,
+      rejectMethod,
+      passedMethod,
       schema: schema,
     },
   };

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

@@ -1,7 +1,10 @@
+import version from "../../version.js";
+
 const schema = {
   title: "JIS结算数据",
   type: "object",
   properties: {
+    version,
     project: {
       title: "项目",
       type: "string",
@@ -89,8 +92,8 @@ export default function () {
             default: [
               {
                 logic: "and",
-                column: "project",
+                column: "version",
-                action: "like",
+                action: "equal",
                 value: null,
                 readOnly: true,
               },

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

@@ -1,11 +1,10 @@
+import version from "../../version.js";
+
 const schema = {
   title: "JIS发运数据",
   type: "object",
   properties: {
-    version: {
+    version,
-      title: "版本",
-      type: "string",
-    },
     shippingDate: {
       title: "发货时间",
       type: "string",
@@ -53,12 +52,8 @@ const schema = {
 
 const baseUrl = "settleaccount/hbpo_se_detail_service";
 const queryUrl = `${baseUrl}/get-list`;
-// const deleteUrl = `${baseUrl}/delete-list`;
-const importUrl = `${baseUrl}/import`;
 const exportUrl = `${baseUrl}/export`;
 const queryMethod = "POST";
-// const deleteMethod = "POST";
-const importMethod = "POST";
 const exportMethod = "POST";
 
 export default function () {
@@ -96,7 +91,7 @@ export default function () {
               {
                 logic: "and",
                 column: "version",
-                action: "like",
+                action: "equal",
                 value: null,
                 readOnly: true,
               },
@@ -120,11 +115,8 @@ export default function () {
       schema: schema,
     },
     edit: {
-      // deleteUrl,
       importUrl,
       exportUrl,
-      // deleteMethod,
-      importMethod,
       exportMethod,
       schema: schema,
     },

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

@@ -1,3 +1,5 @@
+import version from "../../version.js";
+
 const schema = {
   title: "EDI数据",
   type: "object",
@@ -6,10 +8,7 @@ const schema = {
       title: "LU+生产码",
       type: "string",
     },
-    version: {
+    version,
-      title: "期间",
-      type: "string",
-    },
     lu: {
       title: "零件号",
       type: "string",
@@ -49,18 +48,8 @@ const schema = {
 
 const baseUrl = "settleaccount/code-setting";
 const queryUrl = `${baseUrl}/get-list`;
-const detailsUrl = `${baseUrl}/get/%s`;
-const createUrl = `${baseUrl}/create`;
-const updateUrl = `${baseUrl}/update/%s`;
-const deleteUrl = `${baseUrl}/delete-list`;
-const importUrl = `${baseUrl}/code-setting-upload-excel-import`;
 const exportUrl = `${baseUrl}/export`;
 const queryMethod = "POST";
-const detailsMethod = "POST";
-const createMethod = "POST";
-const updateMethod = "POST";
-const deleteMethod = "POST";
-const importMethod = "POST";
 const exportMethod = "POST";
 
 export default function () {
@@ -98,7 +87,7 @@ export default function () {
               {
                 logic: "and",
                 column: "version",
-                action: "like",
+                action: "equal",
                 value: null,
                 readOnly: true,
               },
@@ -122,17 +111,7 @@ 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/settlement/hbpo_ba_detail_service.js

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

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

@@ -51,13 +51,17 @@ const schema = {
   },
 };
 
-const baseUrl = "settleaccount/hbpo_ba_service";
+const baseUrl = "settleaccount/h-bPO_BA_SERVICE";
 const queryUrl = `${baseUrl}/main-query`;
 const detailsUrl = `${baseUrl}/get/%s`;
 const exportUrl = `${baseUrl}/export`;
+const invoiceUrl = "settleaccount/h-bPO_BA_SERVICE/generate-invoice";
+const receivedUrl = "settleaccount/h-bPO_BA_SERVICE/received";
 const queryMethod = "POST";
 const detailsMethod = "POST";
 const exportMethod = "POST";
+const invoiceMethod = "POST";
+const receivedMethod = "POST";
 
 export default function () {
   return {
@@ -120,8 +124,12 @@ export default function () {
     edit: {
       detailsUrl,
       exportUrl,
+      invoiceUrl,
+      receivedUrl,
       detailsMethod,
       exportMethod,
+      invoiceMethod,
+      receivedMethod,
       schema: schema,
     },
   };

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

@@ -24,11 +24,12 @@ const schema = {
 
 const baseUrl = "settleaccount/hbpo_can_sa_service";
 const queryUrl = `${baseUrl}/main-query`;
-const detailsUrl = `${baseUrl}/get/%s`;
 const exportUrl = `${baseUrl}/export`;
+const invoiceUrl="settleaccount/hbpo_can_sa_service/generate-invoice";
+
 const queryMethod = "POST";
-const detailsMethod = "POST";
 const exportMethod = "POST";
+const invoiceMethod="POST";
 
 export default function () {
   return {
@@ -89,10 +90,10 @@ export default function () {
       schema: schema,
     },
     edit: {
-      detailsUrl,
       exportUrl,
-      detailsMethod,
+      invoiceUrl,
       exportMethod,
+      invoiceMethod,
       schema: schema,
     },
   };

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

@@ -51,11 +51,11 @@ const schema = {
 
 const baseUrl = "settleaccount/bbac_not_sa_service";
 const queryUrl = `${baseUrl}/main-query`;
-const detailsUrl = `${baseUrl}/get/%s`;
 const exportUrl = `${baseUrl}/export`;
+const settlementUrl = "settleaccount/hbpo_not_sa_service/generate-settlement-order";
 const queryMethod = "POST";
-const detailsMethod = "POST";
 const exportMethod = "POST";
+const settlementMethod = "POST";
 
 export default function () {
   return {
@@ -116,10 +116,10 @@ export default function () {
       schema: schema,
     },
     edit: {
-      detailsUrl,
       exportUrl,
-      detailsMethod,
+      settlementUrl,
       exportMethod,
+      settlementMethod,
       schema: schema,
     },
   };

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

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

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

@@ -26,17 +26,14 @@ const schema = {
   },
 };
 
-const baseUrl = "settleaccount/hbpo_pd_service";
+const queryUrl = "settleaccount/h-bPO_PD_SERVICE/get-list";
-const queryUrl = `${baseUrl}/get-list`;
+const exportUrl = "settleaccount/h-bPO_PD_SERVICE/export";
-const detailsUrl = `${baseUrl}/get/%s`;
+const passedUrl = "settleaccount/h-bPO_PD_SERVICE/approval-passed";
-const createUrl = `${baseUrl}/create`;
+const rejectUrl = "settleaccount/h-bPO_PD_SERVICE/reject";
-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";
+const passedMethod = "POST";
+const rejectMethod="POST";
 
 export default function () {
   return {
@@ -97,10 +94,12 @@ export default function () {
       schema: schema,
     },
     edit: {
-      detailsUrl,
       exportUrl,
-      detailsMethod,
+      passedUrl,
+      rejectUrl,
       exportMethod,
+      passedMethod,
+      rejectMethod,
       schema: schema,
     },
   };

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

@@ -1,7 +1,10 @@
+import version from "../../version.js";
+
 const schema = {
   title: "JIS结算数据",
   type: "object",
   properties: {
+    version,
     project: {
       title: "项目",
       type: "string",
@@ -89,8 +92,8 @@ export default function () {
             default: [
               {
                 logic: "and",
-                column: "project",
+                column: "version",
-                action: "like",
+                action: "equal",
                 value: null,
                 readOnly: true,
               },

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

@@ -1,11 +1,10 @@
+import version from "../../version.js";
+
 const schema = {
   title: "JIS发运数据",
   type: "object",
   properties: {
-    version: {
+    version,
-      title: "版本",
-      type: "string",
-    },
     shippingDate: {
       title: "发货时间",
       type: "string",
@@ -96,7 +95,7 @@ export default function () {
               {
                 logic: "and",
                 column: "version",
-                action: "like",
+                action: "equal",
                 value: null,
                 readOnly: true,
               },

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

@@ -1,19 +1,20 @@
+import version from "../../version.js";
+import { state2, state3 } from "../../state.js";
+
 const schema = {
-  title: "可结算单明细",
+  title: "商务审批",
   type: "object",
   properties: {
     settleBillNum: {
       title: "关联结算单号",
-      type: "int",
+      type: "string",
     },
     site: {
       title: "工厂地点",
       type: "string",
     },
-    version: {
+    version,
-      title: "版本",
+    state2,
-      type: "int",
-    },
     price: {
       title: "单价",
       type: "decimal",
@@ -22,22 +23,19 @@ const schema = {
       title: "结算单号",
       type: "string",
     },
+
     settleDate: {
       title: "结算日期",
       type: "DateTime",
     },
-    settleInvGroupNumDate: {
+    invGroupNum: {
-      title: "发票组号",
+      title: "发票分组号",
       type: "string",
     },
     lu: {
       title: "零件号",
       type: "string",
     },
-    materialDesc: {
-      title: "物料描述",
-      type: "string",
-    },
     pn: {
       title: "生产号",
       type: "string",
@@ -46,18 +44,20 @@ const schema = {
       title: "结算数量",
       type: "decimal",
     },
-    groupNumy: {
+    groupNum: {
       title: "结算分组号",
       type: "string",
     },
   },
 };
 
-const baseUrl = "settleaccount/hbpo_can_sa_detail_service";
+const baseUrl = "settleaccount/bbac_ba_service";
-const queryUrl = `${baseUrl}/get-list`;
+const queryUrl = `${baseUrl}/main-query`;
 const detailsUrl = `${baseUrl}/get/%s`;
+const exportUrl = `${baseUrl}/export`;
 const queryMethod = "POST";
 const detailsMethod = "POST";
+const exportMethod = "POST";
 
 export default function () {
   return {
@@ -66,7 +66,7 @@ export default function () {
       method: queryMethod,
       hasFilter: true,
       schema: {
-        title: "发票分组号明细",
+        title: "商务审批",
         type: "object",
         properties: {
           filters: {
@@ -93,8 +93,8 @@ export default function () {
             default: [
               {
                 logic: "and",
-                column: "billNum",
+                column: "version",
-                action: "like",
+                action: "equal",
                 value: null,
                 readOnly: true,
               },
@@ -119,7 +119,9 @@ export default function () {
     },
     edit: {
       detailsUrl,
+      exportUrl,
       detailsMethod,
+      exportMethod,
       schema: schema,
     },
   };

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

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

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

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

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

@@ -13,7 +13,7 @@ const stateName = {
 };
 
 const schema = {
-  title: "期间设置",
+  title: "数据对比",
   type: "object",
   properties: {
     type: {
@@ -58,7 +58,7 @@ export default function () {
       autoSubmit: true,
       disableQueryOnLoad: true,
       schema: {
-        title: "期间设置",
+        title: "数据对比",
         type: "object",
         properties: {
           type: Object.assign({ defaultSelected: true }, version),

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

@@ -14,9 +14,9 @@ const schema = {
 };
 
 const baseUrl = "settleaccount/purchase_price_service";
-const queryUrl = `${baseUrl}/get-list`;
+const queryUrl = "settleaccount/purchase_price_service/get-list";
-const importUrl = `${baseUrl}/import`;
+const importUrl = "settleaccount/purchase_price_service/import";
-const exportUrl = `${baseUrl}/export`;
+const exportUrl = "settleaccount/purchase_price_service/export";
 const queryMethod = "POST";
 const importMethod = "POST";
 const exportMethod = "POST";

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

@@ -19,6 +19,15 @@ const schema = {
   },
 };
 
+const queryUrl = "identity/roles";
+const deletetUrl = "identity/roles/{id}";
+const updateUrl = "identity/roles/{id}";
+const createUrl = "identity/roles/{id}";
+const queryMethod = "GET";
+const deletetMethod = "DELETE";
+const updateMethod = "PUT";
+const createMethod = "GET";
+
 export default function () {
   return {
     query: {
@@ -46,5 +55,16 @@ export default function () {
     table: {
       schema: schema,
     },
+    edit: {
+      queryUrl,
+      deletetUrl,
+      updateUrl,
+      createUrl,
+      queryMethod,
+      deletetMethod,
+      updateMethod,
+      createMethod,
+      schema: schema,
+    },
   };
 }

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

@@ -64,18 +64,18 @@ const schema = {
         { pattern: "^[a-zA-Z0-9_-]+@[a-zA-Z0-9_-]+.[a-zA-Z0-9_-]+$", message: "%s必须是正确的格式" },
       ],
     },
-    // roleNames: {
+    roleNames: {
-    //   title: "角色",
+      title: "角色",
-    //   type: "array",
+      type: "array",
-    //   input: "select",
+      input: "select",
-    //   multiple: true,
+      multiple: true,
-    //   url: "identity/roles/all",
+      url: "identity/roles/all",
-    //   value: "name",
+      value: "name",
-    //   label: "name",
+      label: "name",
-    //   items: {
+      items: {
-    //     type: "string",
+        type: "string",
-    //   },
+      },
-    // },
+    },
   },
 };
 

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

@@ -67,48 +67,48 @@ export default [
           },
         ],
       },
-      // {
+      {
-      //   path: "role",
+        path: "role",
-      //   meta: {
+        meta: {
-      //     type: "page",
+          type: "page",
-      //     title: "角色管理",
+          title: "角色管理",
-      //     icon: "file",
+          icon: "file",
-      //     permission: "AbpIdentity.Users",
+          permission: "AbpIdentity.Users",
-      //   },
+        },
-      //   children: [
+        children: [
-      //     {
+          {
-      //       path: "create",
+            path: "create",
-      //       meta: {
+            meta: {
-      //         type: "button",
+              type: "button",
-      //         title: "新建",
+              title: "新建",
-      //         icon: "file",
+              icon: "file",
-      //         permission: "AbpIdentity.Users.Create",
+              permission: "AbpIdentity.Users.Create",
-      //         isTop: true,
+              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",
+            path: "delete",
-      //       meta: {
+            meta: {
-      //         type: "button",
+              type: "button",
-      //         title: "删除",
+              title: "删除",
-      //         icon: "file",
+              icon: "file",
-      //         permission: "AbpIdentity.Users.Delete",
+              permission: "AbpIdentity.Users.Delete",
-      //         disabled: `(o) => o.isStatic`,
+              disabled: `(o) => o.isStatic`,
-      //       },
+            },
-      //     },
+          },
-      //   ],
+        ],
-      // },
+      },
       {
         path: "material",
         meta: {

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

@@ -399,7 +399,7 @@ export default [
                 },
               },
               {
-                path: "generateInvoice",
+                path: "invoice",
                 meta: {
                   type: "button",
                   title: "生成发票数据",
@@ -458,7 +458,7 @@ export default [
                 },
               },
               {
-                path: "generateSettlementOrder",
+                path: "settlement",
                 meta: {
                   type: "button",
                   title: "生成可结算单",
@@ -517,6 +517,26 @@ export default [
               },
             ],
           },
+          {
+            path: "bbac_ba_detail_service",
+            meta: {
+              type: "page",
+              title: "商务审核明细",
+              icon: "file",
+              isHidden: true,
+            },
+            children: [
+              {
+                path: "query",
+                meta: {
+                  type: "button",
+                  title: "查询",
+                  icon: "file",
+                  isTop: true,
+                },
+              },
+            ],
+          },
           {
             path: "bbac_pd_service",
             meta: {
@@ -554,7 +574,7 @@ export default [
                 },
               },
               {
-                path: "approvalPassed ",
+                path: "passed ",
                 meta: {
                   type: "button",
                   title: "审核通过",
@@ -565,6 +585,26 @@ export default [
               },
             ],
           },
+          {
+            path: "bbac_pd_detail_service",
+            meta: {
+              type: "page",
+              title: "寄售库库存扣减审批明细",
+              icon: "file",
+              isHidden: true,
+            },
+            children: [
+              {
+                path: "query",
+                meta: {
+                  type: "button",
+                  title: "查询",
+                  icon: "file",
+                  isTop: true,
+                },
+              },
+            ],
+          },
         ],
       },
     ],
@@ -938,7 +978,7 @@ export default [
             path: "hbpo_can_sa_detail_service",
             meta: {
               type: "page",
-              title: "HBPO发票分组号明细",
+              title: "HBPO可结算单明细",
               icon: "file",
               isHidden: true,
             },
@@ -982,7 +1022,7 @@ export default [
                 },
               },
               {
-                path: "generateSettlementOrder",
+                path: "settlement",
                 meta: {
                   type: "button",
                   title: "生成可结算单",
@@ -1041,6 +1081,26 @@ export default [
               },
             ],
           },
+          {
+            path: "hbpo_ba_detail_service",
+            meta: {
+              type: "page",
+              title: "商务审批明细",
+              icon: "file",
+              isHidden: true,
+            },
+            children: [
+              {
+                path: "query",
+                meta: {
+                  type: "button",
+                  title: "查询",
+                  icon: "file",
+                  isTop: true,
+                },
+              },
+            ],
+          },
           {
             path: "hbpo_pd_service",
             meta: {
@@ -1078,7 +1138,7 @@ export default [
                 },
               },
               {
-                path: "approvalPassed ",
+                path: "passed ",
                 meta: {
                   type: "button",
                   title: "审核通过",
@@ -1089,6 +1149,26 @@ export default [
               },
             ],
           },
+          {
+            path: "hbpo_pd_detail_service",
+            meta: {
+              type: "page",
+              title: "寄售库库存扣减审批明细",
+              icon: "file",
+              isHidden: true,
+            },
+            children: [
+              {
+                path: "query",
+                meta: {
+                  type: "button",
+                  title: "查询",
+                  icon: "file",
+                  isTop: true,
+                },
+              },
+            ],
+          },
         ],
       },
     ],
@@ -1471,6 +1551,26 @@ export default [
               },
             ],
           },
+          {
+            path: "jit_pub_ba_detail_service",
+            meta: {
+              type: "page",
+              title: "商务审批明细",
+              icon: "file",
+              isHidden: true,
+            },
+            children: [
+              {
+                path: "query",
+                meta: {
+                  type: "button",
+                  title: "查询",
+                  icon: "file",
+                  isTop: true,
+                },
+              },
+            ],
+          },
           {
             path: "jit_pub_pd_service",
             meta: {
@@ -1519,6 +1619,26 @@ export default [
               },
             ],
           },
+          {
+            path: "jit_pub_pd_detail_service",
+            meta: {
+              type: "page",
+              title: "寄售库库存扣减审批明细",
+              icon: "file",
+              isHidden: true,
+            },
+            children: [
+              {
+                path: "query",
+                meta: {
+                  type: "button",
+                  title: "查询",
+                  icon: "file",
+                  isTop: true,
+                },
+              },
+            ],
+          },
         ],
       },
     ],
@@ -1901,6 +2021,26 @@ export default [
               },
             ],
           },
+          {
+            path: "bj_pub_ba_detail_service",
+            meta: {
+              type: "page",
+              title: "商务审批明细",
+              icon: "file",
+              isHidden: true,
+            },
+            children: [
+              {
+                path: "query",
+                meta: {
+                  type: "button",
+                  title: "查询",
+                  icon: "file",
+                  isTop: true,
+                },
+              },
+            ],
+          },
           {
             path: "bj_pub_pd_service",
             meta: {
@@ -1949,6 +2089,26 @@ export default [
               },
             ],
           },
+          {
+            path: "bj_pub_pd_detail_service",
+            meta: {
+              type: "page",
+              title: "寄售库库存扣减审批明细",
+              icon: "file",
+              isHidden: true,
+            },
+            children: [
+              {
+                path: "query",
+                meta: {
+                  type: "button",
+                  title: "查询",
+                  icon: "file",
+                  isTop: true,
+                },
+              },
+            ],
+          },
         ],
       },
     ],
@@ -2331,6 +2491,26 @@ export default [
               },
             ],
           },
+          {
+            path: "in_pub_ba_detail_service",
+            meta: {
+              type: "page",
+              title: "商务审批明细",
+              icon: "file",
+              isHidden: true,
+            },
+            children: [
+              {
+                path: "query",
+                meta: {
+                  type: "button",
+                  title: "查询",
+                  icon: "file",
+                  isTop: true,
+                },
+              },
+            ],
+          },
           {
             path: "in_pub_pd_service",
             meta: {
@@ -2379,6 +2559,26 @@ export default [
               },
             ],
           },
+          {
+            path: "in_pub_pd_detail_service",
+            meta: {
+              type: "page",
+              title: "寄售库库存扣减审批明细",
+              icon: "file",
+              isHidden: true,
+            },
+            children: [
+              {
+                path: "query",
+                meta: {
+                  type: "button",
+                  title: "查询",
+                  icon: "file",
+                  isTop: true,
+                },
+              },
+            ],
+          },
         ],
       },
     ],
@@ -2429,7 +2629,7 @@ export default [
             },
           },
           {
-            path: "approvalPassed ",
+            path: "passed ",
             meta: {
               type: "button",
               title: "审核通过",
@@ -2439,7 +2639,7 @@ export default [
             },
           },
           {
-            path: "sync_QAD ",
+            path: "sync_qad ",
             meta: {
               type: "button",
               title: "同步寄售库至QAD",

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

@@ -1,4 +1,4 @@
-import baseDate from "./base-date.js";
+import baseData from "./base-data.js";
 import business from "./business.js";
 
 export default [
@@ -11,6 +11,6 @@ export default [
       public: true,
     },
   },
-  ...baseDate,
+  ...baseData,
   ...business,
 ];

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

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

code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/bj/settlement/bj_pub_can_sa_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/bj/settlement/bj_pub_can_detail_service.js";
 
 export default {
   components: { AppList },

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -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.js";
+import useConfig from "../../../models/jit/settlement/jit_pub_can_sa_detail_service";
 
 export default {
   components: { AppList },

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

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