PC物料导入添加

mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/materialBaseInfo/MaterialBaseInfoDTO.java

@@ -13,6 +13,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.math.BigDecimal;
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -74,6 +75,9 @@ public class MaterialBaseInfoDTO extends BaseVOEntity {
     @Excel(name = "物料分类名称")
     @TableField(typeHandler = ListTypeHandler.class)
     private List<String> materialClassifyName;
+    @ApiModelProperty("物料分类（导入）")
+    @Excel(name = "物料分类")
+    private String materialClassifyImport;
 
     @ApiModelProperty("物料种类编码 数据字典")
     @Excel(name = "物料种类编码 数据字典")
@@ -82,6 +86,9 @@ public class MaterialBaseInfoDTO extends BaseVOEntity {
     @ApiModelProperty("物料种类名称 数据字典")
     @Excel(name = "物料种类名称 数据字典")
     private String materialTypeName;
+    @ApiModelProperty("物料种类（导入）")
+    @Excel(name = "物料种类")
+    private String materialTypeImport;
 
     @ApiModelProperty("包装规格id")
     @Excel(name = "包装规格id")
@@ -94,6 +101,9 @@ public class MaterialBaseInfoDTO extends BaseVOEntity {
     @ApiModelProperty("包装规格名称")
     @Excel(name = "包装规格名称")
     private String packName;
+    @ApiModelProperty("包装规格（导入）")
+    @Excel(name = "包装规格")
+    private String packImport;
 
     @ApiModelProperty("包装单位编码")
     @Excel(name = "包装单位编码")
@@ -102,6 +112,12 @@ public class MaterialBaseInfoDTO extends BaseVOEntity {
     @ApiModelProperty("包装单位名称")
     @Excel(name = "包装单位名称")
     private String unitName;
+    @ApiModelProperty("物料单位（导入）")
+    @Excel(name = "物料单位")
+    private String unitImport;
+    @ApiModelProperty("单位（导入）")
+    @Excel(name = "单位")
+    private String unitImport2;
 
     @ApiModelProperty("品牌id")
     @Excel(name = "品牌id")
@@ -192,32 +208,56 @@ public class MaterialBaseInfoDTO extends BaseVOEntity {
     private Integer common;
 
     @ApiModelProperty("SKU码")
+    @Excel(name = "SKU码")
     private String skuCode;
 
     @ApiModelProperty("单价")
+    @Excel(name = "单价")
     private BigDecimal unitPrice;
 
     @ApiModelProperty("币制")
+    @Excel(name = "币制")
     private String currency;
 
     @ApiModelProperty("原产国")
+    @Excel(name = "原产国")
     private String originCountry;
 
     @ApiModelProperty("HS码")
+    @Excel(name = "HS码")
     private String hsCode;
+    @ApiModelProperty("HS编码（导入）")
+    @Excel(name = "HS编码")
+    private String hsCodeImport;
 
     @ApiModelProperty("申报单位")
+    @Excel(name = "申报单位")
     private String declarationUnit;
 
     @ApiModelProperty("法定单位")
+    @Excel(name = "法定单位")
     private String statutoryUnit;
 
     @ApiModelProperty("法定第二单位")
+    @Excel(name = "法定第二单位")
     private String statutorySecondUnit;
 
     @ApiModelProperty("规格型号")
+    @Excel(name = "规格型号")
     private String specificationModel;
 
     @ApiModelProperty("批次ID")
     private Long batchId;
+
+    @ApiModelProperty("批次规则（导入：批次名称）")
+    @Excel(name = "批次规则")
+    private String batchRuleNameImport;
+
+    @ApiModelProperty("批次名称（导入）")
+    @Excel(name = "批次名称")
+    private String batchName;
+
+    @ApiModelProperty("批次（导入）")
+    @Excel(name = "批次")
+    private String batchImport;
 }

mhd_wms/src/main/java/com/mhd/wms/interfaces/facadeApi/materialBaseInfo/MaterialBaseInfoApi.java

@@ -13,6 +13,7 @@ import com.mhd.wms.interfaces.dto.materialBaseInfo.MaterialBaseInfoDTO;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
 import java.util.List;
@@ -95,6 +96,15 @@ public class MaterialBaseInfoApi extends BaseController {
         return R.ok(materialBaseInfoApplicationService.getInfoByNoOrderReceipt(materialBaseInfoDO));
     }
 
+    /**
+     * 导入物料主数据
+     */
+    @ApiOperation("导入物料主数据")
+    @PostMapping("/importData")
+    public AjaxResult importData(@RequestParam("file") MultipartFile file) {
+        return materialBaseInfoApplicationService.importData(file);
+    }
+