Merge remote-tracking branch 'origin/dev_20251130' into dev_20251130

sckw-modules/sckw-contract/src/main/java/com/sckw/contract/controller/KwcContractSaleController.java

@@ -10,6 +10,8 @@ import com.sckw.core.web.constant.HttpStatus;
 import com.sckw.core.web.response.BaseResult;
 import com.sckw.core.web.response.HttpResult;
 import com.sckw.core.web.response.result.PageDataResult;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.servlet.http.HttpServletResponse;
 import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
@@ -28,6 +30,7 @@ import org.springframework.web.bind.annotation.RestController;
 @RestController
 @RequestMapping("kwcSale")
 @RequiredArgsConstructor
+@Tag(name = "贸易合同相关接口")
 public class KwcContractSaleController {
 
     private final KwcContractTradeService kwcContractTradeService;
@@ -40,6 +43,7 @@ public class KwcContractSaleController {
      * @return HttpResult
      */
     @PostMapping("/queryListByPage")
+    @Operation(summary = "分页查询贸易合同")
     public BaseResult<PageResult> queryListByPage(@RequestBody QueryListReqVo reqVo) {
         reqVo.setEntType(EntTypeEnum.SUPPLIER.getCode());
         return BaseResult.success(kwcContractTradeService.queryListByPage(reqVo));
@@ -53,6 +57,7 @@ public class KwcContractSaleController {
      * @date: 2023/7/18
      */
     @PostMapping("/addTradeContract")
+    @Operation(summary = "新增贸易合同")
     public BaseResult<String> addTradeContract(@Valid @RequestBody ContractTradeReqVo reqVo) {
         kwcContractTradeService.addTradeContract(reqVo);
         return BaseResult.success(HttpStatus.MSG_003);
@@ -66,6 +71,7 @@ public class KwcContractSaleController {
      * @date: 2023/7/18
      */
     @PostMapping("/addSupplyTradeContract")
+    @Operation(summary = "补充合同")
     public BaseResult<String> addSupplyTradeContract(@Valid @RequestBody SupplyContractTradeReq req) {
         kwcContractTradeService.addSupplyTradeContract(req);
         return BaseResult.success(HttpStatus.MSG_003);
@@ -116,6 +122,7 @@ public class KwcContractSaleController {
      * @return HttpResult
      */
     @PostMapping("/updateTradeContract")
+    @Operation(summary = "修改贸易合同")
     public BaseResult<String> updateTradeContract(@Valid @RequestBody ContractTradeReqVo reqVo) {
         kwcContractTradeService.update(reqVo);
         return BaseResult.success();
@@ -224,6 +231,7 @@ public class KwcContractSaleController {
      * 修改合同状态 （审核，手动完结）
      */
     @PostMapping("/updateStatus")
+    @Operation(summary = "审批完结贸易合同")
     public BaseResult<Boolean> updateStatus(@Valid @RequestBody ApprovalReq req) {
         return BaseResult.success(kwcContractTradeService.updateStatus(req));
     }
@@ -233,6 +241,7 @@ public class KwcContractSaleController {
      */
 
     @PostMapping("/queryContractDetail")
+    @Operation(summary = "查询贸易合同详情")
     public BaseResult<ContractDetailResp> queryContractDetail(@Valid @RequestBody ContractDetailReq req) {
         return BaseResult.success(kwcContractTradeService.queryContractDetail(req));
     }

sckw-modules/sckw-product/src/main/java/com/sckw/product/controller/KwpGoodsController.java

@@ -265,6 +265,7 @@ public class KwpGoodsController {
      * 查询商品信息
      */
     @PostMapping("/getGoods")
+    @Operation(summary = "查询商品信息", description = "查询商品信息")
     public BaseResult<GoodsInfoResp> getGoods(@Valid @RequestBody GoodsInfoReq req) {
         return BaseResult.success(kwpGoodsService.getGoods(req));
     }

sckw-modules/sckw-system/src/main/java/com/sckw/system/controller/KwsEnterpriseController.java

@@ -9,6 +9,8 @@ import com.sckw.system.model.vo.res.EntFindInfoResp;
 import com.sckw.system.model.vo.res.EntInfoResp;
 import com.sckw.system.model.vo.res.KwsUserSystemTypeVo;
 import com.sckw.system.service.KwsEnterpriseService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
 import jakarta.validation.Valid;
@@ -28,6 +30,7 @@ import java.util.Map;
  */
 @RestController
 @RequestMapping("/kwsEnt")
+@Tag(name = "企业信息相关接口")
 public class KwsEnterpriseController {
 
     @Autowired
@@ -339,6 +342,7 @@ public class KwsEnterpriseController {
      * 查询供应商或者采购方的企业信息
      */
     @PostMapping("/queryEntInfo")
+    @Operation(summary = "查询供应采购托运企业信息")
     public BaseResult<EntInfoResp> queryEntInfo(@RequestBody EntInfoReq req) {
         return BaseResult.success(kwsEntService.queryEntInfo(req));
     }
@@ -356,6 +360,7 @@ public class KwsEnterpriseController {
      * 查询企业
      */
     @PostMapping("/queryKwsEnterprise")
+    @Operation(summary = "查询企业信息")
     public BaseResult<EntInfoResp> queryKwsEnterprise(@RequestBody EntInfoReq req) {
         return BaseResult.success(kwsEntService.queryKwsEnterprise(req));
     }

sckw-modules/sckw-system/src/main/java/com/sckw/system/controller/KwsUserController.java

@@ -22,6 +22,8 @@ import com.sckw.system.model.vo.req.UserAddReqVo;
 import com.sckw.system.model.vo.res.KwsUserResVo;
 import com.sckw.system.model.vo.res.SalesResp;
 import com.sckw.system.service.KwsUserService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
 import jakarta.validation.Valid;
@@ -39,6 +41,7 @@ import java.util.*;
  */
 @RestController
 @RequestMapping("/kwsUser")
+@Tag(name = "用户信息相关接口")
 public class KwsUserController {
 
     @Autowired
@@ -258,6 +261,7 @@ public class KwsUserController {
      * 查询供应方的销售信息
      */
     @PostMapping("/getSales")
+    @Operation(summary = "查询销售信息")
     public BaseResult<SalesResp> getSales(@RequestBody SalesReq req) {
         return BaseResult.success(kwsUserService.getSales(req));
     }