问题处理

hx-ehsd/src/main/java/com/fjhx/ehsd/a-json/EhsdPurchaseApi.json

@@ -1,1348 +0,0 @@
-{
-  "openapi": "3.0.1",
-  "tags": [
-    {
-      "name": "ehsd采购表"
-    }
-  ],
-  "paths": {
-    "/ehsdPurchase/page": {
-      "post": {
-        "summary": "分页",
-        "tags": [
-          "ehsd采购表"
-        ],
-        "requestBody": {
-          "content": {
-            "application/json": {
-              "schema": {
-                "type": "object",
-                "required": [
-                  "pageNum",
-                  "pageSize"
-                ],
-                "title": null,
-                "properties": {
-                  "pageNum": {
-                    "type": "integer",
-                    "required": null,
-                    "title": "页数",
-                    "properties": null,
-                    "items": null
-                  },
-                  "pageSize": {
-                    "type": "integer",
-                    "required": null,
-                    "title": "每页大小",
-                    "properties": null,
-                    "items": null
-                  }
-                },
-                "items": null
-              }
-            }
-          }
-        },
-        "responses": {
-          "200": {
-            "description": "成功",
-            "content": {
-              "application/json": {
-                "schema": {
-                  "type": "object",
-                  "required": [
-                    "code",
-                    "success",
-                    "msg",
-                    "data"
-                  ],
-                  "title": null,
-                  "properties": {
-                    "code": {
-                      "type": "Integer",
-                      "required": null,
-                      "title": null,
-                      "properties": null,
-                      "items": null
-                    },
-                    "success": {
-                      "type": "boolean",
-                      "required": null,
-                      "title": null,
-                      "properties": null,
-                      "items": null
-                    },
-                    "msg": {
-                      "type": "string",
-                      "required": null,
-                      "title": null,
-                      "properties": null,
-                      "items": null
-                    },
-                    "data": {
-                      "type": "object",
-                      "required": [
-                        "rows",
-                        "total"
-                      ],
-                      "title": null,
-                      "properties": {
-                        "records": {
-                          "type": "array",
-                          "required": null,
-                          "title": "分页数据",
-                          "properties": null,
-                          "items": {
-                            "type": "object",
-                            "required": null,
-                            "title": null,
-                            "properties": {
-                              "id": {
-                                "type": "integer",
-                                "required": null,
-                                "title": "外销合同id",
-                                "properties": null,
-                                "items": null
-                              },
-                              "code": {
-                                "type": "string",
-                                "required": null,
-                                "title": "编码",
-                                "properties": null,
-                                "items": null
-                              },
-                              "businessId": {
-                                "type": "string",
-                                "required": null,
-                                "title": "业务ID  样品单/合同",
-                                "properties": null,
-                                "items": null
-                              },
-                              "businessType": {
-                                "type": "string",
-                                "required": null,
-                                "title": "业务类型 0:样品单  1：交接单",
-                                "properties": null,
-                                "items": null
-                              },
-                              "contractTemplateId": {
-                                "type": "integer",
-                                "required": null,
-                                "title": "合同模版ID",
-                                "properties": null,
-                                "items": null
-                              },
-                              "sellCorporationId": {
-                                "type": "integer",
-                                "required": null,
-                                "title": "卖方公司ID",
-                                "properties": null,
-                                "items": null
-                              },
-                              "sellContactName": {
-                                "type": "string",
-                                "required": null,
-                                "title": "卖方联系人名称",
-                                "properties": null,
-                                "items": null
-                              },
-                              "sellContactNumber": {
-                                "type": "string",
-                                "required": null,
-                                "title": "卖方联系人电话",
-                                "properties": null,
-                                "items": null
-                              },
-                              "sellCountryId": {
-                                "type": "string",
-                                "required": null,
-                                "title": "卖方国家表id",
-                                "properties": null,
-                                "items": null
-                              },
-                              "sellProvinceId": {
-                                "type": "string",
-                                "required": null,
-                                "title": "卖方省份id",
-                                "properties": null,
-                                "items": null
-                              },
-                              "sellCityId": {
-                                "type": "string",
-                                "required": null,
-                                "title": "卖方城市id",
-                                "properties": null,
-                                "items": null
-                              },
-                              "sellAddress": {
-                                "type": "string",
-                                "required": null,
-                                "title": "卖方详细地址",
-                                "properties": null,
-                                "items": null
-                              },
-                              "buyCorporationId": {
-                                "type": "integer",
-                                "required": null,
-                                "title": "买方公司ID",
-                                "properties": null,
-                                "items": null
-                              },
-                              "buyContactName": {
-                                "type": "string",
-                                "required": null,
-                                "title": "买方联系人名称",
-                                "properties": null,
-                                "items": null
-                              },
-                              "buyContactNumber": {
-                                "type": "string",
-                                "required": null,
-                                "title": "买方联系人电话",
-                                "properties": null,
-                                "items": null
-                              },
-                              "buyCountryId": {
-                                "type": "string",
-                                "required": null,
-                                "title": "买方国家表id",
-                                "properties": null,
-                                "items": null
-                              },
-                              "buyProvinceId": {
-                                "type": "string",
-                                "required": null,
-                                "title": "买方省份id",
-                                "properties": null,
-                                "items": null
-                              },
-                              "buyCityId": {
-                                "type": "string",
-                                "required": null,
-                                "title": "买方城市id",
-                                "properties": null,
-                                "items": null
-                              },
-                              "buyAddress": {
-                                "type": "string",
-                                "required": null,
-                                "title": "买方详细地址",
-                                "properties": null,
-                                "items": null
-                              },
-                              "buyPostalCode": {
-                                "type": "string",
-                                "required": null,
-                                "title": "买方邮编",
-                                "properties": null,
-                                "items": null
-                              },
-                              "status": {
-                                "type": "integer",
-                                "required": null,
-                                "title": "审批状态 0草稿 10、审批中；20、驳回  30、审批通过 88：作废   99终止",
-                                "properties": null,
-                                "items": null
-                              },
-                              "amount": {
-                                "type": "number",
-                                "required": null,
-                                "title": "采购总金额",
-                                "properties": null,
-                                "items": null
-                              },
-                              "remark": {
-                                "type": "string",
-                                "required": null,
-                                "title": "条款内容",
-                                "properties": null,
-                                "items": null
-                              },
-                              "currency": {
-                                "type": "string",
-                                "required": null,
-                                "title": "币种（字典account_currency）",
-                                "properties": null,
-                                "items": null
-                              },
-                              "deliveryTime": {
-                                "type": "string",
-                                "required": null,
-                                "title": "交期",
-                                "properties": null,
-                                "items": null
-                              },
-                              "deliveryType": {
-                                "type": "string",
-                                "required": null,
-                                "title": "交货类型字典（delivery_type）",
-                                "properties": null,
-                                "items": null
-                              },
-                              "invoiceType": {
-                                "type": "string",
-                                "required": null,
-                                "title": "发票类型",
-                                "properties": null,
-                                "items": null
-                              },
-                              "paymentMethod": {
-                                "type": "string",
-                                "required": null,
-                                "title": "付款方式（字典funds_payment_method",
-                                "properties": null,
-                                "items": null
-                              },
-                              "warranty": {
-                                "type": "integer",
-                                "required": null,
-                                "title": "质保期",
-                                "properties": null,
-                                "items": null
-                              },
-                              "processInstanceId": {
-                                "type": "string",
-                                "required": null,
-                                "title": "流程KEY",
-                                "properties": null,
-                                "items": null
-                              },
-                              "approvedDate": {
-                                "type": "string",
-                                "required": null,
-                                "title": "审核通过时间",
-                                "properties": null,
-                                "items": null
-                              },
-                              "userName": {
-                                "type": "string",
-                                "required": null,
-                                "title": "创建人名称",
-                                "properties": null,
-                                "items": null
-                              },
-                              "createTime": {
-                                "type": "string",
-                                "required": null,
-                                "title": "创建时间",
-                                "properties": null,
-                                "items": null
-                              },
-                              "updateTime": {
-                                "type": "string",
-                                "required": null,
-                                "title": "修改时间",
-                                "properties": null,
-                                "items": null
-                              }
-                            },
-                            "items": null
-                          }
-                        },
-                        "total": {
-                          "type": "rows",
-                          "required": null,
-                          "title": "总条数",
-                          "properties": null,
-                          "items": null
-                        }
-                      },
-                      "items": null
-                    }
-                  },
-                  "items": null
-                }
-              }
-            }
-          }
-        }
-      }
-    },
-    "/ehsdPurchase/detail": {
-      "post": {
-        "summary": "明细",
-        "tags": [
-          "ehsd采购表"
-        ],
-        "requestBody": {
-          "content": {
-            "application/json": {
-              "schema": {
-                "type": "object",
-                "required": [
-                  "id"
-                ],
-                "title": null,
-                "properties": {
-                  "id": {
-                    "type": "integer",
-                    "required": null,
-                    "title": "ehsd采购表id",
-                    "properties": null,
-                    "items": null
-                  }
-                },
-                "items": null
-              }
-            }
-          }
-        },
-        "responses": {
-          "200": {
-            "description": "成功",
-            "content": {
-              "application/json": {
-                "schema": {
-                  "type": "object",
-                  "required": [
-                    "code",
-                    "success",
-                    "msg",
-                    "data"
-                  ],
-                  "title": null,
-                  "properties": {
-                    "code": {
-                      "type": "Integer",
-                      "required": null,
-                      "title": null,
-                      "properties": null,
-                      "items": null
-                    },
-                    "success": {
-                      "type": "boolean",
-                      "required": null,
-                      "title": null,
-                      "properties": null,
-                      "items": null
-                    },
-                    "msg": {
-                      "type": "string",
-                      "required": null,
-                      "title": null,
-                      "properties": null,
-                      "items": null
-                    },
-                    "data": {
-                      "type": "object",
-                      "required": null,
-                      "title": null,
-                      "properties": {
-                        "id": {
-                          "type": "integer",
-                          "required": null,
-                          "title": "外销合同id",
-                          "properties": null,
-                          "items": null
-                        },
-                        "code": {
-                          "type": "string",
-                          "required": null,
-                          "title": "编码",
-                          "properties": null,
-                          "items": null
-                        },
-                        "businessId": {
-                          "type": "string",
-                          "required": null,
-                          "title": "业务ID  样品单/合同",
-                          "properties": null,
-                          "items": null
-                        },
-                        "businessType": {
-                          "type": "string",
-                          "required": null,
-                          "title": "业务类型 0:样品单  1：交接单",
-                          "properties": null,
-                          "items": null
-                        },
-                        "contractTemplateId": {
-                          "type": "integer",
-                          "required": null,
-                          "title": "合同模版ID",
-                          "properties": null,
-                          "items": null
-                        },
-                        "sellCorporationId": {
-                          "type": "integer",
-                          "required": null,
-                          "title": "卖方公司ID",
-                          "properties": null,
-                          "items": null
-                        },
-                        "sellContactName": {
-                          "type": "string",
-                          "required": null,
-                          "title": "卖方联系人名称",
-                          "properties": null,
-                          "items": null
-                        },
-                        "sellContactNumber": {
-                          "type": "string",
-                          "required": null,
-                          "title": "卖方联系人电话",
-                          "properties": null,
-                          "items": null
-                        },
-                        "sellCountryId": {
-                          "type": "string",
-                          "required": null,
-                          "title": "卖方国家表id",
-                          "properties": null,
-                          "items": null
-                        },
-                        "sellProvinceId": {
-                          "type": "string",
-                          "required": null,
-                          "title": "卖方省份id",
-                          "properties": null,
-                          "items": null
-                        },
-                        "sellCityId": {
-                          "type": "string",
-                          "required": null,
-                          "title": "卖方城市id",
-                          "properties": null,
-                          "items": null
-                        },
-                        "sellAddress": {
-                          "type": "string",
-                          "required": null,
-                          "title": "卖方详细地址",
-                          "properties": null,
-                          "items": null
-                        },
-                        "buyCorporationId": {
-                          "type": "integer",
-                          "required": null,
-                          "title": "买方公司ID",
-                          "properties": null,
-                          "items": null
-                        },
-                        "buyContactName": {
-                          "type": "string",
-                          "required": null,
-                          "title": "买方联系人名称",
-                          "properties": null,
-                          "items": null
-                        },
-                        "buyContactNumber": {
-                          "type": "string",
-                          "required": null,
-                          "title": "买方联系人电话",
-                          "properties": null,
-                          "items": null
-                        },
-                        "buyCountryId": {
-                          "type": "string",
-                          "required": null,
-                          "title": "买方国家表id",
-                          "properties": null,
-                          "items": null
-                        },
-                        "buyProvinceId": {
-                          "type": "string",
-                          "required": null,
-                          "title": "买方省份id",
-                          "properties": null,
-                          "items": null
-                        },
-                        "buyCityId": {
-                          "type": "string",
-                          "required": null,
-                          "title": "买方城市id",
-                          "properties": null,
-                          "items": null
-                        },
-                        "buyAddress": {
-                          "type": "string",
-                          "required": null,
-                          "title": "买方详细地址",
-                          "properties": null,
-                          "items": null
-                        },
-                        "buyPostalCode": {
-                          "type": "string",
-                          "required": null,
-                          "title": "买方邮编",
-                          "properties": null,
-                          "items": null
-                        },
-                        "status": {
-                          "type": "integer",
-                          "required": null,
-                          "title": "审批状态 0草稿 10、审批中；20、驳回  30、审批通过 88：作废   99终止",
-                          "properties": null,
-                          "items": null
-                        },
-                        "amount": {
-                          "type": "number",
-                          "required": null,
-                          "title": "采购总金额",
-                          "properties": null,
-                          "items": null
-                        },
-                        "remark": {
-                          "type": "string",
-                          "required": null,
-                          "title": "条款内容",
-                          "properties": null,
-                          "items": null
-                        },
-                        "currency": {
-                          "type": "string",
-                          "required": null,
-                          "title": "币种（字典account_currency）",
-                          "properties": null,
-                          "items": null
-                        },
-                        "deliveryTime": {
-                          "type": "string",
-                          "required": null,
-                          "title": "交期",
-                          "properties": null,
-                          "items": null
-                        },
-                        "deliveryType": {
-                          "type": "string",
-                          "required": null,
-                          "title": "交货类型字典（delivery_type）",
-                          "properties": null,
-                          "items": null
-                        },
-                        "invoiceType": {
-                          "type": "string",
-                          "required": null,
-                          "title": "发票类型",
-                          "properties": null,
-                          "items": null
-                        },
-                        "paymentMethod": {
-                          "type": "string",
-                          "required": null,
-                          "title": "付款方式（字典funds_payment_method",
-                          "properties": null,
-                          "items": null
-                        },
-                        "warranty": {
-                          "type": "integer",
-                          "required": null,
-                          "title": "质保期",
-                          "properties": null,
-                          "items": null
-                        },
-                        "processInstanceId": {
-                          "type": "string",
-                          "required": null,
-                          "title": "流程KEY",
-                          "properties": null,
-                          "items": null
-                        },
-                        "approvedDate": {
-                          "type": "string",
-                          "required": null,
-                          "title": "审核通过时间",
-                          "properties": null,
-                          "items": null
-                        },
-                        "userName": {
-                          "type": "string",
-                          "required": null,
-                          "title": "创建人名称",
-                          "properties": null,
-                          "items": null
-                        },
-                        "createTime": {
-                          "type": "string",
-                          "required": null,
-                          "title": "创建时间",
-                          "properties": null,
-                          "items": null
-                        },
-                        "updateTime": {
-                          "type": "string",
-                          "required": null,
-                          "title": "修改时间",
-                          "properties": null,
-                          "items": null
-                        }
-                      },
-                      "items": null
-                    }
-                  },
-                  "items": null
-                }
-              }
-            }
-          }
-        }
-      }
-    },
-    "/ehsdPurchase/add": {
-      "post": {
-        "summary": "新增",
-        "tags": [
-          "ehsd采购表"
-        ],
-        "requestBody": {
-          "content": {
-            "application/json": {
-              "schema": {
-                "type": "object",
-                "required": null,
-                "title": null,
-                "properties": {
-                  "code": {
-                    "type": "string",
-                    "required": null,
-                    "title": "编码",
-                    "properties": null,
-                    "items": null
-                  },
-                  "businessId": {
-                    "type": "string",
-                    "required": null,
-                    "title": "业务ID  样品单/合同",
-                    "properties": null,
-                    "items": null
-                  },
-                  "businessType": {
-                    "type": "string",
-                    "required": null,
-                    "title": "业务类型 0:样品单  1：交接单",
-                    "properties": null,
-                    "items": null
-                  },
-                  "contractTemplateId": {
-                    "type": "integer",
-                    "required": null,
-                    "title": "合同模版ID",
-                    "properties": null,
-                    "items": null
-                  },
-                  "sellCorporationId": {
-                    "type": "integer",
-                    "required": null,
-                    "title": "卖方公司ID",
-                    "properties": null,
-                    "items": null
-                  },
-                  "sellContactName": {
-                    "type": "string",
-                    "required": null,
-                    "title": "卖方联系人名称",
-                    "properties": null,
-                    "items": null
-                  },
-                  "sellContactNumber": {
-                    "type": "string",
-                    "required": null,
-                    "title": "卖方联系人电话",
-                    "properties": null,
-                    "items": null
-                  },
-                  "sellCountryId": {
-                    "type": "string",
-                    "required": null,
-                    "title": "卖方国家表id",
-                    "properties": null,
-                    "items": null
-                  },
-                  "sellProvinceId": {
-                    "type": "string",
-                    "required": null,
-                    "title": "卖方省份id",
-                    "properties": null,
-                    "items": null
-                  },
-                  "sellCityId": {
-                    "type": "string",
-                    "required": null,
-                    "title": "卖方城市id",
-                    "properties": null,
-                    "items": null
-                  },
-                  "sellAddress": {
-                    "type": "string",
-                    "required": null,
-                    "title": "卖方详细地址",
-                    "properties": null,
-                    "items": null
-                  },
-                  "buyCorporationId": {
-                    "type": "integer",
-                    "required": null,
-                    "title": "买方公司ID",
-                    "properties": null,
-                    "items": null
-                  },
-                  "buyContactName": {
-                    "type": "string",
-                    "required": null,
-                    "title": "买方联系人名称",
-                    "properties": null,
-                    "items": null
-                  },
-                  "buyContactNumber": {
-                    "type": "string",
-                    "required": null,
-                    "title": "买方联系人电话",
-                    "properties": null,
-                    "items": null
-                  },
-                  "buyCountryId": {
-                    "type": "string",
-                    "required": null,
-                    "title": "买方国家表id",
-                    "properties": null,
-                    "items": null
-                  },
-                  "buyProvinceId": {
-                    "type": "string",
-                    "required": null,
-                    "title": "买方省份id",
-                    "properties": null,
-                    "items": null
-                  },
-                  "buyCityId": {
-                    "type": "string",
-                    "required": null,
-                    "title": "买方城市id",
-                    "properties": null,
-                    "items": null
-                  },
-                  "buyAddress": {
-                    "type": "string",
-                    "required": null,
-                    "title": "买方详细地址",
-                    "properties": null,
-                    "items": null
-                  },
-                  "buyPostalCode": {
-                    "type": "string",
-                    "required": null,
-                    "title": "买方邮编",
-                    "properties": null,
-                    "items": null
-                  },
-                  "status": {
-                    "type": "integer",
-                    "required": null,
-                    "title": "审批状态 0草稿 10、审批中；20、驳回  30、审批通过 88：作废   99终止",
-                    "properties": null,
-                    "items": null
-                  },
-                  "amount": {
-                    "type": "number",
-                    "required": null,
-                    "title": "采购总金额",
-                    "properties": null,
-                    "items": null
-                  },
-                  "remark": {
-                    "type": "string",
-                    "required": null,
-                    "title": "条款内容",
-                    "properties": null,
-                    "items": null
-                  },
-                  "currency": {
-                    "type": "string",
-                    "required": null,
-                    "title": "币种（字典account_currency）",
-                    "properties": null,
-                    "items": null
-                  },
-                  "deliveryTime": {
-                    "type": "string",
-                    "required": null,
-                    "title": "交期",
-                    "properties": null,
-                    "items": null
-                  },
-                  "deliveryType": {
-                    "type": "string",
-                    "required": null,
-                    "title": "交货类型字典（delivery_type）",
-                    "properties": null,
-                    "items": null
-                  },
-                  "invoiceType": {
-                    "type": "string",
-                    "required": null,
-                    "title": "发票类型",
-                    "properties": null,
-                    "items": null
-                  },
-                  "paymentMethod": {
-                    "type": "string",
-                    "required": null,
-                    "title": "付款方式（字典funds_payment_method",
-                    "properties": null,
-                    "items": null
-                  },
-                  "warranty": {
-                    "type": "integer",
-                    "required": null,
-                    "title": "质保期",
-                    "properties": null,
-                    "items": null
-                  },
-                  "processInstanceId": {
-                    "type": "string",
-                    "required": null,
-                    "title": "流程KEY",
-                    "properties": null,
-                    "items": null
-                  },
-                  "approvedDate": {
-                    "type": "string",
-                    "required": null,
-                    "title": "审核通过时间",
-                    "properties": null,
-                    "items": null
-                  },
-                  "userName": {
-                    "type": "string",
-                    "required": null,
-                    "title": "创建人名称",
-                    "properties": null,
-                    "items": null
-                  }
-                },
-                "items": null
-              }
-            }
-          }
-        },
-        "responses": {
-          "200": {
-            "description": "成功",
-            "content": {
-              "application/json": {
-                "schema": {
-                  "type": "object",
-                  "required": [
-                    "code",
-                    "success",
-                    "msg",
-                    "data"
-                  ],
-                  "title": null,
-                  "properties": {
-                    "code": {
-                      "type": "Integer",
-                      "required": null,
-                      "title": null,
-                      "properties": null,
-                      "items": null
-                    },
-                    "success": {
-                      "type": "boolean",
-                      "required": null,
-                      "title": null,
-                      "properties": null,
-                      "items": null
-                    },
-                    "msg": {
-                      "type": "string",
-                      "required": null,
-                      "title": null,
-                      "properties": null,
-                      "items": null
-                    },
-                    "data": {
-                      "type": null,
-                      "required": null,
-                      "title": null,
-                      "properties": null,
-                      "items": null
-                    }
-                  },
-                  "items": null
-                }
-              }
-            }
-          }
-        }
-      }
-    },
-    "/ehsdPurchase/edit": {
-      "post": {
-        "summary": "编辑",
-        "tags": [
-          "ehsd采购表"
-        ],
-        "requestBody": {
-          "content": {
-            "application/json": {
-              "schema": {
-                "type": "object",
-                "required": null,
-                "title": null,
-                "properties": {
-                  "id": {
-                    "type": "integer",
-                    "required": null,
-                    "title": "外销合同id",
-                    "properties": null,
-                    "items": null
-                  },
-                  "code": {
-                    "type": "string",
-                    "required": null,
-                    "title": "编码",
-                    "properties": null,
-                    "items": null
-                  },
-                  "businessId": {
-                    "type": "string",
-                    "required": null,
-                    "title": "业务ID  样品单/合同",
-                    "properties": null,
-                    "items": null
-                  },
-                  "businessType": {
-                    "type": "string",
-                    "required": null,
-                    "title": "业务类型 0:样品单  1：交接单",
-                    "properties": null,
-                    "items": null
-                  },
-                  "contractTemplateId": {
-                    "type": "integer",
-                    "required": null,
-                    "title": "合同模版ID",
-                    "properties": null,
-                    "items": null
-                  },
-                  "sellCorporationId": {
-                    "type": "integer",
-                    "required": null,
-                    "title": "卖方公司ID",
-                    "properties": null,
-                    "items": null
-                  },
-                  "sellContactName": {
-                    "type": "string",
-                    "required": null,
-                    "title": "卖方联系人名称",
-                    "properties": null,
-                    "items": null
-                  },
-                  "sellContactNumber": {
-                    "type": "string",
-                    "required": null,
-                    "title": "卖方联系人电话",
-                    "properties": null,
-                    "items": null
-                  },
-                  "sellCountryId": {
-                    "type": "string",
-                    "required": null,
-                    "title": "卖方国家表id",
-                    "properties": null,
-                    "items": null
-                  },
-                  "sellProvinceId": {
-                    "type": "string",
-                    "required": null,
-                    "title": "卖方省份id",
-                    "properties": null,
-                    "items": null
-                  },
-                  "sellCityId": {
-                    "type": "string",
-                    "required": null,
-                    "title": "卖方城市id",
-                    "properties": null,
-                    "items": null
-                  },
-                  "sellAddress": {
-                    "type": "string",
-                    "required": null,
-                    "title": "卖方详细地址",
-                    "properties": null,
-                    "items": null
-                  },
-                  "buyCorporationId": {
-                    "type": "integer",
-                    "required": null,
-                    "title": "买方公司ID",
-                    "properties": null,
-                    "items": null
-                  },
-                  "buyContactName": {
-                    "type": "string",
-                    "required": null,
-                    "title": "买方联系人名称",
-                    "properties": null,
-                    "items": null
-                  },
-                  "buyContactNumber": {
-                    "type": "string",
-                    "required": null,
-                    "title": "买方联系人电话",
-                    "properties": null,
-                    "items": null
-                  },
-                  "buyCountryId": {
-                    "type": "string",
-                    "required": null,
-                    "title": "买方国家表id",
-                    "properties": null,
-                    "items": null
-                  },
-                  "buyProvinceId": {
-                    "type": "string",
-                    "required": null,
-                    "title": "买方省份id",
-                    "properties": null,
-                    "items": null
-                  },
-                  "buyCityId": {
-                    "type": "string",
-                    "required": null,
-                    "title": "买方城市id",
-                    "properties": null,
-                    "items": null
-                  },
-                  "buyAddress": {
-                    "type": "string",
-                    "required": null,
-                    "title": "买方详细地址",
-                    "properties": null,
-                    "items": null
-                  },
-                  "buyPostalCode": {
-                    "type": "string",
-                    "required": null,
-                    "title": "买方邮编",
-                    "properties": null,
-                    "items": null
-                  },
-                  "status": {
-                    "type": "integer",
-                    "required": null,
-                    "title": "审批状态 0草稿 10、审批中；20、驳回  30、审批通过 88：作废   99终止",
-                    "properties": null,
-                    "items": null
-                  },
-                  "amount": {
-                    "type": "number",
-                    "required": null,
-                    "title": "采购总金额",
-                    "properties": null,
-                    "items": null
-                  },
-                  "remark": {
-                    "type": "string",
-                    "required": null,
-                    "title": "条款内容",
-                    "properties": null,
-                    "items": null
-                  },
-                  "currency": {
-                    "type": "string",
-                    "required": null,
-                    "title": "币种（字典account_currency）",
-                    "properties": null,
-                    "items": null
-                  },
-                  "deliveryTime": {
-                    "type": "string",
-                    "required": null,
-                    "title": "交期",
-                    "properties": null,
-                    "items": null
-                  },
-                  "deliveryType": {
-                    "type": "string",
-                    "required": null,
-                    "title": "交货类型字典（delivery_type）",
-                    "properties": null,
-                    "items": null
-                  },
-                  "invoiceType": {
-                    "type": "string",
-                    "required": null,
-                    "title": "发票类型",
-                    "properties": null,
-                    "items": null
-                  },
-                  "paymentMethod": {
-                    "type": "string",
-                    "required": null,
-                    "title": "付款方式（字典funds_payment_method",
-                    "properties": null,
-                    "items": null
-                  },
-                  "warranty": {
-                    "type": "integer",
-                    "required": null,
-                    "title": "质保期",
-                    "properties": null,
-                    "items": null
-                  },
-                  "processInstanceId": {
-                    "type": "string",
-                    "required": null,
-                    "title": "流程KEY",
-                    "properties": null,
-                    "items": null
-                  },
-                  "approvedDate": {
-                    "type": "string",
-                    "required": null,
-                    "title": "审核通过时间",
-                    "properties": null,
-                    "items": null
-                  },
-                  "userName": {
-                    "type": "string",
-                    "required": null,
-                    "title": "创建人名称",
-                    "properties": null,
-                    "items": null
-                  }
-                },
-                "items": null
-              }
-            }
-          }
-        },
-        "responses": {
-          "200": {
-            "description": "成功",
-            "content": {
-              "application/json": {
-                "schema": {
-                  "type": "object",
-                  "required": [
-                    "code",
-                    "success",
-                    "msg",
-                    "data"
-                  ],
-                  "title": null,
-                  "properties": {
-                    "code": {
-                      "type": "Integer",
-                      "required": null,
-                      "title": null,
-                      "properties": null,
-                      "items": null
-                    },
-                    "success": {
-                      "type": "boolean",
-                      "required": null,
-                      "title": null,
-                      "properties": null,
-                      "items": null
-                    },
-                    "msg": {
-                      "type": "string",
-                      "required": null,
-                      "title": null,
-                      "properties": null,
-                      "items": null
-                    },
-                    "data": {
-                      "type": null,
-                      "required": null,
-                      "title": null,
-                      "properties": null,
-                      "items": null
-                    }
-                  },
-                  "items": null
-                }
-              }
-            }
-          }
-        }
-      }
-    },
-    "/ehsdPurchase/delete": {
-      "post": {
-        "summary": "删除",
-        "tags": [
-          "ehsd采购表"
-        ],
-        "requestBody": {
-          "content": {
-            "application/json": {
-              "schema": {
-                "type": "object",
-                "required": [
-                  "id"
-                ],
-                "title": null,
-                "properties": {
-                  "id": {
-                    "type": "integer",
-                    "required": null,
-                    "title": "ehsd采购表id",
-                    "properties": null,
-                    "items": null
-                  }
-                },
-                "items": null
-              }
-            }
-          }
-        },
-        "responses": {
-          "200": {
-            "description": "成功",
-            "content": {
-              "application/json": {
-                "schema": {
-                  "type": "object",
-                  "required": [
-                    "code",
-                    "success",
-                    "msg",
-                    "data"
-                  ],
-                  "title": null,
-                  "properties": {
-                    "code": {
-                      "type": "Integer",
-                      "required": null,
-                      "title": null,
-                      "properties": null,
-                      "items": null
-                    },
-                    "success": {
-                      "type": "boolean",
-                      "required": null,
-                      "title": null,
-                      "properties": null,
-                      "items": null
-                    },
-                    "msg": {
-                      "type": "string",
-                      "required": null,
-                      "title": null,
-                      "properties": null,
-                      "items": null
-                    },
-                    "data": {
-                      "type": null,
-                      "required": null,
-                      "title": null,
-                      "properties": null,
-                      "items": null
-                    }
-                  },
-                  "items": null
-                }
-              }
-            }
-          }
-        }
-      }
-    }
-  }
-}

hx-ehsd/src/main/java/com/fjhx/ehsd/a-json/EhsdPurchaseArrivalApi.json

@@ -1,620 +0,0 @@
-{
-  "openapi": "3.0.1",
-  "tags": [
-    {
-      "name": "采购合同-到货计划"
-    }
-  ],
-  "paths": {
-    "/ehsdPurchaseArrival/page": {
-      "post": {
-        "summary": "分页",
-        "tags": [
-          "采购合同-到货计划"
-        ],
-        "requestBody": {
-          "content": {
-            "application/json": {
-              "schema": {
-                "type": "object",
-                "required": [
-                  "pageNum",
-                  "pageSize"
-                ],
-                "title": null,
-                "properties": {
-                  "pageNum": {
-                    "type": "integer",
-                    "required": null,
-                    "title": "页数",
-                    "properties": null,
-                    "items": null
-                  },
-                  "pageSize": {
-                    "type": "integer",
-                    "required": null,
-                    "title": "每页大小",
-                    "properties": null,
-                    "items": null
-                  }
-                },
-                "items": null
-              }
-            }
-          }
-        },
-        "responses": {
-          "200": {
-            "description": "成功",
-            "content": {
-              "application/json": {
-                "schema": {
-                  "type": "object",
-                  "required": [
-                    "code",
-                    "success",
-                    "msg",
-                    "data"
-                  ],
-                  "title": null,
-                  "properties": {
-                    "code": {
-                      "type": "Integer",
-                      "required": null,
-                      "title": null,
-                      "properties": null,
-                      "items": null
-                    },
-                    "success": {
-                      "type": "boolean",
-                      "required": null,
-                      "title": null,
-                      "properties": null,
-                      "items": null
-                    },
-                    "msg": {
-                      "type": "string",
-                      "required": null,
-                      "title": null,
-                      "properties": null,
-                      "items": null
-                    },
-                    "data": {
-                      "type": "object",
-                      "required": [
-                        "rows",
-                        "total"
-                      ],
-                      "title": null,
-                      "properties": {
-                        "records": {
-                          "type": "array",
-                          "required": null,
-                          "title": "分页数据",
-                          "properties": null,
-                          "items": {
-                            "type": "object",
-                            "required": null,
-                            "title": null,
-                            "properties": {
-                              "id": {
-                                "type": "integer",
-                                "required": null,
-                                "title": "合同产品ID",
-                                "properties": null,
-                                "items": null
-                              },
-                              "purchaseId": {
-                                "type": "integer",
-                                "required": null,
-                                "title": "采购合同ID",
-                                "properties": null,
-                                "items": null
-                              },
-                              "productId": {
-                                "type": "integer",
-                                "required": null,
-                                "title": "商品ID",
-                                "properties": null,
-                                "items": null
-                              },
-                              "arrivalTime": {
-                                "type": "string",
-                                "required": null,
-                                "title": "到货日期",
-                                "properties": null,
-                                "items": null
-                              },
-                              "quantity": {
-                                "type": "number",
-                                "required": null,
-                                "title": "到货数量",
-                                "properties": null,
-                                "items": null
-                              },
-                              "remark": {
-                                "type": "string",
-                                "required": null,
-                                "title": "备注",
-                                "properties": null,
-                                "items": null
-                              },
-                              "createTime": {
-                                "type": "string",
-                                "required": null,
-                                "title": "创建时间",
-                                "properties": null,
-                                "items": null
-                              },
-                              "updateTime": {
-                                "type": "string",
-                                "required": null,
-                                "title": "修改时间",
-                                "properties": null,
-                                "items": null
-                              }
-                            },
-                            "items": null
-                          }
-                        },
-                        "total": {
-                          "type": "rows",
-                          "required": null,
-                          "title": "总条数",
-                          "properties": null,
-                          "items": null
-                        }
-                      },
-                      "items": null
-                    }
-                  },
-                  "items": null
-                }
-              }
-            }
-          }
-        }
-      }
-    },
-    "/ehsdPurchaseArrival/detail": {
-      "post": {
-        "summary": "明细",
-        "tags": [
-          "采购合同-到货计划"
-        ],
-        "requestBody": {
-          "content": {
-            "application/json": {
-              "schema": {
-                "type": "object",
-                "required": [
-                  "id"
-                ],
-                "title": null,
-                "properties": {
-                  "id": {
-                    "type": "integer",
-                    "required": null,
-                    "title": "采购合同-到货计划id",
-                    "properties": null,
-                    "items": null
-                  }
-                },
-                "items": null
-              }
-            }
-          }
-        },
-        "responses": {
-          "200": {
-            "description": "成功",
-            "content": {
-              "application/json": {
-                "schema": {
-                  "type": "object",
-                  "required": [
-                    "code",
-                    "success",
-                    "msg",
-                    "data"
-                  ],
-                  "title": null,
-                  "properties": {
-                    "code": {
-                      "type": "Integer",
-                      "required": null,
-                      "title": null,
-                      "properties": null,
-                      "items": null
-                    },
-                    "success": {
-                      "type": "boolean",
-                      "required": null,
-                      "title": null,
-                      "properties": null,
-                      "items": null
-                    },
-                    "msg": {
-                      "type": "string",
-                      "required": null,
-                      "title": null,
-                      "properties": null,
-                      "items": null
-                    },
-                    "data": {
-                      "type": "object",
-                      "required": null,
-                      "title": null,
-                      "properties": {
-                        "id": {
-                          "type": "integer",
-                          "required": null,
-                          "title": "合同产品ID",
-                          "properties": null,
-                          "items": null
-                        },
-                        "purchaseId": {
-                          "type": "integer",
-                          "required": null,
-                          "title": "采购合同ID",
-                          "properties": null,
-                          "items": null
-                        },
-                        "productId": {
-                          "type": "integer",
-                          "required": null,
-                          "title": "商品ID",
-                          "properties": null,
-                          "items": null
-                        },
-                        "arrivalTime": {
-                          "type": "string",
-                          "required": null,
-                          "title": "到货日期",
-                          "properties": null,
-                          "items": null
-                        },
-                        "quantity": {
-                          "type": "number",
-                          "required": null,
-                          "title": "到货数量",
-                          "properties": null,
-                          "items": null
-                        },
-                        "remark": {
-                          "type": "string",
-                          "required": null,
-                          "title": "备注",
-                          "properties": null,
-                          "items": null
-                        },
-                        "createTime": {
-                          "type": "string",
-                          "required": null,
-                          "title": "创建时间",
-                          "properties": null,
-                          "items": null
-                        },
-                        "updateTime": {
-                          "type": "string",
-                          "required": null,
-                          "title": "修改时间",
-                          "properties": null,
-                          "items": null
-                        }
-                      },
-                      "items": null
-                    }
-                  },
-                  "items": null
-                }
-              }
-            }
-          }
-        }
-      }
-    },
-    "/ehsdPurchaseArrival/add": {
-      "post": {
-        "summary": "新增",
-        "tags": [
-          "采购合同-到货计划"
-        ],
-        "requestBody": {
-          "content": {
-            "application/json": {
-              "schema": {
-                "type": "object",
-                "required": null,
-                "title": null,
-                "properties": {
-                  "purchaseId": {
-                    "type": "integer",
-                    "required": null,
-                    "title": "采购合同ID",
-                    "properties": null,
-                    "items": null
-                  },
-                  "productId": {
-                    "type": "integer",
-                    "required": null,
-                    "title": "商品ID",
-                    "properties": null,
-                    "items": null
-                  },
-                  "arrivalTime": {
-                    "type": "string",
-                    "required": null,
-                    "title": "到货日期",
-                    "properties": null,
-                    "items": null
-                  },
-                  "quantity": {
-                    "type": "number",
-                    "required": null,
-                    "title": "到货数量",
-                    "properties": null,
-                    "items": null
-                  },
-                  "remark": {
-                    "type": "string",
-                    "required": null,
-                    "title": "备注",
-                    "properties": null,
-                    "items": null
-                  }
-                },
-                "items": null
-              }
-            }
-          }
-        },
-        "responses": {
-          "200": {
-            "description": "成功",
-            "content": {
-              "application/json": {
-                "schema": {
-                  "type": "object",
-                  "required": [
-                    "code",
-                    "success",
-                    "msg",
-                    "data"
-                  ],
-                  "title": null,
-                  "properties": {
-                    "code": {
-                      "type": "Integer",
-                      "required": null,
-                      "title": null,
-                      "properties": null,
-                      "items": null
-                    },
-                    "success": {
-                      "type": "boolean",
-                      "required": null,
-                      "title": null,
-                      "properties": null,
-                      "items": null
-                    },
-                    "msg": {
-                      "type": "string",
-                      "required": null,
-                      "title": null,
-                      "properties": null,
-                      "items": null
-                    },
-                    "data": {
-                      "type": null,
-                      "required": null,
-                      "title": null,
-                      "properties": null,
-                      "items": null
-                    }
-                  },
-                  "items": null
-                }
-              }
-            }
-          }
-        }
-      }
-    },
-    "/ehsdPurchaseArrival/edit": {
-      "post": {
-        "summary": "编辑",
-        "tags": [
-          "采购合同-到货计划"
-        ],
-        "requestBody": {
-          "content": {
-            "application/json": {
-              "schema": {
-                "type": "object",
-                "required": null,
-                "title": null,
-                "properties": {
-                  "id": {
-                    "type": "integer",
-                    "required": null,
-                    "title": "合同产品ID",
-                    "properties": null,
-                    "items": null
-                  },
-                  "purchaseId": {
-                    "type": "integer",
-                    "required": null,
-                    "title": "采购合同ID",
-                    "properties": null,
-                    "items": null
-                  },
-                  "productId": {
-                    "type": "integer",
-                    "required": null,
-                    "title": "商品ID",
-                    "properties": null,
-                    "items": null
-                  },
-                  "arrivalTime": {
-                    "type": "string",
-                    "required": null,
-                    "title": "到货日期",
-                    "properties": null,
-                    "items": null
-                  },
-                  "quantity": {
-                    "type": "number",
-                    "required": null,
-                    "title": "到货数量",
-                    "properties": null,
-                    "items": null
-                  },
-                  "remark": {
-                    "type": "string",
-                    "required": null,
-                    "title": "备注",
-                    "properties": null,
-                    "items": null
-                  }
-                },
-                "items": null
-              }
-            }
-          }
-        },
-        "responses": {
-          "200": {
-            "description": "成功",
-            "content": {
-              "application/json": {
-                "schema": {
-                  "type": "object",
-                  "required": [
-                    "code",
-                    "success",
-                    "msg",
-                    "data"
-                  ],
-                  "title": null,
-                  "properties": {
-                    "code": {
-                      "type": "Integer",
-                      "required": null,
-                      "title": null,
-                      "properties": null,
-                      "items": null
-                    },
-                    "success": {
-                      "type": "boolean",
-                      "required": null,
-                      "title": null,
-                      "properties": null,
-                      "items": null
-                    },
-                    "msg": {
-                      "type": "string",
-                      "required": null,
-                      "title": null,
-                      "properties": null,
-                      "items": null
-                    },
-                    "data": {
-                      "type": null,
-                      "required": null,
-                      "title": null,
-                      "properties": null,
-                      "items": null
-                    }
-                  },
-                  "items": null
-                }
-              }
-            }
-          }
-        }
-      }
-    },
-    "/ehsdPurchaseArrival/delete": {
-      "post": {
-        "summary": "删除",
-        "tags": [
-          "采购合同-到货计划"
-        ],
-        "requestBody": {
-          "content": {
-            "application/json": {
-              "schema": {
-                "type": "object",
-                "required": [
-                  "id"
-                ],
-                "title": null,
-                "properties": {
-                  "id": {
-                    "type": "integer",
-                    "required": null,
-                    "title": "采购合同-到货计划id",
-                    "properties": null,
-                    "items": null
-                  }
-                },
-                "items": null
-              }
-            }
-          }
-        },
-        "responses": {
-          "200": {
-            "description": "成功",
-            "content": {
-              "application/json": {
-                "schema": {
-                  "type": "object",
-                  "required": [
-                    "code",
-                    "success",
-                    "msg",
-                    "data"
-                  ],
-                  "title": null,
-                  "properties": {
-                    "code": {
-                      "type": "Integer",
-                      "required": null,
-                      "title": null,
-                      "properties": null,
-                      "items": null
-                    },
-                    "success": {
-                      "type": "boolean",
-                      "required": null,
-                      "title": null,
-                      "properties": null,
-                      "items": null
-                    },
-                    "msg": {
-                      "type": "string",
-                      "required": null,
-                      "title": null,
-                      "properties": null,
-                      "items": null
-                    },
-                    "data": {
-                      "type": null,
-                      "required": null,
-                      "title": null,
-                      "properties": null,
-                      "items": null
-                    }
-                  },
-                  "items": null
-                }
-              }
-            }
-          }
-        }
-      }
-    }
-  }
-}

hx-ehsd/src/main/java/com/fjhx/ehsd/a-json/EhsdPurchaseProductApi.json

@@ -1,732 +0,0 @@
-{
-  "openapi": "3.0.1",
-  "tags": [
-    {
-      "name": "ehsd采购产品表"
-    }
-  ],
-  "paths": {
-    "/ehsdPurchaseProduct/page": {
-      "post": {
-        "summary": "分页",
-        "tags": [
-          "ehsd采购产品表"
-        ],
-        "requestBody": {
-          "content": {
-            "application/json": {
-              "schema": {
-                "type": "object",
-                "required": [
-                  "pageNum",
-                  "pageSize"
-                ],
-                "title": null,
-                "properties": {
-                  "pageNum": {
-                    "type": "integer",
-                    "required": null,
-                    "title": "页数",
-                    "properties": null,
-                    "items": null
-                  },
-                  "pageSize": {
-                    "type": "integer",
-                    "required": null,
-                    "title": "每页大小",
-                    "properties": null,
-                    "items": null
-                  }
-                },
-                "items": null
-              }
-            }
-          }
-        },
-        "responses": {
-          "200": {
-            "description": "成功",
-            "content": {
-              "application/json": {
-                "schema": {
-                  "type": "object",
-                  "required": [
-                    "code",
-                    "success",
-                    "msg",
-                    "data"
-                  ],
-                  "title": null,
-                  "properties": {
-                    "code": {
-                      "type": "Integer",
-                      "required": null,
-                      "title": null,
-                      "properties": null,
-                      "items": null
-                    },
-                    "success": {
-                      "type": "boolean",
-                      "required": null,
-                      "title": null,
-                      "properties": null,
-                      "items": null
-                    },
-                    "msg": {
-                      "type": "string",
-                      "required": null,
-                      "title": null,
-                      "properties": null,
-                      "items": null
-                    },
-                    "data": {
-                      "type": "object",
-                      "required": [
-                        "rows",
-                        "total"
-                      ],
-                      "title": null,
-                      "properties": {
-                        "records": {
-                          "type": "array",
-                          "required": null,
-                          "title": "分页数据",
-                          "properties": null,
-                          "items": {
-                            "type": "object",
-                            "required": null,
-                            "title": null,
-                            "properties": {
-                              "id": {
-                                "type": "integer",
-                                "required": null,
-                                "title": "合同产品ID",
-                                "properties": null,
-                                "items": null
-                              },
-                              "purchaseId": {
-                                "type": "integer",
-                                "required": null,
-                                "title": "采购单ID",
-                                "properties": null,
-                                "items": null
-                              },
-                              "productId": {
-                                "type": "integer",
-                                "required": null,
-                                "title": "商品ID",
-                                "properties": null,
-                                "items": null
-                              },
-                              "productName": {
-                                "type": "string",
-                                "required": null,
-                                "title": "商品名称",
-                                "properties": null,
-                                "items": null
-                              },
-                              "productModel": {
-                                "type": "string",
-                                "required": null,
-                                "title": "商品型号",
-                                "properties": null,
-                                "items": null
-                              },
-                              "quantity": {
-                                "type": "number",
-                                "required": null,
-                                "title": "商品数量",
-                                "properties": null,
-                                "items": null
-                              },
-                              "price": {
-                                "type": "number",
-                                "required": null,
-                                "title": "商品单价",
-                                "properties": null,
-                                "items": null
-                              },
-                              "amount": {
-                                "type": "number",
-                                "required": null,
-                                "title": "商品金额",
-                                "properties": null,
-                                "items": null
-                              },
-                              "remark": {
-                                "type": "string",
-                                "required": null,
-                                "title": "备注",
-                                "properties": null,
-                                "items": null
-                              },
-                              "json": {
-                                "type": "string",
-                                "required": null,
-                                "title": "尔弘时代扩展JSON",
-                                "properties": null,
-                                "items": null
-                              },
-                              "createTime": {
-                                "type": "string",
-                                "required": null,
-                                "title": "创建时间",
-                                "properties": null,
-                                "items": null
-                              },
-                              "updateTime": {
-                                "type": "string",
-                                "required": null,
-                                "title": "修改时间",
-                                "properties": null,
-                                "items": null
-                              }
-                            },
-                            "items": null
-                          }
-                        },
-                        "total": {
-                          "type": "rows",
-                          "required": null,
-                          "title": "总条数",
-                          "properties": null,
-                          "items": null
-                        }
-                      },
-                      "items": null
-                    }
-                  },
-                  "items": null
-                }
-              }
-            }
-          }
-        }
-      }
-    },
-    "/ehsdPurchaseProduct/detail": {
-      "post": {
-        "summary": "明细",
-        "tags": [
-          "ehsd采购产品表"
-        ],
-        "requestBody": {
-          "content": {
-            "application/json": {
-              "schema": {
-                "type": "object",
-                "required": [
-                  "id"
-                ],
-                "title": null,
-                "properties": {
-                  "id": {
-                    "type": "integer",
-                    "required": null,
-                    "title": "ehsd采购产品表id",
-                    "properties": null,
-                    "items": null
-                  }
-                },
-                "items": null
-              }
-            }
-          }
-        },
-        "responses": {
-          "200": {
-            "description": "成功",
-            "content": {
-              "application/json": {
-                "schema": {
-                  "type": "object",
-                  "required": [
-                    "code",
-                    "success",
-                    "msg",
-                    "data"
-                  ],
-                  "title": null,
-                  "properties": {
-                    "code": {
-                      "type": "Integer",
-                      "required": null,
-                      "title": null,
-                      "properties": null,
-                      "items": null
-                    },
-                    "success": {
-                      "type": "boolean",
-                      "required": null,
-                      "title": null,
-                      "properties": null,
-                      "items": null
-                    },
-                    "msg": {
-                      "type": "string",
-                      "required": null,
-                      "title": null,
-                      "properties": null,
-                      "items": null
-                    },
-                    "data": {
-                      "type": "object",
-                      "required": null,
-                      "title": null,
-                      "properties": {
-                        "id": {
-                          "type": "integer",
-                          "required": null,
-                          "title": "合同产品ID",
-                          "properties": null,
-                          "items": null
-                        },
-                        "purchaseId": {
-                          "type": "integer",
-                          "required": null,
-                          "title": "采购单ID",
-                          "properties": null,
-                          "items": null
-                        },
-                        "productId": {
-                          "type": "integer",
-                          "required": null,
-                          "title": "商品ID",
-                          "properties": null,
-                          "items": null
-                        },
-                        "productName": {
-                          "type": "string",
-                          "required": null,
-                          "title": "商品名称",
-                          "properties": null,
-                          "items": null
-                        },
-                        "productModel": {
-                          "type": "string",
-                          "required": null,
-                          "title": "商品型号",
-                          "properties": null,
-                          "items": null
-                        },
-                        "quantity": {
-                          "type": "number",
-                          "required": null,
-                          "title": "商品数量",
-                          "properties": null,
-                          "items": null
-                        },
-                        "price": {
-                          "type": "number",
-                          "required": null,
-                          "title": "商品单价",
-                          "properties": null,
-                          "items": null
-                        },
-                        "amount": {
-                          "type": "number",
-                          "required": null,
-                          "title": "商品金额",
-                          "properties": null,
-                          "items": null
-                        },
-                        "remark": {
-                          "type": "string",
-                          "required": null,
-                          "title": "备注",
-                          "properties": null,
-                          "items": null
-                        },
-                        "json": {
-                          "type": "string",
-                          "required": null,
-                          "title": "尔弘时代扩展JSON",
-                          "properties": null,
-                          "items": null
-                        },
-                        "createTime": {
-                          "type": "string",
-                          "required": null,
-                          "title": "创建时间",
-                          "properties": null,
-                          "items": null
-                        },
-                        "updateTime": {
-                          "type": "string",
-                          "required": null,
-                          "title": "修改时间",
-                          "properties": null,
-                          "items": null
-                        }
-                      },
-                      "items": null
-                    }
-                  },
-                  "items": null
-                }
-              }
-            }
-          }
-        }
-      }
-    },
-    "/ehsdPurchaseProduct/add": {
-      "post": {
-        "summary": "新增",
-        "tags": [
-          "ehsd采购产品表"
-        ],
-        "requestBody": {
-          "content": {
-            "application/json": {
-              "schema": {
-                "type": "object",
-                "required": null,
-                "title": null,
-                "properties": {
-                  "purchaseId": {
-                    "type": "integer",
-                    "required": null,
-                    "title": "采购单ID",
-                    "properties": null,
-                    "items": null
-                  },
-                  "productId": {
-                    "type": "integer",
-                    "required": null,
-                    "title": "商品ID",
-                    "properties": null,
-                    "items": null
-                  },
-                  "productName": {
-                    "type": "string",
-                    "required": null,
-                    "title": "商品名称",
-                    "properties": null,
-                    "items": null
-                  },
-                  "productModel": {
-                    "type": "string",
-                    "required": null,
-                    "title": "商品型号",
-                    "properties": null,
-                    "items": null
-                  },
-                  "quantity": {
-                    "type": "number",
-                    "required": null,
-                    "title": "商品数量",
-                    "properties": null,
-                    "items": null
-                  },
-                  "price": {
-                    "type": "number",
-                    "required": null,
-                    "title": "商品单价",
-                    "properties": null,
-                    "items": null
-                  },
-                  "amount": {
-                    "type": "number",
-                    "required": null,
-                    "title": "商品金额",
-                    "properties": null,
-                    "items": null
-                  },
-                  "remark": {
-                    "type": "string",
-                    "required": null,
-                    "title": "备注",
-                    "properties": null,
-                    "items": null
-                  },
-                  "json": {
-                    "type": "string",
-                    "required": null,
-                    "title": "尔弘时代扩展JSON",
-                    "properties": null,
-                    "items": null
-                  }
-                },
-                "items": null
-              }
-            }
-          }
-        },
-        "responses": {
-          "200": {
-            "description": "成功",
-            "content": {
-              "application/json": {
-                "schema": {
-                  "type": "object",
-                  "required": [
-                    "code",
-                    "success",
-                    "msg",
-                    "data"
-                  ],
-                  "title": null,
-                  "properties": {
-                    "code": {
-                      "type": "Integer",
-                      "required": null,
-                      "title": null,
-                      "properties": null,
-                      "items": null
-                    },
-                    "success": {
-                      "type": "boolean",
-                      "required": null,
-                      "title": null,
-                      "properties": null,
-                      "items": null
-                    },
-                    "msg": {
-                      "type": "string",
-                      "required": null,
-                      "title": null,
-                      "properties": null,
-                      "items": null
-                    },
-                    "data": {
-                      "type": null,
-                      "required": null,
-                      "title": null,
-                      "properties": null,
-                      "items": null
-                    }
-                  },
-                  "items": null
-                }
-              }
-            }
-          }
-        }
-      }
-    },
-    "/ehsdPurchaseProduct/edit": {
-      "post": {
-        "summary": "编辑",
-        "tags": [
-          "ehsd采购产品表"
-        ],
-        "requestBody": {
-          "content": {
-            "application/json": {
-              "schema": {
-                "type": "object",
-                "required": null,
-                "title": null,
-                "properties": {
-                  "id": {
-                    "type": "integer",
-                    "required": null,
-                    "title": "合同产品ID",
-                    "properties": null,
-                    "items": null
-                  },
-                  "purchaseId": {
-                    "type": "integer",
-                    "required": null,
-                    "title": "采购单ID",
-                    "properties": null,
-                    "items": null
-                  },
-                  "productId": {
-                    "type": "integer",
-                    "required": null,
-                    "title": "商品ID",
-                    "properties": null,
-                    "items": null
-                  },
-                  "productName": {
-                    "type": "string",
-                    "required": null,
-                    "title": "商品名称",
-                    "properties": null,
-                    "items": null
-                  },
-                  "productModel": {
-                    "type": "string",
-                    "required": null,
-                    "title": "商品型号",
-                    "properties": null,
-                    "items": null
-                  },
-                  "quantity": {
-                    "type": "number",
-                    "required": null,
-                    "title": "商品数量",
-                    "properties": null,
-                    "items": null
-                  },
-                  "price": {
-                    "type": "number",
-                    "required": null,
-                    "title": "商品单价",
-                    "properties": null,
-                    "items": null
-                  },
-                  "amount": {
-                    "type": "number",
-                    "required": null,
-                    "title": "商品金额",
-                    "properties": null,
-                    "items": null
-                  },
-                  "remark": {
-                    "type": "string",
-                    "required": null,
-                    "title": "备注",
-                    "properties": null,
-                    "items": null
-                  },
-                  "json": {
-                    "type": "string",
-                    "required": null,
-                    "title": "尔弘时代扩展JSON",
-                    "properties": null,
-                    "items": null
-                  }
-                },
-                "items": null
-              }
-            }
-          }
-        },
-        "responses": {
-          "200": {
-            "description": "成功",
-            "content": {
-              "application/json": {
-                "schema": {
-                  "type": "object",
-                  "required": [
-                    "code",
-                    "success",
-                    "msg",
-                    "data"
-                  ],
-                  "title": null,
-                  "properties": {
-                    "code": {
-                      "type": "Integer",
-                      "required": null,
-                      "title": null,
-                      "properties": null,
-                      "items": null
-                    },
-                    "success": {
-                      "type": "boolean",
-                      "required": null,
-                      "title": null,
-                      "properties": null,
-                      "items": null
-                    },
-                    "msg": {
-                      "type": "string",
-                      "required": null,
-                      "title": null,
-                      "properties": null,
-                      "items": null
-                    },
-                    "data": {
-                      "type": null,
-                      "required": null,
-                      "title": null,
-                      "properties": null,
-                      "items": null
-                    }
-                  },
-                  "items": null
-                }
-              }
-            }
-          }
-        }
-      }
-    },
-    "/ehsdPurchaseProduct/delete": {
-      "post": {
-        "summary": "删除",
-        "tags": [
-          "ehsd采购产品表"
-        ],
-        "requestBody": {
-          "content": {
-            "application/json": {
-              "schema": {
-                "type": "object",
-                "required": [
-                  "id"
-                ],
-                "title": null,
-                "properties": {
-                  "id": {
-                    "type": "integer",
-                    "required": null,
-                    "title": "ehsd采购产品表id",
-                    "properties": null,
-                    "items": null
-                  }
-                },
-                "items": null
-              }
-            }
-          }
-        },
-        "responses": {
-          "200": {
-            "description": "成功",
-            "content": {
-              "application/json": {
-                "schema": {
-                  "type": "object",
-                  "required": [
-                    "code",
-                    "success",
-                    "msg",
-                    "data"
-                  ],
-                  "title": null,
-                  "properties": {
-                    "code": {
-                      "type": "Integer",
-                      "required": null,
-                      "title": null,
-                      "properties": null,
-                      "items": null
-                    },
-                    "success": {
-                      "type": "boolean",
-                      "required": null,
-                      "title": null,
-                      "properties": null,
-                      "items": null
-                    },
-                    "msg": {
-                      "type": "string",
-                      "required": null,
-                      "title": null,
-                      "properties": null,
-                      "items": null
-                    },
-                    "data": {
-                      "type": null,
-                      "required": null,
-                      "title": null,
-                      "properties": null,
-                      "items": null
-                    }
-                  },
-                  "items": null
-                }
-              }
-            }
-          }
-        }
-      }
-    }
-  }
-}

hx-ehsd/src/main/java/com/fjhx/ehsd/a-json/EhsdPurchaseProductMountingsApi.json

@@ -1,732 +0,0 @@
-{
-  "openapi": "3.0.1",
-  "tags": [
-    {
-      "name": "ehsd采购产品配件表"
-    }
-  ],
-  "paths": {
-    "/ehsdPurchaseProductMountings/page": {
-      "post": {
-        "summary": "分页",
-        "tags": [
-          "ehsd采购产品配件表"
-        ],
-        "requestBody": {
-          "content": {
-            "application/json": {
-              "schema": {
-                "type": "object",
-                "required": [
-                  "pageNum",
-                  "pageSize"
-                ],
-                "title": null,
-                "properties": {
-                  "pageNum": {
-                    "type": "integer",
-                    "required": null,
-                    "title": "页数",
-                    "properties": null,
-                    "items": null
-                  },
-                  "pageSize": {
-                    "type": "integer",
-                    "required": null,
-                    "title": "每页大小",
-                    "properties": null,
-                    "items": null
-                  }
-                },
-                "items": null
-              }
-            }
-          }
-        },
-        "responses": {
-          "200": {
-            "description": "成功",
-            "content": {
-              "application/json": {
-                "schema": {
-                  "type": "object",
-                  "required": [
-                    "code",
-                    "success",
-                    "msg",
-                    "data"
-                  ],
-                  "title": null,
-                  "properties": {
-                    "code": {
-                      "type": "Integer",
-                      "required": null,
-                      "title": null,
-                      "properties": null,
-                      "items": null
-                    },
-                    "success": {
-                      "type": "boolean",
-                      "required": null,
-                      "title": null,
-                      "properties": null,
-                      "items": null
-                    },
-                    "msg": {
-                      "type": "string",
-                      "required": null,
-                      "title": null,
-                      "properties": null,
-                      "items": null
-                    },
-                    "data": {
-                      "type": "object",
-                      "required": [
-                        "rows",
-                        "total"
-                      ],
-                      "title": null,
-                      "properties": {
-                        "records": {
-                          "type": "array",
-                          "required": null,
-                          "title": "分页数据",
-                          "properties": null,
-                          "items": {
-                            "type": "object",
-                            "required": null,
-                            "title": null,
-                            "properties": {
-                              "id": {
-                                "type": "integer",
-                                "required": null,
-                                "title": "合同产品ID",
-                                "properties": null,
-                                "items": null
-                              },
-                              "purchaseProductId": {
-                                "type": "integer",
-                                "required": null,
-                                "title": "采购单ID",
-                                "properties": null,
-                                "items": null
-                              },
-                              "productId": {
-                                "type": "integer",
-                                "required": null,
-                                "title": "商品ID",
-                                "properties": null,
-                                "items": null
-                              },
-                              "productName": {
-                                "type": "string",
-                                "required": null,
-                                "title": "商品名称",
-                                "properties": null,
-                                "items": null
-                              },
-                              "productModel": {
-                                "type": "string",
-                                "required": null,
-                                "title": "商品型号",
-                                "properties": null,
-                                "items": null
-                              },
-                              "quantity": {
-                                "type": "number",
-                                "required": null,
-                                "title": "商品数量",
-                                "properties": null,
-                                "items": null
-                              },
-                              "price": {
-                                "type": "number",
-                                "required": null,
-                                "title": "商品单价",
-                                "properties": null,
-                                "items": null
-                              },
-                              "amount": {
-                                "type": "number",
-                                "required": null,
-                                "title": "商品金额",
-                                "properties": null,
-                                "items": null
-                              },
-                              "remark": {
-                                "type": "string",
-                                "required": null,
-                                "title": "备注",
-                                "properties": null,
-                                "items": null
-                              },
-                              "json": {
-                                "type": "string",
-                                "required": null,
-                                "title": "尔弘时代扩展JSON",
-                                "properties": null,
-                                "items": null
-                              },
-                              "createTime": {
-                                "type": "string",
-                                "required": null,
-                                "title": "创建时间",
-                                "properties": null,
-                                "items": null
-                              },
-                              "updateTime": {
-                                "type": "string",
-                                "required": null,
-                                "title": "修改时间",
-                                "properties": null,
-                                "items": null
-                              }
-                            },
-                            "items": null
-                          }
-                        },
-                        "total": {
-                          "type": "rows",
-                          "required": null,
-                          "title": "总条数",
-                          "properties": null,
-                          "items": null
-                        }
-                      },
-                      "items": null
-                    }
-                  },
-                  "items": null
-                }
-              }
-            }
-          }
-        }
-      }
-    },
-    "/ehsdPurchaseProductMountings/detail": {
-      "post": {
-        "summary": "明细",
-        "tags": [
-          "ehsd采购产品配件表"
-        ],
-        "requestBody": {
-          "content": {
-            "application/json": {
-              "schema": {
-                "type": "object",
-                "required": [
-                  "id"
-                ],
-                "title": null,
-                "properties": {
-                  "id": {
-                    "type": "integer",
-                    "required": null,
-                    "title": "ehsd采购产品配件表id",
-                    "properties": null,
-                    "items": null
-                  }
-                },
-                "items": null
-              }
-            }
-          }
-        },
-        "responses": {
-          "200": {
-            "description": "成功",
-            "content": {
-              "application/json": {
-                "schema": {
-                  "type": "object",
-                  "required": [
-                    "code",
-                    "success",
-                    "msg",
-                    "data"
-                  ],
-                  "title": null,
-                  "properties": {
-                    "code": {
-                      "type": "Integer",
-                      "required": null,
-                      "title": null,
-                      "properties": null,
-                      "items": null
-                    },
-                    "success": {
-                      "type": "boolean",
-                      "required": null,
-                      "title": null,
-                      "properties": null,
-                      "items": null
-                    },
-                    "msg": {
-                      "type": "string",
-                      "required": null,
-                      "title": null,
-                      "properties": null,
-                      "items": null
-                    },
-                    "data": {
-                      "type": "object",
-                      "required": null,
-                      "title": null,
-                      "properties": {
-                        "id": {
-                          "type": "integer",
-                          "required": null,
-                          "title": "合同产品ID",
-                          "properties": null,
-                          "items": null
-                        },
-                        "purchaseProductId": {
-                          "type": "integer",
-                          "required": null,
-                          "title": "采购单ID",
-                          "properties": null,
-                          "items": null
-                        },
-                        "productId": {
-                          "type": "integer",
-                          "required": null,
-                          "title": "商品ID",
-                          "properties": null,
-                          "items": null
-                        },
-                        "productName": {
-                          "type": "string",
-                          "required": null,
-                          "title": "商品名称",
-                          "properties": null,
-                          "items": null
-                        },
-                        "productModel": {
-                          "type": "string",
-                          "required": null,
-                          "title": "商品型号",
-                          "properties": null,
-                          "items": null
-                        },
-                        "quantity": {
-                          "type": "number",
-                          "required": null,
-                          "title": "商品数量",
-                          "properties": null,
-                          "items": null
-                        },
-                        "price": {
-                          "type": "number",
-                          "required": null,
-                          "title": "商品单价",
-                          "properties": null,
-                          "items": null
-                        },
-                        "amount": {
-                          "type": "number",
-                          "required": null,
-                          "title": "商品金额",
-                          "properties": null,
-                          "items": null
-                        },
-                        "remark": {
-                          "type": "string",
-                          "required": null,
-                          "title": "备注",
-                          "properties": null,
-                          "items": null
-                        },
-                        "json": {
-                          "type": "string",
-                          "required": null,
-                          "title": "尔弘时代扩展JSON",
-                          "properties": null,
-                          "items": null
-                        },
-                        "createTime": {
-                          "type": "string",
-                          "required": null,
-                          "title": "创建时间",
-                          "properties": null,
-                          "items": null
-                        },
-                        "updateTime": {
-                          "type": "string",
-                          "required": null,
-                          "title": "修改时间",
-                          "properties": null,
-                          "items": null
-                        }
-                      },
-                      "items": null
-                    }
-                  },
-                  "items": null
-                }
-              }
-            }
-          }
-        }
-      }
-    },
-    "/ehsdPurchaseProductMountings/add": {
-      "post": {
-        "summary": "新增",
-        "tags": [
-          "ehsd采购产品配件表"
-        ],
-        "requestBody": {
-          "content": {
-            "application/json": {
-              "schema": {
-                "type": "object",
-                "required": null,
-                "title": null,
-                "properties": {
-                  "purchaseProductId": {
-                    "type": "integer",
-                    "required": null,
-                    "title": "采购单ID",
-                    "properties": null,
-                    "items": null
-                  },
-                  "productId": {
-                    "type": "integer",
-                    "required": null,
-                    "title": "商品ID",
-                    "properties": null,
-                    "items": null
-                  },
-                  "productName": {
-                    "type": "string",
-                    "required": null,
-                    "title": "商品名称",
-                    "properties": null,
-                    "items": null
-                  },
-                  "productModel": {
-                    "type": "string",
-                    "required": null,
-                    "title": "商品型号",
-                    "properties": null,
-                    "items": null
-                  },
-                  "quantity": {
-                    "type": "number",
-                    "required": null,
-                    "title": "商品数量",
-                    "properties": null,
-                    "items": null
-                  },
-                  "price": {
-                    "type": "number",
-                    "required": null,
-                    "title": "商品单价",
-                    "properties": null,
-                    "items": null
-                  },
-                  "amount": {
-                    "type": "number",
-                    "required": null,
-                    "title": "商品金额",
-                    "properties": null,
-                    "items": null
-                  },
-                  "remark": {
-                    "type": "string",
-                    "required": null,
-                    "title": "备注",
-                    "properties": null,
-                    "items": null
-                  },
-                  "json": {
-                    "type": "string",
-                    "required": null,
-                    "title": "尔弘时代扩展JSON",
-                    "properties": null,
-                    "items": null
-                  }
-                },
-                "items": null
-              }
-            }
-          }
-        },
-        "responses": {
-          "200": {
-            "description": "成功",
-            "content": {
-              "application/json": {
-                "schema": {
-                  "type": "object",
-                  "required": [
-                    "code",
-                    "success",
-                    "msg",
-                    "data"
-                  ],
-                  "title": null,
-                  "properties": {
-                    "code": {
-                      "type": "Integer",
-                      "required": null,
-                      "title": null,
-                      "properties": null,
-                      "items": null
-                    },
-                    "success": {
-                      "type": "boolean",
-                      "required": null,
-                      "title": null,
-                      "properties": null,
-                      "items": null
-                    },
-                    "msg": {
-                      "type": "string",
-                      "required": null,
-                      "title": null,
-                      "properties": null,
-                      "items": null
-                    },
-                    "data": {
-                      "type": null,
-                      "required": null,
-                      "title": null,
-                      "properties": null,
-                      "items": null
-                    }
-                  },
-                  "items": null
-                }
-              }
-            }
-          }
-        }
-      }
-    },
-    "/ehsdPurchaseProductMountings/edit": {
-      "post": {
-        "summary": "编辑",
-        "tags": [
-          "ehsd采购产品配件表"
-        ],
-        "requestBody": {
-          "content": {
-            "application/json": {
-              "schema": {
-                "type": "object",
-                "required": null,
-                "title": null,
-                "properties": {
-                  "id": {
-                    "type": "integer",
-                    "required": null,
-                    "title": "合同产品ID",
-                    "properties": null,
-                    "items": null
-                  },
-                  "purchaseProductId": {
-                    "type": "integer",
-                    "required": null,
-                    "title": "采购单ID",
-                    "properties": null,
-                    "items": null
-                  },
-                  "productId": {
-                    "type": "integer",
-                    "required": null,
-                    "title": "商品ID",
-                    "properties": null,
-                    "items": null
-                  },
-                  "productName": {
-                    "type": "string",
-                    "required": null,
-                    "title": "商品名称",
-                    "properties": null,
-                    "items": null
-                  },
-                  "productModel": {
-                    "type": "string",
-                    "required": null,
-                    "title": "商品型号",
-                    "properties": null,
-                    "items": null
-                  },
-                  "quantity": {
-                    "type": "number",
-                    "required": null,
-                    "title": "商品数量",
-                    "properties": null,
-                    "items": null
-                  },
-                  "price": {
-                    "type": "number",
-                    "required": null,
-                    "title": "商品单价",
-                    "properties": null,
-                    "items": null
-                  },
-                  "amount": {
-                    "type": "number",
-                    "required": null,
-                    "title": "商品金额",
-                    "properties": null,
-                    "items": null
-                  },
-                  "remark": {
-                    "type": "string",
-                    "required": null,
-                    "title": "备注",
-                    "properties": null,
-                    "items": null
-                  },
-                  "json": {
-                    "type": "string",
-                    "required": null,
-                    "title": "尔弘时代扩展JSON",
-                    "properties": null,
-                    "items": null
-                  }
-                },
-                "items": null
-              }
-            }
-          }
-        },
-        "responses": {
-          "200": {
-            "description": "成功",
-            "content": {
-              "application/json": {
-                "schema": {
-                  "type": "object",
-                  "required": [
-                    "code",
-                    "success",
-                    "msg",
-                    "data"
-                  ],
-                  "title": null,
-                  "properties": {
-                    "code": {
-                      "type": "Integer",
-                      "required": null,
-                      "title": null,
-                      "properties": null,
-                      "items": null
-                    },
-                    "success": {
-                      "type": "boolean",
-                      "required": null,
-                      "title": null,
-                      "properties": null,
-                      "items": null
-                    },
-                    "msg": {
-                      "type": "string",
-                      "required": null,
-                      "title": null,
-                      "properties": null,
-                      "items": null
-                    },
-                    "data": {
-                      "type": null,
-                      "required": null,
-                      "title": null,
-                      "properties": null,
-                      "items": null
-                    }
-                  },
-                  "items": null
-                }
-              }
-            }
-          }
-        }
-      }
-    },
-    "/ehsdPurchaseProductMountings/delete": {
-      "post": {
-        "summary": "删除",
-        "tags": [
-          "ehsd采购产品配件表"
-        ],
-        "requestBody": {
-          "content": {
-            "application/json": {
-              "schema": {
-                "type": "object",
-                "required": [
-                  "id"
-                ],
-                "title": null,
-                "properties": {
-                  "id": {
-                    "type": "integer",
-                    "required": null,
-                    "title": "ehsd采购产品配件表id",
-                    "properties": null,
-                    "items": null
-                  }
-                },
-                "items": null
-              }
-            }
-          }
-        },
-        "responses": {
-          "200": {
-            "description": "成功",
-            "content": {
-              "application/json": {
-                "schema": {
-                  "type": "object",
-                  "required": [
-                    "code",
-                    "success",
-                    "msg",
-                    "data"
-                  ],
-                  "title": null,
-                  "properties": {
-                    "code": {
-                      "type": "Integer",
-                      "required": null,
-                      "title": null,
-                      "properties": null,
-                      "items": null
-                    },
-                    "success": {
-                      "type": "boolean",
-                      "required": null,
-                      "title": null,
-                      "properties": null,
-                      "items": null
-                    },
-                    "msg": {
-                      "type": "string",
-                      "required": null,
-                      "title": null,
-                      "properties": null,
-                      "items": null
-                    },
-                    "data": {
-                      "type": null,
-                      "required": null,
-                      "title": null,
-                      "properties": null,
-                      "items": null
-                    }
-                  },
-                  "items": null
-                }
-              }
-            }
-          }
-        }
-      }
-    }
-  }
-}

hx-jxst/src/main/java/com/fjhx/jxst/service/sales/impl/SalesContractServiceImpl.java

@@ -228,7 +228,7 @@ public class SalesContractServiceImpl extends ServiceImpl<SalesContractMapper, S
     /**
      * 公共的计算代码块
      */
-    SettlementBo profitClearingConn(SettlementBo record){
+    private SettlementBo profitClearingConn(SettlementBo record){
         //总收入
         record.setTotalIncome(record.getContractClaimAmount().setScale(4, RoundingMode.HALF_UP));
 
@@ -247,7 +247,7 @@ public class SalesContractServiceImpl extends ServiceImpl<SalesContractMapper, S
 
         //毛利率(毛利/总收入*100%)
         BigDecimal grossProfitMargin = BigDecimal.ZERO;
-        if (record.getGrossProfit().compareTo(BigDecimal.ZERO) > 0) {
+        if (record.getTotalIncome().compareTo(BigDecimal.ZERO) != 0) {
             grossProfitMargin = record.getGrossProfit()
                     .divide(record.getTotalIncome(), 2, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100));
         }