lhq/FT501-WMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

任务 后台代码

Browse Source
This commit is contained in:
liuhanqing
2025-05-23 09:03:21 +08:00
parent 4e83b606fa
commit fd1c9ef5e8
17 changed files with 1516 additions and 576 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/controller/MydoJobController.java
View File

@@ -25,7 +25,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
* 任务表Controller
*
* @author ruoyi
* @date 2025-05-22
* @date 2025-05-23
*/
@RestController
@RequestMapping("/job/mydoJob")

108
ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/domain/MydoJob.java
View File

@@ -7,9 +7,9 @@ import com.ruoyi.common.core.domain.BaseEntity;
/**
* 任务表对象 mydo_job
*
*
* @author ruoyi
* @date 2025-05-22
* @date 2025-05-23
*/
public class MydoJob extends BaseEntity
{
@@ -20,11 +20,11 @@ public class MydoJob extends BaseEntity
private String jobId;
/** 任务状态 */
@Excel(name = "任务状态")
@Excel(name = "任务状态",dictType = "mydo_job_status")
private String status;
/** 上线类型 */
@Excel(name = "上线类型")
@Excel(name = "上线类型",dictType = "on_line_type")
private String onLineType;
/** 任务号 */
@@ -76,11 +76,11 @@ public class MydoJob extends BaseEntity
private Long priority;
/** 执行阶段 */
@Excel(name = "执行阶段")
@Excel(name = "执行阶段",dictType = "execution_phase_type")
private String executionPhase;
/** 任务类型 */
@Excel(name = "任务类型")
@Excel(name = "任务类型",dictType = "in_or_out_type")
private String inOrOut;
/** 开始时间 */
@@ -111,242 +111,242 @@ public class MydoJob extends BaseEntity
@Excel(name = "重分标记")
private String faultFlag;
public void setJobId(String jobId)
public void setJobId(String jobId)
{
this.jobId = jobId;
}
public String getJobId()
public String getJobId()
{
return jobId;
}
public void setStatus(String status)
public void setStatus(String status)
{
this.status = status;
}
public String getStatus()
public String getStatus()
{
return status;
}
public void setOnLineType(String onLineType)
public void setOnLineType(String onLineType)
{
this.onLineType = onLineType;
}
public String getOnLineType()
public String getOnLineType()
{
return onLineType;
}
public void setTaskNo(String taskNo)
public void setTaskNo(String taskNo)
{
this.taskNo = taskNo;
}
public String getTaskNo()
public String getTaskNo()
{
return taskNo;
}
public void setSupplierId(String supplierId)
public void setSupplierId(String supplierId)
{
this.supplierId = supplierId;
}
public String getSupplierId()
public String getSupplierId()
{
return supplierId;
}
public void setCustomerId(String customerId)
public void setCustomerId(String customerId)
{
this.customerId = customerId;
}
public String getCustomerId()
public String getCustomerId()
{
return customerId;
}
public void setDepartmentId(String departmentId)
public void setDepartmentId(String departmentId)
{
this.departmentId = departmentId;
}
public String getDepartmentId()
public String getDepartmentId()
{
return departmentId;
}
public void setTrayCode(String trayCode)
public void setTrayCode(String trayCode)
{
this.trayCode = trayCode;
}
public String getTrayCode()
public String getTrayCode()
{
return trayCode;
}
public void setRoadwayId(String roadwayId)
public void setRoadwayId(String roadwayId)
{
this.roadwayId = roadwayId;
}
public String getRoadwayId()
public String getRoadwayId()
{
return roadwayId;
}
public void setCargoSpaceId(String cargoSpaceId)
public void setCargoSpaceId(String cargoSpaceId)
{
this.cargoSpaceId = cargoSpaceId;
}
public String getCargoSpaceId()
public String getCargoSpaceId()
{
return cargoSpaceId;
}
public void setTargetRoadwayId(String targetRoadwayId)
public void setTargetRoadwayId(String targetRoadwayId)
{
this.targetRoadwayId = targetRoadwayId;
}
public String getTargetRoadwayId()
public String getTargetRoadwayId()
{
return targetRoadwayId;
}
public void setTargetCargoSpaceId(String targetCargoSpaceId)
public void setTargetCargoSpaceId(String targetCargoSpaceId)
{
this.targetCargoSpaceId = targetCargoSpaceId;
}
public String getTargetCargoSpaceId()
public String getTargetCargoSpaceId()
{
return targetCargoSpaceId;
}
public void setLineId(String lineId)
public void setLineId(String lineId)
{
this.lineId = lineId;
}
public String getLineId()
public String getLineId()
{
return lineId;
}
public void setWorkshopId(String workshopId)
public void setWorkshopId(String workshopId)
{
this.workshopId = workshopId;
}
public String getWorkshopId()
public String getWorkshopId()
{
return workshopId;
}
public void setPriority(Long priority)
public void setPriority(Long priority)
{
this.priority = priority;
}
public Long getPriority()
public Long getPriority()
{
return priority;
}
public void setExecutionPhase(String executionPhase)
public void setExecutionPhase(String executionPhase)
{
this.executionPhase = executionPhase;
}
public String getExecutionPhase()
public String getExecutionPhase()
{
return executionPhase;
}
public void setInOrOut(String inOrOut)
public void setInOrOut(String inOrOut)
{
this.inOrOut = inOrOut;
}
public String getInOrOut()
public String getInOrOut()
{
return inOrOut;
}
public void setStartTime(String startTime)
public void setStartTime(String startTime)
{
this.startTime = startTime;
}
public String getStartTime()
public String getStartTime()
{
return startTime;
}
public void setFinishTime(String finishTime)
public void setFinishTime(String finishTime)
{
this.finishTime = finishTime;
}
public String getFinishTime()
public String getFinishTime()
{
return finishTime;
}
public void setEntranceId(String entranceId)
public void setEntranceId(String entranceId)
{
this.entranceId = entranceId;
}
public String getEntranceId()
public String getEntranceId()
{
return entranceId;
}
public void setExitId(String exitId)
public void setExitId(String exitId)
{
this.exitId = exitId;
}
public String getExitId()
public String getExitId()
{
return exitId;
}
public void setClassId(String classId)
public void setClassId(String classId)
{
this.classId = classId;
}
public String getClassId()
public String getClassId()
{
return classId;
}
public void setWarehouseId(String warehouseId)
public void setWarehouseId(String warehouseId)
{
this.warehouseId = warehouseId;
}
public String getWarehouseId()
public String getWarehouseId()
{
return warehouseId;
}
public void setFaultFlag(String faultFlag)
public void setFaultFlag(String faultFlag)
{
this.faultFlag = faultFlag;
}
public String getFaultFlag()
public String getFaultFlag()
{
return faultFlag;
}

2
ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/mapper/MydoJobMapper.java
View File

@@ -7,7 +7,7 @@ import com.ruoyi.job.mydojob.domain.MydoJob;
* 任务表Mapper接口
*
* @author ruoyi
* @date 2025-05-22
* @date 2025-05-23
*/
public interface MydoJobMapper
{

2
ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/service/IMydoJobService.java
View File

@@ -7,7 +7,7 @@ import com.ruoyi.job.mydojob.domain.MydoJob;
* 任务表Service接口
*
* @author ruoyi
* @date 2025-05-22
* @date 2025-05-23
*/
public interface IMydoJobService
{

2
ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/service/impl/MydoJobServiceImpl.java
View File

@@ -12,7 +12,7 @@ import com.ruoyi.job.mydojob.service.IMydoJobService;
* 任务表Service业务层处理
*
* @author ruoyi
* @date 2025-05-22
* @date 2025-05-23
*/
@Service
public class MydoJobServiceImpl implements IMydoJobService

104
ruoyi-admin/src/main/java/com/ruoyi/job/mydojobdetailfinish/controller/MydoJobDetailFinishController.java Normal file
View File

@@ -0,0 +1,104 @@
package com.ruoyi.job.mydojobdetailfinish.controller;
import java.util.List;
import javax.servlet.http.HttpServletResponse;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
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 com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.job.mydojobdetailfinish.domain.MydoJobDetailFinish;
import com.ruoyi.job.mydojobdetailfinish.service.IMydoJobDetailFinishService;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.common.core.page.TableDataInfo;
/**
* 历史子作业Controller
*
* @author ruoyi
* @date 2025-05-23
*/
@RestController
@RequestMapping("/job/mydoJobDetailfinish")
public class MydoJobDetailFinishController extends BaseController
{
@Autowired
private IMydoJobDetailFinishService mydoJobDetailFinishService;
/**
* 查询历史子作业列表
*/
@PreAuthorize("@ss.hasPermi('job:mydoJobDetailfinish:list')")
@GetMapping("/list")
public TableDataInfo list(MydoJobDetailFinish mydoJobDetailFinish)
{
startPage();
List<MydoJobDetailFinish> list = mydoJobDetailFinishService.selectMydoJobDetailFinishList(mydoJobDetailFinish);
return getDataTable(list);
}
/**
* 导出历史子作业列表
*/
@PreAuthorize("@ss.hasPermi('job:mydoJobDetailfinish:export')")
@Log(title = "历史子作业", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, MydoJobDetailFinish mydoJobDetailFinish)
{
List<MydoJobDetailFinish> list = mydoJobDetailFinishService.selectMydoJobDetailFinishList(mydoJobDetailFinish);
ExcelUtil<MydoJobDetailFinish> util = new ExcelUtil<MydoJobDetailFinish>(MydoJobDetailFinish.class);
util.exportExcel(response, list, "历史子作业数据");
}
/**
* 获取历史子作业详细信息
*/
@PreAuthorize("@ss.hasPermi('job:mydoJobDetailfinish:query')")
@GetMapping(value = "/{jobDetailId}")
public AjaxResult getInfo(@PathVariable("jobDetailId") String jobDetailId)
{
return success(mydoJobDetailFinishService.selectMydoJobDetailFinishByJobDetailId(jobDetailId));
}
/**
* 新增历史子作业
*/
@PreAuthorize("@ss.hasPermi('job:mydoJobDetailfinish:add')")
@Log(title = "历史子作业", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody MydoJobDetailFinish mydoJobDetailFinish)
{
return toAjax(mydoJobDetailFinishService.insertMydoJobDetailFinish(mydoJobDetailFinish));
}
/**
* 修改历史子作业
*/
@PreAuthorize("@ss.hasPermi('job:mydoJobDetailfinish:edit')")
@Log(title = "历史子作业", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody MydoJobDetailFinish mydoJobDetailFinish)
{
return toAjax(mydoJobDetailFinishService.updateMydoJobDetailFinish(mydoJobDetailFinish));
}
/**
* 删除历史子作业
*/
@PreAuthorize("@ss.hasPermi('job:mydoJobDetailfinish:remove')")
@Log(title = "历史子作业", businessType = BusinessType.DELETE)
@DeleteMapping("/{jobDetailIds}")
public AjaxResult remove(@PathVariable String[] jobDetailIds)
{
return toAjax(mydoJobDetailFinishService.deleteMydoJobDetailFinishByJobDetailIds(jobDetailIds));
}
}

413
ruoyi-admin/src/main/java/com/ruoyi/job/mydojobdetailfinish/domain/MydoJobDetailFinish.java Normal file
View File

@@ -0,0 +1,413 @@
package com.ruoyi.job.mydojobdetailfinish.domain;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity;
/**
* 历史子作业对象 mydo_job_detail_finish
*
* @author ruoyi
* @date 2025-05-23
*/
public class MydoJobDetailFinish extends BaseEntity
{
private static final long serialVersionUID = 1L;
/** 子任务ID */
@Excel(name = "子任务ID")
private String jobDetailId;
/** 任务ID */
@Excel(name = "任务ID")
private String jobId;
/** 库存ID */
@Excel(name = "库存ID")
private String stockId;
/** 批次号 */
@Excel(name = "批次号")
private String lotNo;
/** 入库时间 */
@Excel(name = "入库时间")
private String inDate;
/** 单据ID */
@Excel(name = "单据ID")
private String inOrOutId;
/** 子单据ID */
@Excel(name = "子单据ID")
private String inOrOutDId;
/** 物料GUID */
@Excel(name = "物料GUID")
private String productGuid;
/** 物料编码 */
@Excel(name = "物料编码")
private String productId;
/** 库存状态 */
@Excel(name = "库存状态")
private String stockStatus;
/** 入库数量 */
@Excel(name = "入库数量")
private String inQuantity;
/** 库存数量 */
@Excel(name = "库存数量")
private String stockQuantity;
/** 出库数量 */
@Excel(name = "出库数量")
private String outQuantity;
/** 整层数量 */
@Excel(name = "整层数量")
private String layerQuantity;
/** 出库层数量 */
@Excel(name = "出库层数量")
private String outLayerQuantity;
/** 回流数量 */
@Excel(name = "回流数量")
private String giveNum;
/** 追溯入库单ID */
@Excel(name = "追溯入库单ID")
private String stockinId;
/** 垛型ID */
@Excel(name = "垛型ID")
private String stackingId;
/** 出库口ID */
@Excel(name = "出库口ID")
private String exitId;
/** 生产日期 */
@Excel(name = "生产日期")
private String printDate;
/** 客户ID */
@Excel(name = "客户ID")
private String customerId;
/** 供应商ID */
@Excel(name = "供应商ID")
private String supplierId;
/** 备用字段1 */
@Excel(name = "备用字段1")
private String spare1;
/** 备用字段2 */
@Excel(name = "备用字段2")
private String spare2;
/** 备用字段3 */
@Excel(name = "备用字段3")
private String spare3;
/** 备用字段4 */
@Excel(name = "备用字段4")
private String spare4;
public void setJobDetailId(String jobDetailId)
{
this.jobDetailId = jobDetailId;
}
public String getJobDetailId()
{
return jobDetailId;
}
public void setJobId(String jobId)
{
this.jobId = jobId;
}
public String getJobId()
{
return jobId;
}
public void setStockId(String stockId)
{
this.stockId = stockId;
}
public String getStockId()
{
return stockId;
}
public void setLotNo(String lotNo)
{
this.lotNo = lotNo;
}
public String getLotNo()
{
return lotNo;
}
public void setInDate(String inDate)
{
this.inDate = inDate;
}
public String getInDate()
{
return inDate;
}
public void setInOrOutId(String inOrOutId)
{
this.inOrOutId = inOrOutId;
}
public String getInOrOutId()
{
return inOrOutId;
}
public void setInOrOutDId(String inOrOutDId)
{
this.inOrOutDId = inOrOutDId;
}
public String getInOrOutDId()
{
return inOrOutDId;
}
public void setProductGuid(String productGuid)
{
this.productGuid = productGuid;
}
public String getProductGuid()
{
return productGuid;
}
public void setProductId(String productId)
{
this.productId = productId;
}
public String getProductId()
{
return productId;
}
public void setStockStatus(String stockStatus)
{
this.stockStatus = stockStatus;
}
public String getStockStatus()
{
return stockStatus;
}
public void setInQuantity(String inQuantity)
{
this.inQuantity = inQuantity;
}
public String getInQuantity()
{
return inQuantity;
}
public void setStockQuantity(String stockQuantity)
{
this.stockQuantity = stockQuantity;
}
public String getStockQuantity()
{
return stockQuantity;
}
public void setOutQuantity(String outQuantity)
{
this.outQuantity = outQuantity;
}
public String getOutQuantity()
{
return outQuantity;
}
public void setLayerQuantity(String layerQuantity)
{
this.layerQuantity = layerQuantity;
}
public String getLayerQuantity()
{
return layerQuantity;
}
public void setOutLayerQuantity(String outLayerQuantity)
{
this.outLayerQuantity = outLayerQuantity;
}
public String getOutLayerQuantity()
{
return outLayerQuantity;
}
public void setGiveNum(String giveNum)
{
this.giveNum = giveNum;
}
public String getGiveNum()
{
return giveNum;
}
public void setStockinId(String stockinId)
{
this.stockinId = stockinId;
}
public String getStockinId()
{
return stockinId;
}
public void setStackingId(String stackingId)
{
this.stackingId = stackingId;
}
public String getStackingId()
{
return stackingId;
}
public void setExitId(String exitId)
{
this.exitId = exitId;
}
public String getExitId()
{
return exitId;
}
public void setPrintDate(String printDate)
{
this.printDate = printDate;
}
public String getPrintDate()
{
return printDate;
}
public void setCustomerId(String customerId)
{
this.customerId = customerId;
}
public String getCustomerId()
{
return customerId;
}
public void setSupplierId(String supplierId)
{
this.supplierId = supplierId;
}
public String getSupplierId()
{
return supplierId;
}
public void setSpare1(String spare1)
{
this.spare1 = spare1;
}
public String getSpare1()
{
return spare1;
}
public void setSpare2(String spare2)
{
this.spare2 = spare2;
}
public String getSpare2()
{
return spare2;
}
public void setSpare3(String spare3)
{
this.spare3 = spare3;
}
public String getSpare3()
{
return spare3;
}
public void setSpare4(String spare4)
{
this.spare4 = spare4;
}
public String getSpare4()
{
return spare4;
}
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
.append("jobDetailId", getJobDetailId())
.append("jobId", getJobId())
.append("stockId", getStockId())
.append("lotNo", getLotNo())
.append("inDate", getInDate())
.append("inOrOutId", getInOrOutId())
.append("inOrOutDId", getInOrOutDId())
.append("productGuid", getProductGuid())
.append("productId", getProductId())
.append("stockStatus", getStockStatus())
.append("inQuantity", getInQuantity())
.append("stockQuantity", getStockQuantity())
.append("outQuantity", getOutQuantity())
.append("layerQuantity", getLayerQuantity())
.append("outLayerQuantity", getOutLayerQuantity())
.append("giveNum", getGiveNum())
.append("stockinId", getStockinId())
.append("stackingId", getStackingId())
.append("exitId", getExitId())
.append("printDate", getPrintDate())
.append("customerId", getCustomerId())
.append("supplierId", getSupplierId())
.append("spare1", getSpare1())
.append("spare2", getSpare2())
.append("spare3", getSpare3())
.append("spare4", getSpare4())
.toString();
}
}

61
ruoyi-admin/src/main/java/com/ruoyi/job/mydojobdetailfinish/mapper/MydoJobDetailFinishMapper.java Normal file
View File

@@ -0,0 +1,61 @@
package com.ruoyi.job.mydojobdetailfinish.mapper;
import java.util.List;
import com.ruoyi.job.mydojobdetailfinish.domain.MydoJobDetailFinish;
/**
* 历史子作业Mapper接口
*
* @author ruoyi
* @date 2025-05-23
*/
public interface MydoJobDetailFinishMapper
{
/**
* 查询历史子作业
*
* @param jobDetailId 历史子作业主键
* @return 历史子作业
*/
public MydoJobDetailFinish selectMydoJobDetailFinishByJobDetailId(String jobDetailId);
/**
* 查询历史子作业列表
*
* @param mydoJobDetailFinish 历史子作业
* @return 历史子作业集合
*/
public List<MydoJobDetailFinish> selectMydoJobDetailFinishList(MydoJobDetailFinish mydoJobDetailFinish);
/**
* 新增历史子作业
*
* @param mydoJobDetailFinish 历史子作业
* @return 结果
*/
public int insertMydoJobDetailFinish(MydoJobDetailFinish mydoJobDetailFinish);
/**
* 修改历史子作业
*
* @param mydoJobDetailFinish 历史子作业
* @return 结果
*/
public int updateMydoJobDetailFinish(MydoJobDetailFinish mydoJobDetailFinish);
/**
* 删除历史子作业
*
* @param jobDetailId 历史子作业主键
* @return 结果
*/
public int deleteMydoJobDetailFinishByJobDetailId(String jobDetailId);
/**
* 批量删除历史子作业
*
* @param jobDetailIds 需要删除的数据主键集合
* @return 结果
*/
public int deleteMydoJobDetailFinishByJobDetailIds(String[] jobDetailIds);
}

61
ruoyi-admin/src/main/java/com/ruoyi/job/mydojobdetailfinish/service/IMydoJobDetailFinishService.java Normal file
View File

@@ -0,0 +1,61 @@
package com.ruoyi.job.mydojobdetailfinish.service;
import java.util.List;
import com.ruoyi.job.mydojobdetailfinish.domain.MydoJobDetailFinish;
/**
* 历史子作业Service接口
*
* @author ruoyi
* @date 2025-05-23
*/
public interface IMydoJobDetailFinishService
{
/**
* 查询历史子作业
*
* @param jobDetailId 历史子作业主键
* @return 历史子作业
*/
public MydoJobDetailFinish selectMydoJobDetailFinishByJobDetailId(String jobDetailId);
/**
* 查询历史子作业列表
*
* @param mydoJobDetailFinish 历史子作业
* @return 历史子作业集合
*/
public List<MydoJobDetailFinish> selectMydoJobDetailFinishList(MydoJobDetailFinish mydoJobDetailFinish);
/**
* 新增历史子作业
*
* @param mydoJobDetailFinish 历史子作业
* @return 结果
*/
public int insertMydoJobDetailFinish(MydoJobDetailFinish mydoJobDetailFinish);
/**
* 修改历史子作业
*
* @param mydoJobDetailFinish 历史子作业
* @return 结果
*/
public int updateMydoJobDetailFinish(MydoJobDetailFinish mydoJobDetailFinish);
/**
* 批量删除历史子作业
*
* @param jobDetailIds 需要删除的历史子作业主键集合
* @return 结果
*/
public int deleteMydoJobDetailFinishByJobDetailIds(String[] jobDetailIds);
/**
* 删除历史子作业信息
*
* @param jobDetailId 历史子作业主键
* @return 结果
*/
public int deleteMydoJobDetailFinishByJobDetailId(String jobDetailId);
}

93
ruoyi-admin/src/main/java/com/ruoyi/job/mydojobdetailfinish/service/impl/MydoJobDetailFinishServiceImpl.java Normal file
View File

@@ -0,0 +1,93 @@
package com.ruoyi.job.mydojobdetailfinish.service.impl;
import java.util.List;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.ruoyi.job.mydojobdetailfinish.mapper.MydoJobDetailFinishMapper;
import com.ruoyi.job.mydojobdetailfinish.domain.MydoJobDetailFinish;
import com.ruoyi.job.mydojobdetailfinish.service.IMydoJobDetailFinishService;
/**
* 历史子作业Service业务层处理
*
* @author ruoyi
* @date 2025-05-23
*/
@Service
public class MydoJobDetailFinishServiceImpl implements IMydoJobDetailFinishService
{
@Autowired
private MydoJobDetailFinishMapper mydoJobDetailFinishMapper;
/**
* 查询历史子作业
*
* @param jobDetailId 历史子作业主键
* @return 历史子作业
*/
@Override
public MydoJobDetailFinish selectMydoJobDetailFinishByJobDetailId(String jobDetailId)
{
return mydoJobDetailFinishMapper.selectMydoJobDetailFinishByJobDetailId(jobDetailId);
}
/**
* 查询历史子作业列表
*
* @param mydoJobDetailFinish 历史子作业
* @return 历史子作业
*/
@Override
public List<MydoJobDetailFinish> selectMydoJobDetailFinishList(MydoJobDetailFinish mydoJobDetailFinish)
{
return mydoJobDetailFinishMapper.selectMydoJobDetailFinishList(mydoJobDetailFinish);
}
/**
* 新增历史子作业
*
* @param mydoJobDetailFinish 历史子作业
* @return 结果
*/
@Override
public int insertMydoJobDetailFinish(MydoJobDetailFinish mydoJobDetailFinish)
{
return mydoJobDetailFinishMapper.insertMydoJobDetailFinish(mydoJobDetailFinish);
}
/**
* 修改历史子作业
*
* @param mydoJobDetailFinish 历史子作业
* @return 结果
*/
@Override
public int updateMydoJobDetailFinish(MydoJobDetailFinish mydoJobDetailFinish)
{
return mydoJobDetailFinishMapper.updateMydoJobDetailFinish(mydoJobDetailFinish);
}
/**
* 批量删除历史子作业
*
* @param jobDetailIds 需要删除的历史子作业主键
* @return 结果
*/
@Override
public int deleteMydoJobDetailFinishByJobDetailIds(String[] jobDetailIds)
{
return mydoJobDetailFinishMapper.deleteMydoJobDetailFinishByJobDetailIds(jobDetailIds);
}
/**
* 删除历史子作业信息
*
* @param jobDetailId 历史子作业主键
* @return 结果
*/
@Override
public int deleteMydoJobDetailFinishByJobDetailId(String jobDetailId)
{
return mydoJobDetailFinishMapper.deleteMydoJobDetailFinishByJobDetailId(jobDetailId);
}
}

104
ruoyi-admin/src/main/java/com/ruoyi/job/mydojobfinish/controller/MydoJobFinishController.java Normal file
View File

@@ -0,0 +1,104 @@
package com.ruoyi.job.mydojobfinish.controller;
import java.util.List;
import javax.servlet.http.HttpServletResponse;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
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 com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.job.mydojobfinish.domain.MydoJobFinish;
import com.ruoyi.job.mydojobfinish.service.IMydoJobFinishService;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.common.core.page.TableDataInfo;
/**
* 历史主作业Controller
*
* @author ruoyi
* @date 2025-05-23
*/
@RestController
@RequestMapping("/job/mydoJobFinish")
public class MydoJobFinishController extends BaseController
{
@Autowired
private IMydoJobFinishService mydoJobFinishService;
/**
* 查询历史主作业列表
*/
@PreAuthorize("@ss.hasPermi('job:mydoJobFinish:list')")
@GetMapping("/list")
public TableDataInfo list(MydoJobFinish mydoJobFinish)
{
startPage();
List<MydoJobFinish> list = mydoJobFinishService.selectMydoJobFinishList(mydoJobFinish);
return getDataTable(list);
}
/**
* 导出历史主作业列表
*/
@PreAuthorize("@ss.hasPermi('job:mydoJobFinish:export')")
@Log(title = "历史主作业", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, MydoJobFinish mydoJobFinish)
{
List<MydoJobFinish> list = mydoJobFinishService.selectMydoJobFinishList(mydoJobFinish);
ExcelUtil<MydoJobFinish> util = new ExcelUtil<MydoJobFinish>(MydoJobFinish.class);
util.exportExcel(response, list, "历史主作业数据");
}
/**
* 获取历史主作业详细信息
*/
@PreAuthorize("@ss.hasPermi('job:mydoJobFinish:query')")
@GetMapping(value = "/{jobId}")
public AjaxResult getInfo(@PathVariable("jobId") String jobId)
{
return success(mydoJobFinishService.selectMydoJobFinishByJobId(jobId));
}
/**
* 新增历史主作业
*/
@PreAuthorize("@ss.hasPermi('job:mydoJobFinish:add')")
@Log(title = "历史主作业", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody MydoJobFinish mydoJobFinish)
{
return toAjax(mydoJobFinishService.insertMydoJobFinish(mydoJobFinish));
}
/**
* 修改历史主作业
*/
@PreAuthorize("@ss.hasPermi('job:mydoJobFinish:edit')")
@Log(title = "历史主作业", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody MydoJobFinish mydoJobFinish)
{
return toAjax(mydoJobFinishService.updateMydoJobFinish(mydoJobFinish));
}
/**
* 删除历史主作业
*/
@PreAuthorize("@ss.hasPermi('job:mydoJobFinish:remove')")
@Log(title = "历史主作业", businessType = BusinessType.DELETE)
@DeleteMapping("/{jobIds}")
public AjaxResult remove(@PathVariable String[] jobIds)
{
return toAjax(mydoJobFinishService.deleteMydoJobFinishByJobIds(jobIds));
}
}

582
ruoyi-admin/src/main/java/com/ruoyi/job/mydojobfinish/domain/MydoJobFinish.java
View File

@@ -6,709 +6,379 @@ import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity;
/**
* MydoJobFinish对象 mydo_job_finish
*
* @author gw
* @date 2025-05-21
* 历史主作业对象 mydo_job_finish
*
* @author ruoyi
* @date 2025-05-23
*/
public class MydoJobFinish extends BaseEntity
{
private static final long serialVersionUID = 1L;
/** $column.columnComment */
@Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
/** 任务ID */
@Excel(name = "任务ID")
private String jobId;
/** 1未执行 2 待执行 3正执行 4已完成 5 已作废 */
@Excel(name = "1未执行 2 待执行 3正执行 4已完成 5 已作废")
/** 任务状态 */
@Excel(name = "任务状态")
private String status;
/** $column.columnComment */
@Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
/** 上线类型 */
@Excel(name = "上线类型")
private String onLineType;
/** $column.columnComment */
@Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
/** 任务号 */
@Excel(name = "任务号")
private String taskNo;
/** $column.columnComment */
@Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
/** 供应商ID */
@Excel(name = "供应商ID")
private String supplierId;
/** $column.columnComment */
@Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
/** 客户ID */
@Excel(name = "客户ID")
private String customerId;
/** $column.columnComment */
@Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
/** 部门ID */
@Excel(name = "部门ID")
private String departmentId;
/** $column.columnComment */
@Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
/** 托盘码 */
@Excel(name = "托盘码")
private String trayCode;
/** $column.columnComment */
@Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
/** 巷道ID */
@Excel(name = "巷道ID")
private String roadwayId;
/** $column.columnComment */
@Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
/** 货位ID */
@Excel(name = "货位ID")
private String cargoSpaceId;
/** 445旧任务号 */
@Excel(name = "445旧任务号")
/** 目标巷道ID */
@Excel(name = "目标巷道ID")
private String targetRoadwayId;
/** $column.columnComment */
@Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
/** 目标货位ID */
@Excel(name = "目标货位ID")
private String targetCargoSpaceId;
/** 445产线 */
@Excel(name = "445产线")
/** 产线ID */
@Excel(name = "产线ID")
private String lineId;
/** 445车间 */
@Excel(name = "445车间")
/** 车间ID */
@Excel(name = "车间ID")
private String workshopId;
/** $column.columnComment */
@Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
/** 优先级 */
@Excel(name = "优先级")
private Long priority;
/** $column.columnComment */
@Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
/** 执行阶段 */
@Excel(name = "执行阶段")
private String executionPhase;
/** $column.columnComment */
@Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
/** 任务类型 */
@Excel(name = "任务类型")
private String inOrOut;
/** $column.columnComment */
@Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
/** 开始时间 */
@Excel(name = "开始时间")
private String startTime;
/** $column.columnComment */
@Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
/** 结束时间 */
@Excel(name = "结束时间")
private String finishTime;
/** $column.columnComment */
@Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
/** 入口ID */
@Excel(name = "入口ID")
private String entranceId;
/** 445装车口，出库过程自动选择 */
@Excel(name = "445装车口，出库过程自动选择")
/** 出口ID */
@Excel(name = "出口ID")
private String exitId;
/** 445单据指定出号 */
@Excel(name = "445单据指定出号")
private String classNowName;
/** $column.columnComment */
@Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
private String classWorkshopName;
/** $column.columnComment */
@Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
private String classgroupNumber;
/** $column.columnComment */
@Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
private String classWorkshopDateTime;
/** 445成品库异常口提示信息 默认0，提示值重 */
@Excel(name = "445成品库异常口提示信息 默认0，提示值重")
/** 班组ID */
@Excel(name = "班组ID")
private String classId;
/** $column.columnComment */
@Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
private String classNowDateTime;
/** 445仓库 */
@Excel(name = "445仓库")
/** 仓库ID */
@Excel(name = "仓库ID")
private String warehouseId;
/** 445装车顺序，分配指定 */
@Excel(name = "445装车顺序，分配指定")
private String outId;
/** 445出库去向(输送机目标)，wcs分配 (使用下发数字) */
@Excel(name = "445出库去向(输送机目标)，wcs分配 (使用下发数字)")
private String siteId;
/** $column.columnComment */
@Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
private String carNumber;
/** 445异常作业 0正常 1异常 2异常待处理 */
@Excel(name = "445异常作业 0正常 1异常 2异常待处理")
/** 重分标记 */
@Excel(name = "重分标记")
private String faultFlag;
/** $column.columnComment */
@Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
private String devId;
/** $column.columnComment */
@Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
private String stockSource;
/** 470高度 */
@Excel(name = "470高度")
private String floor;
/** 445原料库拣选台位置编号，agv取走后置为空 */
@Excel(name = "445原料库拣选台位置编号，agv取走后置为空")
private String location;
/** 445是否拣选，出库任务必填 0默认 1拣选 2不拣选 3拣完配送 4拣完入库 5拣完去称重 */
@Excel(name = "445是否拣选，出库任务必填 0默认 1拣选 2不拣选 3拣完配送 4拣完入库 5拣完去称重")
private String dwTime;
/** 445标记是否时合箱的托盘 0没有 1有 */
@Excel(name = "445标记是否时合箱的托盘 0没有 1有")
private String countId;
/** 445出库堆垛机放货完成 0默认 1出库放完成 */
@Excel(name = "445出库堆垛机放货完成 0默认 1出库放完成")
private String xdTime;
/** 下发标志 1：允许 2：下发完成 */
@Excel(name = "下发标志 1：允许 2：下发完成")
private String sendFlag;
/** agv状态 1:小车允许，3小车已执行 */
@Excel(name = "agv状态 1:小车允许，3小车已执行")
private String agvStatus;
/** 当前货物所在输送机，RGV接驳必用 */
@Excel(name = "当前货物所在输送机，RGV接驳必用")
private String wcsNo;
/** 445AGV原站点(拣选时必填) */
@Excel(name = "445AGV原站点(拣选时必填)")
private String srcAgv;
/** 445Agv目标站点 */
@Excel(name = "445Agv目标站点")
private String tarAgv;
/** 445自动分配组编号 */
@Excel(name = "445自动分配组编号")
private String groupGuid;
/** 470 照片位置 */
@Excel(name = "470 照片位置")
private String photoPath;
public void setJobId(String jobId)
public void setJobId(String jobId)
{
this.jobId = jobId;
}
public String getJobId()
public String getJobId()
{
return jobId;
}
public void setStatus(String status)
public void setStatus(String status)
{
this.status = status;
}
public String getStatus()
public String getStatus()
{
return status;
}
public void setOnLineType(String onLineType)
public void setOnLineType(String onLineType)
{
this.onLineType = onLineType;
}
public String getOnLineType()
public String getOnLineType()
{
return onLineType;
}
public void setTaskNo(String taskNo)
public void setTaskNo(String taskNo)
{
this.taskNo = taskNo;
}
public String getTaskNo()
public String getTaskNo()
{
return taskNo;
}
public void setSupplierId(String supplierId)
public void setSupplierId(String supplierId)
{
this.supplierId = supplierId;
}
public String getSupplierId()
public String getSupplierId()
{
return supplierId;
}
public void setCustomerId(String customerId)
public void setCustomerId(String customerId)
{
this.customerId = customerId;
}
public String getCustomerId()
public String getCustomerId()
{
return customerId;
}
public void setDepartmentId(String departmentId)
public void setDepartmentId(String departmentId)
{
this.departmentId = departmentId;
}
public String getDepartmentId()
public String getDepartmentId()
{
return departmentId;
}
public void setTrayCode(String trayCode)
public void setTrayCode(String trayCode)
{
this.trayCode = trayCode;
}
public String getTrayCode()
public String getTrayCode()
{
return trayCode;
}
public void setRoadwayId(String roadwayId)
public void setRoadwayId(String roadwayId)
{
this.roadwayId = roadwayId;
}
public String getRoadwayId()
public String getRoadwayId()
{
return roadwayId;
}
public void setCargoSpaceId(String cargoSpaceId)
public void setCargoSpaceId(String cargoSpaceId)
{
this.cargoSpaceId = cargoSpaceId;
}
public String getCargoSpaceId()
public String getCargoSpaceId()
{
return cargoSpaceId;
}
public void setTargetRoadwayId(String targetRoadwayId)
public void setTargetRoadwayId(String targetRoadwayId)
{
this.targetRoadwayId = targetRoadwayId;
}
public String getTargetRoadwayId()
public String getTargetRoadwayId()
{
return targetRoadwayId;
}
public void setTargetCargoSpaceId(String targetCargoSpaceId)
public void setTargetCargoSpaceId(String targetCargoSpaceId)
{
this.targetCargoSpaceId = targetCargoSpaceId;
}
public String getTargetCargoSpaceId()
public String getTargetCargoSpaceId()
{
return targetCargoSpaceId;
}
public void setLineId(String lineId)
public void setLineId(String lineId)
{
this.lineId = lineId;
}
public String getLineId()
public String getLineId()
{
return lineId;
}
public void setWorkshopId(String workshopId)
public void setWorkshopId(String workshopId)
{
this.workshopId = workshopId;
}
public String getWorkshopId()
public String getWorkshopId()
{
return workshopId;
}
public void setPriority(Long priority)
public void setPriority(Long priority)
{
this.priority = priority;
}
public Long getPriority()
public Long getPriority()
{
return priority;
}
public void setExecutionPhase(String executionPhase)
public void setExecutionPhase(String executionPhase)
{
this.executionPhase = executionPhase;
}
public String getExecutionPhase()
public String getExecutionPhase()
{
return executionPhase;
}
public void setInOrOut(String inOrOut)
public void setInOrOut(String inOrOut)
{
this.inOrOut = inOrOut;
}
public String getInOrOut()
public String getInOrOut()
{
return inOrOut;
}
public void setStartTime(String startTime)
public void setStartTime(String startTime)
{
this.startTime = startTime;
}
public String getStartTime()
public String getStartTime()
{
return startTime;
}
public void setFinishTime(String finishTime)
public void setFinishTime(String finishTime)
{
this.finishTime = finishTime;
}
public String getFinishTime()
public String getFinishTime()
{
return finishTime;
}
public void setEntranceId(String entranceId)
public void setEntranceId(String entranceId)
{
this.entranceId = entranceId;
}
public String getEntranceId()
public String getEntranceId()
{
return entranceId;
}
public void setExitId(String exitId)
public void setExitId(String exitId)
{
this.exitId = exitId;
}
public String getExitId()
public String getExitId()
{
return exitId;
}
public void setClassNowName(String classNowName)
{
this.classNowName = classNowName;
}
public String getClassNowName()
{
return classNowName;
}
public void setClassWorkshopName(String classWorkshopName)
{
this.classWorkshopName = classWorkshopName;
}
public String getClassWorkshopName()
{
return classWorkshopName;
}
public void setClassgroupNumber(String classgroupNumber)
{
this.classgroupNumber = classgroupNumber;
}
public String getClassgroupNumber()
{
return classgroupNumber;
}
public void setClassWorkshopDateTime(String classWorkshopDateTime)
{
this.classWorkshopDateTime = classWorkshopDateTime;
}
public String getClassWorkshopDateTime()
{
return classWorkshopDateTime;
}
public void setClassId(String classId)
public void setClassId(String classId)
{
this.classId = classId;
}
public String getClassId()
public String getClassId()
{
return classId;
}
public void setClassNowDateTime(String classNowDateTime)
{
this.classNowDateTime = classNowDateTime;
}
public String getClassNowDateTime()
{
return classNowDateTime;
}
public void setWarehouseId(String warehouseId)
public void setWarehouseId(String warehouseId)
{
this.warehouseId = warehouseId;
}
public String getWarehouseId()
public String getWarehouseId()
{
return warehouseId;
}
public void setOutId(String outId)
{
this.outId = outId;
}
public String getOutId()
{
return outId;
}
public void setSiteId(String siteId)
{
this.siteId = siteId;
}
public String getSiteId()
{
return siteId;
}
public void setCarNumber(String carNumber)
{
this.carNumber = carNumber;
}
public String getCarNumber()
{
return carNumber;
}
public void setFaultFlag(String faultFlag)
public void setFaultFlag(String faultFlag)
{
this.faultFlag = faultFlag;
}
public String getFaultFlag()
public String getFaultFlag()
{
return faultFlag;
}
public void setDevId(String devId)
{
this.devId = devId;
}
public String getDevId()
{
return devId;
}
public void setStockSource(String stockSource)
{
this.stockSource = stockSource;
}
public String getStockSource()
{
return stockSource;
}
public void setFloor(String floor)
{
this.floor = floor;
}
public String getFloor()
{
return floor;
}
public void setLocation(String location)
{
this.location = location;
}
public String getLocation()
{
return location;
}
public void setDwTime(String dwTime)
{
this.dwTime = dwTime;
}
public String getDwTime()
{
return dwTime;
}
public void setCountId(String countId)
{
this.countId = countId;
}
public String getCountId()
{
return countId;
}
public void setXdTime(String xdTime)
{
this.xdTime = xdTime;
}
public String getXdTime()
{
return xdTime;
}
public void setSendFlag(String sendFlag)
{
this.sendFlag = sendFlag;
}
public String getSendFlag()
{
return sendFlag;
}
public void setAgvStatus(String agvStatus)
{
this.agvStatus = agvStatus;
}
public String getAgvStatus()
{
return agvStatus;
}
public void setWcsNo(String wcsNo)
{
this.wcsNo = wcsNo;
}
public String getWcsNo()
{
return wcsNo;
}
public void setSrcAgv(String srcAgv)
{
this.srcAgv = srcAgv;
}
public String getSrcAgv()
{
return srcAgv;
}
public void setTarAgv(String tarAgv)
{
this.tarAgv = tarAgv;
}
public String getTarAgv()
{
return tarAgv;
}
public void setGroupGuid(String groupGuid)
{
this.groupGuid = groupGuid;
}
public String getGroupGuid()
{
return groupGuid;
}
public void setPhotoPath(String photoPath)
{
this.photoPath = photoPath;
}
public String getPhotoPath()
{
return photoPath;
}
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
.append("jobId", getJobId())
.append("status", getStatus())
.append("onLineType", getOnLineType())
.append("taskNo", getTaskNo())
.append("supplierId", getSupplierId())
.append("customerId", getCustomerId())
.append("departmentId", getDepartmentId())
.append("trayCode", getTrayCode())
.append("roadwayId", getRoadwayId())
.append("cargoSpaceId", getCargoSpaceId())
.append("targetRoadwayId", getTargetRoadwayId())
.append("targetCargoSpaceId", getTargetCargoSpaceId())
.append("lineId", getLineId())
.append("workshopId", getWorkshopId())
.append("priority", getPriority())
.append("executionPhase", getExecutionPhase())
.append("inOrOut", getInOrOut())
.append("createTime", getCreateTime())
.append("startTime", getStartTime())
.append("finishTime", getFinishTime())
.append("entranceId", getEntranceId())
.append("exitId", getExitId())
.append("classNowName", getClassNowName())
.append("classWorkshopName", getClassWorkshopName())
.append("classgroupNumber", getClassgroupNumber())
.append("classWorkshopDateTime", getClassWorkshopDateTime())
.append("classId", getClassId())
.append("classNowDateTime", getClassNowDateTime())
.append("warehouseId", getWarehouseId())
.append("outId", getOutId())
.append("siteId", getSiteId())
.append("carNumber", getCarNumber())
.append("faultFlag", getFaultFlag())
.append("devId", getDevId())
.append("stockSource", getStockSource())
.append("floor", getFloor())
.append("location", getLocation())
.append("dwTime", getDwTime())
.append("countId", getCountId())
.append("xdTime", getXdTime())
.append("sendFlag", getSendFlag())
.append("agvStatus", getAgvStatus())
.append("wcsNo", getWcsNo())
.append("srcAgv", getSrcAgv())
.append("tarAgv", getTarAgv())
.append("groupGuid", getGroupGuid())
.append("photoPath", getPhotoPath())
.toString();
.append("jobId", getJobId())
.append("status", getStatus())
.append("onLineType", getOnLineType())
.append("taskNo", getTaskNo())
.append("supplierId", getSupplierId())
.append("customerId", getCustomerId())
.append("departmentId", getDepartmentId())
.append("trayCode", getTrayCode())
.append("roadwayId", getRoadwayId())
.append("cargoSpaceId", getCargoSpaceId())
.append("targetRoadwayId", getTargetRoadwayId())
.append("targetCargoSpaceId", getTargetCargoSpaceId())
.append("lineId", getLineId())
.append("workshopId", getWorkshopId())
.append("priority", getPriority())
.append("executionPhase", getExecutionPhase())
.append("inOrOut", getInOrOut())
.append("createTime", getCreateTime())
.append("startTime", getStartTime())
.append("finishTime", getFinishTime())
.append("entranceId", getEntranceId())
.append("exitId", getExitId())
.append("classId", getClassId())
.append("warehouseId", getWarehouseId())
.append("faultFlag", getFaultFlag())
.toString();
}
}

62
ruoyi-admin/src/main/java/com/ruoyi/job/mydojobfinish/mapper/MydoJobFinishMapper.java
View File

@@ -1,23 +1,61 @@
package com.ruoyi.job.mydojobfinish.mapper;
import java.util.List;
import com.ruoyi.job.mydojobfinish.domain.MydoJobFinish;
import java.util.List;
/**
* MydoJobFinish Mapper 接口
*
* @author gw
* @date 2025-05-21
* 历史主作业Mapper接口
*
* @author ruoyi
* @date 2025-05-23
*/
public interface MydoJobFinishMapper
public interface MydoJobFinishMapper
{
/**
* 查询 MydoJobFinish 列表
*
* @param mydoJobFinish MydoJobFinish
* @return MydoJobFinish 集合
* 查询历史主作业
*
* @param jobId 历史主作业主键
* @return 历史主作业
*/
public MydoJobFinish selectMydoJobFinishByJobId(String jobId);
/**
* 查询历史主作业列表
*
* @param mydoJobFinish 历史主作业
* @return 历史主作业集合
*/
public List<MydoJobFinish> selectMydoJobFinishList(MydoJobFinish mydoJobFinish);
}
/**
* 新增历史主作业
*
* @param mydoJobFinish 历史主作业
* @return 结果
*/
public int insertMydoJobFinish(MydoJobFinish mydoJobFinish);
/**
* 修改历史主作业
*
* @param mydoJobFinish 历史主作业
* @return 结果
*/
public int updateMydoJobFinish(MydoJobFinish mydoJobFinish);
/**
* 删除历史主作业
*
* @param jobId 历史主作业主键
* @return 结果
*/
public int deleteMydoJobFinishByJobId(String jobId);
/**
* 批量删除历史主作业
*
* @param jobIds 需要删除的数据主键集合
* @return 结果
*/
public int deleteMydoJobFinishByJobIds(String[] jobIds);
}

61
ruoyi-admin/src/main/java/com/ruoyi/job/mydojobfinish/service/IMydoJobFinishService.java Normal file
View File

@@ -0,0 +1,61 @@
package com.ruoyi.job.mydojobfinish.service;
import java.util.List;
import com.ruoyi.job.mydojobfinish.domain.MydoJobFinish;
/**
* 历史主作业Service接口
*
* @author ruoyi
* @date 2025-05-23
*/
public interface IMydoJobFinishService
{
/**
* 查询历史主作业
*
* @param jobId 历史主作业主键
* @return 历史主作业
*/
public MydoJobFinish selectMydoJobFinishByJobId(String jobId);
/**
* 查询历史主作业列表
*
* @param mydoJobFinish 历史主作业
* @return 历史主作业集合
*/
public List<MydoJobFinish> selectMydoJobFinishList(MydoJobFinish mydoJobFinish);
/**
* 新增历史主作业
*
* @param mydoJobFinish 历史主作业
* @return 结果
*/
public int insertMydoJobFinish(MydoJobFinish mydoJobFinish);
/**
* 修改历史主作业
*
* @param mydoJobFinish 历史主作业
* @return 结果
*/
public int updateMydoJobFinish(MydoJobFinish mydoJobFinish);
/**
* 批量删除历史主作业
*
* @param jobIds 需要删除的历史主作业主键集合
* @return 结果
*/
public int deleteMydoJobFinishByJobIds(String[] jobIds);
/**
* 删除历史主作业信息
*
* @param jobId 历史主作业主键
* @return 结果
*/
public int deleteMydoJobFinishByJobId(String jobId);
}

95
ruoyi-admin/src/main/java/com/ruoyi/job/mydojobfinish/service/impl/MydoJobFinishServiceImpl.java Normal file
View File

@@ -0,0 +1,95 @@
package com.ruoyi.job.mydojobfinish.service.impl;
import java.util.List;
import com.ruoyi.common.utils.DateUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.ruoyi.job.mydojobfinish.mapper.MydoJobFinishMapper;
import com.ruoyi.job.mydojobfinish.domain.MydoJobFinish;
import com.ruoyi.job.mydojobfinish.service.IMydoJobFinishService;
/**
* 历史主作业Service业务层处理
*
* @author ruoyi
* @date 2025-05-23
*/
@Service
public class MydoJobFinishServiceImpl implements IMydoJobFinishService
{
@Autowired
private MydoJobFinishMapper mydoJobFinishMapper;
/**
* 查询历史主作业
*
* @param jobId 历史主作业主键
* @return 历史主作业
*/
@Override
public MydoJobFinish selectMydoJobFinishByJobId(String jobId)
{
return mydoJobFinishMapper.selectMydoJobFinishByJobId(jobId);
}
/**
* 查询历史主作业列表
*
* @param mydoJobFinish 历史主作业
* @return 历史主作业
*/
@Override
public List<MydoJobFinish> selectMydoJobFinishList(MydoJobFinish mydoJobFinish)
{
return mydoJobFinishMapper.selectMydoJobFinishList(mydoJobFinish);
}
/**
* 新增历史主作业
*
* @param mydoJobFinish 历史主作业
* @return 结果
*/
@Override
public int insertMydoJobFinish(MydoJobFinish mydoJobFinish)
{
mydoJobFinish.setCreateTime(DateUtils.getNowDate());
return mydoJobFinishMapper.insertMydoJobFinish(mydoJobFinish);
}
/**
* 修改历史主作业
*
* @param mydoJobFinish 历史主作业
* @return 结果
*/
@Override
public int updateMydoJobFinish(MydoJobFinish mydoJobFinish)
{
return mydoJobFinishMapper.updateMydoJobFinish(mydoJobFinish);
}
/**
* 批量删除历史主作业
*
* @param jobIds 需要删除的历史主作业主键
* @return 结果
*/
@Override
public int deleteMydoJobFinishByJobIds(String[] jobIds)
{
return mydoJobFinishMapper.deleteMydoJobFinishByJobIds(jobIds);
}
/**
* 删除历史主作业信息
*
* @param jobId 历史主作业主键
* @return 结果
*/
@Override
public int deleteMydoJobFinishByJobId(String jobId)
{
return mydoJobFinishMapper.deleteMydoJobFinishByJobId(jobId);
}
}

179
ruoyi-admin/src/main/resources/mapper/job/MydoJobDetailFinishMapper.xml Normal file
View File

@@ -0,0 +1,179 @@
<?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="com.ruoyi.job.mydojobdetailfinish.mapper.MydoJobDetailFinishMapper">
<resultMap type="MydoJobDetailFinish" id="MydoJobDetailFinishResult">
<result property="jobDetailId" column="job_detail_id" />
<result property="jobId" column="job_id" />
<result property="stockId" column="stock_id" />
<result property="lotNo" column="lot_no" />
<result property="inDate" column="in_date" />
<result property="inOrOutId" column="in_or_out_id" />
<result property="inOrOutDId" column="in_or_out_d_id" />
<result property="productGuid" column="product_guid" />
<result property="productId" column="product_id" />
<result property="stockStatus" column="stock_status" />
<result property="inQuantity" column="in_quantity" />
<result property="stockQuantity" column="stock_quantity" />
<result property="outQuantity" column="out_quantity" />
<result property="layerQuantity" column="layer_quantity" />
<result property="outLayerQuantity" column="out_layer_quantity" />
<result property="giveNum" column="give_num" />
<result property="stockinId" column="stockin_id" />
<result property="stackingId" column="stacking_id" />
<result property="exitId" column="exit_id" />
<result property="printDate" column="print_date" />
<result property="customerId" column="customer_id" />
<result property="supplierId" column="supplier_id" />
<result property="spare1" column="spare1" />
<result property="spare2" column="spare2" />
<result property="spare3" column="spare3" />
<result property="spare4" column="spare4" />
</resultMap>
<sql id="selectMydoJobDetailFinishVo">
select job_detail_id, job_id, stock_id, lot_no, in_date, in_or_out_id, in_or_out_d_id, product_guid, product_id, stock_status, in_quantity, stock_quantity, out_quantity, layer_quantity, out_layer_quantity, give_num, stockin_id, stacking_id, exit_id, print_date, customer_id, supplier_id, spare1, spare2, spare3, spare4 from mydo_job_detail_finish
</sql>
<select id="selectMydoJobDetailFinishList" parameterType="MydoJobDetailFinish" resultMap="MydoJobDetailFinishResult">
<include refid="selectMydoJobDetailFinishVo"/>
<where>
<if test="jobDetailId != null and jobDetailId != ''"> and job_detail_id = #{jobDetailId}</if>
<if test="jobId != null and jobId != ''"> and job_id = #{jobId}</if>
<if test="stockId != null and stockId != ''"> and stock_id = #{stockId}</if>
<if test="lotNo != null and lotNo != ''"> and lot_no = #{lotNo}</if>
<if test="inDate != null and inDate != ''"> and in_date = #{inDate}</if>
<if test="inOrOutId != null and inOrOutId != ''"> and in_or_out_id = #{inOrOutId}</if>
<if test="inOrOutDId != null and inOrOutDId != ''"> and in_or_out_d_id = #{inOrOutDId}</if>
<if test="productGuid != null and productGuid != ''"> and product_guid = #{productGuid}</if>
<if test="productId != null and productId != ''"> and product_id = #{productId}</if>
<if test="stockStatus != null and stockStatus != ''"> and stock_status = #{stockStatus}</if>
<if test="inQuantity != null and inQuantity != ''"> and in_quantity = #{inQuantity}</if>
<if test="stockQuantity != null and stockQuantity != ''"> and stock_quantity = #{stockQuantity}</if>
<if test="outQuantity != null and outQuantity != ''"> and out_quantity = #{outQuantity}</if>
<if test="layerQuantity != null and layerQuantity != ''"> and layer_quantity = #{layerQuantity}</if>
<if test="outLayerQuantity != null and outLayerQuantity != ''"> and out_layer_quantity = #{outLayerQuantity}</if>
<if test="giveNum != null and giveNum != ''"> and give_num = #{giveNum}</if>
<if test="stockinId != null and stockinId != ''"> and stockin_id = #{stockinId}</if>
<if test="stackingId != null and stackingId != ''"> and stacking_id = #{stackingId}</if>
<if test="exitId != null and exitId != ''"> and exit_id = #{exitId}</if>
<if test="printDate != null and printDate != ''"> and print_date = #{printDate}</if>
<if test="customerId != null and customerId != ''"> and customer_id = #{customerId}</if>
<if test="supplierId != null and supplierId != ''"> and supplier_id = #{supplierId}</if>
<if test="spare1 != null and spare1 != ''"> and spare1 = #{spare1}</if>
<if test="spare2 != null and spare2 != ''"> and spare2 = #{spare2}</if>
<if test="spare3 != null and spare3 != ''"> and spare3 = #{spare3}</if>
<if test="spare4 != null and spare4 != ''"> and spare4 = #{spare4}</if>
</where>
</select>
<select id="selectMydoJobDetailFinishByJobDetailId" parameterType="String" resultMap="MydoJobDetailFinishResult">
<include refid="selectMydoJobDetailFinishVo"/>
where job_detail_id = #{jobDetailId}
</select>
<insert id="insertMydoJobDetailFinish" parameterType="MydoJobDetailFinish">
insert into mydo_job_detail_finish
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="jobDetailId != null and jobDetailId != ''">job_detail_id,</if>
<if test="jobId != null and jobId != ''">job_id,</if>
<if test="stockId != null">stock_id,</if>
<if test="lotNo != null">lot_no,</if>
<if test="inDate != null">in_date,</if>
<if test="inOrOutId != null">in_or_out_id,</if>
<if test="inOrOutDId != null">in_or_out_d_id,</if>
<if test="productGuid != null">product_guid,</if>
<if test="productId != null">product_id,</if>
<if test="stockStatus != null">stock_status,</if>
<if test="inQuantity != null">in_quantity,</if>
<if test="stockQuantity != null">stock_quantity,</if>
<if test="outQuantity != null">out_quantity,</if>
<if test="layerQuantity != null">layer_quantity,</if>
<if test="outLayerQuantity != null">out_layer_quantity,</if>
<if test="giveNum != null">give_num,</if>
<if test="stockinId != null">stockin_id,</if>
<if test="stackingId != null">stacking_id,</if>
<if test="exitId != null">exit_id,</if>
<if test="printDate != null">print_date,</if>
<if test="customerId != null">customer_id,</if>
<if test="supplierId != null">supplier_id,</if>
<if test="spare1 != null">spare1,</if>
<if test="spare2 != null">spare2,</if>
<if test="spare3 != null">spare3,</if>
<if test="spare4 != null">spare4,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="jobDetailId != null and jobDetailId != ''">#{jobDetailId},</if>
<if test="jobId != null and jobId != ''">#{jobId},</if>
<if test="stockId != null">#{stockId},</if>
<if test="lotNo != null">#{lotNo},</if>
<if test="inDate != null">#{inDate},</if>
<if test="inOrOutId != null">#{inOrOutId},</if>
<if test="inOrOutDId != null">#{inOrOutDId},</if>
<if test="productGuid != null">#{productGuid},</if>
<if test="productId != null">#{productId},</if>
<if test="stockStatus != null">#{stockStatus},</if>
<if test="inQuantity != null">#{inQuantity},</if>
<if test="stockQuantity != null">#{stockQuantity},</if>
<if test="outQuantity != null">#{outQuantity},</if>
<if test="layerQuantity != null">#{layerQuantity},</if>
<if test="outLayerQuantity != null">#{outLayerQuantity},</if>
<if test="giveNum != null">#{giveNum},</if>
<if test="stockinId != null">#{stockinId},</if>
<if test="stackingId != null">#{stackingId},</if>
<if test="exitId != null">#{exitId},</if>
<if test="printDate != null">#{printDate},</if>
<if test="customerId != null">#{customerId},</if>
<if test="supplierId != null">#{supplierId},</if>
<if test="spare1 != null">#{spare1},</if>
<if test="spare2 != null">#{spare2},</if>
<if test="spare3 != null">#{spare3},</if>
<if test="spare4 != null">#{spare4},</if>
</trim>
</insert>
<update id="updateMydoJobDetailFinish" parameterType="MydoJobDetailFinish">
update mydo_job_detail_finish
<trim prefix="SET" suffixOverrides=",">
<if test="jobId != null and jobId != ''">job_id = #{jobId},</if>
<if test="stockId != null">stock_id = #{stockId},</if>
<if test="lotNo != null">lot_no = #{lotNo},</if>
<if test="inDate != null">in_date = #{inDate},</if>
<if test="inOrOutId != null">in_or_out_id = #{inOrOutId},</if>
<if test="inOrOutDId != null">in_or_out_d_id = #{inOrOutDId},</if>
<if test="productGuid != null">product_guid = #{productGuid},</if>
<if test="productId != null">product_id = #{productId},</if>
<if test="stockStatus != null">stock_status = #{stockStatus},</if>
<if test="inQuantity != null">in_quantity = #{inQuantity},</if>
<if test="stockQuantity != null">stock_quantity = #{stockQuantity},</if>
<if test="outQuantity != null">out_quantity = #{outQuantity},</if>
<if test="layerQuantity != null">layer_quantity = #{layerQuantity},</if>
<if test="outLayerQuantity != null">out_layer_quantity = #{outLayerQuantity},</if>
<if test="giveNum != null">give_num = #{giveNum},</if>
<if test="stockinId != null">stockin_id = #{stockinId},</if>
<if test="stackingId != null">stacking_id = #{stackingId},</if>
<if test="exitId != null">exit_id = #{exitId},</if>
<if test="printDate != null">print_date = #{printDate},</if>
<if test="customerId != null">customer_id = #{customerId},</if>
<if test="supplierId != null">supplier_id = #{supplierId},</if>
<if test="spare1 != null">spare1 = #{spare1},</if>
<if test="spare2 != null">spare2 = #{spare2},</if>
<if test="spare3 != null">spare3 = #{spare3},</if>
<if test="spare4 != null">spare4 = #{spare4},</if>
</trim>
where job_detail_id = #{jobDetailId}
</update>
<delete id="deleteMydoJobDetailFinishByJobDetailId" parameterType="String">
delete from mydo_job_detail_finish where job_detail_id = #{jobDetailId}
</delete>
<delete id="deleteMydoJobDetailFinishByJobDetailIds" parameterType="String">
delete from mydo_job_detail_finish where job_detail_id in
<foreach item="jobDetailId" collection="array" open="(" separator="," close=")">
#{jobDetailId}
</foreach>
</delete>
</mapper>

161
ruoyi-admin/src/main/resources/mapper/job/MydoJobFinishMapper.xml
View File

@@ -3,7 +3,7 @@
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.job.mydojobfinish.mapper.MydoJobFinishMapper">
<resultMap type="MydoJobFinish" id="MydoJobFinishResult">
<result property="jobId" column="job_id" />
<result property="status" column="status" />
@@ -26,41 +26,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="startTime" column="start_time" />
<result property="finishTime" column="finish_time" />
<result property="entranceId" column="entrance_id" />
<result property="exitId" column="Exit_id" />
<result property="classNowName" column="class_now_name" />
<result property="classWorkshopName" column="class_workshop_name" />
<result property="classgroupNumber" column="classgroup_number" />
<result property="classWorkshopDateTime" column="class_workshop_date_time" />
<result property="exitId" column="exit_id" />
<result property="classId" column="class_id" />
<result property="classNowDateTime" column="class_now_date_time" />
<result property="warehouseId" column="warehouse_id" />
<result property="outId" column="out_id" />
<result property="siteId" column="site_id" />
<result property="carNumber" column="car_number" />
<result property="faultFlag" column="fault_flag" />
<result property="devId" column="Dev_id" />
<result property="stockSource" column="stock_source" />
<result property="floor" column="floor" />
<result property="location" column="location" />
<result property="dwTime" column="dw_time" />
<result property="countId" column="count_id" />
<result property="xdTime" column="xd_time" />
<result property="sendFlag" column="send_flag" />
<result property="agvStatus" column="agv_status" />
<result property="wcsNo" column="wcs_no" />
<result property="srcAgv" column="src_agv" />
<result property="tarAgv" column="tar_agv" />
<result property="groupGuid" column="group_guid" />
<result property="photoPath" column="photo_path" />
</resultMap>
<sql id="selectMydoJobFinishVo">
select job_id, status, on_line_type, task_no, supplier_id, customer_id, department_id, tray_code, roadway_id, cargo_space_id, target_roadway_id, target_cargo_space_id, line_id, workshop_id, priority, execution_phase, in_or_out, create_time, start_time, finish_time, entrance_id, Exit_id, class_now_name, class_workshop_name, classgroup_number, class_workshop_date_time, class_id, class_now_date_time, warehouse_id, out_id, site_id, car_number, fault_flag, Dev_id, stock_source, floor, location, dw_time, count_id, xd_time, send_flag, agv_status, wcs_no, src_agv, tar_agv, group_guid, photo_path from mydo_job_finish
select job_id, status, on_line_type, task_no, supplier_id, customer_id, department_id, tray_code, roadway_id, cargo_space_id, target_roadway_id, target_cargo_space_id, line_id, workshop_id, priority, execution_phase, in_or_out, create_time, start_time, finish_time, entrance_id, exit_id, class_id, warehouse_id, fault_flag from mydo_job_finish
</sql>
<select id="selectMydoJobFinishList" parameterType="MydoJobFinish" resultMap="MydoJobFinishResult">
<include refid="selectMydoJobFinishVo"/>
<where>
<where>
<if test="jobId != null and jobId != ''"> and job_id = #{jobId}</if>
<if test="status != null and status != ''"> and status = #{status}</if>
<if test="onLineType != null and onLineType != ''"> and on_line_type = #{onLineType}</if>
@@ -81,32 +59,115 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="startTime != null and startTime != ''"> and start_time = #{startTime}</if>
<if test="finishTime != null and finishTime != ''"> and finish_time = #{finishTime}</if>
<if test="entranceId != null and entranceId != ''"> and entrance_id = #{entranceId}</if>
<if test="exitId != null and exitId != ''"> and Exit_id = #{exitId}</if>
<if test="classNowName != null and classNowName != ''"> and class_now_name like concat('%', #{classNowName}, '%')</if>
<if test="classWorkshopName != null and classWorkshopName != ''"> and class_workshop_name like concat('%', #{classWorkshopName}, '%')</if>
<if test="classgroupNumber != null and classgroupNumber != ''"> and classgroup_number = #{classgroupNumber}</if>
<if test="classWorkshopDateTime != null and classWorkshopDateTime != ''"> and class_workshop_date_time = #{classWorkshopDateTime}</if>
<if test="exitId != null and exitId != ''"> and exit_id = #{exitId}</if>
<if test="classId != null and classId != ''"> and class_id = #{classId}</if>
<if test="classNowDateTime != null and classNowDateTime != ''"> and class_now_date_time = #{classNowDateTime}</if>
<if test="warehouseId != null and warehouseId != ''"> and warehouse_id = #{warehouseId}</if>
<if test="outId != null and outId != ''"> and out_id = #{outId}</if>
<if test="siteId != null and siteId != ''"> and site_id = #{siteId}</if>
<if test="carNumber != null and carNumber != ''"> and car_number = #{carNumber}</if>
<if test="faultFlag != null and faultFlag != ''"> and fault_flag = #{faultFlag}</if>
<if test="devId != null and devId != ''"> and Dev_id = #{devId}</if>
<if test="stockSource != null and stockSource != ''"> and stock_source = #{stockSource}</if>
<if test="floor != null and floor != ''"> and floor = #{floor}</if>
<if test="location != null and location != ''"> and location = #{location}</if>
<if test="dwTime != null and dwTime != ''"> and dw_time = #{dwTime}</if>
<if test="countId != null and countId != ''"> and count_id = #{countId}</if>
<if test="xdTime != null and xdTime != ''"> and xd_time = #{xdTime}</if>
<if test="sendFlag != null and sendFlag != ''"> and send_flag = #{sendFlag}</if>
<if test="agvStatus != null and agvStatus != ''"> and agv_status = #{agvStatus}</if>
<if test="wcsNo != null and wcsNo != ''"> and wcs_no = #{wcsNo}</if>
<if test="srcAgv != null and srcAgv != ''"> and src_agv = #{srcAgv}</if>
<if test="tarAgv != null and tarAgv != ''"> and tar_agv = #{tarAgv}</if>
<if test="groupGuid != null and groupGuid != ''"> and group_guid = #{groupGuid}</if>
<if test="photoPath != null and photoPath != ''"> and photo_path = #{photoPath}</if>
</where>
</select>
</mapper>
<select id="selectMydoJobFinishByJobId" parameterType="String" resultMap="MydoJobFinishResult">
<include refid="selectMydoJobFinishVo"/>
where job_id = #{jobId}
</select>
<insert id="insertMydoJobFinish" parameterType="MydoJobFinish">
insert into mydo_job_finish
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="jobId != null and jobId != ''">job_id,</if>
<if test="status != null and status != ''">status,</if>
<if test="onLineType != null">on_line_type,</if>
<if test="taskNo != null and taskNo != ''">task_no,</if>
<if test="supplierId != null">supplier_id,</if>
<if test="customerId != null">customer_id,</if>
<if test="departmentId != null">department_id,</if>
<if test="trayCode != null">tray_code,</if>
<if test="roadwayId != null">roadway_id,</if>
<if test="cargoSpaceId != null">cargo_space_id,</if>
<if test="targetRoadwayId != null">target_roadway_id,</if>
<if test="targetCargoSpaceId != null">target_cargo_space_id,</if>
<if test="lineId != null">line_id,</if>
<if test="workshopId != null">workshop_id,</if>
<if test="priority != null">priority,</if>
<if test="executionPhase != null">execution_phase,</if>
<if test="inOrOut != null">in_or_out,</if>
<if test="createTime != null">create_time,</if>
<if test="startTime != null">start_time,</if>
<if test="finishTime != null">finish_time,</if>
<if test="entranceId != null">entrance_id,</if>
<if test="exitId != null">exit_id,</if>
<if test="classId != null">class_id,</if>
<if test="warehouseId != null">warehouse_id,</if>
<if test="faultFlag != null">fault_flag,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="jobId != null and jobId != ''">#{jobId},</if>
<if test="status != null and status != ''">#{status},</if>
<if test="onLineType != null">#{onLineType},</if>
<if test="taskNo != null and taskNo != ''">#{taskNo},</if>
<if test="supplierId != null">#{supplierId},</if>
<if test="customerId != null">#{customerId},</if>
<if test="departmentId != null">#{departmentId},</if>
<if test="trayCode != null">#{trayCode},</if>
<if test="roadwayId != null">#{roadwayId},</if>
<if test="cargoSpaceId != null">#{cargoSpaceId},</if>
<if test="targetRoadwayId != null">#{targetRoadwayId},</if>
<if test="targetCargoSpaceId != null">#{targetCargoSpaceId},</if>
<if test="lineId != null">#{lineId},</if>
<if test="workshopId != null">#{workshopId},</if>
<if test="priority != null">#{priority},</if>
<if test="executionPhase != null">#{executionPhase},</if>
<if test="inOrOut != null">#{inOrOut},</if>
<if test="createTime != null">#{createTime},</if>
<if test="startTime != null">#{startTime},</if>
<if test="finishTime != null">#{finishTime},</if>
<if test="entranceId != null">#{entranceId},</if>
<if test="exitId != null">#{exitId},</if>
<if test="classId != null">#{classId},</if>
<if test="warehouseId != null">#{warehouseId},</if>
<if test="faultFlag != null">#{faultFlag},</if>
</trim>
</insert>
<update id="updateMydoJobFinish" parameterType="MydoJobFinish">
update mydo_job_finish
<trim prefix="SET" suffixOverrides=",">
<if test="status != null and status != ''">status = #{status},</if>
<if test="onLineType != null">on_line_type = #{onLineType},</if>
<if test="taskNo != null and taskNo != ''">task_no = #{taskNo},</if>
<if test="supplierId != null">supplier_id = #{supplierId},</if>
<if test="customerId != null">customer_id = #{customerId},</if>
<if test="departmentId != null">department_id = #{departmentId},</if>
<if test="trayCode != null">tray_code = #{trayCode},</if>
<if test="roadwayId != null">roadway_id = #{roadwayId},</if>
<if test="cargoSpaceId != null">cargo_space_id = #{cargoSpaceId},</if>
<if test="targetRoadwayId != null">target_roadway_id = #{targetRoadwayId},</if>
<if test="targetCargoSpaceId != null">target_cargo_space_id = #{targetCargoSpaceId},</if>
<if test="lineId != null">line_id = #{lineId},</if>
<if test="workshopId != null">workshop_id = #{workshopId},</if>
<if test="priority != null">priority = #{priority},</if>
<if test="executionPhase != null">execution_phase = #{executionPhase},</if>
<if test="inOrOut != null">in_or_out = #{inOrOut},</if>
<if test="createTime != null">create_time = #{createTime},</if>
<if test="startTime != null">start_time = #{startTime},</if>
<if test="finishTime != null">finish_time = #{finishTime},</if>
<if test="entranceId != null">entrance_id = #{entranceId},</if>
<if test="exitId != null">exit_id = #{exitId},</if>
<if test="classId != null">class_id = #{classId},</if>
<if test="warehouseId != null">warehouse_id = #{warehouseId},</if>
<if test="faultFlag != null">fault_flag = #{faultFlag},</if>
</trim>
where job_id = #{jobId}
</update>
<delete id="deleteMydoJobFinishByJobId" parameterType="String">
delete from mydo_job_finish where job_id = #{jobId}
</delete>
<delete id="deleteMydoJobFinishByJobIds" parameterType="String">
delete from mydo_job_finish where job_id in
<foreach item="jobId" collection="array" open="(" separator="," close=")">
#{jobId}
</foreach>
</delete>
</mapper>