0517

src/main/java/cn/ezhizao/project/business/domain/BizOutsourcedOrderDetailProcess.java

@@ -2,6 +2,7 @@ package cn.ezhizao.project.business.domain;
 
 import java.math.BigDecimal;
 import java.util.Date;
+import java.util.List;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
@@ -152,4 +153,6 @@ public class BizOutsourcedOrderDetailProcess extends BaseEntity
     private String originalCarrier;
     @TableField(exist = false)
     private Integer receiptNum;
+    @TableField(exist = false)
+    private List<BizReturnReceiptDetail> returnReceiptDetails;
 }

src/main/resources/mybatis/business/BizOutsourcedOrderDetailMapper.xml

@@ -60,9 +60,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 </foreach>
             </if>
             <if test="supplierName != null  and supplierName != ''"> AND t1.supplier_name like concat('%', #{supplierName}, '%')</if>
-            <if test="deliveryMethod != null "> AND t1.delivery_method = #{deliveryMethod}</if>
+            <if test="lotCode != null "> AND t1.lot_code like concat('%', #{lotCode}, '%')</if>
             <if test="packagingMethod != null  and packagingMethod != ''"> AND t1.packaging_method = #{packagingMethod}</if>
-            <if test="productDescription != null  and productDescription != ''"> AND t1.product_description = #{productDescription}</if>
+            <if test="productDescription != null  and productDescription != ''"> AND t1.product_description like concat('%', #{productDescription}, '%')</if>
             <if test="technologyVersion != null  and technologyVersion != ''"> AND t1.technology_version = #{technologyVersion}</if>
             <if test="originalCarrier != null  and originalCarrier != ''"> AND t1.original_carrier = #{originalCarrier}</if>
             <if test="originalCarrierCount != null "> AND t1.original_carrier_count = #{originalCarrierCount}</if>
@@ -102,9 +102,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="getListForReceipt" parameterType="BizOutsourcedOrderDetail" resultMap="BizOutsourcedOrderDetailResult">
         SELECT
             t1.*
-        FROM biz_outsourced_order_detail t1
+        FROM biz_outsourced_order_detail t1 left join biz_outsourced_order t2 on t1.master_id = t2.id
         <trim prefix=" WHERE" suffix="" suffixOverrides="AND">
-            t1.deleted = 0
+            t1.deleted = 0 and t2.deleted = 0 and t2.is_submit = 1
             <if test="existingOutsourceDetailIds != null and existingOutsourceDetailIds.size > 0">
                 AND t1.id NOT IN
                 <foreach collection="existingOutsourceDetailIds" index="index" item="id" separator="," open="(" close=")">

src/main/resources/mybatis/business/BizOutsourcedOrderDetailProcessMapper.xml

@@ -7,6 +7,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <resultMap type="cn.ezhizao.project.business.domain.BizOutsourcedOrderDetailProcess" id="BizOutsourcedOrderDetailProcessResult">
         <id column="id" property="id"/>
         <association property="auditNum" column="{processStepNumber=process_step_number,lotId=lot_id}" select="getReturnReceiptDetailAuditNum"/>
+        <collection property="returnReceiptDetails" ofType="cn.ezhizao.project.business.domain.BizReturnReceiptDetail" column="{processStepNumber=process_step_number,lotId=lot_id}" select="getReturnReceiptDetailList"/>
     </resultMap>
 
 
@@ -32,12 +33,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select t1.*,t2.original_carrier,t2.new_carrier,t1.qualified_num as receipt_num,t2.original_carrier_count,t2.new_carrier_count  from biz_outsourced_order_detail_process t1
         left join biz_outsourced_order_detail t2 on t1.detail_id = t2.id
         where t1.deleted = 0 and t2.deleted = 0 and t1.detail_id = #{id} order by t1.process_step_number
-
     </select>
     <select id="getReturnReceiptDetailAuditNum" resultType="Integer">
         SELECT t2.audit_num FROM biz_outsourced_order_detail_process t1 left join biz_return_receipt_detail t2 on t1.detail_id = t2.outsource_detail_id and t1.lot_id = t2.lot_id
         WHERE t1.process_step_number = #{processStepNumber} AND  t1.lot_id = #{lotId} and t2.process_step_number = #{processStepNumber} AND  t2.lot_id = #{lotId} and t1.deleted = 0 and t2.deleted = 0
     </select>
+    <select id="getReturnReceiptDetailList" resultType="cn.ezhizao.project.business.domain.BizReturnReceiptDetail">
+        select * from biz_return_receipt_detail where lot_id = #{lotId} and process_step_number = #{processStepNumber} and deleted = 0
+    </select>
     <delete id="physicalDelete">
         DELETE FROM biz_outsourced_order_detail_process
         <trim prefix=" WHERE" suffix="" suffixOverrides="AND">