diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/back/controller/BackApplyDetailsController.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/back/controller/BackApplyDetailsController.java new file mode 100644 index 00000000..3a73b2d2 --- /dev/null +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/back/controller/BackApplyDetailsController.java @@ -0,0 +1,113 @@ +package com.bonus.material.back.controller; + +import java.util.List; +import javax.servlet.http.HttpServletResponse; +import com.bonus.common.log.enums.OperaType; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +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.bonus.common.log.annotation.SysLog; +import com.bonus.common.security.annotation.RequiresPermissions; +import com.bonus.material.back.domain.BackApplyDetails; +import com.bonus.material.back.service.IBackApplyDetailsService; +import com.bonus.common.core.web.controller.BaseController; +import com.bonus.common.core.web.domain.AjaxResult; +import com.bonus.common.core.utils.poi.ExcelUtil; +import com.bonus.common.core.web.page.TableDataInfo; + +/** + * 退料任务详细Controller + * + * @author xsheng + * @date 2024-09-26 + */ +@Api(tags = "退料任务详细接口") +@RestController +@RequestMapping("/back_apply_details") +public class BackApplyDetailsController extends BaseController +{ + @Autowired + private IBackApplyDetailsService backApplyDetailsService; + + /** + * 查询退料任务详细列表 + */ + @ApiOperation(value = "查询退料任务详细列表") + @RequiresPermissions("back:details:list") + @GetMapping("/list") + public TableDataInfo list(BackApplyDetails backApplyDetails) + { + startPage(); + List list = backApplyDetailsService.selectBackApplyDetailsList(backApplyDetails); + return getDataTable(list); + } + + /** + * 导出退料任务详细列表 + */ + @ApiOperation(value = "导出退料任务详细列表") + @RequiresPermissions("back:details:export") + @SysLog(title = "退料任务详细", businessType = OperaType.EXPORT, logType = 1,module = "仓储管理->导出退料任务详细") + @PostMapping("/export") + public void export(HttpServletResponse response, BackApplyDetails backApplyDetails) + { + List list = backApplyDetailsService.selectBackApplyDetailsList(backApplyDetails); + ExcelUtil util = new ExcelUtil(BackApplyDetails.class); + util.exportExcel(response, list, "退料任务详细数据"); + } + + /** + * 获取退料任务详细详细信息 + */ + @ApiOperation(value = "获取退料任务详细详细信息") + @RequiresPermissions("back:details:query") + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") Long id) + { + return success(backApplyDetailsService.selectBackApplyDetailsById(id)); + } + + /** + * 新增退料任务详细 + */ + @ApiOperation(value = "新增退料任务详细") + @RequiresPermissions("back:details:add") + @SysLog(title = "退料任务详细", businessType = OperaType.INSERT, logType = 1,module = "仓储管理->新增退料任务详细") + @PostMapping + public AjaxResult add(@RequestBody BackApplyDetails backApplyDetails) + { + return toAjax(backApplyDetailsService.insertBackApplyDetails(backApplyDetails)); + } + + /** + * 修改退料任务详细 + */ + @ApiOperation(value = "修改退料任务详细") + @RequiresPermissions("back:details:edit") + @SysLog(title = "退料任务详细", businessType = OperaType.UPDATE, logType = 1,module = "仓储管理->修改退料任务详细") + @PutMapping + public AjaxResult edit(@RequestBody BackApplyDetails backApplyDetails) + { + return toAjax(backApplyDetailsService.updateBackApplyDetails(backApplyDetails)); + } + + /** + * 删除退料任务详细 + */ + @ApiOperation(value = "删除退料任务详细") + @RequiresPermissions("back:details:remove") + @SysLog(title = "退料任务详细", businessType = OperaType.DELETE, logType = 1,module = "仓储管理->删除退料任务详细") + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable Long[] ids) + { + return toAjax(backApplyDetailsService.deleteBackApplyDetailsByIds(ids)); + } +} diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/back/controller/BackApplyInfoController.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/back/controller/BackApplyInfoController.java new file mode 100644 index 00000000..aa251fe4 --- /dev/null +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/back/controller/BackApplyInfoController.java @@ -0,0 +1,113 @@ +package com.bonus.material.back.controller; + +import java.util.List; +import javax.servlet.http.HttpServletResponse; +import com.bonus.common.log.enums.OperaType; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +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.bonus.common.log.annotation.SysLog; +import com.bonus.common.security.annotation.RequiresPermissions; +import com.bonus.material.back.domain.BackApplyInfo; +import com.bonus.material.back.service.IBackApplyInfoService; +import com.bonus.common.core.web.controller.BaseController; +import com.bonus.common.core.web.domain.AjaxResult; +import com.bonus.common.core.utils.poi.ExcelUtil; +import com.bonus.common.core.web.page.TableDataInfo; + +/** + * 退料任务Controller + * + * @author xsheng + * @date 2024-09-26 + */ +@Api(tags = "退料任务接口") +@RestController +@RequestMapping("/back_apply_info") +public class BackApplyInfoController extends BaseController +{ + @Autowired + private IBackApplyInfoService backApplyInfoService; + + /** + * 查询退料任务列表 + */ + @ApiOperation(value = "查询退料任务列表") + @RequiresPermissions("back:info:list") + @GetMapping("/list") + public TableDataInfo list(BackApplyInfo backApplyInfo) + { + startPage(); + List list = backApplyInfoService.selectBackApplyInfoList(backApplyInfo); + return getDataTable(list); + } + + /** + * 导出退料任务列表 + */ + @ApiOperation(value = "导出退料任务列表") + @RequiresPermissions("back:info:export") + @SysLog(title = "退料任务", businessType = OperaType.EXPORT, logType = 1,module = "仓储管理->导出退料任务") + @PostMapping("/export") + public void export(HttpServletResponse response, BackApplyInfo backApplyInfo) + { + List list = backApplyInfoService.selectBackApplyInfoList(backApplyInfo); + ExcelUtil util = new ExcelUtil(BackApplyInfo.class); + util.exportExcel(response, list, "退料任务数据"); + } + + /** + * 获取退料任务详细信息 + */ + @ApiOperation(value = "获取退料任务详细信息") + @RequiresPermissions("back:info:query") + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") Long id) + { + return success(backApplyInfoService.selectBackApplyInfoById(id)); + } + + /** + * 新增退料任务 + */ + @ApiOperation(value = "新增退料任务") + @RequiresPermissions("back:info:add") + @SysLog(title = "退料任务", businessType = OperaType.INSERT, logType = 1,module = "仓储管理->新增退料任务") + @PostMapping + public AjaxResult add(@RequestBody BackApplyInfo backApplyInfo) + { + return toAjax(backApplyInfoService.insertBackApplyInfo(backApplyInfo)); + } + + /** + * 修改退料任务 + */ + @ApiOperation(value = "修改退料任务") + @RequiresPermissions("back:info:edit") + @SysLog(title = "退料任务", businessType = OperaType.UPDATE, logType = 1,module = "仓储管理->修改退料任务") + @PutMapping + public AjaxResult edit(@RequestBody BackApplyInfo backApplyInfo) + { + return toAjax(backApplyInfoService.updateBackApplyInfo(backApplyInfo)); + } + + /** + * 删除退料任务 + */ + @ApiOperation(value = "删除退料任务") + @RequiresPermissions("back:info:remove") + @SysLog(title = "退料任务", businessType = OperaType.DELETE, logType = 1,module = "仓储管理->删除退料任务") + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable Long[] ids) + { + return toAjax(backApplyInfoService.deleteBackApplyInfoByIds(ids)); + } +} diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/back/controller/BackCheckDetailsController.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/back/controller/BackCheckDetailsController.java new file mode 100644 index 00000000..a876497b --- /dev/null +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/back/controller/BackCheckDetailsController.java @@ -0,0 +1,113 @@ +package com.bonus.material.back.controller; + +import java.util.List; +import javax.servlet.http.HttpServletResponse; +import com.bonus.common.log.enums.OperaType; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +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.bonus.common.log.annotation.SysLog; +import com.bonus.common.security.annotation.RequiresPermissions; +import com.bonus.material.back.domain.BackCheckDetails; +import com.bonus.material.back.service.IBackCheckDetailsService; +import com.bonus.common.core.web.controller.BaseController; +import com.bonus.common.core.web.domain.AjaxResult; +import com.bonus.common.core.utils.poi.ExcelUtil; +import com.bonus.common.core.web.page.TableDataInfo; + +/** + * 退料核查Controller + * + * @author xsheng + * @date 2024-09-26 + */ +@Api(tags = "退料核查接口") +@RestController +@RequestMapping("/back_check_details") +public class BackCheckDetailsController extends BaseController +{ + @Autowired + private IBackCheckDetailsService backCheckDetailsService; + + /** + * 查询退料核查列表 + */ + @ApiOperation(value = "查询退料核查列表") + @RequiresPermissions("back:details:list") + @GetMapping("/list") + public TableDataInfo list(BackCheckDetails backCheckDetails) + { + startPage(); + List list = backCheckDetailsService.selectBackCheckDetailsList(backCheckDetails); + return getDataTable(list); + } + + /** + * 导出退料核查列表 + */ + @ApiOperation(value = "导出退料核查列表") + @RequiresPermissions("back:details:export") + @SysLog(title = "退料核查", businessType = OperaType.EXPORT, logType = 1,module = "仓储管理->导出退料核查") + @PostMapping("/export") + public void export(HttpServletResponse response, BackCheckDetails backCheckDetails) + { + List list = backCheckDetailsService.selectBackCheckDetailsList(backCheckDetails); + ExcelUtil util = new ExcelUtil(BackCheckDetails.class); + util.exportExcel(response, list, "退料核查数据"); + } + + /** + * 获取退料核查详细信息 + */ + @ApiOperation(value = "获取退料核查详细信息") + @RequiresPermissions("back:details:query") + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") Long id) + { + return success(backCheckDetailsService.selectBackCheckDetailsById(id)); + } + + /** + * 新增退料核查 + */ + @ApiOperation(value = "新增退料核查") + @RequiresPermissions("back:details:add") + @SysLog(title = "退料核查", businessType = OperaType.INSERT, logType = 1,module = "仓储管理->新增退料核查") + @PostMapping + public AjaxResult add(@RequestBody BackCheckDetails backCheckDetails) + { + return toAjax(backCheckDetailsService.insertBackCheckDetails(backCheckDetails)); + } + + /** + * 修改退料核查 + */ + @ApiOperation(value = "修改退料核查") + @RequiresPermissions("back:details:edit") + @SysLog(title = "退料核查", businessType = OperaType.UPDATE, logType = 1,module = "仓储管理->修改退料核查") + @PutMapping + public AjaxResult edit(@RequestBody BackCheckDetails backCheckDetails) + { + return toAjax(backCheckDetailsService.updateBackCheckDetails(backCheckDetails)); + } + + /** + * 删除退料核查 + */ + @ApiOperation(value = "删除退料核查") + @RequiresPermissions("back:details:remove") + @SysLog(title = "退料核查", businessType = OperaType.DELETE, logType = 1,module = "仓储管理->删除退料核查") + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable Long[] ids) + { + return toAjax(backCheckDetailsService.deleteBackCheckDetailsByIds(ids)); + } +} diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/back/domain/BackApplyDetails.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/back/domain/BackApplyDetails.java new file mode 100644 index 00000000..ece3e234 --- /dev/null +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/back/domain/BackApplyDetails.java @@ -0,0 +1,62 @@ +package com.bonus.material.back.domain; + +import com.bonus.common.core.annotation.Excel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.ToString; +import com.bonus.common.core.web.domain.BaseEntity; + +/** + * 退料任务详细对象 back_apply_details + * + * @author xsheng + * @date 2024-09-26 + */ + + +@Data +@ToString +public class BackApplyDetails extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** ID */ + private Long id; + + /** 退料单号 */ + @Excel(name = "退料单号") + @ApiModelProperty(value = "退料单号") + private String code; + + /** 任务ID */ + @Excel(name = "任务ID") + @ApiModelProperty(value = "任务ID") + private Long parentId; + + /** 规格ID */ + @Excel(name = "规格ID") + @ApiModelProperty(value = "规格ID") + private Long typeId; + + /** 申请数量 */ + @Excel(name = "申请数量") + @ApiModelProperty(value = "申请数量") + private Long preNum; + + /** 审批数量 */ + @Excel(name = "审批数量") + @ApiModelProperty(value = "审批数量") + private Long auditNum; + + /** 状态(0待审批,1进行中,2已出库,3已驳回) */ + @Excel(name = "状态(0待审批,1进行中,2已出库,3已驳回)") + @ApiModelProperty(value = "状态(0待审批,1进行中,2已出库,3已驳回)") + private String status; + + /** 数据所属组织 */ + @Excel(name = "数据所属组织") + @ApiModelProperty(value = "数据所属组织") + private Long companyId; + + +} diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/back/domain/BackApplyInfo.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/back/domain/BackApplyInfo.java new file mode 100644 index 00000000..f3b2be49 --- /dev/null +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/back/domain/BackApplyInfo.java @@ -0,0 +1,86 @@ +package com.bonus.material.back.domain; + +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.bonus.common.core.annotation.Excel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.ToString; +import com.bonus.common.core.web.domain.BaseEntity; + +/** + * 退料任务对象 back_apply_info + * + * @author xsheng + * @date 2024-09-26 + */ + + +@Data +@ToString +public class BackApplyInfo extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** ID */ + private Long id; + + /** 退料单号 */ + @Excel(name = "退料单号") + @ApiModelProperty(value = "退料单号") + private String code; + + /** 任务ID */ + @Excel(name = "任务ID") + @ApiModelProperty(value = "任务ID") + private Long taskId; + + /** 退料人 */ + @Excel(name = "退料人") + @ApiModelProperty(value = "退料人") + private String backPerson; + + /** 联系方式 */ + @Excel(name = "联系方式") + @ApiModelProperty(value = "联系方式") + private String phone; + + /** 机具公司审批人 */ + @Excel(name = "机具公司审批人") + @ApiModelProperty(value = "机具公司审批人") + private Long directAuditBy; + + /** 机具公司审批时间 */ + @ApiModelProperty(value = "机具公司审批时间") + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "机具公司审批时间", width = 30, dateFormat = "yyyy-MM-dd") + private Date directAuditTime; + + /** 机具公司审批备注 */ + @Excel(name = "机具公司审批备注") + @ApiModelProperty(value = "机具公司审批备注") + private String directAuditRemark; + + /** 数据所属组织 */ + @Excel(name = "数据所属组织") + @ApiModelProperty(value = "数据所属组织") + private Long companyId; + + /** 预退料时间 */ + @ApiModelProperty(value = "预退料时间") + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "预退料时间", width = 30, dateFormat = "yyyy-MM-dd") + private Date backTime; + + /** 1.机具分公司审核通过,2.机具分公司审批不通过,3.调试分公司审批通过,4.调试分公司审批不通过,5.出库进行中,6.出库完成 */ + @Excel(name = "1.机具分公司审核通过,2.机具分公司审批不通过,3.调试分公司审批通过,4.调试分公司审批不通过,5.出库进行中,6.出库完成") + @ApiModelProperty(value = "1.机具分公司审核通过,2.机具分公司审批不通过,3.调试分公司审批通过,4.调试分公司审批不通过,5.出库进行中,6.出库完成") + private String status; + + /** 直转id */ + @Excel(name = "直转id") + @ApiModelProperty(value = "直转id") + private Long directId; + + +} diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/back/domain/BackCheckDetails.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/back/domain/BackCheckDetails.java new file mode 100644 index 00000000..f69bf33c --- /dev/null +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/back/domain/BackCheckDetails.java @@ -0,0 +1,62 @@ +package com.bonus.material.back.domain; + +import com.bonus.common.core.annotation.Excel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.ToString; +import com.bonus.common.core.web.domain.BaseEntity; + +/** + * 退料核查对象 back_check_details + * + * @author xsheng + * @date 2024-09-26 + */ + + +@Data +@ToString +public class BackCheckDetails extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** ID */ + private Long id; + + /** 任务ID */ + @Excel(name = "任务ID") + @ApiModelProperty(value = "任务ID") + private Long parentId; + + /** 规格ID */ + @Excel(name = "规格ID") + @ApiModelProperty(value = "规格ID") + private Long typeId; + + /** 机具ID */ + @Excel(name = "机具ID") + @ApiModelProperty(value = "机具ID") + private Long maId; + + /** 退料数量 */ + @Excel(name = "退料数量") + @ApiModelProperty(value = "退料数量") + private Long backNum; + + /** 退料状态(1合格,2维修,3待报废) */ + @Excel(name = "退料状态(1合格,2维修,3待报废)") + @ApiModelProperty(value = "退料状态(1合格,2维修,3待报废)") + private String backStatus; + + /** 数据所属组织 */ + @Excel(name = "数据所属组织") + @ApiModelProperty(value = "数据所属组织") + private Long companyId; + + /** 0:未完成退料,可以撤回 1:已完成退料,不能撤回 */ + @Excel(name = "0:未完成退料,可以撤回 1:已完成退料,不能撤回") + @ApiModelProperty(value = "0:未完成退料,可以撤回 1:已完成退料,不能撤回") + private Integer isFinished; + + +} diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/back/mapper/BackApplyDetailsMapper.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/back/mapper/BackApplyDetailsMapper.java new file mode 100644 index 00000000..4e7b313b --- /dev/null +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/back/mapper/BackApplyDetailsMapper.java @@ -0,0 +1,61 @@ +package com.bonus.material.back.mapper; + +import java.util.List; +import com.bonus.material.back.domain.BackApplyDetails; + +/** + * 退料任务详细Mapper接口 + * + * @author xsheng + * @date 2024-09-26 + */ +public interface BackApplyDetailsMapper +{ + /** + * 查询退料任务详细 + * + * @param id 退料任务详细主键 + * @return 退料任务详细 + */ + public BackApplyDetails selectBackApplyDetailsById(Long id); + + /** + * 查询退料任务详细列表 + * + * @param backApplyDetails 退料任务详细 + * @return 退料任务详细集合 + */ + public List selectBackApplyDetailsList(BackApplyDetails backApplyDetails); + + /** + * 新增退料任务详细 + * + * @param backApplyDetails 退料任务详细 + * @return 结果 + */ + public int insertBackApplyDetails(BackApplyDetails backApplyDetails); + + /** + * 修改退料任务详细 + * + * @param backApplyDetails 退料任务详细 + * @return 结果 + */ + public int updateBackApplyDetails(BackApplyDetails backApplyDetails); + + /** + * 删除退料任务详细 + * + * @param id 退料任务详细主键 + * @return 结果 + */ + public int deleteBackApplyDetailsById(Long id); + + /** + * 批量删除退料任务详细 + * + * @param ids 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteBackApplyDetailsByIds(Long[] ids); +} diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/back/mapper/BackApplyInfoMapper.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/back/mapper/BackApplyInfoMapper.java new file mode 100644 index 00000000..79badfe1 --- /dev/null +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/back/mapper/BackApplyInfoMapper.java @@ -0,0 +1,61 @@ +package com.bonus.material.back.mapper; + +import java.util.List; +import com.bonus.material.back.domain.BackApplyInfo; + +/** + * 退料任务Mapper接口 + * + * @author xsheng + * @date 2024-09-26 + */ +public interface BackApplyInfoMapper +{ + /** + * 查询退料任务 + * + * @param id 退料任务主键 + * @return 退料任务 + */ + public BackApplyInfo selectBackApplyInfoById(Long id); + + /** + * 查询退料任务列表 + * + * @param backApplyInfo 退料任务 + * @return 退料任务集合 + */ + public List selectBackApplyInfoList(BackApplyInfo backApplyInfo); + + /** + * 新增退料任务 + * + * @param backApplyInfo 退料任务 + * @return 结果 + */ + public int insertBackApplyInfo(BackApplyInfo backApplyInfo); + + /** + * 修改退料任务 + * + * @param backApplyInfo 退料任务 + * @return 结果 + */ + public int updateBackApplyInfo(BackApplyInfo backApplyInfo); + + /** + * 删除退料任务 + * + * @param id 退料任务主键 + * @return 结果 + */ + public int deleteBackApplyInfoById(Long id); + + /** + * 批量删除退料任务 + * + * @param ids 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteBackApplyInfoByIds(Long[] ids); +} diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/back/mapper/BackCheckDetailsMapper.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/back/mapper/BackCheckDetailsMapper.java new file mode 100644 index 00000000..7cc3b622 --- /dev/null +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/back/mapper/BackCheckDetailsMapper.java @@ -0,0 +1,61 @@ +package com.bonus.material.back.mapper; + +import java.util.List; +import com.bonus.material.back.domain.BackCheckDetails; + +/** + * 退料核查Mapper接口 + * + * @author xsheng + * @date 2024-09-26 + */ +public interface BackCheckDetailsMapper +{ + /** + * 查询退料核查 + * + * @param id 退料核查主键 + * @return 退料核查 + */ + public BackCheckDetails selectBackCheckDetailsById(Long id); + + /** + * 查询退料核查列表 + * + * @param backCheckDetails 退料核查 + * @return 退料核查集合 + */ + public List selectBackCheckDetailsList(BackCheckDetails backCheckDetails); + + /** + * 新增退料核查 + * + * @param backCheckDetails 退料核查 + * @return 结果 + */ + public int insertBackCheckDetails(BackCheckDetails backCheckDetails); + + /** + * 修改退料核查 + * + * @param backCheckDetails 退料核查 + * @return 结果 + */ + public int updateBackCheckDetails(BackCheckDetails backCheckDetails); + + /** + * 删除退料核查 + * + * @param id 退料核查主键 + * @return 结果 + */ + public int deleteBackCheckDetailsById(Long id); + + /** + * 批量删除退料核查 + * + * @param ids 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteBackCheckDetailsByIds(Long[] ids); +} diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/back/service/IBackApplyDetailsService.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/back/service/IBackApplyDetailsService.java new file mode 100644 index 00000000..3d72b192 --- /dev/null +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/back/service/IBackApplyDetailsService.java @@ -0,0 +1,61 @@ +package com.bonus.material.back.service; + +import java.util.List; +import com.bonus.material.back.domain.BackApplyDetails; + +/** + * 退料任务详细Service接口 + * + * @author xsheng + * @date 2024-09-26 + */ +public interface IBackApplyDetailsService +{ + /** + * 查询退料任务详细 + * + * @param id 退料任务详细主键 + * @return 退料任务详细 + */ + public BackApplyDetails selectBackApplyDetailsById(Long id); + + /** + * 查询退料任务详细列表 + * + * @param backApplyDetails 退料任务详细 + * @return 退料任务详细集合 + */ + public List selectBackApplyDetailsList(BackApplyDetails backApplyDetails); + + /** + * 新增退料任务详细 + * + * @param backApplyDetails 退料任务详细 + * @return 结果 + */ + public int insertBackApplyDetails(BackApplyDetails backApplyDetails); + + /** + * 修改退料任务详细 + * + * @param backApplyDetails 退料任务详细 + * @return 结果 + */ + public int updateBackApplyDetails(BackApplyDetails backApplyDetails); + + /** + * 批量删除退料任务详细 + * + * @param ids 需要删除的退料任务详细主键集合 + * @return 结果 + */ + public int deleteBackApplyDetailsByIds(Long[] ids); + + /** + * 删除退料任务详细信息 + * + * @param id 退料任务详细主键 + * @return 结果 + */ + public int deleteBackApplyDetailsById(Long id); +} diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/back/service/IBackApplyInfoService.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/back/service/IBackApplyInfoService.java new file mode 100644 index 00000000..10ca182c --- /dev/null +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/back/service/IBackApplyInfoService.java @@ -0,0 +1,61 @@ +package com.bonus.material.back.service; + +import java.util.List; +import com.bonus.material.back.domain.BackApplyInfo; + +/** + * 退料任务Service接口 + * + * @author xsheng + * @date 2024-09-26 + */ +public interface IBackApplyInfoService +{ + /** + * 查询退料任务 + * + * @param id 退料任务主键 + * @return 退料任务 + */ + public BackApplyInfo selectBackApplyInfoById(Long id); + + /** + * 查询退料任务列表 + * + * @param backApplyInfo 退料任务 + * @return 退料任务集合 + */ + public List selectBackApplyInfoList(BackApplyInfo backApplyInfo); + + /** + * 新增退料任务 + * + * @param backApplyInfo 退料任务 + * @return 结果 + */ + public int insertBackApplyInfo(BackApplyInfo backApplyInfo); + + /** + * 修改退料任务 + * + * @param backApplyInfo 退料任务 + * @return 结果 + */ + public int updateBackApplyInfo(BackApplyInfo backApplyInfo); + + /** + * 批量删除退料任务 + * + * @param ids 需要删除的退料任务主键集合 + * @return 结果 + */ + public int deleteBackApplyInfoByIds(Long[] ids); + + /** + * 删除退料任务信息 + * + * @param id 退料任务主键 + * @return 结果 + */ + public int deleteBackApplyInfoById(Long id); +} diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/back/service/IBackCheckDetailsService.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/back/service/IBackCheckDetailsService.java new file mode 100644 index 00000000..3171cf66 --- /dev/null +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/back/service/IBackCheckDetailsService.java @@ -0,0 +1,61 @@ +package com.bonus.material.back.service; + +import java.util.List; +import com.bonus.material.back.domain.BackCheckDetails; + +/** + * 退料核查Service接口 + * + * @author xsheng + * @date 2024-09-26 + */ +public interface IBackCheckDetailsService +{ + /** + * 查询退料核查 + * + * @param id 退料核查主键 + * @return 退料核查 + */ + public BackCheckDetails selectBackCheckDetailsById(Long id); + + /** + * 查询退料核查列表 + * + * @param backCheckDetails 退料核查 + * @return 退料核查集合 + */ + public List selectBackCheckDetailsList(BackCheckDetails backCheckDetails); + + /** + * 新增退料核查 + * + * @param backCheckDetails 退料核查 + * @return 结果 + */ + public int insertBackCheckDetails(BackCheckDetails backCheckDetails); + + /** + * 修改退料核查 + * + * @param backCheckDetails 退料核查 + * @return 结果 + */ + public int updateBackCheckDetails(BackCheckDetails backCheckDetails); + + /** + * 批量删除退料核查 + * + * @param ids 需要删除的退料核查主键集合 + * @return 结果 + */ + public int deleteBackCheckDetailsByIds(Long[] ids); + + /** + * 删除退料核查信息 + * + * @param id 退料核查主键 + * @return 结果 + */ + public int deleteBackCheckDetailsById(Long id); +} diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/back/service/impl/BackApplyDetailsServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/back/service/impl/BackApplyDetailsServiceImpl.java new file mode 100644 index 00000000..8320ca3d --- /dev/null +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/back/service/impl/BackApplyDetailsServiceImpl.java @@ -0,0 +1,96 @@ +package com.bonus.material.back.service.impl; + +import java.util.List; +import com.bonus.common.core.utils.DateUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.bonus.material.back.mapper.BackApplyDetailsMapper; +import com.bonus.material.back.domain.BackApplyDetails; +import com.bonus.material.back.service.IBackApplyDetailsService; + +/** + * 退料任务详细Service业务层处理 + * + * @author xsheng + * @date 2024-09-26 + */ +@Service +public class BackApplyDetailsServiceImpl implements IBackApplyDetailsService +{ + @Autowired + private BackApplyDetailsMapper backApplyDetailsMapper; + + /** + * 查询退料任务详细 + * + * @param id 退料任务详细主键 + * @return 退料任务详细 + */ + @Override + public BackApplyDetails selectBackApplyDetailsById(Long id) + { + return backApplyDetailsMapper.selectBackApplyDetailsById(id); + } + + /** + * 查询退料任务详细列表 + * + * @param backApplyDetails 退料任务详细 + * @return 退料任务详细 + */ + @Override + public List selectBackApplyDetailsList(BackApplyDetails backApplyDetails) + { + return backApplyDetailsMapper.selectBackApplyDetailsList(backApplyDetails); + } + + /** + * 新增退料任务详细 + * + * @param backApplyDetails 退料任务详细 + * @return 结果 + */ + @Override + public int insertBackApplyDetails(BackApplyDetails backApplyDetails) + { + backApplyDetails.setCreateTime(DateUtils.getNowDate()); + return backApplyDetailsMapper.insertBackApplyDetails(backApplyDetails); + } + + /** + * 修改退料任务详细 + * + * @param backApplyDetails 退料任务详细 + * @return 结果 + */ + @Override + public int updateBackApplyDetails(BackApplyDetails backApplyDetails) + { + backApplyDetails.setUpdateTime(DateUtils.getNowDate()); + return backApplyDetailsMapper.updateBackApplyDetails(backApplyDetails); + } + + /** + * 批量删除退料任务详细 + * + * @param ids 需要删除的退料任务详细主键 + * @return 结果 + */ + @Override + public int deleteBackApplyDetailsByIds(Long[] ids) + { + return backApplyDetailsMapper.deleteBackApplyDetailsByIds(ids); + } + + /** + * 删除退料任务详细信息 + * + * @param id 退料任务详细主键 + * @return 结果 + */ + @Override + public int deleteBackApplyDetailsById(Long id) + { + return backApplyDetailsMapper.deleteBackApplyDetailsById(id); + } +} diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/back/service/impl/BackApplyInfoServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/back/service/impl/BackApplyInfoServiceImpl.java new file mode 100644 index 00000000..54f307ea --- /dev/null +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/back/service/impl/BackApplyInfoServiceImpl.java @@ -0,0 +1,96 @@ +package com.bonus.material.back.service.impl; + +import java.util.List; +import com.bonus.common.core.utils.DateUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.bonus.material.back.mapper.BackApplyInfoMapper; +import com.bonus.material.back.domain.BackApplyInfo; +import com.bonus.material.back.service.IBackApplyInfoService; + +/** + * 退料任务Service业务层处理 + * + * @author xsheng + * @date 2024-09-26 + */ +@Service +public class BackApplyInfoServiceImpl implements IBackApplyInfoService +{ + @Autowired + private BackApplyInfoMapper backApplyInfoMapper; + + /** + * 查询退料任务 + * + * @param id 退料任务主键 + * @return 退料任务 + */ + @Override + public BackApplyInfo selectBackApplyInfoById(Long id) + { + return backApplyInfoMapper.selectBackApplyInfoById(id); + } + + /** + * 查询退料任务列表 + * + * @param backApplyInfo 退料任务 + * @return 退料任务 + */ + @Override + public List selectBackApplyInfoList(BackApplyInfo backApplyInfo) + { + return backApplyInfoMapper.selectBackApplyInfoList(backApplyInfo); + } + + /** + * 新增退料任务 + * + * @param backApplyInfo 退料任务 + * @return 结果 + */ + @Override + public int insertBackApplyInfo(BackApplyInfo backApplyInfo) + { + backApplyInfo.setCreateTime(DateUtils.getNowDate()); + return backApplyInfoMapper.insertBackApplyInfo(backApplyInfo); + } + + /** + * 修改退料任务 + * + * @param backApplyInfo 退料任务 + * @return 结果 + */ + @Override + public int updateBackApplyInfo(BackApplyInfo backApplyInfo) + { + backApplyInfo.setUpdateTime(DateUtils.getNowDate()); + return backApplyInfoMapper.updateBackApplyInfo(backApplyInfo); + } + + /** + * 批量删除退料任务 + * + * @param ids 需要删除的退料任务主键 + * @return 结果 + */ + @Override + public int deleteBackApplyInfoByIds(Long[] ids) + { + return backApplyInfoMapper.deleteBackApplyInfoByIds(ids); + } + + /** + * 删除退料任务信息 + * + * @param id 退料任务主键 + * @return 结果 + */ + @Override + public int deleteBackApplyInfoById(Long id) + { + return backApplyInfoMapper.deleteBackApplyInfoById(id); + } +} diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/back/service/impl/BackCheckDetailsServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/back/service/impl/BackCheckDetailsServiceImpl.java new file mode 100644 index 00000000..69f82e6c --- /dev/null +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/back/service/impl/BackCheckDetailsServiceImpl.java @@ -0,0 +1,96 @@ +package com.bonus.material.back.service.impl; + +import java.util.List; +import com.bonus.common.core.utils.DateUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.bonus.material.back.mapper.BackCheckDetailsMapper; +import com.bonus.material.back.domain.BackCheckDetails; +import com.bonus.material.back.service.IBackCheckDetailsService; + +/** + * 退料核查Service业务层处理 + * + * @author xsheng + * @date 2024-09-26 + */ +@Service +public class BackCheckDetailsServiceImpl implements IBackCheckDetailsService +{ + @Autowired + private BackCheckDetailsMapper backCheckDetailsMapper; + + /** + * 查询退料核查 + * + * @param id 退料核查主键 + * @return 退料核查 + */ + @Override + public BackCheckDetails selectBackCheckDetailsById(Long id) + { + return backCheckDetailsMapper.selectBackCheckDetailsById(id); + } + + /** + * 查询退料核查列表 + * + * @param backCheckDetails 退料核查 + * @return 退料核查 + */ + @Override + public List selectBackCheckDetailsList(BackCheckDetails backCheckDetails) + { + return backCheckDetailsMapper.selectBackCheckDetailsList(backCheckDetails); + } + + /** + * 新增退料核查 + * + * @param backCheckDetails 退料核查 + * @return 结果 + */ + @Override + public int insertBackCheckDetails(BackCheckDetails backCheckDetails) + { + backCheckDetails.setCreateTime(DateUtils.getNowDate()); + return backCheckDetailsMapper.insertBackCheckDetails(backCheckDetails); + } + + /** + * 修改退料核查 + * + * @param backCheckDetails 退料核查 + * @return 结果 + */ + @Override + public int updateBackCheckDetails(BackCheckDetails backCheckDetails) + { + backCheckDetails.setUpdateTime(DateUtils.getNowDate()); + return backCheckDetailsMapper.updateBackCheckDetails(backCheckDetails); + } + + /** + * 批量删除退料核查 + * + * @param ids 需要删除的退料核查主键 + * @return 结果 + */ + @Override + public int deleteBackCheckDetailsByIds(Long[] ids) + { + return backCheckDetailsMapper.deleteBackCheckDetailsByIds(ids); + } + + /** + * 删除退料核查信息 + * + * @param id 退料核查主键 + * @return 结果 + */ + @Override + public int deleteBackCheckDetailsById(Long id) + { + return backCheckDetailsMapper.deleteBackCheckDetailsById(id); + } +} diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/back/BackApplyDetailsMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/back/BackApplyDetailsMapper.xml new file mode 100644 index 00000000..b8fb24e5 --- /dev/null +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/back/BackApplyDetailsMapper.xml @@ -0,0 +1,105 @@ + + + + + + + + + + + + + + + + + + + + + select id, code, parent_id, type_id, pre_num, audit_num, status, create_by, create_time, update_by, update_time, remark, company_id from back_apply_details + + + + + + + + insert into back_apply_details + + code, + parent_id, + type_id, + pre_num, + audit_num, + status, + create_by, + create_time, + update_by, + update_time, + remark, + company_id, + + + #{code}, + #{parentId}, + #{typeId}, + #{preNum}, + #{auditNum}, + #{status}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + #{remark}, + #{companyId}, + + + + + update back_apply_details + + code = #{code}, + parent_id = #{parentId}, + type_id = #{typeId}, + pre_num = #{preNum}, + audit_num = #{auditNum}, + status = #{status}, + create_by = #{createBy}, + create_time = #{createTime}, + update_by = #{updateBy}, + update_time = #{updateTime}, + remark = #{remark}, + company_id = #{companyId}, + + where id = #{id} + + + + delete from back_apply_details where id = #{id} + + + + delete from back_apply_details where id in + + #{id} + + + \ No newline at end of file diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/back/BackApplyInfoMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/back/BackApplyInfoMapper.xml new file mode 100644 index 00000000..f0f4ac26 --- /dev/null +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/back/BackApplyInfoMapper.xml @@ -0,0 +1,125 @@ + + + + + + + + + + + + + + + + + + + + + + + + + select id, code, task_id, back_person, phone, direct_audit_by, direct_audit_time, direct_audit_remark, create_by, create_time, update_by, update_time, remark, company_id, back_time, status, direct_id from back_apply_info + + + + + + + + insert into back_apply_info + + code, + task_id, + back_person, + phone, + direct_audit_by, + direct_audit_time, + direct_audit_remark, + create_by, + create_time, + update_by, + update_time, + remark, + company_id, + back_time, + status, + direct_id, + + + #{code}, + #{taskId}, + #{backPerson}, + #{phone}, + #{directAuditBy}, + #{directAuditTime}, + #{directAuditRemark}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + #{remark}, + #{companyId}, + #{backTime}, + #{status}, + #{directId}, + + + + + update back_apply_info + + code = #{code}, + task_id = #{taskId}, + back_person = #{backPerson}, + phone = #{phone}, + direct_audit_by = #{directAuditBy}, + direct_audit_time = #{directAuditTime}, + direct_audit_remark = #{directAuditRemark}, + create_by = #{createBy}, + create_time = #{createTime}, + update_by = #{updateBy}, + update_time = #{updateTime}, + remark = #{remark}, + company_id = #{companyId}, + back_time = #{backTime}, + status = #{status}, + direct_id = #{directId}, + + where id = #{id} + + + + delete from back_apply_info where id = #{id} + + + + delete from back_apply_info where id in + + #{id} + + + \ No newline at end of file diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/back/BackCheckDetailsMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/back/BackCheckDetailsMapper.xml new file mode 100644 index 00000000..7d2ca351 --- /dev/null +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/back/BackCheckDetailsMapper.xml @@ -0,0 +1,105 @@ + + + + + + + + + + + + + + + + + + + + + select id, parent_id, type_id, ma_id, back_num, back_status, create_by, create_time, update_by, update_time, remark, company_id, is_finished from back_check_details + + + + + + + + insert into back_check_details + + parent_id, + type_id, + ma_id, + back_num, + back_status, + create_by, + create_time, + update_by, + update_time, + remark, + company_id, + is_finished, + + + #{parentId}, + #{typeId}, + #{maId}, + #{backNum}, + #{backStatus}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + #{remark}, + #{companyId}, + #{isFinished}, + + + + + update back_check_details + + parent_id = #{parentId}, + type_id = #{typeId}, + ma_id = #{maId}, + back_num = #{backNum}, + back_status = #{backStatus}, + create_by = #{createBy}, + create_time = #{createTime}, + update_by = #{updateBy}, + update_time = #{updateTime}, + remark = #{remark}, + company_id = #{companyId}, + is_finished = #{isFinished}, + + where id = #{id} + + + + delete from back_check_details where id = #{id} + + + + delete from back_check_details where id in + + #{id} + + + \ No newline at end of file