From 40682b5d4c072a4ab2e51b15b36827ba213d9900 Mon Sep 17 00:00:00 2001
From: cy <1664593601@qq.com>
Date: 星期二, 14 十一月 2023 09:43:12 +0800
Subject: [PATCH] feat: 出库调整

---
 consum-base/src/main/java/com/consum/base/controller/LWhFormOutputController.java |   52 ++++++++++++++++++++++++++++++++--------------------
 1 files changed, 32 insertions(+), 20 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 a4b1079..4521463 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
@@ -1,30 +1,39 @@
 package com.consum.base.controller;
 
 import com.consum.base.BaseController;
-import com.consum.base.pojo.*;
-import com.consum.base.service.BaseCategoryServiceImpl;
+import com.consum.base.core.utils.CommonUtil;
+import com.consum.base.pojo.LWhFormOutputExtend;
+import com.consum.base.pojo.LWhFormOutputInsertParam;
+import com.consum.base.pojo.LWhFormOutputParam;
 import com.consum.base.service.LWhFormOutputServiceImpl;
 import com.consum.base.service.LWhGoodsService;
 import com.consum.base.service.LWhProcureModelService;
-import com.consum.model.po.*;
+import com.consum.model.po.FinSysTenantUser;
+import com.consum.model.po.LWhFormOutput;
+import com.consum.model.po.LWhProcureModel;
 import com.iplatform.model.po.S_user_core;
 import com.walker.db.page.GenericPager;
 import com.walker.infrastructure.utils.CollectionUtils;
-import com.walker.infrastructure.utils.StringUtils;
 import com.walker.web.ResponseValue;
-import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiOperation;
 import java.lang.reflect.Field;
 import java.util.ArrayList;
 import java.util.List;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 /**
  * @Description 鍑哄簱鍗�
  * @Author 鍗㈠簡闃�
  * @Date 2023/10/27
  */
+@Api(value = "鍑哄簱鍗�", tags = "鍑哄簱鍗�")
 @RestController
 @RequestMapping("/pc/l/wh/form/output")
 public class LWhFormOutputController extends BaseController {
@@ -41,22 +50,30 @@
      * @Author 鍗㈠簡闃�
      * @Date 2023/10/27
      */
+    @ApiOperation(value = "鏂板鍑哄簱鍗�", notes = "鏂板鍑哄簱鍗�")
+//    @ApiImplicitParam(name = "param", value = "鍑哄簱鍗曞疄浣�", required = true, dataType = "LWhFormOutputInsertParam", paramType = "body")
     @PostMapping("/add")
-    public ResponseValue add(@RequestBody LWhFormOutputInsertParam param) {
+    public ResponseValue add() {
+        LWhFormOutputInsertParam param = CommonUtil.getObjFromReqBody(LWhFormOutputInsertParam.class);
         S_user_core currentUser = this.getCurrentUser();
         if (currentUser == null) {
             return ResponseValue.error("鐧诲綍鐢ㄦ埛淇℃伅涓嶅瓨鍦�");
         }
-        int result = this.lWhFormOutputService.add(param, currentUser,this.getSysInfo());
-        if (result > 0) return ResponseValue.success(1);
+        int result = this.lWhFormOutputService.add(param, currentUser, this.getSysInfo());
+        if (result > 0) {
+            return ResponseValue.success(1);
+        }
         return ResponseValue.error("鏂板澶辫触锛�");
     }
 
     /**
      * @Description 鍒楄〃鏌ヨ
      */
+    @ApiOperation(value = "鍒楄〃鏌ヨ", notes = "鍒楄〃鏌ヨ")
+    @ApiImplicitParam(name = "param", value = "鍑哄簱鍗曞疄浣�", required = true, dataType = "LWhFormOutputParam", paramType = "query")
     @GetMapping("/list")
-    public ResponseValue queryFormOutputList(LWhFormOutputParam param) {
+    public ResponseValue queryFormOutputList() {
+        LWhFormOutputParam param = CommonUtil.getObjFromReq(LWhFormOutputParam.class);
         S_user_core currentUser = this.getCurrentUser();
         if (currentUser == null) {
             return ResponseValue.error("鐧诲綍鐢ㄦ埛淇℃伅涓嶅瓨鍦�");
@@ -116,23 +133,18 @@
     }
 
     /**
-     * @Description  鏍规嵁浠撳簱id鍜屽瀷鍙穒d 鏌ヨ搴撳瓨
+     * @Description 鏍规嵁浠撳簱id鍜屽瀷鍙穒d 鏌ヨ搴撳瓨
      * @Author 鍗㈠簡闃�
      * @Date 2023/11/2
      */
     @GetMapping("/select/number")
-    public ResponseValue selectNumber(Long warehouseId,Long baseGoodsModelsId) {
+    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);
+        int num = this.lWhGoodsService.queryGoodsModelNum(0, warehouseId, baseGoodsModelsId, (short) 1, null);
         return ResponseValue.success(num);
     }
-
-
-
-
-
 
 
 }

--
Gitblit v1.9.1