diff --git a/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/system/api/RemoteUserService.java b/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/system/api/RemoteUserService.java index e5036e3d..7e6706ce 100644 --- a/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/system/api/RemoteUserService.java +++ b/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/system/api/RemoteUserService.java @@ -93,6 +93,6 @@ public interface RemoteUserService * @param urgentProcessingUser * @return */ - @PostMapping("/urgentProcessingUser") - public AjaxResult urgentProcessingUser(@RequestBody UrgentProcessingUser urgentProcessingUser); + @PostMapping("/user/processingUser") + public R> processingUser(@RequestBody UrgentProcessingUser urgentProcessingUser); } diff --git a/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/system/api/factory/RemoteUserFallbackFactory.java b/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/system/api/factory/RemoteUserFallbackFactory.java index 82107f91..515d2cc2 100644 --- a/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/system/api/factory/RemoteUserFallbackFactory.java +++ b/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/system/api/factory/RemoteUserFallbackFactory.java @@ -1,5 +1,7 @@ package com.bonus.sgzb.system.api.factory; +import com.bonus.sgzb.common.core.web.domain.AjaxResult; +import com.bonus.sgzb.system.api.domain.UrgentProcessingUser; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.cloud.openfeign.FallbackFactory; @@ -8,9 +10,12 @@ import com.bonus.sgzb.common.core.domain.R; import com.bonus.sgzb.system.api.RemoteUserService; import com.bonus.sgzb.system.api.domain.SysUser; import com.bonus.sgzb.system.api.model.LoginUser; +import org.springframework.web.bind.annotation.RequestBody; import java.util.List; +import static com.bonus.sgzb.common.core.web.domain.AjaxResult.success; + /** * 用户服务降级处理 * @@ -61,6 +66,11 @@ public class RemoteUserFallbackFactory implements FallbackFactory> getUserList(SysUser sysUser, String source) { return R.fail("获取用户失败:" + throwable.getMessage()); } + + @Override + public R> processingUser(UrgentProcessingUser urgentProcessingUser){ + return R.fail("获取用户失败:" + throwable.getMessage()); + } }; } } diff --git a/sgzb-common/sgzb-common-core/src/main/java/com/bonus/sgzb/common/core/constant/TaskTypeConstants.java b/sgzb-common/sgzb-common-core/src/main/java/com/bonus/sgzb/common/core/constant/TaskTypeConstants.java index c9cd89b4..2d035f44 100644 --- a/sgzb-common/sgzb-common-core/src/main/java/com/bonus/sgzb/common/core/constant/TaskTypeConstants.java +++ b/sgzb-common/sgzb-common-core/src/main/java/com/bonus/sgzb/common/core/constant/TaskTypeConstants.java @@ -17,5 +17,13 @@ public class TaskTypeConstants { */ public static final String WX = "WX"; + /** + * 退料任务 + */ + public static final String T= "T"; + + private TaskTypeConstants() { + throw new IllegalStateException("Utility class"); + } } diff --git a/sgzb-common/sgzb-common-core/src/main/java/com/bonus/sgzb/common/core/enums/TaskStatusEnum.java b/sgzb-common/sgzb-common-core/src/main/java/com/bonus/sgzb/common/core/enums/TaskStatusEnum.java index 5544c24e..1da1440d 100644 --- a/sgzb-common/sgzb-common-core/src/main/java/com/bonus/sgzb/common/core/enums/TaskStatusEnum.java +++ b/sgzb-common/sgzb-common-core/src/main/java/com/bonus/sgzb/common/core/enums/TaskStatusEnum.java @@ -28,9 +28,39 @@ public enum TaskStatusEnum { COMPLETE("35", "完成"), /** - * 维修进行中 + * 退料任务--待退料审核 */ - REPAIRING("43", "维修进行中"), + RETURNED_MATERIALS_AWAITING_REVIEW("37", "待退料审核"), + + /** + * 退料任务--退料已审核 + */ + MATERIAL_RETURN_APPROVED("38", "退料已审核"), + + /** + * 退料任务--退料核查中 + */ + MATERIAL_RETURN_VERIFICATION_PROGRESS("39", "退料核查中"), + + /** + * 退料任务--退料完成 + */ + MATERIAL_RETURN_COMPLETED("40", "退料完成"), + + /** + * 维修任务--维修待进行 + */ + REPAIR_PENDING("42", "维修待进行"), + + /** + * 维修任务--维修进行中 + */ + MAINTENANCE_PROGRESS("43", "维修进行中"), + + /** + * 维修任务--维修完成 + */ + REPAIR_COMPLETED("44", "维修完成"), /** * 待报废任务--待审核 @@ -43,7 +73,7 @@ public enum TaskStatusEnum { /** * 待报废任务--已通过 */ - PASSED("122", "已通过"), + PASSED("122", "已完成"), /** * 待报废任务--已驳回 */ diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/SgzbBaseApplication.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/SgzbBaseApplication.java index 7c2d9a70..d98e2681 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/SgzbBaseApplication.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/SgzbBaseApplication.java @@ -22,6 +22,7 @@ public class SgzbBaseApplication public static void main(String[] args) { SpringApplication.run(SgzbBaseApplication.class, args); + System.out.println("(♥◠‿◠)ﾉﾞ 基础管理模块启动成功 ლ(´ڡ`ლ)ﾞ \n" + " .-------. ____ __ \n" + " | _ _ \\ \\ \\ / / \n" + 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 ff7a1f00..87531ab9 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 @@ -3,6 +3,7 @@ package com.bonus.sgzb.app.controller; import com.bonus.sgzb.app.domain.BackApplyInfo; import com.bonus.sgzb.app.domain.TmTask; import com.bonus.sgzb.app.service.*; +import com.bonus.sgzb.common.core.constant.Constants; import com.bonus.sgzb.common.core.text.Convert; import com.bonus.sgzb.common.core.utils.ListPagingUtil; import com.bonus.sgzb.common.core.utils.ServletUtils; @@ -39,8 +40,8 @@ public class BackReceiveController extends BaseController { * @return AjaxResult对象 */ @Log(title = "退料接收列表", businessType = BusinessType.QUERY) - @GetMapping("getbackReceiveList") - public AjaxResult getbackReceiveList(BackApplyInfo record) { + @GetMapping("/getbackReceiveList") + public AjaxResult getBackReceiveList(BackApplyInfo record) { try { if (record.getFlag() == 0) { List list = backReceiveService.getbackReceiveList(record); @@ -94,12 +95,14 @@ public class BackReceiveController extends BaseController { * @return AjaxResult对象 */ @Log(title = "退料接收明细-web", businessType = BusinessType.QUERY) - @PostMapping("receiveViewWeb") + @PostMapping("/receiveViewWeb") public AjaxResult receiveViewWeb(@RequestBody BackApplyInfo record) { try { - startPage(); + //startPage(); List list = backReceiveService.receiveView(record); - return success(getDataTable(list)); + Integer pageIndex = cn.hutool.core.convert.Convert.toInt(record.getPageNum(), 1); + Integer pageSize = cn.hutool.core.convert.Convert.toInt(record.getPageSize(), 10); + return AjaxResult.success(ListPagingUtil.paging(pageIndex, pageSize, list)); } catch (Exception e) { throw new RuntimeException(e); } @@ -133,7 +136,7 @@ public class BackReceiveController extends BaseController { * @return AjaxResult对象 */ @Log(title = "退料接收-编码退料", businessType = BusinessType.INSERT) - @PostMapping("setCodeBack") + @PostMapping("/setCodeBack") public AjaxResult setCodeBack(@RequestBody BackApplyInfo record) { try { int res = backReceiveService.setCodeBack(record); @@ -157,7 +160,7 @@ public class BackReceiveController extends BaseController { * @return AjaxResult对象 */ @Log(title = "退料接收撤回") - @PostMapping("revoke") + @PostMapping("/revoke") public AjaxResult revoke(@RequestBody BackApplyInfo record) { int res = backReceiveService.revoke(record); if (res > 0) { @@ -191,7 +194,7 @@ public class BackReceiveController extends BaseController { } @Log(title = "退料接收-结束任务", businessType = BusinessType.MATERIAL) - @PostMapping("endBack") + @PostMapping("/endBack") public AjaxResult endBack(@RequestBody BackApplyInfo record) { try { int res = backReceiveService.endBack(record); @@ -239,7 +242,7 @@ public class BackReceiveController extends BaseController { } @Log(title = "编码接收机具查询-web", businessType = BusinessType.INSERT) - @GetMapping("getBackMachine") + @GetMapping("/getBackMachine") public AjaxResult getBackMachine(TmTask task) { try { startPage(); @@ -250,6 +253,18 @@ public class BackReceiveController extends BaseController { } } + @Log(title = "编码接收机具查询-预报废驳回", businessType = BusinessType.INSERT) + @GetMapping("/getScrapBackMachine") + public AjaxResult getScrapBackMachine(TmTask task) { + try { + startPage(); + List list = backReceiveService.getScrapBackMachine(task); + return AjaxResult.success(getDataTable(list)); + } catch (Exception e) { + throw new RuntimeException(e); + } + } + @Log(title = "查询退料接收记录-web", businessType = BusinessType.INSERT) @GetMapping("getRecord") public AjaxResult getRecord(TmTask task) { @@ -289,7 +304,7 @@ public class BackReceiveController extends BaseController { } @Log(title = "退料接收记录（编码接收）-web", businessType = BusinessType.INSERT) - @PostMapping("backReceiveRecordWebPt") + @PostMapping("/backReceiveRecordWebPt") public AjaxResult backReceiveRecordWebPt(@RequestBody BackApplyInfo record) { try { List list = backReceiveService.backReceiveRecordWebPt(record); diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/TmTaskController.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/TmTaskController.java index bef02f95..a5bc1629 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/TmTaskController.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/TmTaskController.java @@ -6,6 +6,7 @@ import cn.hutool.core.util.PhoneUtil; import com.bonus.sgzb.app.domain.*; import com.bonus.sgzb.app.service.*; import com.bonus.sgzb.base.service.ITypeService; +import com.bonus.sgzb.common.core.domain.R; import com.bonus.sgzb.common.core.enums.TaskStatusEnum; import com.bonus.sgzb.common.core.utils.ListPagingUtil; import com.bonus.sgzb.common.core.utils.ServletUtils; @@ -77,7 +78,7 @@ public class TmTaskController extends BaseController { * @return 结果 */ @Log(title = "宁夏领料审核通过", businessType = BusinessType.UPDATE) - @PostMapping("auditLeaseByCompany") + @PostMapping("/auditLeaseByCompany") public AjaxResult auditLeaseByCompany(@RequestBody TmTask task) { return toAjax(tmTaskService.updateLeaseTaskAuditInfo(task)); } @@ -175,7 +176,7 @@ public class TmTaskController extends BaseController { * @return 结果 */ @Log(title = "往来单位提交领料申请", businessType = BusinessType.INSERT) - @PostMapping("submitLeaseApply") + @PostMapping("/submitLeaseApply") @Transactional public AjaxResult submitLeaseApply(@RequestBody TmTask task) { if (StringUtils.isNull(task)) { @@ -285,9 +286,8 @@ public class TmTaskController extends BaseController { urgentProcessingUser.setTaskStatus(TaskStatusEnum.STAY_INTERNAL_AUDIT.getInfo()); break; } - AjaxResult ajaxResult = remoteUserService.urgentProcessingUser(urgentProcessingUser); - if (ajaxResult.isSuccess()) { - List userList = (List) ajaxResult.get("data"); + List userList = remoteUserService.processingUser(urgentProcessingUser).getData(); + if (userList.size()>0) { String message ="尊敬的用户，宁夏智慧仓储管理系统提醒您：您有一个领料单号为:"+ code +"的领料申请待处理，请及时查看"; if (CollectionUtils.isNotEmpty(userList)) { for (SysUser sysUser : userList) { @@ -391,7 +391,7 @@ public class TmTaskController extends BaseController { * @return 列表 */ @Log(title = "查询机具领料申请列表", businessType = BusinessType.QUERY) - @GetMapping(value = "getLeaseAuditListAll") + @GetMapping(value = "/getLeaseAuditListAll") public AjaxResult getLeaseAuditListAll(TmTask task, Integer souceBy) { if (StringUtils.isNull(task)) { return AjaxResult.error("参数错误"); @@ -415,7 +415,7 @@ public class TmTaskController extends BaseController { * @return 列表 */ @Log(title = "宁夏查询机具领料管理列表", businessType = BusinessType.QUERY) - @GetMapping(value = "getLeaseManageListAll") + @GetMapping(value = "/getLeaseManageListAll") public AjaxResult getLeaseManageListAll(TmTask task, Integer souceBy) { if (StringUtils.isNull(task)) { return AjaxResult.error("参数错误"); diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/BackApplyInfo.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/BackApplyInfo.java index 7a11cd94..316b7229 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/BackApplyInfo.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/BackApplyInfo.java @@ -1,6 +1,7 @@ package com.bonus.sgzb.app.domain; import com.bonus.sgzb.common.core.annotation.Excel; +import io.swagger.annotations.ApiModelProperty; import io.swagger.models.auth.In; import lombok.Data; @@ -213,4 +214,19 @@ public class BackApplyInfo { * 图片地址 */ private String fileUrl; + + /** 数据来源(1预报废2,退料申请) */ + @ApiModelProperty(value = "数据来源(1预报废2,退料申请)") + private Integer backSource; + + /** 预报废单号*/ + private String forecastWasteCode; + + /**页数 */ + private Integer pageNum; + + /** 条数 *、 + * + */ + private Integer pageSize; } 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 fedaddd0..8e8f02a1 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 @@ -204,4 +204,6 @@ public interface BackReceiveMapper { List getCtList(BackApplyInfo record); 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 20fc688b..7753025d 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 @@ -99,4 +99,6 @@ public interface BackReceiveService { List backReceiveRecordWeb(BackApplyInfo record); 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 e6b1c52b..4a3ba7ec 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 @@ -383,6 +383,11 @@ public class BackReceiveServiceImpl implements BackReceiveService { return backApplyInfoList; } + @Override + public List getScrapBackMachine(TmTask task) { + return backReceiveMapper.getScrapBackMachine(task); + } + private int insertRad(int taskId, List wxList) { int result = 0; if (wxList != null) { @@ -421,7 +426,7 @@ public class BackReceiveServiceImpl implements BackReceiveService { String taskStatus = ""; if (TaskTypeEnum.MAINTENANCE_TASK.getCode().equals(taskType)) { //taskStatus = "43"; - taskStatus = TaskStatusEnum.REPAIRING.getCode(); + taskStatus = TaskStatusEnum.MAINTENANCE_PROGRESS.getCode(); } if (TaskTypeEnum.RETURNED_MATERIALS_TO_BE_SCRAPPED.getCode().equals(taskType)) { //taskStatus = "120"; diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java index c99a82cc..eb330e42 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java @@ -248,9 +248,8 @@ public class TmTaskServiceImpl implements TmTaskService { urgentProcessingUser.setTaskStatus(TaskStatusEnum.STAY_INTERNAL_AUDIT.getInfo()); break; } - AjaxResult ajaxResult = remoteUserService.urgentProcessingUser(urgentProcessingUser); - if (ajaxResult.isSuccess()) { - List userList = (List) ajaxResult.get("data"); + List userList =remoteUserService.processingUser(urgentProcessingUser).getData(); + if (userList.size()>0) { log.info("查询到待发送短信人员信息为：{}", userList); String message ="尊敬的用户，宁夏智慧仓储管理系统提醒您：您有一个领料单号为:"+ record.getCode() +"的领料申请待处理，请及时查看"; if (CollectionUtils.isNotEmpty(userList)) { diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/RepairTask.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/RepairTask.java index ccd912a3..b4539564 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/RepairTask.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/RepairTask.java @@ -142,4 +142,15 @@ public class RepairTask { @ApiModelProperty(value = "导出选中列表") private List dataCondition; + /** + * 数据来源(1预报废2,退料) + */ + @ApiModelProperty(value = "数据来源(1预报废2,退料)") + private Integer backSource; + + /** 预报废单号*/ + private String forecastWasteCode; + + /** 驳回原因 */ + private String remark; } diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/RepairTaskDetails.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/RepairTaskDetails.java index 27d41014..82ae42e6 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/RepairTaskDetails.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/RepairTaskDetails.java @@ -85,4 +85,10 @@ public class RepairTaskDetails { @ApiModelProperty(value = "任务创建人") private Long createBy; + /** + * 备注 + */ + @ApiModelProperty(value = "备注") + private String remark; + } diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/mapper/RepairMapper.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/mapper/RepairMapper.java index 5f8700fc..f5e0c443 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/mapper/RepairMapper.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/mapper/RepairMapper.java @@ -161,4 +161,6 @@ public interface RepairMapper { List exportRepairTaskList(RepairTask bean); int addRepairCost(@Param("bean") RepairApplyRecord bean, @Param("costs") BigDecimal costs,@Param("partType") String partType); + + List getRepairTaskListByOne(RepairTask bean); } diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/RepairServiceImpl.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/RepairServiceImpl.java index 8dce130d..12e82afd 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/RepairServiceImpl.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/RepairServiceImpl.java @@ -35,7 +35,15 @@ public class RepairServiceImpl implements RepairService { @Override public List getRepairTaskList(RepairTask bean) { - List repairTaskList = mapper.getRepairTaskList(bean); + List repairTaskList = new ArrayList<>(); + //判断是查询预报废驳回的维修数据还是退料过来的维修数据 + if(bean.getBackSource().equals(BigDecimal.ROUND_DOWN)){ + repairTaskList = mapper.getRepairTaskListByOne(bean); + }else { + repairTaskList = mapper.getRepairTaskList(bean); + } + + if (SecurityUtils.getLoginUser().getRoles().contains("admin")){ return repairTaskList; } diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/BackReceiveMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/BackReceiveMapper.xml index 5389b7a6..a2e778f1 100644 --- a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/BackReceiveMapper.xml +++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/BackReceiveMapper.xml @@ -637,6 +637,7 @@ tt.task_status AS taskStatus, sd.`name` AS taskName, tta.agreement_id AS agreementId, + tt1.code as forecastWasteCode, GROUP_CONCAT( DISTINCT mt2.type_id ) AS typeId, GROUP_CONCAT( bai.company_id ) AS companyId, GROUP_CONCAT(bad.id) as badId, @@ -655,6 +656,7 @@ LEFT JOIN ma_type mt3 ON mt3.type_id = mt2.parent_id LEFT JOIN ma_type mt4 ON mt4.type_id = mt3.parent_id LEFT JOIN sys_dic sd ON sd.id = tt.task_status + LEFT JOIN tm_task tt1 on tt1.task_id = bai.parent_id WHERE tt.task_status IN ( 37, 38, 39, 40 ) @@ -672,6 +674,9 @@ and tt.task_status = #{taskStatus} + + and bai.back_source =#{backSource} + AND bai.back_time BETWEEN CONCAT(#{startTime}, ' 00:00:00') AND CONCAT(#{endTime}, ' 23:59:59') @@ -730,6 +735,7 @@ and mt.type_id = #{modelId} + order by bad.create_time @@ -771,7 +777,7 @@ LEFT JOIN back_apply_info bai on bai.id=bcd.parent_id LEFT JOIN tm_task_agreement tta on tta.task_id=bai.task_id WHERE - parent_id=#{parentId} + bcd.parent_id=#{parentId} and bcd.back_status='2' @@ -794,7 +800,7 @@ LEFT JOIN back_apply_info bai on bai.id=bcd.parent_id LEFT JOIN tm_task_agreement tta on tta.task_id=bai.task_id WHERE - parent_id=#{parentId} + bcd.parent_id=#{parentId} and bcd.back_status='3' @@ -926,7 +932,7 @@ LEFT JOIN back_apply_info bai ON bai.id = bcd.parent_id LEFT JOIN tm_task_agreement tta ON tta.task_id = bai.task_id WHERE - parent_id = #{parentId} + bcd.parent_id = #{parentId} GROUP By bcd.type_id,bcd.ma_id + \ No newline at end of file diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/base/RepairMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/base/RepairMapper.xml index 9e0b5f93..cbf83c21 100644 --- a/sgzb-modules/sgzb-base/src/main/resources/mapper/base/RepairMapper.xml +++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/base/RepairMapper.xml @@ -71,6 +71,7 @@ + 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 480faef6..b3fe7d0d 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 @@ -254,4 +254,11 @@ public class BackApplyInfo extends BaseEntity { /** 创建者 */ @ApiModelProperty(value = "创建者Id") private String userId; + + /** 数据来源(1预报废2,退料申请) */ + @ApiModelProperty(value = "数据来源(1预报废2,退料申请)") + private Integer backSource; + + /** 预报废单号*/ + private String forecastWasteCode; } diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/RepairTaskDetails.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/RepairTaskDetails.java index 372bd36d..82a01689 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/RepairTaskDetails.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/RepairTaskDetails.java @@ -88,4 +88,10 @@ public class RepairTaskDetails { private Long createBy; private Long backId; + /** + * 数据来源(1预报废2,退料) + */ + @ApiModelProperty(value = "数据来源(1预报废2,退料)") + private Integer backSource; + } diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/po/BackApplyDetailsPo.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/po/BackApplyDetailsPo.java new file mode 100644 index 00000000..bf5e3e73 --- /dev/null +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/po/BackApplyDetailsPo.java @@ -0,0 +1,77 @@ +package com.bonus.sgzb.material.domain.po; + +import com.bonus.sgzb.common.core.web.domain.BaseEntity; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; +import java.util.Date; + +@Data +public class BackApplyDetailsPo extends BaseEntity { + + private static final long serialVersionUID = 1L; + + /** 详情ID */ + @ApiModelProperty(value = "详情ID") + private Integer id; + + /** 退料单号 */ + @ApiModelProperty(value = "退料单号") + private String code; + + /** + * 任务ID + */ + @ApiModelProperty(value = "任务ID") + private Integer parentId; + + /** + * 规格ID + */ + @ApiModelProperty(value = "规格ID") + private Integer typeId; + + /** + * 退料数 + */ + @ApiModelProperty(value = "退料数") + private BigDecimal preNum; + + /** + * 审批数量 + */ + @ApiModelProperty(value = "审批数量") + private BigDecimal auditNum; + + /** + * 状态（待审批，进行中，已出库） + */ + @ApiModelProperty(value = "状态（待审批，进行中，已出库）") + private String status; + + /** 创建者 */ + @ApiModelProperty(value = "创建者") + private String createBy; + + /** 创建时间 */ + @ApiModelProperty(value = "创建时间") + private Date createTime; + + /** 更新者 */ + @ApiModelProperty(value = "更新者") + private String updateBy; + + /** 更新时间 */ + @ApiModelProperty(value = "更新时间") + private Date updateTime; + + /** 备注 */ + @ApiModelProperty(value = "备注") + private String remark; + + /** 数据所属组织 */ + @ApiModelProperty(value = "数据所属组织") + private Integer companyId; + +} diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/po/BackApplyInfoPo.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/po/BackApplyInfoPo.java new file mode 100644 index 00000000..01f68a85 --- /dev/null +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/po/BackApplyInfoPo.java @@ -0,0 +1,94 @@ +package com.bonus.sgzb.material.domain.po; + + +import com.bonus.sgzb.common.core.web.domain.BaseEntity; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +@Data +public class BackApplyInfoPo extends BaseEntity { + + private static final long serialVersionUID = 1L; + + /** 退料ID */ + @ApiModelProperty(value = "退料ID") + private Long id; + + + /** 退料单号 */ + @ApiModelProperty(value = "退料单号") + private String code; + + + @ApiModelProperty(value = "任务ID") + private Integer taskId; + + + /** 退料人员 */ + @ApiModelProperty(value = "退料人员") + private String backPerson; + + /** 联系电话 */ + @ApiModelProperty(value = "联系电话") + private String phone; + + /** 机具公司审核人 */ + @ApiModelProperty(value = "机具公司审核人") + private Integer directAuditBy; + + /** 机具公司审批时间 */ + @ApiModelProperty(value = "机具公司审批时间") + private String directAuditTime; + + /** 机具公司审批备注 */ + @ApiModelProperty(value = "机具公司审批备注") + private String directAuditRemark; + + + /** 创建者 */ + @ApiModelProperty(value = "创建者") + private String createBy; + + /** 创建时间 */ + @ApiModelProperty(value = "创建时间") + private Date createTime; + + /** 更新者 */ + @ApiModelProperty(value = "更新者") + private String updateBy; + + /** 更新时间 */ + @ApiModelProperty(value = "更新时间") + private Date updateTime; + + /** 备注 */ + @ApiModelProperty(value = "备注") + private String remark; + + /** 数据所属组织 */ + @ApiModelProperty(value = "数据所属组织") + private Integer companyId; + + /**退料日期 */ + @ApiModelProperty(value = "退料日期") + private String backTime; + + /**任务状态 */ + @ApiModelProperty(value = "任务状态") + private String status; + + /** 直转id */ + @ApiModelProperty(value = "直转id") + private Integer directId; + + /** 数据来源(1预报废2,退料申请) */ + @ApiModelProperty(value = "数据来源(1预报废2,退料申请)") + private Integer backSource; + + /** 预报废任务Id */ + @ApiModelProperty(value = "预报废任务Id") + private Integer parentId; +} diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/po/RepairApplyDetailsPo.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/po/RepairApplyDetailsPo.java new file mode 100644 index 00000000..876b0726 --- /dev/null +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/po/RepairApplyDetailsPo.java @@ -0,0 +1,86 @@ +package com.bonus.sgzb.material.domain.po; + +import com.bonus.sgzb.common.core.annotation.Excel; +import com.bonus.sgzb.common.core.web.domain.BaseEntity; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; +import java.util.Date; + +@Data +public class RepairApplyDetailsPo extends BaseEntity { + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键") + private Long id; + + /** 任务ID */ + @Excel(name = "任务ID") + @ApiModelProperty(value = "任务ID") + private Long taskId; + + /** 机具ID */ + @Excel(name = "机具ID") + @ApiModelProperty(value = "机具ID") + private Long maId; + + /** 规格ID */ + @Excel(name = "规格ID") + @ApiModelProperty(value = "规格ID") + private Long typeId; + + /** 维修总量 */ + @Excel(name = "维修总量") + @ApiModelProperty(value = "维修总量") + private BigDecimal repairNum; + + /** 维修数量 */ + @Excel(name = "维修数量") + @ApiModelProperty(value = "维修数量") + private BigDecimal repairedNum; + + /** 报废数量 */ + @Excel(name = "报废数量") + @ApiModelProperty(value = "报废数量") + private BigDecimal scrapNum; + + /** '0未完成，1已完成 */ + @Excel(name = "'0未完成，1已完成") + @ApiModelProperty(value = "0未完成，1已完成") + private String status; + + /** 创建者 */ + @ApiModelProperty(value = "创建者") + private String createBy; + + /** 创建时间 */ + @ApiModelProperty(value = "创建时间") + private Date createTime; + + /** 更新者 */ + @ApiModelProperty(value = "更新者") + private String updateBy; + + /** 更新时间 */ + @ApiModelProperty(value = "更新时间") + private Date updateTime; + + /** 备注*/ + @ApiModelProperty(value = "备注") + private String remark; + + /** 数据所属组织 */ + @Excel(name = "数据所属组织") + @ApiModelProperty(value = "数据所属组织") + private Integer companyId; + + /** 退料ID*/ + @ApiModelProperty(value = "退料ID") + private Integer backId; + + /** 维修人*/ + @ApiModelProperty(value = "维修人") + private String repairer; + +} diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/BackApplyMapper.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/BackApplyMapper.java index 9574ce0c..19c8eeb5 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/BackApplyMapper.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/BackApplyMapper.java @@ -2,7 +2,10 @@ package com.bonus.sgzb.material.mapper; import com.bonus.sgzb.material.domain.BackApplyDto; import com.bonus.sgzb.material.domain.BackApplyInfo; +import com.bonus.sgzb.material.domain.ScrapApplyDetails; import com.bonus.sgzb.material.domain.TypeTreeNode; +import com.bonus.sgzb.material.domain.po.BackApplyDetailsPo; +import com.bonus.sgzb.material.domain.po.BackApplyInfoPo; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -146,4 +149,12 @@ public interface BackApplyMapper { List getTaskIdByIdAll(BackApplyDto dto); void updateTmTaskAll(BackApplyDto dto); + + BackApplyInfo getBackApplyInfoById(Long parentId); + + void insertBackApplyInfo(BackApplyInfoPo backApplyInfoPo); + + BackApplyDetailsPo getBackApplyDetailsByParentId(ScrapApplyDetails scrapApplyDetail); + + void insertBackApplyDetails(BackApplyDetailsPo backApplyDetailsPoNew); } diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/SltAgreementInfoMapper.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/SltAgreementInfoMapper.java index 598e2a8c..fa540eb0 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/SltAgreementInfoMapper.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/SltAgreementInfoMapper.java @@ -50,4 +50,7 @@ public interface SltAgreementInfoMapper { int updateApply(SltAgreementApply apply); int updateMaStatus(SltAgreementInfo agreementInfo); + + void updateSltAgreementInfoStatus(SltAgreementInfo sltAgreementInfo); + } diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/RepairAuditDetailsServiceImpl.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/RepairAuditDetailsServiceImpl.java index bb56cfdf..8761c399 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/RepairAuditDetailsServiceImpl.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/RepairAuditDetailsServiceImpl.java @@ -21,6 +21,7 @@ import com.bonus.sgzb.material.vo.RepairAuditDetailsVO; import com.bonus.sgzb.material.vo.ScrapApplyDetailsVO; import com.bonus.sgzb.material.vo.ScrapAudit; import com.bonus.sgzb.system.api.domain.SysFile; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -294,7 +295,7 @@ public class RepairAuditDetailsServiceImpl implements IRepairAuditDetailsService scrapApplyDetails.setCompanyId((long) companyId); scrapApplyDetails.setAuditRemark(bean.getScrapReason()); //根据fileIds获取所有的图片地址 - if (bean.getFileIds()!=null){ + if (StringUtils.isNotEmpty(bean.getFileIds())){ String[] fileIsList = bean.getFileIds().split(","); StringBuffer fileUrl = new StringBuffer(); for (int i = 0; i < fileIsList.length; i++) { 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 69506db2..5de2ebf3 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 @@ -8,6 +8,7 @@ import java.util.List; import java.util.stream.Collectors; import cn.hutool.core.bean.BeanUtil; +import com.bonus.sgzb.base.api.domain.SltAgreementInfo; import com.bonus.sgzb.common.core.constant.TaskTypeConstants; import com.bonus.sgzb.common.core.enums.ReviewStatusEnum; import com.bonus.sgzb.common.core.enums.ScrapSourceEnum; @@ -18,17 +19,16 @@ import com.bonus.sgzb.common.core.utils.DateUtils; import com.bonus.sgzb.common.core.utils.StringHelper; import com.bonus.sgzb.common.security.utils.SecurityUtils; import com.bonus.sgzb.material.domain.*; +import com.bonus.sgzb.material.domain.po.BackApplyDetailsPo; +import com.bonus.sgzb.material.domain.po.BackApplyInfoPo; import com.bonus.sgzb.material.exception.ExceptionDict; import com.bonus.sgzb.material.mapper.*; import com.bonus.sgzb.material.service.IScrapApplyDetailsService; import com.bonus.sgzb.material.vo.ForecastWasteExcel; -import com.bonus.sgzb.material.vo.GlobalContants; import com.bonus.sgzb.material.vo.ScrapApplyDetailsVO; import com.bonus.sgzb.material.vo.ScrapAudit; import lombok.extern.slf4j.Slf4j; -import org.apache.catalina.security.SecurityUtil; import org.springframework.beans.BeanUtils; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -58,6 +58,16 @@ public class ScrapApplyDetailsServiceImpl implements IScrapApplyDetailsService { @Resource private ScrapAuditorSetMapper scrapAuditorSetMapper; + @Resource + private BackApplyMapper backApplyMapper; + + @Resource + private RepairAuditDetailsMapper repairAuditDetailsMapper; + + @Resource + private SltAgreementInfoMapper sltAgreementInfoMapper; + + /** * 查询报废任务详细scrap_apply_details * @@ -134,7 +144,7 @@ public class ScrapApplyDetailsServiceImpl implements IScrapApplyDetailsService { scrapApplyDetails.setAuditTime(new Date()); scrapApplyDetailsMapper.updateScrapApplyDetails(scrapApplyDetails); } - //根据任务id查看是否还有未审核的设备 + //根据任务id查所有的设备 List getScrapApplyDetailList = scrapApplyDetailsMapper.selectScrapDetailsByTaskId(taskId); if (scrapApplyDetailList.size()==0){ return BigDecimal.ROUND_UP; @@ -148,7 +158,14 @@ public class ScrapApplyDetailsServiceImpl implements IScrapApplyDetailsService { task.setTaskStatus(Integer.valueOf(TaskStatusEnum.UNDER_REVIEW.getCode())); //当全部审核以后判断是否有被驳回的装备 } else if (!statusList.contains(ReviewStatusEnum.IN_PROGRESS.getCode()) &&statusList.contains(ReviewStatusEnum.REJECTED.getCode())) { - task.setTaskStatus(Integer.valueOf(TaskStatusEnum.REJECTED.getCode())); + //完成订单中包含驳回和通过的审核结果，通过的去预报废列表，驳回的根据来源回到来源处，生成一个新的任务 + task.setTaskStatus(Integer.valueOf(TaskStatusEnum.PASSED.getCode())); + //判断驳回任务中是否包含审核通的单子 + if (statusList.contains(ReviewStatusEnum.PASSED.getCode())){ + createScrapTask(taskId); + } + //驳回回到来源 + returnSource(getScrapApplyDetailList,taskId); //TODO 对审核驳回的单子进行处理的业务待确认 }else { task.setTaskStatus(Integer.valueOf(TaskStatusEnum.PASSED.getCode())); @@ -161,6 +178,118 @@ public class ScrapApplyDetailsServiceImpl implements IScrapApplyDetailsService { return BigDecimal.ROUND_DOWN; } + private void returnSource(List getScrapApplyDetailList,Long taskId) { + log.info("ScrapApplyDetailsServiceImpl returnSource begin"); + TmTask task = taskMapper.selectTmTaskByTaskId(taskId); + if (task == null) { + throw new ServiceException(ExceptionDict.TASK_IS_EMPTY_MSG, ExceptionDict.TASK_IS_EMPTY); + } + // 查询协议表 + TmTaskAgreement tmTaskAgreement = agreementMapper.selectTmTaskAgreementByTaskId(taskId); + + //获取该任务下预报废审核驳回的装备信息 + ScrapApplyDetails scrapApplyDetails = new ScrapApplyDetails(); + scrapApplyDetails.setTaskId(taskId); + scrapApplyDetails.setStatus(ReviewStatusEnum.REJECTED.getCode()); + //获取从退料过来的数据 + scrapApplyDetails.setScrapSource(ScrapSourceEnum.MATERIAL_RETURN.getCode().toString()); + List backList = scrapApplyDetailsMapper.selectScrapAuditList(scrapApplyDetails); + //获取从维修过来的数据 + scrapApplyDetails.setScrapSource(ScrapSourceEnum.MAINTENANCE_COST.getCode().toString()); + List repairList = scrapApplyDetailsMapper.selectScrapAuditList(scrapApplyDetails); + + //获取生成的任务id + int companyId = task.getCompanyId() == null ? 0 : task.getCompanyId(); + + if (backList.size()>0){ + //生成编号 + 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()); + } + if (repairList.size()>0){ + //生成编号 + 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); + } + log.info("ScrapApplyDetailsServiceImpl returnSource end"); + } + + private void repairApplyDetails(List backList, Long backTaskId) { + log.info("ScrapApplyDetailsServiceImpl repairApplyDetails begin"); + //根据parentId获取审核任务详情 + RepairAuditDetails repairAuditDetails = repairAuditDetailsMapper.selectRepairAuditDetailsById(backList.get(0).getParentId()); + RepairTaskDetails repairTaskDetails = new RepairTaskDetails(); + for (ScrapApplyDetails ScrapApplyDetails : backList) { + repairTaskDetails.setTaskId(backTaskId.toString()); + repairTaskDetails.setMaId(ScrapApplyDetails.getMaId()); + repairTaskDetails.setTypeId(ScrapApplyDetails.getTypeId()); + repairTaskDetails.setRepairNum(ScrapApplyDetails.getScrapNum().intValue()); + repairTaskDetails.setCreateBy(Long.valueOf(ScrapApplyDetails.getCreateBy())); + repairTaskDetails.setRemark(ScrapApplyDetails.getAuditRemark()); + repairTaskDetails.setCompanyId(ScrapApplyDetails.getCompanyId()); + repairTaskDetails.setBackId(ScrapApplyDetails.getId()); + repairTaskDetails.setBackSource(BigDecimal.ROUND_DOWN); + repairAuditDetailsMapper.insertRepairDetails(repairTaskDetails); + } + log.info("ScrapApplyDetailsServiceImpl repairApplyDetails end"); + + } + + private void backApplyInfo(List backList, Long backTaskId, String taskCode, Long agreementId) { + log.info("ScrapApplyDetailsServiceImpl backApplyInfo begin"); + //根据parentId获取退料任务详情 + BackApplyInfo backApplyInfo = backApplyMapper.getBackApplyInfoById(backList.get(0).getParentId()); + BackApplyInfoPo backApplyInfoPo = new BackApplyInfoPo(); + backApplyInfoPo.setCode(taskCode); + backApplyInfoPo.setBackPerson(backApplyInfo.getBackPerson()); + backApplyInfoPo.setTaskId(backTaskId.intValue()); + backApplyInfoPo.setPhone(backApplyInfo.getPhone()); + backApplyInfoPo.setBackTime(backApplyInfo.getBackTime()); + backApplyInfoPo.setCreateBy(backApplyInfoPo.getCreateBy()); + backApplyInfoPo.setBackSource(BigDecimal.ROUND_DOWN); + backApplyInfoPo.setParentId(backList.get(0).getTaskId().intValue()); + backApplyMapper.insertBackApplyInfo(backApplyInfoPo); + BackApplyDetailsPo backApplyDetailsPoNew = new BackApplyDetailsPo(); + for (ScrapApplyDetails scrapApplyDetail: backList) { + //根据退料任务和机具类型获取退料详情 + BackApplyDetailsPo backApplyDetailsPo = backApplyMapper.getBackApplyDetailsByParentId(scrapApplyDetail); + backApplyDetailsPoNew.setCode(taskCode); + backApplyDetailsPoNew.setParentId(backApplyInfoPo.getId().intValue()); + backApplyDetailsPoNew.setTypeId(backApplyDetailsPo.getTypeId()); + backApplyDetailsPoNew.setPreNum(scrapApplyDetail.getScrapNum()); + backApplyDetailsPoNew.setAuditNum(scrapApplyDetail.getScrapNum()); + backApplyDetailsPoNew.setStatus("0"); + backApplyDetailsPoNew.setCreateBy(backApplyDetailsPo.getCreateBy()); + backApplyDetailsPoNew.setCompanyId(backApplyDetailsPo.getCompanyId()); + backApplyDetailsPoNew.setRemark(scrapApplyDetail.getAuditRemark()); + backApplyMapper.insertBackApplyDetails(backApplyDetailsPoNew); + + //修改协议表的状态 + SltAgreementInfo sltAgreementInfo = new SltAgreementInfo(); + sltAgreementInfo.setAgreementId(agreementId.toString()); + sltAgreementInfo.setTypeId(backApplyDetailsPo.getTypeId().toString()); + sltAgreementInfoMapper.updateSltAgreementInfoStatus(sltAgreementInfo); + //机具状态变为在用 + if (scrapApplyDetail.getMaId() != null){ + SltAgreementInfo agreementInfo = new SltAgreementInfo(); + agreementInfo.setMaId(scrapApplyDetail.getMaId().toString()); + agreementInfo.setStatus("16"); + sltAgreementInfoMapper.updateMaStatus(agreementInfo); + } + } + + log.info("ScrapApplyDetailsServiceImpl backApplyInfo end"); + + } + /** * 提交报废任务 * @param scrapAudit 包含废弃任务审计信息的对象。 diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/SltAgreementInfoServiceImpl.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/SltAgreementInfoServiceImpl.java index 3da71b18..252f0e36 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/SltAgreementInfoServiceImpl.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/SltAgreementInfoServiceImpl.java @@ -101,6 +101,7 @@ public class SltAgreementInfoServiceImpl implements SltAgreementInfoService { List loseList = getLoseList(infos); for (SltAgreementInfo agreementInfo : loseList){ if (agreementInfo.getMaId() != null && agreementInfo.getMaId().isEmpty()){ + agreementInfo.setStatus("103"); sltAgreementInfoMapper.updateMaStatus(agreementInfo); } } diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/BackApplyMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/BackApplyMapper.xml index f81849c3..d9e6f05f 100644 --- a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/BackApplyMapper.xml +++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/BackApplyMapper.xml @@ -299,6 +299,167 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" NOW() ) + + insert into back_apply_info + ( + + code, + + + task_id, + + + back_person, + + + back_time, + + + phone, + + + direct_audit_by, + + + direct_audit_time, + + + direct_audit_remark, + + + create_by, + + + update_by, + + + update_time, + + + remark, + + + company_id, + + + status, + + + back_source, + + + parent_id, + + create_time + ) values ( + + #{code}, + + + #{taskId}, + + + #{backPerson}, + + + #{backTime}, + + + #{phone}, + + + #{directAuditBy}, + + + #{directAuditTime}, + + + #{directAuditRemark}, + + + #{createBy}, + + + #{updateBy}, + + + #{updateTime}, + + + #{remark}, + + + #{companyId}, + + + #{status}, + + + #{backSource}, + + + #{parentId}, + + NOW() + ) + + + + insert into back_apply_details + ( + + parent_id, + + + type_id, + + + pre_num, + + status, + + create_by, + + update_time, + + remark, + + + company_id, + + + audit_num, + + create_time + ) + values ( + + #{parentId}, + + + #{typeId}, + + + #{preNum}, + + '0', + + #{createBy}, + + NOW(), + + #{remark}, + + + #{companyId}, + + + #{auditNum}, + + NOW() + ) + + update back_apply_details @@ -463,6 +624,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and bai.back_time =#{time} + + and bai.back_source =#{backSource} + GROUP BY bai.task_id, us.user_name, bai.phone, bpl.lot_name, bui.unit_name, bagi.plan_start_time ORDER BY bai.create_time desc @@ -763,6 +927,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" bad.id as detailsId, bad.pre_num AS num, bad.audit_num AS auditNum, + bad.remark AS remark, IFNULL( aa.num, 0 ) AS useNum FROM back_apply_details bad @@ -811,6 +976,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" bagi.agreement_code as agreementCode, tt.task_status as taskStatus, tta.agreement_id as agreementId, + tt1.code as forecastWasteCode, GROUP_CONCAT(bai.company_id) as companyId, GROUP_CONCAT(DISTINCT mt2.type_id) as typeId, GROUP_CONCAT(mt2.type_name) AS typeName, @@ -826,6 +992,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" LEFT JOIN sys_user us on us.user_id=bai.create_by LEFT JOIN ma_type mt1 ON mt1.type_id=bad.type_id LEFT JOIN ma_type mt2 ON mt2.type_id=mt1.parent_id + LEFT JOIN tm_task tt1 on tt1.task_id = bai.parent_id WHERE 1=1 @@ -851,6 +1018,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and bai.back_time =#{time} + + and bai.back_source =#{backSource} + GROUP BY bai.task_id, us.user_name, bai.phone, bpl.lot_name, bui.unit_name, bagi.plan_start_time HAVING FIND_IN_SET(#{typeId}, typeId) > 0 @@ -878,5 +1048,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" (SELECT * FROM back_apply_info bai2 WHERE bai2.id = #{id}) dd on bai1.task_id = dd.task_id + + \ No newline at end of file diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/RepairAuditDetailsMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/RepairAuditDetailsMapper.xml index 62f2ad34..07df6e35 100644 --- a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/RepairAuditDetailsMapper.xml +++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/RepairAuditDetailsMapper.xml @@ -150,6 +150,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" back_id, + + remark, + + + back_source, + create_time ) values ( @@ -181,6 +187,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{backId}, + + #{remark}, + + + #{backSource}, + NOW() ) 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 1476c200..32fc6884 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 @@ -299,6 +299,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" AND sad.status = #{status} + + AND sad.scrap_source = #{scrapSource} + order by sad.create_time desc diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/SltAgreementInfoMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/SltAgreementInfoMapper.xml index 6baab781..676d35c5 100644 --- a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/SltAgreementInfoMapper.xml +++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/SltAgreementInfoMapper.xml @@ -82,9 +82,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update ma_machine - set ma_status = '103' + set ma_status =#{status} where ma_id = #{maId} + + update slt_agreement_info + set status = '0' + where agreement_id = #{agreementId} + and type_id = #{typeId} +