bonus
/
devicesmgt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

试验检验审核驳回修改

This commit is contained in:
1539530615@qq.com 2024-01-24 11:16:21 +08:00
parent f66057f442
commit f20bb2ee9b
9 changed files with 16 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/LeaseOutDetailsServiceImpl.java
View File

@ -57,7 +57,7 @@ public class LeaseOutDetailsServiceImpl implements LeaseOutDetailsService {
if (StringUtils.isNull(record)) { if (StringUtils.isNull(record)) {
return AjaxResult.error("领料出库失败,请检查参数是否填写完整!"); return AjaxResult.error("领料出库失败,请检查参数是否填写完整!");
} }
if (!(Integer.valueOf(0) == record.getMaId() || record.getMaId() == null)) { if (!(Objects.equals(Integer.valueOf(0), record.getMaId()) || record.getMaId() == null)) {
String status = leaseOutDetailsMapper.getMachineStatus(record); String status = leaseOutDetailsMapper.getMachineStatus(record);
if (!maStatus.equals(status)) { if (!maStatus.equals(status)) {
return AjaxResult.error("领料出库失败,该设备不是在库状态！"); return AjaxResult.error("领料出库失败,该设备不是在库状态！");

18
sgzb-modules/sgzb-material/pom.xml
View File

@ -113,6 +113,7 @@
<version>3.6.3</version> <version>3.6.3</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
</dependencies> </dependencies>
<properties> <properties>
@ -120,21 +121,4 @@
<maven.compiler.target>8</maven.compiler.target> <maven.compiler.target>8</maven.compiler.target>
</properties> </properties>
<build>
<finalName>${project.artifactId}</finalName>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<executions>
<execution>
<goals>
<goal>repackage</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project> </project>

2
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/RepairInputDetails.java
View File

@ -56,7 +56,7 @@ public class RepairInputDetails extends BaseEntity
/** 数据所属组织 */ /** 数据所属组织 */
@Excel(name = "数据所属组织") @Excel(name = "数据所属组织")
private Long companyId; private Long companyId;
private Long createById;
public void setId(Long id) public void setId(Long id)
{ {

1
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/ScrapApplyDetails.java
View File

@ -107,7 +107,6 @@ public class ScrapApplyDetails extends BaseEntity
private String keyword; private String keyword;
private String typeName; private String typeName;
private Long createById;
public void setId(Long id) public void setId(Long id)

2
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/TmTaskAgreement.java
View File

@ -2,6 +2,7 @@ package com.bonus.sgzb.material.domain;
import com.bonus.sgzb.common.core.annotation.Excel; import com.bonus.sgzb.common.core.annotation.Excel;
import com.bonus.sgzb.common.core.web.domain.BaseEntity; import com.bonus.sgzb.common.core.web.domain.BaseEntity;
import lombok.Data;
import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle; import org.apache.commons.lang3.builder.ToStringStyle;
@ -11,6 +12,7 @@ import org.apache.commons.lang3.builder.ToStringStyle;
* @author bonus * @author bonus
* @date 2023-12-16 * @date 2023-12-16
*/ */
@Data
public class TmTaskAgreement extends BaseEntity public class TmTaskAgreement extends BaseEntity
{ {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;

12
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/RepairAuditDetailsServiceImpl.java
View File

@ -219,7 +219,7 @@ public class RepairAuditDetailsServiceImpl implements IRepairAuditDetailsService
repairInputDetails.setTypeId(inputDetails.getTypeId()); repairInputDetails.setTypeId(inputDetails.getTypeId());
repairInputDetails.setMaId(inputDetails.getMaId()); repairInputDetails.setMaId(inputDetails.getMaId());
repairInputDetails.setStatus("0"); repairInputDetails.setStatus("0");
repairInputDetails.setCreateById(SecurityUtils.getUserId()); repairInputDetails.setCreateBy(String.valueOf(SecurityUtils.getUserId()));
repairInputDetails.setCreateTime(new Date()); repairInputDetails.setCreateTime(new Date());
repairTestInputMapper.insertRepairInputDetails(repairInputDetails); repairTestInputMapper.insertRepairInputDetails(repairInputDetails);
} }
@ -246,7 +246,7 @@ public class RepairAuditDetailsServiceImpl implements IRepairAuditDetailsService
scrapApplyDetails.setScrapSource("2"); scrapApplyDetails.setScrapSource("2");
scrapApplyDetails.setStatus("0"); scrapApplyDetails.setStatus("0");
scrapApplyDetails.setParentId(scrapDetails.getId()); scrapApplyDetails.setParentId(scrapDetails.getId());
scrapApplyDetails.setCreateById(SecurityUtils.getUserId()); scrapApplyDetails.setCreateBy(String.valueOf(SecurityUtils.getUserId()));
scrapApplyDetails.setCreateTime(new Date()); scrapApplyDetails.setCreateTime(new Date());
scrapApplyDetailsMapper.insertScrapApplyDetails(scrapApplyDetails); scrapApplyDetailsMapper.insertScrapApplyDetails(scrapApplyDetails);
} }
@ -266,7 +266,7 @@ public class RepairAuditDetailsServiceImpl implements IRepairAuditDetailsService
task1.setTaskStatus(47); task1.setTaskStatus(47);
} }
task1.setUpdateTime(new Date()); task1.setUpdateTime(new Date());
task1.setUpdateBy(SecurityUtils.getUsername()); task1.setUpdateBy(String.valueOf(SecurityUtils.getUserId()));
taskMapper.updateTmTask(task1); taskMapper.updateTmTask(task1);
} else { } else {
status = "2"; status = "2";
@ -306,7 +306,7 @@ public class RepairAuditDetailsServiceImpl implements IRepairAuditDetailsService
tmTask.setTaskStatus(48); tmTask.setTaskStatus(48);
} }
tmTask.setUpdateTime(new Date()); tmTask.setUpdateTime(new Date());
tmTask.setUpdateBy(SecurityUtils.getUsername()); tmTask.setUpdateBy(String.valueOf(SecurityUtils.getUserId()));
taskMapper.updateTmTask(tmTask); taskMapper.updateTmTask(tmTask);
} }
if (scrapAudit.getAuditDetailList() != null && scrapAudit.getAuditDetailList().size() > 0){ if (scrapAudit.getAuditDetailList() != null && scrapAudit.getAuditDetailList().size() > 0){
@ -327,7 +327,7 @@ public class RepairAuditDetailsServiceImpl implements IRepairAuditDetailsService
task.setTaskType(taskType); task.setTaskType(taskType);
task.setCompanyId(companyId); task.setCompanyId(companyId);
task.setCreateTime(new Date()); task.setCreateTime(new Date());
task.setCreateBy(SecurityUtils.getUsername()); task.setCreateBy(String.valueOf(SecurityUtils.getUserId()));
taskMapper.insertTmTask(task); taskMapper.insertTmTask(task);
// 添加协议信息表 // 添加协议信息表
TmTaskAgreement taskAgreement = new TmTaskAgreement(); TmTaskAgreement taskAgreement = new TmTaskAgreement();
@ -338,7 +338,7 @@ public class RepairAuditDetailsServiceImpl implements IRepairAuditDetailsService
}else { }else {
taskAgreement.setAgreementId(tmTaskAgreement.getAgreementId()); taskAgreement.setAgreementId(tmTaskAgreement.getAgreementId());
} }
taskAgreement.setCreateBy(SecurityUtils.getUsername()); taskAgreement.setCreateBy(String.valueOf(SecurityUtils.getUserId()));
agreementMapper.insertTmTaskAgreement(taskAgreement); agreementMapper.insertTmTaskAgreement(taskAgreement);
return taskId; return taskId;
} }

2
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/ScrapApplyDetailsServiceImpl.java
View File

@ -164,7 +164,7 @@ public class ScrapApplyDetailsServiceImpl implements IScrapApplyDetailsService
task.setRemark(scrapAudit.getRemark()); task.setRemark(scrapAudit.getRemark());
} }
task.setUpdateTime(new Date()); task.setUpdateTime(new Date());
task.setUpdateBy(SecurityUtils.getUsername()); task.setUpdateBy(String.valueOf(SecurityUtils.getUserId()));
taskMapper.updateTmTask(task); taskMapper.updateTmTask(task);
} }
return 1; return 1;

2
sgzb-modules/sgzb-material/src/main/resources/mapper/material/RepairTestInputMapper.xml
View File

@ -229,7 +229,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="repairNum != null">repair_num,</if> <if test="repairNum != null">repair_num,</if>
<if test="inputNum != null">input_num,</if> <if test="inputNum != null">input_num,</if>
<if test="createBy != null">create_by,</if> <if test="createBy != null">create_by,</if>
<if test="createById != null">create_by,</if>
<if test="createTime != null">create_time,</if> <if test="createTime != null">create_time,</if>
<if test="updateBy != null">update_by,</if> <if test="updateBy != null">update_by,</if>
<if test="updateTime != null">update_time,</if> <if test="updateTime != null">update_time,</if>
@ -247,7 +246,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="repairNum != null">#{repairNum},</if> <if test="repairNum != null">#{repairNum},</if>
<if test="inputNum != null">#{inputNum},</if> <if test="inputNum != null">#{inputNum},</if>
<if test="createBy != null">#{createBy},</if> <if test="createBy != null">#{createBy},</if>
<if test="createById != null">#{createById},</if>
<if test="createTime != null">#{createTime},</if> <if test="createTime != null">#{createTime},</if>
<if test="updateBy != null">#{updateBy},</if> <if test="updateBy != null">#{updateBy},</if>
<if test="updateTime != null">#{updateTime},</if> <if test="updateTime != null">#{updateTime},</if>

8
sgzb-modules/sgzb-material/src/main/resources/mapper/material/ScrapApplyDetailsMapper.xml
View File

@ -38,7 +38,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
dic.NAME taskStatusName, dic.NAME taskStatusName,
bui.unit_name unitName, bui.unit_name unitName,
bpl.lot_name projectName, bpl.lot_name projectName,
tk.create_by createBy, su.user_name createBy,
tk.create_time createTime, tk.create_time createTime,
tk.remark, tk.remark,
tk1.CODE repairNum, tk1.CODE repairNum,
@ -64,6 +64,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
p_id IN ( SELECT id FROM sys_dic WHERE VALUE = 'bf_task' )) dic ON tk.task_status = dic.id p_id IN ( SELECT id FROM sys_dic WHERE VALUE = 'bf_task' )) dic ON tk.task_status = dic.id
LEFT JOIN ma_type mt ON sad.type_id = mt.type_id LEFT JOIN ma_type mt ON sad.type_id = mt.type_id
LEFT JOIN ma_type mt1 ON mt.parent_id = mt1.type_id LEFT JOIN ma_type mt1 ON mt.parent_id = mt1.type_id
LEFT JOIN sys_user su ON su.user_id = tk.create_by
WHERE WHERE
sad.scrap_source IN ( '1', '2' ) sad.scrap_source IN ( '1', '2' )
AND tk.task_type = 57 AND tk.task_type = 57
@ -103,7 +104,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
dic.NAME taskStatusName, dic.NAME taskStatusName,
bui.unit_name unitName, bui.unit_name unitName,
bpl.lot_name projectName, bpl.lot_name projectName,
tk.create_by createBy, su.user_name createBy,
tk.create_time createTime, tk.create_time createTime,
tk.remark, tk.remark,
tk1.CODE repairNum, tk1.CODE repairNum,
@ -132,6 +133,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
LEFT JOIN ma_type mt ON sad.type_id = mt.type_id LEFT JOIN ma_type mt ON sad.type_id = mt.type_id
LEFT JOIN ma_type mt1 ON mt.parent_id = mt1.type_id LEFT JOIN ma_type mt1 ON mt.parent_id = mt1.type_id
left join ma_machine mma on sad.ma_id= mma.ma_id left join ma_machine mma on sad.ma_id= mma.ma_id
LEFT JOIN sys_user su ON su.user_id = tk.create_by
WHERE WHERE
sad.scrap_source IN ( '1', '2' ) sad.scrap_source IN ( '1', '2' )
AND tk.task_type = 57 AND tk.task_type = 57
@ -185,7 +187,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="auditTime != null">audit_time,</if> <if test="auditTime != null">audit_time,</if>
<if test="auditRemark != null">audit_remark,</if> <if test="auditRemark != null">audit_remark,</if>
<if test="createBy != null">create_by,</if> <if test="createBy != null">create_by,</if>
<if test="createById != null">create_by,</if>
<if test="createTime != null">create_time,</if> <if test="createTime != null">create_time,</if>
<if test="updateBy != null">update_by,</if> <if test="updateBy != null">update_by,</if>
<if test="updateTime != null">update_time,</if> <if test="updateTime != null">update_time,</if>
@ -208,7 +209,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="auditTime != null">#{auditTime},</if> <if test="auditTime != null">#{auditTime},</if>
<if test="auditRemark != null">#{auditRemark},</if> <if test="auditRemark != null">#{auditRemark},</if>
<if test="createBy != null">#{createBy},</if> <if test="createBy != null">#{createBy},</if>
<if test="createById != null">#{createById},</if>
<if test="createTime != null">#{createTime},</if> <if test="createTime != null">#{createTime},</if>
<if test="updateBy != null">#{updateBy},</if> <if test="updateBy != null">#{updateBy},</if>
<if test="updateTime != null">#{updateTime},</if> <if test="updateTime != null">#{updateTime},</if>