From 668850dc3ae23ffc3ffbb9e890cd9e06eff0c6bb Mon Sep 17 00:00:00 2001 From: "zangch@mesnac.com" Date: Thu, 21 Aug 2025 16:52:31 +0800 Subject: [PATCH] =?UTF-8?q?feat(wms):=20=E5=85=A5=E5=BA=93=E5=92=8C?= =?UTF-8?q?=E5=87=BA=E5=BA=93=E8=AE=B0=E5=BD=95=E5=A2=9E=E5=8A=A0=E7=89=B9?= =?UTF-8?q?=E6=AE=8A=E6=A0=87=E8=AF=86=E5=AD=97=E6=AE=B5,=E7=89=B9?= =?UTF-8?q?=E6=AE=8A=E6=A0=87=E8=AF=86=E5=AD=97=E6=AE=B5=E7=94=A8=E4=BA=8E?= =?UTF-8?q?=E5=8C=BA=E5=88=86=E8=B0=83=E6=8B=A8=E5=92=8C=E9=80=80=E5=BA=93?= =?UTF-8?q?=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在 WmsInstockRecord、WmsInstockRecordBo 和 WmsInstockRecordVo 中添加 specialType 字段 - 在 WmsOutstockRecord、WmsOutstockRecordBo 和 WmsOutstockRecordVo 中添加 specialType 字段 - 特殊标识字段用于区分调拨和退库操作 --- .../java/org/dromara/wms/domain/WmsInstockRecord.java | 5 +++++ .../java/org/dromara/wms/domain/WmsOutstockRecord.java | 5 +++++ .../org/dromara/wms/domain/bo/WmsInstockRecordBo.java | 4 ++++ .../org/dromara/wms/domain/bo/WmsOutstockRecordBo.java | 6 ++++++ .../org/dromara/wms/domain/vo/WmsInstockRecordVo.java | 5 +++++ .../org/dromara/wms/domain/vo/WmsOutstockRecordVo.java | 8 ++++++++ 6 files changed, 33 insertions(+) diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/WmsInstockRecord.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/WmsInstockRecord.java index 7270405..b36f6b9 100644 --- a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/WmsInstockRecord.java +++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/WmsInstockRecord.java @@ -88,6 +88,11 @@ public class WmsInstockRecord extends TenantEntity { */ private Double erpSynchronousQty; + /** + * 特殊标识（0调拨，1退库） + */ + private String specialType; + /** * 物料大类 */ diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/WmsOutstockRecord.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/WmsOutstockRecord.java index 432c5b5..3721b35 100644 --- a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/WmsOutstockRecord.java +++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/WmsOutstockRecord.java @@ -80,6 +80,11 @@ public class WmsOutstockRecord extends TenantEntity { @TableField(typeHandler = JacksonTypeHandler.class) private BigDecimal erpSynchronousQty; + /** + * 特殊标识（0调拨，1退库） + */ + private String specialType; + /** * 物料 diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/bo/WmsInstockRecordBo.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/bo/WmsInstockRecordBo.java index 02eac45..b3e1269 100644 --- a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/bo/WmsInstockRecordBo.java +++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/bo/WmsInstockRecordBo.java @@ -79,5 +79,9 @@ public class WmsInstockRecordBo extends BaseEntity { @NotNull(message = "erp同步数量不能为空", groups = { AddGroup.class, EditGroup.class }) private Double erpSynchronousQty; + /** + * 特殊标识（0调拨，1退库） + */ + private String specialType; } diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/bo/WmsOutstockRecordBo.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/bo/WmsOutstockRecordBo.java index 8c42408..bae6edc 100644 --- a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/bo/WmsOutstockRecordBo.java +++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/bo/WmsOutstockRecordBo.java @@ -71,6 +71,12 @@ public class WmsOutstockRecordBo extends BaseEntity { */ private BigDecimal erpSynchronousQty; + /** + * 特殊标识（0调拨，1退库） + */ + private String specialType; + + private BigDecimal returnQty; private String returnFlag; private String returnLocationCode; diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/vo/WmsInstockRecordVo.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/vo/WmsInstockRecordVo.java index 37ec1be..f390b62 100644 --- a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/vo/WmsInstockRecordVo.java +++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/vo/WmsInstockRecordVo.java @@ -113,6 +113,11 @@ public class WmsInstockRecordVo implements Serializable { @ExcelProperty(value = "同步时间") private Date updateTime; + /** + * 特殊标识（0调拨，1退库） + */ + private String specialType; + /** * 物料大类 diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/vo/WmsOutstockRecordVo.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/vo/WmsOutstockRecordVo.java index 0bc8cd2..60a3097 100644 --- a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/vo/WmsOutstockRecordVo.java +++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/vo/WmsOutstockRecordVo.java @@ -101,6 +101,14 @@ public class WmsOutstockRecordVo implements Serializable { */ @ExcelProperty(value = "erp同步数量") private BigDecimal erpSynchronousQty; + + + /** + * 特殊标识（0调拨，1退库） + */ + private String specialType; + + /** * 物料信息 */