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

仓储接收装备bug修复

This commit is contained in:
15856 2024-11-11 17:56:51 +08:00
parent e78eb49e31
commit 14d7abc8a0
6 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/controller/MaReceiveController.java
View File

@ -102,7 +102,7 @@ public class MaReceiveController extends BaseController {
}
@ApiOperation(value = "修改租赁设备状态")
@GetMapping("/updateItemStatus")
@PostMapping("/updateItemStatus")
public AjaxResult updateItemStatus(@RequestBody String maMachineRequest) {
Integer itemStatus = maReceiveService.updateItemStatus(maMachineRequest);
return success(itemStatus);

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

@ -110,5 +110,5 @@ public class DataReceiveDetail {
private Long itemId;
@ApiModelProperty(value = "机手附件信息")
private List<EnterpriseDriverFile> enterpriseDriverFile;
private List<EnterpriseDriverFile> enterpriseDriverFileList;
}

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

@ -14,7 +14,7 @@ public class EnterpriseDriverFile {
private Integer receiveDetailId;
@ApiModelProperty(value = "附件名称")
private String file_name;
private String fileName;
@ApiModelProperty(value = "附件地址")
private String fileUrl;

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

@ -185,7 +185,7 @@ public class MaMachineServiceImpl implements MaMachineService {
@Override
public AjaxResult pushNotifications(List<MaMachine> maMachineList) {
log.info("MaMachineServiceImpl pushNotifications 开始处理设备推送逻辑==={}",maMachineList);
log.info("MaMachineServiceImpl pushNotifications 开始处理设备推送逻辑==={}，地址{}",maMachineList,zlptUrl);
if (maMachineList.isEmpty()){
throw new ServiceException(String.format(ExceptionDict.PARAM_IS_NULL_ERROR_MSG,"maMachineList"), ExceptionDict.PARAM_IS_NULL_ERROR);
}

8
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/service/impl/MaReceiveServiceImpl.java
View File

@ -65,6 +65,7 @@ public class MaReceiveServiceImpl implements MaReceiveService {
@Override
@Transactional
public int saveDataReceiveDetails(DataReceiveDetail dataReceiveDetail) {
log.info("保存推送详情{}", dataReceiveDetail);
int i = 0;
//保存推送详情
i = maReceiveMapper.saveDataReceiveDetails(dataReceiveDetail);
@ -72,7 +73,7 @@ public class MaReceiveServiceImpl implements MaReceiveService {
throw new RuntimeException("保存失败");
}
//保存机手附件信息
List<EnterpriseDriverFile> enterpriseDriverFileList = dataReceiveDetail.getEnterpriseDriverFile();
List<EnterpriseDriverFile> enterpriseDriverFileList = dataReceiveDetail.getEnterpriseDriverFileList();
if (enterpriseDriverFileList != null && !enterpriseDriverFileList.isEmpty()){
for (EnterpriseDriverFile enterpriseDriverFile : enterpriseDriverFileList) {
enterpriseDriverFile.setReceiveDetailId(dataReceiveDetail.getId());
@ -99,7 +100,7 @@ public class MaReceiveServiceImpl implements MaReceiveService {
public List<DataReceiveDetail> getDataReceiveDetails(DataReceiveDetail dataReceiveDetail) {
List<DataReceiveDetail> dataReceiveDetails = maReceiveMapper.getDataReceiveDetails(dataReceiveDetail);
dataReceiveDetails.forEach(dataReceiveDetail1 -> {
dataReceiveDetail1.setEnterpriseDriverFile(enterpriseDriverFileMapper.selectEnterpriseDriverFileByReceiveDetailId(dataReceiveDetail1.getId()));
dataReceiveDetail1.setEnterpriseDriverFileList(enterpriseDriverFileMapper.selectEnterpriseDriverFileByReceiveDetailId(dataReceiveDetail1.getId()));
});
return dataReceiveDetails;
}
@ -110,7 +111,8 @@ public class MaReceiveServiceImpl implements MaReceiveService {
for (DataReceiveDetail dataReceiveDetail : dataReceiveInfo.getDataReceiveDetailList()) {
MaMachine maMachine = new MaMachine();
maMachine.setMaCode(FieldGenerator.generateField());
maMachine.setTypeId(dataReceiveDetail.getTypeId());
// maMachine.setTypeId(dataReceiveDetail.getTypeId());
maMachine.setTypeId(1763);
maMachine.setMaStatus("15");
maMachine.setCreateTime(new Date());
maMachine.setSouceBy(2);

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

@ -5,7 +5,7 @@
<mapper namespace="com.bonus.sgzb.base.mapper.EnterpriseDriverFileMapper">
<insert id="insertEnterpriseDriverFile">
insert into base_enterprise_driver_file(receive_detail_id,file_name,file_url,file_type)
insert into enterprise_driver_file(receive_detail_id,file_name,file_url,file_type)
values(#{receiveDetailId},#{fileName},#{fileUrl},#{fileType})
</insert>
<select id="selectEnterpriseDriverFileByReceiveDetailId"