新增生产厂商模块接口

jyzb-api/src/main/java/com/junmp/jyzb/api/bean/dto/OrderDto.java

@@ -69,6 +69,11 @@ public class OrderDto implements Serializable {
      * 单据包含的物资集合
      */
     private String  invList;
+
+    /**
+     * 生产厂商id
+     */
+    private String manufacturerId;
     /**
      * 明细列表
      */

jyzb-api/src/main/java/com/junmp/jyzb/api/bean/dto/OrderMainDto.java

@@ -61,4 +61,9 @@ public class OrderMainDto implements Serializable {
     //单据状态（入库状态）
     private String orderState;
 
+    /**
+     * 生产厂商id
+     */
+    private String manufacturerId;
+
 }

jyzb-api/src/main/java/com/junmp/jyzb/api/bean/query/OrderMainReq.java

@@ -82,7 +82,12 @@ public class OrderMainReq extends BaseRequest {
     private String typeId;
 
     //排序字段
-    private String sortTableField;
+    private String column;
     //排序规则
-    private String sortRules;
+    private String order;
+
+    /**
+     * 生产厂商id
+     */
+    private String manufacturerId;
 }

jyzb-api/src/main/java/com/junmp/jyzb/api/bean/req/ManufacturerReq.java

+package com.junmp.jyzb.api.bean.req;
+import com.junmp.v2.common.bean.request.BaseRequest;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import javax.validation.constraints.NotBlank;
+import java.util.Date;
+import java.util.List;
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class ManufacturerReq extends BaseRequest {
+    /**
+     * 生产厂商id
+     */
+    @NotBlank(message = "生产厂商id不能为空",groups = {edit.class})
+    private String id;
+
+    /**
+     * 厂商名称
+     */
+    @NotBlank(message = "生产厂商名称不能为空",groups = {add.class})
+    private String name;
+
+    /**
+     * 厂商短码
+     */
+    private String code;
+
+    /**
+     * 简称
+     */
+    private String shortName;
+
+    /**
+     * 联系人
+     */
+    private String contacts;
+
+    /**
+     * 联系电话
+     */
+    private String phone;
+
+    /**
+     * 状态（1为启用，0为禁用）
+     */
+    private String state;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+    /**
+     * 创建人员
+     */
+    private String createUser;
+
+    /**
+     * 更新时间
+     */
+    private Date updateTime;
+
+    /**
+     * 更新人员
+     */
+    private String updateUser;
+
+    /**
+     * 批量删除供应厂商id
+     */
+    private List<String> deleteList;
+}

jyzb-api/src/main/java/com/junmp/jyzb/api/bean/req/UpdateOrderReq.java

@@ -101,7 +101,10 @@ public class UpdateOrderReq extends BaseRequest implements Serializable {
      */
     private List<DetailListReq>  detailList;
 
-
+    /**
+     * 生产厂商id
+     */
+    private String manufacturerId;
 
 }
 

jyzb-api/src/main/java/com/junmp/jyzb/api/exception/enums/ManufacturerExceptionEnum.java

+package com.junmp.jyzb.api.exception.enums;
+
+import com.junmp.v2.common.constant.CommonConstant;
+import com.junmp.v2.common.exception.IExceptionEnum;
+import lombok.Getter;
+
+
+@Getter
+public enum ManufacturerExceptionEnum implements IExceptionEnum {
+    MANUTACTURER_IS_EXIST(CommonConstant.DEFAULT_USER_ERROR_CODE,"生产厂商已经存在")
+    ;
+
+    /**
+     * 错误编码
+     */
+    private final Integer code;
+
+    /**
+     * 提示用户信息
+     */
+    private final String message;
+
+
+    ManufacturerExceptionEnum(Integer code, String message) {
+        this.code = code;
+        this.message = message;
+    }
+}

jyzb-biz/src/main/java/com/junmp/jyzb/controller/ManufacturerController.java

+package com.junmp.jyzb.controller;
+
+import com.junmp.jyzb.api.bean.req.ManufacturerReq;
+import com.junmp.jyzb.entity.Manufacturer;
+import com.junmp.jyzb.service.ManufacturerService;
+import com.junmp.v2.common.bean.request.ValidationApi;
+import com.junmp.v2.common.bean.response.ApiRes;
+import com.junmp.v2.db.api.page.PageResult;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.annotation.Validated;
+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 javax.annotation.Resource;
+import java.util.List;
+
+@RestController
+@Slf4j
+@Api("生产厂商模块")
+@RequestMapping("/Manufacturer")
+public class ManufacturerController {
+    @Resource
+    private ManufacturerService manufacturerService;
+
+    //创建生产厂商
+    @PostMapping("AddManufacturer")
+    @ApiOperation("创建生产厂商")
+    public ApiRes<String> addManufacturer(@RequestBody @Validated(ValidationApi.add.class) ManufacturerReq req){
+        return ApiRes.success(manufacturerService.addManufacturer(req));
+    }
+
+    //修改生产厂商
+    @PostMapping("UpdateManufacturer")
+    @ApiOperation("修改生产厂商")
+    public ApiRes<Boolean> updateManufacturer(@RequestBody @Validated(ValidationApi.edit.class) ManufacturerReq req){
+        return ApiRes.success(manufacturerService.updateManufacturer(req));
+    }
+
+    //查询生产厂商(list)
+    @PostMapping("ShowManufacturerList")
+    @ApiOperation("查询生产厂商(list)")
+    public ApiRes<List<Manufacturer>> showManufacturerList(@RequestBody ManufacturerReq req){
+        return ApiRes.success(manufacturerService.showManufacturerList(req));
+    }
+
+    //查询生产厂商(page)
+    @PostMapping("ShowManufacturerPage")
+    @ApiOperation("修改生产厂商(page)")
+    public ApiRes<PageResult<Manufacturer>> showManufacturerPage(@RequestBody ManufacturerReq req){
+        return ApiRes.success(manufacturerService.showManufacturerPage(req));
+    }
+    //删除生产厂商
+    @PostMapping("DelManufacturer")
+    @ApiOperation("修改生产厂商")
+    public ApiRes<Boolean> delManufacturer(@RequestBody ManufacturerReq req){
+        return ApiRes.success(manufacturerService.delManufacturer(req));
+    }
+}

jyzb-biz/src/main/java/com/junmp/jyzb/entity/InventorySummary.java

@@ -16,7 +16,7 @@ import lombok.NoArgsConstructor;
 @ApiModel(value = "com-junmp-jyzb-domain-InventorySummary")
 @AllArgsConstructor
 @NoArgsConstructor
-@TableName("base_inventory_summary_type2")
+@TableName("base_inventory_summary")
 @Data
 public class InventorySummary implements Serializable {
     /**
@@ -88,19 +88,6 @@ public class InventorySummary implements Serializable {
     @TableField("location_name")
     private String locationName;
 
-    /**
-     * 区域id
-     */
-    @ApiModelProperty(value = "区域id")
-    @TableField("location_area_id")
-    private String locationAreaId;
-
-    /**
-     * 区域信息
-     */
-    @ApiModelProperty(value = "区域信息")
-    @TableField("location_area")
-    private String locationArea;
 
     /**
      * 库存数量

jyzb-biz/src/main/java/com/junmp/jyzb/entity/Manufacturer.java

+package com.junmp.jyzb.entity;
+
+import com.baomidou.mybatisplus.annotation.*;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+/**
+ * 
+ * @TableName base_manufacturer
+ * 生产厂商
+ */
+@TableName(value ="base_manufacturer")
+@Data
+public class Manufacturer implements Serializable {
+    /**
+     * 生产厂商id
+     */
+    @TableId(value = "id",type = IdType.ASSIGN_UUID)
+    private String id;
+
+    /**
+     * 厂商名称
+     */
+    private String name;
+
+    /**
+     * 厂商短码
+     */
+    private String code;
+
+    /**
+     * 简称
+     */
+    @TableField(value = "short_name")
+    private String shortName;
+
+    /**
+     * 联系人
+     */
+    private String contacts;
+
+    /**
+     * 联系电话
+     */
+    private String phone;
+
+    /**
+     * 状态（1为启用，0为禁用）
+     */
+    private String state;
+
+    /**
+     * 创建时间
+     */
+    @TableField(value = "create_time",fill = FieldFill.INSERT)
+    private Date createTime;
+
+    /**
+     * 创建人员
+     */
+    @TableField(value = "create_user")
+    private String createUser;
+
+    /**
+     * 更新时间
+     */
+    @TableField(value = "update_time",fill = FieldFill.UPDATE)
+    private Date updateTime;
+
+    /**
+     * 更新人员
+     */
+    @TableField(value = "update_user")
+    private String updateUser;
+
+
+    private static final long serialVersionUID = 1L;
+
+
+}
\ No newline at end of file

jyzb-biz/src/main/java/com/junmp/jyzb/entity/OrderMain.java

@@ -108,5 +108,11 @@ public class OrderMain implements Serializable {
     @TableField("update_user")
     private String updateUser;
 
+    /**
+     * 生产厂商id
+     */
+    @TableField("manufacturer_id")
+    private String manufacturerId;
+
     private static final long serialVersionUID = 1L;
 }
\ No newline at end of file

jyzb-biz/src/main/java/com/junmp/jyzb/mapper/ManufacturerMapper.java

+package com.junmp.jyzb.mapper;
+
+import com.junmp.jyzb.entity.Manufacturer;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+* @author lxh专属坐骑
+* @description 针对表【base_manufacturer】的数据库操作Mapper
+* @createDate 2023-09-15 10:15:29
+* @Entity com.junmp.jyzb.entity.Manufacturer
+*/
+public interface ManufacturerMapper extends BaseMapper<Manufacturer> {
+
+}
+
+
+
+

jyzb-biz/src/main/java/com/junmp/jyzb/service/ManufacturerService.java

+package com.junmp.jyzb.service;
+
+import com.junmp.jyzb.api.bean.req.ManufacturerReq;
+import com.junmp.jyzb.entity.Manufacturer;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.junmp.v2.db.api.page.PageResult;
+import org.springframework.web.bind.annotation.RequestBody;
+
+import java.util.List;
+
+/**
+* @author lxh专属坐骑
+* @description 针对表【base_manufacturer】的数据库操作Service
+* @createDate 2023-09-15 10:15:29
+*/
+public interface ManufacturerService extends IService<Manufacturer> {
+
+    String addManufacturer(ManufacturerReq req);
+
+    boolean updateManufacturer(ManufacturerReq req);
+
+    List<Manufacturer> showManufacturerList(ManufacturerReq req);
+
+    PageResult<Manufacturer> showManufacturerPage(ManufacturerReq req);
+
+    boolean delManufacturer(ManufacturerReq req);
+}

jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/ManufacturerServiceImpl.java

+package com.junmp.jyzb.service.impl;
+
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.junmp.jyzb.api.bean.req.ManufacturerReq;
+import com.junmp.jyzb.api.exception.enums.ManufacturerExceptionEnum;
+import com.junmp.jyzb.entity.Manufacturer;
+import com.junmp.jyzb.service.ManufacturerService;
+import com.junmp.jyzb.mapper.ManufacturerMapper;
+import com.junmp.jyzb.utils.DateTimeUtil;
+import com.junmp.v2.common.exception.base.ServiceException;
+import com.junmp.v2.common.util.BeanPlusUtil;
+import com.junmp.v2.db.api.factory.PageFactory;
+import com.junmp.v2.db.api.factory.PageResultFactory;
+import com.junmp.v2.db.api.page.PageResult;
+import org.springframework.stereotype.Service;
+import java.util.List;
+
+/**
+* @author lxh专属坐骑
+* @description 针对表【base_manufacturer】的数据库操作Service实现
+* @createDate 2023-09-15 10:15:29
+*/
+@Service
+public class ManufacturerServiceImpl extends ServiceImpl<ManufacturerMapper, Manufacturer>
+    implements ManufacturerService{
+
+    @Override
+    public String addManufacturer(ManufacturerReq req) {
+        Manufacturer one = getOne(new LambdaQueryWrapper<Manufacturer>().eq(Manufacturer::getName, req.getName()));
+        if (ObjectUtil.isNotNull(one)){
+            throw new ServiceException(ManufacturerExceptionEnum.MANUTACTURER_IS_EXIST);
+        }
+        Manufacturer manufacturer = new Manufacturer();
+        BeanPlusUtil.copyProperties(req,manufacturer);
+        manufacturer.setCreateTime(DateTimeUtil.getCurrentDateTime());
+        save(manufacturer);
+        return manufacturer.getId();
+    }
+
+    @Override
+    public boolean updateManufacturer(ManufacturerReq req) {
+        Manufacturer manufacturer = new Manufacturer();
+        BeanPlusUtil.copyProperties(req,manufacturer);
+        manufacturer.setUpdateTime(DateTimeUtil.getCurrentDateTime());
+        return updateById(manufacturer);
+    }
+
+    @Override
+    public List<Manufacturer> showManufacturerList(ManufacturerReq req) {
+        LambdaQueryWrapper<Manufacturer> wrapper = createWrapper(req);
+        return  list(wrapper);
+    }
+
+    @Override
+    public PageResult<Manufacturer> showManufacturerPage(ManufacturerReq req) {
+        LambdaQueryWrapper<Manufacturer> wrapper = createWrapper(req);
+        Page<Manufacturer> page = page(PageFactory.getDefaultPage(req.getPageNo(), req.getPageSize()), wrapper);
+        return PageResultFactory.createPageResult(page);
+    }
+
+    @Override
+    public boolean delManufacturer(ManufacturerReq req) {
+
+        return false;
+    }
+
+    private LambdaQueryWrapper<Manufacturer> createWrapper(ManufacturerReq req){
+        LambdaQueryWrapper<Manufacturer> wrapper = new LambdaQueryWrapper<>();
+        if (ObjectUtil.isEmpty(req)){
+            return wrapper;
+        }
+        wrapper.eq(ObjectUtil.isNotNull(req.getId()),Manufacturer::getId,req.getId());
+        wrapper.eq(ObjectUtil.isNotNull(req.getState()),Manufacturer::getState,req.getState());
+        wrapper.like(ObjectUtil.isNotNull(req.getName()),Manufacturer::getName,req.getName());
+        wrapper.like(ObjectUtil.isNotNull(req.getShortName()),Manufacturer::getShortName,req.getShortName());
+        wrapper.like(ObjectUtil.isNotNull(req.getContacts()),Manufacturer::getContacts,req.getContacts());
+        wrapper.orderByDesc(Manufacturer::getCreateTime);
+        return wrapper;
+    }
+}
+
+
+
+

jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/OrderMainServiceImpl.java

@@ -290,6 +290,13 @@ public class OrderMainServiceImpl extends ServiceImpl<OrderMainMapper, OrderMain
     public PageResult<OrderMainDto> getOrderPage(OrderMainReq req) {
 
         Page<OrderMain> page = new Page<>();
+        //排序字段处理，将驼峰改成和数据库同步的字段名
+        String column = req.getColumn();
+        String order = req.getOrder();
+        if (ObjectUtil.isNotNull(column) && !column.trim().isEmpty()
+                && ObjectUtil.isNotNull(order) && !order.trim().isEmpty()){
+            req.setColumn(column.replaceAll("[A-Z]", "_$0").toLowerCase());
+        }
         //根据查询条件得到单据
         IPage<OrderMain> outOrderPage = orderMainMapper.getOrderPage(PageFactory.getDefaultPage(req.getPageNo(), req.getPageSize()),req);
         page.setRecords(outOrderPage.getRecords());

jyzb-biz/src/main/resources/mapper/ManufacturerMapper.xml

+<?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="com.junmp.jyzb.mapper.ManufacturerMapper">
+
+    <resultMap id="BaseResultMap" type="com.junmp.jyzb.entity.Manufacturer">
+            <id property="id" column="id" jdbcType="VARCHAR"/>
+            <result property="name" column="name" jdbcType="VARCHAR"/>
+            <result property="code" column="code" jdbcType="VARCHAR"/>
+            <result property="shortName" column="short_name" jdbcType="VARCHAR"/>
+            <result property="contacts" column="contacts" jdbcType="VARCHAR"/>
+            <result property="phone" column="phone" jdbcType="VARCHAR"/>
+            <result property="state" column="state" jdbcType="VARCHAR"/>
+            <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
+            <result property="createUser" column="create_user" jdbcType="VARCHAR"/>
+            <result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
+            <result property="updateUser" column="update_user" jdbcType="TIMESTAMP"/>
+    </resultMap>
+
+    <sql id="Base_Column_List">
+        id,name,code,
+        short_name,contacts,phone,
+        state,create_time,create_user,
+        update_time,update_user
+    </sql>
+</mapper>

jyzb-biz/src/main/resources/mapper/OrderMainMapper.xml

@@ -90,10 +90,10 @@
         <if test="req.endTime != null and req.endTime != ''">
             and create_time &lt;= #{req.endTime}
         </if>
-        <if test="req.sortTableField != null and req.sortTableField != '' and req.sortRules != null and req.sortRules != '' ">
-            ORDER BY #{req.sortTableField} #{req.sortRules}
+        <if test="req.column != null and req.column != '' and req.order != null and req.order != '' ">
+            order by ${req.column} ${req.order}
         </if>
-        <if test="(req.sortTableField == null || req.sortTableField == '') and (req.sortRules == null || req.sortRules == '') ">
+        <if test="(req.column == null || req.column == '') and (req.order == null || req.order == '') ">
             order by create_time desc
         </if>
     </select>

jyzb-boot/src/main/java/com/junmp/jyzb/boot/JyzbBootApplication.java

@@ -6,8 +6,11 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.flyway.FlywayAutoConfiguration;
 import org.springframework.boot.builder.SpringApplicationBuilder;
 import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
+import org.springframework.context.annotation.Bean;
 import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
+import org.springframework.web.servlet.config.annotation.CorsRegistry;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 import springfox.documentation.swagger2.annotations.EnableSwagger2;
 
 /**
@@ -37,4 +40,16 @@ public class JyzbBootApplication extends SpringBootServletInitializer {
     protected SpringApplicationBuilder configure(SpringApplicationBuilder builder) {
         return builder.sources(JyzbBootApplication.class);
     }
+    @Bean
+    public WebMvcConfigurer corsConfigurer() {
+        return new WebMvcConfigurer() {
+            public void addCorsMappings(CorsRegistry registry) {
+                registry.addMapping("/**")
+                        .allowedOrigins("http://127.0.0.1:8080")
+                        .allowedMethods("GET", "POST", "PUT", "DELETE")
+                        .allowedHeaders("*")
+                        .allowCredentials(true);
+            }
+        };
+    }
 }