From 3380e6ceeede7085f8b12e38bc8cf4725bd7684f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E5=B8=85?= Date: Mon, 21 Jul 2025 19:00:20 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ErpClientController.java | 8 ++ .../ErpMalfunctionProjectController.java | 8 ++ .../business/domain/bo/ErpMaterialBo.java | 2 - .../impl/ErpMaterialCheckServiceImpl.java | 89 ++++++++++---- .../service/impl/ErpWarehouseServiceImpl.java | 1 + .../common/helper/JimuReportTokenService.java | 11 +- .../resources/mapper/system/SysDeptMapper.xml | 2 +- maintain-ui/src/api/business/client.js | 9 ++ .../src/api/business/malfunctionProject.js | 11 +- maintain-ui/src/views/business/car/index.vue | 25 ++-- .../views/business/examineProject/index.vue | 16 --- .../views/business/maintainProject/index.vue | 29 +---- .../views/business/materialCheck/index.vue | 112 ++++++++++-------- .../views/business/materialPutaway/index.vue | 16 +-- .../views/business/siteWarehouse/index.vue | 2 + 15 files changed, 202 insertions(+), 139 deletions(-) diff --git a/maintain-business/src/main/java/com/maintain/business/controller/ErpClientController.java b/maintain-business/src/main/java/com/maintain/business/controller/ErpClientController.java index dc50c81..77bd707 100644 --- a/maintain-business/src/main/java/com/maintain/business/controller/ErpClientController.java +++ b/maintain-business/src/main/java/com/maintain/business/controller/ErpClientController.java @@ -57,6 +57,14 @@ public class ErpClientController extends BaseController { return iErpClientService.queryPageList(bo, pageQuery); } + /** + * 查询客户信息-客户列表 + */ + @GetMapping("/listAll") + public R> list(ErpClientBo bo) { + return R.ok(iErpClientService.queryList(bo)); + } + /** * 客户信息-客户导入模板下载 */ diff --git a/maintain-business/src/main/java/com/maintain/business/controller/ErpMalfunctionProjectController.java b/maintain-business/src/main/java/com/maintain/business/controller/ErpMalfunctionProjectController.java index 5fd6d88..30f1e26 100644 --- a/maintain-business/src/main/java/com/maintain/business/controller/ErpMalfunctionProjectController.java +++ b/maintain-business/src/main/java/com/maintain/business/controller/ErpMalfunctionProjectController.java @@ -51,6 +51,14 @@ public class ErpMalfunctionProjectController extends BaseController { return iErpMalfunctionProjectService.queryPageList(bo, pageQuery); } + /** + * 查询故障项目列表 + */ + @GetMapping("/listAll") + public R> listAll(ErpMalfunctionProjectBo bo) { + return R.ok(iErpMalfunctionProjectService.queryList(bo)); + } + /** * 故障项目导入模板下载 */ diff --git a/maintain-business/src/main/java/com/maintain/business/domain/bo/ErpMaterialBo.java b/maintain-business/src/main/java/com/maintain/business/domain/bo/ErpMaterialBo.java index 201dd23..e07212a 100644 --- a/maintain-business/src/main/java/com/maintain/business/domain/bo/ErpMaterialBo.java +++ b/maintain-business/src/main/java/com/maintain/business/domain/bo/ErpMaterialBo.java @@ -54,8 +54,6 @@ public class ErpMaterialBo extends BaseEntity { /** * 仓库ID */ - - @NotNull(message = "仓库不能为空", groups = { AddGroup.class, EditGroup.class }) private Long warehouseId; /** diff --git a/maintain-business/src/main/java/com/maintain/business/service/impl/ErpMaterialCheckServiceImpl.java b/maintain-business/src/main/java/com/maintain/business/service/impl/ErpMaterialCheckServiceImpl.java index f44561c..fb85479 100644 --- a/maintain-business/src/main/java/com/maintain/business/service/impl/ErpMaterialCheckServiceImpl.java +++ b/maintain-business/src/main/java/com/maintain/business/service/impl/ErpMaterialCheckServiceImpl.java @@ -29,9 +29,12 @@ import com.maintain.business.domain.vo.ErpMaterialCheckVo; import com.maintain.business.service.IErpMaterialCheckService; import org.springframework.transaction.annotation.Transactional; +import java.math.BigDecimal; import java.util.*; import java.util.stream.Collectors; +import static net.sf.jsqlparser.parser.feature.Feature.update; + /** * 物资盘点Service业务层处理 * @@ -146,17 +149,51 @@ public class ErpMaterialCheckServiceImpl implements IErpMaterialCheckService { /** * 修改物资盘点 */ + @Transactional(rollbackFor = Exception.class) @Override public Boolean updateByBo(ErpMaterialCheckBo bo) { - ErpMaterialCheck update = BeanUtil.toBean(bo, ErpMaterialCheck.class); - validEntityBeforeSave(update); - SysDept sysDept = deptMapper.selectVoById(update.getDeptId()); - update.setDeptName(sysDept.getDeptName()); - ErpWarehouseVo warehouseVo = warehouseMapper.selectVoById(update.getWarehouseId()); - update.setWarehouseName(warehouseVo.getName()); - SysUser sysUser = userMapper.selectVoById(update.getTaskUserId()); - update.setTaskUserName(sysUser.getNickName()); - return baseMapper.updateById(update) > 0; + ErpMaterialCheck materialCheck = baseMapper.selectById(bo.getId()); + materialCheck.setTaskName(bo.getTaskName()); + materialCheck.setTaskStartTime(bo.getTaskStartTime()); + materialCheck.setRemark(bo.getRemark()); + if (!bo.getDeptId().equals(materialCheck.getDeptId())) { + /* 车间变更 */ + SysDept sysDept = deptMapper.selectVoById(bo.getDeptId()); + materialCheck.setDeptId(sysDept.getDeptId()); + materialCheck.setDeptName(sysDept.getDeptName()); + /* 仓库变更 */ + ErpWarehouse warehouse = warehouseMapper.selectById(bo.getWarehouseId()); + materialCheck.setWarehouseId(warehouse.getId()); + materialCheck.setWarehouseName(warehouse.getName()); + /* 仓库盘点状态变更 */ + warehouse.setIsCheck(IsEnableStatus.YES.getCode()); + warehouseMapper.updateById(warehouse); + /* 原仓库状态变更 */ + ErpWarehouse erpWarehouse = new ErpWarehouse(); + erpWarehouse.setId(materialCheck.getWarehouseId()); + erpWarehouse.setIsCheck(IsEnableStatus.NO.getCode()); + } + /* 盘点人存在变更 */ + if (!bo.getTaskUserId().equals(materialCheck.getTaskUserId())) { + SysUser sysUser = userMapper.selectVoById(bo.getTaskUserId()); + materialCheck.setTaskUserId(sysUser.getUserId()); + materialCheck.setTaskUserName(sysUser.getNickName()); + } + boolean flag = baseMapper.updateById(materialCheck) > 0; + if (flag) { + /* 删除旧绑定 */ + LambdaQueryWrapper lambdaQuery = Wrappers.lambdaQuery(); + lambdaQuery.eq(ErpMaterialCheckInfo::getCheckId, bo.getId()); + checkInfoMapper.delete(lambdaQuery); + /* 创建新绑定 */ + checkInfoMapper.insertBatch(bo.getCheckInfoList().stream().map(item -> { + ErpMaterialCheckInfo checkInfo = BeanUtil.toBean(item, ErpMaterialCheckInfo.class); + checkInfo.setId(null); + checkInfo.setCheckId(bo.getId()); + return checkInfo; + }).collect(Collectors.toList())); + } + return flag; } /** @@ -172,14 +209,9 @@ public class ErpMaterialCheckServiceImpl implements IErpMaterialCheckService { materialCheck.setTaskEndTime(new Date()); materialCheck.setCheckState(CheckState.TWO.getCode()); // 将盘点的仓库状态改为 否 - ErpWarehouse warehouse = warehouseMapper.selectById(bo.getWarehouseId()); + ErpWarehouse warehouse = warehouseMapper.selectById(materialCheck.getWarehouseId()); warehouse.setIsCheck(IsEnableStatus.NO.getCode()); warehouseMapper.updateById(warehouse); - // 将盘点所在仓库下的物料是否盘点状态更改为 是 -// LambdaUpdateWrapper materialLambdaUpdateWrapper = Wrappers.lambdaUpdate(); -// materialLambdaUpdateWrapper.eq(ErpMaterial::getWarehouseId, materialCheck.getWarehouseId()); -// materialLambdaUpdateWrapper.set(ErpMaterial::getIsCheck, IsEnableStatus.NO.getCode()); -// materialMapper.update(materialLambdaUpdateWrapper); boolean flag = baseMapper.updateById(materialCheck) > 0; if (flag) { List putawayInfoList = new ArrayList<>(); @@ -195,17 +227,22 @@ public class ErpMaterialCheckServiceImpl implements IErpMaterialCheckService { ErpMaterial material = materialMapper.selectById(item.getMaterialId()); /* 查询物料库存 */ ErpMaterialInventoryRecordVo recordVo = materialInventoryRecordMapper.queryMaterialByWarehouseIdAndMaterialId(bo.getWarehouseId(), item.getMaterialId()); + /* 如果recordVo为空，说明改物料没有过库存变动记录数据，默认给0 */ + BigDecimal inventory = new BigDecimal("0"); + if (null != recordVo) { + inventory = recordVo.getInventory(); + } // 判断盘盈或盘亏 盘盈则新增入库、盘亏新增出库 if (item.getResultState().equals(CheckInfoState.ONE.getCode())) { ErpMaterialPutawayInfo putawayInfo = BeanUtil.toBean(material, ErpMaterialPutawayInfo.class); - putawayInfo.setPutawayNumber(item.getCheckNum().subtract(recordVo.getInventory())); - putawayInfo.setMaterialId(recordVo.getMaterialId()); + putawayInfo.setPutawayNumber(item.getCheckNum().subtract(inventory)); + putawayInfo.setMaterialId(item.getMaterialId()); putawayInfo.setId(null); putawayInfoList.add(putawayInfo); }else if (item.getResultState().equals(CheckInfoState.TWO.getCode())) { ErpMaterialPickingInfo pickingInfo = BeanUtil.toBean(material, ErpMaterialPickingInfo.class); - pickingInfo.setCollectNumber(recordVo.getInventory().subtract(item.getCheckNum())); - pickingInfo.setMaterialId(recordVo.getMaterialId()); + pickingInfo.setCollectNumber(inventory.subtract(item.getCheckNum())); + pickingInfo.setMaterialId(item.getMaterialId()); pickingInfo.setId(null); pickingInfoList.add(pickingInfo); } @@ -286,9 +323,19 @@ public class ErpMaterialCheckServiceImpl implements IErpMaterialCheckService { */ @Override public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { - if(isValid){ - //TODO 做一些业务上的校验,判断是否需要校验 + /* 删除盘点明细 */ + LambdaQueryWrapper lambdaQueryWrapper = Wrappers.lambdaQuery(); + lambdaQueryWrapper.in(ErpMaterialCheckInfo::getCheckId, ids); + checkInfoMapper.delete(lambdaQueryWrapper); + /* 仓库盘点状态变更 */ + List checkVoList = baseMapper.selectVoBatchIds(ids); + List collect = checkVoList.stream().map(ErpMaterialCheckVo::getWarehouseId).collect(Collectors.toList()); + if (!collect.isEmpty()) { + LambdaUpdateWrapper updateWrapper = Wrappers.lambdaUpdate(); + updateWrapper.in(ErpWarehouse::getId, collect).set(ErpWarehouse::getIsCheck, CheckInfoState.ONE.getCode()); + warehouseMapper.update(updateWrapper); } + /* 删除盘点单 */ return baseMapper.deleteBatchIds(ids) > 0; } } diff --git a/maintain-business/src/main/java/com/maintain/business/service/impl/ErpWarehouseServiceImpl.java b/maintain-business/src/main/java/com/maintain/business/service/impl/ErpWarehouseServiceImpl.java index 7c1de32..ba04eb6 100644 --- a/maintain-business/src/main/java/com/maintain/business/service/impl/ErpWarehouseServiceImpl.java +++ b/maintain-business/src/main/java/com/maintain/business/service/impl/ErpWarehouseServiceImpl.java @@ -73,6 +73,7 @@ public class ErpWarehouseServiceImpl implements IErpWarehouseService { lqw.eq(bo.getDeptId() != null, ErpWarehouse::getDeptId, bo.getDeptId()); lqw.like(StringUtils.isNotBlank(bo.getDeptName()), ErpWarehouse::getDeptName, bo.getDeptName()); lqw.in(!deptList.isEmpty(), ErpWarehouse::getCreateDeptId, deptList.stream().map(SysDept::getDeptId).collect(Collectors.toList())); + lqw.orderByDesc(ErpWarehouse::getCreateTime); return lqw; } diff --git a/maintain-common/src/main/java/com/maintain/common/helper/JimuReportTokenService.java b/maintain-common/src/main/java/com/maintain/common/helper/JimuReportTokenService.java index d81049b..61eccb5 100644 --- a/maintain-common/src/main/java/com/maintain/common/helper/JimuReportTokenService.java +++ b/maintain-common/src/main/java/com/maintain/common/helper/JimuReportTokenService.java @@ -1,5 +1,6 @@ package com.maintain.common.helper; +import com.maintain.common.core.domain.model.LoginUser; import lombok.extern.slf4j.Slf4j; import org.jeecg.modules.jmreport.api.JmReportTokenServiceI; import org.springframework.stereotype.Component; @@ -21,6 +22,7 @@ public class JimuReportTokenService implements JmReportTokenServiceI { @Override public String getUsername(String s) { + System.out.println("---------call---------getUsername-----------------------"); return ""; } @@ -31,8 +33,8 @@ public class JimuReportTokenService implements JmReportTokenServiceI { */ @Override public String getToken(HttpServletRequest request) { - //System.out.println("---------call---------getToken-----------------------"); - return "token令牌"; + System.out.println("---------call---------getToken-----------------------"); + return request.getHeader("token"); } /** * Token校验 @@ -41,7 +43,8 @@ public class JimuReportTokenService implements JmReportTokenServiceI { */ @Override public Boolean verifyToken(String token) { - //System.out.println("---------verify-----Token---------------"); + System.out.println("---------verify-----Token---------------"); + System.out.println(token); return true; } @@ -53,6 +56,7 @@ public class JimuReportTokenService implements JmReportTokenServiceI { */ @Override public String[] getRoles(String token) { + System.out.println("---------call---------getRoles-----------------------"); return new String[]{"admin","lowdeveloper","dbadeveloper"}; } @@ -64,6 +68,7 @@ public class JimuReportTokenService implements JmReportTokenServiceI { */ @Override public String[] getPermissions(String token) { + System.out.println("---------call---------getPermissions-----------------------"); return new String[]{"drag:datasource:testConnection","onl:drag:clear:recovery","drag:analysis:sql","drag:design:getTotalData"}; } } diff --git a/maintain-system/src/main/resources/mapper/system/SysDeptMapper.xml b/maintain-system/src/main/resources/mapper/system/SysDeptMapper.xml index 1ed067a..52136e2 100644 --- a/maintain-system/src/main/resources/mapper/system/SysDeptMapper.xml +++ b/maintain-system/src/main/resources/mapper/system/SysDeptMapper.xml @@ -38,7 +38,7 @@ diff --git a/maintain-ui/src/api/business/client.js b/maintain-ui/src/api/business/client.js index 04c5f7f..55b8138 100644 --- a/maintain-ui/src/api/business/client.js +++ b/maintain-ui/src/api/business/client.js @@ -9,6 +9,15 @@ export function listClient(query) { }) } +// 查询客户信息-客户列表 +export function listClientAll(query) { + return request({ + url: '/business/client/listAll', + method: 'get', + params: query + }) +} + // 查询客户信息-客户详细 export function getClient(id) { return request({ diff --git a/maintain-ui/src/api/business/malfunctionProject.js b/maintain-ui/src/api/business/malfunctionProject.js index ca04702..9c416e4 100644 --- a/maintain-ui/src/api/business/malfunctionProject.js +++ b/maintain-ui/src/api/business/malfunctionProject.js @@ -9,6 +9,15 @@ export function listMalfunctionProject(query) { }) } +// 查询故障项目列表 +export function listMalfunctionProjectAll(query) { + return request({ + url: '/business/malfunctionProject/listAll', + method: 'get', + params: query + }) +} + // 查询故障项目详细 export function getMalfunctionProject(id) { return request({ @@ -49,4 +58,4 @@ export function getMalfunctionCode() { url: '/business/malfunctionProject/getMalfunctionCode', method: 'get' }) -} \ No newline at end of file +} diff --git a/maintain-ui/src/views/business/car/index.vue b/maintain-ui/src/views/business/car/index.vue index 5cb344b..7102da0 100644 --- a/maintain-ui/src/views/business/car/index.vue +++ b/maintain-ui/src/views/business/car/index.vue @@ -149,7 +149,7 @@ - + @@ -169,7 +169,7 @@ v-for="item in dict.type.client_type" :key="item.value" :label="item.label" - :value="parseInt(item.value)" + :value="item.value" /> @@ -345,7 +345,7 @@