From 4302930fce83cda72be74711041e4673c89411aa Mon Sep 17 00:00:00 2001 From: starrysky <838252223@qq.com> Date: Tue, 5 May 2020 15:04:19 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E8=AE=A2=E5=8D=95=E7=8A=B6?= =?UTF-8?q?=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../customerOrder/domain/CustomerOrder.java | 4 + .../domain/CustomerOrderProduct.java | 4 + .../CustomerOrderProductRepository.java | 12 ++ .../repository/CustomerOrderRepository.java | 12 ++ .../service/dto/CustomerOrderDTO.java | 3 + .../impl/CustomerOrderServiceImpl.java | 3 + .../modules/wms/invoice/domain/Invoice.java | 3 + .../wms/invoice/domain/InvoiceProduct.java | 4 + .../repository/InvoiceProductRepository.java | 15 ++ .../invoice/repository/InvoiceRepository.java | 10 ++ .../service/dto/InvoiceProductDTO.java | 3 + .../service/impl/InvoiceServiceImpl.java | 133 +++++++++++++++++- .../main/java/me/zhengjie/utils/DateUtil.java | 17 +++ .../main/java/me/zhengjie/utils/PiciUtil.java | 14 ++ .../me/zhengjie/utils/ProcStatusEnum.java | 37 +++++ 15 files changed, 270 insertions(+), 4 deletions(-) create mode 100644 eladmin-tools/src/main/java/me/zhengjie/utils/DateUtil.java create mode 100644 eladmin-tools/src/main/java/me/zhengjie/utils/PiciUtil.java create mode 100644 eladmin-tools/src/main/java/me/zhengjie/utils/ProcStatusEnum.java diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/wms/customerOrder/domain/CustomerOrder.java b/eladmin-system/src/main/java/me/zhengjie/modules/wms/customerOrder/domain/CustomerOrder.java index 5b89a316..012d3882 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/wms/customerOrder/domain/CustomerOrder.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/wms/customerOrder/domain/CustomerOrder.java @@ -113,6 +113,10 @@ public class CustomerOrder implements Serializable { @Column(name = "complete_status") private Boolean completeStatus; + // 订单进展状态 + @Column(name = "proc_status") + private String procStatus; + public void copy(CustomerOrder source){ BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true)); } diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/wms/customerOrder/domain/CustomerOrderProduct.java b/eladmin-system/src/main/java/me/zhengjie/modules/wms/customerOrder/domain/CustomerOrderProduct.java index 7d0eb03a..f774999d 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/wms/customerOrder/domain/CustomerOrderProduct.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/wms/customerOrder/domain/CustomerOrderProduct.java @@ -27,6 +27,10 @@ public class CustomerOrderProduct implements Serializable { @Column(name = "customer_order_id") private Long customerOrderId; + // 所属客户订单 + @Column(name = "customer_order_code") + private Long customerOrderCode; + // 产品主键 @Column(name = "product_id") private Long productId; diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/wms/customerOrder/repository/CustomerOrderProductRepository.java b/eladmin-system/src/main/java/me/zhengjie/modules/wms/customerOrder/repository/CustomerOrderProductRepository.java index 036eca25..b429647c 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/wms/customerOrder/repository/CustomerOrderProductRepository.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/wms/customerOrder/repository/CustomerOrderProductRepository.java @@ -14,8 +14,20 @@ import java.util.List; */ public interface CustomerOrderProductRepository extends JpaRepository, JpaSpecificationExecutor { + /** + * 根据客户订单id查看客户订单对应的所有产品 + * @param customerOrderId + * @return + */ List findByCustomerOrderIdAndStatusTrue(Long customerOrderId); + /** + * 根据客户订单编号查询客户订单对应的所有产品信息 + * @param customerOrderCode + * @return + */ + List findByCustomerOrderCodeAndStatusTrue(String customerOrderCode); + /** * 根据产品code以及客户订单id删除订单中对应的产品信息 * @param productCode diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/wms/customerOrder/repository/CustomerOrderRepository.java b/eladmin-system/src/main/java/me/zhengjie/modules/wms/customerOrder/repository/CustomerOrderRepository.java index 9da9558e..695c1c0a 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/wms/customerOrder/repository/CustomerOrderRepository.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/wms/customerOrder/repository/CustomerOrderRepository.java @@ -1,6 +1,7 @@ package me.zhengjie.modules.wms.customerOrder.repository; import me.zhengjie.modules.wms.customerOrder.domain.CustomerOrder; +import me.zhengjie.modules.wms.customerOrder.domain.CustomerOrderProduct; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.JpaSpecificationExecutor; import org.springframework.data.jpa.repository.Modifying; @@ -29,4 +30,15 @@ public interface CustomerOrderRepository extends JpaRepository customerOrderProductList; + // 订单紧张状态 + private String procStatus; + public void copy(CustomerOrderDTO source){ BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true)); } diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/wms/customerOrder/service/impl/CustomerOrderServiceImpl.java b/eladmin-system/src/main/java/me/zhengjie/modules/wms/customerOrder/service/impl/CustomerOrderServiceImpl.java index 6a0157bf..8c232ebb 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/wms/customerOrder/service/impl/CustomerOrderServiceImpl.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/wms/customerOrder/service/impl/CustomerOrderServiceImpl.java @@ -226,6 +226,9 @@ public class CustomerOrderServiceImpl implements CustomerOrderService { } customerOrder.setTotalMoney(totalMoney); + customerOrder.setCompleteStatus(false); + // 录入订单的时候是等待发货 + customerOrder.setProcStatus(ProcStatusEnum.WAIT_SEND_GOOD.getCode()); customerOrderRepository.save(customerOrder); customerOrderProductRepository.saveAll(customerOrderProductList); diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/wms/invoice/domain/Invoice.java b/eladmin-system/src/main/java/me/zhengjie/modules/wms/invoice/domain/Invoice.java index cf0bac44..86d5790c 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/wms/invoice/domain/Invoice.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/wms/invoice/domain/Invoice.java @@ -77,6 +77,9 @@ public class Invoice implements Serializable { @Column(name = "customer_name") private String customerName; + @Column(name = "pi_ci") + private String pici; + public void copy(Invoice source){ BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true)); } diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/wms/invoice/domain/InvoiceProduct.java b/eladmin-system/src/main/java/me/zhengjie/modules/wms/invoice/domain/InvoiceProduct.java index b368e9f3..4b0ec104 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/wms/invoice/domain/InvoiceProduct.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/wms/invoice/domain/InvoiceProduct.java @@ -76,6 +76,10 @@ public class InvoiceProduct implements Serializable { @Column(name = "invoice_id") private Long invoiceId; + // 客户订单编号 + @Column(name = "customer_order_code") + private String customerOrderCode; + public void copy(InvoiceProduct source){ BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true)); } diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/wms/invoice/repository/InvoiceProductRepository.java b/eladmin-system/src/main/java/me/zhengjie/modules/wms/invoice/repository/InvoiceProductRepository.java index 4dfe9ddc..4d14664f 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/wms/invoice/repository/InvoiceProductRepository.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/wms/invoice/repository/InvoiceProductRepository.java @@ -16,6 +16,21 @@ public interface InvoiceProductRepository extends JpaRepository findByInvoiceIdAndStatusTrue(Long invoiceId); + /** + * 根据销售发货单编号编号查询所有产品 + * @param invoicCode + * @return + */ + List findByInvoiceCodeAndStatusTrue(String invoicCode); + + /** + * 根据客户订单编号查询所有销售发货单对应的产品 + * @param customerOrderCode + * @return + */ + List findByCustomerOrderCodeAndStatusTrue(String customerOrderCode); + + @Modifying @Query(value = "update s_invoice_product set status = 0 where invoice_id = ?1", nativeQuery = true) void deleteInvoiceProduct(long invoiceId); diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/wms/invoice/repository/InvoiceRepository.java b/eladmin-system/src/main/java/me/zhengjie/modules/wms/invoice/repository/InvoiceRepository.java index 74cd4025..e39da7e4 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/wms/invoice/repository/InvoiceRepository.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/wms/invoice/repository/InvoiceRepository.java @@ -1,11 +1,14 @@ package me.zhengjie.modules.wms.invoice.repository; import me.zhengjie.modules.wms.invoice.domain.Invoice; +import me.zhengjie.modules.wms.invoice.service.dto.InvoiceDetailDTO; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.JpaSpecificationExecutor; import org.springframework.data.jpa.repository.Modifying; import org.springframework.data.jpa.repository.Query; +import java.util.List; + /** * @author jie * @date 2019-08-27 @@ -14,6 +17,13 @@ public interface InvoiceRepository extends JpaRepository, JpaSpec Invoice findBySaleInvoiceCode(String saleInvoiceCode); + /** + * 根据客户订单编号查看客户订单 + * @param customerOrderCode + * @return + */ + List findByCustomerOrderCodeAndStatusTrue(String customerOrderCode); + @Modifying @Query(value = "update s_invoice set status = 0 where id = ?1", nativeQuery = true) void deleteInvoice(long invoiceId); diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/wms/invoice/service/dto/InvoiceProductDTO.java b/eladmin-system/src/main/java/me/zhengjie/modules/wms/invoice/service/dto/InvoiceProductDTO.java index efb02928..423b21a5 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/wms/invoice/service/dto/InvoiceProductDTO.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/wms/invoice/service/dto/InvoiceProductDTO.java @@ -38,6 +38,9 @@ public class InvoiceProductDTO implements Serializable { // 订单数量 private Long customerOrderNumber; + // 备注：为了前端方便，特意加上这个字段，因为客户订单里面的产品数量用的这个，销售发货单里面改了字段名字叫customerOrderNumber 所以 customerOrderNumber = productNumber + private Long productNumber; + // 实际发货单数量 private Long actualInvoiceNumber; diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/wms/invoice/service/impl/InvoiceServiceImpl.java b/eladmin-system/src/main/java/me/zhengjie/modules/wms/invoice/service/impl/InvoiceServiceImpl.java index 13afecc6..ddc8849c 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/wms/invoice/service/impl/InvoiceServiceImpl.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/wms/invoice/service/impl/InvoiceServiceImpl.java @@ -1,5 +1,6 @@ package me.zhengjie.modules.wms.invoice.service.impl; +import com.google.gson.Gson; import lombok.extern.slf4j.Slf4j; import me.zhengjie.exception.BadRequestException; import me.zhengjie.modules.system.cons.MessageModulePath; @@ -18,6 +19,8 @@ import me.zhengjie.modules.wms.bd.repository.CustomerInfoRepository; import me.zhengjie.modules.wms.bd.repository.ProductInfoRepository; import me.zhengjie.modules.wms.customerOrder.domain.CustomerOrder; import me.zhengjie.modules.wms.customerOrder.domain.CustomerOrderProduct; +import me.zhengjie.modules.wms.customerOrder.repository.CustomerOrderProductRepository; +import me.zhengjie.modules.wms.customerOrder.repository.CustomerOrderRepository; import me.zhengjie.modules.wms.customerOrder.request.CustomerOrderProductRequest; import me.zhengjie.modules.wms.customerOrder.service.dto.CustomerOrderDTO; import me.zhengjie.modules.wms.customerOrder.service.dto.CustomerOrderProductDTO; @@ -29,8 +32,7 @@ import me.zhengjie.modules.wms.invoice.request.UpdateInvoiceRequest; import me.zhengjie.modules.wms.invoice.service.dto.InvoiceDetailDTO; import me.zhengjie.modules.wms.invoice.service.dto.InvoiceProductDTO; import me.zhengjie.modules.wms.invoice.service.mapper.InvoiceProductMapper; -import me.zhengjie.utils.SecurityUtils; -import me.zhengjie.utils.ValidationUtil; +import me.zhengjie.utils.*; import me.zhengjie.modules.wms.invoice.repository.InvoiceRepository; import me.zhengjie.modules.wms.invoice.service.InvoiceService; import me.zhengjie.modules.wms.invoice.service.dto.InvoiceDTO; @@ -48,11 +50,10 @@ import java.text.SimpleDateFormat; import java.util.*; import java.util.function.Function; import java.util.stream.Collectors; +import java.util.stream.LongStream; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; -import me.zhengjie.utils.PageUtil; -import me.zhengjie.utils.QueryHelp; import org.springframework.util.CollectionUtils; import org.springframework.util.StringUtils; @@ -79,6 +80,12 @@ public class InvoiceServiceImpl implements InvoiceService { @Autowired private CustomerInfoRepository customerInfoRepository; + @Autowired + private CustomerOrderRepository customerOrderRepository; + + @Autowired + private CustomerOrderProductRepository customerOrderProductRepository; + @Autowired private InvoiceProductMapper invoiceProductMapper; @@ -166,6 +173,9 @@ public class InvoiceServiceImpl implements InvoiceService { List invoiceProductList = invoiceProductRepository.findByInvoiceIdAndStatusTrue(id); if(!CollectionUtils.isEmpty(invoiceProductList)){ List invoiceProductDTOList = invoiceProductMapper.toDto(invoiceProductList); + for(InvoiceProductDTO invoiceProductDTO : invoiceProductDTOList){ + invoiceProductDTO.setProductNumber(invoiceProductDTO.getCustomerOrderNumber()); + } invoiceDetailDTO.setInvoiceProductDTOList(invoiceProductDTOList); } return invoiceDetailDTO; @@ -257,6 +267,7 @@ public class InvoiceServiceImpl implements InvoiceService { BeanUtils.copyProperties(createInvoiceRequest, invoice); invoice.setStatus(true); + invoice.setPici(PiciUtil.initPici(customerOrderCode)); invoiceRepository.save(invoice); invoice = invoiceRepository.findBySaleInvoiceCode(saleInvoiceCode); InvoiceDTO invoiceDTO = invoiceMapper.toDto(invoice); @@ -272,17 +283,30 @@ public class InvoiceServiceImpl implements InvoiceService { if(null == productInfo){ throw new BadRequestException("产品编号" + productInfo.getProductCode() + "对应的产品不存在!"); } + invoiceProduct.setCustomerOrderCode(customerOrderCode); invoiceProduct.setProductId(productInfo.getId()); invoiceProductRepository.save(invoiceProduct); } List invoiceProductList = invoiceProductRepository.findByInvoiceIdAndStatusTrue(invoice.getId()); List invoiceProductDTOList = invoiceProductMapper.toDto(invoiceProductList); + for(InvoiceProductDTO invoiceProductDTO : invoiceProductDTOList){ + invoiceProductDTO.setProductNumber(invoiceProductDTO.getCustomerOrderNumber()); + } InvoiceDetailDTO invoiceDetailDTO = new InvoiceDetailDTO(); BeanUtils.copyProperties(invoiceDTO, invoiceDetailDTO); invoiceDetailDTO.setInvoiceProductDTOList(invoiceProductDTOList); + /** + * 判断客户订单是否完成 + * 查看客户订单所有的商品以及数量 + * 查看该订单的所有发货单数量， + * 比较是否完成 + */ + + + /** * 新增消息通知 */ @@ -309,6 +333,47 @@ public class InvoiceServiceImpl implements InvoiceService { } messageRepository.saveAll(messageList); } + + // 查看发货单的数量是否根订单数量一致，如果一致则订单已发货，如果 + Map existProduct = new HashMap<>(); + List existProductList = invoiceProductRepository.findByCustomerOrderCodeAndStatusTrue(customerOrderCode); + if(!CollectionUtils.isEmpty(existProductList)){ + Map> existProductMap = existProductList.stream().collect(Collectors.groupingBy(InvoiceProduct::getProductCode)); + for(Map.Entry> entry : existProductMap.entrySet()){ + String productCode = entry.getKey(); + List invoiceProductListTemp = entry.getValue(); + if(!CollectionUtils.isEmpty(invoiceProductListTemp)){ + Long productNumberTotal = invoiceProductListTemp.stream().mapToLong(InvoiceProduct::getActualInvoiceNumber).sum(); + existProduct.put(productCode, productNumberTotal); + } + } + } + Map sourceProduct = new HashMap<>(); + List sourceProductList = customerOrderProductRepository.findByCustomerOrderCodeAndStatusTrue(customerOrderCode); + if(!CollectionUtils.isEmpty(sourceProductList)){ + Map> sourceProductMap = sourceProductList.stream().collect(Collectors.groupingBy(CustomerOrderProduct::getProductCode)); + for(Map.Entry> entry : sourceProductMap.entrySet()){ + String productCode = entry.getKey(); + List customerOrderProductListTemp = entry.getValue(); + if(!CollectionUtils.isEmpty(customerOrderProductListTemp)){ + Long productNumberTotal = customerOrderProductListTemp.stream().mapToLong(CustomerOrderProduct::getProductNumber).sum(); + sourceProduct.put(productCode, productNumberTotal); + } + } + } + + if(!CollectionUtils.isEmpty(sourceProduct)){ + for(Map.Entry entry : sourceProduct.entrySet()){ + String productCodeTemp = entry.getKey(); + long productNumberTemp = entry.getValue(); + long productNumberTempExist = existProduct.get(productCodeTemp); + if(productNumberTemp == productNumberTempExist || productNumberTemp > productNumberTempExist){ + customerOrderRepository.updateProcStatus(ProcStatusEnum.COMPLETED.getCode()); + }else{ + customerOrderRepository.updateProcStatus(ProcStatusEnum.SENDING_GOOD.getCode()); + } + } + } }catch (Exception e){ log.error("单据编号:插入消息失败!"); } @@ -403,4 +468,64 @@ public class InvoiceServiceImpl implements InvoiceService { invoiceRepository.deleteInvoice(id); invoiceProductRepository.deleteInvoiceProduct(id); } + + /** + * 处理当前客户订单的完成状态 + * @param customerOrderCode + */ + public void dealCustomerOrderCompleteStatus(String customerOrderCode){ + if(!StringUtils.isEmpty(customerOrderCode)){ + List customerOrderProductList = customerOrderProductRepository.findByCustomerOrderCodeAndStatusTrue(customerOrderCode); + if(!CollectionUtils.isEmpty(customerOrderProductList)){ + Map customerOrderProductMap = customerOrderProductList.stream().collect(Collectors.toMap(CustomerOrderProduct::getProductCode, a -> a, (k1, k2) -> k1)); + + // 查看客户订单对应销售发货单所有产品 + List invoiceProductList = invoiceProductRepository.findByCustomerOrderCodeAndStatusTrue(customerOrderCode); + if(!CollectionUtils.isEmpty(invoiceProductList)){ + // 销售发货单产品集合，key为产品，value为产品集合 +// Map> invoiceProductMap = invoiceProductList.stream().collect(Collectors.groupingBy(InvoiceProduct::getProductCode)); + Map existProductNumnerMap = new HashMap<>(); +// invoiceProductList.forEach(invoiceProduct -> existProductNumnerMap.computeIfPresent(invoiceProduct.getCustomerOrderCode(), invoiceProduct.getCustomerOrderNumber())); + } + } + } + } + + public static void main(String[] args) { + List invoiceProductList = new ArrayList<>(); + + InvoiceProduct invoiceProduct = new InvoiceProduct(); + invoiceProduct.setProductCode("01001"); + invoiceProduct.setCustomerOrderNumber(10L); + invoiceProductList.add(invoiceProduct); + + + InvoiceProduct invoiceProduct2 = new InvoiceProduct(); + invoiceProduct2.setProductCode("01001"); + invoiceProduct2.setCustomerOrderNumber(10L); + invoiceProductList.add(invoiceProduct2); + + + + Map targetMap = new HashMap<>(); + + invoiceProductList.forEach(item->{ + System.out.println(item.getProductCode() + ":" + item.getCustomerOrderNumber()); + + Long tempNum = targetMap.computeIfAbsent(item.getProductCode(), (k) ->{ + Long tempNumber = null == targetMap.get(k)?0L:targetMap.get(k); + tempNumber += item.getCustomerOrderNumber(); + return tempNumber; + + }); + + + targetMap.put(item.getProductCode(), tempNum); + System.out.println(tempNum); + }); + + + System.out.println(new Gson().toJson(targetMap)); + + } } \ No newline at end of file diff --git a/eladmin-tools/src/main/java/me/zhengjie/utils/DateUtil.java b/eladmin-tools/src/main/java/me/zhengjie/utils/DateUtil.java new file mode 100644 index 00000000..06763a06 --- /dev/null +++ b/eladmin-tools/src/main/java/me/zhengjie/utils/DateUtil.java @@ -0,0 +1,17 @@ +package me.zhengjie.utils; + +import java.text.SimpleDateFormat; +import java.util.Date; + +/** + * @author 黄星星 + * @date 2020-03-27 + */ +public class DateUtil { + public static String format_yyyyMMddHHmmss = "yyyy-MM-dd HH:mm:ss"; + + public static String parseToStr(Date date, String format){ + SimpleDateFormat sdf = new SimpleDateFormat(format); + return sdf.format(date); + } +} diff --git a/eladmin-tools/src/main/java/me/zhengjie/utils/PiciUtil.java b/eladmin-tools/src/main/java/me/zhengjie/utils/PiciUtil.java new file mode 100644 index 00000000..b2395cf0 --- /dev/null +++ b/eladmin-tools/src/main/java/me/zhengjie/utils/PiciUtil.java @@ -0,0 +1,14 @@ +package me.zhengjie.utils; + +import java.util.Date; + +/** + * @author 黄星星 + * @date 2020-03-27 + */ +public class PiciUtil { + + public static String initPici(String code){ + return code + "_" + DateUtil.parseToStr(new Date(), DateUtil.format_yyyyMMddHHmmss); + } +} diff --git a/eladmin-tools/src/main/java/me/zhengjie/utils/ProcStatusEnum.java b/eladmin-tools/src/main/java/me/zhengjie/utils/ProcStatusEnum.java new file mode 100644 index 00000000..05e7cca1 --- /dev/null +++ b/eladmin-tools/src/main/java/me/zhengjie/utils/ProcStatusEnum.java @@ -0,0 +1,37 @@ +package me.zhengjie.utils; + +/** + * @author 黄星星 + * @date 2020-05-05 + */ +public enum ProcStatusEnum { + WAIT_SEND_GOOD("等待发货", "WAIT_SEND_GOOD"), + SENDING_GOOD("发货中", "SENDING_GOOD"), + COMPLETED("已完结", "COMPLETED"), + ; + + private String name; + + private String code; + + ProcStatusEnum(String name, String code) { + this.name = name; + this.code = code; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getCode() { + return code; + } + + public void setCode(String code) { + this.code = code; + } +}