From b852254d90e7d1955db31db154193ec8ee84d8b3 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期三, 09 九月 2026 10:57:59 +0800
Subject: [PATCH] feat(hrm): 新增员工用工性质、班组归属字段及考勤异常处理优化
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/sn/MesWmSnController.java | 87 +++++++++++++++++++++++++++++++++++--------
1 files changed, 70 insertions(+), 17 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/sn/MesWmSnController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/sn/MesWmSnController.java
index 63d5afe..fb8b39b 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/sn/MesWmSnController.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/sn/MesWmSnController.java
@@ -8,14 +8,20 @@
import cn.iocoder.yudao.framework.common.util.collection.MapUtils;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
+import cn.iocoder.yudao.module.mes.controller.admin.wm.sn.vo.MesWmSnDetailRespVO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.sn.vo.MesWmSnGenerateReqVO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.sn.vo.MesWmSnGroupRespVO;
+import cn.iocoder.yudao.module.mes.controller.admin.wm.sn.vo.MesWmSnInStockPageReqVO;
+import cn.iocoder.yudao.module.mes.controller.admin.wm.sn.vo.MesWmSnInStockReqVO;
+import cn.iocoder.yudao.module.mes.controller.admin.wm.sn.vo.MesWmSnOutStockReqVO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.sn.vo.MesWmSnPageReqVO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.sn.vo.MesWmSnRespVO;
-import cn.iocoder.yudao.module.mes.dal.dataobject.md.item.MesMdItemDO;
-import cn.iocoder.yudao.module.mes.dal.dataobject.md.unitmeasure.MesMdUnitMeasureDO;
-import cn.iocoder.yudao.module.mes.service.md.item.MesMdItemService;
-import cn.iocoder.yudao.module.mes.service.md.unitmeasure.MesMdUnitMeasureService;
+import cn.iocoder.yudao.module.mdm.api.item.MdmItemApi;
+import cn.iocoder.yudao.module.mdm.api.item.dto.MdmItemRespDTO;
+
+import cn.iocoder.yudao.module.mdm.api.unit.MdmUnitMeasureApi;
+import cn.iocoder.yudao.module.mdm.api.unit.dto.MdmUnitMeasureRespDTO;
+
import cn.iocoder.yudao.module.mes.service.wm.sn.MesWmSnService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
@@ -31,6 +37,7 @@
import java.io.IOException;
import java.util.List;
import java.util.Map;
+import java.util.stream.Collectors;
import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.EXPORT;
import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
@@ -45,9 +52,9 @@
@Resource
private MesWmSnService snService;
@Resource
- private MesMdItemService itemService;
+ private MdmItemApi mdmItemApi;
@Resource
- private MesMdUnitMeasureService unitMeasureService;
+ private MdmUnitMeasureApi mdmUnitMeasureApi;
@PostMapping("/generate")
@Operation(summary = "鐢熸垚 SN 鐮�")
@@ -65,8 +72,19 @@
if (CollUtil.isEmpty(pageResult.getList())) {
return success(PageResult.empty(pageResult.getTotal()));
}
- buildGroupItemInfo(pageResult.getList());
+ buildSnGroupItemVO(pageResult.getList());
return success(pageResult);
+ }
+
+ @GetMapping("/list-by-uuid")
+ @Operation(summary = "鑾峰緱鎵规 SN 鐮佹槑缁嗗垪琛�")
+ @Parameter(name = "uuid", description = "鎵规 UUID", required = true)
+ @PreAuthorize("@ss.hasPermission('mes:wm-sn:query')")
+ public CommonResult<List<MesWmSnRespVO>> getSnListByUuid(
+ @RequestParam("uuid") @NotBlank(message = "鎵规 UUID 涓嶈兘涓虹┖") String uuid) {
+ List<MesWmSnRespVO> list = BeanUtils.toBean(snService.getSnListByUuid(uuid), MesWmSnRespVO.class);
+ buildSnItemVO(list);
+ return success(list);
}
@DeleteMapping("/delete-batch")
@@ -78,6 +96,39 @@
return success(true);
}
+ @PostMapping("/in-stock")
+ @Operation(summary = "鍏ュ簱鐧昏 SN", description = "鎸� SN 寤虹珛鍗曚欢鍏ュ簱浜嬪姟骞跺叆鍙帮紝闇�鐗╂枡宸插惎鐢ㄥ簭鍒楀彿绠＄悊")
+ @PreAuthorize("@ss.hasPermission('mes:wm-sn:update')")
+ public CommonResult<Boolean> registerSnInStock(@Valid @RequestBody MesWmSnInStockReqVO reqVO) {
+ snService.registerSnInStock(reqVO);
+ return success(true);
+ }
+
+ @PostMapping("/out-stock")
+ @Operation(summary = "鍑哄簱鏍搁攢 SN", description = "鎸� SN 寤虹珛鍗曚欢鍑哄簱浜嬪姟骞舵牳閿�")
+ @PreAuthorize("@ss.hasPermission('mes:wm-sn:update')")
+ public CommonResult<Boolean> outboundSn(@Valid @RequestBody MesWmSnOutStockReqVO reqVO) {
+ snService.outboundSn(reqVO);
+ return success(true);
+ }
+
+ @GetMapping("/detail")
+ @Operation(summary = "鑾峰緱 SN 鍗曚欢鏄庣粏", description = "杩斿洖鐘舵�併�佸湪搴撲綅缃強鏈�杩戜竴绗斿簱瀛樹簨鍔�")
+ @Parameter(name = "code", description = "SN 鐮�", required = true, example = "SN20260305000001")
+ @PreAuthorize("@ss.hasPermission('mes:wm-sn:query')")
+ public CommonResult<MesWmSnDetailRespVO> getSnDetail(@RequestParam("code") @NotBlank(message = "SN 鐮佷笉鑳戒负绌�") String code) {
+ return success(snService.getSnDetail(code));
+ }
+
+ @GetMapping("/in-stock-page")
+ @Operation(summary = "SN 鐮佺姸鎬佸垎椤�", description = "鎸夌姸鎬�/鐗╂枡/搴撲綅绛夌淮搴﹀垎椤垫煡璇� SN锛堟敮鎸佺洏鐐规牳瀵癸級")
+ @PreAuthorize("@ss.hasPermission('mes:wm-sn:query')")
+ public CommonResult<PageResult<MesWmSnRespVO>> getSnInStockPage(@Valid MesWmSnInStockPageReqVO reqVO) {
+ PageResult<MesWmSnRespVO> pageResult = BeanUtils.toBean(snService.getSnInStockPage(reqVO), MesWmSnRespVO.class);
+ buildSnItemVO(pageResult.getList());
+ return success(pageResult);
+ }
+
@GetMapping("/group-export-excel")
@Operation(summary = "瀵煎嚭 SN 鐮佸垎缁� Excel")
@PreAuthorize("@ss.hasPermission('mes:wm-sn:export')")
@@ -85,7 +136,7 @@
public void exportSnGroupExcel(@Valid MesWmSnPageReqVO reqVO, HttpServletResponse response) throws IOException {
reqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
List<MesWmSnGroupRespVO> list = snService.getSnGroupPage(reqVO).getList();
- buildGroupItemInfo(list);
+ buildSnGroupItemVO(list);
ExcelUtils.write(response, "SN鐮佸垎缁�.xls", "鏁版嵁", MesWmSnGroupRespVO.class, list);
}
@@ -96,32 +147,34 @@
@ApiAccessLog(operateType = EXPORT)
public void exportSnExcel(@RequestParam("uuid") String uuid, HttpServletResponse response) throws IOException {
List<MesWmSnRespVO> list = BeanUtils.toBean(snService.getSnListByUuid(uuid), MesWmSnRespVO.class);
- buildItemInfo(list);
+ buildSnItemVO(list);
ExcelUtils.write(response, "SN鐮佹槑缁�.xls", "鏁版嵁", MesWmSnRespVO.class, list);
}
// ==================== 鎷兼帴 VO ====================
- private void buildGroupItemInfo(List<MesWmSnGroupRespVO> list) {
+ private void buildSnGroupItemVO(List<MesWmSnGroupRespVO> list) {
if (CollUtil.isEmpty(list)) {
return;
}
- Map<Long, MesMdItemDO> itemMap = itemService.getItemMap(convertSet(list, MesWmSnGroupRespVO::getItemId));
- Map<Long, MesMdUnitMeasureDO> unitMap = unitMeasureService.getUnitMeasureMap(
- convertSet(itemMap.values(), MesMdItemDO::getUnitMeasureId));
+ Map<Long, MdmItemRespDTO> itemMap = mdmItemApi.getItemMap(convertSet(list, MesWmSnGroupRespVO::getItemId));
+ Map<Long, MdmUnitMeasureRespDTO> unitMap = mdmUnitMeasureApi.getUnitMeasureList(
+ convertSet(itemMap.values(), MdmItemRespDTO::getUnitMeasureId)).getCheckedData()
+ .stream().collect(Collectors.toMap(MdmUnitMeasureRespDTO::getId, e -> e));
list.forEach(vo -> MapUtils.findAndThen(itemMap, vo.getItemId(), item -> {
vo.setItemCode(item.getCode()).setItemName(item.getName()).setSpecification(item.getSpecification());
MapUtils.findAndThen(unitMap, item.getUnitMeasureId(), unit -> vo.setUnitName(unit.getName()));
}));
}
- private void buildItemInfo(List<MesWmSnRespVO> list) {
+ private void buildSnItemVO(List<MesWmSnRespVO> list) {
if (CollUtil.isEmpty(list)) {
return;
}
- Map<Long, MesMdItemDO> itemMap = itemService.getItemMap(convertSet(list, MesWmSnRespVO::getItemId));
- Map<Long, MesMdUnitMeasureDO> unitMap = unitMeasureService.getUnitMeasureMap(
- convertSet(itemMap.values(), MesMdItemDO::getUnitMeasureId));
+ Map<Long, MdmItemRespDTO> itemMap = mdmItemApi.getItemMap(convertSet(list, MesWmSnRespVO::getItemId));
+ Map<Long, MdmUnitMeasureRespDTO> unitMap = mdmUnitMeasureApi.getUnitMeasureList(
+ convertSet(itemMap.values(), MdmItemRespDTO::getUnitMeasureId)).getCheckedData()
+ .stream().collect(Collectors.toMap(MdmUnitMeasureRespDTO::getId, e -> e));
list.forEach(vo -> MapUtils.findAndThen(itemMap, vo.getItemId(), item -> {
vo.setItemCode(item.getCode()).setItemName(item.getName()).setSpecification(item.getSpecification());
MapUtils.findAndThen(unitMap, item.getUnitMeasureId(), unit -> vo.setUnitName(unit.getName()));
--
Gitblit v1.9.3