diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/pack/vo/PackRespVO.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/pack/vo/PackRespVO.java index fcf4580df..a2b159ecd 100644 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/pack/vo/PackRespVO.java +++ b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/pack/vo/PackRespVO.java @@ -13,7 +13,7 @@ import java.util.List; public class PackRespVO { - @Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "7788") + @Schema(description = "生产单号", requiredMode = Schema.RequiredMode.REQUIRED, example = "7788") private Long id; @@ -25,10 +25,18 @@ public class PackRespVO { private String customOrderNo; + @Schema(description = "经销商电话", requiredMode = Schema.RequiredMode.REQUIRED,example = "ABCD") + private String dealerPhoneNumber; + + @Schema(description = "经销商", requiredMode = Schema.RequiredMode.REQUIRED,example = "ABCD") private String dealer; + @Schema(description = "订单日期", requiredMode = Schema.RequiredMode.REQUIRED,example = "ABCD") + private LocalDateTime orderDate; + + @Schema(description = "交付日期", requiredMode = Schema.RequiredMode.REQUIRED,example = "ABCD") private LocalDateTime deliveryDate; diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/resources/com/cf/imes/module/manage/dal/mysql/query/ProductionStatusMapper.xml b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/resources/com/cf/imes/module/manage/dal/mysql/query/ProductionStatusMapper.xml index 46173b425..f542fd39b 100644 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/resources/com/cf/imes/module/manage/dal/mysql/query/ProductionStatusMapper.xml +++ b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/resources/com/cf/imes/module/manage/dal/mysql/query/ProductionStatusMapper.xml @@ -40,6 +40,8 @@ + + @@ -49,7 +51,6 @@ - @@ -65,6 +66,8 @@ o.id as orderNo, o.custom_order_no as customOrderNo, o.dealer as dealer, + o.dealer_phone_number as dealerPhoneNumber, + o.order_date as orderDate, o.create_time as createTime, o.delivery_date as deliveryDate, o.customer as customer,