|
|
@@ -3,6 +3,8 @@ package com.fjhx.wms.controller.stock;
|
|
|
import com.baomidou.dynamic.datasource.annotation.DS;
|
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
|
import com.fjhx.common.constant.SourceConstant;
|
|
|
+import com.fjhx.item.entity.product.IssueImportExcelBo;
|
|
|
+import com.fjhx.item.service.product.ProductInfoService;
|
|
|
import com.fjhx.wms.entity.stock.dto.StockWaitDetailsDto;
|
|
|
import com.fjhx.wms.entity.stock.dto.StockWaitDto;
|
|
|
import com.fjhx.wms.entity.stock.dto.StockWaitSelectDto;
|
|
|
@@ -10,10 +12,8 @@ import com.fjhx.wms.entity.stock.vo.StockWaitVo;
|
|
|
import com.fjhx.wms.service.stock.StockWaitService;
|
|
|
import com.ruoyi.common.core.domain.BaseSelectDto;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
-import org.springframework.web.bind.annotation.PostMapping;
|
|
|
-import org.springframework.web.bind.annotation.RequestBody;
|
|
|
-import org.springframework.web.bind.annotation.RequestMapping;
|
|
|
-import org.springframework.web.bind.annotation.RestController;
|
|
|
+import org.springframework.web.bind.annotation.*;
|
|
|
+import org.springframework.web.multipart.MultipartFile;
|
|
|
|
|
|
import javax.servlet.http.HttpServletResponse;
|
|
|
import java.util.List;
|
|
|
@@ -35,6 +35,9 @@ public class StockWaitController {
|
|
|
@Autowired
|
|
|
private StockWaitService stockWaitService;
|
|
|
|
|
|
+ @Autowired
|
|
|
+ private ProductInfoService productInfoService;
|
|
|
+
|
|
|
/**
|
|
|
* 待出入库分页
|
|
|
*/
|
|
|
@@ -116,4 +119,12 @@ public class StockWaitController {
|
|
|
stockWaitService.inStockWaitExportExcel(httpServletResponse, ids);
|
|
|
}
|
|
|
|
|
|
+ /**
|
|
|
+ * 出入库明细产品导入
|
|
|
+ */
|
|
|
+ @PostMapping("/issueExcelImport")
|
|
|
+ public List<IssueImportExcelBo> issueExcelImport(@RequestParam("file") MultipartFile file) {
|
|
|
+ return productInfoService.issueImportExcel(file);
|
|
|
+ }
|
|
|
+
|
|
|
}
|
yzc