From 64a3c9c32ece7c4598aab89a59a3a413bacd683a Mon Sep 17 00:00:00 2001 From: "zangch@mesnac.com" Date: Wed, 3 Sep 2025 10:04:38 +0800 Subject: [PATCH] =?UTF-8?q?refactor(wms):=20=E7=A7=BB=E9=99=A4=20WmsInstoc?= =?UTF-8?q?kDetail=20=E4=B8=AD=E7=9A=84=20AGV=20=E7=9B=B8=E5=85=B3?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=EF=BC=8C=E6=96=B0=E5=A2=9E=E4=B8=BAprint?= =?UTF-8?q?=E4=B8=BAagv?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit -从 WmsInstockDetail、WmsInstockDetailBo、WmsInstockDetailVo 中移除了 isAgv、completeQty 和 agvStatus 字段 - 在 WmsInstockPrint、WmsInstockPrintBo 和 WmsInstockPrintVo 中添加了 isAgv 和 agvStatus 字段 - 删除了 WmsInstockDetailServiceImpl 中的 actionAGV 方法 --- .../org/dromara/wms/domain/WmsInstockDetail.java | 15 --------------- .../org/dromara/wms/domain/WmsInstockPrint.java | 12 ++++++++++++ .../dromara/wms/domain/bo/WmsInstockDetailBo.java | 15 --------------- .../dromara/wms/domain/bo/WmsInstockPrintBo.java | 11 +++++++++++ .../dromara/wms/domain/vo/WmsInstockDetailVo.java | 15 --------------- .../dromara/wms/domain/vo/WmsInstockPrintVo.java | 10 ++++++++++ .../service/impl/WmsInstockDetailServiceImpl.java | 12 ------------ 7 files changed, 33 insertions(+), 57 deletions(-) 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 e5e67325..68515c21 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 @@ -147,21 +147,6 @@ public class WmsInstockDetail{ private String materialCategoryName;//字段映射 - /** - * 是否为AGV任务（0是，1否） - */ - private String isAgv; - - /** - * 完成数量 - */ - private BigDecimal completeQty; - - /** - * AGV状态（0待拾取 / 1运输中 / 2完成） - */ - private String agvStatus; - /** * 打印时间(打印记录的创建时间按) diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/WmsInstockPrint.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/WmsInstockPrint.java index 318771f0..37b4c7c5 100644 --- a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/WmsInstockPrint.java +++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/WmsInstockPrint.java @@ -125,6 +125,18 @@ public class WmsInstockPrint{ */ private Date actualInboundTime; + + /** + * 是否为AGV任务（0是，1否） + */ + private String isAgv; + + + /** + * AGV状态（0待拾取 / 1运输中 / 2完成） + */ + private String agvStatus; + /** * 物料大类 */ 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 745818f7..87f59762 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 @@ -191,21 +191,6 @@ public class WmsInstockDetailBo{ */ private String inspectionRequest; - /** - * 是否为AGV任务（0是，1否） - */ - private String isAgv; - - /** - * 完成数量 - */ - private BigDecimal completeQty; - - /** - * AGV状态（0待拾取 / 1运输中 / 2完成） - */ - private String agvStatus; - /** * 每包数量列表（当分包数量>1时使用） diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/bo/WmsInstockPrintBo.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/bo/WmsInstockPrintBo.java index c1730b90..54a28be9 100644 --- a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/bo/WmsInstockPrintBo.java +++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/bo/WmsInstockPrintBo.java @@ -111,4 +111,15 @@ public class WmsInstockPrintBo extends BaseEntity { */ private Date actualInboundTime; + /** + * 是否为AGV任务（0是，1否） + */ + private String isAgv; + + + /** + * AGV状态（0待拾取 / 1运输中 / 2完成） + */ + private String agvStatus; + } 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 26c33b83..cc3c8b09 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 @@ -161,21 +161,6 @@ public class WmsInstockDetailVo implements Serializable { private String inspectionRequest; - /** - * 是否为AGV任务（0是，1否） - */ - private String isAgv; - - /** - * 完成数量 - */ - private BigDecimal completeQty; - - /** - * AGV状态（0待拾取 / 1运输中 / 2完成） - */ - private String agvStatus; - /** * 打印时间(打印记录的创建时间按) diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/vo/WmsInstockPrintVo.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/vo/WmsInstockPrintVo.java index 5e2e924a..1a9a48e5 100644 --- a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/vo/WmsInstockPrintVo.java +++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/vo/WmsInstockPrintVo.java @@ -142,5 +142,15 @@ public class WmsInstockPrintVo implements Serializable { */ private Date createTime; + /** + * 是否为AGV任务（0是，1否） + */ + private String isAgv; + + + /** + * AGV状态（0待拾取 / 1运输中 / 2完成） + */ + private String agvStatus; } diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsInstockDetailServiceImpl.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsInstockDetailServiceImpl.java index d638335b..7924a412 100644 --- a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsInstockDetailServiceImpl.java +++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsInstockDetailServiceImpl.java @@ -123,9 +123,6 @@ public class WmsInstockDetailServiceImpl implements IWmsInstockDetailService { .eq(StringUtils.isNotBlank(bo.getMaterialCategoryId()), WmsInstockDetail::getMaterialCategoryId, bo.getMaterialCategoryId()) //新增 .eq(StringUtils.isNotBlank(bo.getInspectionRequest()), BaseMaterialInfo::getInspectionRequest, bo.getInspectionRequest()) - .eq(StringUtils.isNotBlank(bo.getIsAgv()), WmsInstockDetail::getIsAgv, bo.getIsAgv())//agv - .eq(bo.getCompleteQty() != null, WmsInstockDetail::getCompleteQty, bo.getCompleteQty())//agv - .eq(StringUtils.isNotBlank(bo.getAgvStatus()), WmsInstockDetail::getAgvStatus, bo.getAgvStatus())//agv .orderByDesc(WmsInstockDetail::getCreateTime); return lqw; } @@ -350,13 +347,4 @@ public class WmsInstockDetailServiceImpl implements IWmsInstockDetailService { return baseMapper.deleteByIds(ids) > 0; } - /** - * 启动AGV - * @param bo - * @return boolean - * 暂时默认启动成功 - */ - private Boolean actionAGV(WmsInstockDetailBo bo) { - return true; - } }