From 717ff115ee5c57c8df0fd491b40b848090d2c68e Mon Sep 17 00:00:00 2001 From: cy <1664593601@qq.com> Date: 星期一, 20 十一月 2023 14:48:53 +0800 Subject: [PATCH] feat: 台账库存查询、导出 --- consum-base/src/main/java/com/consum/base/controller/LWhFormOutputController.java | 27 ++++++++------------------- 1 files changed, 8 insertions(+), 19 deletions(-) diff --git a/consum-base/src/main/java/com/consum/base/controller/LWhFormOutputController.java b/consum-base/src/main/java/com/consum/base/controller/LWhFormOutputController.java index 4d66964..ca0024f 100644 --- a/consum-base/src/main/java/com/consum/base/controller/LWhFormOutputController.java +++ b/consum-base/src/main/java/com/consum/base/controller/LWhFormOutputController.java @@ -15,6 +15,7 @@ import com.consum.base.service.LWhFormOutputServiceImpl; import com.consum.base.service.LWhGoodsService; import com.consum.base.service.LWhProcureModelService; +import com.consum.model.po.FinSysTenantUser; import com.consum.model.po.LWhFormOutput; import com.iplatform.model.po.S_user_core; import com.walker.db.page.GenericPager; @@ -91,7 +92,12 @@ if (currentUser == null) { return ResponseValue.error("鐧诲綍鐢ㄦ埛淇℃伅涓嶅瓨鍦�"); } - + /*褰撳墠鐧诲綍浜哄彧鑳界湅鍒拌嚜宸辨満鏋勪笅鐨勫垪琛�*/ + FinSysTenantUser sysInfo = this.getSysInfo(); + String tenantId = sysInfo.getTenantId(); + if (param.getAgencyId() == null) { + param.setAgencyId(Long.valueOf(tenantId)); + } GenericPager genericPager = lWhFormOutputService.queryFormOutputList(param); List<LWhFormOutput> data = genericPager.getDatas(); @@ -175,24 +181,7 @@ return ResponseValue.success("鏌ヨ鎴愬姛!", lWhFormOutputExtendVO); } - /** - * @Description 鏍规嵁浠撳簱id鍜屽瀷鍙穒d 鏌ヨ搴撳瓨 - * @Author 鍗㈠簡闃� - * @Date 2023/11/2 - */ - @ApiOperation(value = "鏍规嵁浠撳簱id鍜屽瀷鍙穒d 鏌ヨ搴撳瓨", notes = "鏍规嵁浠撳簱id鍜屽瀷鍙穒d 鏌ヨ搴撳瓨") - @ApiImplicitParams({ - @ApiImplicitParam(name = "warehouseId", value = "浠撳簱id", required = true, dataType = "Long", paramType = "query"), - @ApiImplicitParam(name = "baseGoodsModelsId", value = "鍨嬪彿id", required = true, dataType = "Long", paramType = "query") - }) - @GetMapping("/select/number") - public ResponseValue selectNumber(Long warehouseId, Long baseGoodsModelsId) { - if (warehouseId == null || baseGoodsModelsId == null) { - return ResponseValue.error("鍙傛暟閿欒"); - } - int num = this.lWhGoodsService.queryGoodsModelNum(0, warehouseId, baseGoodsModelsId, (short) 1, null); - return ResponseValue.success(num); - } + @ApiOperation(value = "鏌ヨ鍑哄簱鍗曡鎯呮槑缁�", notes = "鏌ヨ鍑哄簱鍗曡鎯呮槑缁�") @ApiImplicitParam(name = "formOutputQry", value = "鍑哄簱鍗曡鎯呮煡璇㈡潯浠�", required = true, dataType = "LWhFormOutputQry", paramType = "query") -- Gitblit v1.9.1