From 9bfe11af522ac2038065904b22d6069a48c802b9 Mon Sep 17 00:00:00 2001 From: starrysky <838252223@qq.com> Date: Tue, 5 May 2020 20:19:37 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E8=AE=A2=E5=8D=95=E6=90=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/dto/CustomerOrderDTO.java | 3 +++ .../dto/CustomerOrderQueryCriteria.java | 6 ++++++ .../service/impl/CustomerOrderServiceImpl.java | 18 ++++++++++++++++++ .../wms/invoice/domain/InvoiceProduct.java | 1 + .../repository/InvoiceProductRepository.java | 2 +- .../domain/OutSourceProcessSheet.java | 4 ++++ .../service/dto/OutSourceProcessSheetDTO.java | 5 +++++ ...SourceInspectionCertificateServiceImpl.java | 2 ++ .../impl/OutSourceProcessSheetServiceImpl.java | 6 ++---- .../main/resources/config/application-dev.yml | 2 +- .../main/resources/config/application-prod.yml | 2 +- .../java/me/zhengjie/utils/ProcStatusEnum.java | 12 ++++++++++++ 12 files changed, 56 insertions(+), 7 deletions(-) diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/wms/customerOrder/service/dto/CustomerOrderDTO.java b/eladmin-system/src/main/java/me/zhengjie/modules/wms/customerOrder/service/dto/CustomerOrderDTO.java index 7bcca3e0..a9db1bfa 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/wms/customerOrder/service/dto/CustomerOrderDTO.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/wms/customerOrder/service/dto/CustomerOrderDTO.java @@ -85,6 +85,9 @@ public class CustomerOrderDTO implements Serializable { // 订单紧张状态 private String procStatus; + // 订单状态名称 + private String procStatusName; + 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/dto/CustomerOrderQueryCriteria.java b/eladmin-system/src/main/java/me/zhengjie/modules/wms/customerOrder/service/dto/CustomerOrderQueryCriteria.java index f016adaa..33627fc3 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/wms/customerOrder/service/dto/CustomerOrderQueryCriteria.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/wms/customerOrder/service/dto/CustomerOrderQueryCriteria.java @@ -10,4 +10,10 @@ import me.zhengjie.annotation.Query; */ @Data public class CustomerOrderQueryCriteria { + + // 客户订单编号 + private String customerOrderCode; + + // 客户名称 + private String customerName; } \ No newline at end of file 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 8c232ebb..7f415e2d 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 @@ -109,6 +109,17 @@ public class CustomerOrderServiceImpl implements CustomerOrderService { Predicate statusPredicate = criteriaBuilder.equal(root.get("status"), 1); targetPredicateList.add(statusPredicate); + + if(!StringUtils.isEmpty(criteria.getCustomerOrderCode())){ + Predicate customerOrderCodePredicate = criteriaBuilder.equal(root.get("customerOrderCode"), criteria.getCustomerOrderCode()); + targetPredicateList.add(customerOrderCodePredicate); + } + + if(!StringUtils.isEmpty(criteria.getCustomerName())){ + Predicate customerNamePredicate = criteriaBuilder.equal(root.get("customerName"), criteria.getCustomerName()); + targetPredicateList.add(customerNamePredicate); + } + criteriaQuery.orderBy(criteriaBuilder.desc(root.get("createTime"))); if(CollectionUtils.isEmpty(targetPredicateList)){ @@ -119,6 +130,7 @@ public class CustomerOrderServiceImpl implements CustomerOrderService { } }; Page page = customerOrderRepository.findAll(specification, pageable); + Page customerOrderDTOPage = page.map(customerOrderMapper::toDto); if(null != customerOrderDTOPage){ List customerOrderDTOList = customerOrderDTOPage.getContent(); @@ -129,6 +141,12 @@ public class CustomerOrderServiceImpl implements CustomerOrderService { Timestamp createTime = customerOrderDTO.getCreateTime(); customerOrderDTO.setCreateTimeStr(new SimpleDateFormat("yyyy-MM-dd").format(createTime)); customerOrderDTO.setCustomerOrderProductList(customerOrderProductDTOList); + String procStatus = customerOrderDTO.getProcStatus(); + ProcStatusEnum procStatusEnum = ProcStatusEnum.getProcStatusEnum(procStatus); + if(null != procStatusEnum){ + customerOrderDTO.setProcStatusName(procStatusEnum.getName()); + } + } } } 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 4b0ec104..0d075f77 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 @@ -73,6 +73,7 @@ public class InvoiceProduct implements Serializable { @Column(name = "remark") private String remark; + // 销售发货单id @Column(name = "invoice_id") private Long invoiceId; 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 4d14664f..c87f118f 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 @@ -21,7 +21,7 @@ public interface InvoiceProductRepository extends JpaRepository findByInvoiceCodeAndStatusTrue(String invoicCode); + List findByInvoiceIdAndStatusTrue(String invoicCode); /** * 根据客户订单编号查询所有销售发货单对应的产品 diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/wms/outSourceProductSheet/domain/OutSourceProcessSheet.java b/eladmin-system/src/main/java/me/zhengjie/modules/wms/outSourceProductSheet/domain/OutSourceProcessSheet.java index 25a52a55..348e7053 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/wms/outSourceProductSheet/domain/OutSourceProcessSheet.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/wms/outSourceProductSheet/domain/OutSourceProcessSheet.java @@ -62,6 +62,10 @@ OutSourceProcessSheet implements Serializable { @Column(name = "out_source_process_sheet_code") private String outSourceProcessSheetCode; + // 委外加工单状态 + @Column(name = "proc_status") + private String procStatus; + public void copy(OutSourceProcessSheet source){ BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true)); } diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/wms/outSourceProductSheet/service/dto/OutSourceProcessSheetDTO.java b/eladmin-system/src/main/java/me/zhengjie/modules/wms/outSourceProductSheet/service/dto/OutSourceProcessSheetDTO.java index 3e7dbe7d..46d6e3e4 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/wms/outSourceProductSheet/service/dto/OutSourceProcessSheetDTO.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/wms/outSourceProductSheet/service/dto/OutSourceProcessSheetDTO.java @@ -47,4 +47,9 @@ public class OutSourceProcessSheetDTO implements Serializable { // 委外加工单产品信息 private List outSourceProcessSheetProductList; + + // 委外加工单状态 + private String procStatus; + + private String procStatusName; } \ No newline at end of file diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/wms/outSourceProductSheet/service/impl/OutSourceInspectionCertificateServiceImpl.java b/eladmin-system/src/main/java/me/zhengjie/modules/wms/outSourceProductSheet/service/impl/OutSourceInspectionCertificateServiceImpl.java index 4793e3f0..fde39c04 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/wms/outSourceProductSheet/service/impl/OutSourceInspectionCertificateServiceImpl.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/wms/outSourceProductSheet/service/impl/OutSourceInspectionCertificateServiceImpl.java @@ -216,6 +216,8 @@ public class OutSourceInspectionCertificateServiceImpl implements OutSourceInspe } messageRepository.saveAll(messageList); } + + // 修改为外加工单状态 }catch (Exception e){ log.error("单据编号:插入消息失败!"); } diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/wms/outSourceProductSheet/service/impl/OutSourceProcessSheetServiceImpl.java b/eladmin-system/src/main/java/me/zhengjie/modules/wms/outSourceProductSheet/service/impl/OutSourceProcessSheetServiceImpl.java index 56f7975b..c51f8f35 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/wms/outSourceProductSheet/service/impl/OutSourceProcessSheetServiceImpl.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/wms/outSourceProductSheet/service/impl/OutSourceProcessSheetServiceImpl.java @@ -26,8 +26,7 @@ import me.zhengjie.modules.wms.outSourceProductSheet.request.QueryOutSourceProce import me.zhengjie.modules.wms.outSourceProductSheet.request.UpdateOutSourceProcessSheetRequest; import me.zhengjie.modules.wms.outSourceProductSheet.service.dto.OutSourceProcessSheetProductDTO; import me.zhengjie.modules.wms.outSourceProductSheet.service.mapper.OutSourceProcessSheetProductMapper; -import me.zhengjie.utils.SecurityUtils; -import me.zhengjie.utils.ValidationUtil; +import me.zhengjie.utils.*; import me.zhengjie.modules.wms.outSourceProductSheet.repository.OutSourceProcessSheetRepository; import me.zhengjie.modules.wms.outSourceProductSheet.service.OutSourceProcessSheetService; import me.zhengjie.modules.wms.outSourceProductSheet.service.dto.OutSourceProcessSheetDTO; @@ -52,8 +51,6 @@ import java.util.stream.Collectors; 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; @@ -186,6 +183,7 @@ public class OutSourceProcessSheetServiceImpl implements OutSourceProcessSheetSe } outSourceProcessSheet.setStatus(true); + outSourceProcessSheet.setProcStatus(ProcStatusEnum.OUT_SOURCE_ING.getCode()); // 新增委外加工单 outSourceProcessSheetRepository.save(outSourceProcessSheet); diff --git a/eladmin-system/src/main/resources/config/application-dev.yml b/eladmin-system/src/main/resources/config/application-dev.yml index cd4d4376..2d5afe38 100644 --- a/eladmin-system/src/main/resources/config/application-dev.yml +++ b/eladmin-system/src/main/resources/config/application-dev.yml @@ -4,7 +4,7 @@ spring: druid: type: com.alibaba.druid.pool.DruidDataSource driverClassName: net.sf.log4jdbc.sql.jdbcapi.DriverSpy - url: jdbc:log4jdbc:mysql://47.103.159.227:3306/eladmin?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false + url: jdbc:log4jdbc:mysql://rm-uf6xgp37n61jn71x5ao.mysql.rds.aliyuncs.com:3306/eladmin?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false username: hecate password: hxx2751085Qwe! diff --git a/eladmin-system/src/main/resources/config/application-prod.yml b/eladmin-system/src/main/resources/config/application-prod.yml index 9e172ca1..5fea5a6d 100644 --- a/eladmin-system/src/main/resources/config/application-prod.yml +++ b/eladmin-system/src/main/resources/config/application-prod.yml @@ -4,7 +4,7 @@ spring: druid: type: com.alibaba.druid.pool.DruidDataSource driverClassName: net.sf.log4jdbc.sql.jdbcapi.DriverSpy - url: jdbc:log4jdbc:mysql://47.103.159.227:3306/eladmin?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false + url: jdbc:log4jdbc:mysql://rm-uf6xgp37n61jn71x5ao.mysql.rds.aliyuncs.com:3306/eladmin?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false username: hecate password: hxx2751085Qwe! diff --git a/eladmin-tools/src/main/java/me/zhengjie/utils/ProcStatusEnum.java b/eladmin-tools/src/main/java/me/zhengjie/utils/ProcStatusEnum.java index 05e7cca1..fccc5e06 100644 --- a/eladmin-tools/src/main/java/me/zhengjie/utils/ProcStatusEnum.java +++ b/eladmin-tools/src/main/java/me/zhengjie/utils/ProcStatusEnum.java @@ -8,6 +8,8 @@ public enum ProcStatusEnum { WAIT_SEND_GOOD("等待发货", "WAIT_SEND_GOOD"), SENDING_GOOD("发货中", "SENDING_GOOD"), COMPLETED("已完结", "COMPLETED"), + + OUT_SOURCE_ING("委外中", "OUT_SOURCE_ING") ; private String name; @@ -34,4 +36,14 @@ public enum ProcStatusEnum { public void setCode(String code) { this.code = code; } + + public static ProcStatusEnum getProcStatusEnum(String code) { + ProcStatusEnum[] funcEnums = values(); + for (ProcStatusEnum funcEnum : funcEnums) { + if (funcEnum.getCode().equals(code)) { + return funcEnum; + } + } + return null; + } }