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/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/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..71652d4a 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 @@ @@ -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} +