feat(wms): 添加调拨工单审批功能并优化相关实体和接口

- 在 IWmsAllocateOrderService 中添加 approveAllocateOrder 方法用于审批调拨工单
- 在 WmsAllocateOrderController 中添加 approveAllocateOrder 接口
- 在 WmsAllocateOrderServiceImpl 中实现 approveAllocateOrder 方法
- 优化 WmsAllocateOrder 和 WmsAllocateOrderDetail 实体类，将 createBy 和 updateBy 字段类型改为 Long
- 修改 WmsAllocateOrderDetailServiceImpl 中的查询方法，简化代码结构
- 更新 WmsAllocateTask 实体类，添加表主键标注

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

@@ -24,7 +24,7 @@ import java.util.List;
 
 /**
  * 生产订单信息
- * 前端访问路由地址为:/mes/orderInfo
+ * 前端访问路由地址为:/wms/orderInfo
  *
  * @author Yinq
  * @date 2025-01-09

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

@@ -103,4 +103,14 @@ public class WmsAllocateOrderController extends BaseController {
                           @PathVariable Long[] aoIds) {
         return toAjax(wmsAllocateOrderService.deleteWithValidByIds(List.of(aoIds), true));
     }
+
+    /**
+     * 调拨工单审批
+     * @param bo
+     * @return
+     */
+    @PutMapping("/approveAllocateOrder")
+    public R<Integer> approveAllocateOrder(@RequestBody WmsAllocateOrderBo bo) {
+        return R.ok(wmsAllocateOrderService.approveAllocateOrder(bo));
+    }
 }

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

@@ -107,7 +107,7 @@ public class WmsAllocateOrder{
      */
     private String tenantId;
     @TableField(fill = FieldFill.INSERT)
-    private String createBy;
+    private Long createBy;
 
     /**
      * 创建时间
@@ -119,7 +119,7 @@ public class WmsAllocateOrder{
      * 更新者
      */
     @TableField(fill = FieldFill.INSERT_UPDATE)
-    private String updateBy;
+    private Long updateBy;
 
     /**
      * 更新时间

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

@@ -61,8 +61,12 @@ public class WmsAllocateOrderDetail {
      * 租户id
      */
     private String tenantId;
+
+    /**
+     * 创建者
+     */
     @TableField(fill = FieldFill.INSERT)
-    private String createBy;
+    private Long createBy;
 
     /**
      * 创建时间
@@ -74,7 +78,7 @@ public class WmsAllocateOrderDetail {
      * 更新者
      */
     @TableField(fill = FieldFill.INSERT_UPDATE)
-    private String updateBy;
+    private Long updateBy;
 
     /**
      * 更新时间

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

@@ -1,13 +1,14 @@
 package org.dromara.wms.domain;
 
-import org.dromara.common.tenant.core.TenantEntity;
+import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.*;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import java.util.Date;
+import org.dromara.common.tenant.core.TenantEntity;
-import com.fasterxml.jackson.annotation.JsonFormat;
 
 import java.io.Serial;
+import java.util.Date;
 
 /**
  * 调拨打印对象 wms_allocate_task
@@ -26,6 +27,7 @@ public class WmsAllocateTask extends TenantEntity {
     /**
      * 调拨任务表主键
      */
+    @TableId(value = "allocate_task_id", type = IdType.AUTO)
     private Long allocateTaskId;
 
     /**

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

@@ -65,4 +65,12 @@ public interface IWmsAllocateOrderService {
      * @return 是否删除成功
      */
     Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+    /**
+     * 审批调拨工单
+     *
+     * @param bo 调拨工单
+     * @return 是否审批成功
+     */
+    Integer approveAllocateOrder(WmsAllocateOrderBo bo);
 }

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

@@ -200,7 +200,6 @@ public class WmsAllocateOrderServiceImpl implements IWmsAllocateOrderService {
     public Boolean updateByBo(WmsAllocateOrderBo bo) {
         WmsAllocateOrder update = MapstructUtils.convert(bo, WmsAllocateOrder.class);
         validEntityBeforeSave(update);
-        update.setUpdateBy(LoginHelper.getUsername());
         return baseMapper.updateById(update) > 0;
     }
 
@@ -225,4 +224,21 @@ public class WmsAllocateOrderServiceImpl implements IWmsAllocateOrderService {
         }
         return baseMapper.deleteByIds(ids) > 0;
     }
+
+    /**
+     * 审批调拨工单
+     *
+     * @param bo 调拨工单
+     * @return 是否审批成功
+     */
+    @Override
+    public Integer approveAllocateOrder(WmsAllocateOrderBo bo) {
+        String username = LoginHelper.getUsername();
+        WmsAllocateOrder update = MapstructUtils.convert(bo, WmsAllocateOrder.class);
+        validEntityBeforeSave(update);
+        update.setAuditTime(new Date());
+        update.setAuditBy(username);
+        int rows = baseMapper.updateById(update);
+        return rows;
+    }
 }

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

@@ -530,6 +530,12 @@ if("1".equals(bo.getInstockType())){ // 工单类型(1采购订单)
         //TODO 做一些数据校验,如唯一约束
     }
 
+    /**
+     * 审批入库单
+     *
+     * @param bo 入库单
+     * @return 是否审批成功
+     */
     @Override
     public Integer approveInstockOrder(WmsInstockOrderBo bo) {
         String username = LoginHelper.getUsername();

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

@@ -20,7 +20,7 @@
             *
         </if>
         from prod_order_info t
-        left join base_material_info bmi on bmi.material_id = t.material_id
+        left join base_material_info_copy1 bmi on bmi.material_id = t.material_id
         left join prod_base_prod_line_info pli on t.dispatch_type = 1 and pli.prod_line_id = t.dispatch_id
         left join prod_base_route rt on t.dispatch_type = 2 and rt.route_id = t.dispatch_id
         left join prod_base_process_info pi on t.dispatch_type = 3 and pi.process_id = t.dispatch_id