Merge remote-tracking branch 'origin/master'

src/main/java/cn/ezhizao/project/business/auxiliaryDaywork/controller/BizDayworkAuxiliaryItemController.java

@@ -0,0 +1,254 @@
+package cn.ezhizao.project.business.auxiliaryDaywork.controller;
+
+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.auxiliaryDaywork.domain.BizAuxiliaryProcess;
+import cn.ezhizao.project.business.auxiliaryDaywork.domain.BizDayworkAuxiliaryItem;
+import cn.ezhizao.project.business.auxiliaryDaywork.domain.BizDayworkAuxiliaryItemReject;
+import cn.ezhizao.project.business.auxiliaryDaywork.service.IBizAuxiliaryProcessService;
+import cn.ezhizao.project.business.auxiliaryDaywork.service.IBizDayworkAuxiliaryItemRejectService;
+import cn.ezhizao.project.business.auxiliaryDaywork.service.IBizDayworkAuxiliaryItemService;
+import cn.ezhizao.project.business.outsource.service.IBizOutsourcedOrderDetailService;
+import cn.ezhizao.project.business.process.domain.BizProcess;
+import cn.ezhizao.project.business.process.service.IBizProcessService;
+import cn.ezhizao.project.business.product.domain.*;
+import cn.ezhizao.project.business.product.mapper.BizDayworkItemRejectMapper;
+import cn.ezhizao.project.business.product.service.*;
+import cn.ezhizao.project.business.resourceGroup.service.IBizProductionResourceGroupDetailService;
+import cn.ezhizao.project.business.technologicalProcessDetail.domain.BizTechnologicalProcessDetail;
+import cn.ezhizao.project.business.technologicalProcessDetail.service.IBizTechnologicalProcessDetailService;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.text.SimpleDateFormat;
+import java.util.*;
+import java.util.stream.Collectors;
+
+/**
+ * 辅助工序报工Controller
+ *
+ * @author ezhizao
+ * @date 2024-08-09
+ */
+@RestController
+@RequestMapping("/business/auxiliaryDaywork")
+public class BizDayworkAuxiliaryItemController extends BaseController {
+    @Resource
+    private IBizDayworkService bizDayworkService;
+
+    @Resource
+    private IBizTechnologicalProcessDetailService bizTechnologicalProcessDetailService;
+
+    @Resource
+    private IBizLotTechnologicalProcessDetailService bizTechnologicalAmendDetailService;
+
+    @Resource
+    private IBizOutsourcedOrderDetailService bizOutsourcedOrderDetailService;
+
+    @Resource
+    private IBizDayworkCarrierService bizDayworkCarrierService;
+
+    @Resource
+    private IBizLotTechnologicalProcessDetailService bizLotTechnologicalProcessDetailService;
+
+    @Resource
+    private IBizLotService bizLotService;
+
+    @Resource
+    private IBizProcessService bizProcessService;
+    @Resource
+    private IBizDayworkItemService bizDayworkItemService;
+    @Resource
+    private IBizDayworkItemRejectService bizDayworkItemRejectService;
+    @Resource
+    private IBizCarrierService bizCarrierService;
+    @Resource
+    private IBizReturnReceiptDetailService bizReturnReceiptDetailService;
+    @Resource
+    private IBizProductionResourceGroupDetailService bizProductionResourceGroupDetailService;
+    @Resource
+    private IBizLotTechnologicalProcessService bizLotTechnologicalProcessService;
+    @Resource
+    private IBizProductionPlanDetailService bizProductionPlanDetailService;
+    @Resource
+    private IBizProductService bizProductService;
+    @Resource
+    private IBizDayworkAuxiliaryItemService bizDayworkAuxiliaryItemService;
+    @Resource
+    private IBizDayworkAuxiliaryItemRejectService bizDayworkAuxiliaryItemRejectService;
+    @Resource
+    private IBizAuxiliaryProcessService bizAuxiliaryProcessService;
+
+    /**
+     * 查询序检主列表
+     */
+//    @PreAuthorize("@ss.hasPermi('business:inspecion:list')")
+    @PostMapping("/list")
+    public TableDataInfo list(@RequestBody BizDayworkAuxiliaryItem bizDayworkAuxiliaryItem) throws NoSuchFieldException, IllegalAccessException {
+
+        if (bizDayworkAuxiliaryItem.getStartTime() != null) {
+            Date startTimeDate = bizDayworkAuxiliaryItem.getStartTime();
+            // 使用 SimpleDateFormat 格式化 Date 对象为特定格式的字符串
+            SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd", Locale.getDefault());
+            String time = dateFormat.format(startTimeDate);
+
+            bizDayworkAuxiliaryItem.setStartTimeString(time + " 00:00:00");
+            bizDayworkAuxiliaryItem.setEndTimeString(time + " 23:59:59");
+        }
+
+        List<BizDayworkAuxiliaryItem> list = bizDayworkAuxiliaryItemService.getList(bizDayworkAuxiliaryItem);
+        return getDataTable(list);
+    }
+
+    @PostMapping("/getInfoById")
+    public AjaxResult getInfoById(@RequestBody BizDayworkAuxiliaryItem bizDayworkAuxiliaryItem) {
+        List<BizDayworkAuxiliaryItem> list = bizDayworkAuxiliaryItemService.getList(bizDayworkAuxiliaryItem);
+        BizDayworkAuxiliaryItem item = list.isEmpty() ? null : list.get(0);
+        if (item != null) {
+            BizDaywork bizDaywork = bizDayworkService.getById(item.getDayworkId());
+            item.setDaywork(bizDaywork);
+            BizProcess bizProcess = bizProcessService.getById(item.getProcessId());
+            item.setProcess(bizProcess);
+            BizProduct bizProduct = bizProductService.getById(bizDayworkAuxiliaryItem.getProductId());
+            item.setProduct(bizProduct);
+            item.setAuxiliaryProcess(bizAuxiliaryProcessService.getById(item.getAuxiliaryProcessId()));
+            BizTechnologicalProcessDetail bizTechnologicalProcessDetail = bizTechnologicalProcessDetailService.getById(item.getTechnologicalProcessDetailId());
+            item.setTechnologicalProcessDetail(bizTechnologicalProcessDetail);
+            List<BizDayworkAuxiliaryItemReject> bizDayworkAuxiliaryItemRejects = bizDayworkAuxiliaryItemRejectService.query().eq("daywork_auxiliary_item_id", item.getId()).list();
+            List<BizDayworkItem> dayworkItems = bizDayworkItemService.query().eq("daywork_id", item.getDayworkId()).eq("technological_process_detail_id", item.getTechnologicalProcessDetailId()).list();
+            bizDayworkAuxiliaryItemRejects.forEach(v -> {
+                v.setDayworkItem(dayworkItems.stream().filter(v1 -> v1.getId().equals(v.getDayworkItemId())).findFirst().orElse(new BizDayworkItem()));
+            });
+            item.setRejectList(bizDayworkAuxiliaryItemRejects);
+        }
+        return AjaxResult.success(item);
+    }
+
+    @PostMapping("/getInfoByCarrierCode")
+    public AjaxResult getInfoByCarrierCode(@RequestBody BizDayworkAuxiliaryItem bizDayworkAuxiliaryItem) {
+        BizCarrier bizCarrier = bizCarrierService.query().eq("code", bizDayworkAuxiliaryItem.getCarrierCode()).one();
+        List<BizDayworkCarrier> bizDayworkCarriers = bizDayworkCarrierService.query().eq("carrier_id", bizCarrier.getId()).eq("is_changed", 0).list();
+        List<BizDaywork> bizDayworks = bizDayworkService.query().in("id", bizDayworkCarriers.isEmpty() ? Collections.singletonList(0L) : bizDayworkCarriers.stream().map(BizDayworkCarrier::getDayworkId).collect(Collectors.toList())).list();
+        List<BizDayworkCarrier> carriers = bizDayworkCarrierService.query().eq("is_changed", 0).in("daywork_id", bizDayworks.isEmpty() ? Collections.singletonList(0L) : bizDayworks.stream().map(BizDaywork::getId).collect(Collectors.toList())).list();
+        List<BizDayworkItem> bizDayworkItems = bizDayworkItemService.query().in("daywork_id", bizDayworks.isEmpty() ? Collections.singletonList(0L) : bizDayworks.stream().map(BizDaywork::getId).collect(Collectors.toList())).list();
+        List<BizProduct> bizProducts = bizProductService.query().in("id", bizDayworks.isEmpty() ?Collections.singletonList(0L) : bizDayworks.stream().map(BizDaywork::getProductId).collect(Collectors.toList())).list();
+        bizDayworks.forEach(l -> {
+            BizProduct product = bizProducts.stream().filter(v -> v.getId().equals(l.getProductId())).findFirst().orElse(new BizProduct());
+            l.setDayworkItemList(bizDayworkItems.stream().filter(v -> v.getDayworkId().equals(l.getId())).sorted(Comparator.comparing(BizDayworkItem::getCreateTime).reversed()).collect(Collectors.toList()));
+            l.setDayworkCarriers(carriers.stream().filter(v -> v.getDayworkId().equals(l.getId())).collect(Collectors.toList()));
+            l.setProcessSequence(new ArrayList<>());
+            l.setAllCarrierName(l.getDayworkCarriers().stream().map(BizDayworkCarrier::getCarrierCode).collect(Collectors.joining(",")));
+            l.setCarrierCode(bizCarrier.getCode());
+            l.setProductDescription(product.getDescription());
+
+            if (l.getIsAmend().equals(1) || l.getIsWasteRecycling().equals(1)) {
+                List<BizLotTechnologicalProcessDetail> technologicalProcessDetails = bizLotTechnologicalProcessDetailService.query().in("id", l.getDayworkItemList().isEmpty() ? Collections.singletonList(0L) : l.getDayworkItemList().stream().map(BizDayworkItem::getTechnologicalProcessDetailId).collect(Collectors.toList())).list();
+                technologicalProcessDetails.forEach(v -> {
+                    BizProcess process = new BizProcess(v);
+                    l.getProcessSequence().add(process);
+                });
+            } else {
+                List<BizTechnologicalProcessDetail> technologicalProcessDetails = bizTechnologicalProcessDetailService.query().in("id", l.getDayworkItemList().isEmpty() ? Collections.singletonList(0L) : l.getDayworkItemList().stream().map(BizDayworkItem::getTechnologicalProcessDetailId).collect(Collectors.toList())).list();
+                technologicalProcessDetails.forEach(v -> {
+                    BizProcess process = new BizProcess(v);
+                    l.getProcessSequence().add(process);
+                });
+            }
+            l.getProcessSequence().sort(Comparator.comparing(BizProcess::getProcessStepNumber));
+        });
+        return success(bizDayworks);
+    }
+
+    @GetMapping("/getProcesses")
+    public AjaxResult getProcesses() {
+        List<BizAuxiliaryProcess> bizProcesses = bizAuxiliaryProcessService.query().list();
+        return success(bizProcesses);
+    }
+
+    @PostMapping("/save")
+    @Transactional
+    public AjaxResult save (@RequestBody BizDayworkAuxiliaryItem bizDayworkAuxiliaryItem) {
+        bizDayworkAuxiliaryItem.setDayworkId(bizDayworkAuxiliaryItem.getDaywork().getId());
+        bizDayworkAuxiliaryItem.setStartTime(new Date());
+//        List<BizDayworkItem> item = bizDayworkAuxiliaryItem.getDaywork().getDayworkItemList();
+        bizDayworkAuxiliaryItem.setTenantId(getLoginUser().getTenantId());
+        bizDayworkAuxiliaryItem.setProductionPlanId(bizDayworkAuxiliaryItem.getDaywork().getProductionPlanId());
+        bizDayworkAuxiliaryItem.setProductionPlanDetailId(bizDayworkAuxiliaryItem.getDaywork().getProductionPlanDetailId());
+        bizDayworkAuxiliaryItem.setProductionPlanDetailSubDetailId(bizDayworkAuxiliaryItem.getDaywork().getProductionPlanDetailSubDetailId());
+        bizDayworkAuxiliaryItem.setLotId(bizDayworkAuxiliaryItem.getDaywork().getLotId());
+        bizDayworkAuxiliaryItem.setLotCode(bizDayworkAuxiliaryItem.getDaywork().getLotCode());
+        bizDayworkAuxiliaryItem.setTechnologicalProcessId(bizDayworkAuxiliaryItem.getDaywork().getTechnologicalProcessId());
+        bizDayworkAuxiliaryItem.setStatus("0");
+        bizDayworkAuxiliaryItem.setTenantId(getLoginUser().getTenantId());
+        bizDayworkAuxiliaryItem.setProductId(bizDayworkAuxiliaryItem.getDaywork().getProductId());
+        List<BizDayworkAuxiliaryItemReject> rejects = new ArrayList<>();
+        List<BizDayworkItem> items = bizDayworkItemService.query().eq("daywork_id", bizDayworkAuxiliaryItem.getDayworkId()).eq("technological_process_detail_id", bizDayworkAuxiliaryItem.getTechnologicalProcessDetailId()).lt("status", "4").list();
+        bizDayworkAuxiliaryItemService.save(bizDayworkAuxiliaryItem);
+        items.forEach(l -> {
+            BizDayworkAuxiliaryItemReject reject = new BizDayworkAuxiliaryItemReject(l);
+            reject.setDayworkAuxiliaryItemId(bizDayworkAuxiliaryItem.getId());
+            reject.setUserName(bizDayworkAuxiliaryItem.getUserName());
+            reject.setNickName(bizDayworkAuxiliaryItem.getNickName());
+            reject.setTenantId(bizDayworkAuxiliaryItem.getTenantId());
+            rejects.add(reject);
+        });
+        bizDayworkAuxiliaryItemRejectService.saveBatch(rejects);
+        return success();
+    }
+
+    @PostMapping("/finished")
+    @Transactional
+    public AjaxResult finished (@RequestBody BizDayworkAuxiliaryItem bizDayworkAuxiliaryItem) {
+        // 添加报工废品
+        bizDayworkAuxiliaryItem.setStatus("3");
+        List<BizDayworkItemReject> rejects = new ArrayList<>();
+        bizDayworkAuxiliaryItem.getRejectList().forEach(l -> {
+            BizDayworkItemReject reject = new BizDayworkItemReject(l);
+            reject.setProductionPlanId(bizDayworkAuxiliaryItem.getProductionPlanId());
+            reject.setProductionPlanDetailSubDetailId(bizDayworkAuxiliaryItem.getProductionPlanDetailSubDetailId());
+            reject.setProductionPlanDetailId(bizDayworkAuxiliaryItem.getProductionPlanDetailId());
+            reject.setUserId(bizDayworkAuxiliaryItem.getUserId());
+            reject.setTenantId(l.getTenantId());
+            reject.setDeptId(bizDayworkAuxiliaryItem.getDeptId());
+            reject.setProcessId(bizDayworkAuxiliaryItem.getProcessId());
+            reject.setLotId(bizDayworkAuxiliaryItem.getLotId());
+            rejects.add(reject);
+        });
+        Integer rejectNum = bizDayworkAuxiliaryItem.getRejectList().stream().mapToInt(BizDayworkAuxiliaryItemReject::getRejectNum).sum();
+        // 修改报工表的合格数量
+        BizDaywork bizDaywork = bizDayworkService.getById(bizDayworkAuxiliaryItem.getDayworkId());
+        List<BizDayworkItem> bizDayworkItems = bizDayworkItemService.query().eq("daywork_id", bizDaywork.getId()).orderByDesc("create_time").list();
+        bizDaywork.setProcessQualifiedNum(bizDaywork.getProcessQualifiedNum() - rejectNum);
+        bizDaywork.setTemporaryProcessQualifiedNum(bizDaywork.getTemporaryProcessQualifiedNum() - rejectNum);
+        BizDayworkItem lastDaywork = bizDayworkItems.stream().filter(v -> v.getStatus().compareTo("4") < 0).sorted(Comparator.comparing(BizDayworkItem::getProcessStepNumber).thenComparing(BizDayworkItem::getStatus).reversed()).findFirst().orElse(new BizDayworkItem());
+        // 假设最新报工已完成 则修改下序报工的投产数量
+        if (lastDaywork.getStatus().compareTo("3") < 0) {
+            // 假设最新报工未完成 则修改本序投产数量。
+            // 获取当前工序 假设当前工序不是辅助生产工序则修改投产数量。
+            if (!lastDaywork.getTechnologicalProcessDetailId().equals(bizDayworkAuxiliaryItem.getTechnologicalProcessDetailId())) {
+                List<BizDayworkItem> items = bizDayworkItems.stream().filter(v -> v.getTechnologicalProcessDetailId().equals(lastDaywork.getTechnologicalProcessDetailId()) && v.getStatus().compareTo("3") < 0).collect(Collectors.toList());
+                items.forEach(l -> {
+                    l.setProdNum(l.getProdNum() - rejectNum);
+                });
+            }
+        }
+        bizDayworkService.updateById(bizDaywork);
+        bizDayworkAuxiliaryItemRejectService.saveOrUpdateBatch(bizDayworkAuxiliaryItem.getRejectList());
+        bizDayworkAuxiliaryItemService.updateById(bizDayworkAuxiliaryItem);
+        bizDayworkItemService.updateBatchById(bizDayworkItems);
+        bizDayworkItemRejectService.saveBatch(rejects);
+        return success();
+    }
+
+    @Transactional
+    @PostMapping("/pause")
+    public AjaxResult pause (@RequestBody BizDayworkAuxiliaryItem bizDayworkAuxiliaryItem) {
+        bizDayworkAuxiliaryItem.setStatus("1");
+        bizDayworkAuxiliaryItemService.updateById(bizDayworkAuxiliaryItem);
+        List<BizDayworkAuxiliaryItemReject> rejects = bizDayworkAuxiliaryItem.getRejectList();
+        bizDayworkAuxiliaryItemRejectService.saveOrUpdateBatch(rejects);
+        return success();
+    }
+}

src/main/java/cn/ezhizao/project/business/auxiliaryDaywork/domain/BizAuxiliaryProcess.java

@@ -0,0 +1,37 @@
+package cn.ezhizao.project.business.auxiliaryDaywork.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_auxiliary_process
+ *
+ * @author ezhizao
+ * @date 2024-08-20
+ */
+@Data
+@TableName(value = "biz_auxiliary_process")
+public class BizAuxiliaryProcess extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 辅助工序名称 */
+    @Excel(name = "辅助工序名称")
+    @ApiModelProperty(value = "辅助工序名称")
+    private String name;
+
+    /**
+     * 租户（厂别）id
+     */
+    @ApiModelProperty(value = "${comment}")
+    private Long tenantId;
+
+
+    @TableField(exist = true)
+    private String remark;
+
+}

src/main/java/cn/ezhizao/project/business/auxiliaryDaywork/domain/BizDayworkAuxiliaryItem.java

@@ -0,0 +1,167 @@
+package cn.ezhizao.project.business.auxiliaryDaywork.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.process.domain.BizProcess;
+import cn.ezhizao.project.business.product.domain.BizDaywork;
+import cn.ezhizao.project.business.product.domain.BizProduct;
+import cn.ezhizao.project.business.technologicalProcessDetail.domain.BizTechnologicalProcessDetail;
+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_daywork_auxiliary_item
+ *
+ * @author ezhizao
+ * @date 2024-08-20
+ */
+@Data
+@TableName(value = "biz_daywork_auxiliary_item")
+public class BizDayworkAuxiliaryItem extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 报工外键 */
+    @ApiModelProperty(value = "${comment}")
+    private Long dayworkId;
+
+    /** 用户id */
+    @ApiModelProperty(value = "${comment}")
+    private Long userId;
+
+    /** 租户（厂别）id */
+    @ApiModelProperty(value = "${comment}")
+    private Long tenantId;
+
+    /** 计划单id */
+    @ApiModelProperty(value = "${comment}")
+    private Long productionPlanId;
+
+    /** 计划单明细id */
+    @ApiModelProperty(value = "${comment}")
+    private Long productionPlanDetailId;
+
+    /** 子计划id */
+    @ApiModelProperty(value = "${comment}")
+    private Long productionPlanDetailSubDetailId;
+
+    /** 子计划工序对应的设备id？？？？？？？？？ */
+    @ApiModelProperty(value = "${comment}")
+    private Long productionPlanDetailSubDetailEquipmentId;
+
+    /** 批次号 */
+    @ApiModelProperty(value = "${comment}")
+    private Long lotId;
+
+    /** 工艺id（通过工艺id，获取版本号） */
+    @ApiModelProperty(value = "${comment}")
+    private Long technologicalProcessId;
+
+    /** 工艺版本明细id */
+    @ApiModelProperty(value = "${comment}")
+    private Long technologicalProcessDetailId;
+
+    /** 工序id */
+    @ApiModelProperty(value = "${comment}")
+    private Long processId;
+
+    /** 工段id（状态为：0、1、2、3时，dept_id,是当前工段，其它是下一工段id） */
+    @ApiModelProperty(value = "${comment}")
+    private Long deptId;
+
+    /** 工段名称 */
+    @Excel(name = "工段名称")
+    @ApiModelProperty(value = "工段名称")
+    private String deptName;
+
+    /** 生产状态 0:未开始, 1: 生产中, 2: 报工结束 ,3: 工序已完成, 4: 待周转，5: 周转中，6: 已送达，7：已接收 */
+    @Excel(name = "生产状态 0:未开始, 1: 生产中, 2: 报工结束 ,3: 工序已完成, 4: 待周转，5: 周转中，6: 已送达，7：已接收")
+    @ApiModelProperty(value = "生产状态 0:未开始, 1: 生产中, 2: 报工结束 ,3: 工序已完成, 4: 待周转，5: 周转中，6: 已送达，7：已接收")
+    private String status;
+
+    /** 员工编码 */
+    @Excel(name = "员工编码")
+    @ApiModelProperty(value = "员工编码")
+    private String userName;
+
+    /** 员工姓名 */
+    @Excel(name = "员工姓名")
+    @ApiModelProperty(value = "员工姓名")
+    private String nickName;
+
+    /** 开始时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "开始时间", width = 30, dateFormat = "yyyy-MM-dd")
+    @ApiModelProperty(value = "开始时间")
+    private Date startTime;
+
+    /** 结束时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "结束时间", width = 30, dateFormat = "yyyy-MM-dd")
+    @ApiModelProperty(value = "结束时间")
+    private Date endTime;
+
+    @ApiModelProperty("辅助工序外键")
+    private Long auxiliaryProcessId;
+
+    @ApiModelProperty("工序序号")
+    private String processStepNumber;
+
+    @ApiModelProperty("批次号")
+    private String lotCode;
+
+    @ApiModelProperty("产品id")
+    private Long productId;
+
+    @TableField(exist = false)
+    private String startTimeString;
+
+    @TableField(exist = false)
+    private String endTimeString;
+
+    @TableField(exist = false)
+    private Integer rejectSum;
+    @TableField(exist = false)
+    private Integer isAmend;
+    @TableField(exist = false)
+    private Integer isWasteRecycling;
+    @TableField(exist = false)
+    private String productDescription;
+    @TableField(exist = false)
+    private String carrierName;
+    @TableField(exist = false)
+    private BizDaywork daywork;
+    @TableField(exist = false)
+    private BizProcess process;
+    @TableField(exist = false)
+    private BizTechnologicalProcessDetail technologicalProcessDetail;
+    @TableField(exist = false)
+    private BizProcess processSequence;
+    @TableField(exist = false)
+    private BizAuxiliaryProcess auxiliaryProcess;
+
+    @TableField(exist = false)
+    private String carrierCode;
+    @TableField(exist = false)
+    private List<Long> carrierIds;
+
+    @TableField(exist = false)
+    private BizDaywork bizDaywork;
+
+    @TableField(exist = false)
+    private String processAlias;
+    @TableField(exist = false)
+    private String auxiliaryProcessAlias;
+    @TableField(exist = false)
+    private String keyword;
+    @TableField(exist = false)
+    private List<BizDayworkAuxiliaryItemReject> rejectList;
+    @TableField(exist = false)
+    private BizProduct product;
+}

src/main/java/cn/ezhizao/project/business/auxiliaryDaywork/domain/BizDayworkAuxiliaryItemReject.java

@@ -0,0 +1,74 @@
+package cn.ezhizao.project.business.auxiliaryDaywork.domain;
+
+import cn.ezhizao.framework.aspectj.lang.annotation.Excel;
+import cn.ezhizao.framework.web.domain.BaseEntity;
+import cn.ezhizao.project.business.product.domain.BizDayworkItem;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * 辅助工序报工废品对象 biz_daywork_auxiliary_item_reject
+ *
+ * @author ezhizao
+ * @date 2024-08-20
+ */
+@Data
+@TableName(value = "biz_daywork_auxiliary_item_reject")
+public class BizDayworkAuxiliaryItemReject extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** $column.columnComment */
+    @ApiModelProperty(value = "${comment}")
+    private Long dayworkAuxiliaryItemId;
+
+    /** $column.columnComment */
+    @ApiModelProperty(value = "${comment}")
+    private Long dayworkId;
+
+    /** $column.columnComment */
+    @ApiModelProperty(value = "${comment}")
+    private Long dayworkItemId;
+
+    /** 投产数(周转到外协时填写投产数，其余周转不填写) */
+    @Excel(name = "投产数(周转到外协时填写投产数，其余周转不填写)")
+    @ApiModelProperty(value = "投产数(周转到外协时填写投产数，其余周转不填写)")
+    private Integer prodNum;
+
+    /** 合格数 */
+    @Excel(name = "合格数")
+    @ApiModelProperty(value = "合格数")
+    private Integer qualifiedNum;
+
+    /** 废品数量 */
+    @Excel(name = "废品数量")
+    @ApiModelProperty(value = "废品数量")
+    private Integer rejectNum;
+
+    /** 员工编码 */
+    @Excel(name = "员工编码")
+    @ApiModelProperty(value = "员工编码")
+    private String userName;
+
+    /** 员工姓名 */
+    @Excel(name = "员工姓名")
+    @ApiModelProperty(value = "员工姓名")
+    private String nickName;
+
+    @ApiModelProperty("报工")
+    @TableField(exist = false)
+    private BizDayworkItem dayworkItem;
+
+    public BizDayworkAuxiliaryItemReject() {
+        super();
+    }
+
+    public BizDayworkAuxiliaryItemReject(BizDayworkItem l) {
+        super();
+        this.dayworkItemId = l.getId();
+        this.dayworkId = l.getDayworkId();
+        this.prodNum = l.getQualifiedNum();
+    }
+}

src/main/java/cn/ezhizao/project/business/auxiliaryDaywork/mapper/BizAuxiliaryProcessMapper.java

@@ -0,0 +1,30 @@
+package cn.ezhizao.project.business.auxiliaryDaywork.mapper;
+
+import cn.ezhizao.project.business.auxiliaryDaywork.domain.BizAuxiliaryProcess;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+import java.util.List;
+
+/**
+ * 辅助工序Mapper接口
+ *
+ * @author ezhizao
+ * @date 2024-08-20
+ */
+public interface BizAuxiliaryProcessMapper extends BaseMapper<BizAuxiliaryProcess>
+{
+    /**
+     * 查询辅助工序列表
+     *
+     * @param bizAuxiliaryProcess 辅助工序
+     * @return 辅助工序集合
+     */
+    public List<BizAuxiliaryProcess> getList(BizAuxiliaryProcess bizAuxiliaryProcess);
+
+    /**
+     * 物理删除
+     * @param bizAuxiliaryProcess
+     * @return 删除结果
+    */
+    public int physicalDelete(BizAuxiliaryProcess bizAuxiliaryProcess);
+}

src/main/java/cn/ezhizao/project/business/auxiliaryDaywork/mapper/BizDayworkAuxiliaryItemMapper.java

@@ -0,0 +1,29 @@
+package cn.ezhizao.project.business.auxiliaryDaywork.mapper;
+
+import java.util.List;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import cn.ezhizao.project.business.auxiliaryDaywork.domain.BizDayworkAuxiliaryItem;
+
+/**
+ * 辅助工序报工Mapper接口
+ *
+ * @author ezhizao
+ * @date 2024-08-20
+ */
+public interface BizDayworkAuxiliaryItemMapper extends BaseMapper<BizDayworkAuxiliaryItem>
+{
+    /**
+     * 查询辅助工序报工列表
+     *
+     * @param bizDayworkAuxiliaryItem 辅助工序报工
+     * @return 辅助工序报工集合
+     */
+    public List<BizDayworkAuxiliaryItem> getList(BizDayworkAuxiliaryItem bizDayworkAuxiliaryItem);
+
+    /**
+     * 物理删除
+     * @param bizDayworkAuxiliaryItem
+     * @return 删除结果
+    */
+    public int physicalDelete(BizDayworkAuxiliaryItem bizDayworkAuxiliaryItem);
+}

src/main/java/cn/ezhizao/project/business/auxiliaryDaywork/mapper/BizDayworkAuxiliaryItemRejectMapper.java

@@ -0,0 +1,29 @@
+package cn.ezhizao.project.business.auxiliaryDaywork.mapper;
+
+import java.util.List;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import cn.ezhizao.project.business.auxiliaryDaywork.domain.BizDayworkAuxiliaryItemReject;
+
+/**
+ * 辅助工序报工废品Mapper接口
+ *
+ * @author ezhizao
+ * @date 2024-08-20
+ */
+public interface BizDayworkAuxiliaryItemRejectMapper extends BaseMapper<BizDayworkAuxiliaryItemReject>
+{
+    /**
+     * 查询辅助工序报工废品列表
+     *
+     * @param bizDayworkAuxiliaryItemReject 辅助工序报工废品
+     * @return 辅助工序报工废品集合
+     */
+    public List<BizDayworkAuxiliaryItemReject> getList(BizDayworkAuxiliaryItemReject bizDayworkAuxiliaryItemReject);
+
+    /**
+     * 物理删除
+     * @param bizDayworkAuxiliaryItemReject
+     * @return 删除结果
+    */
+    public int physicalDelete(BizDayworkAuxiliaryItemReject bizDayworkAuxiliaryItemReject);
+}

src/main/java/cn/ezhizao/project/business/auxiliaryDaywork/service/IBizAuxiliaryProcessService.java

@@ -0,0 +1,31 @@
+package cn.ezhizao.project.business.auxiliaryDaywork.service;
+
+import cn.ezhizao.project.business.auxiliaryDaywork.domain.BizAuxiliaryProcess;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.List;
+
+/**
+ * 辅助工序Service接口
+ *
+ * @author ezhizao
+ * @date 2024-08-20
+ */
+public interface IBizAuxiliaryProcessService extends IService<BizAuxiliaryProcess>
+{
+    /**
+     * 查询辅助工序列表
+     *
+     * @param bizAuxiliaryProcess 辅助工序
+     * @return 辅助工序集合
+     */
+    public List<BizAuxiliaryProcess> getList(BizAuxiliaryProcess bizAuxiliaryProcess);
+
+    /**
+     * 物理删除
+     * @param bizAuxiliaryProcess
+     * @return 删除结果
+     */
+    public int physicalDelete(BizAuxiliaryProcess bizAuxiliaryProcess);
+
+}

src/main/java/cn/ezhizao/project/business/auxiliaryDaywork/service/IBizDayworkAuxiliaryItemRejectService.java

@@ -0,0 +1,30 @@
+package cn.ezhizao.project.business.auxiliaryDaywork.service;
+
+import java.util.List;
+import com.baomidou.mybatisplus.extension.service.IService;
+import cn.ezhizao.project.business.auxiliaryDaywork.domain.BizDayworkAuxiliaryItemReject;
+
+/**
+ * 辅助工序报工废品Service接口
+ *
+ * @author ezhizao
+ * @date 2024-08-20
+ */
+public interface IBizDayworkAuxiliaryItemRejectService extends IService<BizDayworkAuxiliaryItemReject>
+{
+    /**
+     * 查询辅助工序报工废品列表
+     *
+     * @param bizDayworkAuxiliaryItemReject 辅助工序报工废品
+     * @return 辅助工序报工废品集合
+     */
+    public List<BizDayworkAuxiliaryItemReject> getList(BizDayworkAuxiliaryItemReject bizDayworkAuxiliaryItemReject);
+
+    /**
+     * 物理删除
+     * @param bizDayworkAuxiliaryItemReject
+     * @return 删除结果
+     */
+    public int physicalDelete(BizDayworkAuxiliaryItemReject bizDayworkAuxiliaryItemReject);
+
+}

src/main/java/cn/ezhizao/project/business/auxiliaryDaywork/service/IBizDayworkAuxiliaryItemService.java

@@ -0,0 +1,30 @@
+package cn.ezhizao.project.business.auxiliaryDaywork.service;
+
+import java.util.List;
+import com.baomidou.mybatisplus.extension.service.IService;
+import cn.ezhizao.project.business.auxiliaryDaywork.domain.BizDayworkAuxiliaryItem;
+
+/**
+ * 辅助工序报工Service接口
+ *
+ * @author ezhizao
+ * @date 2024-08-20
+ */
+public interface IBizDayworkAuxiliaryItemService extends IService<BizDayworkAuxiliaryItem>
+{
+    /**
+     * 查询辅助工序报工列表
+     *
+     * @param bizDayworkAuxiliaryItem 辅助工序报工
+     * @return 辅助工序报工集合
+     */
+    public List<BizDayworkAuxiliaryItem> getList(BizDayworkAuxiliaryItem bizDayworkAuxiliaryItem);
+
+    /**
+     * 物理删除
+     * @param bizDayworkAuxiliaryItem
+     * @return 删除结果
+     */
+    public int physicalDelete(BizDayworkAuxiliaryItem bizDayworkAuxiliaryItem);
+
+}

src/main/java/cn/ezhizao/project/business/auxiliaryDaywork/service/impl/BizAuxiliaryProcessServiceImpl.java

@@ -0,0 +1,44 @@
+package cn.ezhizao.project.business.auxiliaryDaywork.service.impl;
+
+import cn.ezhizao.project.business.auxiliaryDaywork.domain.BizAuxiliaryProcess;
+import cn.ezhizao.project.business.auxiliaryDaywork.mapper.BizAuxiliaryProcessMapper;
+import cn.ezhizao.project.business.auxiliaryDaywork.service.IBizAuxiliaryProcessService;
+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 2024-08-20
+ */
+@Service
+public class BizAuxiliaryProcessServiceImpl extends ServiceImpl<BizAuxiliaryProcessMapper, BizAuxiliaryProcess> implements IBizAuxiliaryProcessService
+{
+    @Resource
+    private BizAuxiliaryProcessMapper bizAuxiliaryProcessMapper;
+
+    /**
+     * 查询辅助工序列表
+     *
+     * @param bizAuxiliaryProcess 辅助工序
+     * @return 辅助工序
+     */
+    @Override
+    public List<BizAuxiliaryProcess> getList(BizAuxiliaryProcess bizAuxiliaryProcess)
+    {
+        return bizAuxiliaryProcessMapper.getList(bizAuxiliaryProcess);
+    }
+
+    /**
+     * 物理删除
+     * @param bizAuxiliaryProcess
+     * @return 删除结果
+     */
+    @Override
+    public int physicalDelete(BizAuxiliaryProcess bizAuxiliaryProcess){ return bizAuxiliaryProcessMapper.physicalDelete(bizAuxiliaryProcess); };
+
+}

src/main/java/cn/ezhizao/project/business/auxiliaryDaywork/service/impl/BizDayworkAuxiliaryItemRejectServiceImpl.java

@@ -0,0 +1,43 @@
+package cn.ezhizao.project.business.auxiliaryDaywork.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.auxiliaryDaywork.mapper.BizDayworkAuxiliaryItemRejectMapper;
+import cn.ezhizao.project.business.auxiliaryDaywork.domain.BizDayworkAuxiliaryItemReject;
+import cn.ezhizao.project.business.auxiliaryDaywork.service.IBizDayworkAuxiliaryItemRejectService;
+
+/**
+ * 辅助工序报工废品Service业务层处理
+ *
+ * @author ezhizao
+ * @date 2024-08-20
+ */
+@Service
+public class BizDayworkAuxiliaryItemRejectServiceImpl  extends ServiceImpl<BizDayworkAuxiliaryItemRejectMapper, BizDayworkAuxiliaryItemReject> implements IBizDayworkAuxiliaryItemRejectService
+{
+    @Resource
+    private BizDayworkAuxiliaryItemRejectMapper bizDayworkAuxiliaryItemRejectMapper;
+
+    /**
+     * 查询辅助工序报工废品列表
+     *
+     * @param bizDayworkAuxiliaryItemReject 辅助工序报工废品
+     * @return 辅助工序报工废品
+     */
+    @Override
+    public List<BizDayworkAuxiliaryItemReject> getList(BizDayworkAuxiliaryItemReject bizDayworkAuxiliaryItemReject)
+    {
+        return bizDayworkAuxiliaryItemRejectMapper.getList(bizDayworkAuxiliaryItemReject);
+    }
+
+    /**
+     * 物理删除
+     * @param bizDayworkAuxiliaryItemReject
+     * @return 删除结果
+     */
+    @Override
+    public int physicalDelete(BizDayworkAuxiliaryItemReject bizDayworkAuxiliaryItemReject){ return bizDayworkAuxiliaryItemRejectMapper.physicalDelete(bizDayworkAuxiliaryItemReject); };
+
+}

src/main/java/cn/ezhizao/project/business/auxiliaryDaywork/service/impl/BizDayworkAuxiliaryItemServiceImpl.java

@@ -0,0 +1,43 @@
+package cn.ezhizao.project.business.auxiliaryDaywork.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.auxiliaryDaywork.mapper.BizDayworkAuxiliaryItemMapper;
+import cn.ezhizao.project.business.auxiliaryDaywork.domain.BizDayworkAuxiliaryItem;
+import cn.ezhizao.project.business.auxiliaryDaywork.service.IBizDayworkAuxiliaryItemService;
+
+/**
+ * 辅助工序报工Service业务层处理
+ *
+ * @author ezhizao
+ * @date 2024-08-20
+ */
+@Service
+public class BizDayworkAuxiliaryItemServiceImpl  extends ServiceImpl<BizDayworkAuxiliaryItemMapper, BizDayworkAuxiliaryItem> implements IBizDayworkAuxiliaryItemService
+{
+    @Resource
+    private BizDayworkAuxiliaryItemMapper bizDayworkAuxiliaryItemMapper;
+
+    /**
+     * 查询辅助工序报工列表
+     *
+     * @param bizDayworkAuxiliaryItem 辅助工序报工
+     * @return 辅助工序报工
+     */
+    @Override
+    public List<BizDayworkAuxiliaryItem> getList(BizDayworkAuxiliaryItem bizDayworkAuxiliaryItem)
+    {
+        return bizDayworkAuxiliaryItemMapper.getList(bizDayworkAuxiliaryItem);
+    }
+
+    /**
+     * 物理删除
+     * @param bizDayworkAuxiliaryItem
+     * @return 删除结果
+     */
+    @Override
+    public int physicalDelete(BizDayworkAuxiliaryItem bizDayworkAuxiliaryItem){ return bizDayworkAuxiliaryItemMapper.physicalDelete(bizDayworkAuxiliaryItem); };
+
+}

src/main/java/cn/ezhizao/project/business/process/domain/BizProcess.java

@@ -5,6 +5,7 @@ import cn.ezhizao.framework.web.domain.BaseEntity;
 import cn.ezhizao.project.business.deptProcess.domain.BizDeptProcess;
 import cn.ezhizao.project.business.product.domain.BizLotTechnologicalProcess;
 import cn.ezhizao.project.business.product.domain.BizLotTechnologicalProcessDetail;
+import cn.ezhizao.project.business.technologicalProcessDetail.domain.BizTechnologicalProcessDetail;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 
@@ -79,4 +80,12 @@ public class BizProcess extends BaseEntity
         this.setProcessStepNumber(p.getProcessStepNumber());
         this.setTechnologicalProcessDetailId(p.getId());
     }
+
+    public BizProcess(BizTechnologicalProcessDetail p) {
+        this.setId(p.getProcessId());
+        this.setProcessCode(p.getProcessCode());
+        this.setProcessAlias(p.getProcessAlias());
+        this.setProcessStepNumber(p.getProcessStepNumber());
+        this.setTechnologicalProcessDetailId(p.getId());
+    }
 }

src/main/java/cn/ezhizao/project/business/product/domain/BizDaywork.java

@@ -196,6 +196,8 @@ public class BizDaywork extends BaseEntity
     @TableField(exist = false)
     private String carrierCode;
     @TableField(exist = false)
+    private String allCarrierName;
+    @TableField(exist = false)
     private String productDescription;
     @TableField(exist = false)
     private String drawingNumber;
@@ -217,5 +219,4 @@ public class BizDaywork extends BaseEntity
     private List<BizInspectionChamber> inspectionChambers;
     @TableField(exist = false)
     private Integer prodNum;
-
 }

src/main/java/cn/ezhizao/project/business/product/domain/BizDayworkItemReject.java

@@ -3,6 +3,7 @@ package cn.ezhizao.project.business.product.domain;
 
 import cn.ezhizao.framework.aspectj.lang.annotation.Excel;
 import cn.ezhizao.framework.web.domain.BaseEntity;
+import cn.ezhizao.project.business.auxiliaryDaywork.domain.BizDayworkAuxiliaryItemReject;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModelProperty;
@@ -92,5 +93,24 @@ public class BizDayworkItemReject extends BaseEntity
     private String processAlias;
     @TableField(exist = false)
     private String nickName;
-
+    @ApiModelProperty("辅助工序报工")
+    private Long dayworkAuxiliaryItemId;
+    @ApiModelProperty("辅助工序报工废品")
+    private Long dayworkAuxiliaryItemRejectId;
+
+    public BizDayworkItemReject() {
+        super();
+    }
+
+    public BizDayworkItemReject(BizDayworkAuxiliaryItemReject l) {
+        super();
+        this.userId = l.getCreatorId();
+        this.tenantId = l.getTenantId();
+        this.dayworkId = l.getDayworkId();
+        this.dayworkItemId = l.getDayworkItemId();
+        this.reason = "辅助工序废品";
+        this.rejectNum = Long.valueOf(l.getRejectNum());
+        this.dayworkAuxiliaryItemId = l.getDayworkAuxiliaryItemId();
+        this.dayworkAuxiliaryItemRejectId = l.getId();
+    }
 }

src/main/resources/mybatis/business/auxiliaryDaywork/BizAuxiliaryProcessMapper.xml

@@ -0,0 +1,29 @@
+<?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.auxiliaryDaywork.mapper.BizAuxiliaryProcessMapper">
+
+    <resultMap type="cn.ezhizao.project.business.auxiliaryDaywork.domain.BizAuxiliaryProcess" id="BizAuxiliaryProcessResult">
+        <id column="id" property="id"/>
+    </resultMap>
+
+
+    <select id="getList" parameterType="BizAuxiliaryProcess" resultMap="BizAuxiliaryProcessResult">
+        SELECT * FROM biz_auxiliary_process
+        <trim prefix=" WHERE" suffix="" suffixOverrides="AND">
+            deleted = 0
+            <if test="name != null  and name != ''"> AND name like concat('%', #{name}, '%')</if>
+        </trim>
+    </select>
+
+    <delete id="physicalDelete">
+        DELETE FROM biz_auxiliary_process
+        <trim prefix=" WHERE" suffix="" suffixOverrides="AND">
+            <if test="id != null">
+                id = #{id} AND
+            </if>
+       <!-- 删除条件为其他外键可以在这里加 -->
+        </trim>
+    </delete>
+</mapper>

src/main/resources/mybatis/business/auxiliaryDaywork/BizDayworkAuxiliaryItemMapper.xml

@@ -0,0 +1,176 @@
+<?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.auxiliaryDaywork.mapper.BizDayworkAuxiliaryItemMapper">
+
+    <resultMap type="cn.ezhizao.project.business.auxiliaryDaywork.domain.BizDayworkAuxiliaryItem" id="BizDayworkAuxiliaryItemResult">
+        <id column="id" property="id"/>
+        <result column="lot_id" property="lotId"/>
+        <result column="daywork_id" property="dayworkId"/>
+        <result column="process_id" property="processId"/>
+        <result column="product_id" property="productId"/>
+        <result column="auxiliary_process_id" property="auxiliaryProcessId"/>
+        <result column="technological_process_id" property="technologicalProcessId"/>
+        <result column="technological_process_detail_id" property="technologicalProcessDetailId" />
+        <result column="production_plan_detail_id" property="productionPlanDetailId" />
+        <association property="rejectSum" javaType="java.lang.Integer" column="id" select="getRejectNumber"/>
+        <association property="isAmend" javaType="java.lang.Integer" column="daywork_id" select="getIsAmend"/>
+        <association property="isWasteRecycling" javaType="java.lang.Integer" column="daywork_id" select="getIsWasteRecycling"/>
+        <association property="productDescription" javaType="java.lang.String" column="product_id"
+                     select="getProductDescription"/>
+        <association property="lotCode" javaType="java.lang.String" column="lot_id" select="getLotCode"/>
+        <association property="carrierName" javaType="java.lang.String" column="daywork_id" select="getCarrier"/>
+        <association property="daywork" javaType="cn.ezhizao.project.business.product.domain.BizDaywork"
+                     column="daywork_id" select="getDaywork"/>
+        <association property="process" javaType="cn.ezhizao.project.business.process.domain.BizProcess"
+                     column="process_id" select="getProcess"/>
+        <association property="processAlias" javaType="java.lang.String" column="process_id" select="getProcessAlias"/>
+        <association property="auxiliaryProcessAlias" javaType="java.lang.String" column="auxiliary_process_id"
+                     select="getAuxiliaryProcessAlias"/>
+        <association property="technologicalProcessDetail"
+                     javaType="cn.ezhizao.project.business.technologicalProcessDetail.domain.BizTechnologicalProcessDetail"
+                     column="technological_process_detail_id" select="getTechnologicalProcessDetail"/>
+        <collection property="processSequence" ofType="cn.ezhizao.project.business.process.domain.BizProcess"
+                    column="technological_process_id" select="getProcessSequenceItem"/>
+    </resultMap>
+
+    <resultMap id="BizDayworkResult" type="cn.ezhizao.project.business.product.domain.BizDaywork">
+        <id column="id" property="id"/>
+    </resultMap>
+    <resultMap id="BizProcessResult" type="cn.ezhizao.project.business.process.domain.BizProcess">
+        <id column="id" property="id"/>
+    </resultMap>
+    <resultMap id="BizTechnologicalProcessDetailResult"
+               type="cn.ezhizao.project.business.technologicalProcessDetail.domain.BizTechnologicalProcessDetail">
+        <id column="id" property="id"/>
+    </resultMap>
+    <select id="getCarrier" resultType="java.lang.String">
+        select GROUP_CONCAT(code SEPARATOR '、') as carrierName
+        from biz_carrier
+        where id in
+        (select carrier_id from biz_daywork_carrier where deleted = 0 and is_changed = 0 and daywork_id = #{daywork_id} and process_inspection_id = 0)
+    </select>
+    <select id="getDaywork" resultMap="BizDayworkResult">
+        SELECT t1.*,t2.is_waste FROM biz_daywork t1 left join biz_lot t2 on t1.lot_id = t2.id
+        <trim prefix=" WHERE" suffix="" suffixOverrides="AND">
+            t1.deleted = 0
+            <if test="id!= null and id!= ''">AND t1.id = #{dayworkId}</if>
+        </trim>
+    </select>
+    <select id="getProcessAlias" resultType="java.lang.String">
+        select process_alias
+        from biz_process
+        where deleted = 0
+        and id = #{process_id}
+    </select>
+    <select id="getAuxiliaryProcessAlias" resultType="java.lang.String" >
+        select name
+        from biz_auxiliary_process
+        where deleted = 0
+        and id = #{auxiliary_process_id}
+    </select>
+    <select id="getRejectNumber" resultType="java.lang.Integer">
+        select IFNULL(SUM(reject_num), 0)
+        from biz_daywork_item_reject
+        where deleted = 0
+        and daywork_item_id = #{id}
+    </select>
+
+    <select id="getProcess" resultMap="BizProcessResult">
+        select *
+        from biz_process
+        where deleted = 0
+        and id = #{processId}
+    </select>
+    <select id="getIsAmend" resultType="Integer">
+        select is_amend from biz_daywork where id = #{daywork_id}
+    </select>
+    <select id="getIsWasteRecycling" resultType="Integer">
+        select is_waste_recycling from biz_daywork where id = #{daywork_id}
+    </select>
+    <select id="getTechnologicalProcessDetail" resultMap="BizTechnologicalProcessDetailResult">
+        select *
+        from biz_technological_process_detail
+        where deleted = 0
+        and id = #{technological_process_detail_id}
+    </select>
+    <select id="getProductDescription" resultType="java.lang.String">
+        select description as productDescription
+        from biz_product
+        where deleted = 0
+        and id = #{product_id}
+        <!--              (select product_id from biz_technological_process where deleted = 0 and id = #{technologicalProcessId})-->
+    </select>
+
+    <select id="getLotCode" resultType="java.lang.String">
+        SELECT lot_code FROM biz_lot WHERE id = #{lot_id}
+    </select>
+
+    <select id="getProcessSequenceItem" resultMap="BizProcessResult">
+        SELECT t1.*,
+        t2.id as technological_process_detail_id,
+        t2.process_step_number
+        FROM biz_process t1
+        JOIN biz_technological_process_detail t2 ON t1.id = t2.process_id
+        WHERE t1.deleted = 0
+        AND t2.deleted = 0
+        AND t2.technological_process_id = #{technological_processId}
+        AND t1.id != 1 AND t1.id !=2 AND t2.tenant_id != 9
+        ORDER BY
+        t2.process_step_number;
+    </select>
+    <select id="getProcessSequence" resultMap="BizProcessResult">
+        <choose>
+            <when test="is_amend == 0 and  is_waste_recycling == 0">
+                SELECT t1.*,
+                t2.id as technological_process_detail_id,
+                t2.process_step_number
+                FROM biz_process t1
+                JOIN biz_technological_process_detail t2 ON t1.id = t2.process_id
+                WHERE t1.deleted = 0
+                AND t2.deleted = 0
+                AND t2.technological_process_id = #{technological_processId}
+                AND t1.id != 1 AND t1.id !=2 AND t2.tenant_id != 9
+                ORDER BY
+                t2.process_step_number;
+            </when>
+            <otherwise>
+                SELECT t1.*,
+                t2.id as technological_process_detail_id,
+                t2.process_step_number
+                FROM biz_process t1
+                JOIN biz_lot_technological_process_detail t2 ON t1.id = t2.process_id
+                WHERE t1.deleted = 0
+                AND t2.deleted = 0
+                AND t2.lot_technological_process_id = #{technological_processId}
+                AND t1.id != 1 AND t1.id !=2 AND t2.tenant_id != 9
+                ORDER BY
+                t2.process_step_number;
+            </otherwise>
+        </choose>
+    </select>
+
+    <select id="getList" parameterType="BizDayworkAuxiliaryItem" resultMap="BizDayworkAuxiliaryItemResult">
+        SELECT t1.* FROM biz_daywork_auxiliary_item t1
+        <trim prefix=" WHERE" suffix="" suffixOverrides="AND">
+            t1.deleted = 0
+            <if test="deptName != null  and deptName != ''"> AND t1.dept_name like concat('%', #{deptName}, '%')</if>
+            <if test="status != null  and status != ''"> AND t1.status = #{status}</if>
+            <if test="userName != null  and userName != ''"> AND t1.user_name like concat('%', #{userName}, '%')</if>
+            <if test="nickName != null  and nickName != ''"> AND t1.nick_name like concat('%', #{nickName}, '%')</if>
+            <if test="startTimeString != null and startTimeString!=''">AND t1.start_time &gt;= #{startTimeString}</if>
+            <if test="endTimeString != null and endTimeString!='' ">AND t1.start_time &lt;= #{endTimeString}</if>
+        </trim>
+    </select>
+
+    <delete id="physicalDelete">
+        DELETE FROM biz_daywork_auxiliary_item
+        <trim prefix=" WHERE" suffix="" suffixOverrides="AND">
+            <if test="id != null">
+                id = #{id} AND
+            </if>
+       <!-- 删除条件为其他外键可以在这里加 -->
+        </trim>
+    </delete>
+</mapper>

src/main/resources/mybatis/business/auxiliaryDaywork/BizDayworkAuxiliaryItemRejectMapper.xml

@@ -0,0 +1,33 @@
+<?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.auxiliaryDaywork.mapper.BizDayworkAuxiliaryItemRejectMapper">
+
+    <resultMap type="cn.ezhizao.project.business.auxiliaryDaywork.domain.BizDayworkAuxiliaryItemReject" id="BizDayworkAuxiliaryItemRejectResult">
+        <id column="id" property="id"/>
+    </resultMap>
+
+
+    <select id="getList" parameterType="BizDayworkAuxiliaryItemReject" resultMap="BizDayworkAuxiliaryItemRejectResult">
+        SELECT * FROM biz_daywork_auxiliary_item_reject
+        <trim prefix=" WHERE" suffix="" suffixOverrides="AND">
+            deleted = 0
+            <if test="prodNum != null "> AND prod_num = #{prodNum}</if>
+            <if test="qualifiedNum != null "> AND qualified_num = #{qualifiedNum}</if>
+            <if test="rejectNum != null "> AND reject_num = #{rejectNum}</if>
+            <if test="userName != null  and userName != ''"> AND user_name like concat('%', #{userName}, '%')</if>
+            <if test="nickName != null  and nickName != ''"> AND nick_name like concat('%', #{nickName}, '%')</if>
+        </trim>
+    </select>
+
+    <delete id="physicalDelete">
+        DELETE FROM biz_daywork_auxiliary_item_reject
+        <trim prefix=" WHERE" suffix="" suffixOverrides="AND">
+            <if test="id != null">
+                id = #{id} AND
+            </if>
+       <!-- 删除条件为其他外键可以在这里加 -->
+        </trim>
+    </delete>
+</mapper>