diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/clMaterial/CYlMaterialController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/clMaterial/CYlMaterialController.java index 9d6454d..2b9a735 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/clMaterial/CYlMaterialController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/clMaterial/CYlMaterialController.java @@ -81,6 +81,10 @@ public class CYlMaterialController extends BaseController @PostMapping public AjaxResult add(@RequestBody CYlMaterial cYlMaterial) { + if (!cYlMaterialService.checkMaterialNoUnique(cYlMaterial)) + { + return error("新增材料'" + cYlMaterial.getMaterialNo() + "'失败，编码已存在"); + } return toAjax(cYlMaterialService.insertCYlMaterial(cYlMaterial)); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/factory/CFactoryController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/factory/CFactoryController.java index 7e29153..337a8c3 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/factory/CFactoryController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/factory/CFactoryController.java @@ -102,6 +102,10 @@ public class CFactoryController extends BaseController @PostMapping public AjaxResult add(@RequestBody CFactory cFactory) { + if (!cFactoryService.checkFactoryNoUnique(cFactory)) + { + return error("新增车间'" + cFactory.getFactoryNo() + "'失败，编码已存在"); + } return toAjax(cFactoryService.insertCFactory(cFactory)); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java index 90441b8..e230008 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java @@ -86,7 +86,7 @@ public class SysUserController extends BaseController return getDataTable(list); } - /*@Log(title = "用户管理", businessType = BusinessType.EXPORT) + @Log(title = "用户管理", businessType = BusinessType.EXPORT) @PreAuthorize("@ss.hasPermi('system:user:export')") @PostMapping("/export") public void export(HttpServletResponse response, SysUser user) @@ -94,7 +94,7 @@ public class SysUserController extends BaseController List list = userService.selectUserList(user); ExcelUtil util = new ExcelUtil(SysUser.class); util.exportExcel(response, list, "用户数据"); - }*/ + } @Log(title = "用户管理", businessType = BusinessType.IMPORT) @PreAuthorize("@ss.hasPermi('system:user:import')") @@ -313,7 +313,7 @@ public class SysUserController extends BaseController } /*===============================================测试====================================================*/ - @DataSource(DataSourceType.QUOT) + /*@DataSource(DataSourceType.QUOT) @Log(title = "用户管理", businessType = BusinessType.EXPORT) @PreAuthorize("@ss.hasPermi('system:user:export')") @PostMapping("/export") @@ -328,7 +328,7 @@ public class SysUserController extends BaseController List> averageAssign = ListUtils.partition(templist, 5000); - /*List list = averageAssign.get(0);*/ + *//*List list = averageAssign.get(0);*//* int num = 1; int num2 = 1; @@ -343,9 +343,9 @@ public class SysUserController extends BaseController materials.add(m); num++; -/* +*//* for(int i=1;i<63;i++){ -*/ +*//* if("M001".equals(t.getM_id_M001())){ c = new cost(); @@ -849,7 +849,7 @@ public class SysUserController extends BaseController costs.add(c);num2++; } - /* }*/ + *//* }*//* } } @@ -859,11 +859,11 @@ public class SysUserController extends BaseController System.out.println("materials===================="+materials.size()); System.out.println("costs======================="+costs.size()); - /*insertMaterialBatch(materials); - insertCostBatch(costs);*/ + *//*insertMaterialBatch(materials); + insertCostBatch(costs);*//* batchInsert.insertMaterialBatch(materials); batchInsert.insertCostBatch(costs); - } + }*/ @DataSource(DataSourceType.QUOT) public void insertMaterialBatch(List temp) { diff --git a/ruoyi-system/src/main/java/com/ruoyi/clMaterial/mapper/CYlMaterialMapper.java b/ruoyi-system/src/main/java/com/ruoyi/clMaterial/mapper/CYlMaterialMapper.java index 4dfd544..7131cd5 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/clMaterial/mapper/CYlMaterialMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/clMaterial/mapper/CYlMaterialMapper.java @@ -5,15 +5,15 @@ import com.ruoyi.clMaterial.domain.CYlMaterial; /** * 材料管理Mapper接口 - * + * * @author ruoyi * @date 2024-02-28 */ -public interface CYlMaterialMapper +public interface CYlMaterialMapper { /** * 查询材料管理 - * + * * @param materialId 材料管理主键 * @return 材料管理 */ @@ -21,7 +21,7 @@ public interface CYlMaterialMapper /** * 查询材料管理列表 - * + * * @param cYlMaterial 材料管理 * @return 材料管理集合 */ @@ -29,7 +29,7 @@ public interface CYlMaterialMapper /** * 新增材料管理 - * + * * @param cYlMaterial 材料管理 * @return 结果 */ @@ -37,7 +37,7 @@ public interface CYlMaterialMapper /** * 修改材料管理 - * + * * @param cYlMaterial 材料管理 * @return 结果 */ @@ -45,7 +45,7 @@ public interface CYlMaterialMapper /** * 删除材料管理 - * + * * @param materialId 材料管理主键 * @return 结果 */ @@ -53,9 +53,16 @@ public interface CYlMaterialMapper /** * 批量删除材料管理 - * + * * @param materialIds 需要删除的数据主键集合 * @return 结果 */ public int deleteCYlMaterialByMaterialIds(Long[] materialIds); + + /** + * 校验材料编码是否存在 + * @param materialNo 编码 + * @return 结果 + */ + CYlMaterial checkMaterialNoUnique(String materialNo); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/clMaterial/service/ICYlMaterialService.java b/ruoyi-system/src/main/java/com/ruoyi/clMaterial/service/ICYlMaterialService.java index 84fe1bc..38c66ff 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/clMaterial/service/ICYlMaterialService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/clMaterial/service/ICYlMaterialService.java @@ -5,15 +5,15 @@ import com.ruoyi.clMaterial.domain.CYlMaterial; /** * 材料管理Service接口 - * + * * @author ruoyi * @date 2024-02-28 */ -public interface ICYlMaterialService +public interface ICYlMaterialService { /** * 查询材料管理 - * + * * @param materialId 材料管理主键 * @return 材料管理 */ @@ -21,7 +21,7 @@ public interface ICYlMaterialService /** * 查询材料管理列表 - * + * * @param cYlMaterial 材料管理 * @return 材料管理集合 */ @@ -29,7 +29,7 @@ public interface ICYlMaterialService /** * 新增材料管理 - * + * * @param cYlMaterial 材料管理 * @return 结果 */ @@ -37,7 +37,7 @@ public interface ICYlMaterialService /** * 修改材料管理 - * + * * @param cYlMaterial 材料管理 * @return 结果 */ @@ -45,7 +45,7 @@ public interface ICYlMaterialService /** * 批量删除材料管理 - * + * * @param materialIds 需要删除的材料管理主键集合 * @return 结果 */ @@ -53,9 +53,16 @@ public interface ICYlMaterialService /** * 删除材料管理信息 - * + * * @param materialId 材料管理主键 * @return 结果 */ public int deleteCYlMaterialByMaterialId(Long materialId); + + /** + * 校验材料编码是否存在 + * @param cYlMaterial + * @return + */ + boolean checkMaterialNoUnique(CYlMaterial cYlMaterial); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/clMaterial/service/impl/CYlMaterialServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/clMaterial/service/impl/CYlMaterialServiceImpl.java index 0a924af..430cfab 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/clMaterial/service/impl/CYlMaterialServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/clMaterial/service/impl/CYlMaterialServiceImpl.java @@ -1,6 +1,10 @@ package com.ruoyi.clMaterial.service.impl; import java.util.List; + +import com.ruoyi.common.constant.UserConstants; +import com.ruoyi.common.core.domain.entity.SysUser; +import com.ruoyi.common.utils.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.ruoyi.clMaterial.mapper.CYlMaterialMapper; @@ -9,19 +13,19 @@ import com.ruoyi.clMaterial.service.ICYlMaterialService; /** * 材料管理Service业务层处理 - * + * * @author ruoyi * @date 2024-02-28 */ @Service -public class CYlMaterialServiceImpl implements ICYlMaterialService +public class CYlMaterialServiceImpl implements ICYlMaterialService { @Autowired private CYlMaterialMapper cYlMaterialMapper; /** * 查询材料管理 - * + * * @param materialId 材料管理主键 * @return 材料管理 */ @@ -33,7 +37,7 @@ public class CYlMaterialServiceImpl implements ICYlMaterialService /** * 查询材料管理列表 - * + * * @param cYlMaterial 材料管理 * @return 材料管理 */ @@ -45,7 +49,7 @@ public class CYlMaterialServiceImpl implements ICYlMaterialService /** * 新增材料管理 - * + * * @param cYlMaterial 材料管理 * @return 结果 */ @@ -57,7 +61,7 @@ public class CYlMaterialServiceImpl implements ICYlMaterialService /** * 修改材料管理 - * + * * @param cYlMaterial 材料管理 * @return 结果 */ @@ -69,7 +73,7 @@ public class CYlMaterialServiceImpl implements ICYlMaterialService /** * 批量删除材料管理 - * + * * @param materialIds 需要删除的材料管理主键 * @return 结果 */ @@ -81,7 +85,7 @@ public class CYlMaterialServiceImpl implements ICYlMaterialService /** * 删除材料管理信息 - * + * * @param materialId 材料管理主键 * @return 结果 */ @@ -90,4 +94,20 @@ public class CYlMaterialServiceImpl implements ICYlMaterialService { return cYlMaterialMapper.deleteCYlMaterialByMaterialId(materialId); } + + /** + * 校验材料编码是否存在 + * @param cYlMaterial + * @return + */ + @Override + public boolean checkMaterialNoUnique(CYlMaterial cYlMaterial) { + Long materialId = StringUtils.isNull(cYlMaterial.getMaterialId()) ? -1L : cYlMaterial.getMaterialId(); + CYlMaterial info = cYlMaterialMapper.checkMaterialNoUnique(cYlMaterial.getMaterialNo()); + if (StringUtils.isNotNull(info) && info.getMaterialId().longValue() != materialId.longValue()) + { + return UserConstants.NOT_UNIQUE; + } + return UserConstants.UNIQUE; + } } diff --git a/ruoyi-system/src/main/java/com/ruoyi/factory/mapper/CFactoryMapper.java b/ruoyi-system/src/main/java/com/ruoyi/factory/mapper/CFactoryMapper.java index 803cd09..439dce2 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/factory/mapper/CFactoryMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/factory/mapper/CFactoryMapper.java @@ -87,4 +87,11 @@ public interface CFactoryMapper /*物料类别列表*/ List selectCTypelist(); + + /** + * 校验车间编码是否存在 + * @param factoryNo 编码 + * @return 结果 + */ + CFactory checkFactoryNoUnique(String factoryNo); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/factory/service/ICFactoryService.java b/ruoyi-system/src/main/java/com/ruoyi/factory/service/ICFactoryService.java index f883163..977feb4 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/factory/service/ICFactoryService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/factory/service/ICFactoryService.java @@ -60,4 +60,11 @@ public interface ICFactoryService public int deleteCFactoryByFactoryId(Long factoryId); Object selectCTypelist(); + + /** + * 校验车间编码是否存在 + * @param cFactory + * @return + */ + boolean checkFactoryNoUnique(CFactory cFactory); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/factory/service/impl/CFactoryServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/factory/service/impl/CFactoryServiceImpl.java index 4de1df8..dea76ed 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/factory/service/impl/CFactoryServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/factory/service/impl/CFactoryServiceImpl.java @@ -1,6 +1,9 @@ package com.ruoyi.factory.service.impl; import java.util.List; + +import com.ruoyi.clMaterial.domain.CYlMaterial; +import com.ruoyi.common.constant.UserConstants; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.ArrayList; @@ -134,4 +137,20 @@ public class CFactoryServiceImpl implements ICFactoryService } } } + + /** + * 校验车间编码是否存在 + * @param cFactory + * @return + */ + @Override + public boolean checkFactoryNoUnique(CFactory cFactory) { + Long factoryId = StringUtils.isNull(cFactory.getFactoryId()) ? -1L : cFactory.getFactoryId(); + CFactory info = cFactoryMapper.checkFactoryNoUnique(cFactory.getFactoryNo()); + if (StringUtils.isNotNull(info) && info.getFactoryId().longValue() != factoryId.longValue()) + { + return UserConstants.NOT_UNIQUE; + } + return UserConstants.UNIQUE; + } } diff --git a/ruoyi-system/src/main/java/com/ruoyi/material/domain/CMaterial.java b/ruoyi-system/src/main/java/com/ruoyi/material/domain/CMaterial.java index ba47f5f..f20896e 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/material/domain/CMaterial.java +++ b/ruoyi-system/src/main/java/com/ruoyi/material/domain/CMaterial.java @@ -39,6 +39,10 @@ public class CMaterial extends BaseEntity @Excel(name = "单位") private String materialDw; + /** 物料类型 */ + @Excel(name = "物料类型") + private String typeName; + /** 物料成本信息 */ private List cMaterialCostList; @@ -107,6 +111,14 @@ public class CMaterial extends BaseEntity this.cMaterialCostList = cMaterialCostList; } + public String getTypeName() { + return typeName; + } + + public void setTypeName(String typeName) { + this.typeName = typeName; + } + @Override public String toString() { return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE) diff --git a/ruoyi-system/src/main/resources/mapper/clMaterial/CYlMaterialMapper.xml b/ruoyi-system/src/main/resources/mapper/clMaterial/CYlMaterialMapper.xml index 0a6c21d..73deced 100644 --- a/ruoyi-system/src/main/resources/mapper/clMaterial/CYlMaterialMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/clMaterial/CYlMaterialMapper.xml @@ -3,7 +3,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + @@ -17,17 +17,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + - + insert into c_yl_material @@ -57,9 +57,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - delete from c_yl_material where material_id in + delete from c_yl_material where material_id in #{materialId} - \ No newline at end of file + + + + diff --git a/ruoyi-system/src/main/resources/mapper/factory/CFactoryMapper.xml b/ruoyi-system/src/main/resources/mapper/factory/CFactoryMapper.xml index f8814af..622acab 100644 --- a/ruoyi-system/src/main/resources/mapper/factory/CFactoryMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/factory/CFactoryMapper.xml @@ -128,4 +128,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" (#{item.typeNo}, #{item.typeName}, #{item.factoryId}) + + diff --git a/ruoyi-system/src/main/resources/mapper/material/CMaterialMapper.xml b/ruoyi-system/src/main/resources/mapper/material/CMaterialMapper.xml index 406c42d..996a715 100644 --- a/ruoyi-system/src/main/resources/mapper/material/CMaterialMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/material/CMaterialMapper.xml @@ -11,6 +11,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + @@ -29,7 +30,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select material_id,material_type_id, material_xingh, material_guig, material_diany, material_dw from c_material + select a.material_id,a.material_type_id, a.material_xingh, a.material_guig, a.material_diany, a.material_dw,b.type_name + from c_material a + left join c_material_type b on a.material_type_id = b.type_id