add:物料

wms_pro/hd/.idea/sonarlint/issuestore/1/0/10e40d67bd7d0818c5483704f020703d1bef8378

@@ -1,2 +0,0 @@
-
-N	java:S106."9Replace this use of System.out or System.err by a logger.(<28><><EFBFBD><EFBFBD>

wms_pro/hd/.idea/sonarlint/issuestore/4/9/491288c6a971edd368823e6e6d6a676827d0d7b8

@@ -1,3 +0,0 @@
-
-k	java:S117I"QRename this local variable to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(<28><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>

-k	java:S117N"QRename this local variable to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(<28><>Ђ<EFBFBD><D082><EFBFBD><EFBFBD><EFBFBD>

wms_pro/hd/.idea/sonarlint/issuestore/index.pb

@@ -3,8 +3,6 @@ q
 Anladmin-system/src/main/java/org/nl/common/anno/Datazhuazhua.java,3/6/363ec6c9460095b38992146a934751ba30bef9af
 <EFBFBD>

 Ynladmin-system/src/main/java/org/nl/wms/system_manage/controller/dept/DeptController.java,a/a/aa9ec186e2a7aa1989de50b7632ac6126cea19a9
-_
-/nladmin-system/src/main/java/org/nl/AppRun.java,1/0/10e40d67bd7d0818c5483704f020703d1bef8378
 <EFBFBD>

 _nladmin-system/src/main/java/org/nl/wms/system_manage/controller/monitor/MonitorController.java,5/b/5bf8a103b07bcc6e53d76381558cf3ce51acec97
 <EFBFBD>

@@ -50,6 +48,4 @@ inladmin-system/src/main/java/org/nl/wms/base_manage/field_mapping/service/dao/B
 <EFBFBD>

 vnladmin-system/src/main/java/org/nl/wms/base_manage/field_mapping/service/dao/mapper/BmExternalFieldMappingMapper.java,3/8/3828de74f3f9d1252984dd2c3524e61bc6632160
 <EFBFBD>

-ynladmin-system/src/main/java/org/nl/wms/base_manage/field_mapping/service/dao/mapper/xml/BmExternalFieldMappingMapper.xml,8/5/8579f2942008652ebd59f8eed6fafca608a42516
-<EFBFBD>

-rnladmin-system/src/main/java/org/nl/wms/base_manage/field_mapping/controller/BmExternalFieldMappingController.java,4/9/491288c6a971edd368823e6e6d6a676827d0d7b8
+ynladmin-system/src/main/java/org/nl/wms/base_manage/field_mapping/service/dao/mapper/xml/BmExternalFieldMappingMapper.xml,8/5/8579f2942008652ebd59f8eed6fafca608a42516

wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/material/controller/BmMaterialController.java

@@ -0,0 +1,72 @@
+package org.nl.wms.base_manage.material.controller;
+
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import org.nl.common.TableDataInfo;
+import org.nl.common.domain.entity.PageQuery;
+import org.nl.common.utils.RedissonUtils;
+import org.nl.wms.base_manage.material.service.IBmMaterialService;
+import org.nl.wms.base_manage.material.service.dao.BmMaterial;
+import org.nl.wms.base_manage.material.service.dto.MaterialQuery;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.Arrays;
+
+/**
+ * <p>
+ * 物料基本信息表 前端控制器
+ * </p>
+ *
+ * @author generator
+ * @since 2023-04-26
+ */
+@RestController
+@RequestMapping("/api/bmMaterial")
+public class BmMaterialController {
+
+    @Autowired
+    private IBmMaterialService materialService;
+
+    @GetMapping
+    public ResponseEntity<Object> getAll(MaterialQuery query, PageQuery page) {
+        return new ResponseEntity<>(TableDataInfo.build(materialService.page(page.build(), query.build())), HttpStatus.OK);
+    }
+
+    @PostMapping
+    public ResponseEntity<Object> create(@Validated @RequestBody BmMaterial dto) {
+        materialService.save(dto);
+        return new ResponseEntity<>(HttpStatus.CREATED);
+    }
+
+
+    @PutMapping
+    public ResponseEntity<Object> update(@Validated @RequestBody BmMaterial dto) {
+        materialService.update(dto, new LambdaUpdateWrapper<BmMaterial>().eq(BmMaterial::getMaterial_id, dto.getMaterial_id()));
+        return new ResponseEntity<>(HttpStatus.OK);
+    }
+
+
+    @DeleteMapping
+    public ResponseEntity<Object> delete(@RequestBody Long[] ids) {
+        if (ids.length > 0) {
+            materialService.removeByIds(Arrays.asList(ids));
+        }
+        return new ResponseEntity<>(HttpStatus.OK);
+    }
+
+    @PostMapping("/excelImport")
+    public ResponseEntity<Object> excelImport(@RequestParam("file") MultipartFile file, HttpServletRequest request, HttpServletResponse response) {
+        RedissonUtils.lock(() ->
+        {
+            materialService.excelImport(file, request, response);
+        }, "物料基础信息导入", null);
+        return new ResponseEntity<>(HttpStatus.OK);
+    }
+}
+

wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/material/service/IBmMaterialService.java

@@ -0,0 +1,31 @@
+package org.nl.wms.base_manage.material.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.nl.wms.base_manage.material.service.dao.BmMaterial;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 物料基本信息表 服务类
+ * </p>
+ *
+ * @author generator
+ * @since 2023-04-26
+ */
+public interface IBmMaterialService extends IService<BmMaterial>{
+     /**
+      * 物料基础信息导入
+      */
+     void excelImport(MultipartFile file, HttpServletRequest request, HttpServletResponse response)
+        throws IOException;
+
+     List<Map> pageQuery(Map whereJson);
+
+     void create(BmMaterial entity);
+}

wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/material/service/dao/BmMaterial.java

@@ -0,0 +1,150 @@
+package org.nl.wms.base_manage.material.service.dao;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * <p>
+ * 物料基本信息表
+ * </p>
+ *
+ * @author generator
+ * @since 2023-04-26
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName("bm_material")
+public class BmMaterial implements Serializable {
+    private static final long serialVersionUID = 1L;
+    /**
+     * 车间
+     */
+    private String product_area;
+    /**
+     * 物料标识
+     */
+    @TableId
+    private String material_id;
+    /**
+     * 物料编码
+     */
+    private String material_code;
+    /**
+     * 物料名称
+     */
+    private String material_name;
+    /**
+     * 规格
+     */
+    private String material_spec;
+    /**
+     * 型号
+     */
+    private String material_model;
+    /**
+     * 外文名称
+     */
+    private String english_name;
+    /**
+     * 基本计量单位
+     */
+    private String base_unit_id;
+    /**
+     * 辅助计量单位
+     */
+    private String assist_unit_id;
+    /**
+     * 批准文号
+     */
+    private String approve_fileno;
+    /**
+     * 工程图号
+     */
+    private String print_no;
+    /**
+     * 物料分类标识
+     */
+    private String material_type_id;
+    /**
+     * 长度单位
+     */
+    private String len_unit_id;
+    /**
+     * 物料长度
+     */
+    private BigDecimal length;
+    /**
+     * 物料宽度
+     */
+    private BigDecimal width;
+    /**
+     * 物料高度
+     */
+    private BigDecimal height;
+    /**
+     * 重量单位
+     */
+    private String weight_unit_id;
+    /**
+     * 物料毛重
+     */
+    private BigDecimal gross_weight;
+    /**
+     * 物料净重
+     */
+    private BigDecimal net_weight;
+    /**
+     * 体积单位
+     */
+    private String cubage_unit_id;
+    /**
+     * 物料体积
+     */
+    private BigDecimal cubage;
+    /**
+     * 创建人
+     */
+    private String create_id;
+    /**
+     * 创建人姓名
+     */
+    private String create_name;
+    /**
+     * 创建时间
+     */
+    private String create_time;
+    /**
+     * 修改人
+     */
+    private String update_id;
+    /**
+     * 修改人姓名
+     */
+    private String update_name;
+    /**
+     * 修改时间
+     */
+    private String update_time;
+    /**
+     * 启用时间
+     */
+    private String is_used_time;
+    /**
+     * 是否启用
+     */
+    private Boolean is_used;
+    /**
+     * 是否删除
+     */
+    private Boolean is_delete;
+    /**
+     * 外部标识
+     */
+    private String ext_id;
+
+}

wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/material/service/dao/mapper/BmMaterialMapper.java

@@ -0,0 +1,23 @@
+package org.nl.wms.base_manage.material.service.dao.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+import org.nl.common.domain.entity.PageQuery;
+import org.nl.wms.base_manage.material.service.dao.BmMaterial;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 物料基本信息表 Mapper 接口
+ * </p>
+ *
+ * @author generator
+ * @since 2023-04-26
+ */
+public interface BmMaterialMapper extends BaseMapper<BmMaterial> {
+
+
+    List<Map> queryAll(Map whereJson);
+}

wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/material/service/dao/mapper/xml/BmMaterialMapper.xml

@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.nl.wms.base_manage.material.service.dao.mapper.BmMaterialMapper">
+    <select id="queryAll" resultType="java.util.Map">
+        SELECT
+        mb.*,
+        class.class_code,
+        class.class_name,
+        unit_name, '50' as standard_weight,
+        unit_name as base_unit_name,
+        class2.class_code as product_series_code,
+        class2.class_name as product_series_name
+        FROM
+        md_me_materialbase mb
+        LEFT JOIN MD_PB_ClassStandard class ON class.class_id = mb.material_type_id
+        LEFT JOIN md_pb_measureunit unit ON unit.measure_unit_id = mb.base_unit_id
+        left join MD_PB_ClassStandard class2 on class2.class_id =mb.product_series
+        WHERE mb.is_delete = '0'
+        <if test="idssql != null and idssql != ''">
+            and ${idssql}
+        </if>
+        <if test="search != null and search != ''">
+            and (
+            mb.material_code like '%${search}%'
+            OR
+            mb.material_name like '%${search}%'
+            )
+        </if>
+        <if test="class_code != null and class_code != ''">
+            and class.class_code like '%${class_code}%'
+        </if>
+        <if test="raw_material_code != null and raw_material_code != ''">
+            and mb.material_code like '${raw_material_code}%'
+        </if>
+        <if test="classIds != null and classIds != ''">
+            and class.class_id in ${classIds}
+        </if>
+    </select>
+</mapper>

wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/material/service/dto/MaterialQuery.java

@@ -0,0 +1,28 @@
+package org.nl.wms.base_manage.material.service.dto;
+
+import lombok.Data;
+import org.nl.common.domain.entity.BaseQuery;
+import org.nl.common.domain.entity.QParam;
+import org.nl.common.enums.QueryTEnum;
+import org.nl.wms.base_manage.field_mapping.service.dao.BmExternalFieldMapping;
+import org.nl.wms.base_manage.material.service.dao.BmMaterial;
+
+/*
+ * @author ZZQ
+ * @Date 2023/5/4 19:49
+ */
+@Data
+public class MaterialQuery extends BaseQuery<BmMaterial> {
+
+
+    private String local_table_name;
+    private String search;
+
+    @Override
+    public void paramMapping() {
+        super.doP.put("local_table_name", QParam.builder().k(new String[]{"local_table_name"}).type(QueryTEnum.EQ).build());
+        super.doP.put("search", QParam.builder().k(new String[]{"local_field_name", "external_field_name"}).type(QueryTEnum.EQ).build());
+    }
+
+
+}

wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/material/service/impl/BmMaterialServiceImpl.java

@@ -0,0 +1,55 @@
+package org.nl.wms.base_manage.material.service.impl;
+
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import cn.hutool.poi.excel.ExcelReader;
+import cn.hutool.poi.excel.ExcelUtil;
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.nl.common.domain.exception.BadRequestException;
+import org.nl.common.utils.IdUtil;
+import org.nl.common.utils.SecurityUtils;
+import org.nl.wms.base_manage.material.service.IBmMaterialService;
+import org.nl.wms.base_manage.material.service.dao.BmMaterial;
+import org.nl.wms.base_manage.material.service.dao.mapper.BmMaterialMapper;
+import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 物料基本信息表 服务实现类
+ * </p>
+ *
+ * @author generator
+ * @since 2023-04-26
+ */
+@Service
+public class BmMaterialServiceImpl extends ServiceImpl<BmMaterialMapper, BmMaterial> implements IBmMaterialService {
+
+    @Override
+    public List<Map> pageQuery(Map whereJson) {
+        return this.baseMapper.queryAll(whereJson);
+    }
+
+    @Override
+    public void create(BmMaterial entity) {
+        this.baseMapper.insert(entity);
+    }
+
+
+    @Override
+    public void excelImport(MultipartFile file, HttpServletRequest request, HttpServletResponse response) {
+
+    }
+}