futian.liu
2023-11-14 b0841619e23dd01b8fba9561ad9036c7c3d6aa08
consum-base/src/main/java/com/consum/base/controller/LWhFormProcureController.java
@@ -10,7 +10,7 @@
import com.consum.base.pojo.LWhFormProcureGoodsParams;
import com.consum.base.pojo.LWhFormProcureParam;
import com.consum.base.pojo.LWhProcureModelParams;
import com.consum.base.pojo.query.FormProcureQryDto;
import com.consum.base.pojo.query.FormProcureQry;
import com.consum.base.pojo.response.FormProcureVO;
import com.consum.base.pojo.response.FromProcureTemplateInfoVO;
import com.consum.base.pojo.response.GoodsModelVO;
@@ -103,11 +103,6 @@
        FinSysTenantUser sysTenantUser = this.getSysInfo();
        String tenantId = sysTenantUser.getTenantId();
        String tenantName = sysTenantUser.getTenantName();
//        String tenantId = "100";
//        String tenantName = "河南省分公司";
        // 只能添加本机构仓库的进货单
        //??????
        //
        List<LWhFormProcureGoodsParams> procureGoods = param.getProcureGoods();
        if (CollectionUtils.isEmpty(procureGoods)) {
@@ -228,15 +223,11 @@
        @ApiImplicitParam(name = "param", value = "采购查询条件", required = true, dataType = "FormProcureQryDto", paramType = "query")
    })
    @GetMapping("/list")
    public ResponseValue queryFormProcureList(FormProcureQryDto param) {
    public ResponseValue queryFormProcureList(FormProcureQry param) {
        S_user_core currentUser = this.getCurrentUser();
        if (currentUser == null) {
            return ResponseValue.error("登录用户信息不存在");
        }
        FinSysTenantUser sysInfo = getSysInfo();
        //只能查询本级 及以下机构的进货单
        //??????
        GenericPager genericPager = lWhFormProcureService.queryFormProcureList(param);
        List<LWhFormProcure> data = genericPager.getDatas();
@@ -381,13 +372,13 @@
    @ApiImplicitParams({@ApiImplicitParam(name = "param", value = "采购单明细查询", required = true, dataType = "FormProcureQryDto", paramType = "query")})
    @GetMapping("detail/list")
    public ResponseValue queryFormProcureDetailList() {
        FormProcureQryDto formProcureQryDto = CommonUtil.getObjFromReq(FormProcureQryDto.class);
        FormProcureQry formProcureQry = CommonUtil.getObjFromReq(FormProcureQry.class);
        S_user_core currentUser = this.getCurrentUser();
        if (currentUser == null) {
            return ResponseValue.error("登录用户信息不存在");
        }
        GenericPager genericPager = lWhFormProcureService.queryFormProcureDetailList(formProcureQryDto);
        GenericPager genericPager = lWhFormProcureService.queryFormProcureDetailList(formProcureQry);
        return ResponseValue.success(genericPager);
    }
}