diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/mechanicalcost/vo/MechanicalCostSaveReqVO.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/mechanicalcost/vo/MechanicalCostSaveReqVO.java index bcab493..d7db311 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/mechanicalcost/vo/MechanicalCostSaveReqVO.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/mechanicalcost/vo/MechanicalCostSaveReqVO.java @@ -75,7 +75,7 @@ public class MechanicalCostSaveReqVO { private String companyId; @Schema(description = "部门id", example = "13645") - private Long deptId; + private List deptId; @Schema(description = "备注", example = "随便") private String remark; diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/rentalmechanicalcost/vo/RentalMechanicalCostSaveReqVO.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/rentalmechanicalcost/vo/RentalMechanicalCostSaveReqVO.java index 2379eea..fdc0e34 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/rentalmechanicalcost/vo/RentalMechanicalCostSaveReqVO.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/rentalmechanicalcost/vo/RentalMechanicalCostSaveReqVO.java @@ -66,7 +66,7 @@ public class RentalMechanicalCostSaveReqVO { private String companyId; @Schema(description = "部门id", example = "25446") - private Long deptId; + private List deptId; @Schema(description = "道路ID数组（多选）") private String roadIds; diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/road/vo/RoadSaveReqVO.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/road/vo/RoadSaveReqVO.java index 8018a60..387f5c5 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/road/vo/RoadSaveReqVO.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/road/vo/RoadSaveReqVO.java @@ -90,11 +90,9 @@ public class RoadSaveReqVO { private Long deptId; @Schema(description = "创建者", requiredMode = Schema.RequiredMode.REQUIRED, example = "赵六") - @NotEmpty(message = "创建者不能为空") private String creatorName; @Schema(description = "更新者", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋艿") - @NotEmpty(message = "更新者不能为空") private String updaterName; -} \ No newline at end of file +} diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/departmentcost/DepartmentCostServiceImpl.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/departmentcost/DepartmentCostServiceImpl.java index 1101ea3..f9489c3 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/departmentcost/DepartmentCostServiceImpl.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/departmentcost/DepartmentCostServiceImpl.java @@ -60,16 +60,6 @@ public class DepartmentCostServiceImpl implements DepartmentCostService { // 更新 DepartmentCostDO updateObj = BeanUtils.toBean(updateReqVO, DepartmentCostDO.class); - // add bt wq 20251119 插入增加校验 - LambdaQueryWrapper queryWrapper = Wrappers.lambdaQuery(); - queryWrapper.eq(DepartmentCostDO::getSalaryMonth, updateObj.getSalaryMonth()); - queryWrapper.eq(DepartmentCostDO::getExpenseName, updateObj.getExpenseName()); - queryWrapper.eq(DepartmentCostDO::getCompanyId, updateObj.getCompanyId()); - List list = departmentCostMapper.selectList(queryWrapper); - if (!CollectionUtils.isEmpty(list)) { - throw exception(COST_FEE_NOT_EXISTS); - } - // add bt wq 20251119 插入增加校验 departmentCostMapper.updateById(updateObj); } diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/material/MaterialServiceImpl.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/material/MaterialServiceImpl.java index eecf2c5..828c937 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/material/MaterialServiceImpl.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/material/MaterialServiceImpl.java @@ -36,7 +36,7 @@ public class MaterialServiceImpl implements MaterialService { QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.lambda().eq(MaterialDO::getMaterialCode, createReqVO.getMaterialCode()) .eq(MaterialDO::getSpecCode, createReqVO.getSpecCode()) - .eq(MaterialDO::getMaterialTypeId, createReqVO.getTypeDetailId()); + .eq(MaterialDO::getTypeDetailId, createReqVO.getTypeDetailId()); List tdMaterials = materialMapper.selectList(queryWrapper); if (null != tdMaterials && tdMaterials.size() > 0) { MaterialDO material = tdMaterials.get(0); diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/materialinventory/MaterialInventoryService.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/materialinventory/MaterialInventoryService.java index 7d09864..5e4bf5c 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/materialinventory/MaterialInventoryService.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/materialinventory/MaterialInventoryService.java @@ -80,7 +80,7 @@ public interface MaterialInventoryService { * @Date 2025/11/28 23:36 * @Param materialId */ - MaterialInventoryDO selectTdMaterialInventoryByMaterialId(Long materialId); + MaterialInventoryDO selectMaterialInventoryByMaterialId(Long materialId, Long companyId); /** @@ -98,4 +98,13 @@ public interface MaterialInventoryService { * @return */ int updateInVentoryAlremNum(Long materialId, Long alermNum); + + /** + * @Author wangqian + * @Description 查询物料信息根据 + * @Date 2025/11/28 23:36 + * @Param materialId + */ + MaterialInventoryDO selectMaterialInventoryByMaterialId(Long materialId); + } diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/materialinventory/MaterialInventoryServiceImpl.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/materialinventory/MaterialInventoryServiceImpl.java index 9667d84..af278ac 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/materialinventory/MaterialInventoryServiceImpl.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/materialinventory/MaterialInventoryServiceImpl.java @@ -3,6 +3,7 @@ package com.zteits.urbanops.module.garden.service.materialinventory; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; +import com.baomidou.mybatisplus.core.toolkit.StringUtils; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.zteits.urbanops.framework.common.pojo.PageResult; import com.zteits.urbanops.framework.common.util.object.BeanUtils; @@ -92,6 +93,10 @@ public class MaterialInventoryServiceImpl implements MaterialInventoryService { @Override public PageResult getMaterialInventoryPage(MaterialInventoryPageReqVO pageReqVO) { + //查询自己单位入库的库存 + if(getCompanyId() != 100) { + pageReqVO.setBelongCompanyId(getCompanyId()); + } return materialInventoryMapper.selectPage(pageReqVO); } @@ -99,7 +104,7 @@ public class MaterialInventoryServiceImpl implements MaterialInventoryService { public int insertMaterialInventory(MaterialInventoryDO materialInventory) { LambdaQueryWrapper queryWrapper = Wrappers.lambdaQuery(); queryWrapper.eq(MaterialInventoryDO::getBelongCompanyId, materialInventory.getBelongCompanyId()); - queryWrapper.eq(MaterialInventoryDO::getTypeDetailId, materialInventory.getTypeDetailId()); + queryWrapper.eq(MaterialInventoryDO::getMaterialId, materialInventory.getMaterialId()); MaterialInventoryDO object = materialInventoryMapper.selectOne(queryWrapper); if(object != null){ object.setInventoryTotalNum(object.getInventoryTotalNum()+ materialInventory.getCurrentNum()); @@ -118,25 +123,27 @@ public class MaterialInventoryServiceImpl implements MaterialInventoryService { } @Override - public MaterialInventoryDO selectTdMaterialInventoryByMaterialId(Long materialId) { + public MaterialInventoryDO selectMaterialInventoryByMaterialId(Long materialId, Long companyId) { if (materialId == null) { - throw exception0(BAD_REQUEST.getCode(),"更新库存失败：materialId为空！"); + throw exception0(BAD_REQUEST.getCode(),"更新库存失败：typeDetailId为空！"); } LambdaQueryWrapper queryWrapper = Wrappers.lambdaQuery(); - queryWrapper.eq(MaterialInventoryDO::getTypeDetailId, materialId); + queryWrapper.eq(MaterialInventoryDO::getMaterialId, materialId); + queryWrapper.eq(MaterialInventoryDO::getBelongCompanyId, companyId); return materialInventoryMapper.selectOne(queryWrapper); } @Override public int updateInVentoryByMaterialId(MaterialInventoryDO materialInventory, Long outNum) { // 1. 入参空值校验（避免无效更新或SQL异常） + if (materialInventory == null || materialInventory.getInventoryId() == null) { + throw exception0(BAD_REQUEST.getCode(),"更新库存失败：InventoryId为空！"); + } if (outNum == null) { throw exception0(BAD_REQUEST.getCode(),"更新库存失败：outNum为空！"); } - MaterialInventoryDO out = new MaterialInventoryDO(); - out.setInventoryId(materialInventory.getInventoryId()); - out.setOutTotalNum(materialInventory.getInventoryTotalNum() + outNum); - out.setCurrentNum(materialInventory.getCurrentNum() - outNum); + materialInventory.setOutTotalNum(materialInventory.getInventoryTotalNum() + outNum); + materialInventory.setCurrentNum(materialInventory.getCurrentNum() - outNum); return materialInventoryMapper.updateById(materialInventory); } @@ -157,4 +164,14 @@ public class MaterialInventoryServiceImpl implements MaterialInventoryService { // 3. 执行更新（MyBatis-Plus支持直接传wrapper，第一个参数为null即可） return materialInventoryMapper.update(null, updateWrapper); } + + @Override + public MaterialInventoryDO selectMaterialInventoryByMaterialId(Long materialId) { + if (materialId == null) { + throw exception0(BAD_REQUEST.getCode(),"更新库存失败：materialId为空！"); + } + LambdaQueryWrapper queryWrapper = Wrappers.lambdaQuery(); + queryWrapper.eq(MaterialInventoryDO::getMaterialId, materialId); + return materialInventoryMapper.selectOne(queryWrapper); + } } diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/materialinventoryin/MaterialInventoryInServiceImpl.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/materialinventoryin/MaterialInventoryInServiceImpl.java index 42ffc65..21ab444 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/materialinventoryin/MaterialInventoryInServiceImpl.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/materialinventoryin/MaterialInventoryInServiceImpl.java @@ -74,8 +74,6 @@ public class MaterialInventoryInServiceImpl implements MaterialInventoryInServic in.setTypeDetailId(material.getTypeDetailId()); in.setTypeDetailName(material.getTypeDetailName()); in.setSpecifications(material.getSpecifications()); -// in.setBelongCompanyId(material.getBelongCompanyId()); -// in.setBelongCompanyName(material.getBelongCompanyName()); in.setBelongCompanyId(deptRespDTO.getId()); in.setBelongCompanyName(deptRespDTO.getName()); in.setInInventoryNum(createReqVO.getInInventoryNum()); @@ -103,8 +101,8 @@ public class MaterialInventoryInServiceImpl implements MaterialInventoryInServic inventory.setTypeDetailId(material.getTypeDetailId()); inventory.setTypeDetailName(material.getTypeDetailName()); inventory.setSpecifications(in.getSpecifications()); - inventory.setBelongCompanyId(in.getBelongCompanyId()); - inventory.setBelongCompanyName(in.getBelongCompanyName()); + inventory.setBelongCompanyId(deptRespDTO.getId()); + inventory.setBelongCompanyName(deptRespDTO.getName()); inventory.setUnitId(in.getUnitId()); inventory.setUnitName(in.getUnitName()); inventory.setCurrentNum(in.getInInventoryNum()); @@ -133,8 +131,6 @@ public class MaterialInventoryInServiceImpl implements MaterialInventoryInServic updateObj.setMaterialTypeId(material.getMaterialTypeId()); updateObj.setMaterialTypeName(material.getMaterialTypeName()); updateObj.setSpecifications(material.getSpecifications()); - updateObj.setBelongCompanyId(material.getBelongCompanyId()); - updateObj.setBelongCompanyName(material.getBelongCompanyName()); updateObj.setUnitId(material.getUnitId()); updateObj.setUnitName(material.getUnitName()); materialInventoryInMapper.updateById(updateObj); @@ -148,20 +144,17 @@ public class MaterialInventoryInServiceImpl implements MaterialInventoryInServic if (null == materialInventoryIn) { throw exception(MATERIAL_INVENTORY_IN_NOT_EXISTS); } - MaterialInventoryDO materialInventory = materialInventoryService.selectTdMaterialInventoryByMaterialId(materialInventoryIn.getMaterialId()); - if(null == materialInventory){ + MaterialInventoryDO inventory = materialInventoryService.selectMaterialInventoryByMaterialId(materialInventoryIn.getMaterialId(),getCompanyId()); + if(null == inventory){ throw exception0(BAD_REQUEST.getCode(),"参数错误"); } //库存已使用 - if(materialInventory.getCurrentNum() < materialInventoryIn.getInInventoryNum()){ + if(inventory.getCurrentNum() < materialInventoryIn.getInInventoryNum()){ throw exception0(BAD_REQUEST.getCode(),"库存已使用"); } //入库记录减扣 - MaterialInventoryDO inventory = new MaterialInventoryDO(); - inventory.setInventoryId(materialInventory.getInventoryId()); - inventory.setMaterialId(materialInventory.getMaterialId()); - inventory.setCurrentNum(materialInventory.getCurrentNum() - materialInventoryIn.getInInventoryNum()); - inventory.setInventoryTotalNum(materialInventory.getInventoryTotalNum() - materialInventoryIn.getInInventoryNum()); + inventory.setCurrentNum(inventory.getCurrentNum() - materialInventoryIn.getInInventoryNum()); + inventory.setInventoryTotalNum(inventory.getInventoryTotalNum() - materialInventoryIn.getInInventoryNum()); materialInventoryService.updateTdMaterialInventory(inventory); // 删除 materialInventoryInMapper.deleteById(id); @@ -187,6 +180,10 @@ public class MaterialInventoryInServiceImpl implements MaterialInventoryInServic @Override public PageResult getMaterialInventoryInPage(MaterialInventoryInPageReqVO pageReqVO) { + //查询自己单位入库的记录 + if(getCompanyId() != 100) { + pageReqVO.setBelongCompanyId(getCompanyId()); + } return materialInventoryInMapper.selectPage(pageReqVO); } diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/materialinventoryout/MaterialInventoryOutServiceImpl.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/materialinventoryout/MaterialInventoryOutServiceImpl.java index e347c07..b3c7754 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/materialinventoryout/MaterialInventoryOutServiceImpl.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/materialinventoryout/MaterialInventoryOutServiceImpl.java @@ -1,5 +1,6 @@ package com.zteits.urbanops.module.garden.service.materialinventoryout; +import cn.hutool.core.util.RandomUtil; import com.zteits.urbanops.framework.common.pojo.PageResult; import com.zteits.urbanops.framework.common.util.object.BeanUtils; import com.zteits.urbanops.module.garden.controller.admin.materialinventoryout.vo.MaterialInventoryOutPageReqVO; @@ -52,7 +53,7 @@ public class MaterialInventoryOutServiceImpl implements MaterialInventoryOutServ if(null == material){ throw exception0(BAD_REQUEST.getCode(), "无效参数-materialId"); } - MaterialInventoryDO materialInventory = materialInventoryService.selectTdMaterialInventoryByMaterialId(out.getMaterialId()); + MaterialInventoryDO materialInventory = materialInventoryService.selectMaterialInventoryByMaterialId(material.getMaterialId(),getCompanyId()); if(null == materialInventory){ throw exception0(BAD_REQUEST.getCode(),createReqVO.getMaterialName()+"没有库存"); } @@ -64,6 +65,8 @@ public class MaterialInventoryOutServiceImpl implements MaterialInventoryOutServ if(null == deptRespDTO){ throw exception0(BAD_REQUEST.getCode(), "无效参数-登录人所属单位为空"); } + out.setInventoryOutNo(System.currentTimeMillis()+ RandomUtil.randomInt(10, 100000)+""); + out.setMaterialId(createReqVO.getMaterialId()); out.setMaterialName(material.getMaterialName()); out.setMaterialTypeId(material.getMaterialTypeId()); out.setMaterialTypeName(material.getMaterialTypeName()); @@ -76,8 +79,10 @@ public class MaterialInventoryOutServiceImpl implements MaterialInventoryOutServ // out.setBelongCompanyName(material.getBelongCompanyName()); out.setBelongCompanyId(deptRespDTO.getId()); out.setBelongCompanyName(deptRespDTO.getName()); + out.setOutInventoryNum(createReqVO.getOutInventoryNum()); out.setUnitId(material.getUnitId()); out.setUnitName(material.getUnitName()); + out.setOutDate(createReqVO.getOutDate()); materialInventoryOutMapper.insert(out); //更新库存 @@ -103,23 +108,19 @@ public class MaterialInventoryOutServiceImpl implements MaterialInventoryOutServ throw exception(MATERIAL_INVENTORY_OUT_NOT_EXISTS); } - //查询库存 - MaterialInventoryDO materialInventory = materialInventoryService.selectTdMaterialInventoryByMaterialId(materialInventoryOut.getMaterialId()); - if(null == materialInventory){ + MaterialInventoryDO inventory = materialInventoryService.selectMaterialInventoryByMaterialId(materialInventoryOut.getMaterialId(),getCompanyId()); + if(null == inventory){ throw exception0(BAD_REQUEST.getCode(),"参数错误"); } //库存已使用 - if(materialInventory.getCurrentNum() < materialInventoryOut.getOutInventoryNum()){ + if(inventory.getCurrentNum() < materialInventoryOut.getOutInventoryNum()){ throw exception0(BAD_REQUEST.getCode(),"库存已使用"); } //入库记录减扣 - MaterialInventoryDO inventory = new MaterialInventoryDO(); - inventory.setInventoryId(materialInventory.getInventoryId()); - inventory.setMaterialId(materialInventory.getMaterialId()); - inventory.setCurrentNum(materialInventory.getCurrentNum() + materialInventoryOut.getOutInventoryNum()); - inventory.setInventoryTotalNum(materialInventory.getInventoryTotalNum() + materialInventoryOut.getOutInventoryNum()); - inventory.setOutTotalNum(materialInventory.getOutTotalNum() - materialInventoryOut.getOutInventoryNum()); + inventory.setCurrentNum(inventory.getCurrentNum() + materialInventoryOut.getOutInventoryNum()); + inventory.setInventoryTotalNum(inventory.getInventoryTotalNum() + materialInventoryOut.getOutInventoryNum()); + inventory.setOutTotalNum(inventory.getOutTotalNum() - materialInventoryOut.getOutInventoryNum()); materialInventoryService.updateTdMaterialInventory(inventory); // 删除 @@ -146,6 +147,10 @@ public class MaterialInventoryOutServiceImpl implements MaterialInventoryOutServ @Override public PageResult getMaterialInventoryOutPage(MaterialInventoryOutPageReqVO pageReqVO) { + //查询自己单位出库的记录 + if(getCompanyId() != 100) { + pageReqVO.setBelongCompanyId(getCompanyId()); + } return materialInventoryOutMapper.selectPage(pageReqVO); }