生产备料出库

sd-business/src/main/java/com/sd/business/entity/production/dto/ProductionWorkOrderSelectDto.java

@@ -14,4 +14,44 @@ import lombok.Setter;
 @Setter
 public class ProductionWorkOrderSelectDto extends BaseSelectDto {
 
+    /**
+     * 订单号
+     */
+    private String orderCode;
+
+    /**
+     * 订单万里牛单号
+     */
+    private String orderWlnCode;
+
+    /**
+     * sku规格品号
+     */
+    private String skuSpecCode;
+
+    /**
+     * sku规格品名
+     */
+    private String skuSpecName;
+
+    /**
+     * bom规格品号
+     */
+    private String bomSpecCode;
+
+    /**
+     * bom规格品名
+     */
+    private String bomSpecName;
+
+    /**
+     * 打印 1单面 2 双面
+     */
+    private Integer printType;
+
+    /**
+     * 工单号
+     */
+    private String productionWorkOrderCode;
+
 }

sd-business/src/main/java/com/sd/business/entity/production/vo/ProductionWorkOrderVo.java

@@ -14,4 +14,39 @@ import lombok.Setter;
 @Setter
 public class ProductionWorkOrderVo extends ProductionWorkOrder {
 
+    /**
+     * 订单号
+     */
+    private String orderCode;
+
+    /**
+     * 订单万里牛单号
+     */
+    private String orderWlnCode;
+
+    /**
+     * sku规格品号
+     */
+    private String skuSpecCode;
+
+    /**
+     * sku规格品名
+     */
+    private String skuSpecName;
+
+    /**
+     * bom规格品号
+     */
+    private String bomSpecCode;
+
+    /**
+     * bom规格品名
+     */
+    private String bomSpecName;
+
+    /**
+     * 打印 1单面 2 双面
+     */
+    private Integer printType;
+
 }

sd-business/src/main/java/com/sd/business/service/production/impl/ProductionWorkOrderServiceImpl.java

@@ -3,9 +3,13 @@ package com.sd.business.service.production.impl;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ruoyi.common.utils.wrapper.IWrapper;
+import com.sd.business.entity.bom.po.BomSpec;
+import com.sd.business.entity.order.enums.OrderStatusEnum;
+import com.sd.business.entity.order.po.OrderInfo;
 import com.sd.business.entity.production.dto.ProductionWorkOrderSelectDto;
 import com.sd.business.entity.production.po.ProductionWorkOrder;
 import com.sd.business.entity.production.vo.ProductionWorkOrderVo;
+import com.sd.business.entity.sku.po.SkuSpec;
 import com.sd.business.mapper.production.ProductionWorkOrderMapper;
 import com.sd.business.service.production.ProductionWorkOrderService;
 import org.springframework.stereotype.Service;
@@ -26,7 +30,24 @@ public class ProductionWorkOrderServiceImpl extends ServiceImpl<ProductionWorkOr
     public Page<ProductionWorkOrderVo> getPage(ProductionWorkOrderSelectDto dto) {
         IWrapper<ProductionWorkOrder> wrapper = getWrapper();
         wrapper.orderByDesc("pwo", ProductionWorkOrder::getId);
+        wrapper.eq("oi", OrderInfo::getStatus, OrderStatusEnum.IN_PRODUCTION.getKey());
+
+        wrapper.like("oi", OrderInfo::getCode, dto.getOrderCode());
+        wrapper.like("oi", OrderInfo::getWlnCode, dto.getOrderWlnCode());
+
+        wrapper.like("pwo", ProductionWorkOrder::getCode, dto.getProductionWorkOrderCode());
+
+        wrapper.like("ss", SkuSpec::getCode, dto.getSkuSpecCode());
+        wrapper.like("ss", SkuSpec::getName, dto.getSkuSpecName());
+
+        wrapper.like("bs", BomSpec::getCode, dto.getBomSpecCode());
+        wrapper.like("bs", BomSpec::getName, dto.getBomSpecName());
+
+        wrapper.ge("oi", OrderInfo::getDeliveryTime, dto.getBeginTime());
+        wrapper.le("oi", OrderInfo::getDeliveryTime, dto.getEndTime());
+
         Page<ProductionWorkOrderVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
+
         return page;
     }
 

sd-business/src/main/resources/mapper/production/ProductionWorkOrderMapper.xml

@@ -1,17 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.sd.business.mapper.production.ProductionWorkOrderMapper">
+
     <select id="getPage" resultType="com.sd.business.entity.production.vo.ProductionWorkOrderVo">
         select pwo.id,
                pwo.production_task_id,
                pwo.code,
                pwo.status,
                pwo.complete_time,
-               pwo.create_user,
-               pwo.create_time,
-               pwo.update_user,
-               pwo.update_time
+               oi.code          orderCode,
+               oi.wln_code      orderWlnCode,
+               oi.delivery_time deliveryTime,
+               ss.code          skuSpecCode,
+               ss.name          skuSpecName,
+               bs.code          bomSpecCode,
+               bs.name          bomSpecName,
+               pt.print_type    printType
         from production_work_order pwo
+                 inner join production_task pt on pwo.production_task_id = pt.id
+                 inner join order_info oi on pt.order_id = oi.id
+                 inner join sku_spec ss on pt.sku_spec_id = ss.id
+                 inner join bom_spec bs on pt.bom_spec_id = bs.id
             ${ew.customSqlSegment}
     </select>