diff --git a/sgzb-common/sgzb-common-core/src/main/java/com/bonus/sgzb/common/core/enums/TaskTypeEnum.java b/sgzb-common/sgzb-common-core/src/main/java/com/bonus/sgzb/common/core/enums/TaskTypeEnum.java index 90ec54f7..7aafb74e 100644 --- a/sgzb-common/sgzb-common-core/src/main/java/com/bonus/sgzb/common/core/enums/TaskTypeEnum.java +++ b/sgzb-common/sgzb-common-core/src/main/java/com/bonus/sgzb/common/core/enums/TaskTypeEnum.java @@ -31,6 +31,7 @@ public enum TaskTypeEnum { *维修任务 */ MAINTENANCE_TASK(41, "维修任务"), + MAINTENANCE_IN_PROGRESS(43, "维修进行中"), /** *维修审核 diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/BackReceiveController.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/BackReceiveController.java index 87531ab9..506312ee 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/BackReceiveController.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/BackReceiveController.java @@ -16,6 +16,7 @@ import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; +import java.util.ArrayList; import java.util.List; import static com.bonus.sgzb.common.core.constant.Constants.PAGE_NUM; @@ -33,6 +34,7 @@ public class BackReceiveController extends BaseController { @Resource private BackReceiveService backReceiveService; + /** * 退料接收列表 * @@ -50,7 +52,7 @@ public class BackReceiveController extends BaseController { List list = backReceiveService.getbackReceiveList(record); Integer pageIndex = Convert.toInt(ServletUtils.getParameter(PAGE_NUM), 1); Integer pageSize = Convert.toInt(ServletUtils.getParameter(PAGE_SIZE), 10); - return AjaxResult.success(ListPagingUtil.paging(pageIndex,pageSize, list)); + return AjaxResult.success(ListPagingUtil.paging(pageIndex, pageSize, list)); } } catch (Exception e) { throw new RuntimeException(e); @@ -98,7 +100,6 @@ public class BackReceiveController extends BaseController { @PostMapping("/receiveViewWeb") public AjaxResult receiveViewWeb(@RequestBody BackApplyInfo record) { try { - //startPage(); List list = backReceiveService.receiveView(record); Integer pageIndex = cn.hutool.core.convert.Convert.toInt(record.getPageNum(), 1); Integer pageSize = cn.hutool.core.convert.Convert.toInt(record.getPageSize(), 10); @@ -108,6 +109,24 @@ public class BackReceiveController extends BaseController { } } + /** + * 校验退料接收数量是否全部处理 + * + * @param record 查询条件 + * @return AjaxResult对象 + */ + @Log(title = "退料接收明细-web", businessType = BusinessType.QUERY) + @PostMapping("/getReceiveViewWebNum") + public AjaxResult getReceiveViewWebNum(@RequestBody BackApplyInfo record) { + List list = backReceiveService.receiveView(record); + for (BackApplyInfo backApplyInfo : list) { + if (Integer.valueOf(backApplyInfo.getNum()) > 0) { + return AjaxResult.success(0); + } + } + return AjaxResult.success(1); + } + /** * 数量退料--管理方式为1的 * @@ -297,7 +316,7 @@ public class BackReceiveController extends BaseController { List list = backReceiveService.backReceiveRecordWeb(record); Integer pageIndex = Convert.toInt(ServletUtils.getParameter(PAGE_NUM), 1); Integer pageSize = Convert.toInt(ServletUtils.getParameter(PAGE_SIZE), 10); - return AjaxResult.success(ListPagingUtil.paging(pageIndex,pageSize, list)); + return AjaxResult.success(ListPagingUtil.paging(pageIndex, pageSize, list)); } catch (Exception e) { throw new RuntimeException(e); } diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/BackReceiveMapper.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/BackReceiveMapper.java index 8e8f02a1..f14fb269 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/BackReceiveMapper.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/BackReceiveMapper.java @@ -206,4 +206,5 @@ public interface BackReceiveMapper { List backReceiveRecordWebPt(BackApplyInfo record); List getScrapBackMachine(TmTask task); + } \ No newline at end of file diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/BackReceiveService.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/BackReceiveService.java index 7753025d..7ce2a6ba 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/BackReceiveService.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/BackReceiveService.java @@ -101,4 +101,5 @@ public interface BackReceiveService { List backReceiveRecordWebPt(BackApplyInfo record); List getScrapBackMachine(TmTask task); + } diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/BackReceiveServiceImpl.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/BackReceiveServiceImpl.java index 4a3ba7ec..02d4f39a 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/BackReceiveServiceImpl.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/BackReceiveServiceImpl.java @@ -65,7 +65,8 @@ public class BackReceiveServiceImpl implements BackReceiveService { @Override public List receiveView(BackApplyInfo record) { List backApplyInfoList = backReceiveMapper.receiveView(record); - int count1 = 0; + //重庆成套设备处理（宁夏不用） + /* int count1 = 0; int count2 = 0; for (BackApplyInfo backApplyInfo : backApplyInfoList) { if ("2".equals(backApplyInfo.getManageType())) { @@ -89,7 +90,7 @@ public class BackReceiveServiceImpl implements BackReceiveService { backApplyInfo.setPartNum((int) Double.parseDouble(backApplyInfo.getPreNum())); } } - } + }*/ return backApplyInfoList; } diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/MaWholeSetController.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/MaWholeSetController.java index 0d578df5..96f0a429 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/MaWholeSetController.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/MaWholeSetController.java @@ -106,7 +106,7 @@ public class MaWholeSetController extends BaseController { */ @ApiOperation("领料申请查询成套抱杆设备") @GetMapping("/selectListByWholeTypeName") - public AjaxResult selectListByWholeTypeName(String wholeTypeName) { + public AjaxResult selectListByWholeTypeName(MaWholeSetDto wholeTypeName) { List list = maWholeSetService.selectListByWholeTypeName(wholeTypeName); return AjaxResult.success(list); } diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/PurchaseCheckServiceCenterController.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/PurchaseCheckServiceCenterController.java index 8c85558e..ce518a77 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/PurchaseCheckServiceCenterController.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/PurchaseCheckServiceCenterController.java @@ -27,15 +27,14 @@ import java.util.List; /** * 新购--综合服务中心 - * + * * @author bonus * @date 2023-12-10 */ @RestController @Api(value = "新购--综合服务中心") @RequestMapping("/purchaseCheckServiceCenter") -public class PurchaseCheckServiceCenterController extends BaseController -{ +public class PurchaseCheckServiceCenterController extends BaseController { @Autowired private PurchaseCheckServiceCenterService purchaseCheckServiceCenterService; @@ -44,19 +43,23 @@ public class PurchaseCheckServiceCenterController extends BaseController */ @ApiOperation("查询新购入库任务列表") @GetMapping("/putInList") - public TableDataInfo putInList(PurchaseCheckInfo purchaseCheckInfo) - { - startPage(); - return getDataTable(purchaseCheckServiceCenterService.selectPutInListList(purchaseCheckInfo)); + public AjaxResult putInList(PurchaseCheckInfo purchaseCheckInfo) { + if (purchaseCheckInfo.getFlag() == 1) { + //app传1 + return AjaxResult.success(purchaseCheckServiceCenterService.selectPutInListList(purchaseCheckInfo)); + } else { + startPage(); + return AjaxResult.success(getDataTable(purchaseCheckServiceCenterService.selectPutInListList(purchaseCheckInfo))); + } } + /** * 获取新购验收编号管理详细信息 */ @ApiOperation(value = "新购入库清单明细") @GetMapping(value = "/putinDetails") - public TableDataInfo putinDetails(PurchaseMacodeInfo purchaseMacodeInfo) - { + public TableDataInfo putinDetails(PurchaseMacodeInfo purchaseMacodeInfo) { startPage(); return getDataTable(purchaseCheckServiceCenterService.selectPutinDetails(purchaseMacodeInfo)); } @@ -66,7 +69,7 @@ public class PurchaseCheckServiceCenterController extends BaseController */ @ApiOperation(value = "综合服务中心审核") @PutMapping("/manageStatus") - public AjaxResult modifyManageStatus(@RequestBody MaInputVO maInputVO){ + public AjaxResult modifyManageStatus(@RequestBody MaInputVO maInputVO) { try { return purchaseCheckServiceCenterService.modifyManageStatus(maInputVO); } catch (Exception e) { @@ -83,8 +86,7 @@ public class PurchaseCheckServiceCenterController extends BaseController @ApiOperation("导出新购工机具入库") @Log(title = "导出新购工机具入库", businessType = BusinessType.EXPORT) @PostMapping("/putInExport") - public void putInExport(HttpServletResponse response, PurchaseCheckInfo purchaseCheckInfo) - { + public void putInExport(HttpServletResponse response, PurchaseCheckInfo purchaseCheckInfo) { List list = purchaseCheckServiceCenterService.putInExportList(purchaseCheckInfo); ExcelUtil util = new ExcelUtil(PurchaseInput.class); util.exportExcel(response, list, "新购工机具入库"); diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/ScrapApplyDetailsController.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/ScrapApplyDetailsController.java index a40b1ed4..272d3c99 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/ScrapApplyDetailsController.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/ScrapApplyDetailsController.java @@ -2,12 +2,14 @@ package com.bonus.sgzb.material.controller; import java.util.List; import java.util.Map; +import java.util.stream.Collectors; import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; import cn.hutool.core.convert.Convert; import com.bonus.sgzb.common.core.utils.ListPagingUtil; import com.bonus.sgzb.common.core.utils.ServletUtils; +import com.bonus.sgzb.common.core.web.page.TableSupport; import com.bonus.sgzb.material.domain.*; import com.bonus.sgzb.material.service.IScrapApplyDetailsService; import com.bonus.sgzb.material.vo.*; @@ -77,7 +79,6 @@ public class ScrapApplyDetailsController extends BaseController { } - /** * 查看报废任务详细列表 */ @@ -89,6 +90,128 @@ public class ScrapApplyDetailsController extends BaseController { return getDataTable(list); } + /** + * 查看报废任务-驳回退料列表 + */ + @ApiOperation("查看报废任务详细列表") + @GetMapping("/getScrapRefuseList") + public TableDataInfo getScrapRefuseList(ScrapApplyDetails scrapApplyDetails) { + startPage(); + List list = scrapApplyDetailsService.getScrapRefuseList(scrapApplyDetails); + return getDataTable(list); + } + + /** + * 完成退料时，查看是否都退料完成 + */ + @ApiOperation("完成退料时，查看是否都退料完成") + @GetMapping("/getScrapRefuseIsSuc") + public AjaxResult getScrapRefuseIsSuc(ScrapApplyDetails scrapApplyDetails) { + List list = scrapApplyDetailsService.getScrapRefuseIsSuc(scrapApplyDetails); + if (list.size() != 0) { + for (ScrapApplyDetails applyDetails : list) { + if (applyDetails.getNum() != 0) { + // 存在未退料 + return AjaxResult.success(0); + } + } + List collect = list.stream().filter(t -> t.getBackStatus() == 3).collect(Collectors.toList()); + if (collect.size() > 0) { + //全部退料，但存在报废机具 + return AjaxResult.success(1); + } + } + //全部退料，不存在报废机具 + return AjaxResult.success(2); + } + + /** + * 预报废列表-驳回退料编辑按钮查看（编码设备） + */ + @ApiOperation("预报废列表-驳回退料编辑按钮查看（编码设备）") + @GetMapping("/getScrapRefuseMaCodeList") + public TableDataInfo getScrapRefuseMaCodeList(ScrapApplyDetails scrapApplyDetails) { + startPage(); + List list = scrapApplyDetailsService.getScrapRefuseMaCodeList(scrapApplyDetails); + return getDataTable(list); + } + + + /** + * @param record 查询条件 + * @return AjaxResult对象 + */ + @Log(title = "退料接收-数量退料/编码退料", businessType = BusinessType.INSERT) + @PostMapping("setNumOrCodeBack") + public AjaxResult setNumOrCodeBack(@RequestBody BackApplyInfo record) { + try { + if (record.getFlag() == 0) { + int res = scrapApplyDetailsService.setNumBack(record); + if (res > 0) { + return AjaxResult.success("接收成功"); + } else { + return AjaxResult.error("接收失败"); + } + } else { + int res = scrapApplyDetailsService.setCodeBack(record); + if (res > 0) { + return AjaxResult.success("接收成功"); + } else if (res == -1) { + return AjaxResult.error("该编码已接收"); + } else if (res == -2) { + return AjaxResult.error("已超出退料数量！！"); + } else { + return AjaxResult.error("接收失败"); + } + } + } catch (Exception e) { + throw new RuntimeException(e); + } + } + + /** + * 退料接收撤回 + * + * @return AjaxResult对象 + */ + @Log(title = "退料接收-撤回") + @PostMapping("/revoke") + public AjaxResult revoke(@RequestBody BackApplyInfo record) { + int res = scrapApplyDetailsService.revoke(record); + if (res > 0) { + return AjaxResult.success("撤回成功"); + } else { + return AjaxResult.error("撤回失败"); + } + } + + + @Log(title = "预报废列表-退料接收记录-web（数量设备）", businessType = BusinessType.INSERT) + @PostMapping("scrapReceiveRecordWeb") + public AjaxResult scrapReceiveRecordWeb(@RequestBody BackApplyInfo record) { + try { + List list = scrapApplyDetailsService.scrapReceiveRecordWeb(record); + Integer pageIndex = com.bonus.sgzb.common.core.text.Convert.toInt(ServletUtils.getParameter(PAGE_NUM), 1); + Integer pageSize = com.bonus.sgzb.common.core.text.Convert.toInt(ServletUtils.getParameter(TableSupport.PAGE_SIZE), 10); + return AjaxResult.success(ListPagingUtil.paging(pageIndex, pageSize, list)); + } catch (Exception e) { + throw new RuntimeException(e); + } + } + + @Log(title = "预报废列表-退料接收记录-web（编码设备）", businessType = BusinessType.INSERT) + @PostMapping("scrapReceiveRecordWebPt") + public AjaxResult scrapReceiveRecordWebPt(@RequestBody BackApplyInfo record) { + try { + List list = scrapApplyDetailsService.backReceiveRecordWebPt(record); + Integer pageIndex = com.bonus.sgzb.common.core.text.Convert.toInt(ServletUtils.getParameter(PAGE_NUM), 1); + Integer pageSize = com.bonus.sgzb.common.core.text.Convert.toInt(ServletUtils.getParameter(TableSupport.PAGE_SIZE), 10); + return AjaxResult.success(ListPagingUtil.paging(pageIndex, pageSize, list)); + } catch (Exception e) { + throw new RuntimeException(e); + } + } + /** * 查看报废任务详细列表-app */ @@ -108,6 +231,15 @@ public class ScrapApplyDetailsController extends BaseController { public AjaxResult audit(@RequestBody ScrapAudit scrapAudit) throws Exception { return toAjax(scrapApplyDetailsService.auditScrap(scrapAudit)); } + /** + * 报废任务审核 + */ + @ApiOperation("预报废列表-完成退料") + @Log(title = "报废任务审核", businessType = BusinessType.UPDATE) + @PostMapping("/endBack") + public AjaxResult endBack(@RequestBody ScrapAudit scrapAudit) { + return toAjax(scrapApplyDetailsService.endback(scrapAudit)); + } /** * 查看报废明细 @@ -149,6 +281,7 @@ public class ScrapApplyDetailsController extends BaseController { List list = scrapApplyDetailsService.getScrapApplyList(scrapApplyDetails); return getDataTable(list); } + /** * 查询预报废任务列表-App */ @@ -201,8 +334,6 @@ public class ScrapApplyDetailsController extends BaseController { } - - /** * 报废任务审核----宁夏 */ @@ -239,6 +370,7 @@ public class ScrapApplyDetailsController extends BaseController { public AjaxResult obtainDisposal(@RequestBody List tmTaskList) { return toAjax(scrapApplyDetailsService.obtainDisposal(tmTaskList)); } + /** * 导出报废任务列表 */ diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/BackApplyInfo.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/BackApplyInfo.java index b3fe7d0d..2ad8255f 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/BackApplyInfo.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/BackApplyInfo.java @@ -24,6 +24,19 @@ public class BackApplyInfo extends BaseEntity { @ApiModelProperty(value="工程id") private Long projectId; + /** + * 合格数量 + */ + private Integer hgNum; + /** + * 维修数量 + */ + private Integer wxNum; + /** + * 报废数量 + */ + private Integer bfNum; + /** * 任务ID */ @@ -44,6 +57,9 @@ public class BackApplyInfo extends BaseEntity { private String ids; private String applyStatus; + /** 报废原因 */ + @ApiModelProperty(value = "报废原因") + private String scrapReason; /** * 装备管理方式(0编号 1计数) */ @@ -57,10 +73,19 @@ public class BackApplyInfo extends BaseEntity { private Integer maId; + /** + * 报废（0：自然报废，1人为报废） + */ + private Integer scrapType; + /** * 退料状态 */ private String backStatus; + /** + * 报废图片地址 + */ + private String fileUrl; /** * 退料数量 diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/PurchaseCheckInfo.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/PurchaseCheckInfo.java index e281c950..61451fe0 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/PurchaseCheckInfo.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/PurchaseCheckInfo.java @@ -44,6 +44,14 @@ public class PurchaseCheckInfo extends BaseEntity @Excel(name = "到货日期") private String arrivalTime; + public Integer getFlag() { + return flag; + } + + public void setFlag(Integer flag) { + this.flag = flag; + } + /** 采购员名称 */ @ApiModelProperty(value = "采购员名称") @Excel(name = "采购员") @@ -53,6 +61,8 @@ public class PurchaseCheckInfo extends BaseEntity @ApiModelProperty(value = "采购员") private Long purchaser; + private Integer flag; + /** 采购机具设备名称 */ @ApiModelProperty(value = "采购机具设备") @Excel(name = "机具类型名称") diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/ScrapApplyDetails.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/ScrapApplyDetails.java index a0216ad8..02409980 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/ScrapApplyDetails.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/ScrapApplyDetails.java @@ -30,6 +30,9 @@ public class ScrapApplyDetails extends BaseEntity /** 任务ID */ @ApiModelProperty(value = "任务ID") private Long taskId; + /** 管理方式(0编号 1计数) */ + @ApiModelProperty(value = "管理方式(0编号 1计数)") + private Integer manageType; /** * 审核状态 @@ -96,12 +99,17 @@ public class ScrapApplyDetails extends BaseEntity @ApiModelProperty(value = "规格型号") private String specificationType; + @ApiModelProperty(value = "退料数量数量") + private Integer preNum; + @ApiModelProperty(value = "待退料数量") + private Integer num; @ApiModelProperty(value = "机具类型名称") private String machineTypeName; @ApiModelProperty(value = "机具编号") private String maCode; + private String maStatus; private String buyPrice; /** @@ -135,6 +143,9 @@ public class ScrapApplyDetails extends BaseEntity /** 当前记录起始索引 */ private Integer pageNum; + /** 退料状态(1合格，2维修，3待报废) */ + private Integer backStatus; + /** 每页显示记录数 */ private Integer pageSize; diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/MaWholeSetMapper.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/MaWholeSetMapper.java index 41ec8d81..cdc78d40 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/MaWholeSetMapper.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/MaWholeSetMapper.java @@ -25,7 +25,7 @@ public interface MaWholeSetMapper { * @param wholeTypeName * @return */ - int selectByWholeTypeName(String wholeTypeName); + int selectByWholeTypeName(MaWholeSetDto wholeTypeName); /** * 查询整套抱杆管理 @@ -76,5 +76,5 @@ public interface MaWholeSetMapper { */ List selectId(@Param("typeId") List typeId); - List selectListByWholeTypeName(String wholeTypeName); + List selectListByWholeTypeName(MaWholeSetDto wholeTypeName); } diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/ScrapApplyDetailsMapper.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/ScrapApplyDetailsMapper.java index 292dcdc3..a4142c6c 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/ScrapApplyDetailsMapper.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/ScrapApplyDetailsMapper.java @@ -5,22 +5,24 @@ import com.bonus.sgzb.material.domain.RepairAuditDetails; import com.bonus.sgzb.material.domain.RepairRecord; import com.bonus.sgzb.material.domain.ScrapApplyDetails; import com.bonus.sgzb.material.vo.ScrapApplyDetailsVO; +import com.bonus.sgzb.material.vo.ScrapAudit; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import java.util.Date; import java.util.List; /** * 报废任务详细scrap_apply_detailsMapper接口 - * + * * @author bonus * @date 2023-12-15 */ @Mapper -public interface ScrapApplyDetailsMapper -{ +public interface ScrapApplyDetailsMapper { /** * 查询报废任务详细scrap_apply_details - * + * * @param id 报废任务详细scrap_apply_details主键 * @return 报废任务详细scrap_apply_details */ @@ -28,7 +30,7 @@ public interface ScrapApplyDetailsMapper /** * 查询报废任务详细scrap_apply_details列表 - * + * * @param scrapApplyDetails 报废任务详细scrap_apply_details * @return 报废任务详细scrap_apply_details集合 */ @@ -36,7 +38,7 @@ public interface ScrapApplyDetailsMapper /** * 新增报废任务详细scrap_apply_details - * + * * @param scrapApplyDetails 报废任务详细scrap_apply_details * @return 结果 */ @@ -44,7 +46,7 @@ public interface ScrapApplyDetailsMapper /** * 修改报废任务详细scrap_apply_details - * + * * @param scrapApplyDetails 报废任务详细scrap_apply_details * @return 结果 */ @@ -52,7 +54,7 @@ public interface ScrapApplyDetailsMapper /** * 删除报废任务详细scrap_apply_details - * + * * @param id 报废任务详细scrap_apply_details主键 * @return 结果 */ @@ -60,91 +62,103 @@ public interface ScrapApplyDetailsMapper /** * 批量删除报废任务详细scrap_apply_details - * + * * @param ids 需要删除的数据主键集合 * @return 结果 */ public int deleteScrapApplyDetailsByIds(Long[] ids); /** - *查询ScrapApplyDetails + * 查询ScrapApplyDetails + * * @param scrapApplyDetails * @return */ List selectScrapAuditList(ScrapApplyDetails scrapApplyDetails); /** - *查询ScrapApplyDetails + * 查询ScrapApplyDetails + * * @param taskId * @return */ List selectScrapDetailsByTaskId(Long taskId); /** - *修改 + * 修改 + * * @param maId * @return */ int updateMachine(Long maId); /** - *查询 + * 查询 + * * @param taskId * @return */ String selectTypeNameByTaskId(Long taskId); /** - *导出 + * 导出 + * * @param bean * @return */ List exportScrapApplyDetailsList(ScrapApplyDetails bean); /** - *查询 + * 查询 + * * @param taskId * @return */ List selectnotScrapByTaskId(Long taskId); /** - *添加 + * 添加 + * * @param bean * @return */ int addBackDetails(ScrapApplyDetails bean); /** - *查询 + * 查询 + * * @param parentId * @return */ BackApplyInfo getBackApplyInfo(int parentId); /** - *添加 + * 添加 + * * @param backApplyInfo * @return */ int addBackInfo(BackApplyInfo backApplyInfo); /** - *查询RepairAuditDetails + * 查询RepairAuditDetails + * * @param parentId * @return */ RepairAuditDetails getRepairAudit(Long parentId); /** - *添加 + * 添加 + * * @param details * @return */ int addRepaieAudit(RepairAuditDetails details); /** - *修改 + * 修改 + * * @param bean * @return */ @@ -162,10 +176,54 @@ public interface ScrapApplyDetailsMapper /** * 查询预报废申请列表 + * * @param scrapApplyDetails 包含预报废申请详情的实体对象，用于筛选申请列表的条件。 * @return */ List getScrapApplyList(ScrapApplyDetails scrapApplyDetails); List scrapTaskReviewList(ScrapApplyDetails scrapApplyDetails); + + List getScrapRefuseList(ScrapApplyDetails scrapApplyDetails); + + List getScrapRefuseMaCodeList(ScrapApplyDetails scrapApplyDetails); + + int insertCheckDetails(BackApplyInfo backApplyInfo); + + int updateMaStatus(@Param("maId") int maId, @Param("maStatus") String maStatus); + + int selectNumByTypeId(@Param("parentId") Integer parentId, @Param("typeId") String typeId); + + int selectCodeByMaIdAndTaskId(@Param("maId") Integer maId, @Param("taskId") Integer taskId); + + List getMaId(BackApplyInfo record); + + int deleteCheckDetails(BackApplyInfo record); + + + BackApplyInfo scrapReceiveRecordWeb(BackApplyInfo record); + + BackApplyInfo scrapReceiveRecordWebPt(BackApplyInfo record); + + List getScrapRefuseIsSuc(ScrapApplyDetails scrapApplyDetails); + + int selectTaskStatus(long taskId); + + List getHgList(ScrapAudit scrapAudit); + + int insertIad(BackApplyInfo bi); + + int updateMt(BackApplyInfo bi); + + List getWxList(ScrapAudit scrapAudit); + + int insertTta(@Param("taskId") int taskId,@Param("agreementId") Integer agreementId); + + int insertRad(BackApplyInfo wx); + + List getBfList(ScrapAudit scrapAudit); + + int insertSad(BackApplyInfo bf); + + Integer selectTaskNumByMonthWx(@Param("date") Date date, @Param("taskType") Integer taskType); } diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/TaskMapper.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/TaskMapper.java index 53f40970..089db445 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/TaskMapper.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/TaskMapper.java @@ -98,4 +98,8 @@ public interface TaskMapper { String selectTaskNumByMonths(@Param("date") Date nowDate, @Param("taskType") Integer taskType); List selectTmTaskListByDisposition(ScrapApplyDetails scrapApplyDetails); + + int insertTt(BackApplyInfo applyInfo); + + int updateTaskStatus(@Param("taskId") long taskId, @Param("status") int status); } diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/IScrapApplyDetailsService.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/IScrapApplyDetailsService.java index c88868f0..af9b3162 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/IScrapApplyDetailsService.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/IScrapApplyDetailsService.java @@ -69,6 +69,13 @@ public interface IScrapApplyDetailsService * @return */ List getScrapAuditList(ScrapApplyDetails scrapApplyDetails); + /** + * 看报废任务-驳回退料列表 + * @param scrapApplyDetails + * @return + */ + List getScrapRefuseList(ScrapApplyDetails scrapApplyDetails); + List getScrapRefuseMaCodeList(ScrapApplyDetails scrapApplyDetails); /** * 报废任务审核 @@ -147,4 +154,18 @@ public interface IScrapApplyDetailsService * @return */ List exportForecastWaste(ScrapApplyDetails scrapApplyDetails); + + int setNumBack(BackApplyInfo record); + + int setCodeBack(BackApplyInfo record); + + int revoke(BackApplyInfo record); + + List scrapReceiveRecordWeb(BackApplyInfo record); + + List backReceiveRecordWebPt(BackApplyInfo record); + + List getScrapRefuseIsSuc(ScrapApplyDetails scrapApplyDetails); + + int endback(ScrapAudit scrapAudit); } diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/MaWholeSetService.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/MaWholeSetService.java index 6fb8ecf1..d1d3e6fe 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/MaWholeSetService.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/MaWholeSetService.java @@ -58,5 +58,5 @@ public interface MaWholeSetService { */ MaWholeTreeVo selectListTree(Integer id); - List selectListByWholeTypeName(String wholeTypeName); + List selectListByWholeTypeName(MaWholeSetDto wholeTypeName); } diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/BackApplyServiceImpl.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/BackApplyServiceImpl.java index fd645281..8f58d595 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/BackApplyServiceImpl.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/BackApplyServiceImpl.java @@ -149,23 +149,6 @@ public class BackApplyServiceImpl implements BackApplyService { bean.setCompanyId(companyId.toString()); } List view = backApplyMapper.getView(bean); - return getMaTypeDetails(view); - } - - private List getMaTypeDetails(List view) { - if (view.size() > 0) { - for (BackApplyInfo backApplyInfo : view) { - List machineParts = new ArrayList<>(); - List typeIds = tmTaskMapper.getMaTypeDetails(backApplyInfo); - typeIds.removeIf(item -> item == null); - for (TmTask typeId : typeIds) { - MachinePart machinePart = tmTaskMapper.getMachineParts(typeId); - machinePart.setPartNum((int) (Double.parseDouble(typeId.getPartNum()) * Double.parseDouble(backApplyInfo.getPreNum()))); - machineParts.add(machinePart); - } - backApplyInfo.setMaTypeDetails(machineParts); - } - } return view; } diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/MaWholeSetServiceImpl.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/MaWholeSetServiceImpl.java index bb9f25c8..e029c3d6 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/MaWholeSetServiceImpl.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/MaWholeSetServiceImpl.java @@ -43,7 +43,7 @@ public class MaWholeSetServiceImpl implements MaWholeSetService { } //先查询是否有重复的配套名称 - if (selectByWholeTypeName(dto.getWholeTypeName()) > 0) { + if (selectByWholeTypeName(dto) > 0) { return AjaxResult.error("成套名称已存在"); } @@ -157,10 +157,10 @@ public class MaWholeSetServiceImpl implements MaWholeSetService { log.error("insertMaWholeSet方法插入异常"); throw new RuntimeException("insertMaWholeSet方法插入异常"); } - /* int count = selectByWholeTypeName(dto.getWholeTypeName()); + int count = selectByWholeTypeName(dto); if (count > 1) { throw new RuntimeException("配套名称已重复，请重新输入"); - }*/ + } } catch (Exception e) { e.printStackTrace(); return AjaxResult.error(ExceptionEnum.UPDATE_TO_DATABASE.getCode(), ExceptionEnum.UPDATE_TO_DATABASE.getMsg()); @@ -194,7 +194,7 @@ public class MaWholeSetServiceImpl implements MaWholeSetService { } @Override - public List selectListByWholeTypeName(String wholeTypeName) { + public List selectListByWholeTypeName(MaWholeSetDto wholeTypeName) { return mapper.selectListByWholeTypeName(wholeTypeName); } @@ -214,7 +214,7 @@ public class MaWholeSetServiceImpl implements MaWholeSetService { * @param wholeTypeName * @return */ - private int selectByWholeTypeName(String wholeTypeName) { + private int selectByWholeTypeName(MaWholeSetDto wholeTypeName) { return mapper.selectByWholeTypeName(wholeTypeName); } } diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/ScrapApplyDetailsServiceImpl.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/ScrapApplyDetailsServiceImpl.java index 7227115e..9bb96291 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/ScrapApplyDetailsServiceImpl.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/ScrapApplyDetailsServiceImpl.java @@ -28,6 +28,7 @@ import com.bonus.sgzb.material.vo.ForecastWasteExcel; import com.bonus.sgzb.material.vo.ScrapApplyDetailsVO; import com.bonus.sgzb.material.vo.ScrapAudit; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -106,6 +107,7 @@ public class ScrapApplyDetailsServiceImpl implements IScrapApplyDetailsService { /** * 查询预报废申请列表 + * * @param scrapApplyDetails 包含预报废申请详情的实体对象，用于筛选申请列表的条件。 * @return */ @@ -122,6 +124,7 @@ public class ScrapApplyDetailsServiceImpl implements IScrapApplyDetailsService { /** * 预报废任务审核 + * * @param scrapAudit * @return */ @@ -137,16 +140,16 @@ public class ScrapApplyDetailsServiceImpl implements IScrapApplyDetailsService { //获取审核列表 List scrapApplyDetailList = scrapAudit.getScrapDetailList(); if (scrapApplyDetailList == null || scrapApplyDetailList.size() == 0) { - throw new ServiceException(String.format(ExceptionDict.PARAM_IS_NULL_ERROR_MSG,"scrapDetailList"), ExceptionDict.PARAM_IS_NULL_ERROR); + throw new ServiceException(String.format(ExceptionDict.PARAM_IS_NULL_ERROR_MSG, "scrapDetailList"), ExceptionDict.PARAM_IS_NULL_ERROR); } //修改装备状态 - for (ScrapApplyDetails scrapApplyDetails: scrapApplyDetailList){ + for (ScrapApplyDetails scrapApplyDetails : scrapApplyDetailList) { scrapApplyDetails.setAuditTime(new Date()); scrapApplyDetailsMapper.updateScrapApplyDetails(scrapApplyDetails); } //根据任务id查所有的设备 List getScrapApplyDetailList = scrapApplyDetailsMapper.selectScrapDetailsByTaskId(taskId); - if (scrapApplyDetailList.size()==0){ + if (scrapApplyDetailList.size() == 0) { return BigDecimal.ROUND_UP; } //获取所有装备的状态 @@ -154,20 +157,20 @@ public class ScrapApplyDetailsServiceImpl implements IScrapApplyDetailsService { TmTask task = new TmTask(); task.setTaskId(taskId); //判断是否还有装备没有进行审核 - if (statusList.contains(ReviewStatusEnum.IN_PROGRESS.getCode())){ + if (statusList.contains(ReviewStatusEnum.IN_PROGRESS.getCode())) { task.setTaskStatus(Integer.valueOf(TaskStatusEnum.UNDER_REVIEW.getCode())); //当全部审核以后判断是否有被驳回的装备 - } else if (!statusList.contains(ReviewStatusEnum.IN_PROGRESS.getCode()) &&statusList.contains(ReviewStatusEnum.REJECTED.getCode())) { + } else if (!statusList.contains(ReviewStatusEnum.IN_PROGRESS.getCode()) && statusList.contains(ReviewStatusEnum.REJECTED.getCode())) { //完成订单中包含驳回和通过的审核结果，通过的去预报废列表，驳回的根据来源回到来源处，生成一个新的任务 task.setTaskStatus(Integer.valueOf(TaskStatusEnum.PASSED.getCode())); //判断驳回任务中是否包含审核通的单子 - if (statusList.contains(ReviewStatusEnum.PASSED.getCode())){ + if (statusList.contains(ReviewStatusEnum.PASSED.getCode())) { createScrapTask(taskId); } //驳回回到来源 - returnSource(getScrapApplyDetailList,taskId); + returnSource(getScrapApplyDetailList, taskId); //TODO 对审核驳回的单子进行处理的业务待确认 - }else { + } else { task.setTaskStatus(Integer.valueOf(TaskStatusEnum.PASSED.getCode())); //生成报废的单子 createScrapTask(taskId); @@ -178,7 +181,7 @@ public class ScrapApplyDetailsServiceImpl implements IScrapApplyDetailsService { return BigDecimal.ROUND_DOWN; } - private void returnSource(List getScrapApplyDetailList,Long taskId) { + private void returnSource(List getScrapApplyDetailList, Long taskId) { log.info("ScrapApplyDetailsServiceImpl returnSource begin"); TmTask task = taskMapper.selectTmTaskByTaskId(taskId); if (task == null) { @@ -201,23 +204,23 @@ public class ScrapApplyDetailsServiceImpl implements IScrapApplyDetailsService { //获取生成的任务id int companyId = task.getCompanyId() == null ? 0 : task.getCompanyId(); - if (backList.size()>0){ + if (backList.size() > 0) { //生成编号 - String taskCode = purchaseCodeRule(TaskTypeConstants.T, Integer.valueOf(TaskTypeEnum.MATERIAL_RETURN_TASK.getCode())); + String taskCode = purchaseCodeRule(TaskTypeConstants.T, Integer.valueOf(TaskTypeEnum.MATERIAL_RETURN_TASK.getCode())); Integer taskStatus = Integer.valueOf(TaskStatusEnum.MATERIAL_RETURN_APPROVED.getCode()); Integer taskType = Integer.valueOf(TaskTypeEnum.MATERIAL_RETURN_TASK.getCode()); long backTaskId = genTask(taskCode, taskType, taskStatus, tmTaskAgreement, companyId); // 保存到退料任务表 - backApplyInfo(backList,backTaskId,taskCode,tmTaskAgreement.getAgreementId()); + backApplyInfo(backList, backTaskId, taskCode, tmTaskAgreement.getAgreementId()); } - if (repairList.size()>0){ + if (repairList.size() > 0) { //生成编号 - String taskCode = purchaseCodeRule(TaskTypeConstants.WX, Integer.valueOf(TaskTypeEnum.MAINTENANCE_TASK.getCode())); + String taskCode = purchaseCodeRule(TaskTypeConstants.WX, Integer.valueOf(TaskTypeEnum.MAINTENANCE_TASK.getCode())); Integer taskStatus = Integer.valueOf(TaskStatusEnum.MAINTENANCE_PROGRESS.getCode()); Integer taskType = Integer.valueOf(TaskTypeEnum.MAINTENANCE_TASK.getCode()); long backTaskId = genTask(taskCode, taskType, taskStatus, tmTaskAgreement, companyId); //保存到维修任务表 - repairApplyDetails(repairList,backTaskId); + repairApplyDetails(repairList, backTaskId); } log.info("ScrapApplyDetailsServiceImpl returnSource end"); } @@ -258,7 +261,7 @@ public class ScrapApplyDetailsServiceImpl implements IScrapApplyDetailsService { backApplyInfoPo.setParentId(backList.get(0).getTaskId().intValue()); backApplyMapper.insertBackApplyInfo(backApplyInfoPo); BackApplyDetailsPo backApplyDetailsPoNew = new BackApplyDetailsPo(); - for (ScrapApplyDetails scrapApplyDetail: backList) { + for (ScrapApplyDetails scrapApplyDetail : backList) { //根据退料任务和机具类型获取退料详情 BackApplyDetailsPo backApplyDetailsPo = backApplyMapper.getBackApplyDetailsByParentId(scrapApplyDetail); backApplyDetailsPoNew.setCode(taskCode); @@ -274,11 +277,11 @@ public class ScrapApplyDetailsServiceImpl implements IScrapApplyDetailsService { scrapApplyDetail.setParentId(backApplyInfoPo.getId()); scrapApplyDetail.setTypeId(Long.valueOf(backApplyDetailsPo.getTypeId())); BackApplyDetailsPo backApplyDetailsPoResult = backApplyMapper.getBackApplyDetailsByParentId(scrapApplyDetail); - if (backApplyDetailsPoResult!=null){ + if (backApplyDetailsPoResult != null) { backApplyDetailsPoNew.setPreNum(backApplyDetailsPoResult.getPreNum().add(BigDecimal.ONE)); backApplyDetailsPoNew.setAuditNum(backApplyDetailsPoResult.getAuditNum().add(BigDecimal.ONE)); backApplyMapper.updateBackApplyDetailsByParentId(backApplyDetailsPoNew); - }else { + } else { backApplyMapper.insertBackApplyDetails(backApplyDetailsPoNew); } //修改协议表的状态 @@ -287,7 +290,7 @@ public class ScrapApplyDetailsServiceImpl implements IScrapApplyDetailsService { sltAgreementInfo.setTypeId(backApplyDetailsPo.getTypeId().toString()); sltAgreementInfoMapper.updateSltAgreementInfoStatus(sltAgreementInfo); //机具状态变为在用 - if (scrapApplyDetail.getMaId() != null){ + if (scrapApplyDetail.getMaId() != null) { SltAgreementInfo agreementInfo = new SltAgreementInfo(); agreementInfo.setMaId(scrapApplyDetail.getMaId().toString()); agreementInfo.setStatus("16"); @@ -301,6 +304,7 @@ public class ScrapApplyDetailsServiceImpl implements IScrapApplyDetailsService { /** * 提交报废任务 + * * @param scrapAudit 包含废弃任务审计信息的对象。 * @return */ @@ -311,9 +315,9 @@ public class ScrapApplyDetailsServiceImpl implements IScrapApplyDetailsService { //参数校验 后期可以考虑写一个校验的工具类 List deptIds = scrapAudit.getDeptIds(); if (deptIds == null || deptIds.size() == 0) { - throw new ServiceException(String.format(ExceptionDict.PARAM_IS_NULL_ERROR_MSG,"deptIds"), ExceptionDict.PARAM_IS_NULL_ERROR); + throw new ServiceException(String.format(ExceptionDict.PARAM_IS_NULL_ERROR_MSG, "deptIds"), ExceptionDict.PARAM_IS_NULL_ERROR); } - List taskIdList =scrapAudit.getTaskIdList(); + List taskIdList = scrapAudit.getTaskIdList(); if (taskIdList == null || taskIdList.size() == 0) { throw new ServiceException(ExceptionDict.TASK_ID_IS_EMPTY_MSG, ExceptionDict.TASK_ID_IS_EMPTY); } @@ -332,12 +336,13 @@ public class ScrapApplyDetailsServiceImpl implements IScrapApplyDetailsService { scrapAuditorSetMapper.insertScrapAuditorSet(scrapAuditorSet); } } - log.info("ScrapApplyDetailsServiceImpl submitScrapTask end" ); + log.info("ScrapApplyDetailsServiceImpl submitScrapTask end"); return BigDecimal.ROUND_DOWN; } /** * 报废任务审核--宁夏 + * * @param scrapAuditorSet * @return */ @@ -356,12 +361,12 @@ public class ScrapApplyDetailsServiceImpl implements IScrapApplyDetailsService { TmTask task = new TmTask(); task.setTaskId(Long.valueOf(scrapAuditorSet.getTaskId())); //判断是否还有部门没有进行审核 - if (statusList.contains(ReviewStatusEnum.IN_PROGRESS.getCode())){ + if (statusList.contains(ReviewStatusEnum.IN_PROGRESS.getCode())) { task.setTaskStatus(Integer.valueOf(TaskStatusEnum.SCRAP_UNDER_REVIEW.getCode())); //当全部审核以后判断是否有驳回的 - } else if (!statusList.contains(ReviewStatusEnum.IN_PROGRESS.getCode()) &&statusList.contains(ReviewStatusEnum.REJECTED.getCode())) { + } else if (!statusList.contains(ReviewStatusEnum.IN_PROGRESS.getCode()) && statusList.contains(ReviewStatusEnum.REJECTED.getCode())) { task.setTaskStatus(Integer.valueOf(TaskStatusEnum.SCRAP_REJECTED.getCode())); - }else { + } else { task.setTaskStatus(Integer.valueOf(TaskStatusEnum.SCRAP_PASSED.getCode())); task.setDisposition(Integer.valueOf(TaskStatusEnum.NOT_DISPOSED.getCode())); } @@ -377,12 +382,13 @@ public class ScrapApplyDetailsServiceImpl implements IScrapApplyDetailsService { /** * 报废任务审核列表 + * * @param scrapApplyDetails * @return */ @Override public List scrapTaskReviewList(ScrapApplyDetails scrapApplyDetails) { - log.info("ScrapApplyDetailsServiceImpl scrapTaskReviewList begin:{}",scrapApplyDetails); + log.info("ScrapApplyDetailsServiceImpl scrapTaskReviewList begin:{}", scrapApplyDetails); List scrapApplyDetailsList = scrapApplyDetailsMapper.scrapTaskReviewList(scrapApplyDetails); for (ScrapApplyDetailsVO applyDetails : scrapApplyDetailsList) { Long taskId = applyDetails.getTaskId(); @@ -391,12 +397,13 @@ public class ScrapApplyDetailsServiceImpl implements IScrapApplyDetailsService { List scrapAuditorSetList = scrapAuditorSetMapper.selectScrapAuditListByTaskId(taskId); applyDetails.setScrapAuditorSetList(scrapAuditorSetList); } - log.info("ScrapApplyDetailsServiceImpl scrapTaskReviewList end:{}",scrapApplyDetails); + log.info("ScrapApplyDetailsServiceImpl scrapTaskReviewList end:{}", scrapApplyDetails); return scrapApplyDetailsList; } /** * 获取处置列表----宁夏 + * * @param scrapApplyDetails * @return */ @@ -415,21 +422,23 @@ public class ScrapApplyDetailsServiceImpl implements IScrapApplyDetailsService { /** * 处置 + * * @param tmTaskList * @return */ @Override public int obtainDisposal(List tmTaskList) { - log.info("ScrapApplyDetailsServiceImpl scrapTaskReviewList begin:{}",tmTaskList); + log.info("ScrapApplyDetailsServiceImpl scrapTaskReviewList begin:{}", tmTaskList); tmTaskList.forEach(tmTask -> { taskMapper.updateTmTask(tmTask); }); - log.info("ScrapApplyDetailsServiceImpl scrapTaskReviewList end:{}",tmTaskList); + log.info("ScrapApplyDetailsServiceImpl scrapTaskReviewList end:{}", tmTaskList); return BigDecimal.ROUND_DOWN; } /** * 导出预报废 + * * @param scrapApplyDetails * @return */ @@ -439,10 +448,10 @@ public class ScrapApplyDetailsServiceImpl implements IScrapApplyDetailsService { List ForecastWasteExcelList = new ArrayList<>(); ForecastWasteExcel forecastWasteExcel = new ForecastWasteExcel(); //对预报废来源进行处理 - for (ScrapApplyDetailsVO scrapApplyDetailsVO: scrapApplyDetailsList) { - BeanUtils.copyProperties(scrapApplyDetailsVO,forecastWasteExcel); + for (ScrapApplyDetailsVO scrapApplyDetailsVO : scrapApplyDetailsList) { + BeanUtils.copyProperties(scrapApplyDetailsVO, forecastWasteExcel); //获取来源单号 - forecastWasteExcel.setRepairNum(scrapApplyDetailsVO.getRepairNum()!=null?scrapApplyDetailsVO.getRepairNum(): scrapApplyDetailsVO.getRepairCode()); + forecastWasteExcel.setRepairNum(scrapApplyDetailsVO.getRepairNum() != null ? scrapApplyDetailsVO.getRepairNum() : scrapApplyDetailsVO.getRepairCode()); //获取来源名称 forecastWasteExcel.setScrapSourceName(ScrapSourceEnum.getInfoByCode(scrapApplyDetailsVO.getScrapSource())); ForecastWasteExcelList.add(forecastWasteExcel); @@ -450,8 +459,381 @@ public class ScrapApplyDetailsServiceImpl implements IScrapApplyDetailsService { return ForecastWasteExcelList; } + @Override + public int setNumBack(BackApplyInfo record) { + int res; + try { +// int taskId = record.getTaskId(); +// //修改任务状态 +// res = updateTaskStatus(taskId, 39); + //插入scrap_check_details + res = insertBcd(record); + if (res == 0) { + throw new RuntimeException("插入scrap_check_details异常"); + } + } catch (Exception e) { + throw new RuntimeException(e.getMessage()); + } + + return res; + } + + @Override + public int setCodeBack(BackApplyInfo record) { + int res = 0; + try { + BackApplyInfo[] arr = record.getArr(); + if (arr.length > 0) { + for (int i = 0; i < arr.length; i++) { + //判断是否超出审核数量 + int re = scrapApplyDetailsMapper.selectNumByTypeId(arr[i].getParentId(), arr[i].getTypeId()); + if (re <= 0) { + res = -2; + break; + } + //根据maId和taskId查询是否已接收 + re = scrapApplyDetailsMapper.selectCodeByMaIdAndTaskId(arr[i].getMaId(), record.getTaskId()); + if (re > 0) { + res = -1; + break; + } + } + if (res < 0) { + return res; + } + } +// int taskId = record.getTaskId(); +// //修改任务状态 +// res = updateTaskStatus(taskId, 39); +// if (res == 0) { +// throw new RuntimeException("修改updateTaskStatus异常"); +// } + //插入scrap_check_details + res = insertBcd(record); + if (res == 0) { + throw new RuntimeException("插入scrap_check_details异常"); + } + } catch (Exception e) { + throw new RuntimeException(e.getMessage()); + } + return res; + } + + @Override + public int revoke(BackApplyInfo record) { + //删除scrap_check_details + int res = deleteBcd(record); + if (res == 0) { + throw new RuntimeException("该机具未领用，撤回失败"); + } + return res; + } + + @Override + public List scrapReceiveRecordWeb(BackApplyInfo record) { + String typeId = record.getTypeId(); + String[] split = typeId.split(","); + List backApplyInfoList = new ArrayList<>(); + for (String s : split) { + record.setTypeId(s); + BackApplyInfo backApplyInfo = scrapApplyDetailsMapper.scrapReceiveRecordWeb(record); + if (backApplyInfo != null) { + backApplyInfoList.add(backApplyInfo); + } + } + return backApplyInfoList; + } + + @Override + public List backReceiveRecordWebPt(BackApplyInfo record) { + String typeId = record.getTypeId(); + String[] split = typeId.split(","); + List backApplyInfoList = new ArrayList<>(); + for (String s : split) { + record.setTypeId(s); + BackApplyInfo backApplyInfo = scrapApplyDetailsMapper.scrapReceiveRecordWebPt(record); + if (backApplyInfo != null) { + backApplyInfoList.add(backApplyInfo); + } + } + return backApplyInfoList; + } + + @Override + public List getScrapRefuseIsSuc(ScrapApplyDetails scrapApplyDetails) { + return scrapApplyDetailsMapper.getScrapRefuseIsSuc(scrapApplyDetails); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public int endback(ScrapAudit scrapAudit) { + int res; + //参数校验 后期可以考虑写一个校验的工具类 + List deptIds = scrapAudit.getDeptIds(); + Long taskId = scrapAudit.getTaskId(); + if (StringUtils.isBlank(taskId.toString())) { + throw new ServiceException(ExceptionDict.TASK_ID_IS_EMPTY_MSG, ExceptionDict.TASK_ID_IS_EMPTY); + } + + //先判断是否已经完成退料了 + int taskStatus = selectTaskStatus(taskId); + if (taskStatus == 0) { + throw new RuntimeException("该退料单已完成退料"); + } + //修改任务状态为报废审核进行中 + res = updateTaskStatus(taskId, 59); + if (res == 0) { + throw new RuntimeException("tm_task修改状态"); + } + //更加退料接收的数据创建下一步流程 + //合格的插入入库记录input_apply_details，修改库存ma_type,修改机具状态 + List hgList = scrapApplyDetailsMapper.getHgList(scrapAudit); + if (hgList != null && hgList.size() > 0) { + res = insertIad(hgList); + if (res == 0) { + throw new RuntimeException("input_apply_details"); + } + res = updateMt(hgList); + if (res == 0) { + throw new RuntimeException("ma_type修改异常"); + } + res = updateMaStatus(hgList); + if (res == 0) { + throw new RuntimeException("ma_machines修改异常"); + } + + } + //维修的创建维修任务，插入任务协议表 + List wxList = scrapApplyDetailsMapper.getWxList(scrapAudit); + if (wxList != null && wxList.size() > 0) { + //插入任务表tm_task + int newTaskId = insertTt(wxList, TaskTypeEnum.MAINTENANCE_TASK.getCode(), scrapAudit.getCreateBy()); + //插入协议任务表tm_task_agreement + res = insertTta(newTaskId, wxList); + //插入维修记录表repair_apply_details + res = insertRad(newTaskId, wxList); + } + //待报废的创建报废任务，插入任务协议表 + + List bfList = scrapApplyDetailsMapper.getBfList(scrapAudit); + if (bfList != null && bfList.size() > 0) { + //插入任务表tm_task + int newTaskId = insertTt(bfList, TaskTypeEnum.SCRAP_TASK.getCode(), scrapAudit.getCreateBy()); + //插入协议任务表tm_task_agreement + res = insertTta(newTaskId, bfList); + //插入维修记录表scrap_apply_details + res = insertSad(newTaskId, bfList); + ScrapAuditorSet scrapAuditorSet = new ScrapAuditorSet(); + scrapAuditorSet.setTaskId(taskId.intValue()); + for (Integer deptId : deptIds) { + scrapAuditorSet.setDeptId(deptId); + scrapAuditorSet.setTaskId(newTaskId); + scrapAuditorSetMapper.insertScrapAuditorSet(scrapAuditorSet); + } + } + //创建审核详情 + + //结算功能 + /* List allList = scrapApplyDetailsMapper.getAllList(scrapAudit); + if (allList != null && allList.size() > 0) { + res = updateSlt(scrapAudit, allList); + if (res == 0) { + throw new RuntimeException("该机具未被领料使用"); + } + }*/ + return res; + } + + private int insertSad(int taskId, List list) { + int result = 0; + if (list != null) { + for (BackApplyInfo bf : list) { + bf.setTaskId(taskId); + result = scrapApplyDetailsMapper.insertSad(bf); + } + } + return result; + } + + private int insertRad(int taskId, List wxList) { + int result = 0; + if (wxList != null) { + for (BackApplyInfo wx : wxList) { + wx.setTaskId(taskId); + result = scrapApplyDetailsMapper.insertRad(wx); + } + } + return result; + } + + private int insertTta(int taskId, List list) { + int res; + Integer agreementId = list.get(0).getAgreementId(); + res = scrapApplyDetailsMapper.insertTta(taskId, agreementId); + return res; + } + + private int insertTt(List wxList, Integer taskType, String createBy) { + int newTask; + //生成单号 + String code = genCodeRule(taskType); + BackApplyInfo applyInfo = new BackApplyInfo(); + applyInfo.setTaskType(Integer.valueOf(taskType)); + String taskStatus = ""; + if (TaskTypeEnum.MAINTENANCE_TASK.getCode().equals(taskType)) { + //taskStatus = "43"; + taskStatus = TaskStatusEnum.MAINTENANCE_PROGRESS.getCode(); + } + if (TaskTypeEnum.SCRAP_TASK.getCode().equals(taskType)) { + //taskStatus = "120"; + taskStatus = TaskStatusEnum.SCRAP_UNDER_REVIEW.getCode(); + } + applyInfo.setTaskStatus(taskStatus); + applyInfo.setCode(code); + //创建人 + applyInfo.setCreateBy(createBy); + newTask = taskMapper.insertTt(applyInfo); + if (newTask > 0 && applyInfo.getTaskId() > 0) { + newTask = applyInfo.getTaskId(); + } + return newTask; + } + + /** + * 编号生成规则 + */ + private String genCodeRule(Integer taskType) { + SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMdd"); + Date nowDate = DateUtils.getNowDate(); + String format = dateFormat.format(nowDate); + Integer taskNum = scrapApplyDetailsMapper.selectTaskNumByMonthWx(nowDate, taskType); + + String taskNumStr = ""; + if (taskNum != null) { + // 将字符串转换为整数 +// int num = Integer.parseInt(taskNum); + // 执行加一操作 + taskNum++; + // 将结果转换回字符串格式，并确保结果是四位数，不足四位则在前面补0 + taskNumStr = String.format("%04d", taskNum); + } else { + taskNumStr = "0001"; + } + String code = ""; + if (TaskTypeEnum.MAINTENANCE_TASK.getCode().equals(taskType)) { + code = TaskTypeConstants.WX; + } + + if (TaskTypeEnum.RETURNED_MATERIALS_TO_BE_SCRAPPED.getCode().equals(taskType)) { + code = TaskTypeConstants.YBF; + } + code = code + format + "-" + taskNumStr; + return code; + } + + private int updateMaStatus(List hgList) { + int res = 0; + if (hgList != null && hgList.size() > 0) { + for (BackApplyInfo bi : hgList) { + Integer maId = bi.getMaId(); + if (maId == null) { + res = 1; + } else { + res = scrapApplyDetailsMapper.updateMaStatus(maId, "15"); + } + } + } + return res; + } + + private int updateMt(List hgList) { + int res = 0; + if (hgList != null && hgList.size() > 0) { + for (BackApplyInfo bi : hgList) { + res = scrapApplyDetailsMapper.updateMt(bi); + } + } + return res; + } + + private int insertIad(List hgList) { + int res = 0; + if (hgList != null && hgList.size() > 0) { + for (BackApplyInfo bi : hgList) { + res = scrapApplyDetailsMapper.insertIad(bi); + } + } + return res; + } + + private int updateTaskStatus(long taskId, int i) { + int res; + res = taskMapper.updateTaskStatus(taskId, i); + return res; + } + + private int selectTaskStatus(long taskId) { + int taskStatus = scrapApplyDetailsMapper.selectTaskStatus(taskId); + if (taskStatus == 59) { + return 0; + } else { + return 1; + } + } + + private int deleteBcd(BackApplyInfo record) { + int res = 0; + if (record != null) { + String manageType = record.getManageType(); + if ("0".equals(manageType)) { + List maId = scrapApplyDetailsMapper.getMaId(record); + for (Integer s : maId) { + //机具状态变为在用 + scrapApplyDetailsMapper.updateMaStatus(s, "16"); + } + res = scrapApplyDetailsMapper.deleteCheckDetails(record); + } else { + res = scrapApplyDetailsMapper.deleteCheckDetails(record); + } + + } + + return res; + } + + private int insertBcd(BackApplyInfo record) { + int res = 0; + BackApplyInfo[] arr = record.getArr(); + if (arr.length > 0) { + for (int i = 0; i < arr.length; i++) { + res = scrapApplyDetailsMapper.insertCheckDetails(arr[i]); + String manageType = arr[i].getManageType(); + if ("0".equals(manageType)) { + String backStatus = arr[i].getBackStatus(); + int maId = arr[i].getMaId(); + if ("1".equals(backStatus)) { + //退料合格状态变为退料带入库84 + scrapApplyDetailsMapper.updateMaStatus(maId, "84"); + } + if ("2".equals(backStatus)) { + //退料维修状态变为退料待检修17 + scrapApplyDetailsMapper.updateMaStatus(maId, "17"); + } + if ("3".equals(backStatus)) { + //退料待报废状态变为退料待报废20 + scrapApplyDetailsMapper.updateMaStatus(maId, "20"); + + } + } + } + } + return res; + } + + /** * 生成报废任务 + * * @param taskId */ private void createScrapTask(Long taskId) { @@ -462,7 +844,7 @@ public class ScrapApplyDetailsServiceImpl implements IScrapApplyDetailsService { // 查询协议表 TmTaskAgreement tmTaskAgreement = agreementMapper.selectTmTaskAgreementByTaskId(taskId); //生成编号 - String taskCode = purchaseCodeRule(TaskTypeConstants.BF, Integer.valueOf(TaskTypeEnum.SCRAP_TASK.getCode())); + String taskCode = purchaseCodeRule(TaskTypeConstants.BF, Integer.valueOf(TaskTypeEnum.SCRAP_TASK.getCode())); Integer taskStatus = Integer.valueOf(TaskStatusEnum.SCRAP_UNSUBMITTED.getCode()); Integer taskType = Integer.valueOf(TaskTypeEnum.SCRAP_TASK.getCode()); //获取该任务下通过预报废审核的装备信息 @@ -470,14 +852,14 @@ public class ScrapApplyDetailsServiceImpl implements IScrapApplyDetailsService { scrapApplyDetails.setTaskId(taskId); scrapApplyDetails.setStatus(ReviewStatusEnum.PASSED.getCode()); List scrapApplyDetailsList = scrapApplyDetailsMapper.selectScrapAuditList(scrapApplyDetails); - if (scrapApplyDetailsList.size() == 0){ + if (scrapApplyDetailsList.size() == 0) { throw new ServiceException(ExceptionDict.TASK_DETAILS_IS_EMPTY_MSG, ExceptionDict.TASK_DETAILS_IS_EMPTY); } //获取生成的任务id int companyId = task.getCompanyId() == null ? 0 : task.getCompanyId(); long backTaskId = genTask(taskCode, taskType, taskStatus, tmTaskAgreement, companyId); //保存装备详情 - processScrapApplyDetails( scrapApplyDetailsList, backTaskId); + processScrapApplyDetails(scrapApplyDetailsList, backTaskId); } @@ -489,7 +871,7 @@ public class ScrapApplyDetailsServiceImpl implements IScrapApplyDetailsService { */ public void processScrapApplyDetails(List scrapApplyDetailsList, Long backTaskId) { ScrapApplyDetails scrapApplyDetails = new ScrapApplyDetails(); - for (ScrapApplyDetails scrapApplyDetail:scrapApplyDetailsList) { + for (ScrapApplyDetails scrapApplyDetail : scrapApplyDetailsList) { BeanUtil.copyProperties(scrapApplyDetail, scrapApplyDetails); scrapApplyDetails.setStatus(ReviewStatusEnum.IN_PROGRESS.getCode()); scrapApplyDetails.setId(null); @@ -578,6 +960,16 @@ public class ScrapApplyDetailsServiceImpl implements IScrapApplyDetailsService { return scrapApplyDetailsMapper.selectScrapAuditList(scrapApplyDetails); } + @Override + public List getScrapRefuseList(ScrapApplyDetails scrapApplyDetails) { + return scrapApplyDetailsMapper.getScrapRefuseList(scrapApplyDetails); + } + + @Override + public List getScrapRefuseMaCodeList(ScrapApplyDetails scrapApplyDetails) { + return scrapApplyDetailsMapper.getScrapRefuseMaCodeList(scrapApplyDetails); + } + /** * 报废任务审核 * @@ -713,14 +1105,14 @@ public class ScrapApplyDetailsServiceImpl implements IScrapApplyDetailsService { Date nowDate = DateUtils.getNowDate(); String format = dateFormat.format(nowDate); String taskNum = taskMapper.selectTaskNumByMonths(nowDate, taskType); - if (StringHelper.isNotEmpty(taskNum)){ + if (StringHelper.isNotEmpty(taskNum)) { // 将字符串转换为整数 int num = Integer.parseInt(taskNum); // 执行加一操作 num++; // 将结果转换回字符串格式，并确保结果是四位数，不足四位则在前面补0 taskNum = String.format("%04d", num); - }else { + } else { taskNum = "0001"; } String codeNum = code + format + "-" + taskNum; diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/vo/ScrapApplyDetailsVO.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/vo/ScrapApplyDetailsVO.java index 32701ec8..6d616133 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/vo/ScrapApplyDetailsVO.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/vo/ScrapApplyDetailsVO.java @@ -67,6 +67,10 @@ public class ScrapApplyDetailsVO { * 工程id */ private String projectId; + /** + * 父id + */ + private String parentId; /** * 审核状态 diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/vo/ScrapAudit.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/vo/ScrapAudit.java index 0f97bb56..75a6ad56 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/vo/ScrapAudit.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/vo/ScrapAudit.java @@ -42,4 +42,6 @@ public class ScrapAudit { @ApiModelProperty(value = "处置情况") private Integer disposition; + private String createBy; + } diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/MaWholeSetMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/MaWholeSetMapper.xml index 74fe9e22..e352a14f 100644 --- a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/MaWholeSetMapper.xml +++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/MaWholeSetMapper.xml @@ -52,7 +52,7 @@ diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/ScrapApplyDetailsMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/ScrapApplyDetailsMapper.xml index 32fc6884..91de3198 100644 --- a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/ScrapApplyDetailsMapper.xml +++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/ScrapApplyDetailsMapper.xml @@ -240,6 +240,322 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" insert into repair_audit_details (task_id,repair_id,ma_id,type_id,repair_num,repaired_num,scrap_num,status,create_by,create_time,update_by,update_time,company_id) values (#{taskId},#{repairId},#{maId},#{typeId},#{repairNum},#{repairedNum},#{scrapNum},#{status},#{createBy},now(),#{updateBy},now(),#{companyId}); + + insert into scrap_check_details + ( + + parent_id, + + + type_id, + + + ma_id, + + + back_num, + + + back_status, + + + create_by, + + + update_by, + + update_time, + + remark, + + + scrap_reason, + + + scrap_type, + + + file_url, + + + company_id, + + create_time + ) + values ( + + #{parentId}, + + + #{typeId}, + + + #{maId}, + + + #{backNum}, + + + #{backStatus}, + + + #{createBy}, + + + #{createBy}, + + NOW(), + + #{remark}, + + + #{scrapReason}, + + + #{scrapType}, + + + #{fileUrl}, + + + #{companyId}, + + NOW() + ) + + + insert into input_apply_details + ( + + task_id, + + + ma_id, + + + type_id, + + + parent_id, + + + input_num, + + input_type, + + create_by, + + + update_by, + + update_time, + + remark, + + + company_id, + + create_time + ) + values ( + + #{taskId}, + + + #{maId}, + + + #{typeId}, + + + #{parentId}, + + + #{backNum}, + + '2', + + #{createBy}, + + + #{createBy}, + + NOW(), + + #{remark}, + + + #{companyId}, + + NOW() + ) + + + insert into tm_task_agreement + ( + + task_id, + + + agreement_id, + + create_time + ) values ( + + #{taskId}, + + + #{agreementId}, + + NOW() + ) + + + insert into repair_apply_details + ( + + task_id, + + + ma_id, + + + type_id, + + + repair_num, + + + status, + + + create_by, + + + update_by, + + update_time, + + remark, + + + company_id, + + + back_id, + + back_source, + create_time + ) + values ( + + #{taskId}, + + + #{maId}, + + + #{typeId}, + + + #{backNum}, + + + #{status}, + + + #{createBy}, + + + #{createBy}, + + NOW(), + + #{remark}, + + + #{companyId}, + + + #{id}, + + 1, + NOW() + ) + + + insert into scrap_apply_details + ( + + task_id, + + + parent_id, + + + ma_id, + + + type_id, + + + scrap_num, + + scrap_source, + status, + + create_by, + + + company_id, + + + remark, + + + scrap_type, + + + file_url, + + create_time + ) + values ( + + #{taskId}, + + + #{parentId}, + + + #{maId}, + + + #{typeId}, + + + #{backNum}, + + '1', + '0', + + #{createBy}, + + + #{companyId}, + + + #{scrapReason}, + + + #{scrapType}, + + + #{fileUrl}, + + NOW() + ) + update scrap_apply_details @@ -277,6 +593,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{id} + + delete from scrap_check_details where parent_id = #{parentId} and type_id = #{typeId} + + and ma_id = #{maId} + + select GROUP_CONCAT(type_name) typeName from @@ -582,5 +914,224 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" GROUP BY tk.CODE order by tk.create_time desc - + + + + + + + + + + + + + \ No newline at end of file diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/TaskMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/TaskMapper.xml index 48ec9600..778d8410 100644 --- a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/TaskMapper.xml +++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/TaskMapper.xml @@ -192,6 +192,62 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ) + + insert into tm_task + ( + + task_type, + + + task_status, + + + code, + + + create_by, + + + update_by, + + + update_time, + + + remark, + + + company_id, + + create_time + ) values ( + + #{taskType}, + + + #{taskStatus}, + + + #{code}, + + + #{createBy}, + + + #{updateBy}, + + + #{updateTime}, + + + #{remark}, + + + #{companyId}, + + NOW() + ) + update tm_task @@ -211,6 +267,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where task_id = #{taskId} + + update tm_task + set task_status=#{status} + where task_id = #{taskId} + delete from tm_task where task_id = #{taskId}