wurenji
/
erp-ht
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

This commit is contained in:
mash 2024-10-14 17:00:34 +08:00
parent 45273128ac 751e88f6cd
commit 09e1de4289
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
xingyun-sc/src/main/java/com/lframework/xingyun/sc/controller/ydool/YdoolPurchaseOrderController.java
View File

@ -2,6 +2,9 @@ package com.lframework.xingyun.sc.controller.ydool;
import com.lframework.starter.web.annotations.OpenApi; import com.lframework.starter.web.annotations.OpenApi;
import com.lframework.starter.web.annotations.security.HasPermission; import com.lframework.starter.web.annotations.security.HasPermission;
import com.lframework.starter.web.common.security.AbstractUserDetails;
import com.lframework.starter.web.common.utils.ApplicationUtil;
import com.lframework.starter.web.components.security.UserDetailsService;
import com.lframework.starter.web.controller.DefaultBaseController; import com.lframework.starter.web.controller.DefaultBaseController;
import com.lframework.starter.web.resp.InvokeResult; import com.lframework.starter.web.resp.InvokeResult;
import com.lframework.starter.web.resp.InvokeResultBuilder; import com.lframework.starter.web.resp.InvokeResultBuilder;
@ -10,6 +13,8 @@ import com.lframework.xingyun.sc.bo.purchase.GetPurchaseOrderBo;
import com.lframework.xingyun.sc.dto.purchase.PurchaseOrderFullDto; import com.lframework.xingyun.sc.dto.purchase.PurchaseOrderFullDto;
import com.lframework.xingyun.sc.service.purchase.PurchaseOrderService; import com.lframework.xingyun.sc.service.purchase.PurchaseOrderService;
import com.lframework.xingyun.sc.vo.ydool.YdoolApproveOrderVo; import com.lframework.xingyun.sc.vo.ydool.YdoolApproveOrderVo;
import com.lframework.xingyun.template.inner.controller.AuthController;
import com.lframework.xingyun.template.inner.dto.LoginDto;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
@ -57,6 +62,13 @@ public class YdoolPurchaseOrderController extends DefaultBaseController {
@GetMapping @GetMapping
public InvokeResult<GetPurchaseOrderBo> findById( public InvokeResult<GetPurchaseOrderBo> findById(
@NotBlank(message = "订单ID不能为空！") String id) { @NotBlank(message = "订单ID不能为空！") String id) {
// AuthController authController = ApplicationUtil.getBean(AuthController.class);
// UserDetailsService userDetailsService = ApplicationUtil.getBean(UserDetailsService.class);
// AbstractUserDetails user = userDetailsService.loadUserByUsername("yanxiaomao1");
//
// LoginDto dto = authController.doLogin(user);
//
// authController.addAttributesToSession(user);
PurchaseOrderFullDto data = purchaseOrderService.getDetail(id); PurchaseOrderFullDto data = purchaseOrderService.getDetail(id);