提交

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

@@ -11,6 +11,7 @@ import javax.servlet.http.HttpServletResponse;
 import cn.ezhizao.framework.redis.RedisCache;
 import cn.ezhizao.project.business.domain.*;
 import cn.ezhizao.project.business.service.*;
+import org.aspectj.weaver.loadtime.Aj;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 import cn.ezhizao.framework.aspectj.lang.annotation.Log;
@@ -42,6 +43,10 @@ public class BizOutsourcedOrderController extends BaseController
     @Resource
     private IBizReturnReceiptDetailService bizReturnReceiptDetailService;
     @Resource
+    private IBizCarrierService bizCarrierService;
+    @Resource
+    private IBizDayworkCarrierService bizDayworkCarrierService;
+    @Resource
     HttpServletRequest request;
     /**
      * 查询外协单主
@@ -144,4 +149,37 @@ public class BizOutsourcedOrderController extends BaseController
 
         return success(outsourcedOrder);
     }
+    @GetMapping(value = "/carrierForOutsource")
+    public TableDataInfo carrierForOutsource(BizCarrier carrier) {
+        carrier.setNotInUse(1);
+        carrier.setIsAllowMore(0);
+        List<BizCarrier> list = bizCarrierService.getListFromOutsource(carrier);
+        return getDataTable(list);
+    }
+    @PostMapping("/saveCarriers")
+    public AjaxResult saveCarriers(@RequestBody BizOutsourcedOrderDetail bizOutsourcedOrderDetail) {
+        BizOutsourcedOrderDetail detail = bizOutsourcedOrderDetailService.getById(bizOutsourcedOrderDetail.getDetailId());
+        detail.setNewCarrierCount(bizOutsourcedOrderDetail.getCarrierIds().size());
+        List<BizCarrier> carriers = bizCarrierService.query().in("id", bizOutsourcedOrderDetail.getCarrierIds()).list();
+        detail.setNewCarrier(carriers.stream().map(v -> v.getId() + "|" + v.getCode()).collect(Collectors.joining(",")));
+        detail.setNewCarrierName(carriers.stream().map(BizCarrier::getCode).collect(Collectors.joining(",")));
+        bizOutsourcedOrderDetailService.updateById(detail);
+        List<BizDayworkCarrier> oldCarriers = bizDayworkCarrierService.query().eq("daywork_id", bizOutsourcedOrderDetail.getDayworkId()).list();
+        oldCarriers.forEach(l -> {
+            l.setIsChanged(1);
+        });
+        bizDayworkCarrierService.updateBatchById(oldCarriers);
+        List<BizDayworkCarrier> newCarriers = new ArrayList<>();
+        carriers.forEach(l -> {
+            BizDayworkCarrier item = new BizDayworkCarrier();
+            item.setCarrierId(l.getId());
+            item.setCarrierCode(l.getCode());
+            item.setLotId(bizOutsourcedOrderDetail.getLotId());
+            item.setDayworkId(bizOutsourcedOrderDetail.getDayworkId());
+            item.setProductId(bizOutsourcedOrderDetail.getProductId());
+            newCarriers.add(item);
+        });
+        bizDayworkCarrierService.saveBatch(newCarriers);
+        return success();
+    }
 }

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

@@ -1,6 +1,7 @@
 package cn.ezhizao.project.business.controller;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 import java.util.StringTokenizer;
 import java.util.stream.Collectors;
@@ -9,7 +10,9 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import cn.ezhizao.project.business.domain.BizCarrier;
+import cn.ezhizao.project.business.domain.BizOutsourcedOrderDetail;
 import cn.ezhizao.project.business.domain.BizReturnReceiptDetail;
+import cn.ezhizao.project.business.service.IBizOutsourcedOrderDetailService;
 import cn.ezhizao.project.business.service.IBizReturnReceiptDetailService;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
@@ -37,6 +40,8 @@ public class BizOutsourcedOrderDetailProcessController extends BaseController
     @Resource
     private IBizReturnReceiptDetailService returnReceiptDetailService;
     @Resource
+    private IBizOutsourcedOrderDetailService bizOutsourcedOrderDetailService;
+    @Resource
     private HttpServletRequest request;
 
     /**
@@ -58,12 +63,39 @@ public class BizOutsourcedOrderDetailProcessController extends BaseController
         startPage();
         bizOutsourcedOrderDetailProcess.setSupplierId(Long.valueOf(request.getHeader("tenantId")));
         List<BizOutsourcedOrderDetailProcess> list = bizOutsourcedOrderDetailProcessService.getList(bizOutsourcedOrderDetailProcess);
+        List<BizOutsourcedOrderDetail> details = bizOutsourcedOrderDetailService.query().in("id", list.isEmpty() ? Collections.singletonList(0L) : list.stream().map(BizOutsourcedOrderDetailProcess::getDetailId).collect(Collectors.toList())).list();
         //收回状态
         list.forEach(item ->{
             item.setReturnStatus(0);
             if(item.getReturnReceiptDetails()!=null &&item.getReturnReceiptDetails().size()>0&&item.getReturnReceiptDetails().get(0).getIsAudit() == 1 ) {
                 item.setReturnStatus(1);
             }
+            BizOutsourcedOrderDetail detail = details.stream().filter(v -> v.getId().equals(item.getDetailId())).findFirst().orElse(null);
+            if(detail != null) {
+                // 将字符串拆分转为对象
+                List<BizCarrier> carriers = new ArrayList<>();
+                // 为了减少前段的逻辑，所以需要先将拆分后的id也拼接起来
+                List<Long> carrierIds = new ArrayList<>();
+                //使用 StringTokenizer 来分割字符串
+                StringTokenizer tokenizer = new StringTokenizer(detail.getNewCarrier(), ",");
+                while (tokenizer.hasMoreTokens()) {
+                    String token = tokenizer.nextToken();
+                    // 检查当前 token 是否包含 "|" 字符 如果没有表示不是新箱，则跳过当前 token
+                    if (token.contains("|")) {
+                        String[] idCode = token.split("\\|"); // 安全地分割 token
+                        if (idCode.length == 2) {
+                            carrierIds.add(Long.parseLong(idCode[0]));
+                            BizCarrier bizCarrier = new BizCarrier();
+                            bizCarrier.setId(Long.parseLong(idCode[0]));
+                            bizCarrier.setCode(idCode[1]);
+                            carriers.add(bizCarrier);
+                        }
+                    }
+                }
+                item.setNewCarriers(carriers);
+                item.setCarrierIds(carrierIds);
+                item.setCarriers(carriers);
+            }
         });
         return getDataTable(list);
     }

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

@@ -79,4 +79,7 @@ public class BizCarrier extends BaseEntity {
     private Integer isAllowMore;
     @TableField(exist = false)
     private Integer notInUse;
+
+    @TableField(exist = false)
+    private Long dayworkId;
 }

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

@@ -0,0 +1,105 @@
+package cn.ezhizao.project.business.domain;
+
+import cn.ezhizao.framework.aspectj.lang.annotation.Excel;
+import cn.ezhizao.framework.web.domain.BaseEntity;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+
+/**
+ * 报工载具中间表对象 biz_daywork_carrier
+ *
+ * @author ezhizao
+ * @date 2023-12-04
+ */
+@Data
+@TableName(value = "biz_daywork_carrier")
+public class BizDayworkCarrier extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 租户（厂别）id
+     */
+    @ApiModelProperty(value = "${comment}")
+    private Long tenantId;
+
+    /**
+     * daywork id
+     */
+    @ApiModelProperty(value = "${comment}")
+    private Long dayworkId;
+
+    /**
+     * 计划单id
+     */
+    @ApiModelProperty(value = "${comment}")
+    private Long productionPlanId;
+
+    /**
+     * 子计划id
+     */
+    @ApiModelProperty(value = "${comment}")
+    private Long productionPlanDetailSubDetailId;
+
+    /**
+     * 计划单明细id
+     */
+    @ApiModelProperty(value = "${comment}")
+    private Long productionPlanDetailId;
+
+    /**
+     * 子计划工序对应的设备id
+     */
+    @ApiModelProperty(value = "${comment}")
+    private Long productionPlanDetailSubDetailEquipmentId;
+
+    /**
+     * 批次号
+     */
+    @ApiModelProperty(value = "${comment}")
+    private Long lotId;
+
+    /**
+     * 产品id
+     */
+    @ApiModelProperty(value = "${comment}")
+    private Long productId;
+
+    /**
+     * 工艺id（通过工艺id，获取版本号）
+     */
+    @ApiModelProperty(value = "${comment}")
+    private Long technologicalProcessId;
+
+    /**
+     * 用户id
+     */
+    @ApiModelProperty(value = "${comment}")
+    private Long userId;
+
+    /**
+     * 箱子id
+     */
+    @ApiModelProperty(value = "${comment}")
+    private Long carrierId;
+
+    /**
+     * 箱子编码
+     */
+    @Excel(name = "箱子编码")
+    @ApiModelProperty(value = "箱子编码")
+    private String carrierCode;
+
+    /**
+     * 是否被更换
+     */
+    @Excel(name = "是否被更换")
+    @ApiModelProperty(value = "是否被更换")
+    private Integer isChanged;
+
+    @TableField(exist = false)
+    private String remark;
+
+}

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

@@ -149,4 +149,16 @@ public class BizOutsourcedOrderDetail extends BaseEntity
     private List<BizOutsourcedOrderDetailProcess> outsourcedOrderDetailProcessList;
     @TableField(exist = false)
     private List<BizReturnReceiptDetail> returnReceiptDetailList;
+
+    @TableField(exist = false)
+    private List<BizCarrier>  newCarriers;
+    @TableField(exist = false)
+    private List<Long>  carrierIds;
+    @TableField(exist = false)
+    private List<BizCarrier> carriers;
+
+    @ApiModelProperty("新箱号")
+    private String newCarrierName;
+    @TableField(exist = false)
+    private Long detailId;
 }

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

@@ -161,5 +161,13 @@ public class BizOutsourcedOrderDetailProcess extends BaseEntity
     private List<Long> hasReturnDetailId;
     @TableField(exist = false)
     private String newCarrierName;
+    @TableField(exist = false)
+    private Integer isFirstProcess;
 
+    @TableField(exist = false)
+    private List<BizCarrier>  newCarriers;
+    @TableField(exist = false)
+    private List<Long>  carrierIds;
+    @TableField(exist = false)
+    private List<BizCarrier> carriers;
 }

src/main/java/cn/ezhizao/project/business/mapper/BizCarrierMapper.java

@@ -0,0 +1,33 @@
+package cn.ezhizao.project.business.mapper;
+
+import cn.ezhizao.project.business.domain.BizCarrier;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+import java.util.List;
+
+
+/**
+ * 设备档案Mapper接口
+ *
+ * @author ezhizao
+ * @date 2023-11-14
+ */
+public interface BizCarrierMapper extends BaseMapper<BizCarrier> {
+    /**
+     * 物理删除
+     *
+     * @param bizEquipmentDetail 载具信息
+     * @return 删除结果
+     */
+    public int physicalDelete(BizCarrier bizEquipmentDetail);
+
+    public List<BizCarrier> getList(BizCarrier bizCarrier);
+    /**
+     * 取消废弃
+     * @param id 载具id
+     * @return 影响数量
+     */
+    public int unAbandoned(Long id);
+
+    List<BizCarrier> getListFromOutsource(BizCarrier carrier);
+}

src/main/java/cn/ezhizao/project/business/mapper/BizDayworkCarrierMapper.java

@@ -0,0 +1,32 @@
+package cn.ezhizao.project.business.mapper;
+
+import cn.ezhizao.project.business.domain.BizDayworkCarrier;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+import java.util.List;
+
+/**
+ * 报工载具中间表Mapper接口
+ *
+ * @author ezhizao
+ * @date 2023-12-04
+ */
+public interface BizDayworkCarrierMapper extends BaseMapper<BizDayworkCarrier>
+{
+    /**
+     * 查询报工载具中间表列表
+     *
+     * @param bizDayworkCarrier 报工载具中间表
+     * @return 报工载具中间表集合
+     */
+    public List<BizDayworkCarrier> getList(BizDayworkCarrier bizDayworkCarrier);
+
+    /**
+     * 物理删除
+     * @param bizDayworkCarrier
+     * @return 删除结果
+    */
+    public int physicalDelete(BizDayworkCarrier bizDayworkCarrier);
+
+    int removeByDayworkIds(List<Long> ids);
+}

src/main/java/cn/ezhizao/project/business/service/IBizCarrierService.java

@@ -0,0 +1,34 @@
+package cn.ezhizao.project.business.service;
+
+import cn.ezhizao.project.business.domain.BizCarrier;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.List;
+
+/**
+ * 设备档案Service接口
+ *
+ * @author ezhizao
+ * @date 2023-11-14
+ */
+public interface IBizCarrierService extends IService<BizCarrier> {
+
+    /**
+     * 物理删除
+     *
+     * @param bizCarrier
+     * @return 删除结果
+     */
+    int physicalDelete(BizCarrier bizCarrier);
+
+    /**
+     * 取消废弃
+     * @param id 载具id
+     * @return 影响数量
+     */
+    int unAbandoned(Long id);
+
+    public List<BizCarrier> getList(BizCarrier bizCarrier);
+
+    List<BizCarrier> getListFromOutsource(BizCarrier carrier);
+}

src/main/java/cn/ezhizao/project/business/service/IBizDayworkCarrierService.java

@@ -0,0 +1,35 @@
+package cn.ezhizao.project.business.service;
+
+import cn.ezhizao.project.business.domain.BizDayworkCarrier;
+import cn.ezhizao.project.business.domain.BizOutsourcedOrderDetail;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.List;
+
+/**
+ * 报工载具中间表Service接口
+ *
+ * @author ezhizao
+ * @date 2023-12-04
+ */
+public interface IBizDayworkCarrierService extends IService<BizDayworkCarrier>
+{
+    /**
+     * 查询报工载具中间表列表
+     *
+     * @param bizDayworkCarrier 报工载具中间表
+     * @return 报工载具中间表集合
+     */
+    public List<BizDayworkCarrier> getList(BizDayworkCarrier bizDayworkCarrier);
+
+    /**
+     * 物理删除
+     * @param bizDayworkCarrier
+     * @return 删除结果
+     */
+    public int physicalDelete(BizDayworkCarrier bizDayworkCarrier);
+
+    int removeByDayworkIds(List<Long> ids);
+
+    void updateByDayworkIds(List<BizOutsourcedOrderDetail> orderDetails);
+}

src/main/java/cn/ezhizao/project/business/service/impl/BizCarrierServiceImpl.java

@@ -0,0 +1,57 @@
+package cn.ezhizao.project.business.service.impl;
+
+import cn.ezhizao.project.business.domain.BizCarrier;
+import cn.ezhizao.project.business.mapper.BizCarrierMapper;
+import cn.ezhizao.project.business.service.IBizCarrierService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * 设备档案Service业务层处理
+ *
+ * @author ezhizao
+ * @date 2023-11-14
+ */
+@Service
+public class BizCarrierServiceImpl extends ServiceImpl<BizCarrierMapper, BizCarrier> implements IBizCarrierService {
+    @Resource
+    private BizCarrierMapper bizCarrierMapper;
+
+    /**
+     * 物理删除
+     *
+     * @param bizCarrier
+     * @return 删除结果
+     */
+    @Override
+    public int physicalDelete(BizCarrier bizCarrier) {
+        return bizCarrierMapper.physicalDelete(bizCarrier);
+    }
+
+    ;
+
+
+    /**
+     * 取消废弃
+     *
+     * @param id 载具id
+     * @return 影响数量
+     */
+    @Override
+    public int unAbandoned(Long id) {
+        return bizCarrierMapper.unAbandoned(id);
+    }
+
+    @Override
+    public List<BizCarrier> getList(BizCarrier bizCarrier) {
+        return bizCarrierMapper.getList(bizCarrier);
+    }
+
+    @Override
+    public List<BizCarrier> getListFromOutsource(BizCarrier carrier) {
+        return bizCarrierMapper.getListFromOutsource(carrier);
+    }
+}

src/main/java/cn/ezhizao/project/business/service/impl/BizDayworkCarrierServiceImpl.java

@@ -0,0 +1,55 @@
+package cn.ezhizao.project.business.service.impl;
+
+import cn.ezhizao.project.business.domain.BizDayworkCarrier;
+import cn.ezhizao.project.business.domain.BizOutsourcedOrderDetail;
+import cn.ezhizao.project.business.mapper.BizDayworkCarrierMapper;
+import cn.ezhizao.project.business.service.IBizDayworkCarrierService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * 报工载具中间表Service业务层处理
+ *
+ * @author ezhizao
+ * @date 2023-12-04
+ */
+@Service
+public class BizDayworkCarrierServiceImpl extends ServiceImpl<BizDayworkCarrierMapper, BizDayworkCarrier> implements IBizDayworkCarrierService
+{
+    @Resource
+    private BizDayworkCarrierMapper bizDayworkCarrierMapper;
+
+    /**
+     * 查询报工载具中间表列表
+     *
+     * @param bizDayworkCarrier 报工载具中间表
+     * @return 报工载具中间表
+     */
+    @Override
+    public List<BizDayworkCarrier> getList(BizDayworkCarrier bizDayworkCarrier)
+    {
+        return bizDayworkCarrierMapper.getList(bizDayworkCarrier);
+    }
+
+    /**
+     * 物理删除
+     * @param bizDayworkCarrier
+     * @return 删除结果
+     */
+    @Override
+    public int physicalDelete(BizDayworkCarrier bizDayworkCarrier){ return bizDayworkCarrierMapper.physicalDelete(bizDayworkCarrier); }
+
+    @Override
+    public int removeByDayworkIds(List<Long> ids) {
+        return bizDayworkCarrierMapper.removeByDayworkIds(ids) ;
+    }
+
+    @Override
+    public void updateByDayworkIds(List<BizOutsourcedOrderDetail> orderDetails) {
+
+    };
+
+}

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

@@ -0,0 +1,64 @@
+<?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="cn.ezhizao.project.business.mapper.BizCarrierMapper">
+
+    <resultMap type="cn.ezhizao.project.business.domain.BizCarrier" id="BizCarrierResult">
+        <id column="id" property="id"/>
+    </resultMap>
+
+    <select id="getList" resultMap="BizCarrierResult" parameterType="cn.ezhizao.project.business.domain.BizCarrier">
+        select t1.id,t1.category_id,t1.code,t1.qc_code,t1.remark,t1.tenant_id,t1.is_allow_more,COALESCE((SELECT t2.is_abandoned FROM biz_carrier_reject t2 WHERE t1.id = t2.carrier_id ORDER BY t2.create_time DESC LIMIT 1), 0) AS is_abandoned
+        FROM biz_carrier t1
+        <trim prefix=" WHERE" suffix="" suffixOverrides="AND">
+            deleted = 0
+            <if test="categoryId != null  and categoryId != 0"> AND category_id = #{categoryId}</if>
+            <if test="tenantId != null  and tenantId != 0"> AND tenant_id = #{tenantId}</if>
+            <if test="code != null  and code != ''"> AND code LIKE CONCAT('%', #{code}, '%')</if>
+            <if test="isAbandoned != null"> AND is_abandoned = #{isAbandoned}</if>
+            <!--  未关联任何生产单  -->
+            <if test="notInUse == 1">
+                AND not exists (select 1 from biz_daywork_carrier t where t.is_changed = 0 and t.carrier_id = t1.id)
+            </if>
+
+        </trim>
+    </select>
+
+    <select id="getListFromOutsource" resultMap="BizCarrierResult" parameterType="cn.ezhizao.project.business.domain.BizCarrier">
+        select t1.id,t1.category_id,t1.code,t1.qc_code,t1.remark,t1.tenant_id,t1.is_allow_more,COALESCE((SELECT t2.is_abandoned FROM biz_carrier_reject t2 WHERE t1.id = t2.carrier_id ORDER BY t2.create_time DESC LIMIT 1), 0) AS is_abandoned
+        FROM biz_carrier t1
+        <trim prefix=" WHERE" suffix="" suffixOverrides="AND">
+            deleted = 0
+            <if test="categoryId != null  and categoryId != 0"> AND t1.category_id = #{categoryId}</if>
+            <if test="code != null  and code != ''"> AND  t1.code=#{code}</if>
+            <!--  未关联任何生产单  -->
+            <if test="notInUse == 1">
+                AND not exists (select 1 from biz_daywork_carrier t where t.is_changed = 0 and t.carrier_id = t1.id and t.daywork_id != #{dayworkId})
+            </if>
+
+        </trim>
+    </select>
+
+
+
+    <update id="unAbandoned">
+        update biz_carrier
+        <set>
+            is_abandoned=0,
+            abandonment_date = '0000-00-00 00:00:00.000000',
+            abandonment_reason = ''
+        </set>
+        where id = #{id}
+    </update>
+
+    <delete id="physicalDelete">
+        DELETE FROM biz_carrier
+        <trim prefix=" WHERE" suffix="" suffixOverrides="AND">
+            <if test="id != null">
+                id = #{id} AND
+            </if>
+       <!-- 删除条件为其他外键可以在这里加 -->
+        </trim>
+    </delete>
+</mapper>

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

@@ -0,0 +1,40 @@
+<?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="cn.ezhizao.project.business.mapper.BizDayworkCarrierMapper">
+
+    <resultMap type="cn.ezhizao.project.business.domain.BizDayworkCarrier" id="BizDayworkCarrierResult">
+        <id column="id" property="id"/>
+    </resultMap>
+
+
+    <select id="getList" parameterType="BizDayworkCarrier" resultMap="BizDayworkCarrierResult">
+        SELECT * FROM biz_daywork_carrier
+        <trim prefix=" WHERE" suffix="" suffixOverrides="AND">
+            deleted = 0
+            <if test="carrierCode != null  and carrierCode != ''"> AND carrier_code = #{carrierCode}</if>
+            <if test="isChanged != null "> AND is_changed = #{isChanged}</if>
+            <if test="dayworkId!= null "> AND daywork_id = #{dayworkId}</if>
+        </trim>
+    </select>
+
+    <update id="removeByDayworkIds" parameterType="java.util.List">
+        UPDATE biz_daywork_carrier
+        SET is_changed = 1
+        WHERE daywork_id IN
+        <foreach collection="ids" item="daywork" index="index" open="(" separator="," close=")">
+            #{daywork}
+        </foreach>
+    </update>
+
+    <delete id="physicalDelete">
+        DELETE FROM biz_daywork_carrier
+        <trim prefix=" WHERE" suffix="" suffixOverrides="AND">
+            <if test="id != null">
+                id = #{id} AND
+            </if>
+       <!-- 删除条件为其他外键可以在这里加 -->
+        </trim>
+    </delete>
+</mapper>

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

@@ -17,8 +17,9 @@
     <select id="getList" parameterType="BizOutsourcedOrderDetailProcess"
             resultMap="BizOutsourcedOrderDetailProcessResult">
         SELECT t1.*,t2.loss_limit,(select new_carrier_name from biz_outsourced_order_detail where t1.detail_id
-        =biz_outsourced_order_detail.id and biz_outsourced_order_detail.deleted = 0 ) as newCarrierName FROM
-        biz_outsourced_order_detail_process t1 right join biz_outsourced_order t2 on t1.master_id = t2.id
+        =biz_outsourced_order_detail.id and biz_outsourced_order_detail.deleted = 0 ) as newCarrierName
+        , t2.is_first_process FROM biz_outsourced_order_detail_process t1
+        right join biz_outsourced_order t2 on t1.master_id = t2.id
         <trim prefix=" WHERE" suffix="" suffixOverrides="AND">
             t1.deleted = 0 and t2.is_submit = 1 and t2.deleted = 0
             <if test="formCode != null  and formCode != ''">AND t1.form_code like concat('%', #{formCode}, '%')</if>