From b0841619e23dd01b8fba9561ad9036c7c3d6aa08 Mon Sep 17 00:00:00 2001 From: futian.liu <liufutianyoo@163.com> Date: 星期二, 14 十一月 2023 14:05:20 +0800 Subject: [PATCH] 出库单管理 --- consum-base/src/main/java/com/consum/base/controller/LWhFormProcureController.java | 17 ++++------------- 1 files changed, 4 insertions(+), 13 deletions(-) diff --git a/consum-base/src/main/java/com/consum/base/controller/LWhFormProcureController.java b/consum-base/src/main/java/com/consum/base/controller/LWhFormProcureController.java index a3a2f81..0bef5bb 100644 --- a/consum-base/src/main/java/com/consum/base/controller/LWhFormProcureController.java +++ b/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); } } -- Gitblit v1.9.1