diff --git a/admin/src/main/java/com/hcy/admin/controller/sparePartAllot/SparePartAllotController.java b/admin/src/main/java/com/hcy/admin/controller/sparePartAllot/SparePartAllotController.java new file mode 100644 index 0000000..e138fe6 --- /dev/null +++ b/admin/src/main/java/com/hcy/admin/controller/sparePartAllot/SparePartAllotController.java @@ -0,0 +1,98 @@ +package com.hcy.admin.controller.sparePartAllot; + +import com.hcy.admin.config.aop.Log; +import com.hcy.admin.service.sparePartAllot.ISparePartAllotService; +import com.hcy.admin.service.sparePartOutWarehouse.ISparePartOutWarehouseService; +import com.hcy.admin.validate.common.PageParam; +import com.hcy.admin.validate.sparePartStockAudit.SparePartStockAuditParam; +import com.hcy.admin.vo.SparePartOutWarehouseListVo.SparePartOutWarehouseListVo; +import com.hcy.admin.vo.sparePartAllotListVo.SparePartAllotListVo; +import com.hcy.common.core.AjaxResult; +import com.hcy.common.core.PageResult; +import com.hcy.common.validator.annotation.IDMust; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import java.util.Map; + +/** + * 备件调拨管理 + */ +@RestController +@RequestMapping("api/sparePartAllot") +public class SparePartAllotController { + + @Resource + ISparePartAllotService iSparePartAllotService; + + /** + * 备件调拨列表 + * + * @author hcy + * @param pageParam 分页参数 + * @param params 搜索参数 + * @return Object + */ + @GetMapping("/list") + public Object list(@Validated PageParam pageParam, + @RequestParam Map params) { + PageResult list = iSparePartAllotService.list(pageParam, params); + return AjaxResult.success(list); + } + /** + * 备件调拨详情 + * + * @author hcy + * @param id 主键ID + * @return Object + */ + @GetMapping("/detail") + public Object detail(@Validated @IDMust() @RequestParam("id") Integer id) { + SparePartAllotListVo detail = iSparePartAllotService.detail(id); + return AjaxResult.success(detail); + } + + /** + * 备件调拨新增 + * + * @author hcy + * @param sparePartStockAuditParam 参数 + * @return Object + */ + @Log(title = "备件调拨新增") + @PostMapping("/add") + public Object add(@Validated(value = SparePartStockAuditParam.create.class) @RequestBody SparePartStockAuditParam sparePartStockAuditParam) { + iSparePartAllotService.add(sparePartStockAuditParam); + return AjaxResult.success(); + } + + /** + * 备件调拨编辑 + * + * @author hcy + * @param sparePartStockAuditParam 参数 + * @return Object + */ + @Log(title = "备件调拨编辑") + @PostMapping("/edit") + public Object edit(@Validated(value = SparePartStockAuditParam.update.class) @RequestBody SparePartStockAuditParam sparePartStockAuditParam) { + iSparePartAllotService.edit(sparePartStockAuditParam); + return AjaxResult.success(); + } + + /** + * 备件调拨删除 + * + * @author hcy + * @param sparePartStockAuditParam 参数 + * @return Object + */ + @Log(title = "备件调拨删除") + @PostMapping("/del") + public Object del(@Validated(value = SparePartStockAuditParam.delete.class) @RequestBody SparePartStockAuditParam sparePartStockAuditParam) { + iSparePartAllotService.del(Math.toIntExact(sparePartStockAuditParam.getId())); + return AjaxResult.success(); + } + +} diff --git a/admin/src/main/java/com/hcy/admin/controller/sparePartAudit/SparePartAuditController.java b/admin/src/main/java/com/hcy/admin/controller/sparePartAudit/SparePartAuditController.java index d00a847..5c4bcf5 100644 --- a/admin/src/main/java/com/hcy/admin/controller/sparePartAudit/SparePartAuditController.java +++ b/admin/src/main/java/com/hcy/admin/controller/sparePartAudit/SparePartAuditController.java @@ -1,7 +1,7 @@ package com.hcy.admin.controller.sparePartAudit; import com.hcy.admin.config.aop.Log; -import com.hcy.admin.service.SparePartAudit.ISparePartAuditService; +import com.hcy.admin.service.sparePartAudit.ISparePartAuditService; import com.hcy.admin.validate.SparePartAudit.SparePartAuditParam; import com.hcy.admin.validate.common.PageParam; import com.hcy.admin.vo.SparePartAudit.SparePartAuditListVo; diff --git a/admin/src/main/java/com/hcy/admin/controller/sparePartStockAudit/SparePartStockAuditController.java b/admin/src/main/java/com/hcy/admin/controller/sparePartStockAudit/SparePartStockAuditController.java index b0a8d43..7542df6 100644 --- a/admin/src/main/java/com/hcy/admin/controller/sparePartStockAudit/SparePartStockAuditController.java +++ b/admin/src/main/java/com/hcy/admin/controller/sparePartStockAudit/SparePartStockAuditController.java @@ -94,4 +94,18 @@ public class SparePartStockAuditController { return AjaxResult.success(); } + /** + * 备件出入库审核操作 + * + * @author hcy + * @param sparePartStockAuditParam 参数 + * @return Object + */ + @Log(title = "备件出入库审核") + @PostMapping("/audit") + public Object audit(@RequestBody SparePartStockAuditParam sparePartStockAuditParam) { + iSparePartStockAuditService.audit(sparePartStockAuditParam); + return AjaxResult.success(); + } + } diff --git a/admin/src/main/java/com/hcy/admin/service/sparePart/impl/SparePartServiceImpl.java b/admin/src/main/java/com/hcy/admin/service/sparePart/impl/SparePartServiceImpl.java index 0edca17..8a2ce1c 100644 --- a/admin/src/main/java/com/hcy/admin/service/sparePart/impl/SparePartServiceImpl.java +++ b/admin/src/main/java/com/hcy/admin/service/sparePart/impl/SparePartServiceImpl.java @@ -13,7 +13,9 @@ import com.hcy.common.core.PageResult; import com.hcy.common.dto.UserDto; import com.hcy.common.entity.activity.Activity; import com.hcy.common.entity.sparePart.SparePart; +import com.hcy.common.entity.warehouse.Warehouse; import com.hcy.common.mapper.sparePart.SparePartMapper; +import com.hcy.common.mapper.warehouse.WarehouseMapper; import com.hcy.common.utils.StringUtil; import com.hcy.common.utils.TimeUtil; import org.springframework.beans.BeanUtils; @@ -33,6 +35,9 @@ public class SparePartServiceImpl implements ISparePartService { @Resource SparePartMapper sparePartMapper; + @Resource + WarehouseMapper warehouseMapper; + /** * 备件信息列表 * @@ -81,6 +86,12 @@ public class SparePartServiceImpl implements ISparePartService { BeanUtils.copyProperties(item, vo); vo.setCreateTime(TimeUtil.timestampToDate(item.getCreateTime())); vo.setUpdateTime(TimeUtil.timestampToDate(item.getUpdateTime())); + Warehouse warehouse = warehouseMapper.selectOne( + new QueryWrapper() + .eq("id", item.getWarehouseId()) + .eq("is_delete", 0) + .last("limit 1")); + vo.setWarehouseName(warehouse.getWarehouseName()); list.add(vo); } @@ -106,6 +117,12 @@ public class SparePartServiceImpl implements ISparePartService { SparePartDetailVo vo = new SparePartDetailVo(); BeanUtils.copyProperties(model, vo); + Warehouse warehouse = warehouseMapper.selectOne( + new QueryWrapper() + .eq("id", model.getWarehouseId()) + .eq("is_delete", 0) + .last("limit 1")); + vo.setWarehouseName(warehouse.getWarehouseName()); return vo; } diff --git a/admin/src/main/java/com/hcy/admin/service/sparePartAllot/ISparePartAllotService.java b/admin/src/main/java/com/hcy/admin/service/sparePartAllot/ISparePartAllotService.java new file mode 100644 index 0000000..ed25641 --- /dev/null +++ b/admin/src/main/java/com/hcy/admin/service/sparePartAllot/ISparePartAllotService.java @@ -0,0 +1,59 @@ +package com.hcy.admin.service.sparePartAllot; + +import com.hcy.admin.validate.common.PageParam; +import com.hcy.admin.validate.sparePartStockAudit.SparePartStockAuditParam; +import com.hcy.admin.vo.SparePartOutWarehouseListVo.SparePartOutWarehouseListVo; +import com.hcy.admin.vo.sparePartAllotListVo.SparePartAllotListVo; +import com.hcy.common.core.PageResult; + +import java.util.Map; + +/** + * 备件调拨服务接口类 + */ +public interface ISparePartAllotService { + + /** + * 备件调拨列表 + * + * @param pageParam 分页参数 + * @param params 搜索参数 + * @return PageResult + * @author hcy + */ + PageResult list(PageParam pageParam, Map params); + + /** + * 备件调拨详情 + * + * @author hcy + * @param id 主键ID + * @return SparePartInWarehouseListVo + */ + SparePartAllotListVo detail(Integer id); + + /** + * 备件调拨新增 + * + * @author hcy + * @param sparePartStockAuditParam 参数 + */ + void add(SparePartStockAuditParam sparePartStockAuditParam); + + /** + * 备件调拨编辑 + * + * @author hcy + * @param sparePartStockAuditParam 参数 + */ + void edit(SparePartStockAuditParam sparePartStockAuditParam); + + /** + * 备件调拨删除 + * + * @author hcy + * @param id 主键ID + */ + void del(Integer id); + +} diff --git a/admin/src/main/java/com/hcy/admin/service/sparePartAllot/impl/SpareParAllotServiceImpl.java b/admin/src/main/java/com/hcy/admin/service/sparePartAllot/impl/SpareParAllotServiceImpl.java new file mode 100644 index 0000000..3ac3c20 --- /dev/null +++ b/admin/src/main/java/com/hcy/admin/service/sparePartAllot/impl/SpareParAllotServiceImpl.java @@ -0,0 +1,273 @@ +package com.hcy.admin.service.sparePartAllot.impl; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.hcy.admin.AdminThreadLocal; +import com.hcy.admin.service.sparePartAllot.ISparePartAllotService; +import com.hcy.admin.validate.common.PageParam; +import com.hcy.admin.validate.sparePartStockAudit.SparePartStockAuditParam; +import com.hcy.admin.vo.SparePartOutWarehouseListVo.SparePartOutWarehouseListVo; +import com.hcy.admin.vo.sparePartAllotListVo.SparePartAllotListVo; +import com.hcy.common.core.PageResult; +import com.hcy.common.entity.SparePartAudit.SparePartAudit; +import com.hcy.common.entity.sparePartStockAudit.SparePartStockAudit; +import com.hcy.common.entity.warehouse.Warehouse; +import com.hcy.common.enums.Audit.AuditStateEnum; +import com.hcy.common.mapper.SparePartAudit.SparePartAuditMapper; +import com.hcy.common.mapper.sparePartStockAudit.SparePartStockAuditMapper; +import com.hcy.common.mapper.warehouse.WarehouseMapper; +import com.hcy.common.utils.TimeUtil; +import org.springframework.beans.BeanUtils; +import org.springframework.stereotype.Service; +import org.springframework.util.Assert; + +import javax.annotation.Resource; +import java.text.SimpleDateFormat; +import java.util.Date; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; + +/** + * 备件调拨实现类 + */ +@Service +public class SpareParAllotServiceImpl implements ISparePartAllotService { + + @Resource + SparePartStockAuditMapper sparePartStockAuditMapper; + + @Resource + SparePartAuditMapper sparePartAuditMapper; + + @Resource + WarehouseMapper warehouseMapper; + + /** + * 备件调拨列表 + * + * @param pageParam 分页参数 + * @param params 搜索参数 + * @return PageResult + * @author hcy + */ + public PageResult list(PageParam pageParam, Map params) { + Integer page = pageParam.getPageNo(); + Integer limit = pageParam.getPageSize(); + + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("receipt_type",2); //单据类型 + queryWrapper.eq("is_delete", 0); + queryWrapper.orderByDesc("id"); + + sparePartStockAuditMapper.setSearch(queryWrapper, params, new String[]{ + "like:receiptNumber@receipt_number:str", + "=:auditState@audit_state:int", + }); + + IPage iPage = sparePartStockAuditMapper.selectPage(new Page<>(page, limit), queryWrapper); + List list = new LinkedList<>(); + for(SparePartStockAudit item : iPage.getRecords()) { + SparePartAllotListVo vo = new SparePartAllotListVo(); + BeanUtils.copyProperties(item, vo); + vo.setCreateTime(TimeUtil.timestampToDate(item.getCreateTime())); + vo.setUpdateTime(TimeUtil.timestampToDate(item.getUpdateTime())); + // 调入仓库名 + Warehouse importWarehouseName = warehouseMapper.selectOne( + new QueryWrapper() + .eq("id", item.getImportWarehouse()) + .eq("is_delete", 0) + .last("limit 1")); + vo.setImportWarehouseName(importWarehouseName.getWarehouseName()); + // 调出仓库名 + Warehouse exportWarehouseName = warehouseMapper.selectOne( + new QueryWrapper() + .eq("id", item.getExportWarehouse()) + .eq("is_delete", 0) + .last("limit 1")); + vo.setExportWarehouseName(exportWarehouseName.getWarehouseName()); + list.add(vo); + } + + return PageResult.iPageHandle(iPage.getTotal(), iPage.getCurrent(), iPage.getSize(), list); + } + + /** + * 备件调拨详情 + * + * @author hcy + * @param id 主键参数 + * @return SparePartInWarehouseListVo + */ + @Override + public SparePartAllotListVo detail(Integer id) { + SparePartStockAudit model = sparePartStockAuditMapper.selectOne( + new QueryWrapper() + .eq("id", id) + .eq("is_delete", 0) + .last("limit 1")); + + Assert.notNull(model, "数据不存在"); + + SparePartAllotListVo vo = new SparePartAllotListVo(); + BeanUtils.copyProperties(model, vo); + + //获取待审核备件信息 + List stockAuditId = sparePartAuditMapper.selectList( + new QueryWrapper() + .eq("stock_audit_id", model.getId()) + ); + vo.setSparePartAuditList(stockAuditId); // 待入库的备件 + + // 调入仓库名 + Warehouse importWarehouseName = warehouseMapper.selectOne( + new QueryWrapper() + .eq("id", model.getImportWarehouse()) + .eq("is_delete", 0) + .last("limit 1")); + vo.setImportWarehouseName(importWarehouseName.getWarehouseName()); + // 调出仓库名 + Warehouse exportWarehouseName = warehouseMapper.selectOne( + new QueryWrapper() + .eq("id", model.getExportWarehouse()) + .eq("is_delete", 0) + .last("limit 1")); + vo.setExportWarehouseName(exportWarehouseName.getWarehouseName()); + + return vo; + } + + /** + * 备件调拨新增 + * + * @author hcy + * @param sparePartStockAuditParam 参数 + */ + @Override + public void add(SparePartStockAuditParam sparePartStockAuditParam) { + SparePartStockAudit model = new SparePartStockAudit(); + + QueryWrapper qw = new QueryWrapper<>(); + qw.select("max(id) as id"); + SparePartStockAudit sparePartStockAudit = sparePartStockAuditMapper.selectOne(qw); + if(sparePartStockAudit.getId() == null){ + model.setId(1L); + }else{ + model.setId(sparePartStockAudit.getId() + 1); + } + + model.setExportWarehouse(sparePartStockAuditParam.getExportWarehouse()); // 调出仓库 + model.setImportWarehouse(sparePartStockAuditParam.getImportWarehouse()); // 调入仓库 + model.setRemark(sparePartStockAuditParam.getRemark()); // 备注 + model.setReceiptNumber(generateOrderNumber()); // 单据编号 + // 获取当前的用户 + Object username = AdminThreadLocal.get("username"); + model.setResponsiblePerson((String) username); + // 审核状态 + model.setAuditState(AuditStateEnum.UNREVIEWED.getStatus()); + //单据类型（0=入库单，1=出库单，2=仓库调拨单） + model.setReceiptType(AuditStateEnum.ALLOT.getStatus()); + + List sparePartAuditList = sparePartStockAuditParam.getSparePartAuditList(); + // 使用StringBuilder来拼接id值 + StringBuilder sb = new StringBuilder(); + for (SparePartAudit sparePartAudit : sparePartAuditList) { + sparePartAudit.setStockAuditId(model.getId()); + sparePartAudit.setUpdateTime(System.currentTimeMillis() / 1000); + sparePartAuditMapper.updateById(sparePartAudit);//插入备件审核信息 + sb.append(sparePartAudit.getId()).append(","); + } + sb.deleteCharAt(sb.length() - 1); // 删除最后一个逗号 + model.setSparePartAuditId(String.valueOf(sb));// 备件审核id + model.setCreateTime(System.currentTimeMillis() / 1000); + sparePartStockAuditMapper.insert(model); + } + + /** + * 备件调拨编辑 + * + * @author hcy + * @param sparePartStockAuditParam 参数 + */ + @Override + public void edit(SparePartStockAuditParam sparePartStockAuditParam) { + SparePartStockAudit model = sparePartStockAuditMapper.selectOne( + new QueryWrapper() + .eq("id", sparePartStockAuditParam.getId()) + .eq("is_delete", 0) + .last("limit 1")); + + Assert.notNull(model, "数据不存在!"); + model.setId(sparePartStockAuditParam.getId()); + model.setExportWarehouse(sparePartStockAuditParam.getExportWarehouse()); // 调出仓库 + model.setImportWarehouse(sparePartStockAuditParam.getImportWarehouse()); // 调入仓库 + model.setRemark(sparePartStockAuditParam.getRemark()); // 备注 + + List sparePartAuditList = sparePartStockAuditParam.getSparePartAuditList(); + // 使用StringBuilder来拼接id值 + StringBuilder sb = new StringBuilder(); + for (SparePartAudit sparePartAudit : sparePartAuditList) { + sb.append(sparePartAudit.getId()).append(","); + } + sb.deleteCharAt(sb.length() - 1); // 删除最后一个逗号 + model.setSparePartAuditId(String.valueOf(sb));// 备件审核id + model.setUpdateTime(System.currentTimeMillis() / 1000); + sparePartStockAuditMapper.updateById(model); + } + + /** + * 备件调拨删除 + * + * @author hcy + * @param id 主键ID + */ + @Override + public void del(Integer id) { + SparePartStockAudit model = sparePartStockAuditMapper.selectOne( + new QueryWrapper() + .eq("id", id) + .eq("is_delete", 0) + .last("limit 1")); + + Assert.notNull(model, "数据不存在!"); + + model.setIsDelete(1); + model.setDeleteTime(System.currentTimeMillis() / 1000); + sparePartStockAuditMapper.updateById(model); + } + + + /** + * 系统自动生成订单号：年月日+6位流水号 + * @return + */ + public String generateOrderNumber() { + String DATE_FORMAT = "yyyyMMdd"; + int SEQUENCE_LENGTH = 6; + int sequence = 1; // 流水号从1开始 + // 获取当前日期 + SimpleDateFormat dateFormat = new SimpleDateFormat(DATE_FORMAT); + String dateStr = dateFormat.format(new Date()); + + //查看数据库是否今日有订单编号 + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.like("receipt_number",dateStr); + List sparePartStockAudits = sparePartStockAuditMapper.selectList(queryWrapper); + int max = sparePartStockAudits.size(); + if(sequence <= max){ + sequence = max + 1; // 递增流水号 + } + + // 生成6位流水号 + StringBuilder sequenceBuilder = new StringBuilder(); + for (int i = 0; i < SEQUENCE_LENGTH; i++) { + sequenceBuilder.append(String.format("%0" + (SEQUENCE_LENGTH - i) + "d", sequence)); + } + String truncatedString = sequenceBuilder.substring(0, 6); + // 拼接订单号 + String orderNumber = dateStr + truncatedString; + + return orderNumber; + } +} diff --git a/admin/src/main/java/com/hcy/admin/service/SparePartAudit/ISparePartAuditService.java b/admin/src/main/java/com/hcy/admin/service/sparePartAudit/ISparePartAuditService.java similarity index 96% rename from admin/src/main/java/com/hcy/admin/service/SparePartAudit/ISparePartAuditService.java rename to admin/src/main/java/com/hcy/admin/service/sparePartAudit/ISparePartAuditService.java index 86b8695..9e6d292 100644 --- a/admin/src/main/java/com/hcy/admin/service/SparePartAudit/ISparePartAuditService.java +++ b/admin/src/main/java/com/hcy/admin/service/sparePartAudit/ISparePartAuditService.java @@ -1,4 +1,4 @@ -package com.hcy.admin.service.SparePartAudit; +package com.hcy.admin.service.sparePartAudit; import com.hcy.admin.validate.common.PageParam; import com.hcy.admin.validate.SparePartAudit.SparePartAuditParam; diff --git a/admin/src/main/java/com/hcy/admin/service/SparePartAudit/impl/SparePartAuditServiceImpl.java b/admin/src/main/java/com/hcy/admin/service/sparePartAudit/impl/SparePartAuditServiceImpl.java similarity index 86% rename from admin/src/main/java/com/hcy/admin/service/SparePartAudit/impl/SparePartAuditServiceImpl.java rename to admin/src/main/java/com/hcy/admin/service/sparePartAudit/impl/SparePartAuditServiceImpl.java index 676739c..c030c0a 100644 --- a/admin/src/main/java/com/hcy/admin/service/SparePartAudit/impl/SparePartAuditServiceImpl.java +++ b/admin/src/main/java/com/hcy/admin/service/sparePartAudit/impl/SparePartAuditServiceImpl.java @@ -1,21 +1,19 @@ -package com.hcy.admin.service.SparePartAudit.impl; +package com.hcy.admin.service.sparePartAudit.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.github.yulichang.query.MPJQueryWrapper; -import com.hcy.admin.service.SparePartAudit.ISparePartAuditService; +import com.hcy.admin.service.sparePartAudit.ISparePartAuditService; import com.hcy.admin.validate.common.PageParam; import com.hcy.admin.validate.SparePartAudit.SparePartAuditParam; import com.hcy.admin.vo.SparePartAudit.SparePartAuditListVo; import com.hcy.admin.vo.SparePartAudit.SparePartAuditDetailVo; import com.hcy.common.core.PageResult; import com.hcy.common.entity.SparePartAudit.SparePartAudit; +import com.hcy.common.entity.warehouse.Warehouse; import com.hcy.common.mapper.SparePartAudit.SparePartAuditMapper; -import com.hcy.common.utils.ArrayUtil; +import com.hcy.common.mapper.warehouse.WarehouseMapper; import com.hcy.common.utils.TimeUtil; -import com.hcy.common.utils.UrlUtil; -import com.hcy.common.config.GlobalConfig; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import org.springframework.util.Assert; @@ -32,6 +30,9 @@ public class SparePartAuditServiceImpl implements ISparePartAuditService { @Resource SparePartAuditMapper sparePartAuditMapper; + @Resource + WarehouseMapper warehouseMapper; + /** * 备件审核列表 * @@ -65,6 +66,12 @@ public class SparePartAuditServiceImpl implements ISparePartAuditService { BeanUtils.copyProperties(item, vo); vo.setCreateTime(TimeUtil.timestampToDate(item.getCreateTime())); vo.setUpdateTime(TimeUtil.timestampToDate(item.getUpdateTime())); + Warehouse warehouse = warehouseMapper.selectOne( + new QueryWrapper() + .eq("id", item.getWarehouseId()) + .eq("is_delete", 0) + .last("limit 1")); + vo.setWarehouseName(warehouse.getWarehouseName()); list.add(vo); } @@ -90,6 +97,12 @@ public class SparePartAuditServiceImpl implements ISparePartAuditService { SparePartAuditDetailVo vo = new SparePartAuditDetailVo(); BeanUtils.copyProperties(model, vo); + Warehouse warehouse = warehouseMapper.selectOne( + new QueryWrapper() + .eq("id", model.getWarehouseId()) + .eq("is_delete", 0) + .last("limit 1")); + vo.setWarehouseName(warehouse.getWarehouseName()); return vo; } diff --git a/admin/src/main/java/com/hcy/admin/service/sparePartInWarehouse/impl/SparePartInWarehouseServiceImpl.java b/admin/src/main/java/com/hcy/admin/service/sparePartInWarehouse/impl/SparePartInWarehouseServiceImpl.java index 9e1e1bf..f7a9f80 100644 --- a/admin/src/main/java/com/hcy/admin/service/sparePartInWarehouse/impl/SparePartInWarehouseServiceImpl.java +++ b/admin/src/main/java/com/hcy/admin/service/sparePartInWarehouse/impl/SparePartInWarehouseServiceImpl.java @@ -14,9 +14,11 @@ import com.hcy.common.core.PageResult; import com.hcy.common.entity.SparePartAudit.SparePartAudit; import com.hcy.common.entity.sparePartStockAudit.SparePartStockAudit; import com.hcy.common.entity.user.User; +import com.hcy.common.entity.warehouse.Warehouse; import com.hcy.common.enums.Audit.AuditStateEnum; import com.hcy.common.mapper.SparePartAudit.SparePartAuditMapper; import com.hcy.common.mapper.sparePartStockAudit.SparePartStockAuditMapper; +import com.hcy.common.mapper.warehouse.WarehouseMapper; import com.hcy.common.utils.TimeUtil; import io.lettuce.core.ScriptOutputType; import org.springframework.beans.BeanUtils; @@ -40,6 +42,9 @@ public class SparePartInWarehouseServiceImpl implements ISparePartInWarehouseSer @Resource SparePartAuditMapper sparePartAuditMapper; + @Resource + WarehouseMapper warehouseMapper; + /** * 备件入库列表 * @@ -73,6 +78,13 @@ public class SparePartInWarehouseServiceImpl implements ISparePartInWarehouseSer vo.setCreateTime(TimeUtil.timestampToDate(item.getCreateTime())); vo.setUpdateTime(TimeUtil.timestampToDate(item.getUpdateTime())); vo.setSupplierPhone(item.getSupplier() + "/" + item.getPhone()); + //获取仓库名称 + Warehouse warehouse = warehouseMapper.selectOne( + new QueryWrapper() + .eq("id", item.getWarehouseId()) + .eq("is_delete", 0) + .last("limit 1")); + vo.setWarehouseName(warehouse.getWarehouseName()); list.add(vo); } @@ -97,6 +109,12 @@ public class SparePartInWarehouseServiceImpl implements ISparePartInWarehouseSer Assert.notNull(model, "数据不存在"); SparePartInWarehouseListVo vo = new SparePartInWarehouseListVo(); + Warehouse warehouse = warehouseMapper.selectOne( + new QueryWrapper() + .eq("id", model.getWarehouseId()) + .eq("is_delete", 0) + .last("limit 1")); + vo.setWarehouseName(warehouse.getWarehouseName()); BeanUtils.copyProperties(model, vo); //获取待审核备件信息 diff --git a/admin/src/main/java/com/hcy/admin/service/sparePartOutWarehouse/impl/SparePartOutWarehouseServiceImpl.java b/admin/src/main/java/com/hcy/admin/service/sparePartOutWarehouse/impl/SparePartOutWarehouseServiceImpl.java index 6435d98..7066292 100644 --- a/admin/src/main/java/com/hcy/admin/service/sparePartOutWarehouse/impl/SparePartOutWarehouseServiceImpl.java +++ b/admin/src/main/java/com/hcy/admin/service/sparePartOutWarehouse/impl/SparePartOutWarehouseServiceImpl.java @@ -12,9 +12,11 @@ import com.hcy.admin.vo.sparePartInWarehouse.SparePartInWarehouseListVo; import com.hcy.common.core.PageResult; import com.hcy.common.entity.SparePartAudit.SparePartAudit; import com.hcy.common.entity.sparePartStockAudit.SparePartStockAudit; +import com.hcy.common.entity.warehouse.Warehouse; import com.hcy.common.enums.Audit.AuditStateEnum; import com.hcy.common.mapper.SparePartAudit.SparePartAuditMapper; import com.hcy.common.mapper.sparePartStockAudit.SparePartStockAuditMapper; +import com.hcy.common.mapper.warehouse.WarehouseMapper; import com.hcy.common.utils.TimeUtil; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; @@ -39,6 +41,9 @@ public class SparePartOutWarehouseServiceImpl implements ISparePartOutWarehouseS @Resource SparePartAuditMapper sparePartAuditMapper; + @Resource + WarehouseMapper warehouseMapper; + /** * 备件出库列表 * @@ -72,6 +77,12 @@ public class SparePartOutWarehouseServiceImpl implements ISparePartOutWarehouseS vo.setCreateTime(TimeUtil.timestampToDate(item.getCreateTime())); vo.setUpdateTime(TimeUtil.timestampToDate(item.getUpdateTime())); vo.setConsigneePhone(item.getConsignee() + "/" + item.getPhone()); + Warehouse warehouse = warehouseMapper.selectOne( + new QueryWrapper() + .eq("id", item.getWarehouseId()) + .eq("is_delete", 0) + .last("limit 1")); + vo.setWarehouseName(warehouse.getWarehouseName()); list.add(vo); } @@ -105,6 +116,13 @@ public class SparePartOutWarehouseServiceImpl implements ISparePartOutWarehouseS ); vo.setSparePartAuditList(stockAuditId); // 待入库的备件 + Warehouse warehouse = warehouseMapper.selectOne( + new QueryWrapper() + .eq("id", model.getWarehouseId()) + .eq("is_delete", 0) + .last("limit 1")); + vo.setWarehouseName(warehouse.getWarehouseName()); + return vo; } diff --git a/admin/src/main/java/com/hcy/admin/service/sparePartStockAudit/ISparePartStockAuditService.java b/admin/src/main/java/com/hcy/admin/service/sparePartStockAudit/ISparePartStockAuditService.java index a1b516d..8d8e74f 100644 --- a/admin/src/main/java/com/hcy/admin/service/sparePartStockAudit/ISparePartStockAuditService.java +++ b/admin/src/main/java/com/hcy/admin/service/sparePartStockAudit/ISparePartStockAuditService.java @@ -56,4 +56,11 @@ public interface ISparePartStockAuditService { */ void del(Integer id); + /** + * 备件出入库审核 + * + * @author hcy + * @param sparePartStockAuditParam 参数 + */ + void audit(SparePartStockAuditParam sparePartStockAuditParam); } diff --git a/admin/src/main/java/com/hcy/admin/service/sparePartStockAudit/impl/SparePartStockAuditServiceImpl.java b/admin/src/main/java/com/hcy/admin/service/sparePartStockAudit/impl/SparePartStockAuditServiceImpl.java index b4b46fa..3c0f0c1 100644 --- a/admin/src/main/java/com/hcy/admin/service/sparePartStockAudit/impl/SparePartStockAuditServiceImpl.java +++ b/admin/src/main/java/com/hcy/admin/service/sparePartStockAudit/impl/SparePartStockAuditServiceImpl.java @@ -13,6 +13,7 @@ import com.hcy.admin.vo.sparePartStockAudit.SparePartStockAuditDetailVo; import com.hcy.common.core.PageResult; import com.hcy.common.entity.sparePart.SparePart; import com.hcy.common.entity.sparePartStockAudit.SparePartStockAudit; +import com.hcy.common.enums.Audit.AuditStateEnum; import com.hcy.common.mapper.sparePartStockAudit.SparePartStockAuditMapper; import com.hcy.common.utils.ArrayUtil; import com.hcy.common.utils.TimeUtil; @@ -192,4 +193,29 @@ public class SparePartStockAuditServiceImpl implements ISparePartStockAuditServi sparePartStockAuditMapper.updateById(model); } + /** + * 备件出入库审核 + * + * @author hcy + * @param sparePartStockAuditParam 参数 + */ + @Override + public void audit(SparePartStockAuditParam sparePartStockAuditParam) { + SparePartStockAudit model = sparePartStockAuditMapper.selectOne( + new QueryWrapper() + .eq("id", sparePartStockAuditParam.getId()) + .eq("is_delete", 0) + .last("limit 1")); + + Assert.notNull(model, "数据不存在!"); + + model.setId(sparePartStockAuditParam.getId()); + model.setAuditResult(sparePartStockAuditParam.getAuditResult()); // 审核结果（0=未通过，1=已通过） + model.setAuditState(AuditStateEnum.AUDITED.getStatus()); // 审核状态（0=未审核，1=已审核，2=已取消） + model.setAuditTime(System.currentTimeMillis() / 1000); // 审核时间 + model.setAuditIdea(sparePartStockAuditParam.getAuditIdea()); // 审核意见 + + sparePartStockAuditMapper.updateById(model); + } + } diff --git a/admin/src/main/java/com/hcy/admin/vo/SparePartAudit/SparePartAuditDetailVo.java b/admin/src/main/java/com/hcy/admin/vo/SparePartAudit/SparePartAuditDetailVo.java index f484bfb..b42b49d 100644 --- a/admin/src/main/java/com/hcy/admin/vo/SparePartAudit/SparePartAuditDetailVo.java +++ b/admin/src/main/java/com/hcy/admin/vo/SparePartAudit/SparePartAuditDetailVo.java @@ -22,5 +22,6 @@ public class SparePartAuditDetailVo implements Serializable { private Long unit; // 单位 private Long quantity; // 库存数量 private BigDecimal unitPrice; // 单价（元） + private String warehouseName; // 所属仓库名 } diff --git a/admin/src/main/java/com/hcy/admin/vo/SparePartAudit/SparePartAuditListVo.java b/admin/src/main/java/com/hcy/admin/vo/SparePartAudit/SparePartAuditListVo.java index 0e86613..3f21c14 100644 --- a/admin/src/main/java/com/hcy/admin/vo/SparePartAudit/SparePartAuditListVo.java +++ b/admin/src/main/java/com/hcy/admin/vo/SparePartAudit/SparePartAuditListVo.java @@ -24,5 +24,6 @@ public class SparePartAuditListVo implements Serializable { private BigDecimal unitPrice; // 单价（元） private String createTime; // 创建时间 private String updateTime; // 更新时间 + private String warehouseName; // 所属仓库名 } diff --git a/admin/src/main/java/com/hcy/admin/vo/SparePartOutWarehouseListVo/SparePartOutWarehouseListVo.java b/admin/src/main/java/com/hcy/admin/vo/SparePartOutWarehouseListVo/SparePartOutWarehouseListVo.java index 2ca2a31..5fc79bc 100644 --- a/admin/src/main/java/com/hcy/admin/vo/SparePartOutWarehouseListVo/SparePartOutWarehouseListVo.java +++ b/admin/src/main/java/com/hcy/admin/vo/SparePartOutWarehouseListVo/SparePartOutWarehouseListVo.java @@ -31,4 +31,5 @@ public class SparePartOutWarehouseListVo implements Serializable { private String sparePartAuditId; // 备件审核id private String consigneePhone; // 供应商/电话 private List sparePartAuditList; //待入库的备件 + private String warehouseName; // 所属仓库名 } diff --git a/admin/src/main/java/com/hcy/admin/vo/sparePart/SparePartDetailVo.java b/admin/src/main/java/com/hcy/admin/vo/sparePart/SparePartDetailVo.java index d71d544..b6987f4 100644 --- a/admin/src/main/java/com/hcy/admin/vo/sparePart/SparePartDetailVo.java +++ b/admin/src/main/java/com/hcy/admin/vo/sparePart/SparePartDetailVo.java @@ -21,5 +21,5 @@ public class SparePartDetailVo implements Serializable { private String unit; // 单位 private Long quantity; // 库存数量 private BigDecimal unitPrice; // 单价 - + private String warehouseName; // 所属仓库名 } diff --git a/admin/src/main/java/com/hcy/admin/vo/sparePart/SparePartListVo.java b/admin/src/main/java/com/hcy/admin/vo/sparePart/SparePartListVo.java index 8630a95..d86dd0d 100644 --- a/admin/src/main/java/com/hcy/admin/vo/sparePart/SparePartListVo.java +++ b/admin/src/main/java/com/hcy/admin/vo/sparePart/SparePartListVo.java @@ -26,5 +26,5 @@ public class SparePartListVo implements Serializable { // 备件模糊关键字 private String likeWork; - + private String warehouseName; // 所属仓库名 } diff --git a/admin/src/main/java/com/hcy/admin/vo/sparePartAllotListVo/SparePartAllotListVo.java b/admin/src/main/java/com/hcy/admin/vo/sparePartAllotListVo/SparePartAllotListVo.java new file mode 100644 index 0000000..02c19cb --- /dev/null +++ b/admin/src/main/java/com/hcy/admin/vo/sparePartAllotListVo/SparePartAllotListVo.java @@ -0,0 +1,34 @@ +package com.hcy.admin.vo.sparePartAllotListVo; + +import com.hcy.common.entity.SparePartAudit.SparePartAudit; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +/** + * sparePartAllotListVo + */ +@Data +public class SparePartAllotListVo implements Serializable { + + private static final long serialVersionUID = 1L; + + private Long id; // 主键id + private String receiptNumber; // 单据编号 + private Long importWarehouse; // 调入仓库 + private Long exportWarehouse; // 调出仓库 + private String remark; // 备注 + private String responsiblePerson; // 经办人 + private Long handlingTime; // 经办时间 + private Integer auditState; // 审核状态（0=未审核，1=已审核，2=已取消） + private Integer auditResult; // 审核结果（0=未通过，1=已通过） + private Long auditTime; // 审核时间 + private String auditIdea; // 审核意见 + private String createTime; // 创建时间 + private String updateTime; // 更新时间 + private String sparePartAuditId; // 备件审核id + private List sparePartAuditList; //待入库的备件 + private String importWarehouseName; // 调入仓库名 + private String exportWarehouseName; // 调出仓库名 +} diff --git a/admin/src/main/java/com/hcy/admin/vo/sparePartInWarehouse/SparePartInWarehouseListVo.java b/admin/src/main/java/com/hcy/admin/vo/sparePartInWarehouse/SparePartInWarehouseListVo.java index d83352c..a69f974 100644 --- a/admin/src/main/java/com/hcy/admin/vo/sparePartInWarehouse/SparePartInWarehouseListVo.java +++ b/admin/src/main/java/com/hcy/admin/vo/sparePartInWarehouse/SparePartInWarehouseListVo.java @@ -31,4 +31,5 @@ public class SparePartInWarehouseListVo implements Serializable { private String sparePartAuditId; // 备件审核id private String supplierPhone; // 供应商/电话 private List sparePartAuditList; //待入库的备件 + private String warehouseName; // 所属仓库名 } diff --git a/admin/src/main/java/com/hcy/admin/vo/sparePartStockAudit/SparePartStockAuditDetailVo.java b/admin/src/main/java/com/hcy/admin/vo/sparePartStockAudit/SparePartStockAuditDetailVo.java index 77051f5..c1ab1a7 100644 --- a/admin/src/main/java/com/hcy/admin/vo/sparePartStockAudit/SparePartStockAuditDetailVo.java +++ b/admin/src/main/java/com/hcy/admin/vo/sparePartStockAudit/SparePartStockAuditDetailVo.java @@ -32,4 +32,7 @@ public class SparePartStockAuditDetailVo implements Serializable { private String phone; // 联系电话 private String remark; // 备注 private String sparePartAuditId; // 备件审核id + private String warehouseName; // 所属仓库名 + private String importWarehouseName; // 调入仓库名 + private String exportWarehouseName; // 调出仓库名 } diff --git a/admin/src/main/java/com/hcy/admin/vo/sparePartStockAudit/SparePartStockAuditListVo.java b/admin/src/main/java/com/hcy/admin/vo/sparePartStockAudit/SparePartStockAuditListVo.java index ce7179a..6ff40f6 100644 --- a/admin/src/main/java/com/hcy/admin/vo/sparePartStockAudit/SparePartStockAuditListVo.java +++ b/admin/src/main/java/com/hcy/admin/vo/sparePartStockAudit/SparePartStockAuditListVo.java @@ -1,8 +1,10 @@ package com.hcy.admin.vo.sparePartStockAudit; +import com.hcy.common.entity.SparePartAudit.SparePartAudit; import lombok.Data; import java.io.Serializable; +import java.util.List; /** * SparePartStockAuditVo @@ -30,6 +32,11 @@ public class SparePartStockAuditListVo implements Serializable { private Long auditTime; // 审核时间 private String createTime; // 创建时间 private String updateTime; // 更新时间 - private String deleteTime; // 删除时间 private String sparePartAuditId; // 备件审核id + private String consigneePhone; // 收货单位（人员）/电话 + private String supplierPhone; // 供应商/电话 + private List sparePartAuditList; //待入库的备件 + private String warehouseName; // 所属仓库名 + private String importWarehouseName; // 调入仓库名 + private String exportWarehouseName; // 调出仓库名 } diff --git a/www/wwwroot/java-smyy/server/like-admin/admin-log4j2-ERROR-2024-08-02_1.log.gz b/www/wwwroot/java-smyy/server/like-admin/admin-log4j2-ERROR-2024-08-02_1.log.gz new file mode 100644 index 0000000..6229046 Binary files /dev/null and b/www/wwwroot/java-smyy/server/like-admin/admin-log4j2-ERROR-2024-08-02_1.log.gz differ diff --git a/www/wwwroot/java-smyy/server/like-admin/admin-log4j2-INFO-2024-08-02_1.log.gz b/www/wwwroot/java-smyy/server/like-admin/admin-log4j2-INFO-2024-08-02_1.log.gz new file mode 100644 index 0000000..e099253 Binary files /dev/null and b/www/wwwroot/java-smyy/server/like-admin/admin-log4j2-INFO-2024-08-02_1.log.gz differ diff --git a/www/wwwroot/java-smyy/server/like-admin/admin-log4j2-WARN-2024-08-02_1.log.gz b/www/wwwroot/java-smyy/server/like-admin/admin-log4j2-WARN-2024-08-02_1.log.gz new file mode 100644 index 0000000..92af807 Binary files /dev/null and b/www/wwwroot/java-smyy/server/like-admin/admin-log4j2-WARN-2024-08-02_1.log.gz differ