预报废驳回和自动发送短信

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<TmTask> getScrapBackMachine(TmTask task) {
+        return backReceiveMapper.getScrapBackMachine(task);
+    }
+
     private int insertRad(int taskId, List<BackApplyInfo> 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";

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;
+}