Yangwl
/
mesnac_mes
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

检验项目移至common模块

Browse Source
philip 4 years ago
parent 261cea0f00
commit f5b7cf7c07
18 changed files with 76 additions and 91 deletions
Show Stats Download Patch File Download Diff File

12
quality/src/main/java/com/foreverwin/mesnac/quality/controller/InspectionItemAdditionController.java → common/src/main/java/com/foreverwin/mesnac/common/controller/InspectionItemAdditionController.java
Unescape Escape View File

@ -1,16 +1,14 @@
package com.foreverwin.mesnac.quality.controller;
package com.foreverwin.mesnac.common.controller;
import com.foreverwin.modular.core.util.R;
import com.foreverwin.modular.core.util.FrontPage;
import com.foreverwin.modular.core.util.CommonMethods;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springframework.web.bind.annotation.RequestMapping;
import com.foreverwin.mesnac.common.model.InspectionItemAddition;
import com.foreverwin.mesnac.common.service.InspectionItemAdditionService;
import com.foreverwin.modular.core.util.FrontPage;
import com.foreverwin.modular.core.util.R;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import com.foreverwin.mesnac.quality.service.InspectionItemAdditionService;
import com.foreverwin.mesnac.quality.model.InspectionItemAddition;
import java.util.List;
/**

25
quality/src/main/java/com/foreverwin/mesnac/quality/controller/InspectionItemController.java → common/src/main/java/com/foreverwin/mesnac/common/controller/InspectionItemController.java
Unescape Escape View File

@ -1,27 +1,24 @@
package com.foreverwin.mesnac.quality.controller;
package com.foreverwin.mesnac.common.controller;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.foreverwin.mesnac.common.enums.HandleEnum;
import com.foreverwin.mesnac.common.mapper.InspectionItemAdditionMapper;
import com.foreverwin.mesnac.common.mapper.InspectionItemDetailMapper;
import com.foreverwin.mesnac.common.model.InspectionItem;
import com.foreverwin.mesnac.common.model.InspectionItemAddition;
import com.foreverwin.mesnac.common.model.InspectionItemDetail;
import com.foreverwin.mesnac.common.service.InspectionItemService;
import com.foreverwin.mesnac.common.util.StringUtil;
import com.foreverwin.mesnac.quality.mapper.InspectionItemAdditionMapper;
import com.foreverwin.mesnac.quality.mapper.InspectionItemDetailMapper;
import com.foreverwin.mesnac.quality.model.*;
import com.foreverwin.modular.core.util.R;
import com.foreverwin.modular.core.util.FrontPage;
import com.foreverwin.modular.core.util.CommonMethods;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.sap.me.sampling.InspectionData;
import com.foreverwin.modular.core.util.FrontPage;
import com.foreverwin.modular.core.util.R;
import com.visiprise.common.exception.BaseException;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import com.foreverwin.mesnac.quality.service.InspectionItemService;
import java.time.LocalDateTime;
import java.util.HashMap;
import java.util.List;
import java.util.UUID;
/**
*

12
quality/src/main/java/com/foreverwin/mesnac/quality/controller/InspectionItemDetailController.java → common/src/main/java/com/foreverwin/mesnac/common/controller/InspectionItemDetailController.java
Unescape Escape View File

@ -1,16 +1,14 @@
package com.foreverwin.mesnac.quality.controller;
package com.foreverwin.mesnac.common.controller;
import com.foreverwin.modular.core.util.R;
import com.foreverwin.modular.core.util.FrontPage;
import com.foreverwin.modular.core.util.CommonMethods;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springframework.web.bind.annotation.RequestMapping;
import com.foreverwin.mesnac.common.model.InspectionItemDetail;
import com.foreverwin.mesnac.common.service.InspectionItemDetailService;
import com.foreverwin.modular.core.util.FrontPage;
import com.foreverwin.modular.core.util.R;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import com.foreverwin.mesnac.quality.service.InspectionItemDetailService;
import com.foreverwin.mesnac.quality.model.InspectionItemDetail;
import java.util.List;
/**

4
quality/src/main/java/com/foreverwin/mesnac/quality/mapper/InspectionItemAdditionMapper.java → common/src/main/java/com/foreverwin/mesnac/common/mapper/InspectionItemAdditionMapper.java
Unescape Escape View File

@ -1,7 +1,7 @@
package com.foreverwin.mesnac.quality.mapper;
package com.foreverwin.mesnac.common.mapper;
import com.foreverwin.mesnac.quality.model.InspectionItemAddition;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.foreverwin.mesnac.common.model.InspectionItemAddition;
import org.springframework.stereotype.Repository;
/**

4
quality/src/main/java/com/foreverwin/mesnac/quality/mapper/InspectionItemDetailMapper.java → common/src/main/java/com/foreverwin/mesnac/common/mapper/InspectionItemDetailMapper.java
Unescape Escape View File

@ -1,7 +1,7 @@
package com.foreverwin.mesnac.quality.mapper;
package com.foreverwin.mesnac.common.mapper;
import com.foreverwin.mesnac.quality.model.InspectionItemDetail;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.foreverwin.mesnac.common.model.InspectionItemDetail;
import org.springframework.stereotype.Repository;
/**

4
quality/src/main/java/com/foreverwin/mesnac/quality/mapper/InspectionItemMapper.java → common/src/main/java/com/foreverwin/mesnac/common/mapper/InspectionItemMapper.java
Unescape Escape View File

@ -1,7 +1,7 @@
package com.foreverwin.mesnac.quality.mapper;
package com.foreverwin.mesnac.common.mapper;
import com.foreverwin.mesnac.quality.model.InspectionItem;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.foreverwin.mesnac.common.model.InspectionItem;
import org.springframework.stereotype.Repository;
/**

14
quality/src/main/java/com/foreverwin/mesnac/quality/model/InspectionItem.java → common/src/main/java/com/foreverwin/mesnac/common/model/InspectionItem.java
Unescape Escape View File

@ -1,17 +1,15 @@
package com.foreverwin.mesnac.quality.model;
import java.io.Serializable;
package com.foreverwin.mesnac.common.model;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.extension.activerecord.Model;
import com.baomidou.mybatisplus.annotation.TableId;
import java.time.LocalDateTime;
import com.baomidou.mybatisplus.annotation.TableField;
import java.io.Serializable;
import java.time.LocalDateTime;
import java.util.List;
import com.baomidou.mybatisplus.annotation.IdType;
/**
* <p>
* 检验项目维护主表

3
quality/src/main/java/com/foreverwin/mesnac/quality/model/InspectionItemAddition.java → common/src/main/java/com/foreverwin/mesnac/common/model/InspectionItemAddition.java
Unescape Escape View File

@ -1,4 +1,4 @@
package com.foreverwin.mesnac.quality.model;
package com.foreverwin.mesnac.common.model;
import java.io.Serializable;
@ -7,7 +7,6 @@ import com.baomidou.mybatisplus.extension.activerecord.Model;
import com.baomidou.mybatisplus.annotation.TableId;
import java.time.LocalDateTime;
import com.baomidou.mybatisplus.annotation.TableField;
import java.io.Serializable;
import com.baomidou.mybatisplus.annotation.IdType;
/**

3
quality/src/main/java/com/foreverwin/mesnac/quality/model/InspectionItemDetail.java → common/src/main/java/com/foreverwin/mesnac/common/model/InspectionItemDetail.java
Unescape Escape View File

@ -1,4 +1,4 @@
package com.foreverwin.mesnac.quality.model;
package com.foreverwin.mesnac.common.model;
import java.io.Serializable;
@ -7,7 +7,6 @@ import com.baomidou.mybatisplus.extension.activerecord.Model;
import com.baomidou.mybatisplus.annotation.TableId;
import java.time.LocalDateTime;
import com.baomidou.mybatisplus.annotation.TableField;
import java.io.Serializable;
import com.baomidou.mybatisplus.annotation.IdType;
/**

4
quality/src/main/java/com/foreverwin/mesnac/quality/service/InspectionItemAdditionService.java → common/src/main/java/com/foreverwin/mesnac/common/service/InspectionItemAdditionService.java
Unescape Escape View File

@ -1,7 +1,7 @@
package com.foreverwin.mesnac.quality.service;
package com.foreverwin.mesnac.common.service;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.foreverwin.mesnac.quality.model.InspectionItemAddition;
import com.foreverwin.mesnac.common.model.InspectionItemAddition;
import com.baomidou.mybatisplus.extension.service.IService;
import com.foreverwin.modular.core.util.FrontPage;

4
quality/src/main/java/com/foreverwin/mesnac/quality/service/InspectionItemDetailService.java → common/src/main/java/com/foreverwin/mesnac/common/service/InspectionItemDetailService.java
Unescape Escape View File

@ -1,7 +1,7 @@
package com.foreverwin.mesnac.quality.service;
package com.foreverwin.mesnac.common.service;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.foreverwin.mesnac.quality.model.InspectionItemDetail;
import com.foreverwin.mesnac.common.model.InspectionItemDetail;
import com.baomidou.mybatisplus.extension.service.IService;
import com.foreverwin.modular.core.util.FrontPage;

5
quality/src/main/java/com/foreverwin/mesnac/quality/service/InspectionItemService.java → common/src/main/java/com/foreverwin/mesnac/common/service/InspectionItemService.java
Unescape Escape View File

@ -1,9 +1,8 @@
package com.foreverwin.mesnac.quality.service;
package com.foreverwin.mesnac.common.service;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.foreverwin.mesnac.quality.model.InspectionItem;
import com.foreverwin.mesnac.common.model.InspectionItem;
import com.baomidou.mybatisplus.extension.service.IService;
import com.foreverwin.mesnac.quality.model.InspectionProject;
import com.foreverwin.modular.core.util.FrontPage;
import java.util.List;

8
quality/src/main/java/com/foreverwin/mesnac/quality/service/impl/InspectionItemAdditionServiceImpl.java → common/src/main/java/com/foreverwin/mesnac/common/service/impl/InspectionItemAdditionServiceImpl.java
Unescape Escape View File

@ -1,11 +1,11 @@
package com.foreverwin.mesnac.quality.service.impl;
package com.foreverwin.mesnac.common.service.impl;
import com.foreverwin.modular.core.util.FrontPage;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.foreverwin.mesnac.quality.model.InspectionItemAddition;
import com.foreverwin.mesnac.quality.mapper.InspectionItemAdditionMapper;
import com.foreverwin.mesnac.quality.service.InspectionItemAdditionService;
import com.foreverwin.mesnac.common.model.InspectionItemAddition;
import com.foreverwin.mesnac.common.mapper.InspectionItemAdditionMapper;
import com.foreverwin.mesnac.common.service.InspectionItemAdditionService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
import org.springframework.beans.factory.annotation.Autowired;

12
quality/src/main/java/com/foreverwin/mesnac/quality/service/impl/InspectionItemDetailServiceImpl.java → common/src/main/java/com/foreverwin/mesnac/common/service/impl/InspectionItemDetailServiceImpl.java
Unescape Escape View File

@ -1,14 +1,14 @@
package com.foreverwin.mesnac.quality.service.impl;
package com.foreverwin.mesnac.common.service.impl;
import com.foreverwin.modular.core.util.FrontPage;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.foreverwin.mesnac.quality.model.InspectionItemDetail;
import com.foreverwin.mesnac.quality.mapper.InspectionItemDetailMapper;
import com.foreverwin.mesnac.quality.service.InspectionItemDetailService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
import com.foreverwin.mesnac.common.mapper.InspectionItemDetailMapper;
import com.foreverwin.mesnac.common.model.InspectionItemDetail;
import com.foreverwin.mesnac.common.service.InspectionItemDetailService;
import com.foreverwin.modular.core.util.FrontPage;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.List;

29
quality/src/main/java/com/foreverwin/mesnac/quality/service/impl/InspectionItemServiceImpl.java → common/src/main/java/com/foreverwin/mesnac/common/service/impl/InspectionItemServiceImpl.java
Unescape Escape View File

@ -1,27 +1,24 @@
package com.foreverwin.mesnac.quality.service.impl;
package com.foreverwin.mesnac.common.service.impl;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.injector.methods.SelectOne;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.foreverwin.mesnac.common.constant.Constants;
import com.foreverwin.mesnac.common.enums.HandleEnum;
import com.foreverwin.mesnac.common.mapper.InspectionItemMapper;
import com.foreverwin.mesnac.common.model.InspectionItem;
import com.foreverwin.mesnac.common.model.InspectionItemAddition;
import com.foreverwin.mesnac.common.model.InspectionItemDetail;
import com.foreverwin.mesnac.common.service.InspectionItemAdditionService;
import com.foreverwin.mesnac.common.service.InspectionItemDetailService;
import com.foreverwin.mesnac.common.service.InspectionItemService;
import com.foreverwin.mesnac.common.util.StringUtil;
import com.foreverwin.mesnac.quality.model.InspectionItemAddition;
import com.foreverwin.mesnac.quality.model.InspectionItemDetail;
import com.foreverwin.mesnac.quality.model.InspectionProject;
import com.foreverwin.mesnac.quality.service.InspectionItemAdditionService;
import com.foreverwin.mesnac.quality.service.InspectionItemDetailService;
import com.foreverwin.mesnac.common.constant.Constants;
import com.foreverwin.modular.core.util.CommonMethods;
import com.foreverwin.modular.core.util.FrontPage;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.foreverwin.mesnac.quality.model.InspectionItem;
import com.foreverwin.mesnac.quality.mapper.InspectionItemMapper;
import com.foreverwin.mesnac.quality.service.InspectionItemService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.visiprise.common.exception.BaseException;
import org.springframework.stereotype.Service;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.time.LocalDateTime;

8
quality/src/main/resources/mapper/InspectionItemAdditionMapper.xml → common/src/main/resources/mapper/InspectionItemAdditionMapper.xml
Unescape Escape View File

@ -1,9 +1,9 @@
<?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.foreverwin.mesnac.quality.mapper.InspectionItemAdditionMapper">
<mapper namespace="com.foreverwin.mesnac.common.mapper.InspectionItemAdditionMapper">
<!-- 通用查询映射结果 -->
<resultMap id="BaseResultMap" type="com.foreverwin.mesnac.quality.model.InspectionItemAddition">
<resultMap id="BaseResultMap" type="com.foreverwin.mesnac.common.model.InspectionItemAddition">
<id column="HANDLE" property="handle" />
<result column="INSPECTION_ITEM_BO" property="inspectionItemBo" />
<result column="SEQ" property="seq" />
@ -233,7 +233,7 @@
</if>
</select>
<insert id="insert" parameterType="com.foreverwin.mesnac.quality.model.InspectionItemAddition">
<insert id="insert" parameterType="com.foreverwin.mesnac.common.model.InspectionItemAddition">
INSERT INTO Z_INSPECTION_ITEM_ADDITION
<trim prefix="(" suffix=")" suffixOverrides=",">
HANDLE,
@ -261,7 +261,7 @@
</trim>
</insert>
<insert id="insertAllColumn" parameterType="com.foreverwin.mesnac.quality.model.InspectionItemAddition">
<insert id="insertAllColumn" parameterType="com.foreverwin.mesnac.common.model.InspectionItemAddition">
INSERT INTO Z_INSPECTION_ITEM_ADDITION
<trim prefix="(" suffix=")" suffixOverrides=",">
<include refid="Base_Column_List"></include>

8
quality/src/main/resources/mapper/InspectionItemDetailMapper.xml → common/src/main/resources/mapper/InspectionItemDetailMapper.xml
Unescape Escape View File

@ -1,9 +1,9 @@
<?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.foreverwin.mesnac.quality.mapper.InspectionItemDetailMapper">
<mapper namespace="com.foreverwin.mesnac.common.model.InspectionItemDetailMapper">
<!-- 通用查询映射结果 -->
<resultMap id="BaseResultMap" type="com.foreverwin.mesnac.quality.model.InspectionItemDetail">
<resultMap id="BaseResultMap" type="com.foreverwin.mesnac.common.model.InspectionItemDetail">
<id column="HANDLE" property="handle" />
<result column="INSPECTION_ITEM_BO" property="inspectionItemBo" />
<result column="SEQ" property="seq" />
@ -313,7 +313,7 @@
</if>
</select>
<insert id="insert" parameterType="com.foreverwin.mesnac.quality.model.InspectionItemDetail">
<insert id="insert" parameterType="com.foreverwin.mesnac.common.model.InspectionItemDetail">
INSERT INTO Z_INSPECTION_ITEM_DETAIL
<trim prefix="(" suffix=")" suffixOverrides=",">
HANDLE,
@ -361,7 +361,7 @@
</trim>
</insert>
<insert id="insertAllColumn" parameterType="com.foreverwin.mesnac.quality.model.InspectionItemDetail">
<insert id="insertAllColumn" parameterType="com.foreverwin.mesnac.common.model.InspectionItemDetail">
INSERT INTO Z_INSPECTION_ITEM_DETAIL
<trim prefix="(" suffix=")" suffixOverrides=",">
<include refid="Base_Column_List"></include>

8
quality/src/main/resources/mapper/InspectionItemMapper.xml → common/src/main/resources/mapper/InspectionItemMapper.xml
Unescape Escape View File

@ -1,9 +1,9 @@
<?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.foreverwin.mesnac.quality.mapper.InspectionItemMapper">
<mapper namespace="com.foreverwin.mesnac.common.model.InspectionItemMapper">
<!-- 通用查询映射结果 -->
<resultMap id="BaseResultMap" type="com.foreverwin.mesnac.quality.model.InspectionItem">
<resultMap id="BaseResultMap" type="com.foreverwin.mesnac.common.model.InspectionItem">
<id column="HANDLE" property="handle" />
<result column="SITE" property="site" />
<result column="INSPECTION_ITEM_NO" property="inspectionItemNo" />
@ -257,7 +257,7 @@
</if>
</select>
<insert id="insert" parameterType="com.foreverwin.mesnac.quality.model.InspectionItem">
<insert id="insert" parameterType="com.foreverwin.mesnac.common.model.InspectionItem">
INSERT INTO Z_INSPECTION_ITEM
<trim prefix="(" suffix=")" suffixOverrides=",">
HANDLE,
@ -291,7 +291,7 @@
</trim>
</insert>
<insert id="insertAllColumn" parameterType="com.foreverwin.mesnac.quality.model.InspectionItem">
<insert id="insertAllColumn" parameterType="com.foreverwin.mesnac.common.model.InspectionItem">
INSERT INTO Z_INSPECTION_ITEM
<trim prefix="(" suffix=")" suffixOverrides=",">
<include refid="Base_Column_List"></include>
Write Preview
Loading…
Cancel
Save