feat(wms): 添加退库工单审批功能

- 在 IWmsReturnOrderService 接口中添加 auditReturnOrder 方法
- 在 WmsReturnOrderController 中添加 audit 方法处理审批请求
- 在 WmsReturnOrderServiceImpl 中实现 auditReturnOrder 方法
- 优化 WmsReturnOrderBo 类，添加必要的字段和注解
- 新增 WmsReturnOrderMapper.xml 文件，定义 MyBatis 映射

ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/controller/WmsReturnOrderController.java

@@ -103,4 +103,17 @@ public class WmsReturnOrderController extends BaseController {
                           @PathVariable Long[] roIds) {
         return toAjax(wmsReturnOrderService.deleteWithValidByIds(List.of(roIds), true));
     }
+
+    /**
+     * 审批退库工单
+     *
+     * @param bo 审批信息
+     */
+    @SaCheckPermission("system:returnOrder:audit")
+    @Log(title = "退库工单审批", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PostMapping("/audit")
+    public R<Void> audit(@Validated @RequestBody WmsReturnOrderBo bo) {
+        return toAjax(wmsReturnOrderService.auditReturnOrder(bo));
+    }
 }

ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/WmsReturnOrder.java

@@ -1,15 +1,11 @@
 package org.dromara.wms.domain;
 
-import org.dromara.common.tenant.core.TenantEntity;
 import com.baomidou.mybatisplus.annotation.*;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.math.BigDecimal;
-import java.util.Date;
-import com.fasterxml.jackson.annotation.JsonFormat;
 
 import java.io.Serial;
+import java.math.BigDecimal;
+import java.util.Date;
 
 /**
  * 退库工单对象 wms_return_order
@@ -27,6 +23,7 @@ public class WmsReturnOrder {
     /**
      * 表主键
      */
+    @TableId(value = "ro_id", type = IdType.AUTO)
     private Long roId;
 
     /**

ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/bo/WmsReturnOrderBo.java

@@ -2,6 +2,7 @@ package org.dromara.wms.domain.bo;
 
 import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import org.dromara.common.mybatis.core.domain.BaseEntity;
 import org.dromara.wms.domain.WmsReturnOrder;
 
@@ -14,6 +15,7 @@ import java.util.Date;
  * @author LionLi
  * @date 2025-01-09
  */
+@EqualsAndHashCode(callSuper = true)
 @Data
 @AutoMapper(target = WmsReturnOrder.class, reverseConvertGenerate = false)
 public class WmsReturnOrderBo extends BaseEntity {

ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/vo/WmsMoveOrderVo.java

@@ -1,14 +1,9 @@
 package org.dromara.wms.domain.vo;
 
-import java.util.Date;
-
-import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
-import org.dromara.common.excel.annotation.ExcelDictFormat;
+import com.baomidou.mybatisplus.annotation.FieldFill;
-import org.dromara.common.excel.convert.ExcelDictConvert;
+import com.baomidou.mybatisplus.annotation.TableField;
 import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
 import org.dromara.wms.domain.WmsMoveOrder;
@@ -144,4 +139,8 @@ public class WmsMoveOrderVo implements Serializable {
      */
     private String materialCategoryName;//字段映射
 
+
+    // 批次条码 插入
+    private String batchCode;
+
 }

ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/IWmsReturnOrderService.java

@@ -70,4 +70,12 @@ public interface IWmsReturnOrderService {
     WmsReturnOrderVo selectOrderInfoByCode(String code);
 
     Boolean returnStoreSubmit(WmsReturnOrderVo data);
+
+    /**
+     * 审批退库工单
+     *
+     * @param bo 审批信息
+     * @return 是否审批成功
+     */
+    Boolean auditReturnOrder(WmsReturnOrderBo bo);
 }

ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsReturnOrderServiceImpl.java

@@ -22,6 +22,7 @@ import org.dromara.wms.service.IWmsReturnOrderService;
 import org.springframework.stereotype.Service;
 
 import java.util.Collection;
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -176,7 +177,7 @@ public class WmsReturnOrderServiceImpl implements IWmsReturnOrderService {
 
     @Override
     public WmsReturnOrderVo selectOrderInfoByCode(String code) {
-        return baseMapper.selectOrderInfoByCode(code);
+        return null;
     }
 
     @Override
@@ -187,7 +188,31 @@ public class WmsReturnOrderServiceImpl implements IWmsReturnOrderService {
         wmsReturnOrder.setUpdateBy(LoginHelper.getUsername());
         wmsReturnOrder.setReturnAmount(data.getPlanAmount());
         wmsReturnOrder.setOrderStatus(String.valueOf(1));
-        int i = baseMapper.updateTable(wmsReturnOrder);
+        int i = baseMapper.updateById(wmsReturnOrder);
         return i > 0;
     }
+
+    /**
+     * 审批退库工单
+     *
+     * @param bo 审批信息
+     * @return 是否审批成功
+     */
+    @Override
+    public Boolean auditReturnOrder(WmsReturnOrderBo bo) {
+        if (bo.getRoId() == null) {
+            throw new IllegalArgumentException("退库工单ID不能为空");
+        }
+        if (StringUtils.isBlank(bo.getAuditStatus())) {
+            throw new IllegalArgumentException("审核状态不能为空");
+        }
+//        WmsReturnOrderVo wmsReturnOrderVo = queryById(bo.getRoId());
+//        BeanUtil.copyProperties(wmsReturnOrderVo, bo);
+        WmsReturnOrder entity =  MapstructUtils.convert(bo, WmsReturnOrder.class);
+        // 设置审核时间和审核人
+        entity.setAuditTime(new Date());
+        entity.setAuditBy(LoginHelper.getUsername());
+
+        return baseMapper.updateById(entity) > 0;
+    }
 }

ruoyi-modules/hwmom-wms/src/main/resources/mapper/wms/WmsReturnOrderMapper.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.dromara.wms.mapper.WmsReturnOrderMapper">
+
+</mapper>