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

Merge branch 'dev' into test

This commit is contained in:
liang.chao 2024-01-24 18:44:39 +08:00
parent b7f2c3ba4c 96020c4510
commit 07ab9b64f1
13 changed files with 109 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/BackReceiveController.java
View File

@ -139,6 +139,17 @@ public class BackReceiveController extends BaseController {
}
}
@Log(title = "退料接收-rfid编码查询", businessType = BusinessType.INSERT)
@PostMapping("rfidCodeQuery")
public AjaxResult rfidCodeQuery(@RequestBody BackApplyInfo record) {
try {
List<BackApplyInfo> list =backReceiveService.rfidCodeQuery(record);
return AjaxResult.success(list);
} catch (Exception e) {
throw new RuntimeException(e);
}
}
@Log(title = "退料接收记录", businessType = BusinessType.INSERT)
@PostMapping("backReceiveRecord")
public AjaxResult backReceiveRecord(@RequestBody BackApplyInfo record) {

7
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/BackApplyInfo.java
View File

@ -143,7 +143,14 @@ public class BackApplyInfo {
private List<BackApplyInfo> backApplyDetails;
private Integer parentId;
private String sdStatus;
/**
* 二维码编码
*/
private String qrCode;
/**
* rfid编码
*/
private String rfidCode;
private String repairedNum;
private String backId;
private String repairer;

7
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/BackReceiveMapper.java
View File

@ -57,4 +57,11 @@ public interface BackReceiveMapper {
List<BackApplyInfo> backReceiveRecord(BackApplyInfo record);
int selectCodeByMaIdAndTaskId(@Param("maId") Integer maId,@Param("taskId") Integer taskId);
/**
* 退料接收-rfid编码查询
* @param record
* @return List<BackApplyInfo>
*/
List<BackApplyInfo> rfidCodeQuery(BackApplyInfo record);
}

7
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/BackReceiveService.java
View File

@ -21,4 +21,11 @@ public interface BackReceiveService {
List<BackApplyInfo> qrcodeQuery(BackApplyInfo record);
List<BackApplyInfo> backReceiveRecord(BackApplyInfo record);
/**
* 退料接收-rfid编码查询
* @param record
* @return List<BackApplyInfo>
*/
List<BackApplyInfo> rfidCodeQuery(BackApplyInfo record);
}

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

@ -169,6 +169,11 @@ public class BackReceiveServiceImpl implements BackReceiveService {
return backReceiveMapper.backReceiveRecord(record);
}
@Override
public List<BackApplyInfo> rfidCodeQuery(BackApplyInfo record) {
return backReceiveMapper.rfidCodeQuery(record);
}
private int insertRad(int taskId, List<BackApplyInfo> wxList) {
int result = 0;
if(wxList !=null){

1
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/RepairServiceImpl.java
View File

@ -175,7 +175,6 @@ public class RepairServiceImpl implements RepairService {
for (RepairTaskDetails details : detailsList){
details.setCreateBy(loginUser.getUserid());
details.setTaskId(task.getTaskId());
details.setCompanyId(task.getCompanyId());
mapper.addAuditDetails(details);
}
task.setAgreementId(agreementId);

17
sgzb-modules/sgzb-base/src/main/resources/mapper/app/BackReceiveMapper.xml
View File

@ -749,5 +749,22 @@
AND bai.task_id = #{taskId}
</select>
<select id="rfidCodeQuery" resultType="com.bonus.sgzb.app.domain.BackApplyInfo">
SELECT
mt.type_id as typeId,
mm.ma_id as maId,
mm.ma_code as maCode,
mt.type_name as typeCode,
mt2.type_name as typeName,
sd.`name` as sdStatus
FROM
ma_machine mm
LEFT JOIN ma_type mt on mt.type_id=mm.type_id
LEFT JOIN ma_type mt2 on mt2.type_id=mt.parent_id
LEFT JOIN sys_dic sd on mm.ma_status=sd.id
WHERE
rfid_code =#{rfidCode}
</select>
</mapper>

3
sgzb-modules/sgzb-base/src/main/resources/mapper/base/RepairMapper.xml
View File

@ -254,7 +254,8 @@
type_id as typeId,
repair_num as repairNum,
repaired_num as repairedNum,
scrap_num as scrapNum
scrap_num as scrapNum,
company_id as companyId
from repair_apply_details
where task_id = #{taskId}
</select>

13
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/PurchasePartDetails.java
View File

@ -163,6 +163,11 @@ public class PurchasePartDetails extends BaseEntity
@ApiModelProperty(value = "关键字筛选")
private String keyWord;
/**
* 提交入库时间
*/
private String submitStorageTime;
public void setTaskId(Long taskId)
{
this.taskId = taskId;
@ -447,6 +452,14 @@ public class PurchasePartDetails extends BaseEntity
this.createTime = createTime;
}
public String getSubmitStorageTime() {
return submitStorageTime;
}
public void setSubmitStorageTime(String submitStorageTime) {
this.submitStorageTime = submitStorageTime;
}
@Override
public String toString() {
return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)

6
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/RepairTaskDetails.java
View File

@ -25,7 +25,7 @@ public class RepairTaskDetails {
* 机具ID
*/
@ApiModelProperty(value = "机具ID")
private String maId;
private Long maId;
/**
* 类型名称
*/
@ -77,12 +77,14 @@ public class RepairTaskDetails {
@ApiModelProperty(value = "维修人")
private String repairer;
private String keyword;
private String typeId;
private Long typeId;
private Long companyId;
private String remark;
/**
* 任务创建人
*/
@ApiModelProperty(value = "任务创建人")
private Long createBy;
private Long backId;
}

2
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/RepairAuditDetailsMapper.java
View File

@ -80,4 +80,6 @@ public interface RepairAuditDetailsMapper
int updateStatus(RepairAuditDetails bean);
int insertRepairDetails(RepairTaskDetails repairTaskDetails);
Long getBackId(Long repairId);
}

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

@ -197,7 +197,10 @@ public class RepairAuditDetailsServiceImpl implements IRepairAuditDetailsService
}
if(repairInputList != null && repairInputList.size() > 0){
companyId = repairInputList.get(0).getCompanyId();
if(repairInputList.get(0).getCompanyId() != null){
companyId = repairInputList.get(0).getCompanyId();
}
taskCode = purchaseCodeRule("R",50);
taskStatus = 53;
taskType = 50;
@ -225,7 +228,9 @@ public class RepairAuditDetailsServiceImpl implements IRepairAuditDetailsService
}
}
if(scrapNumList != null && scrapNumList.size() > 0){
companyId = scrapNumList.get(0).getCompanyId();
if(scrapNumList.get(0).getCompanyId() != null){
companyId = scrapNumList.get(0).getCompanyId();
}
taskCode = purchaseCodeRule("BF",57);
taskStatus = 58;
taskType = 57;
@ -276,23 +281,27 @@ public class RepairAuditDetailsServiceImpl implements IRepairAuditDetailsService
repairDetailList.addAll(auditAllList);
}
if(repairDetailList != null && repairDetailList.size() > 0){
companyId = repairDetailList.get(0).getCompanyId();
if (repairDetailList.get(0).getCompanyId() != null){
companyId = repairDetailList.get(0).getCompanyId();
}
taskCode = purchaseCodeRule("WX",41);
taskStatus = 42;
taskType = 41;
long inputTaskId = genTask(taskCode,taskType,taskStatus,tmTaskAgreement,companyId);
for (RepairAuditDetails inputDetails : repairDetailList) {
Long backId = repairAuditDetailsMapper.getBackId(inputDetails.getRepairId());
// 添加驳回后维修详细表数据
RepairTaskDetails repairTaskDetails = new RepairTaskDetails();
repairTaskDetails.setTaskId(String.valueOf(inputTaskId));
repairTaskDetails.setMaId(String.valueOf(inputDetails.getMaId()));
repairTaskDetails.setTypeId(String.valueOf(inputDetails.getTypeId()));
repairTaskDetails.setMaId(inputDetails.getMaId());
repairTaskDetails.setTypeId(inputDetails.getTypeId());
BigDecimal repairNum = inputDetails.getRepairNum();
int i = repairNum.intValue(); // 直接转换
repairTaskDetails.setRepairNum(i);
repairTaskDetails.setStatus("0");
repairTaskDetails.setCreateBy(SecurityUtils.getUserId());
repairTaskDetails.setCompanyId((long) companyId);
repairTaskDetails.setBackId(backId);
repairAuditDetailsMapper.insertRepairDetails(repairTaskDetails);
}
}
@ -309,7 +318,15 @@ public class RepairAuditDetailsServiceImpl implements IRepairAuditDetailsService
taskMapper.updateTmTask(tmTask);
}
if (scrapAudit.getAuditDetailList() != null && scrapAudit.getAuditDetailList().size() > 0){
for (RepairAuditDetails bean : auditDetailList){
if (auditDetailList != null) {
for (RepairAuditDetails bean : auditDetailList){
bean.setAuditBy(SecurityUtils.getUserId());
bean.setStatus(status);
repairAuditDetailsMapper.updateStatus(bean);
}
}
}else {
for (RepairAuditDetails bean : auditAllList){
bean.setAuditBy(SecurityUtils.getUserId());
bean.setStatus(status);
repairAuditDetailsMapper.updateStatus(bean);

23
sgzb-modules/sgzb-material/src/main/resources/mapper/material/RepairAuditDetailsMapper.xml
View File

@ -131,7 +131,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="typeId != null">
type_id,
</if>
<if test="backNum != null">
<if test="repairNum != null">
repair_num,
</if>
<if test="status != null">
@ -144,13 +144,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
update_by,
</if>
update_time,
<if test="remark != null and remark != ''">
remark,
</if>
<if test="companyId != null">
company_id,
</if>
<if test="id != null">
<if test="backId != null">
back_id,
</if>
create_time
@ -165,8 +162,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="typeId != null">
#{typeId},
</if>
<if test="backNum != null">
#{backNum},
<if test="repairNum != null">
#{repairNum},
</if>
<if test="status != null">
#{status},
@ -178,14 +175,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
#{createBy},
</if>
NOW(),
<if test="remark != null and remark != ''">
#{remark},
</if>
<if test="companyId != null">
#{companyId},
</if>
<if test="id != null">
#{id},
<if test="backId != null">
#{backId},
</if>
NOW()
)
@ -383,5 +377,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<include refid="selectRepairAuditDetailsVo"/>
where task_id = #{taskId} and scrap_num > 0
</select>
<select id="getBackId" resultType="java.lang.Long">
select back_id
from repair_apply_details
where id = #{repairId}
</select>
</mapper>