入库功能新增根据配置赋权审批人

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

@@ -105,6 +105,11 @@ public class WmsInstockDetailController extends BaseController {
         return toAjax(wmsInstockDetailService.deleteWithValidByIds(List.of(instockDetailIds), true));
     }
 
+    /**
+     * 根据入库明细id删除
+     * @param instockDetailId
+     * @return
+     */
     @SaCheckPermission("system:instockDetail:remove")
     @Log(title = "入库单-物料", businessType = BusinessType.DELETE)
     @DeleteMapping("/removeInstockDetail/{instockDetailId}")

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

@@ -92,6 +92,16 @@ public class WmsInstockOrderController extends BaseController {
         return toAjax(wmsInstockOrderService.updateByBo(bo));
     }
 
+    /**
+     * 入库单审批
+     * @param bo
+     * @return
+     */
+    @PutMapping("/approveInstockOrder")
+    public R<Integer> approveInstockOrder(@RequestBody WmsInstockOrderBo bo) {
+        return R.ok(wmsInstockOrderService.approveInstockOrder(bo));
+    }
+
     /**
      * 删除入库单
      *

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

@@ -6,6 +6,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 import java.io.Serial;
+import java.math.BigDecimal;
 import java.util.Date;
 
 /**
@@ -66,7 +67,7 @@ public class WmsInstockDetail{
     /**
      * 入库数量
      */
-    private Long instockQty;
+    private BigDecimal instockQty;
 
     /**
      * 物料规格
@@ -118,7 +119,7 @@ public class WmsInstockDetail{
     /**
      * 已打印数量
      */
-    private Integer printedNum;
+    private BigDecimal printedNum;
 
 
 }

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

@@ -1,5 +1,9 @@
 package org.dromara.wms.domain.bo;
 
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonInclude;
 import org.dromara.common.mybatis.core.domain.BaseEntity;
 import org.dromara.common.core.validate.AddGroup;
 import org.dromara.common.core.validate.EditGroup;
@@ -9,6 +13,11 @@ import lombok.EqualsAndHashCode;
 import jakarta.validation.constraints.*;
 import org.dromara.wms.domain.WmsInstockDetail;
 
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+
 /**
  * 入库单-物料业务对象 wms_instock_detail
  *
@@ -16,9 +25,9 @@ import org.dromara.wms.domain.WmsInstockDetail;
  * @date 2025-01-06
  */
 @Data
-@EqualsAndHashCode(callSuper = true)
+//@EqualsAndHashCode(callSuper = true)
 @AutoMapper(target = WmsInstockDetail.class, reverseConvertGenerate = false)
-public class WmsInstockDetailBo extends BaseEntity {
+public class WmsInstockDetailBo{
 
     /**
      * 入库单子表主键
@@ -72,7 +81,7 @@ public class WmsInstockDetailBo extends BaseEntity {
      * 入库数量
      */
     @NotNull(message = "入库数量不能为空", groups = { AddGroup.class, EditGroup.class })
-    private Long instockQty;
+    private BigDecimal instockQty;
 
     /**
      * 物料规格
@@ -102,14 +111,57 @@ public class WmsInstockDetailBo extends BaseEntity {
      */
     private String tenantId;
     /**
-     * 打印数量
+     * 分包数量
      */
-    private Integer printNum;
+    private BigDecimal printNum;
     /**
      * 已打印数量
      */
-    private Integer printedNum;
+    private BigDecimal printedNum;
     private Long barcodeNum;
+    /**
+     * 搜索值
+     */
+    @JsonIgnore
+    @TableField(exist = false)
+    private String searchValue;
+
+    /**
+     * 创建部门
+     */
+    @TableField(fill = FieldFill.INSERT)
+    private String createDept;
+
+    /**
+     * 创建者
+     */
+    @TableField(fill = FieldFill.INSERT)
+    private String createBy;
+
+    /**
+     * 创建时间
+     */
+    @TableField(fill = FieldFill.INSERT)
+    private Date createTime;
+
+    /**
+     * 更新者
+     */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private String updateBy;
+
+    /**
+     * 更新时间
+     */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Date updateTime;
+
+    /**
+     * 请求参数
+     */
+    @JsonInclude(JsonInclude.Include.NON_EMPTY)
+    @TableField(exist = false)
+    private Map<String, Object> params = new HashMap<>();
 
 
 }

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

@@ -12,6 +12,7 @@ import org.dromara.wms.domain.WmsInstockDetail;
 
 import java.io.Serial;
 import java.io.Serializable;
+import java.math.BigDecimal;
 import java.util.Date;
 
 
@@ -82,7 +83,7 @@ public class WmsInstockDetailVo implements Serializable {
      * 入库数量
      */
     @ExcelProperty(value = "入库数量")
-    private Long instockQty;
+    private BigDecimal instockQty;
 
     /**
      * 物料规格
@@ -130,7 +131,7 @@ public class WmsInstockDetailVo implements Serializable {
     /**
      * 已打印数量
      */
-    private Integer printedNum;
+    private BigDecimal printedNum;
     /**
      * 租户id
      */

ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/mapper/WmsInstockOrderMapper.java

@@ -1,9 +1,14 @@
 package org.dromara.wms.mapper;
 
+import jakarta.validation.constraints.NotNull;
+import org.apache.ibatis.annotations.Param;
 import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+import org.dromara.wms.domain.WmsConfiguration;
 import org.dromara.wms.domain.WmsInstockOrder;
 import org.dromara.wms.domain.vo.WmsInstockOrderVo;
 
+import java.util.List;
+
 /**
  * 入库单Mapper接口
  *
@@ -13,4 +18,8 @@ import org.dromara.wms.domain.vo.WmsInstockOrderVo;
 public interface WmsInstockOrderMapper extends BaseMapperPlus<WmsInstockOrder, WmsInstockOrderVo> {
 
     int updateInstock(WmsInstockOrder update);
+
+    List<WmsConfiguration> selectAuditByConfiguration(@Param("warehouseId") Long warehouseId);
+
+    List<WmsConfiguration> selectUnAuditByConfiguration(@Param("warehouseId") Long warehouseId);
 }

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

@@ -12,12 +12,39 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="instockType != null and instockType != ''">instock_type = #{instockType},</if>
             <if test="auditBy != null">audit_by = #{auditBy},</if>
             <if test="auditComments != null">audit_comments = #{auditComments},</if>
+            <if test="auditStatus != null">audit_status = #{auditStatus},</if>
             <if test="warehouseId != null">warehouse_id = #{warehouseId},</if>
             <if test="createBy != null">create_by = #{createBy},</if>
             <if test="createTime != null">create_time = #{createTime},</if>
             <if test="updateBy != null">update_by = #{updateBy},</if>
             <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="auditTime != null">audit_time = #{auditTime},</if>
         </trim>
         where instock_id = #{instockId}
     </update>
+    <select id="selectAuditByConfiguration" resultType="org.dromara.wms.domain.WmsConfiguration"
+            parameterType="java.lang.Long">
+        SELECT
+            x.*
+        FROM
+            hwmom.dbo.wms_configuration x
+        where
+            ((x.approve_range = '1'
+                and x.warehouse_id = #{warehouseId})
+                or x.approve_range = '0')
+          and x.node_code = 'in'
+          and x.approve_yes_no = '0'
+          and x.approve_type != '2'
+    </select>
+    <select id="selectUnAuditByConfiguration" resultType="org.dromara.wms.domain.WmsConfiguration"
+            parameterType="java.lang.Long">
+        SELECT
+            x.*
+        FROM
+            hwmom.dbo.wms_configuration x
+        where
+            x.approve_type != '2'
+          and x.node_code = 'in'
+          and x.approve_yes_no = '1'
+    </select>
 </mapper>