From dc14e04d9d5ab1cdfcebf59eeaa97e38001a6411 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=A5=8E=E5=85=B4?= <2220574228@qq.com> Date: Wed, 3 Jun 2026 15:30:19 +0800 Subject: [PATCH] =?UTF-8?q?=E5=87=BA=E5=BA=93=E5=8D=95=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E8=BD=A6=E6=AC=A1=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mhd/system/api/domain/StockOutOrder.java | 3 +++ .../ReservationStockInOrderImpl.java | 1 + .../entity/ReservationStockOutOrder.java | 4 ++++ .../po/ReservationStockOutOrderPO.java | 3 +++ .../todo/ReservationStockOutOrderDO.java | 3 +++ .../todo/ReservationStockOutOrderDTO.java | 3 +++ .../todo/DeliveryDetailsLinkItemsDO.java | 19 +------------------ .../stockOutOrder/entity/StockOutOrder.java | 4 +++- .../repository/po/StockOutOrderPO.java | 3 +++ .../repository/todo/StockOutOrderDO.java | 3 +++ .../DeliveryDetailsLinkItemsDTO.java | 10 +--------- .../dto/stockOutOrder/StockOutOrderDTO.java | 3 +++ 12 files changed, 31 insertions(+), 28 deletions(-) diff --git a/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/domain/StockOutOrder.java b/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/domain/StockOutOrder.java index 413411bda..f94c49b5d 100644 --- a/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/domain/StockOutOrder.java +++ b/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/domain/StockOutOrder.java @@ -401,5 +401,8 @@ public class StockOutOrder extends BaseVOEntity { private String salesmanId; @ApiModelProperty("业务员名称") private String salesmanName; + @ApiModelProperty("车次") + @Excel(name = "车次") + private Integer trainNo; } \ No newline at end of file diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/repository/persistence/ReservationStockInOrderImpl.java b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/repository/persistence/ReservationStockInOrderImpl.java index ea6bf402e..b8ec9b043 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/repository/persistence/ReservationStockInOrderImpl.java +++ b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/repository/persistence/ReservationStockInOrderImpl.java @@ -229,6 +229,7 @@ public class ReservationStockInOrderImpl extends ServiceImpl reservationOutMaterialDetailDOList = new ArrayList<>(); for (ProductDetail productDetail : productDetailList) { 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 11eac890c..b5fdd26c5 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 @@ -482,4 +482,8 @@ public class ReservationStockOutOrder extends BaseVOEntity { @Excel(name = "运输业务单号") private String businessNumber; + @ApiModelProperty("车次") + @Excel(name = "车次") + private Integer trainNo; + } \ 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 3895c12b6..3bf84b9e3 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 @@ -499,4 +499,7 @@ public class ReservationStockOutOrderPO extends BaseVOEntity { @ApiModelProperty("NC客户编码") private String customerNcCode; + @ApiModelProperty("车次") + @Excel(name = "车次") + private Integer trainNo; } \ 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 e2b4511e9..ca827ab81 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 @@ -534,4 +534,7 @@ public class ReservationStockOutOrderDO extends BaseVOEntity { @ApiModelProperty("NC客户编码") private String customerNcCode; + @ApiModelProperty("车次") + @Excel(name = "车次") + private Integer trainNo; } \ 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 1ddd81c7d..237e9554c 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 @@ -523,4 +523,7 @@ public class ReservationStockOutOrderDTO extends ReservationStockOutOrderBaseDTO @ApiModelProperty("NC客户编码") private String customerNcCode; + @ApiModelProperty("车次") + @Excel(name = "车次") + private Integer trainNo; } \ No newline at end of file diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/deliveryDetailsLinkItems/repository/todo/DeliveryDetailsLinkItemsDO.java b/mhd_wms/src/main/java/com/mhd/wms/domain/deliveryDetailsLinkItems/repository/todo/DeliveryDetailsLinkItemsDO.java index 7ad127aa2..ba64b9a91 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/deliveryDetailsLinkItems/repository/todo/DeliveryDetailsLinkItemsDO.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/deliveryDetailsLinkItems/repository/todo/DeliveryDetailsLinkItemsDO.java @@ -53,21 +53,4 @@ public class DeliveryDetailsLinkItemsDO extends BaseVOEntity { @ApiModelProperty("配送id") private Long deliveryId; - @ApiModelProperty("组织表ID") - @Excel(name = "组织表ID") - private Long organizationId; - - @ApiModelProperty("组织名称") - @Excel(name = "组织名称") - private String organizationName; - - @ApiModelProperty("一级组织表ID") - @Excel(name = "一级组织表ID") - private Long topOrganizationId; - - @ApiModelProperty(name = "组织ID集合") - private List organizationIdList; - - @ApiModelProperty(name = "权限菜单ID") - private Long permissionMenuId; -} +} \ No newline at end of file diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/entity/StockOutOrder.java b/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/entity/StockOutOrder.java index ea005d3ed..b90313ac0 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/entity/StockOutOrder.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/entity/StockOutOrder.java @@ -407,5 +407,7 @@ public class StockOutOrder extends BaseVOEntity { @ApiModelProperty("退货数量") @Excel(name = "退货数量") private BigDecimal returnQuantity; - + @ApiModelProperty("车次") + @Excel(name = "车次") + private Integer trainNo; } \ No newline at end of file diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/repository/po/StockOutOrderPO.java b/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/repository/po/StockOutOrderPO.java index a7e071fa9..3836b6f03 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/repository/po/StockOutOrderPO.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/repository/po/StockOutOrderPO.java @@ -434,4 +434,7 @@ public class StockOutOrderPO extends BaseVOEntity { @Excel(name = "退货数量") private BigDecimal returnQuantity; private List deliveryDetailsLinkList; + @ApiModelProperty("车次") + @Excel(name = "车次") + private Integer trainNo; } \ No newline at end of file diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/repository/todo/StockOutOrderDO.java b/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/repository/todo/StockOutOrderDO.java index e7d4e4d5e..c56e1a891 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/repository/todo/StockOutOrderDO.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/repository/todo/StockOutOrderDO.java @@ -455,4 +455,7 @@ public class StockOutOrderDO extends BaseVOEntity { @ApiModelProperty("退货数量") @Excel(name = "退货数量") private BigDecimal returnQuantity; + @ApiModelProperty("车次") + @Excel(name = "车次") + private Integer trainNo; } \ No newline at end of file diff --git a/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/deliveryDetailsLinkItems/DeliveryDetailsLinkItemsDTO.java b/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/deliveryDetailsLinkItems/DeliveryDetailsLinkItemsDTO.java index 35a17a105..890205711 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/deliveryDetailsLinkItems/DeliveryDetailsLinkItemsDTO.java +++ b/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/deliveryDetailsLinkItems/DeliveryDetailsLinkItemsDTO.java @@ -48,12 +48,4 @@ public class DeliveryDetailsLinkItemsDTO extends BaseVOEntity { @ApiModelProperty("配送id") private Long deliveryId; - @ApiModelProperty("备注") - private String remark; - - @ApiModelProperty(name = "组织ID集合") - private List organizationIdList; - - @ApiModelProperty(name = "权限菜单ID") - private Long permissionMenuId; -} +} \ No newline at end of file diff --git a/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/stockOutOrder/StockOutOrderDTO.java b/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/stockOutOrder/StockOutOrderDTO.java index c9111a31b..ea8fa9522 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/stockOutOrder/StockOutOrderDTO.java +++ b/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/stockOutOrder/StockOutOrderDTO.java @@ -449,4 +449,7 @@ public class StockOutOrderDTO extends StockOutOrderBaseDTO { */ @ApiModelProperty("提货单打印模版名/弹窗选项全文；后端生成 printTitle（-- 会规范为 ——）") private String noticePrintTemplateName; + @ApiModelProperty("车次") + @Excel(name = "车次") + private Integer trainNo; } \ No newline at end of file