Merge remote-tracking branch 'origin/0.8.X' into 0.8.X

klp-wms/src/main/java/com/klp/controller/WmsAttendanceCheckController.java

@@ -0,0 +1,58 @@
+package com.klp.controller;
+
+import com.klp.common.annotation.Log;
+import com.klp.common.core.controller.BaseController;
+import com.klp.common.core.domain.PageQuery;
+import com.klp.common.core.domain.R;
+import com.klp.common.core.page.TableDataInfo;
+import com.klp.common.enums.BusinessType;
+import com.klp.domain.bo.AttendanceCheckBo;
+import com.klp.domain.bo.WmsAttendanceCheckBo;
+import com.klp.domain.vo.WmsAttendanceCheckVo;
+import com.klp.service.IWmsAttendanceCheckService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.constraints.NotEmpty;
+import java.util.Arrays;
+import java.util.List;
+
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/wms/attendanceCheck")
+public class WmsAttendanceCheckController extends BaseController {
+
+    private final IWmsAttendanceCheckService iWmsAttendanceCheckService;
+
+    @GetMapping("/list")
+    public TableDataInfo<WmsAttendanceCheckVo> list(WmsAttendanceCheckBo bo, PageQuery pageQuery) {
+        return iWmsAttendanceCheckService.queryPageList(bo, pageQuery);
+    }
+
+    @GetMapping("/{checkId}")
+    public R<WmsAttendanceCheckVo> getInfo(@PathVariable Long checkId) {
+        return R.ok(iWmsAttendanceCheckService.queryById(checkId));
+    }
+
+    @Log(title = "考勤比对", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{checkIds}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空")
+                          @PathVariable Long[] checkIds) {
+        return toAjax(iWmsAttendanceCheckService.deleteWithValidByIds(Arrays.asList(checkIds), true));
+    }
+
+    @Log(title = "考勤比对", businessType = BusinessType.INSERT)
+    @PostMapping("/check")
+    public R<Void> checkAttendance(@Validated @RequestBody AttendanceCheckBo bo) {
+        iWmsAttendanceCheckService.checkAttendance(bo);
+        return R.ok();
+    }
+}

klp-wms/src/main/java/com/klp/controller/WmsAttendanceRuleController.java

@@ -0,0 +1,99 @@
+package com.klp.controller;
+
+import java.util.List;
+import java.util.Arrays;
+
+import lombok.RequiredArgsConstructor;
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.constraints.*;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.validation.annotation.Validated;
+import com.klp.common.annotation.RepeatSubmit;
+import com.klp.common.annotation.Log;
+import com.klp.common.core.controller.BaseController;
+import com.klp.common.core.domain.PageQuery;
+import com.klp.common.core.domain.R;
+import com.klp.common.core.validate.AddGroup;
+import com.klp.common.core.validate.EditGroup;
+import com.klp.common.enums.BusinessType;
+import com.klp.common.utils.poi.ExcelUtil;
+import com.klp.domain.vo.WmsAttendanceRuleVo;
+import com.klp.domain.bo.WmsAttendanceRuleBo;
+import com.klp.service.IWmsAttendanceRuleService;
+import com.klp.common.core.page.TableDataInfo;
+
+/**
+ * 考勤规则（迟到/早退/旷工规则配置）
+ *
+ * @author klp
+ * @date 2026-05-12
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/wms/attendanceRule")
+public class WmsAttendanceRuleController extends BaseController {
+
+    private final IWmsAttendanceRuleService iWmsAttendanceRuleService;
+
+    /**
+     * 查询考勤规则（迟到/早退/旷工规则配置）列表
+     */
+    @GetMapping("/list")
+    public TableDataInfo<WmsAttendanceRuleVo> list(WmsAttendanceRuleBo bo, PageQuery pageQuery) {
+        return iWmsAttendanceRuleService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出考勤规则（迟到/早退/旷工规则配置）列表
+     */
+    @Log(title = "考勤规则（迟到/早退/旷工规则配置）", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(WmsAttendanceRuleBo bo, HttpServletResponse response) {
+        List<WmsAttendanceRuleVo> list = iWmsAttendanceRuleService.queryList(bo);
+        ExcelUtil.exportExcel(list, "考勤规则（迟到/早退/旷工规则配置）", WmsAttendanceRuleVo.class, response);
+    }
+
+    /**
+     * 获取考勤规则（迟到/早退/旷工规则配置）详细信息
+     *
+     * @param ruleId 主键
+     */
+    @GetMapping("/{ruleId}")
+    public R<WmsAttendanceRuleVo> getInfo(@NotNull(message = "主键不能为空")
+                                     @PathVariable Long ruleId) {
+        return R.ok(iWmsAttendanceRuleService.queryById(ruleId));
+    }
+
+    /**
+     * 新增考勤规则（迟到/早退/旷工规则配置）
+     */
+    @Log(title = "考勤规则（迟到/早退/旷工规则配置）", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody WmsAttendanceRuleBo bo) {
+        return toAjax(iWmsAttendanceRuleService.insertByBo(bo));
+    }
+
+    /**
+     * 修改考勤规则（迟到/早退/旷工规则配置）
+     */
+    @Log(title = "考勤规则（迟到/早退/旷工规则配置）", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody WmsAttendanceRuleBo bo) {
+        return toAjax(iWmsAttendanceRuleService.updateByBo(bo));
+    }
+
+    /**
+     * 删除考勤规则（迟到/早退/旷工规则配置）
+     *
+     * @param ruleIds 主键串
+     */
+    @Log(title = "考勤规则（迟到/早退/旷工规则配置）", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ruleIds}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空")
+                          @PathVariable Long[] ruleIds) {
+        return toAjax(iWmsAttendanceRuleService.deleteWithValidByIds(Arrays.asList(ruleIds), true));
+    }
+}

klp-wms/src/main/java/com/klp/controller/WmsAttendanceScheduleController.java

@@ -103,8 +103,8 @@ public class WmsAttendanceScheduleController extends BaseController {
      */
     @Log(title = "生成排班", businessType = BusinessType.INSERT)
     @PostMapping("/generate")
-    public R<Void> generateSchedule(@Validated @RequestBody GenerateScheduleBo bo) {
-        iWmsAttendanceScheduleService.generateSchedule(bo);
+    public R<Void> generateSchedule(@Validated @RequestBody List<GenerateScheduleBo> boList) {
+        iWmsAttendanceScheduleService.generateSchedule(boList);
         return R.ok();
     }
 }