From cb1672c56e1029435346e9ea45fea5a3637a8a33 Mon Sep 17 00:00:00 2001 From: "maxw@mesnac.com" Date: Mon, 24 Feb 2025 16:05:00 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=A5=E5=BA=93=E5=8A=9F=E8=83=BD=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E6=A0=B9=E6=8D=AE=E9=85=8D=E7=BD=AE=E8=B5=8B=E6=9D=83?= =?UTF-8?q?=E5=AE=A1=E6=89=B9=E4=BA=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../WmsInstockDetailController.java | 5 ++ .../controller/WmsInstockOrderController.java | 10 +++ .../dromara/wms/domain/WmsInstockDetail.java | 5 +- .../wms/domain/bo/WmsInstockDetailBo.java | 64 +++++++++++++++++-- .../wms/domain/vo/WmsInstockDetailVo.java | 5 +- .../wms/mapper/WmsInstockOrderMapper.java | 9 +++ .../mapper/wms/WmsInstockOrderMapper.xml | 27 ++++++++ 7 files changed, 115 insertions(+), 10 deletions(-) diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/controller/WmsInstockDetailController.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/controller/WmsInstockDetailController.java index 43559c61..090d99c0 100644 --- a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/controller/WmsInstockDetailController.java +++ b/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}") diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/controller/WmsInstockOrderController.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/controller/WmsInstockOrderController.java index 5fc6bc26..88465f61 100644 --- a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/controller/WmsInstockOrderController.java +++ b/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 approveInstockOrder(@RequestBody WmsInstockOrderBo bo) { + return R.ok(wmsInstockOrderService.approveInstockOrder(bo)); + } + /** * 删除入库单 * diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/WmsInstockDetail.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/WmsInstockDetail.java index 8611ff87..245d6ec8 100644 --- a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/WmsInstockDetail.java +++ b/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; } diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/bo/WmsInstockDetailBo.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/bo/WmsInstockDetailBo.java index 916544cc..c48c4dca 100644 --- a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/bo/WmsInstockDetailBo.java +++ b/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 params = new HashMap<>(); } diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/vo/WmsInstockDetailVo.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/vo/WmsInstockDetailVo.java index 3ce811ed..8b8d065e 100644 --- a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/vo/WmsInstockDetailVo.java +++ b/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 */ diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/mapper/WmsInstockOrderMapper.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/mapper/WmsInstockOrderMapper.java index bf79546e..c7da5e5f 100644 --- a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/mapper/WmsInstockOrderMapper.java +++ b/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 { int updateInstock(WmsInstockOrder update); + + List selectAuditByConfiguration(@Param("warehouseId") Long warehouseId); + + List selectUnAuditByConfiguration(@Param("warehouseId") Long warehouseId); } diff --git a/ruoyi-modules/hwmom-wms/src/main/resources/mapper/wms/WmsInstockOrderMapper.xml b/ruoyi-modules/hwmom-wms/src/main/resources/mapper/wms/WmsInstockOrderMapper.xml index 7b90d4cd..6bb3e35a 100644 --- a/ruoyi-modules/hwmom-wms/src/main/resources/mapper/wms/WmsInstockOrderMapper.xml +++ b/ruoyi-modules/hwmom-wms/src/main/resources/mapper/wms/WmsInstockOrderMapper.xml @@ -12,12 +12,39 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" instock_type = #{instockType}, audit_by = #{auditBy}, audit_comments = #{auditComments}, + audit_status = #{auditStatus}, warehouse_id = #{warehouseId}, create_by = #{createBy}, create_time = #{createTime}, update_by = #{updateBy}, update_time = #{updateTime}, + audit_time = #{auditTime}, where instock_id = #{instockId} + +