内部外协

src/main/java/cn/ezhizao/project/business/controller/BizReturnReceiptController.java

@@ -282,6 +282,7 @@ public class BizReturnReceiptController extends BaseController {
             info.setReceiptNum(detailList.get(detailList.size() - 1).getReceiptNum());
             info.setNewCarrier(detailList.get(0).getNewCarrier());
             info.setRemark(detailList.get(0).getRemark());
+            info.setUnbind(detailList.get(0).getUnbind());
             info.setProcessAlias(detailProcesses.stream()
                     .filter(dp -> dp.getDetailId().equals(detailList.get(0).getOutsourceDetailId()))
                     .sorted(Comparator.comparing((BizOutsourcedOrderDetailProcess::getProcessStepNumber)))

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

@@ -149,7 +149,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="getIdsForInterReturn" resultType="java.lang.Long" parameterType="cn.ezhizao.project.business.domain.BizOutsourcedOrderDetail">
         select t1.id 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 and t2.deleted = 0 and t2.is_submit = 1 and not exists (select 1 from biz_daywork_item di where di.deleted = 0 and di.daywork_id = t1.daywork_id and process_step_number = (select process_step_number from biz_outsourced_order_detail_process t3 where t3.detail_id = t1.id and t3.deleted = 0 order by process_step_number desc limit 1))
+            t1.deleted = 0 and t2.deleted = 0 and t2.is_submit = 1 and not exists (select 1 from biz_daywork_item di where di.deleted = 0 and di.daywork_id = t1.daywork_id and process_step_number = (select process_step_number from biz_outsourced_order_detail_process t3 where t3.detail_id = t1.id and t3.deleted = 0 order by process_step_number desc limit 1) and di.status = 3)
             <if test="isInnerOutsource != null"> and t2.is_inner_outsource = #{isInnerOutsource}</if>
             <if test="supplierId != null "> AND t1.supplier_id = #{supplierId}</if>
         </trim>