订单明细

sd-business/src/main/java/com/sd/business/controller/order/OrderInfoController.java

@@ -168,6 +168,22 @@ public class OrderInfoController {
     }
 
     /**
+     * 已删除订单分页
+     */
+    @PostMapping("/deletedOrderPage")
+    public Page<OrderInfoVo> deletedOrderPage(@RequestBody OrderInfoSelectDto dto) {
+        return orderInfoService.deletedOrderPage(dto);
+    }
+
+    /**
+     * 已删除订单明细
+     */
+    @PostMapping("/deletedOrderDetail")
+    public OrderInfoVo deletedOrderDetail(@RequestBody BaseSelectDto dto) {
+        return orderInfoService.deletedOrderDetail(dto);
+    }
+
+    /**
      * 订单导出
      */
     @PostMapping("/orderExportExcel")

sd-business/src/main/java/com/sd/business/controller/order/OrderSkuController.java

@@ -1,7 +1,12 @@
 package com.sd.business.controller.order;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.sd.business.entity.order.dto.OrderSkuSelectDto;
+import com.sd.business.entity.order.vo.OrderSkuVo;
 import com.sd.business.service.order.OrderSkuService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -21,4 +26,12 @@ public class OrderSkuController {
     @Autowired
     private OrderSkuService orderSkuService;
 
+    /**
+     * 订单sku分页
+     */
+    @PostMapping("/page")
+    public Page<OrderSkuVo> page(@RequestBody OrderSkuSelectDto dto) {
+        return orderSkuService.getPage(dto);
+    }
+
 }

sd-business/src/main/java/com/sd/business/entity/order/dto/OrderSkuSelectDto.java

@@ -14,4 +14,49 @@ import lombok.Setter;
 @Setter
 public class OrderSkuSelectDto extends BaseSelectDto {
 
+    /**
+     * sku规格编码
+     */
+    private String skuSpecCode;
+
+    /**
+     * sku规格名称
+     */
+    private String skuSpecName;
+
+    /**
+     * bom规格名称
+     */
+    private String bomSpecName;
+
+    /**
+     * bom规格编码
+     */
+    private String bomSpecCode;
+
+    /**
+     * 订单号
+     */
+    private String orderCode;
+
+    /**
+     * 万里牛订单号
+     */
+    private String orderWlnCode;
+
+    /**
+     * 订单状态 {@link com.sd.business.entity.order.enums.OrderStatusEnum}
+     */
+    private Integer orderStatus;
+
+    /**
+     * 事业部名称
+     */
+    private String departmentName;
+
+    /**
+     * 事业部id
+     */
+    private Long departmentId;
+
 }

sd-business/src/main/java/com/sd/business/entity/order/vo/OrderSkuVo.java

@@ -4,6 +4,8 @@ import com.sd.business.entity.order.po.OrderSku;
 import lombok.Getter;
 import lombok.Setter;
 
+import java.math.BigDecimal;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -37,6 +39,41 @@ public class OrderSkuVo extends OrderSku {
     private String bomSpecName;
 
     /**
+     * 订单号
+     */
+    private String orderCode;
+
+    /**
+     * 万里牛订单号
+     */
+    private String orderWlnCode;
+
+    /**
+     * 订单状态 {@link com.sd.business.entity.order.enums.OrderStatusEnum}
+     */
+    private Integer orderStatus;
+
+    /**
+     * 订单结算状态 1未结算 2已对账 3已结算
+     */
+    private String orderSettlementStatus;
+
+    /**
+     * 订单总金额
+     */
+    private BigDecimal orderTotalAmount;
+
+    /**
+     * 下单时间
+     */
+    private Date wlnCreateTime;
+
+    /**
+     * 事业部名称
+     */
+    private String departmentName;
+
+    /**
      * 包材配件
      */
     private List<OrderSkuBomVo> orderSkuBomList;

sd-business/src/main/java/com/sd/business/service/order/OrderInfoService.java

@@ -1,6 +1,7 @@
 package com.sd.business.service.order;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.common.core.domain.BaseSelectDto;
 import com.ruoyi.common.core.service.BaseService;
 import com.sd.business.entity.order.dto.OrderInfoDto;
 import com.sd.business.entity.order.dto.OrderInfoSelectDto;
@@ -111,6 +112,16 @@ public interface OrderInfoService extends BaseService<OrderInfo> {
     List<OrderPackageBomVo> getSkuSpecPackageBomList(SkuSpecPackageBomDto dto);
 
     /**
+     * 已删除订单分页
+     */
+    Page<OrderInfoVo> deletedOrderPage(OrderInfoSelectDto dto);
+
+    /**
+     * 已删除订单明细
+     */
+    OrderInfoVo deletedOrderDetail(BaseSelectDto dto);
+
+    /**
      * 订单导出
      */
     void orderExportExcel(Long id);

sd-business/src/main/java/com/sd/business/service/order/OrderSkuService.java

@@ -1,7 +1,10 @@
 package com.sd.business.service.order;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ruoyi.common.core.service.BaseService;
+import com.sd.business.entity.order.dto.OrderSkuSelectDto;
 import com.sd.business.entity.order.po.OrderSku;
+import com.sd.business.entity.order.vo.OrderSkuVo;
 
 
 /**
@@ -14,4 +17,6 @@ import com.sd.business.entity.order.po.OrderSku;
  */
 public interface OrderSkuService extends BaseService<OrderSku> {
 
+    Page<OrderSkuVo> getPage(OrderSkuSelectDto dto);
+
 }

sd-business/src/main/java/com/sd/business/service/order/impl/OrderInfoServiceImpl.java

@@ -9,9 +9,11 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fjhx.file.utils.ObsFileUtil;
 import com.fjhx.flow.enums.FlowStatusEnum;
+import com.ruoyi.common.annotation.LogicIgnore;
 import com.ruoyi.common.constant.StatusConstant;
 import com.ruoyi.common.core.domain.BaseIdPo;
 import com.ruoyi.common.core.domain.BasePo;
+import com.ruoyi.common.core.domain.BaseSelectDto;
 import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.system.service.ISysRoleService;
@@ -1042,6 +1044,27 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
     }
 
     @Override
+    public Page<OrderInfoVo> deletedOrderPage(OrderInfoSelectDto dto) {
+        return Sql.create(OrderInfoVo.class)
+                .selectAll(OrderInfo.class)
+                .selectAs(Department::getName, OrderInfoVo::getDepartmentName)
+                .from(OrderInfo.class)
+                .leftJoin(Department.class, OrderInfo::getDepartmentId)
+                .orderByDesc(OrderInfo::getId)
+                .eq(Department::getId, dto.getDepartmentId())
+                .like(OrderInfo::getCode, dto.getCode())
+                .like(OrderInfo::getWlnCode, dto.getWlnCode())
+                .eq(OrderInfo::getDelFlag, StatusConstant.DELETED)
+                .page(dto);
+    }
+
+    @LogicIgnore
+    @Override
+    public OrderInfoVo deletedOrderDetail(BaseSelectDto dto) {
+        return detail(dto.getId());
+    }
+
+    @Override
     public void orderExportExcel(Long id) {
         OrderInfo orderInfo = this.getById(id);
         List<OrderSku> list = orderSkuService.list(q -> q.eq(OrderSku::getOrderId, id));

sd-business/src/main/java/com/sd/business/service/order/impl/OrderSkuServiceImpl.java

@@ -1,9 +1,18 @@
 package com.sd.business.service.order.impl;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.sd.business.entity.bom.po.BomSpec;
+import com.sd.business.entity.department.po.Department;
+import com.sd.business.entity.order.dto.OrderSkuSelectDto;
+import com.sd.business.entity.order.enums.OrderExceptionTypeEnum;
+import com.sd.business.entity.order.po.OrderInfo;
 import com.sd.business.entity.order.po.OrderSku;
+import com.sd.business.entity.order.vo.OrderSkuVo;
+import com.sd.business.entity.sku.po.SkuSpec;
 import com.sd.business.mapper.order.OrderSkuMapper;
 import com.sd.business.service.order.OrderSkuService;
+import com.sd.framework.util.sql.Sql;
 import org.springframework.stereotype.Service;
 
 
@@ -18,4 +27,43 @@ import org.springframework.stereotype.Service;
 @Service
 public class OrderSkuServiceImpl extends ServiceImpl<OrderSkuMapper, OrderSku> implements OrderSkuService {
 
+    @Override
+    public Page<OrderSkuVo> getPage(OrderSkuSelectDto dto) {
+
+        return Sql.create(OrderSkuVo.class)
+                .selectAll(OrderSku.class)
+                .selectAs(OrderInfo::getCode, OrderSkuVo::getOrderCode)
+                .selectAs(OrderInfo::getWlnCode, OrderSkuVo::getOrderWlnCode)
+                .selectAs(OrderInfo::getStatus, OrderSkuVo::getOrderStatus)
+                .selectAs(OrderInfo::getSettlementStatus, OrderSkuVo::getOrderSettlementStatus)
+                .selectAs(OrderInfo::getTotalAmount, OrderSkuVo::getOrderTotalAmount)
+                .selectAs(OrderInfo::getWlnCreateTime, OrderSkuVo::getWlnCreateTime)
+                .selectAs(SkuSpec::getCode, OrderSkuVo::getSkuSpecCode)
+                .selectAs(SkuSpec::getName, OrderSkuVo::getSkuSpecName)
+                .selectAs(BomSpec::getCode, OrderSkuVo::getBomSpecCode)
+                .selectAs(BomSpec::getName, OrderSkuVo::getBomSpecName)
+                .selectAs(Department::getName, OrderSkuVo::getDepartmentName)
+
+                .from(OrderSku.class)
+                .leftJoin(OrderInfo.class, OrderSku::getOrderId)
+                .leftJoin(SkuSpec.class, OrderSku::getSkuSpecId)
+                .leftJoin(BomSpec.class, OrderSku::getBomSpecId)
+                .leftJoin(Department.class, OrderInfo::getDepartmentId)
+
+                .orderByDesc(OrderSku::getId)
+                .eq(OrderInfo::getStatus, dto.getOrderStatus())
+                .eq(OrderInfo::getDepartmentId, dto.getDepartmentId())
+                .ge(OrderInfo::getWlnCreateTime, dto.getBeginTime())
+                .le(OrderInfo::getWlnCreateTime, dto.getEndTime())
+                .eq(OrderInfo::getExceptionType, OrderExceptionTypeEnum.NORMAL.getKey().toString())
+                .like(OrderInfo::getCode, dto.getOrderCode())
+                .like(OrderInfo::getWlnCode, dto.getOrderWlnCode())
+                .like(SkuSpec::getCode, dto.getSkuSpecCode())
+                .like(SkuSpec::getName, dto.getSkuSpecName())
+                .like(BomSpec::getCode, dto.getBomSpecCode())
+                .like(BomSpec::getName, dto.getBomSpecName())
+                .like(Department::getName, dto.getDepartmentName())
+                .page(dto);
+    }
+
 }