Browse Source

更新

master
常熟吴彦祖 2 days ago
parent
commit
4aad7ad385
  1. 43
      src/main/java/com/xujie/modules/baseInformation/controller/SrmPartFamilyController.java
  2. 43
      src/main/java/com/xujie/modules/baseInformation/controller/SrmUmController.java
  3. 37
      src/main/java/com/xujie/modules/baseInformation/entity/SrmPartFamily.java
  4. 19
      src/main/java/com/xujie/modules/baseInformation/entity/SrmUm.java
  5. 24
      src/main/java/com/xujie/modules/baseInformation/mapper/SrmPartFamilyMapper.java
  6. 23
      src/main/java/com/xujie/modules/baseInformation/mapper/SrmUmMapper.java
  7. 16
      src/main/java/com/xujie/modules/baseInformation/service/SrmPartFamilyService.java
  8. 16
      src/main/java/com/xujie/modules/baseInformation/service/SrmUmService.java
  9. 110
      src/main/java/com/xujie/modules/baseInformation/service/impl/SrmPartFamilyServiceImpl.java
  10. 108
      src/main/java/com/xujie/modules/baseInformation/service/impl/SrmUmServiceImpl.java
  11. 111
      src/main/resources/mapper/baseInformation/SrmPartFamilyMapper.xml
  12. 84
      src/main/resources/mapper/baseInformation/SrmUmMapper.xml

43
src/main/java/com/xujie/modules/baseInformation/controller/SrmPartFamilyController.java

@ -0,0 +1,43 @@
package com.xujie.modules.baseInformation.controller;
import com.xujie.common.utils.PageUtils;
import com.xujie.common.utils.R;
import com.xujie.modules.baseInformation.entity.SrmPartFamily;
import com.xujie.modules.baseInformation.service.SrmPartFamilyService;
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;
@RestController
@RequestMapping("/srmPartFamily")
public class SrmPartFamilyController {
@Autowired
private SrmPartFamilyService srmPartFamilyService;
/**
* part_family 分页查询 - rqrq
*/
@PostMapping("/getPartFamilyListPaging")
public R getPartFamilyListPaging(@RequestBody SrmPartFamily partFamily) {
PageUtils page = srmPartFamilyService.getPartFamilyListPaging(partFamily);
return R.ok().put("data", page);
}
@PostMapping("/savePartFamily")
public R savePartFamily(@RequestBody SrmPartFamily partFamily) {
return srmPartFamilyService.savePartFamily(partFamily);
}
@PostMapping("/updatePartFamily")
public R updatePartFamily(@RequestBody SrmPartFamily partFamily) {
return srmPartFamilyService.updatePartFamily(partFamily);
}
@PostMapping("/deletePartFamily")
public R deletePartFamily(@RequestBody SrmPartFamily partFamily) {
return srmPartFamilyService.deletePartFamily(partFamily.getFamilyId(), partFamily.getSite());
}
}

43
src/main/java/com/xujie/modules/baseInformation/controller/SrmUmController.java

@ -0,0 +1,43 @@
package com.xujie.modules.baseInformation.controller;
import com.xujie.common.utils.PageUtils;
import com.xujie.common.utils.R;
import com.xujie.modules.baseInformation.entity.SrmUm;
import com.xujie.modules.baseInformation.service.SrmUmService;
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;
@RestController
@RequestMapping("/srmUm")
public class SrmUmController {
@Autowired
private SrmUmService srmUmService;
/**
* UM 分页查询 - rqrq
*/
@PostMapping("/getUmListPaging")
public R getUmListPaging(@RequestBody SrmUm um) {
PageUtils page = srmUmService.getUmListPaging(um);
return R.ok().put("data", page);
}
@PostMapping("/saveUm")
public R saveUm(@RequestBody SrmUm um) {
return srmUmService.saveUm(um);
}
@PostMapping("/updateUm")
public R updateUm(@RequestBody SrmUm um) {
return srmUmService.updateUm(um);
}
@PostMapping("/deleteUm")
public R deleteUm(@RequestBody SrmUm um) {
return srmUmService.deleteUm(um.getUmId(), um.getSite());
}
}

37
src/main/java/com/xujie/modules/baseInformation/entity/SrmPartFamily.java

@ -0,0 +1,37 @@
package com.xujie.modules.baseInformation.entity;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.xujie.common.utils.QueryPage;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
import java.util.Date;
/**
* part_family 维护实体 - rqrq
*/
@Data
public class SrmPartFamily extends QueryPage {
private String site;
private String familyId;
private String familyName;
private String active;
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date createDate;
private String createBy;
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date updateDate;
private String updateBy;
private String showInQueryFlag;
}

19
src/main/java/com/xujie/modules/baseInformation/entity/SrmUm.java

@ -0,0 +1,19 @@
package com.xujie.modules.baseInformation.entity;
import com.xujie.common.utils.QueryPage;
import lombok.Data;
/**
* UM 维护实体 - rqrq
*/
@Data
public class SrmUm extends QueryPage {
private String site;
private String umId;
private String umName;
private String active;
}

24
src/main/java/com/xujie/modules/baseInformation/mapper/SrmPartFamilyMapper.java

@ -0,0 +1,24 @@
package com.xujie.modules.baseInformation.mapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.xujie.modules.baseInformation.entity.SrmPartFamily;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@Mapper
public interface SrmPartFamilyMapper {
IPage<SrmPartFamily> selectPartFamilyListWithPaging(@Param("page") Page<SrmPartFamily> page,
@Param("partFamily") SrmPartFamily partFamily);
SrmPartFamily selectPartFamilyByCode(@Param("familyId") String familyId, @Param("site") String site);
int insertPartFamily(SrmPartFamily partFamily);
int updatePartFamily(SrmPartFamily partFamily);
Integer checkPartFamilyReference(@Param("familyId") String familyId, @Param("site") String site);
int deletePartFamily(@Param("familyId") String familyId, @Param("site") String site);
}

23
src/main/java/com/xujie/modules/baseInformation/mapper/SrmUmMapper.java

@ -0,0 +1,23 @@
package com.xujie.modules.baseInformation.mapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.xujie.modules.baseInformation.entity.SrmUm;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@Mapper
public interface SrmUmMapper {
IPage<SrmUm> selectUmListWithPaging(@Param("page") Page<SrmUm> page, @Param("um") SrmUm um);
SrmUm selectUmByCode(@Param("umId") String umId, @Param("site") String site);
int insertUm(SrmUm um);
int updateUm(SrmUm um);
Integer checkUmReference(@Param("umId") String umId, @Param("site") String site);
int deleteUm(@Param("umId") String umId, @Param("site") String site);
}

16
src/main/java/com/xujie/modules/baseInformation/service/SrmPartFamilyService.java

@ -0,0 +1,16 @@
package com.xujie.modules.baseInformation.service;
import com.xujie.common.utils.PageUtils;
import com.xujie.common.utils.R;
import com.xujie.modules.baseInformation.entity.SrmPartFamily;
public interface SrmPartFamilyService {
PageUtils getPartFamilyListPaging(SrmPartFamily partFamily);
R savePartFamily(SrmPartFamily partFamily);
R updatePartFamily(SrmPartFamily partFamily);
R deletePartFamily(String familyId, String site);
}

16
src/main/java/com/xujie/modules/baseInformation/service/SrmUmService.java

@ -0,0 +1,16 @@
package com.xujie.modules.baseInformation.service;
import com.xujie.common.utils.PageUtils;
import com.xujie.common.utils.R;
import com.xujie.modules.baseInformation.entity.SrmUm;
public interface SrmUmService {
PageUtils getUmListPaging(SrmUm um);
R saveUm(SrmUm um);
R updateUm(SrmUm um);
R deleteUm(String umId, String site);
}

110
src/main/java/com/xujie/modules/baseInformation/service/impl/SrmPartFamilyServiceImpl.java

@ -0,0 +1,110 @@
package com.xujie.modules.baseInformation.service.impl;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.xujie.common.utils.PageUtils;
import com.xujie.common.utils.R;
import com.xujie.modules.baseInformation.entity.SrmPartFamily;
import com.xujie.modules.baseInformation.mapper.SrmPartFamilyMapper;
import com.xujie.modules.baseInformation.service.SrmPartFamilyService;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@Service
public class SrmPartFamilyServiceImpl implements SrmPartFamilyService {
@Autowired
private SrmPartFamilyMapper srmPartFamilyMapper;
@Override
public PageUtils getPartFamilyListPaging(SrmPartFamily partFamily) {
Page<SrmPartFamily> page = new Page<>(partFamily.getPage(), partFamily.getLimit());
IPage<SrmPartFamily> iPage = this.srmPartFamilyMapper.selectPartFamilyListWithPaging(page, partFamily);
return new PageUtils(iPage);
}
@Override
public R savePartFamily(SrmPartFamily partFamily) {
// 新增前校验与标准化 - rqrq
normalizeInput(partFamily);
if (StringUtils.isBlank(partFamily.getSite())) {
return R.error("site 不能为空");
}
if (StringUtils.isBlank(partFamily.getFamilyId())) {
return R.error("编码不能为空");
}
if (StringUtils.isBlank(partFamily.getFamilyName())) {
return R.error("名称不能为空");
}
if (StringUtils.isBlank(partFamily.getActive())) {
partFamily.setActive("Y");
}
SrmPartFamily existing = srmPartFamilyMapper.selectPartFamilyByCode(partFamily.getFamilyId(), partFamily.getSite());
if (existing != null) {
return R.error("编码已存在");
}
int result = srmPartFamilyMapper.insertPartFamily(partFamily);
return result > 0 ? R.ok().put("msg", "新增成功") : R.error("新增失败");
}
@Override
public R updatePartFamily(SrmPartFamily partFamily) {
// 编辑前校验与标准化 - rqrq
normalizeInput(partFamily);
if (StringUtils.isBlank(partFamily.getSite())) {
return R.error("site 不能为空");
}
if (StringUtils.isBlank(partFamily.getFamilyId())) {
return R.error("编码不能为空");
}
if (StringUtils.isBlank(partFamily.getFamilyName())) {
return R.error("名称不能为空");
}
if (StringUtils.isBlank(partFamily.getActive())) {
return R.error("是否在用不能为空");
}
SrmPartFamily existing = srmPartFamilyMapper.selectPartFamilyByCode(partFamily.getFamilyId(), partFamily.getSite());
if (existing == null) {
return R.error("记录不存在");
}
int result = srmPartFamilyMapper.updatePartFamily(partFamily);
return result > 0 ? R.ok().put("msg", "更新成功") : R.error("更新失败");
}
@Override
public R deletePartFamily(String familyId, String site) {
familyId = StringUtils.trimToEmpty(familyId);
site = StringUtils.trimToEmpty(site);
if (StringUtils.isBlank(site)) {
return R.error("site 不能为空");
}
if (StringUtils.isBlank(familyId)) {
return R.error("编码不能为空");
}
Integer referenceCount = srmPartFamilyMapper.checkPartFamilyReference(familyId, site);
if (referenceCount != null && referenceCount > 0) {
return R.error("该编码已被物料使用,无法删除");
}
int result = srmPartFamilyMapper.deletePartFamily(familyId, site);
return result > 0 ? R.ok().put("msg", "删除成功") : R.error("删除失败");
}
private void normalizeInput(SrmPartFamily partFamily) {
if (partFamily == null) {
return;
}
partFamily.setSite(StringUtils.trimToEmpty(partFamily.getSite()));
partFamily.setFamilyId(StringUtils.trimToEmpty(partFamily.getFamilyId()));
partFamily.setFamilyName(StringUtils.trimToEmpty(partFamily.getFamilyName()));
partFamily.setActive(StringUtils.trimToEmpty(partFamily.getActive()));
partFamily.setCreateBy(StringUtils.trimToEmpty(partFamily.getCreateBy()));
partFamily.setUpdateBy(StringUtils.trimToEmpty(partFamily.getUpdateBy()));
}
}

108
src/main/java/com/xujie/modules/baseInformation/service/impl/SrmUmServiceImpl.java

@ -0,0 +1,108 @@
package com.xujie.modules.baseInformation.service.impl;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.xujie.common.utils.PageUtils;
import com.xujie.common.utils.R;
import com.xujie.modules.baseInformation.entity.SrmUm;
import com.xujie.modules.baseInformation.mapper.SrmUmMapper;
import com.xujie.modules.baseInformation.service.SrmUmService;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@Service
public class SrmUmServiceImpl implements SrmUmService {
@Autowired
private SrmUmMapper srmUmMapper;
@Override
public PageUtils getUmListPaging(SrmUm um) {
Page<SrmUm> page = new Page<>(um.getPage(), um.getLimit());
IPage<SrmUm> iPage = this.srmUmMapper.selectUmListWithPaging(page, um);
return new PageUtils(iPage);
}
@Override
public R saveUm(SrmUm um) {
// 新增前校验与标准化 - rqrq
normalizeInput(um);
if (StringUtils.isBlank(um.getSite())) {
return R.error("site 不能为空");
}
if (StringUtils.isBlank(um.getUmId())) {
return R.error("编码不能为空");
}
if (StringUtils.isBlank(um.getUmName())) {
return R.error("名称不能为空");
}
if (StringUtils.isBlank(um.getActive())) {
um.setActive("Y");
}
SrmUm existing = srmUmMapper.selectUmByCode(um.getUmId(), um.getSite());
if (existing != null) {
return R.error("编码已存在");
}
int result = srmUmMapper.insertUm(um);
return result > 0 ? R.ok().put("msg", "新增成功") : R.error("新增失败");
}
@Override
public R updateUm(SrmUm um) {
// 编辑前校验与标准化 - rqrq
normalizeInput(um);
if (StringUtils.isBlank(um.getSite())) {
return R.error("site 不能为空");
}
if (StringUtils.isBlank(um.getUmId())) {
return R.error("编码不能为空");
}
if (StringUtils.isBlank(um.getUmName())) {
return R.error("名称不能为空");
}
if (StringUtils.isBlank(um.getActive())) {
return R.error("是否在用不能为空");
}
SrmUm existing = srmUmMapper.selectUmByCode(um.getUmId(), um.getSite());
if (existing == null) {
return R.error("记录不存在");
}
int result = srmUmMapper.updateUm(um);
return result > 0 ? R.ok().put("msg", "更新成功") : R.error("更新失败");
}
@Override
public R deleteUm(String umId, String site) {
umId = StringUtils.trimToEmpty(umId);
site = StringUtils.trimToEmpty(site);
if (StringUtils.isBlank(site)) {
return R.error("site 不能为空");
}
if (StringUtils.isBlank(umId)) {
return R.error("编码不能为空");
}
Integer referenceCount = srmUmMapper.checkUmReference(umId, site);
if (referenceCount != null && referenceCount > 0) {
return R.error("该编码已被物料使用,无法删除");
}
int result = srmUmMapper.deleteUm(umId, site);
return result > 0 ? R.ok().put("msg", "删除成功") : R.error("删除失败");
}
private void normalizeInput(SrmUm um) {
if (um == null) {
return;
}
um.setSite(StringUtils.trimToEmpty(um.getSite()));
um.setUmId(StringUtils.trimToEmpty(um.getUmId()));
um.setUmName(StringUtils.trimToEmpty(um.getUmName()));
um.setActive(StringUtils.trimToEmpty(um.getActive()));
}
}

111
src/main/resources/mapper/baseInformation/SrmPartFamilyMapper.xml

@ -0,0 +1,111 @@
<?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.xujie.modules.baseInformation.mapper.SrmPartFamilyMapper">
<resultMap id="PartFamilyResultMap" type="com.xujie.modules.baseInformation.entity.SrmPartFamily">
<result property="site" column="site"/>
<result property="familyId" column="family_id"/>
<result property="familyName" column="family_name"/>
<result property="active" column="active"/>
<result property="createDate" column="create_date"/>
<result property="createBy" column="create_by"/>
<result property="updateDate" column="update_date"/>
<result property="updateBy" column="update_by"/>
<result property="showInQueryFlag" column="show_in_query_flag"/>
</resultMap>
<!-- part_family 分页查询 - rqrq -->
<select id="selectPartFamilyListWithPaging" resultMap="PartFamilyResultMap">
SELECT
site,
family_id,
family_name,
active,
create_date,
create_by,
update_date,
update_by,
show_in_query_flag
FROM part_family
<where>
<if test="partFamily.site != null and partFamily.site != ''">
AND site = #{partFamily.site}
</if>
<if test="partFamily.familyId != null and partFamily.familyId != ''">
AND family_id LIKE '%' + #{partFamily.familyId} + '%'
</if>
<if test="partFamily.familyName != null and partFamily.familyName != ''">
AND family_name LIKE '%' + #{partFamily.familyName} + '%'
</if>
<if test="partFamily.active != null and partFamily.active != ''">
AND active = #{partFamily.active}
</if>
</where>
ORDER BY family_id
</select>
<select id="selectPartFamilyByCode" resultMap="PartFamilyResultMap">
SELECT
site,
family_id,
family_name,
active,
create_date,
create_by,
update_date,
update_by,
show_in_query_flag
FROM part_family
WHERE site = #{site}
AND family_id = #{familyId}
</select>
<insert id="insertPartFamily">
INSERT INTO part_family (
site,
family_id,
family_name,
active,
create_date,
create_by,
update_date,
update_by,
show_in_query_flag
) VALUES (
#{site},
#{familyId},
#{familyName},
#{active},
GETDATE(),
#{createBy},
GETDATE(),
#{updateBy},
#{showInQueryFlag}
)
</insert>
<update id="updatePartFamily">
UPDATE part_family
<set>
family_name = #{familyName},
active = #{active},
update_date = GETDATE(),
update_by = #{updateBy}
</set>
WHERE site = #{site}
AND family_id = #{familyId}
</update>
<select id="checkPartFamilyReference" resultType="java.lang.Integer">
SELECT COUNT(1)
FROM part
WHERE site = #{site}
AND category = #{familyId}
</select>
<delete id="deletePartFamily">
DELETE FROM part_family
WHERE site = #{site}
AND family_id = #{familyId}
</delete>
</mapper>

84
src/main/resources/mapper/baseInformation/SrmUmMapper.xml

@ -0,0 +1,84 @@
<?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.xujie.modules.baseInformation.mapper.SrmUmMapper">
<resultMap id="UmResultMap" type="com.xujie.modules.baseInformation.entity.SrmUm">
<result property="site" column="Site"/>
<result property="umId" column="UMID"/>
<result property="umName" column="UMName"/>
<result property="active" column="Active"/>
</resultMap>
<!-- UM 分页查询 - rqrq -->
<select id="selectUmListWithPaging" resultMap="UmResultMap">
SELECT
Site,
UMID,
UMName,
Active
FROM UM
<where>
<if test="um.site != null and um.site != ''">
AND Site = #{um.site}
</if>
<if test="um.umId != null and um.umId != ''">
AND UMID LIKE '%' + #{um.umId} + '%'
</if>
<if test="um.umName != null and um.umName != ''">
AND UMName LIKE '%' + #{um.umName} + '%'
</if>
<if test="um.active != null and um.active != ''">
AND Active = #{um.active}
</if>
</where>
ORDER BY UMID
</select>
<select id="selectUmByCode" resultMap="UmResultMap">
SELECT
Site,
UMID,
UMName,
Active
FROM UM
WHERE Site = #{site}
AND UMID = #{umId}
</select>
<insert id="insertUm">
INSERT INTO UM (
UMID,
Site,
UMName,
Active
) VALUES (
#{umId},
#{site},
#{umName},
#{active}
)
</insert>
<update id="updateUm">
UPDATE UM
<set>
UMName = #{umName},
Active = #{active}
</set>
WHERE Site = #{site}
AND UMID = #{umId}
</update>
<select id="checkUmReference" resultType="java.lang.Integer">
SELECT COUNT(1)
FROM part
WHERE site = #{site}
AND unit = #{umId}
</select>
<delete id="deleteUm">
DELETE FROM UM
WHERE Site = #{site}
AND UMID = #{umId}
</delete>
</mapper>
Loading…
Cancel
Save