From f7ad272b8cd9990b7cdaaae1aaa6d35a7c2adb76 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=A5=8E=E5=85=B4?= <2220574228@qq.com> Date: Fri, 17 Apr 2026 14:19:43 +0800 Subject: [PATCH] =?UTF-8?q?oms=E5=87=BA=E5=85=A5=E5=BA=93;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/ReservationStockInOrder.java | 9 ++++++++- .../repository/po/ReservationStockInOrderPO.java | 9 ++++++++- .../repository/todo/ReservationStockInOrderDO.java | 8 +++++++- .../repository/todo/ReservationStockInOrderDTO.java | 8 +++++++- .../service/ReservationStockInOrderDomainService.java | 2 +- .../entity/ReservationStockOutOrder.java | 9 ++++++++- .../repository/po/ReservationStockOutOrderPO.java | 8 +++++++- .../repository/todo/ReservationStockOutOrderDO.java | 8 +++++++- .../repository/todo/ReservationStockOutOrderDTO.java | 8 +++++++- .../service/ReservationStockOutOrderDomainService.java | 2 +- .../repository/persistence/MaterialInventoryImpl.java | 7 ++++++- 11 files changed, 67 insertions(+), 11 deletions(-) diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/entity/ReservationStockInOrder.java b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/entity/ReservationStockInOrder.java index a59ccad35..f315cf684 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/entity/ReservationStockInOrder.java +++ b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/entity/ReservationStockInOrder.java @@ -355,7 +355,7 @@ public class ReservationStockInOrder extends BaseVOEntity { @ApiModelProperty( "下发状态 0-无状态 1-未下发 2-已下发 ") - private Long issueStatus; + private Integer issueStatus; @ApiModelProperty("下发时间") @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") @@ -379,4 +379,11 @@ public class ReservationStockInOrder extends BaseVOEntity { @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") private Date reservationAuditTime; + @ApiModelProperty("结算币种") + private String settlementCurrency; + @ApiModelProperty("业务员ID") + private String salesmanId; + @ApiModelProperty("业务员名称") + private String salesmanName; + } \ No newline at end of file diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/repository/po/ReservationStockInOrderPO.java b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/repository/po/ReservationStockInOrderPO.java index 7de742d0a..7ace91617 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/repository/po/ReservationStockInOrderPO.java +++ b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/repository/po/ReservationStockInOrderPO.java @@ -375,7 +375,7 @@ public class ReservationStockInOrderPO extends BaseVOEntity { private String orderStatus; @ApiModelProperty( "下发状态 0-无状态 1-未下发 2-已下发 ") - private Long issueStatus; + private Integer issueStatus; @ApiModelProperty("下发时间") @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") @@ -398,4 +398,11 @@ public class ReservationStockInOrderPO extends BaseVOEntity { @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") private Date reservationAuditTime; + + @ApiModelProperty("结算币种") + private String settlementCurrency; + @ApiModelProperty("业务员ID") + private String salesmanId; + @ApiModelProperty("业务员名称") + private String salesmanName; } \ No newline at end of file diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/repository/todo/ReservationStockInOrderDO.java b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/repository/todo/ReservationStockInOrderDO.java index 383b24af5..c9cfdc254 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/repository/todo/ReservationStockInOrderDO.java +++ b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/repository/todo/ReservationStockInOrderDO.java @@ -381,7 +381,7 @@ public class ReservationStockInOrderDO extends BaseVOEntity { private String materialCode; @ApiModelProperty( "下发状态 0-无状态 1-未下发 2-已下发 ") - private Long issueStatus; + private Integer issueStatus; @ApiModelProperty("下发时间") @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") @@ -404,4 +404,10 @@ public class ReservationStockInOrderDO extends BaseVOEntity { @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") private Date reservationAuditTime; + @ApiModelProperty("结算币种") + private String settlementCurrency; + @ApiModelProperty("业务员ID") + private String salesmanId; + @ApiModelProperty("业务员名称") + private String salesmanName; } \ No newline at end of file diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/repository/todo/ReservationStockInOrderDTO.java b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/repository/todo/ReservationStockInOrderDTO.java index 1a5cdb456..47dd5b135 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/repository/todo/ReservationStockInOrderDTO.java +++ b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/repository/todo/ReservationStockInOrderDTO.java @@ -378,7 +378,7 @@ public class ReservationStockInOrderDTO extends ReservationStockInOrderBaseDTO { private String materialCode; @ApiModelProperty( "下发状态 0-无状态 1-未下发 2-已下发 ") - private Long issueStatus; + private Integer issueStatus; @ApiModelProperty("下发时间") @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") @@ -401,4 +401,10 @@ public class ReservationStockInOrderDTO extends ReservationStockInOrderBaseDTO { @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") private Date reservationAuditTime; + @ApiModelProperty("结算币种") + private String settlementCurrency; + @ApiModelProperty("业务员ID") + private String salesmanId; + @ApiModelProperty("业务员名称") + private String salesmanName; } \ No newline at end of file diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/service/ReservationStockInOrderDomainService.java b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/service/ReservationStockInOrderDomainService.java index ac6d82bc8..98246f8e7 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/service/ReservationStockInOrderDomainService.java +++ b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/service/ReservationStockInOrderDomainService.java @@ -376,7 +376,7 @@ public class ReservationStockInOrderDomainService { @Transactional(rollbackFor = Exception.class) public Boolean auditState(ReservationStockInOrderDO stockInOrderDO) { LoginUser loginUser = SecurityUtils.getLoginUser(); - Integer auditStatus = stockInOrderDO.getAuditStatus(); + Integer auditStatus = stockInOrderDO.getIssueStatus(); Integer issueStatus = 0; issueStatus = auditStatus == 2 ? 2 : 3; // 获取用户姓名（优先从UserPo获取，如果为空则使用realname，最后使用username作为兜底） diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/entity/ReservationStockOutOrder.java b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/entity/ReservationStockOutOrder.java index 1e6287471..0cc798e61 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/entity/ReservationStockOutOrder.java +++ b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/entity/ReservationStockOutOrder.java @@ -396,7 +396,7 @@ public class ReservationStockOutOrder extends BaseVOEntity { private Date documentDate; @ApiModelProperty( "下发状态 0-无状态 1-未下发 2-已下发 ") - private Long issueStatus; + private Integer issueStatus; @ApiModelProperty("下发时间") @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") @@ -420,4 +420,11 @@ public class ReservationStockOutOrder extends BaseVOEntity { @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") private Date reservationAuditTime; + @ApiModelProperty("结算币种") + private String settlementCurrency; + @ApiModelProperty("业务员ID") + private String salesmanId; + @ApiModelProperty("业务员名称") + private String salesmanName; + } \ No newline at end of file diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/repository/po/ReservationStockOutOrderPO.java b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/repository/po/ReservationStockOutOrderPO.java index 1ae5441d5..9e054ca66 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/repository/po/ReservationStockOutOrderPO.java +++ b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/repository/po/ReservationStockOutOrderPO.java @@ -408,7 +408,7 @@ public class ReservationStockOutOrderPO extends BaseVOEntity { private String carrierName; @ApiModelProperty( "下发状态 0-无状态 1-未下发 2-已下发 ") - private Long issueStatus; + private Integer issueStatus; @ApiModelProperty("下发时间") @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") @@ -431,4 +431,10 @@ public class ReservationStockOutOrderPO extends BaseVOEntity { @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") private Date reservationAuditTime; + @ApiModelProperty("结算币种") + private String settlementCurrency; + @ApiModelProperty("业务员ID") + private String salesmanId; + @ApiModelProperty("业务员名称") + private String salesmanName; } \ No newline at end of file diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/repository/todo/ReservationStockOutOrderDO.java b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/repository/todo/ReservationStockOutOrderDO.java index a84a92e56..5b774086b 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/repository/todo/ReservationStockOutOrderDO.java +++ b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/repository/todo/ReservationStockOutOrderDO.java @@ -444,7 +444,7 @@ public class ReservationStockOutOrderDO extends BaseVOEntity { private String carrierName; @ApiModelProperty( "下发状态 0-无状态 1-未下发 2-已下发 ") - private Long issueStatus; + private Integer issueStatus; @ApiModelProperty("下发时间") @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") @@ -467,4 +467,10 @@ public class ReservationStockOutOrderDO extends BaseVOEntity { @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") private Date reservationAuditTime; + @ApiModelProperty("结算币种") + private String settlementCurrency; + @ApiModelProperty("业务员ID") + private String salesmanId; + @ApiModelProperty("业务员名称") + private String salesmanName; } \ No newline at end of file diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/repository/todo/ReservationStockOutOrderDTO.java b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/repository/todo/ReservationStockOutOrderDTO.java index a6038cb7c..796cbd934 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/repository/todo/ReservationStockOutOrderDTO.java +++ b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/repository/todo/ReservationStockOutOrderDTO.java @@ -433,7 +433,7 @@ public class ReservationStockOutOrderDTO extends ReservationStockOutOrderBaseDTO private String carrierName; @ApiModelProperty( "下发状态 0-无状态 1-未下发 2-已下发 ") - private Long issueStatus; + private Integer issueStatus; @ApiModelProperty("下发时间") @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") @@ -456,4 +456,10 @@ public class ReservationStockOutOrderDTO extends ReservationStockOutOrderBaseDTO @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") private Date reservationAuditTime; + @ApiModelProperty("结算币种") + private String settlementCurrency; + @ApiModelProperty("业务员ID") + private String salesmanId; + @ApiModelProperty("业务员名称") + private String salesmanName; } \ No newline at end of file diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/service/ReservationStockOutOrderDomainService.java b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/service/ReservationStockOutOrderDomainService.java index 271cf4630..77937601d 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/service/ReservationStockOutOrderDomainService.java +++ b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/service/ReservationStockOutOrderDomainService.java @@ -224,7 +224,7 @@ public class ReservationStockOutOrderDomainService { @Transactional(rollbackFor = Exception.class) public Boolean auditState(ReservationStockOutOrderDO stockOutOrderDO) { LoginUser loginUser = SecurityUtils.getLoginUser(); - Integer auditStatus = stockOutOrderDO.getAuditStatus(); + Integer auditStatus = stockOutOrderDO.getIssueStatus(); Integer issueStatus = 0; issueStatus = auditStatus == 2 ? 2 : 3; // 获取用户姓名（优先从UserPo获取，如果为空则使用realname，最后使用username作为兜底） diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/materialInventory/repository/persistence/MaterialInventoryImpl.java b/mhd_wms/src/main/java/com/mhd/wms/domain/materialInventory/repository/persistence/MaterialInventoryImpl.java index 80dc22f15..529ff8c7f 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/materialInventory/repository/persistence/MaterialInventoryImpl.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/materialInventory/repository/persistence/MaterialInventoryImpl.java @@ -680,7 +680,12 @@ public class MaterialInventoryImpl extends ServiceImpl