diff --git a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/domain/entity/OrderSupplier.java b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/domain/entity/OrderSupplier.java index bc63b99..390d68c 100644 --- a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/domain/entity/OrderSupplier.java +++ b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/domain/entity/OrderSupplier.java @@ -8,6 +8,7 @@ import com.xunhong.erp.turbo.api.biz.dto.common.UploadFileItem; import com.xunhong.erp.turbo.api.biz.dto.enums.LoadingModeEnum; import com.xunhong.erp.turbo.api.biz.dto.enums.PurchaseOrderPricingMethodEnum; import com.xunhong.erp.turbo.api.biz.dto.enums.PurchaseOrderStateEnum; +import com.xunhong.erp.turbo.api.biz.dto.enums.SupplierTypeEnum; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; @@ -44,6 +45,11 @@ public class OrderSupplier extends DTO { */ private String name; + /** + * 收款人姓名 + */ + private String payeeName; + /** * 身份证号 */ @@ -64,6 +70,11 @@ public class OrderSupplier extends DTO { */ private String wechatQr; + /** + * 供应商类型:1_瓜农;2_档口; + */ + private SupplierTypeEnum type; + /** * 是否最后一家 */ diff --git a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/domain/entity/PurchaseOrder.java b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/domain/entity/PurchaseOrder.java index e8e38b0..1f00e27 100644 --- a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/domain/entity/PurchaseOrder.java +++ b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/domain/entity/PurchaseOrder.java @@ -6,6 +6,7 @@ import com.xunhong.erp.turbo.api.biz.dto.common.*; import com.xunhong.erp.turbo.api.biz.dto.enums.PurchaseOrderAuditStateEnum; import com.xunhong.erp.turbo.api.biz.dto.enums.PurchaseOrderPricingMethodEnum; import com.xunhong.erp.turbo.api.biz.dto.enums.PurchaseOrderStateEnum; +import com.xunhong.erp.turbo.api.biz.dto.enums.PurchaseOrderTypeEnum; import lombok.Data; import lombok.EqualsAndHashCode; @@ -60,6 +61,11 @@ public class PurchaseOrder extends DTO { */ private PurchaseOrderAuditStateEnum auditState; + /** + * 采购类型:1_产地采购;2_市场采购; + */ + private PurchaseOrderTypeEnum type; + /** * 备注 */ diff --git a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/domain/entity/Supplier.java b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/domain/entity/Supplier.java index 9de3b3c..87b85b2 100644 --- a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/domain/entity/Supplier.java +++ b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/domain/entity/Supplier.java @@ -2,6 +2,7 @@ package com.xunhong.erp.turbo.biz.domain.entity; import com.alibaba.cola.domain.Entity; import com.alibaba.cola.dto.DTO; +import com.xunhong.erp.turbo.api.biz.dto.enums.SupplierTypeEnum; import lombok.Data; import lombok.EqualsAndHashCode; @@ -25,6 +26,11 @@ public class Supplier extends DTO { */ private String name; + /** + * 收款人姓名 + */ + private String payeeName; + /** * 身份证号 */ @@ -45,6 +51,11 @@ public class Supplier extends DTO { */ private String wechatQr; + /** + * 供应商类型:1_瓜农;2_档口; + */ + private SupplierTypeEnum type; + /** * 备注 */ diff --git a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/infrastructure/entity/OrderSupplierDO.java b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/infrastructure/entity/OrderSupplierDO.java index 9064f21..bd9c09e 100644 --- a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/infrastructure/entity/OrderSupplierDO.java +++ b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/infrastructure/entity/OrderSupplierDO.java @@ -10,6 +10,7 @@ import com.xunhong.erp.turbo.api.biz.dto.common.UploadFileItem; import com.xunhong.erp.turbo.api.biz.dto.enums.LoadingModeEnum; import com.xunhong.erp.turbo.api.biz.dto.enums.PurchaseOrderPricingMethodEnum; import com.xunhong.erp.turbo.api.biz.dto.enums.PurchaseOrderStateEnum; +import com.xunhong.erp.turbo.api.biz.dto.enums.SupplierTypeEnum; import com.xunhong.erp.turbo.datasource.domain.entity.BaseDO; import lombok.Data; import lombok.EqualsAndHashCode; @@ -49,6 +50,11 @@ public class OrderSupplierDO extends BaseDO { @TableField(value = "name") private String name; + /** + * 收款人姓名 + */ + private String payeeName; + /** * 身份证号 */ @@ -73,6 +79,12 @@ public class OrderSupplierDO extends BaseDO { @TableField(value = "wechat_qr") private String wechatQr; + /** + * 供应商类型:1_瓜农;2_档口; + */ + @TableField(value = "type") + private SupplierTypeEnum type; + /** * 是否最后一家 */ diff --git a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/infrastructure/entity/PurchaseOrderDO.java b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/infrastructure/entity/PurchaseOrderDO.java index ea96300..0288061 100644 --- a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/infrastructure/entity/PurchaseOrderDO.java +++ b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/infrastructure/entity/PurchaseOrderDO.java @@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.annotation.TableName; import com.xunhong.erp.turbo.api.biz.dto.enums.PurchaseOrderAuditStateEnum; import com.xunhong.erp.turbo.api.biz.dto.enums.PurchaseOrderPricingMethodEnum; import com.xunhong.erp.turbo.api.biz.dto.enums.PurchaseOrderStateEnum; +import com.xunhong.erp.turbo.api.biz.dto.enums.PurchaseOrderTypeEnum; import com.xunhong.erp.turbo.datasource.domain.entity.BaseDO; import lombok.Data; import lombok.EqualsAndHashCode; @@ -69,6 +70,12 @@ public class PurchaseOrderDO extends BaseDO { @TableField(value = "audit_state") private PurchaseOrderAuditStateEnum auditState; + /** + * 采购类型:1_产地采购;2_市场采购; + */ + @TableField(value = "type") + private PurchaseOrderTypeEnum type; + /** * 备注 */ diff --git a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/infrastructure/entity/SupplierDO.java b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/infrastructure/entity/SupplierDO.java index e64a071..6048386 100644 --- a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/infrastructure/entity/SupplierDO.java +++ b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/infrastructure/entity/SupplierDO.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import com.xunhong.erp.turbo.api.biz.dto.enums.SupplierTypeEnum; import com.xunhong.erp.turbo.datasource.domain.entity.BaseDO; import lombok.Data; import lombok.EqualsAndHashCode; @@ -28,6 +29,12 @@ public class SupplierDO extends BaseDO { @TableField(value = "name") private String name; + /** + * 收款人姓名 + */ + @TableField(value = "payee_name") + private String payeeName; + /** * 身份证号 */ @@ -58,6 +65,12 @@ public class SupplierDO extends BaseDO { @TableField(value = "remark") private String remark; + /** + * 供应商类型:1_瓜农;2_档口; + */ + @TableField(value = "type") + private SupplierTypeEnum type; + /** * 创建人ID */ diff --git a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/infrastructure/gateway/PurchaseOrderGatewayImpl.java b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/infrastructure/gateway/PurchaseOrderGatewayImpl.java index 5c1b0c3..101b4be 100644 --- a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/infrastructure/gateway/PurchaseOrderGatewayImpl.java +++ b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/infrastructure/gateway/PurchaseOrderGatewayImpl.java @@ -59,7 +59,6 @@ public class PurchaseOrderGatewayImpl implements PurchaseOrderGateway { private final OrderCompanyConvert orderCompanyConvert; private final OrderRebateMapper orderRebateMapper; - private final OrderRebateConvert orderRebateConvert; private final OrderShipMapper orderShipMapper; private final OrderShipConvert orderShipConvert; @@ -88,6 +87,7 @@ public class PurchaseOrderGatewayImpl implements PurchaseOrderGateway { queryWrapper.eq(Objects.nonNull(purchaseOrderPageQry.getState()), PurchaseOrderDO::getState, purchaseOrderPageQry.getState()); queryWrapper.eq(Objects.nonNull(purchaseOrderPageQry.getAuditState()), PurchaseOrderDO::getAuditState, purchaseOrderPageQry.getAuditState()); queryWrapper.eq(Objects.nonNull(purchaseOrderPageQry.getCreatedBy()), PurchaseOrderDO::getCreatedBy, purchaseOrderPageQry.getCreatedBy()); + queryWrapper.eq(Objects.nonNull(purchaseOrderPageQry.getType()), PurchaseOrderDO::getType, purchaseOrderPageQry.getType()); String vehicleNo = purchaseOrderPageQry.getVehicleNo(); if (StrUtil.isNotBlank(vehicleNo)) { @@ -139,6 +139,14 @@ public class PurchaseOrderGatewayImpl implements PurchaseOrderGateway { @Override public List list(PurchaseOrderListQry purchaseOrderListQry) { LambdaQueryWrapper queryWrapper = Wrappers.lambdaQuery(PurchaseOrderDO.class); + queryWrapper.like(StrUtil.isNotBlank(purchaseOrderListQry.getOrderSn()), PurchaseOrderDO::getOrderSn, purchaseOrderListQry.getOrderSn()); + queryWrapper.eq(Objects.nonNull(purchaseOrderListQry.getState()), PurchaseOrderDO::getState, purchaseOrderListQry.getState()); + queryWrapper.eq(Objects.nonNull(purchaseOrderListQry.getAuditState()), PurchaseOrderDO::getAuditState, purchaseOrderListQry.getAuditState()); + queryWrapper.eq(Objects.nonNull(purchaseOrderListQry.getCreatedBy()), PurchaseOrderDO::getCreatedBy, purchaseOrderListQry.getCreatedBy()); + queryWrapper.eq(Objects.nonNull(purchaseOrderListQry.getType()), PurchaseOrderDO::getType, purchaseOrderListQry.getType()); + queryWrapper.select(PurchaseOrderDO::getOrderId, PurchaseOrderDO::getOrderSn, PurchaseOrderDO::getState, PurchaseOrderDO::getAuditState, PurchaseOrderDO::getType); + + queryWrapper.orderByDesc(PurchaseOrderDO::getCreatedAt); List purchaseOrderDOList = purchaseOrderMapper.selectList(queryWrapper); return purchaseOrderDOList.stream().map(purchaseOrderConvert::toPurchaseOrder).toList(); } @@ -153,6 +161,8 @@ public class PurchaseOrderGatewayImpl implements PurchaseOrderGateway { public PurchaseOrder show(PurchaseOrderShowQry purchaseOrderShowQry) { LambdaQueryWrapper queryWrapper = Wrappers.lambdaQuery(PurchaseOrderDO.class); queryWrapper.eq(PurchaseOrderDO::getOrderId, purchaseOrderShowQry.getOrderId()); + queryWrapper.eq(Objects.nonNull(purchaseOrderShowQry.getType()), PurchaseOrderDO::getType, purchaseOrderShowQry.getType()); + queryWrapper.last("limit 1"); PurchaseOrderDO purchaseOrderDO = purchaseOrderMapper.selectOne(queryWrapper); @@ -756,6 +766,7 @@ public class PurchaseOrderGatewayImpl implements PurchaseOrderGateway { purchaseOrderDO = purchaseOrderConvert.toPurchaseOrderDO(purchaseOrderStep1Cmd); purchaseOrderDO.setState(PurchaseOrderStateEnum.DRAFT); purchaseOrderDO.setOrderSn("CG" + generateOrderShipSn()); + purchaseOrderDO.setType(purchaseOrderStep1Cmd.getType()); purchaseOrderMapper.insert(purchaseOrderDO); } else { // 否则更新现有订单 @@ -766,6 +777,7 @@ public class PurchaseOrderGatewayImpl implements PurchaseOrderGateway { purchaseOrderDO = purchaseOrderMapper.selectOne(queryWrapper); purchaseOrderDO.setActive(purchaseOrderStep1Cmd.getActive()); purchaseOrderDO.setState(PurchaseOrderStateEnum.DRAFT); + purchaseOrderDO.setType(purchaseOrderStep1Cmd.getType()); purchaseOrderMapper.updateById(purchaseOrderDO); } @@ -827,6 +839,8 @@ public class PurchaseOrderGatewayImpl implements PurchaseOrderGateway { PurchaseOrderDO purchaseOrderDO = purchaseOrderMapper.selectOne(queryWrapper); purchaseOrderDO.setActive(purchaseOrderStep2Cmd.getActive()); purchaseOrderDO.setState(PurchaseOrderStateEnum.DRAFT); + purchaseOrderDO.setType(purchaseOrderStep2Cmd.getType()); + purchaseOrderMapper.updateById(purchaseOrderDO); // 更新供应商信息(精细化处理) @@ -986,6 +1000,7 @@ public class PurchaseOrderGatewayImpl implements PurchaseOrderGateway { PurchaseOrderDO purchaseOrderDO = purchaseOrderMapper.selectOne(queryWrapper); purchaseOrderDO.setActive(purchaseOrderStep3Cmd.getActive()); purchaseOrderDO.setForeman(purchaseOrderStep3Cmd.getForeman()); + purchaseOrderDO.setType(purchaseOrderStep3Cmd.getType()); purchaseOrderDO.setState(PurchaseOrderStateEnum.DRAFT); purchaseOrderMapper.updateById(purchaseOrderDO); diff --git a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/infrastructure/gateway/SupplierGatewayImpl.java b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/infrastructure/gateway/SupplierGatewayImpl.java index 5c48d92..b292dc0 100644 --- a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/infrastructure/gateway/SupplierGatewayImpl.java +++ b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/infrastructure/gateway/SupplierGatewayImpl.java @@ -48,6 +48,7 @@ public class SupplierGatewayImpl implements SupplierGateway { queryWrapper.like(Objects.nonNull(supplierPageQry.getPhone()), SupplierDO::getPhone, supplierPageQry.getPhone()); queryWrapper.like(Objects.nonNull(supplierPageQry.getBankCard()), SupplierDO::getBankCard, supplierPageQry.getBankCard()); queryWrapper.eq(Objects.nonNull(supplierPageQry.getStatus()), SupplierDO::getStatus, supplierPageQry.getStatus()); + queryWrapper.eq(Objects.nonNull(supplierPageQry.getType()), SupplierDO::getType, supplierPageQry.getType()); queryWrapper.orderByDesc(SupplierDO::getCreatedAt); IPage page = new Page<>(supplierPageQry.getPageIndex(), supplierPageQry.getPageSize()); @@ -62,6 +63,8 @@ public class SupplierGatewayImpl implements SupplierGateway { queryWrapper.eq(Objects.nonNull(supplierListQry.getSupplierId()), SupplierDO::getSupplierId, supplierListQry.getSupplierId()); queryWrapper.like(Objects.nonNull(supplierListQry.getName()), SupplierDO::getName, supplierListQry.getName()); queryWrapper.eq(Objects.nonNull(supplierListQry.getStatus()), SupplierDO::getStatus, supplierListQry.getStatus()); + queryWrapper.eq(Objects.nonNull(supplierListQry.getType()), SupplierDO::getType, supplierListQry.getType()); + queryWrapper.orderByDesc(SupplierDO::getCreatedAt); List supplierDOList = supplierMapper.selectList(queryWrapper); return supplierDOList.stream().map(supplierConvert::toSupplier).toList(); diff --git a/erp-turbo-business/erp-turbo-biz/src/main/resources/mapper/OrderCostMapper.xml b/erp-turbo-business/erp-turbo-biz/src/main/resources/mapper/OrderCostMapper.xml index 26079d8..f9dcc2e 100644 --- a/erp-turbo-business/erp-turbo-biz/src/main/resources/mapper/OrderCostMapper.xml +++ b/erp-turbo-business/erp-turbo-biz/src/main/resources/mapper/OrderCostMapper.xml @@ -65,6 +65,9 @@ AND po.order_id = #{query.orderId} + + AND po.type = #{query.poType} + AND po.state IN AND po.order_id = #{query.orderId} + + AND po.type = #{query.poType} + AND po.state IN diff --git a/erp-turbo-business/erp-turbo-biz/src/main/resources/mapper/OrderSupplierMapper.xml b/erp-turbo-business/erp-turbo-biz/src/main/resources/mapper/OrderSupplierMapper.xml index a1b86df..06861de 100644 --- a/erp-turbo-business/erp-turbo-biz/src/main/resources/mapper/OrderSupplierMapper.xml +++ b/erp-turbo-business/erp-turbo-biz/src/main/resources/mapper/OrderSupplierMapper.xml @@ -9,10 +9,12 @@ + + @@ -69,6 +71,9 @@ AND po.order_id = #{query.orderId} + + AND po.type = #{query.poType} + AND po.state IN diff --git a/erp-turbo-business/erp-turbo-biz/src/main/resources/mapper/PurchaseOrderMapper.xml b/erp-turbo-business/erp-turbo-biz/src/main/resources/mapper/PurchaseOrderMapper.xml index 4d57a17..9ce2f06 100644 --- a/erp-turbo-business/erp-turbo-biz/src/main/resources/mapper/PurchaseOrderMapper.xml +++ b/erp-turbo-business/erp-turbo-biz/src/main/resources/mapper/PurchaseOrderMapper.xml @@ -13,6 +13,7 @@ + @@ -37,12 +38,15 @@ + + + @@ -50,7 +54,7 @@ resultType="com.xunhong.erp.turbo.biz.infrastructure.entity.PurchaseOrderDO" resultMap="SelectByOrderIdListResultMap"> SELECT - po.order_id, po.order_sn, po.state, ov.vehicle_id, ov.vehicle_no, ov.dealer_id, ov.dealer_name + po.order_id, po.order_sn, po.state, po.type, ov.vehicle_id, ov.vehicle_no, ov.dealer_id, ov.dealer_name, ov.origin, ov.destination FROM purchase_order po LEFT JOIN order_vehicle ov ON po.order_id = ov.order_id AND ov.is_delete = 0 diff --git a/erp-turbo-business/erp-turbo-biz/src/main/resources/mapper/SupplierMapper.xml b/erp-turbo-business/erp-turbo-biz/src/main/resources/mapper/SupplierMapper.xml index ab10778..3189890 100644 --- a/erp-turbo-business/erp-turbo-biz/src/main/resources/mapper/SupplierMapper.xml +++ b/erp-turbo-business/erp-turbo-biz/src/main/resources/mapper/SupplierMapper.xml @@ -7,10 +7,12 @@ type="com.xunhong.erp.turbo.biz.infrastructure.entity.SupplierDO"> + + diff --git a/erp-turbo-common/erp-turbo-api/src/main/java/com/xunhong/erp/turbo/api/biz/dto/cmd/PurchaseOrderStep1Cmd.java b/erp-turbo-common/erp-turbo-api/src/main/java/com/xunhong/erp/turbo/api/biz/dto/cmd/PurchaseOrderStep1Cmd.java index 69e9de0..d1aea19 100644 --- a/erp-turbo-common/erp-turbo-api/src/main/java/com/xunhong/erp/turbo/api/biz/dto/cmd/PurchaseOrderStep1Cmd.java +++ b/erp-turbo-common/erp-turbo-api/src/main/java/com/xunhong/erp/turbo/api/biz/dto/cmd/PurchaseOrderStep1Cmd.java @@ -2,6 +2,7 @@ package com.xunhong.erp.turbo.api.biz.dto.cmd; import com.xunhong.erp.turbo.api.biz.dto.common.OrderDealer; import com.xunhong.erp.turbo.api.biz.dto.common.OrderVehicle; +import com.xunhong.erp.turbo.api.biz.dto.enums.PurchaseOrderTypeEnum; import com.xunhong.erp.turbo.base.dto.Command; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; @@ -27,6 +28,12 @@ public class PurchaseOrderStep1Cmd extends Command { @Schema(title = "步骤标识") private Integer active; + /** + * 采购类型:1_产地采购;2_市场采购; + */ + @Schema(title = "采购类型:1_产地采购;2_市场采购;") + private PurchaseOrderTypeEnum type; + /** * 车辆信息 */ diff --git a/erp-turbo-common/erp-turbo-api/src/main/java/com/xunhong/erp/turbo/api/biz/dto/cmd/PurchaseOrderStep2Cmd.java b/erp-turbo-common/erp-turbo-api/src/main/java/com/xunhong/erp/turbo/api/biz/dto/cmd/PurchaseOrderStep2Cmd.java index fd0088d..8428944 100644 --- a/erp-turbo-common/erp-turbo-api/src/main/java/com/xunhong/erp/turbo/api/biz/dto/cmd/PurchaseOrderStep2Cmd.java +++ b/erp-turbo-common/erp-turbo-api/src/main/java/com/xunhong/erp/turbo/api/biz/dto/cmd/PurchaseOrderStep2Cmd.java @@ -1,6 +1,7 @@ package com.xunhong.erp.turbo.api.biz.dto.cmd; import com.xunhong.erp.turbo.api.biz.dto.common.OrderSupplier; +import com.xunhong.erp.turbo.api.biz.dto.enums.PurchaseOrderTypeEnum; import com.xunhong.erp.turbo.base.dto.Command; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; @@ -28,6 +29,12 @@ public class PurchaseOrderStep2Cmd extends Command { @Schema(title = "步骤标识") private Integer active; + /** + * 采购类型:1_产地采购;2_市场采购; + */ + @Schema(title = "采购类型:1_产地采购;2_市场采购;") + private PurchaseOrderTypeEnum type; + /** * 供应商信息 */ diff --git a/erp-turbo-common/erp-turbo-api/src/main/java/com/xunhong/erp/turbo/api/biz/dto/cmd/PurchaseOrderStep3Cmd.java b/erp-turbo-common/erp-turbo-api/src/main/java/com/xunhong/erp/turbo/api/biz/dto/cmd/PurchaseOrderStep3Cmd.java index 5fba56e..940ae53 100644 --- a/erp-turbo-common/erp-turbo-api/src/main/java/com/xunhong/erp/turbo/api/biz/dto/cmd/PurchaseOrderStep3Cmd.java +++ b/erp-turbo-common/erp-turbo-api/src/main/java/com/xunhong/erp/turbo/api/biz/dto/cmd/PurchaseOrderStep3Cmd.java @@ -3,6 +3,7 @@ package com.xunhong.erp.turbo.api.biz.dto.cmd; import com.xunhong.erp.turbo.api.biz.dto.common.OrderCost; import com.xunhong.erp.turbo.api.biz.dto.common.OrderCostItem; import com.xunhong.erp.turbo.api.biz.dto.common.OrderPackage; +import com.xunhong.erp.turbo.api.biz.dto.enums.PurchaseOrderTypeEnum; import com.xunhong.erp.turbo.base.dto.Command; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; @@ -36,6 +37,12 @@ public class PurchaseOrderStep3Cmd extends Command { @Schema(title = "工头") private String foreman; + /** + * 采购类型:1_产地采购;2_市场采购; + */ + @Schema(title = "采购类型:1_产地采购;2_市场采购;") + private PurchaseOrderTypeEnum type; + /** * 费用信息 */ diff --git a/erp-turbo-common/erp-turbo-api/src/main/java/com/xunhong/erp/turbo/api/biz/dto/cmd/SupplierCreateCmd.java b/erp-turbo-common/erp-turbo-api/src/main/java/com/xunhong/erp/turbo/api/biz/dto/cmd/SupplierCreateCmd.java index 04b11e2..395d802 100644 --- a/erp-turbo-common/erp-turbo-api/src/main/java/com/xunhong/erp/turbo/api/biz/dto/cmd/SupplierCreateCmd.java +++ b/erp-turbo-common/erp-turbo-api/src/main/java/com/xunhong/erp/turbo/api/biz/dto/cmd/SupplierCreateCmd.java @@ -1,5 +1,6 @@ package com.xunhong.erp.turbo.api.biz.dto.cmd; +import com.xunhong.erp.turbo.api.biz.dto.enums.SupplierTypeEnum; import com.xunhong.erp.turbo.base.dto.Command; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; @@ -25,16 +26,23 @@ public class SupplierCreateCmd extends Command { @Schema(title = "姓名", requiredMode = Schema.RequiredMode.REQUIRED) private String name; + + /** + * 收款人姓名 + */ + @Schema(title = "收款人姓名") + private String payeeName; + /** * 身份证号 */ - @Schema(title = "身份证号", requiredMode = Schema.RequiredMode.REQUIRED) + @Schema(title = "身份证号") private String idCard; /** * 手机号 */ - @Schema(title = "手机号", requiredMode = Schema.RequiredMode.REQUIRED) + @Schema(title = "手机号") private String phone; /** @@ -61,5 +69,10 @@ public class SupplierCreateCmd extends Command { @Schema(title = "状态:1_启用;0_禁用;", requiredMode = Schema.RequiredMode.REQUIRED) private Boolean status; + /** + * 供应商类型:1_瓜农;2_档口; + */ + @Schema(title = "供应商类型:1_瓜农;2_档口;", requiredMode = Schema.RequiredMode.REQUIRED) + private SupplierTypeEnum type; } diff --git a/erp-turbo-common/erp-turbo-api/src/main/java/com/xunhong/erp/turbo/api/biz/dto/common/OrderSupplier.java b/erp-turbo-common/erp-turbo-api/src/main/java/com/xunhong/erp/turbo/api/biz/dto/common/OrderSupplier.java index bdc5eaa..10e8175 100644 --- a/erp-turbo-common/erp-turbo-api/src/main/java/com/xunhong/erp/turbo/api/biz/dto/common/OrderSupplier.java +++ b/erp-turbo-common/erp-turbo-api/src/main/java/com/xunhong/erp/turbo/api/biz/dto/common/OrderSupplier.java @@ -3,6 +3,7 @@ package com.xunhong.erp.turbo.api.biz.dto.common; import com.xunhong.erp.turbo.api.biz.dto.enums.LoadingModeEnum; import com.xunhong.erp.turbo.api.biz.dto.enums.PurchaseOrderPricingMethodEnum; import com.xunhong.erp.turbo.api.biz.dto.enums.PurchaseOrderStateEnum; +import com.xunhong.erp.turbo.api.biz.dto.enums.SupplierTypeEnum; import com.xunhong.erp.turbo.base.dto.Command; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; @@ -44,6 +45,12 @@ public class OrderSupplier extends Command { @Schema(title = "供应商姓名", requiredMode = Schema.RequiredMode.REQUIRED) private String name; + /** + * 收款人姓名 + */ + @Schema(title = "收款人姓名", requiredMode = Schema.RequiredMode.REQUIRED) + private String payeeName; + /** * 身份证号 */ @@ -68,6 +75,12 @@ public class OrderSupplier extends Command { @Schema(title = "微信二维码") private String wechatQr; + /** + * 供应商类型:1_瓜农;2_档口; + */ + @Schema(title = "供应商类型:1_瓜农;2_档口;", requiredMode = Schema.RequiredMode.REQUIRED) + private SupplierTypeEnum type; + /** * 是否最后一家 */ diff --git a/erp-turbo-common/erp-turbo-api/src/main/java/com/xunhong/erp/turbo/api/biz/dto/enums/PurchaseOrderTypeEnum.java b/erp-turbo-common/erp-turbo-api/src/main/java/com/xunhong/erp/turbo/api/biz/dto/enums/PurchaseOrderTypeEnum.java new file mode 100644 index 0000000..23bf805 --- /dev/null +++ b/erp-turbo-common/erp-turbo-api/src/main/java/com/xunhong/erp/turbo/api/biz/dto/enums/PurchaseOrderTypeEnum.java @@ -0,0 +1,21 @@ +package com.xunhong.erp.turbo.api.biz.dto.enums; + +import com.baomidou.mybatisplus.annotation.EnumValue; +import lombok.Getter; +import lombok.RequiredArgsConstructor; + +@Getter +@RequiredArgsConstructor +public enum PurchaseOrderTypeEnum { + /** + * 采购类型:1_产地采购;2_市场采购; + */ + PRODUCTION_PURCHASE(1, "产地采购"), + MARKET_PURCHASE(2, "市场采购"), + ; + + @EnumValue + private final int type; + + private final String message; +} diff --git a/erp-turbo-common/erp-turbo-api/src/main/java/com/xunhong/erp/turbo/api/biz/dto/enums/SupplierTypeEnum.java b/erp-turbo-common/erp-turbo-api/src/main/java/com/xunhong/erp/turbo/api/biz/dto/enums/SupplierTypeEnum.java new file mode 100644 index 0000000..ef042f4 --- /dev/null +++ b/erp-turbo-common/erp-turbo-api/src/main/java/com/xunhong/erp/turbo/api/biz/dto/enums/SupplierTypeEnum.java @@ -0,0 +1,21 @@ +package com.xunhong.erp.turbo.api.biz.dto.enums; + +import com.baomidou.mybatisplus.annotation.EnumValue; +import lombok.Getter; +import lombok.RequiredArgsConstructor; + +@Getter +@RequiredArgsConstructor +public enum SupplierTypeEnum { + /** + * 供应商类型:1_瓜农;2_档口; + */ + FARMER(1, "瓜农"), + STALL(2, "档口"), + ; + + @EnumValue + private final int type; + + private final String message; +} diff --git a/erp-turbo-common/erp-turbo-api/src/main/java/com/xunhong/erp/turbo/api/biz/dto/qry/OrderCostPageQry.java b/erp-turbo-common/erp-turbo-api/src/main/java/com/xunhong/erp/turbo/api/biz/dto/qry/OrderCostPageQry.java index b521b00..c5576b9 100644 --- a/erp-turbo-common/erp-turbo-api/src/main/java/com/xunhong/erp/turbo/api/biz/dto/qry/OrderCostPageQry.java +++ b/erp-turbo-common/erp-turbo-api/src/main/java/com/xunhong/erp/turbo/api/biz/dto/qry/OrderCostPageQry.java @@ -2,6 +2,7 @@ package com.xunhong.erp.turbo.api.biz.dto.qry; import com.xunhong.erp.turbo.api.biz.dto.enums.CostBelongEnum; import com.xunhong.erp.turbo.api.biz.dto.enums.PurchaseOrderStateEnum; +import com.xunhong.erp.turbo.api.biz.dto.enums.PurchaseOrderTypeEnum; import com.xunhong.erp.turbo.base.dto.PageQuery; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; @@ -29,6 +30,9 @@ public class OrderCostPageQry extends PageQuery { @Schema(title = "订单状态") private List poStates; + @Schema(title = "订单类型") + private PurchaseOrderTypeEnum poType; + @Schema(title = "所属方") private List belongs; diff --git a/erp-turbo-common/erp-turbo-api/src/main/java/com/xunhong/erp/turbo/api/biz/dto/qry/OrderRebatePageQry.java b/erp-turbo-common/erp-turbo-api/src/main/java/com/xunhong/erp/turbo/api/biz/dto/qry/OrderRebatePageQry.java index 268fc74..d8f8e47 100644 --- a/erp-turbo-common/erp-turbo-api/src/main/java/com/xunhong/erp/turbo/api/biz/dto/qry/OrderRebatePageQry.java +++ b/erp-turbo-common/erp-turbo-api/src/main/java/com/xunhong/erp/turbo/api/biz/dto/qry/OrderRebatePageQry.java @@ -1,6 +1,7 @@ package com.xunhong.erp.turbo.api.biz.dto.qry; import com.xunhong.erp.turbo.api.biz.dto.enums.PurchaseOrderStateEnum; +import com.xunhong.erp.turbo.api.biz.dto.enums.PurchaseOrderTypeEnum; import com.xunhong.erp.turbo.base.dto.PageQuery; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; @@ -22,6 +23,9 @@ public class OrderRebatePageQry extends PageQuery { @Schema(title = "订单状态") private List poStates; + @Schema(title = "订单类型") + private PurchaseOrderTypeEnum poType; + @Schema(title = "是否支付", type = "boolean") private Boolean isPaid; } diff --git a/erp-turbo-common/erp-turbo-api/src/main/java/com/xunhong/erp/turbo/api/biz/dto/qry/OrderSupplierPageQry.java b/erp-turbo-common/erp-turbo-api/src/main/java/com/xunhong/erp/turbo/api/biz/dto/qry/OrderSupplierPageQry.java index ec29bef..c15ba2b 100644 --- a/erp-turbo-common/erp-turbo-api/src/main/java/com/xunhong/erp/turbo/api/biz/dto/qry/OrderSupplierPageQry.java +++ b/erp-turbo-common/erp-turbo-api/src/main/java/com/xunhong/erp/turbo/api/biz/dto/qry/OrderSupplierPageQry.java @@ -1,6 +1,7 @@ package com.xunhong.erp.turbo.api.biz.dto.qry; import com.xunhong.erp.turbo.api.biz.dto.enums.PurchaseOrderStateEnum; +import com.xunhong.erp.turbo.api.biz.dto.enums.PurchaseOrderTypeEnum; import com.xunhong.erp.turbo.base.dto.PageQuery; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; @@ -37,6 +38,9 @@ public class OrderSupplierPageQry extends PageQuery { @Schema(title = "订单状态") private List poStates; + @Schema(title = "订单类型") + private PurchaseOrderTypeEnum poType; + @Schema(title = "是否支付", type = "boolean") private Boolean isPaid; } diff --git a/erp-turbo-common/erp-turbo-api/src/main/java/com/xunhong/erp/turbo/api/biz/dto/qry/PurchaseOrderCountQry.java b/erp-turbo-common/erp-turbo-api/src/main/java/com/xunhong/erp/turbo/api/biz/dto/qry/PurchaseOrderCountQry.java index 39a02d6..899f8a2 100644 --- a/erp-turbo-common/erp-turbo-api/src/main/java/com/xunhong/erp/turbo/api/biz/dto/qry/PurchaseOrderCountQry.java +++ b/erp-turbo-common/erp-turbo-api/src/main/java/com/xunhong/erp/turbo/api/biz/dto/qry/PurchaseOrderCountQry.java @@ -2,6 +2,7 @@ package com.xunhong.erp.turbo.api.biz.dto.qry; import com.xunhong.erp.turbo.api.biz.dto.enums.PurchaseOrderAuditStateEnum; import com.xunhong.erp.turbo.api.biz.dto.enums.PurchaseOrderStateEnum; +import com.xunhong.erp.turbo.api.biz.dto.enums.PurchaseOrderTypeEnum; import com.xunhong.erp.turbo.base.dto.Query; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; @@ -26,5 +27,11 @@ public class PurchaseOrderCountQry extends Query { */ @Schema(title = "采购单审核状态: 1_待报价审核;2_待老板审批;3_老板审批通过;4_报价审核驳回;5_老板审批驳回") private PurchaseOrderAuditStateEnum auditState; + + /** + * 采购类型:1_产地采购;2_市场采购; + */ + @Schema(title = "采购类型:1_产地采购;2_市场采购;") + private PurchaseOrderTypeEnum type; } diff --git a/erp-turbo-common/erp-turbo-api/src/main/java/com/xunhong/erp/turbo/api/biz/dto/qry/PurchaseOrderListQry.java b/erp-turbo-common/erp-turbo-api/src/main/java/com/xunhong/erp/turbo/api/biz/dto/qry/PurchaseOrderListQry.java index 11bfa11..cb0d0a0 100644 --- a/erp-turbo-common/erp-turbo-api/src/main/java/com/xunhong/erp/turbo/api/biz/dto/qry/PurchaseOrderListQry.java +++ b/erp-turbo-common/erp-turbo-api/src/main/java/com/xunhong/erp/turbo/api/biz/dto/qry/PurchaseOrderListQry.java @@ -1,5 +1,8 @@ package com.xunhong.erp.turbo.api.biz.dto.qry; +import com.xunhong.erp.turbo.api.biz.dto.enums.PurchaseOrderAuditStateEnum; +import com.xunhong.erp.turbo.api.biz.dto.enums.PurchaseOrderStateEnum; +import com.xunhong.erp.turbo.api.biz.dto.enums.PurchaseOrderTypeEnum; import com.xunhong.erp.turbo.base.dto.Query; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; @@ -15,5 +18,26 @@ public class PurchaseOrderListQry extends Query { @Schema(title = "采购订单ID", type = "string") private Long orderId; + + @Schema(title = "采购订单编号", type = "string") + private String orderSn; + + /** + * 采购订单状态: 0_草稿;1_审核中;2_已完成;3_已驳回;4_已关闭; + */ + @Schema(title = "采购订单状态: 0_草稿;1_审核中;2_已完成;3_已驳回;4_已关闭;") + private PurchaseOrderStateEnum state; + + /** + * 采购单审核状态: 1_待报价审核;2_待老板审批;3_老板审批通过;4_报价审核驳回;5_老板审批驳回 + */ + @Schema(title = "采购单审核状态: 1_待报价审核;2_待老板审批;3_老板审批通过;4_报价审核驳回;5_老板审批驳回") + private PurchaseOrderAuditStateEnum auditState; + + /** + * 采购类型:1_产地采购;2_市场采购; + */ + @Schema(title = "采购类型:1_产地采购;2_市场采购;") + private PurchaseOrderTypeEnum type; } diff --git a/erp-turbo-common/erp-turbo-api/src/main/java/com/xunhong/erp/turbo/api/biz/dto/qry/PurchaseOrderPageQry.java b/erp-turbo-common/erp-turbo-api/src/main/java/com/xunhong/erp/turbo/api/biz/dto/qry/PurchaseOrderPageQry.java index 042f645..795dc6f 100644 --- a/erp-turbo-common/erp-turbo-api/src/main/java/com/xunhong/erp/turbo/api/biz/dto/qry/PurchaseOrderPageQry.java +++ b/erp-turbo-common/erp-turbo-api/src/main/java/com/xunhong/erp/turbo/api/biz/dto/qry/PurchaseOrderPageQry.java @@ -2,6 +2,7 @@ package com.xunhong.erp.turbo.api.biz.dto.qry; import com.xunhong.erp.turbo.api.biz.dto.enums.PurchaseOrderAuditStateEnum; import com.xunhong.erp.turbo.api.biz.dto.enums.PurchaseOrderStateEnum; +import com.xunhong.erp.turbo.api.biz.dto.enums.PurchaseOrderTypeEnum; import com.xunhong.erp.turbo.base.dto.PageQuery; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; @@ -36,6 +37,12 @@ public class PurchaseOrderPageQry extends PageQuery { @Schema(title = "采购单审核状态: 1_待报价审核;2_待老板审批;3_老板审批通过;4_报价审核驳回;5_老板审批驳回") private PurchaseOrderAuditStateEnum auditState; + /** + * 采购类型:1_产地采购;2_市场采购; + */ + @Schema(title = "采购类型:1_产地采购;2_市场采购;") + private PurchaseOrderTypeEnum type; + @Schema(title = "供应商名称", type = "string") private String supplierName; diff --git a/erp-turbo-common/erp-turbo-api/src/main/java/com/xunhong/erp/turbo/api/biz/dto/qry/PurchaseOrderShowQry.java b/erp-turbo-common/erp-turbo-api/src/main/java/com/xunhong/erp/turbo/api/biz/dto/qry/PurchaseOrderShowQry.java index 7d94e4e..511c4d3 100644 --- a/erp-turbo-common/erp-turbo-api/src/main/java/com/xunhong/erp/turbo/api/biz/dto/qry/PurchaseOrderShowQry.java +++ b/erp-turbo-common/erp-turbo-api/src/main/java/com/xunhong/erp/turbo/api/biz/dto/qry/PurchaseOrderShowQry.java @@ -1,5 +1,6 @@ package com.xunhong.erp.turbo.api.biz.dto.qry; +import com.xunhong.erp.turbo.api.biz.dto.enums.PurchaseOrderTypeEnum; import com.xunhong.erp.turbo.base.dto.Query; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; @@ -18,5 +19,11 @@ public class PurchaseOrderShowQry extends Query { @Schema(title = "采购订单发货ID", type = "string") private Long orderShipId; + + /** + * 采购类型:1_产地采购;2_市场采购; + */ + @Schema(title = "采购类型:1_产地采购;2_市场采购;") + private PurchaseOrderTypeEnum type; } diff --git a/erp-turbo-common/erp-turbo-api/src/main/java/com/xunhong/erp/turbo/api/biz/dto/qry/SupplierListQry.java b/erp-turbo-common/erp-turbo-api/src/main/java/com/xunhong/erp/turbo/api/biz/dto/qry/SupplierListQry.java index 9e54b93..1edf636 100644 --- a/erp-turbo-common/erp-turbo-api/src/main/java/com/xunhong/erp/turbo/api/biz/dto/qry/SupplierListQry.java +++ b/erp-turbo-common/erp-turbo-api/src/main/java/com/xunhong/erp/turbo/api/biz/dto/qry/SupplierListQry.java @@ -1,5 +1,6 @@ package com.xunhong.erp.turbo.api.biz.dto.qry; +import com.xunhong.erp.turbo.api.biz.dto.enums.SupplierTypeEnum; import com.xunhong.erp.turbo.base.dto.Query; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; @@ -19,6 +20,12 @@ public class SupplierListQry extends Query { @Schema(title = "供应商名称", type = "string") private String name; + /** + * 供应商类型:1_瓜农;2_档口; + */ + @Schema(title = "供应商类型:1_瓜农;2_档口;") + private SupplierTypeEnum type; + /** * 状态:1_启用;0_禁用; */ diff --git a/erp-turbo-common/erp-turbo-api/src/main/java/com/xunhong/erp/turbo/api/biz/dto/qry/SupplierPageQry.java b/erp-turbo-common/erp-turbo-api/src/main/java/com/xunhong/erp/turbo/api/biz/dto/qry/SupplierPageQry.java index 55195ab..66bd417 100644 --- a/erp-turbo-common/erp-turbo-api/src/main/java/com/xunhong/erp/turbo/api/biz/dto/qry/SupplierPageQry.java +++ b/erp-turbo-common/erp-turbo-api/src/main/java/com/xunhong/erp/turbo/api/biz/dto/qry/SupplierPageQry.java @@ -1,5 +1,6 @@ package com.xunhong.erp.turbo.api.biz.dto.qry; +import com.xunhong.erp.turbo.api.biz.dto.enums.SupplierTypeEnum; import com.xunhong.erp.turbo.base.dto.PageQuery; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; @@ -27,5 +28,11 @@ public class SupplierPageQry extends PageQuery { @Schema(title = "银行卡号", type = "string") private String bankCard; + + /** + * 供应商类型:1_瓜农;2_档口; + */ + @Schema(title = "供应商类型:1_瓜农;2_档口;") + private SupplierTypeEnum type; } diff --git a/erp-turbo-common/erp-turbo-api/src/main/java/com/xunhong/erp/turbo/api/biz/dto/vo/OrderSupplierVO.java b/erp-turbo-common/erp-turbo-api/src/main/java/com/xunhong/erp/turbo/api/biz/dto/vo/OrderSupplierVO.java index 52b7c69..fff2da0 100644 --- a/erp-turbo-common/erp-turbo-api/src/main/java/com/xunhong/erp/turbo/api/biz/dto/vo/OrderSupplierVO.java +++ b/erp-turbo-common/erp-turbo-api/src/main/java/com/xunhong/erp/turbo/api/biz/dto/vo/OrderSupplierVO.java @@ -6,6 +6,7 @@ import com.xunhong.erp.turbo.api.biz.dto.common.UploadFileItem; import com.xunhong.erp.turbo.api.biz.dto.enums.LoadingModeEnum; import com.xunhong.erp.turbo.api.biz.dto.enums.PurchaseOrderPricingMethodEnum; import com.xunhong.erp.turbo.api.biz.dto.enums.PurchaseOrderStateEnum; +import com.xunhong.erp.turbo.api.biz.dto.enums.SupplierTypeEnum; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; @@ -46,6 +47,12 @@ public class OrderSupplierVO extends DTO { @Schema(title = "供应商姓名", requiredMode = Schema.RequiredMode.REQUIRED) private String name; + /** + * 收款人姓名 + */ + @Schema(title = "收款人姓名", requiredMode = Schema.RequiredMode.REQUIRED) + private String payeeName; + /** * 身份证号 */ @@ -70,6 +77,12 @@ public class OrderSupplierVO extends DTO { @Schema(title = "微信二维码", requiredMode = Schema.RequiredMode.REQUIRED) private String wechatQr; + /** + * 供应商类型:1_瓜农;2_档口; + */ + @Schema(title = "供应商类型:1_瓜农;2_档口;", requiredMode = Schema.RequiredMode.REQUIRED) + private SupplierTypeEnum type; + /** * 是否最后一家 */ diff --git a/erp-turbo-common/erp-turbo-api/src/main/java/com/xunhong/erp/turbo/api/biz/dto/vo/PurchaseOrderVO.java b/erp-turbo-common/erp-turbo-api/src/main/java/com/xunhong/erp/turbo/api/biz/dto/vo/PurchaseOrderVO.java index 196de92..50c858b 100644 --- a/erp-turbo-common/erp-turbo-api/src/main/java/com/xunhong/erp/turbo/api/biz/dto/vo/PurchaseOrderVO.java +++ b/erp-turbo-common/erp-turbo-api/src/main/java/com/xunhong/erp/turbo/api/biz/dto/vo/PurchaseOrderVO.java @@ -6,6 +6,7 @@ import com.xunhong.erp.turbo.api.biz.dto.common.*; import com.xunhong.erp.turbo.api.biz.dto.enums.PurchaseOrderAuditStateEnum; import com.xunhong.erp.turbo.api.biz.dto.enums.PurchaseOrderPricingMethodEnum; import com.xunhong.erp.turbo.api.biz.dto.enums.PurchaseOrderStateEnum; +import com.xunhong.erp.turbo.api.biz.dto.enums.PurchaseOrderTypeEnum; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; @@ -76,6 +77,12 @@ public class PurchaseOrderVO extends DTO { @Schema(title = "采购单审核状态: 1_待报价审核;2_待老板审批;3_老板审批通过;4_报价审核驳回;5_老板审批驳回") private PurchaseOrderAuditStateEnum auditState; + /** + * 采购类型:1_产地采购;2_市场采购; + */ + @Schema(title = "采购类型:1_产地采购;2_市场采购;") + private PurchaseOrderTypeEnum type; + /** * 备注 */ diff --git a/erp-turbo-common/erp-turbo-api/src/main/java/com/xunhong/erp/turbo/api/biz/dto/vo/SupplierVO.java b/erp-turbo-common/erp-turbo-api/src/main/java/com/xunhong/erp/turbo/api/biz/dto/vo/SupplierVO.java index 4c85821..9c69c5c 100644 --- a/erp-turbo-common/erp-turbo-api/src/main/java/com/xunhong/erp/turbo/api/biz/dto/vo/SupplierVO.java +++ b/erp-turbo-common/erp-turbo-api/src/main/java/com/xunhong/erp/turbo/api/biz/dto/vo/SupplierVO.java @@ -1,6 +1,7 @@ package com.xunhong.erp.turbo.api.biz.dto.vo; import com.alibaba.cola.dto.DTO; +import com.xunhong.erp.turbo.api.biz.dto.enums.SupplierTypeEnum; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; @@ -27,16 +28,22 @@ public class SupplierVO extends DTO { @Schema(title = "姓名", requiredMode = Schema.RequiredMode.REQUIRED) private String name; + /** + * 收款人姓名 + */ + @Schema(title = "收款人姓名") + private String payeeName; + /** * 身份证号 */ - @Schema(title = "身份证号", requiredMode = Schema.RequiredMode.REQUIRED) + @Schema(title = "身份证号") private String idCard; /** * 手机号 */ - @Schema(title = "手机号", requiredMode = Schema.RequiredMode.REQUIRED) + @Schema(title = "手机号") private String phone; /** @@ -51,6 +58,12 @@ public class SupplierVO extends DTO { @Schema(title = "微信收款码URL") private String wechatQr; + /** + * 供应商类型:1_瓜农;2_档口; + */ + @Schema(title = "供应商类型:1_瓜农;2_档口;", requiredMode = Schema.RequiredMode.REQUIRED) + private SupplierTypeEnum type; + /** * 备注 */