提交

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

@@ -0,0 +1,142 @@
+package cn.ezhizao.project.business.outsource.controller;
+
+import java.lang.reflect.Array;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.stream.Collectors;
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+
+import cn.ezhizao.common.utils.poi.ExcelUtil;
+import cn.ezhizao.framework.aspectj.lang.annotation.Log;
+import cn.ezhizao.framework.aspectj.lang.enums.BusinessType;
+import cn.ezhizao.framework.web.controller.BaseController;
+import cn.ezhizao.framework.web.domain.AjaxResult;
+import cn.ezhizao.framework.web.page.TableDataInfo;
+import cn.ezhizao.project.business.outsource.domain.BizOutsourcedOrderDetail;
+import cn.ezhizao.project.business.outsource.service.IBizOutsourcedOrderDetailService;
+import cn.ezhizao.project.business.product.domain.BizCarrier;
+import cn.ezhizao.project.business.product.service.IBizCarrierService;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import cn.ezhizao.project.business.outsource.domain.BizOutsourcedOrder;
+import cn.ezhizao.project.business.outsource.service.IBizOutsourcedOrderService;
+
+/**
+ * 外协单主
+带箱方式，是整单的。如果换新箱子，明细中，都需要更换箱子Controller
+ *
+ * @author ezhizao
+ * @date 2024-05-28
+ */
+@RestController
+@RequestMapping("/business/outsourcedOrder")
+public class BizOutsourcedOrderController extends BaseController
+{
+    @Resource
+    private IBizOutsourcedOrderService bizOutsourcedOrderService;
+    @Resource
+    private IBizOutsourcedOrderDetailService bizOutsourcedOrderDetailService;
+    @Resource
+    private IBizCarrierService carrierService;
+
+    /**
+     * 查询外协单主 带箱方式，是整单的。如果换新箱子，明细中，都需要更换箱子列表
+     */
+    @GetMapping("/list")
+    public TableDataInfo list(BizOutsourcedOrder bizOutsourcedOrder) throws NoSuchFieldException, IllegalAccessException
+    {
+        setTenantId(bizOutsourcedOrder);
+        startPage();
+        List<BizOutsourcedOrder> list = bizOutsourcedOrderService.getList(bizOutsourcedOrder);
+        List<BizOutsourcedOrderDetail> details = bizOutsourcedOrderDetailService.query().in("master_id", list.isEmpty() ? Collections.singletonList(0L) : list.stream().map(BizOutsourcedOrder::getId).collect(Collectors.toList())).list();
+        list.forEach(l -> l.setCarrierCount(details.stream().filter(v -> v.getMasterId().equals(l.getId())).mapToInt(v ->l.getPackagingMethod().equals("0") ? v.getOriginalCarrierCount() : v.getNewCarrierCount()).sum()));
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出外协单主 带箱方式，是整单的。如果换新箱子，明细中，都需要更换箱子列表
+     */
+    @Log(title = "外协单主 带箱方式，是整单的。如果换新箱子，明细中，都需要更换箱子", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, BizOutsourcedOrder bizOutsourcedOrder) throws NoSuchFieldException, IllegalAccessException
+    {
+        setTenantId(bizOutsourcedOrder);
+        List<BizOutsourcedOrder> list = bizOutsourcedOrderService.getList(bizOutsourcedOrder);
+        ExcelUtil<BizOutsourcedOrder> util = new ExcelUtil<BizOutsourcedOrder>(BizOutsourcedOrder.class);
+        util.exportExcel(response, list, "外协单主 带箱方式，是整单的。如果换新箱子，明细中，都需要更换箱子数据");
+    }
+
+    /**
+     * 获取外协单主 带箱方式，是整单的。如果换新箱子，明细中，都需要更换箱子详细信息
+     */
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return success(bizOutsourcedOrderService.getById(id));
+    }
+
+    /**
+     * 新增外协单主 带箱方式，是整单的。如果换新箱子，明细中，都需要更换箱子
+     */
+    @Log(title = "外协单主 带箱方式，是整单的。如果换新箱子，明细中，都需要更换箱子", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody BizOutsourcedOrder bizOutsourcedOrder) throws NoSuchFieldException, IllegalAccessException
+    {
+        setTenantId(bizOutsourcedOrder);
+        return toAjax(bizOutsourcedOrderService.save(bizOutsourcedOrder));
+    }
+
+    /**
+     * 修改外协单主 带箱方式，是整单的。如果换新箱子，明细中，都需要更换箱子
+     */
+    @Log(title = "外协单主 带箱方式，是整单的。如果换新箱子，明细中，都需要更换箱子", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody BizOutsourcedOrder bizOutsourcedOrder) throws NoSuchFieldException, IllegalAccessException
+    {
+        setTenantId(bizOutsourcedOrder);
+        return toAjax(bizOutsourcedOrderService.updateById(bizOutsourcedOrder));
+    }
+
+    /**
+     * 删除外协单主 带箱方式，是整单的。如果换新箱子，明细中，都需要更换箱子
+     */
+    @Log(title = "外协单主 带箱方式，是整单的。如果换新箱子，明细中，都需要更换箱子", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable List<Long> ids)
+    {
+        return toAjax(bizOutsourcedOrderService.removeBatchByIds(ids));
+    }
+
+    @Log(title = "外协单获取外协绑定箱码和箱", businessType = BusinessType.SELECT)
+    @PostMapping("/getCarriers")
+    public AjaxResult getCarriers(@RequestBody BizOutsourcedOrder outsourcedOrder) {
+        List<BizOutsourcedOrderDetail> details = bizOutsourcedOrderDetailService.query().eq("master_id", outsourcedOrder.getId()).list();
+        List<BizCarrier> carriers = new ArrayList<>();
+        List<Long> carrierIds = new ArrayList<>();
+        details.stream().filter(v -> v.getNewCarrier().contains("|")).forEach(v -> {
+            List<String> splitCarriers = Arrays.asList(v.getNewCarrier().split(","));
+            carrierIds.addAll(splitCarriers.stream().map(t -> Long.parseLong(t.split("\\|")[0])).collect(Collectors.toList()));
+        });
+        List<String> carrierCodes = new ArrayList<>();
+        details.stream().filter(v -> !v.getNewCarrier().contains("|")).forEach(v -> {
+            List<String> splitCarriers = Arrays.asList(v.getNewCarrier().split(","));
+            carrierCodes.addAll(splitCarriers);
+        });
+        carriers.addAll(carrierService.query().in("id", carrierIds.isEmpty() ? Collections.singletonList(0L) : carrierIds).list());
+        carriers.addAll(carrierService.query().in("code", carrierCodes.isEmpty() ? Collections.singletonList("x") : carrierCodes).list());
+        details.forEach(l -> {
+            l.setCarriers(carriers.stream().filter(v -> l.getNewCarrier().contains(v.getCode())).collect(Collectors.toList()));
+        });
+        return success(details);
+    }
+}

src/main/java/cn/ezhizao/project/business/outsource/controller/BizOutsourcedOrderDetailController.java

@@ -0,0 +1,103 @@
+package cn.ezhizao.project.business.outsource.controller;
+
+import java.util.List;
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+
+import cn.ezhizao.common.utils.poi.ExcelUtil;
+import cn.ezhizao.framework.aspectj.lang.annotation.Log;
+import cn.ezhizao.framework.aspectj.lang.enums.BusinessType;
+import cn.ezhizao.framework.web.controller.BaseController;
+import cn.ezhizao.framework.web.domain.AjaxResult;
+import cn.ezhizao.framework.web.page.TableDataInfo;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import cn.ezhizao.project.business.outsource.domain.BizOutsourcedOrderDetail;
+import cn.ezhizao.project.business.outsource.service.IBizOutsourcedOrderDetailService;
+
+/**
+ * 外协单从Controller
+ *
+ * @author ezhizao
+ * @date 2024-05-28
+ */
+@RestController
+@RequestMapping("/business/outsourcedOrderDetail")
+public class BizOutsourcedOrderDetailController extends BaseController
+{
+    @Resource
+    private IBizOutsourcedOrderDetailService bizOutsourcedOrderDetailService;
+
+    /**
+     * 查询外协单从列表
+     */
+    @GetMapping("/list")
+    public TableDataInfo list(BizOutsourcedOrderDetail bizOutsourcedOrderDetail) throws NoSuchFieldException, IllegalAccessException
+    {
+        setTenantId(bizOutsourcedOrderDetail);
+        startPage();
+        List<BizOutsourcedOrderDetail> list = bizOutsourcedOrderDetailService.getList(bizOutsourcedOrderDetail);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出外协单从列表
+     */
+    @Log(title = "外协单从", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, BizOutsourcedOrderDetail bizOutsourcedOrderDetail) throws NoSuchFieldException, IllegalAccessException
+    {
+        setTenantId(bizOutsourcedOrderDetail);
+        List<BizOutsourcedOrderDetail> list = bizOutsourcedOrderDetailService.getList(bizOutsourcedOrderDetail);
+        ExcelUtil<BizOutsourcedOrderDetail> util = new ExcelUtil<BizOutsourcedOrderDetail>(BizOutsourcedOrderDetail.class);
+        util.exportExcel(response, list, "外协单从数据");
+    }
+
+    /**
+     * 获取外协单从详细信息
+     */
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return success(bizOutsourcedOrderDetailService.getById(id));
+    }
+
+    /**
+     * 新增外协单从
+     */
+    @Log(title = "外协单从", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody BizOutsourcedOrderDetail bizOutsourcedOrderDetail) throws NoSuchFieldException, IllegalAccessException
+    {
+        setTenantId(bizOutsourcedOrderDetail);
+        return toAjax(bizOutsourcedOrderDetailService.save(bizOutsourcedOrderDetail));
+    }
+
+    /**
+     * 修改外协单从
+     */
+    @Log(title = "外协单从", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody BizOutsourcedOrderDetail bizOutsourcedOrderDetail) throws NoSuchFieldException, IllegalAccessException
+    {
+        setTenantId(bizOutsourcedOrderDetail);
+        return toAjax(bizOutsourcedOrderDetailService.updateById(bizOutsourcedOrderDetail));
+    }
+
+    /**
+     * 删除外协单从
+     */
+    @Log(title = "外协单从", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable List<Long> ids)
+    {
+        return toAjax(bizOutsourcedOrderDetailService.removeBatchByIds(ids));
+    }
+}

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

@@ -0,0 +1,103 @@
+package cn.ezhizao.project.business.outsource.controller;
+
+import java.util.List;
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+
+import cn.ezhizao.common.utils.poi.ExcelUtil;
+import cn.ezhizao.framework.aspectj.lang.annotation.Log;
+import cn.ezhizao.framework.aspectj.lang.enums.BusinessType;
+import cn.ezhizao.framework.web.controller.BaseController;
+import cn.ezhizao.framework.web.domain.AjaxResult;
+import cn.ezhizao.framework.web.page.TableDataInfo;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import cn.ezhizao.project.business.outsource.domain.BizOutsourcedOrderDetailProcess;
+import cn.ezhizao.project.business.outsource.service.IBizOutsourcedOrderDetailProcessService;
+
+/**
+ * 外协单从对应的外协工序的从Controller
+ *
+ * @author ezhizao
+ * @date 2024-05-28
+ */
+@RestController
+@RequestMapping("/business/outsourcedOrderDetailProcess")
+public class BizOutsourcedOrderDetailProcessController extends BaseController
+{
+    @Resource
+    private IBizOutsourcedOrderDetailProcessService bizOutsourcedOrderDetailProcessService;
+
+    /**
+     * 查询外协单从对应的外协工序的从列表
+     */
+    @GetMapping("/list")
+    public TableDataInfo list(BizOutsourcedOrderDetailProcess bizOutsourcedOrderDetailProcess) throws NoSuchFieldException, IllegalAccessException
+    {
+        setTenantId(bizOutsourcedOrderDetailProcess);
+        startPage();
+        List<BizOutsourcedOrderDetailProcess> list = bizOutsourcedOrderDetailProcessService.getList(bizOutsourcedOrderDetailProcess);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出外协单从对应的外协工序的从列表
+     */
+    @Log(title = "外协单从对应的外协工序的从", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, BizOutsourcedOrderDetailProcess bizOutsourcedOrderDetailProcess) throws NoSuchFieldException, IllegalAccessException
+    {
+        setTenantId(bizOutsourcedOrderDetailProcess);
+        List<BizOutsourcedOrderDetailProcess> list = bizOutsourcedOrderDetailProcessService.getList(bizOutsourcedOrderDetailProcess);
+        ExcelUtil<BizOutsourcedOrderDetailProcess> util = new ExcelUtil<BizOutsourcedOrderDetailProcess>(BizOutsourcedOrderDetailProcess.class);
+        util.exportExcel(response, list, "外协单从对应的外协工序的从数据");
+    }
+
+    /**
+     * 获取外协单从对应的外协工序的从详细信息
+     */
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return success(bizOutsourcedOrderDetailProcessService.getById(id));
+    }
+
+    /**
+     * 新增外协单从对应的外协工序的从
+     */
+    @Log(title = "外协单从对应的外协工序的从", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody BizOutsourcedOrderDetailProcess bizOutsourcedOrderDetailProcess) throws NoSuchFieldException, IllegalAccessException
+    {
+        setTenantId(bizOutsourcedOrderDetailProcess);
+        return toAjax(bizOutsourcedOrderDetailProcessService.save(bizOutsourcedOrderDetailProcess));
+    }
+
+    /**
+     * 修改外协单从对应的外协工序的从
+     */
+    @Log(title = "外协单从对应的外协工序的从", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody BizOutsourcedOrderDetailProcess bizOutsourcedOrderDetailProcess) throws NoSuchFieldException, IllegalAccessException
+    {
+        setTenantId(bizOutsourcedOrderDetailProcess);
+        return toAjax(bizOutsourcedOrderDetailProcessService.updateById(bizOutsourcedOrderDetailProcess));
+    }
+
+    /**
+     * 删除外协单从对应的外协工序的从
+     */
+    @Log(title = "外协单从对应的外协工序的从", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable List<Long> ids)
+    {
+        return toAjax(bizOutsourcedOrderDetailProcessService.removeBatchByIds(ids));
+    }
+}

src/main/java/cn/ezhizao/project/business/outsource/domain/BizOutsourcedOrder.java

@@ -0,0 +1,77 @@
+package cn.ezhizao.project.business.outsource.domain;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+import cn.ezhizao.framework.aspectj.lang.annotation.Excel;
+import cn.ezhizao.framework.web.domain.BaseEntity;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * 外协单主
+带箱方式，是整单的。如果换新箱子，明细中，都需要更换箱子对象 biz_outsourced_order
+ *
+ * @author ezhizao
+ * @date 2024-05-28
+ */
+@Data
+@TableName(value = "biz_outsourced_order")
+public class BizOutsourcedOrder extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 租户（厂别）id */
+    @ApiModelProperty(value = "${comment}")
+    private Long tenantId;
+
+    /** 单据号 */
+    @Excel(name = "单据号")
+    @ApiModelProperty(value = "单据号")
+    private String formCode;
+
+    /** 表单日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "表单日期", width = 30, dateFormat = "yyyy-MM-dd")
+    @ApiModelProperty(value = "表单日期")
+    private Date formDate;
+
+    /** 外协商id */
+    @ApiModelProperty(value = "表单日期")
+    private Long supplierId;
+
+    /** 外协商名称 */
+    @Excel(name = "外协商名称")
+    @ApiModelProperty(value = "外协商名称")
+    private String supplierName;
+
+    /** 0：自提；1：物流 */
+    @Excel(name = "0：自提；1：物流")
+    @ApiModelProperty(value = "0：自提；1：物流")
+    private Integer deliveryMethod;
+
+    /** 运费单价 */
+    @Excel(name = "运费单价")
+    @ApiModelProperty(value = "运费单价")
+    private BigDecimal freightPrice;
+
+    /** 运费总价 */
+    @Excel(name = "运费总价")
+    @ApiModelProperty(value = "运费总价")
+    private BigDecimal freightAmount;
+
+    /** 带箱方式：0：原箱；1：新箱 */
+    @Excel(name = "带箱方式：0：原箱；1：新箱")
+    @ApiModelProperty(value = "带箱方式：0：原箱；1：新箱")
+    private String packagingMethod;
+
+    @TableField(exist = false)
+    @ApiModelProperty("箱子数量")
+    private Integer carrierCount;
+
+    @TableField(exist = false)
+    private String keywords;
+}

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

@@ -0,0 +1,112 @@
+package cn.ezhizao.project.business.outsource.domain;
+
+import java.util.Date;
+import java.util.List;
+
+import cn.ezhizao.framework.aspectj.lang.annotation.Excel;
+import cn.ezhizao.framework.web.domain.BaseEntity;
+import cn.ezhizao.project.business.product.domain.BizCarrier;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * 外协单从对象 biz_outsourced_order_detail
+ *
+ * @author ezhizao
+ * @date 2024-05-28
+ */
+@Data
+@TableName(value = "biz_outsourced_order_detail")
+public class BizOutsourcedOrderDetail extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 租户（厂别）id */
+    @ApiModelProperty(value = "${comment}")
+    private Long tenantId;
+
+    @ApiModelProperty(value = "${comment}")
+    private Long masterId;
+    /** 单据号 */
+    @Excel(name = "单据号")
+    @ApiModelProperty(value = "单据号")
+    private String formCode;
+
+    /** 表单日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "表单日期", width = 30, dateFormat = "yyyy-MM-dd")
+    @ApiModelProperty(value = "表单日期")
+    private Date formDate;
+
+    /** 外协商id */
+    @ApiModelProperty(value = "表单日期")
+    private Long supplierId;
+
+    /** 外协商名称 */
+    @Excel(name = "外协商名称")
+    @ApiModelProperty(value = "外协商名称")
+    private String supplierName;
+
+    /** 0：自提；1：物流 */
+    @Excel(name = "0：自提；1：物流")
+    @ApiModelProperty(value = "0：自提；1：物流")
+    private Integer deliveryMethod;
+
+    /** 带箱方式：0：原箱；1：新箱 */
+    @Excel(name = "带箱方式：0：原箱；1：新箱")
+    @ApiModelProperty(value = "带箱方式：0：原箱；1：新箱")
+    private String packagingMethod;
+
+    /** 批次id */
+    @ApiModelProperty(value = "带箱方式：0：原箱；1：新箱")
+    private Long lotId;
+
+    /** 报工主表id */
+    @ApiModelProperty(value = "带箱方式：0：原箱；1：新箱")
+    private Long dayworkId;
+
+    /** 产品id */
+    @ApiModelProperty(value = "带箱方式：0：原箱；1：新箱")
+    private Long productId;
+
+    /** 产品描述 */
+    @Excel(name = "产品描述")
+    @ApiModelProperty(value = "产品描述")
+    private String productDescription;
+
+    /** 工艺id（通过工艺id，获取版本号） */
+    @ApiModelProperty(value = "产品描述")
+    private Long technologicalProcessId;
+
+    /** 工艺版本A,B,C */
+    @Excel(name = "工艺版本A,B,C")
+    @ApiModelProperty(value = "工艺版本A,B,C")
+    private String technologyVersion;
+
+    /** 原箱号，以英文“,”分割 */
+    @Excel(name = "原箱号，以英文“,”分割")
+    @ApiModelProperty(value = "原箱号，以英文“,”分割")
+    private String originalCarrier;
+
+    /** 原箱数 */
+    @Excel(name = "原箱数")
+    @ApiModelProperty(value = "原箱数")
+    private Integer originalCarrierCount;
+
+    /** 新箱号，以英文“,”分割 */
+    @Excel(name = "新箱号，以英文“,”分割")
+    @ApiModelProperty(value = "新箱号，以英文“,”分割")
+    private String newCarrier;
+
+    /** 新箱数 */
+    @Excel(name = "新箱数")
+    @ApiModelProperty(value = "新箱数")
+    private Integer newCarrierCount;
+
+    @ApiModelProperty("箱子")
+    @TableField(exist = false)
+    private List<BizCarrier> carriers;
+}

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

@@ -0,0 +1,93 @@
+package cn.ezhizao.project.business.outsource.domain;
+
+import java.util.Date;
+
+import cn.ezhizao.framework.aspectj.lang.annotation.Excel;
+import cn.ezhizao.framework.web.domain.BaseEntity;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * 外协单从对应的外协工序的从对象 biz_outsourced_order_detail_process
+ *
+ * @author ezhizao
+ * @date 2024-05-28
+ */
+@Data
+@TableName(value = "biz_outsourced_order_detail_process")
+public class BizOutsourcedOrderDetailProcess extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 租户（厂别）id */
+    @ApiModelProperty(value = "${comment}")
+    private Long tenantId;
+
+    /** 单据号 */
+    @Excel(name = "单据号")
+    @ApiModelProperty(value = "单据号")
+    private String formCode;
+
+    /** 表单日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "表单日期", width = 30, dateFormat = "yyyy-MM-dd")
+    @ApiModelProperty(value = "表单日期")
+    private Date formDate;
+
+    /** 外协商id */
+    @ApiModelProperty(value = "表单日期")
+    private Long supplierId;
+
+    /** 外协商名称 */
+    @Excel(name = "外协商名称")
+    @ApiModelProperty(value = "外协商名称")
+    private String supplierName;
+
+    /** 0：自提；1：物流 */
+    @Excel(name = "0：自提；1：物流")
+    @ApiModelProperty(value = "0：自提；1：物流")
+    private Integer deliveryMethod;
+
+    /** 带箱方式：0：原箱；1：新箱 */
+    @Excel(name = "带箱方式：0：原箱；1：新箱")
+    @ApiModelProperty(value = "带箱方式：0：原箱；1：新箱")
+    private String packagingMethod;
+
+    /** 批次id */
+    @ApiModelProperty(value = "带箱方式：0：原箱；1：新箱")
+    private Long lotId;
+
+    /** 报工主表id */
+    @ApiModelProperty(value = "带箱方式：0：原箱；1：新箱")
+    private Long dayworkId;
+
+    /** 产品id */
+    @ApiModelProperty(value = "带箱方式：0：原箱；1：新箱")
+    private Long productId;
+
+    /** 产品描述 */
+    @Excel(name = "产品描述")
+    @ApiModelProperty(value = "产品描述")
+    private String productDescription;
+
+    /** 工艺id（通过工艺id，获取版本号） */
+    @ApiModelProperty(value = "产品描述")
+    private Long technologicalProcessId;
+
+    /** 工艺版本A,B,C */
+    @Excel(name = "工艺版本A,B,C")
+    @ApiModelProperty(value = "工艺版本A,B,C")
+    private String technologyVersion;
+
+    /** 工序id */
+    @ApiModelProperty(value = "工艺版本A,B,C")
+    private Long processId;
+
+    /** 工序简称 */
+    @Excel(name = "工序简称")
+    @ApiModelProperty(value = "工序简称")
+    private String processAlias;
+
+}

src/main/java/cn/ezhizao/project/business/outsource/mapper/BizOutsourcedOrderDetailMapper.java

@@ -0,0 +1,29 @@
+package cn.ezhizao.project.business.outsource.mapper;
+
+import java.util.List;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import cn.ezhizao.project.business.outsource.domain.BizOutsourcedOrderDetail;
+
+/**
+ * 外协单从Mapper接口
+ *
+ * @author ezhizao
+ * @date 2024-05-28
+ */
+public interface BizOutsourcedOrderDetailMapper extends BaseMapper<BizOutsourcedOrderDetail>
+{
+    /**
+     * 查询外协单从列表
+     *
+     * @param bizOutsourcedOrderDetail 外协单从
+     * @return 外协单从集合
+     */
+    public List<BizOutsourcedOrderDetail> getList(BizOutsourcedOrderDetail bizOutsourcedOrderDetail);
+
+    /**
+     * 物理删除
+     * @param bizOutsourcedOrderDetail
+     * @return 删除结果
+    */
+    public int physicalDelete(BizOutsourcedOrderDetail bizOutsourcedOrderDetail);
+}

src/main/java/cn/ezhizao/project/business/outsource/mapper/BizOutsourcedOrderDetailProcessMapper.java

@@ -0,0 +1,29 @@
+package cn.ezhizao.project.business.outsource.mapper;
+
+import java.util.List;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import cn.ezhizao.project.business.outsource.domain.BizOutsourcedOrderDetailProcess;
+
+/**
+ * 外协单从对应的外协工序的从Mapper接口
+ *
+ * @author ezhizao
+ * @date 2024-05-28
+ */
+public interface BizOutsourcedOrderDetailProcessMapper extends BaseMapper<BizOutsourcedOrderDetailProcess>
+{
+    /**
+     * 查询外协单从对应的外协工序的从列表
+     *
+     * @param bizOutsourcedOrderDetailProcess 外协单从对应的外协工序的从
+     * @return 外协单从对应的外协工序的从集合
+     */
+    public List<BizOutsourcedOrderDetailProcess> getList(BizOutsourcedOrderDetailProcess bizOutsourcedOrderDetailProcess);
+
+    /**
+     * 物理删除
+     * @param bizOutsourcedOrderDetailProcess
+     * @return 删除结果
+    */
+    public int physicalDelete(BizOutsourcedOrderDetailProcess bizOutsourcedOrderDetailProcess);
+}

src/main/java/cn/ezhizao/project/business/outsource/mapper/BizOutsourcedOrderMapper.java

@@ -0,0 +1,33 @@
+package cn.ezhizao.project.business.outsource.mapper;
+
+import java.util.List;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import cn.ezhizao.project.business.outsource.domain.BizOutsourcedOrder;
+
+/**
+ * 外协单主
+带箱方式，是整单的。如果换新箱子，明细中，都需要更换箱子Mapper接口
+ *
+ * @author ezhizao
+ * @date 2024-05-28
+ */
+public interface BizOutsourcedOrderMapper extends BaseMapper<BizOutsourcedOrder>
+{
+    /**
+     * 查询外协单主
+带箱方式，是整单的。如果换新箱子，明细中，都需要更换箱子列表
+     *
+     * @param bizOutsourcedOrder 外协单主
+带箱方式，是整单的。如果换新箱子，明细中，都需要更换箱子
+     * @return 外协单主
+带箱方式，是整单的。如果换新箱子，明细中，都需要更换箱子集合
+     */
+    public List<BizOutsourcedOrder> getList(BizOutsourcedOrder bizOutsourcedOrder);
+
+    /**
+     * 物理删除
+     * @param bizOutsourcedOrder
+     * @return 删除结果
+    */
+    public int physicalDelete(BizOutsourcedOrder bizOutsourcedOrder);
+}

src/main/java/cn/ezhizao/project/business/outsource/service/IBizOutsourcedOrderDetailProcessService.java

@@ -0,0 +1,30 @@
+package cn.ezhizao.project.business.outsource.service;
+
+import java.util.List;
+import com.baomidou.mybatisplus.extension.service.IService;
+import cn.ezhizao.project.business.outsource.domain.BizOutsourcedOrderDetailProcess;
+
+/**
+ * 外协单从对应的外协工序的从Service接口
+ *
+ * @author ezhizao
+ * @date 2024-05-28
+ */
+public interface IBizOutsourcedOrderDetailProcessService extends IService<BizOutsourcedOrderDetailProcess>
+{
+    /**
+     * 查询外协单从对应的外协工序的从列表
+     *
+     * @param bizOutsourcedOrderDetailProcess 外协单从对应的外协工序的从
+     * @return 外协单从对应的外协工序的从集合
+     */
+    public List<BizOutsourcedOrderDetailProcess> getList(BizOutsourcedOrderDetailProcess bizOutsourcedOrderDetailProcess);
+
+    /**
+     * 物理删除
+     * @param bizOutsourcedOrderDetailProcess
+     * @return 删除结果
+     */
+    public int physicalDelete(BizOutsourcedOrderDetailProcess bizOutsourcedOrderDetailProcess);
+
+}

src/main/java/cn/ezhizao/project/business/outsource/service/IBizOutsourcedOrderDetailService.java

@@ -0,0 +1,30 @@
+package cn.ezhizao.project.business.outsource.service;
+
+import java.util.List;
+import com.baomidou.mybatisplus.extension.service.IService;
+import cn.ezhizao.project.business.outsource.domain.BizOutsourcedOrderDetail;
+
+/**
+ * 外协单从Service接口
+ *
+ * @author ezhizao
+ * @date 2024-05-28
+ */
+public interface IBizOutsourcedOrderDetailService extends IService<BizOutsourcedOrderDetail>
+{
+    /**
+     * 查询外协单从列表
+     *
+     * @param bizOutsourcedOrderDetail 外协单从
+     * @return 外协单从集合
+     */
+    public List<BizOutsourcedOrderDetail> getList(BizOutsourcedOrderDetail bizOutsourcedOrderDetail);
+
+    /**
+     * 物理删除
+     * @param bizOutsourcedOrderDetail
+     * @return 删除结果
+     */
+    public int physicalDelete(BizOutsourcedOrderDetail bizOutsourcedOrderDetail);
+
+}

src/main/java/cn/ezhizao/project/business/outsource/service/IBizOutsourcedOrderService.java

@@ -0,0 +1,34 @@
+package cn.ezhizao.project.business.outsource.service;
+
+import java.util.List;
+import com.baomidou.mybatisplus.extension.service.IService;
+import cn.ezhizao.project.business.outsource.domain.BizOutsourcedOrder;
+
+/**
+ * 外协单主
+带箱方式，是整单的。如果换新箱子，明细中，都需要更换箱子Service接口
+ *
+ * @author ezhizao
+ * @date 2024-05-28
+ */
+public interface IBizOutsourcedOrderService extends IService<BizOutsourcedOrder>
+{
+    /**
+     * 查询外协单主
+带箱方式，是整单的。如果换新箱子，明细中，都需要更换箱子列表
+     *
+     * @param bizOutsourcedOrder 外协单主
+带箱方式，是整单的。如果换新箱子，明细中，都需要更换箱子
+     * @return 外协单主
+带箱方式，是整单的。如果换新箱子，明细中，都需要更换箱子集合
+     */
+    public List<BizOutsourcedOrder> getList(BizOutsourcedOrder bizOutsourcedOrder);
+
+    /**
+     * 物理删除
+     * @param bizOutsourcedOrder
+     * @return 删除结果
+     */
+    public int physicalDelete(BizOutsourcedOrder bizOutsourcedOrder);
+
+}

src/main/java/cn/ezhizao/project/business/outsource/service/impl/BizOutsourcedOrderDetailProcessServiceImpl.java

@@ -0,0 +1,43 @@
+package cn.ezhizao.project.business.outsource.service.impl;
+
+import java.util.List;
+import javax.annotation.Resource;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+import cn.ezhizao.project.business.outsource.mapper.BizOutsourcedOrderDetailProcessMapper;
+import cn.ezhizao.project.business.outsource.domain.BizOutsourcedOrderDetailProcess;
+import cn.ezhizao.project.business.outsource.service.IBizOutsourcedOrderDetailProcessService;
+
+/**
+ * 外协单从对应的外协工序的从Service业务层处理
+ *
+ * @author ezhizao
+ * @date 2024-05-28
+ */
+@Service
+public class BizOutsourcedOrderDetailProcessServiceImpl  extends ServiceImpl<BizOutsourcedOrderDetailProcessMapper, BizOutsourcedOrderDetailProcess> implements IBizOutsourcedOrderDetailProcessService
+{
+    @Resource
+    private BizOutsourcedOrderDetailProcessMapper bizOutsourcedOrderDetailProcessMapper;
+
+    /**
+     * 查询外协单从对应的外协工序的从列表
+     *
+     * @param bizOutsourcedOrderDetailProcess 外协单从对应的外协工序的从
+     * @return 外协单从对应的外协工序的从
+     */
+    @Override
+    public List<BizOutsourcedOrderDetailProcess> getList(BizOutsourcedOrderDetailProcess bizOutsourcedOrderDetailProcess)
+    {
+        return bizOutsourcedOrderDetailProcessMapper.getList(bizOutsourcedOrderDetailProcess);
+    }
+
+    /**
+     * 物理删除
+     * @param bizOutsourcedOrderDetailProcess
+     * @return 删除结果
+     */
+    @Override
+    public int physicalDelete(BizOutsourcedOrderDetailProcess bizOutsourcedOrderDetailProcess){ return bizOutsourcedOrderDetailProcessMapper.physicalDelete(bizOutsourcedOrderDetailProcess); };
+
+}

src/main/java/cn/ezhizao/project/business/outsource/service/impl/BizOutsourcedOrderDetailServiceImpl.java

@@ -0,0 +1,43 @@
+package cn.ezhizao.project.business.outsource.service.impl;
+
+import java.util.List;
+import javax.annotation.Resource;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+import cn.ezhizao.project.business.outsource.mapper.BizOutsourcedOrderDetailMapper;
+import cn.ezhizao.project.business.outsource.domain.BizOutsourcedOrderDetail;
+import cn.ezhizao.project.business.outsource.service.IBizOutsourcedOrderDetailService;
+
+/**
+ * 外协单从Service业务层处理
+ *
+ * @author ezhizao
+ * @date 2024-05-28
+ */
+@Service
+public class BizOutsourcedOrderDetailServiceImpl  extends ServiceImpl<BizOutsourcedOrderDetailMapper, BizOutsourcedOrderDetail> implements IBizOutsourcedOrderDetailService
+{
+    @Resource
+    private BizOutsourcedOrderDetailMapper bizOutsourcedOrderDetailMapper;
+
+    /**
+     * 查询外协单从列表
+     *
+     * @param bizOutsourcedOrderDetail 外协单从
+     * @return 外协单从
+     */
+    @Override
+    public List<BizOutsourcedOrderDetail> getList(BizOutsourcedOrderDetail bizOutsourcedOrderDetail)
+    {
+        return bizOutsourcedOrderDetailMapper.getList(bizOutsourcedOrderDetail);
+    }
+
+    /**
+     * 物理删除
+     * @param bizOutsourcedOrderDetail
+     * @return 删除结果
+     */
+    @Override
+    public int physicalDelete(BizOutsourcedOrderDetail bizOutsourcedOrderDetail){ return bizOutsourcedOrderDetailMapper.physicalDelete(bizOutsourcedOrderDetail); };
+
+}

src/main/java/cn/ezhizao/project/business/outsource/service/impl/BizOutsourcedOrderServiceImpl.java

@@ -0,0 +1,47 @@
+package cn.ezhizao.project.business.outsource.service.impl;
+
+import java.util.List;
+import javax.annotation.Resource;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+import cn.ezhizao.project.business.outsource.mapper.BizOutsourcedOrderMapper;
+import cn.ezhizao.project.business.outsource.domain.BizOutsourcedOrder;
+import cn.ezhizao.project.business.outsource.service.IBizOutsourcedOrderService;
+
+/**
+ * 外协单主
+带箱方式，是整单的。如果换新箱子，明细中，都需要更换箱子Service业务层处理
+ *
+ * @author ezhizao
+ * @date 2024-05-28
+ */
+@Service
+public class BizOutsourcedOrderServiceImpl  extends ServiceImpl<BizOutsourcedOrderMapper, BizOutsourcedOrder> implements IBizOutsourcedOrderService
+{
+    @Resource
+    private BizOutsourcedOrderMapper bizOutsourcedOrderMapper;
+
+    /**
+     * 查询外协单主
+带箱方式，是整单的。如果换新箱子，明细中，都需要更换箱子列表
+     *
+     * @param bizOutsourcedOrder 外协单主
+带箱方式，是整单的。如果换新箱子，明细中，都需要更换箱子
+     * @return 外协单主
+带箱方式，是整单的。如果换新箱子，明细中，都需要更换箱子
+     */
+    @Override
+    public List<BizOutsourcedOrder> getList(BizOutsourcedOrder bizOutsourcedOrder)
+    {
+        return bizOutsourcedOrderMapper.getList(bizOutsourcedOrder);
+    }
+
+    /**
+     * 物理删除
+     * @param bizOutsourcedOrder
+     * @return 删除结果
+     */
+    @Override
+    public int physicalDelete(BizOutsourcedOrder bizOutsourcedOrder){ return bizOutsourcedOrderMapper.physicalDelete(bizOutsourcedOrder); };
+
+}

src/main/java/cn/ezhizao/project/system/controller/SysDeptController.java

@@ -58,7 +58,7 @@ public class SysDeptController extends BaseController
             BizLotTechnologicalProcess technologicalProcess = bizLotTechnologicalProcessService.query().eq("lot_id", dept.getLotId()).eq("is_stop",0).one();
             dept.setLotTechnologicalProcessId(technologicalProcess.getId());
             departments = deptService.selectDeptListByTechnologyWasteRecyclingId(dept);
-        }else {
+        } else {
             departments = deptService.selectDeptListByPlanDetailsId(dept);
         }
         return success(departments);

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

@@ -0,0 +1,39 @@
+<?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.outsource.mapper.BizOutsourcedOrderDetailMapper">
+
+    <resultMap type="cn.ezhizao.project.business.outsource.domain.BizOutsourcedOrderDetail" id="BizOutsourcedOrderDetailResult">
+        <id column="id" property="id"/>
+    </resultMap>
+
+
+    <select id="getList" parameterType="BizOutsourcedOrderDetail" resultMap="BizOutsourcedOrderDetailResult">
+        SELECT * FROM biz_outsourced_order_detail
+        <trim prefix=" WHERE" suffix="" suffixOverrides="AND">
+            deleted = 0
+            <if test="formCode != null  and formCode != ''"> AND form_code = #{formCode}</if>
+            <if test="formDate != null "> AND form_date = #{formDate}</if>
+            <if test="supplierName != null  and supplierName != ''"> AND supplier_name like concat('%', #{supplierName}, '%')</if>
+            <if test="deliveryMethod != null "> AND delivery_method = #{deliveryMethod}</if>
+            <if test="packagingMethod != null  and packagingMethod != ''"> AND packaging_method = #{packagingMethod}</if>
+            <if test="productDescription != null  and productDescription != ''"> AND product_description = #{productDescription}</if>
+            <if test="technologyVersion != null  and technologyVersion != ''"> AND technology_version = #{technologyVersion}</if>
+            <if test="originalCarrier != null  and originalCarrier != ''"> AND original_carrier = #{originalCarrier}</if>
+            <if test="originalCarrierCount != null "> AND original_carrier_count = #{originalCarrierCount}</if>
+            <if test="newCarrier != null  and newCarrier != ''"> AND new_carrier = #{newCarrier}</if>
+            <if test="newCarrierCount != null "> AND new_carrier_count = #{newCarrierCount}</if>
+        </trim>
+    </select>
+
+    <delete id="physicalDelete">
+        DELETE FROM biz_outsourced_order_detail
+        <trim prefix=" WHERE" suffix="" suffixOverrides="AND">
+            <if test="id != null">
+                id = #{id} AND
+            </if>
+       <!-- 删除条件为其他外键可以在这里加 -->
+        </trim>
+    </delete>
+</mapper>

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

@@ -0,0 +1,36 @@
+<?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.outsource.mapper.BizOutsourcedOrderDetailProcessMapper">
+
+    <resultMap type="cn.ezhizao.project.business.outsource.domain.BizOutsourcedOrderDetailProcess" id="BizOutsourcedOrderDetailProcessResult">
+        <id column="id" property="id"/>
+    </resultMap>
+
+
+    <select id="getList" parameterType="BizOutsourcedOrderDetailProcess" resultMap="BizOutsourcedOrderDetailProcessResult">
+        SELECT * FROM biz_outsourced_order_detail_process
+        <trim prefix=" WHERE" suffix="" suffixOverrides="AND">
+            deleted = 0
+            <if test="formCode != null  and formCode != ''"> AND form_code = #{formCode}</if>
+            <if test="formDate != null "> AND form_date = #{formDate}</if>
+            <if test="supplierName != null  and supplierName != ''"> AND supplier_name like concat('%', #{supplierName}, '%')</if>
+            <if test="deliveryMethod != null "> AND delivery_method = #{deliveryMethod}</if>
+            <if test="packagingMethod != null  and packagingMethod != ''"> AND packaging_method = #{packagingMethod}</if>
+            <if test="productDescription != null  and productDescription != ''"> AND product_description = #{productDescription}</if>
+            <if test="technologyVersion != null  and technologyVersion != ''"> AND technology_version = #{technologyVersion}</if>
+            <if test="processAlias != null  and processAlias != ''"> AND process_alias = #{processAlias}</if>
+        </trim>
+    </select>
+
+    <delete id="physicalDelete">
+        DELETE FROM biz_outsourced_order_detail_process
+        <trim prefix=" WHERE" suffix="" suffixOverrides="AND">
+            <if test="id != null">
+                id = #{id} AND
+            </if>
+       <!-- 删除条件为其他外键可以在这里加 -->
+        </trim>
+    </delete>
+</mapper>

src/main/resources/mybatis/business/outsource/BizOutsourcedOrderMapper.xml

@@ -0,0 +1,38 @@
+<?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.outsource.mapper.BizOutsourcedOrderMapper">
+
+    <resultMap type="cn.ezhizao.project.business.outsource.domain.BizOutsourcedOrder" id="BizOutsourcedOrderResult">
+        <id column="id" property="id"/>
+    </resultMap>
+
+
+    <select id="getList" parameterType="BizOutsourcedOrder" resultMap="BizOutsourcedOrderResult">
+        SELECT * FROM biz_outsourced_order
+        <trim prefix=" WHERE" suffix="" suffixOverrides="AND">
+            deleted = 0
+            <if test="formCode != null  and formCode != ''"> AND form_code = #{formCode}</if>
+            <if test="formDate != null "> AND form_date = #{formDate}</if>
+            <if test="supplierName != null  and supplierName != ''"> AND supplier_name like concat('%', #{supplierName}, '%')</if>
+            <if test="keywords != null  and keywords != ''"> AND
+                ( supplier_name like concat('%', #{keywords}, '%') or
+                  form_code like concat('%', #{keywords}, '%') )</if>
+            <if test="deliveryMethod != null "> AND delivery_method = #{deliveryMethod}</if>
+            <if test="freightPrice != null "> AND freight_price = #{freightPrice}</if>
+            <if test="freightAmount != null "> AND freight_amount = #{freightAmount}</if>
+            <if test="packagingMethod != null  and packagingMethod != ''"> AND packaging_method = #{packagingMethod}</if>
+        </trim>
+    </select>
+
+    <delete id="physicalDelete">
+        DELETE FROM biz_outsourced_order
+        <trim prefix=" WHERE" suffix="" suffixOverrides="AND">
+            <if test="id != null">
+                id = #{id} AND
+            </if>
+       <!-- 删除条件为其他外键可以在这里加 -->
+        </trim>
+    </delete>
+</mapper>