维多利亚

hx-service-api/victoriatourist-api/src/main/java/com/fjhx/entity/stock/ManualVo.java → hx-service-api/victoriatourist-api/src/main/java/com/fjhx/entity/stock/ManualOutDto.java

@@ -6,7 +6,7 @@ import lombok.Data;
 import java.util.List;
 
 @Data
-public class ManualVo {
+public class ManualOutDto {
 
     /**
      * 仓库id

hx-service-api/victoriatourist-api/src/main/java/com/fjhx/enums/stock/OutTypeEnum.java

@@ -25,14 +25,8 @@ public enum OutTypeEnum {
 
     // business_id = 自定义id
     PICKING(3, "领料出库"),
-
-    // business_id = 自定义id
     SALE(4, "销售出库"),
-
-    // business_id = 自定义id
     RETURN_GOODS(5, "退货出库"),
-
-    // business_id = 自定义id
     SCRAP(6, "报废出库"),
 
     // ======== 手动出库明细 ========

hx-service-api/victoriatourist-api/src/main/java/com/fjhx/params/stock/ManualInStockVo.java → hx-service-api/victoriatourist-api/src/main/java/com/fjhx/params/stock/ManualInDto.java

@@ -5,7 +5,7 @@ import lombok.Data;
 import java.util.List;
 
 @Data
-public class ManualInStockVo {
+public class ManualInDto {
 
     /**
      * 仓库id

hx-service/victoriatourist/src/main/java/com/fjhx/controller/stock/ManualInStockController.java

@@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fjhx.base.Condition;
 import com.fjhx.entity.stock.StockJournal;
 import com.fjhx.enums.stock.InTypeEnum;
-import com.fjhx.params.stock.ManualInStockVo;
+import com.fjhx.params.stock.ManualInDto;
 import com.fjhx.params.stock.StockChangeDto;
 import com.fjhx.service.stock.StockJournalService;
 import com.fjhx.service.stock.StockService;
@@ -42,13 +42,13 @@ public class ManualInStockController {
     }
 
     @PostMapping("/add")
-    public R add(@RequestBody ManualInStockVo entity) {
+    public R add(@RequestBody ManualInDto manualInDto) {
         StockChangeDto stockChangeDto = new StockChangeDto();
         stockChangeDto.setDefaultBusinessId(IdWorker.getId());
-        stockChangeDto.setDefaultWarehouseId(entity.getWarehouseId());
-        stockChangeDto.setDefaultRemarks(entity.getRemarks());
+        stockChangeDto.setDefaultWarehouseId(manualInDto.getWarehouseId());
+        stockChangeDto.setDefaultRemarks(manualInDto.getRemarks());
         stockChangeDto.setTypeEnum(InTypeEnum.MANUAL);
-        stockChangeDto.setChangeDetailsList(entity.getChangeProductList());
+        stockChangeDto.setChangeDetailsList(manualInDto.getChangeProductList());
 
         stockService.changeQuantity(stockChangeDto);
         return R.success();

hx-service/victoriatourist/src/main/java/com/fjhx/controller/stock/ManualOutStockController.java

@@ -3,7 +3,7 @@ package com.fjhx.controller.stock;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fjhx.base.Condition;
-import com.fjhx.entity.stock.ManualVo;
+import com.fjhx.entity.stock.ManualOutDto;
 import com.fjhx.enums.stock.OutTypeEnum;
 import com.fjhx.params.stock.StockChangeDto;
 import com.fjhx.service.stock.StockJournalService;
@@ -30,23 +30,23 @@ public class ManualOutStockController {
     @Autowired
     private StockJournalService stockJournalService;
 
+    @PostMapping("page")
+    public R page(@RequestBody Condition condition) {
+        Page<Map<String, Object>> page = stockJournalService.getManualOutPage(condition);
+        return R.success(page);
+    }
+
     @PostMapping("/add")
-    public R add(@RequestBody ManualVo manualVo) {
+    public R add(@RequestBody ManualOutDto manualOutDto) {
         StockChangeDto stockChangeDto = new StockChangeDto();
         stockChangeDto.setDefaultBusinessId(IdWorker.getId());
-        stockChangeDto.setDefaultWarehouseId(manualVo.getWarehouseId());
-        stockChangeDto.setDefaultRemarks(manualVo.getRemarks());
-        stockChangeDto.setTypeEnum(OutTypeEnum.getEnumByKey(manualVo.getType()));
-        stockChangeDto.setChangeDetailsList(manualVo.getChangeProductList());
+        stockChangeDto.setDefaultWarehouseId(manualOutDto.getWarehouseId());
+        stockChangeDto.setDefaultRemarks(manualOutDto.getRemarks());
+        stockChangeDto.setTypeEnum(OutTypeEnum.getEnumByKey(manualOutDto.getType()));
+        stockChangeDto.setChangeDetailsList(manualOutDto.getChangeProductList());
 
         stockService.changeQuantity(stockChangeDto);
         return R.success();
     }
 
-    @PostMapping("page")
-    public R page(@RequestBody Condition condition) {
-        Page<Map<String, Object>> page = stockJournalService.getManualOutPage(condition);
-        return R.success(page);
-    }
-
 }