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

结算管理bug

This commit is contained in:
hongchao 2025-03-25 16:41:30 +08:00
parent 107c820e41
commit e013adb90e
4 changed files with 32 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/SltAgreementInfo.java
View File

@ -28,6 +28,11 @@ public class SltAgreementInfo {
* 协议id * 协议id
*/ */
private String agreementId; private String agreementId;
private List<String> agreementIds;
/**
* 项目id
*/
/** /**
* 编码 * 编码
*/ */

24
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/BackApplyServiceImpl.java
View File

@ -570,6 +570,13 @@ public class BackApplyServiceImpl implements BackApplyService {
return AjaxResult.error("退料数不能超过在用数"); return AjaxResult.error("退料数不能超过在用数");
} }
} }
String backTime = null;
if(bean.getBackApplyInfo().getBackTime()!=null){
backTime = bean.getBackApplyInfo().getBackTime();
} else {
backTime = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
}
BackApplyInfo backApplyInfo = bean.getBackApplyInfo(); BackApplyInfo backApplyInfo = bean.getBackApplyInfo();
try { try {
int result = 0; int result = 0;
@ -645,6 +652,7 @@ public class BackApplyServiceImpl implements BackApplyService {
// 根据任务详情往back_check_details插入数据 // 根据任务详情往back_check_details插入数据
// 退料合格数据处理 // 退料合格数据处理
if ("1".equals(leaseApplyDetails.getManageType()) && leaseApplyDetails.getPassNum() > 0) { if ("1".equals(leaseApplyDetails.getManageType()) && leaseApplyDetails.getPassNum() > 0) {
leaseApplyDetails.setEndTime(backTime);
AjaxResult error = getHgAjaxResult(bean, taskId, leaseApplyDetails); AjaxResult error = getHgAjaxResult(bean, taskId, leaseApplyDetails);
if (error != null) { if (error != null) {
return error; return error;
@ -652,6 +660,7 @@ public class BackApplyServiceImpl implements BackApplyService {
} }
// 维修数据处理 // 维修数据处理
if ("1".equals(leaseApplyDetails.getManageType()) && leaseApplyDetails.getMaintenanceNum() > 0) { if ("1".equals(leaseApplyDetails.getManageType()) && leaseApplyDetails.getMaintenanceNum() > 0) {
leaseApplyDetails.setEndTime(backTime);
AjaxResult error = getWxAjaxResult(bean, backApplyInfoId, leaseApplyDetails); AjaxResult error = getWxAjaxResult(bean, backApplyInfoId, leaseApplyDetails);
if (error != null) { if (error != null) {
return error; return error;
@ -659,6 +668,7 @@ public class BackApplyServiceImpl implements BackApplyService {
} }
// 编码设备合格数据处理 // 编码设备合格数据处理
if ("0".equals(leaseApplyDetails.getManageType()) && !CollectionUtils.isEmpty(leaseApplyDetails.getPassMaCodeDtoList())){ if ("0".equals(leaseApplyDetails.getManageType()) && !CollectionUtils.isEmpty(leaseApplyDetails.getPassMaCodeDtoList())){
leaseApplyDetails.setEndTime(backTime);
AjaxResult error = getMaCodeHgAjaxResult(bean, taskId, leaseApplyDetails); AjaxResult error = getMaCodeHgAjaxResult(bean, taskId, leaseApplyDetails);
if (error != null) { if (error != null) {
return error; return error;
@ -666,6 +676,7 @@ public class BackApplyServiceImpl implements BackApplyService {
} }
// 编码维修数据处理 // 编码维修数据处理
if ("0".equals(leaseApplyDetails.getManageType()) && !CollectionUtils.isEmpty(leaseApplyDetails.getRepairMaCodeDtoList())){ if ("0".equals(leaseApplyDetails.getManageType()) && !CollectionUtils.isEmpty(leaseApplyDetails.getRepairMaCodeDtoList())){
leaseApplyDetails.setEndTime(backTime);
AjaxResult error = getMaCodeWxAjaxResult(bean, backApplyInfoId, leaseApplyDetails); AjaxResult error = getMaCodeWxAjaxResult(bean, backApplyInfoId, leaseApplyDetails);
if (error != null) { if (error != null) {
return error; return error;
@ -675,6 +686,7 @@ public class BackApplyServiceImpl implements BackApplyService {
bean.getIsFinishBack() != null && bean.getIsFinishBack() == 1) { bean.getIsFinishBack() != null && bean.getIsFinishBack() == 1) {
//更新结算表 slt_agreement_info //更新结算表 slt_agreement_info
leaseApplyDetails.setAgreementId(bean.getAgreementId()); leaseApplyDetails.setAgreementId(bean.getAgreementId());
leaseApplyDetails.setEndTime(backTime);
int r = updateSlt4Bean(leaseApplyDetails); int r = updateSlt4Bean(leaseApplyDetails);
if (r == 0) { if (r == 0) {
throw new RuntimeException("该机具未被领料使用"); throw new RuntimeException("该机具未被领料使用");
@ -725,6 +737,13 @@ public class BackApplyServiceImpl implements BackApplyService {
return AjaxResult.error("退料数不能超过在用数"); return AjaxResult.error("退料数不能超过在用数");
} }
} }
String backTime = null;
if(bean.getBackApplyInfo().getBackTime()!=null){
backTime = bean.getBackApplyInfo().getBackTime();
} else {
backTime = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
}
boolean addLeaseTaskResult = false; boolean addLeaseTaskResult = false;
Long backApplyInfoId = 0L; Long backApplyInfoId = 0L;
try { try {
@ -808,6 +827,7 @@ public class BackApplyServiceImpl implements BackApplyService {
leaseApplyDetails.setMaintenanceNum(0); leaseApplyDetails.setMaintenanceNum(0);
} }
if ("1".equals(leaseApplyDetails.getManageType()) && leaseApplyDetails.getPassNum() > 0) { if ("1".equals(leaseApplyDetails.getManageType()) && leaseApplyDetails.getPassNum() > 0) {
leaseApplyDetails.setEndTime(backTime);
AjaxResult error = getHgAjaxResult(bean, taskId, leaseApplyDetails); AjaxResult error = getHgAjaxResult(bean, taskId, leaseApplyDetails);
if (error != null) { if (error != null) {
return error; return error;
@ -815,6 +835,7 @@ public class BackApplyServiceImpl implements BackApplyService {
} }
// 维修数据处理 // 维修数据处理
if ("1".equals(leaseApplyDetails.getManageType()) && leaseApplyDetails.getMaintenanceNum() > 0) { if ("1".equals(leaseApplyDetails.getManageType()) && leaseApplyDetails.getMaintenanceNum() > 0) {
leaseApplyDetails.setEndTime(backTime);
AjaxResult error = getWxAjaxResult(bean, backApplyInfoId, leaseApplyDetails); AjaxResult error = getWxAjaxResult(bean, backApplyInfoId, leaseApplyDetails);
if (error != null) { if (error != null) {
return error; return error;
@ -822,6 +843,7 @@ public class BackApplyServiceImpl implements BackApplyService {
} }
// 编码设备合格数据处理 // 编码设备合格数据处理
if ("0".equals(leaseApplyDetails.getManageType()) && !CollectionUtils.isEmpty(leaseApplyDetails.getPassMaCodeDtoList())){ if ("0".equals(leaseApplyDetails.getManageType()) && !CollectionUtils.isEmpty(leaseApplyDetails.getPassMaCodeDtoList())){
leaseApplyDetails.setEndTime(backTime);
AjaxResult error = getMaCodeHgAjaxResult(bean, taskId, leaseApplyDetails); AjaxResult error = getMaCodeHgAjaxResult(bean, taskId, leaseApplyDetails);
if (error != null) { if (error != null) {
return error; return error;
@ -829,6 +851,7 @@ public class BackApplyServiceImpl implements BackApplyService {
} }
// 编码维修数据处理 // 编码维修数据处理
if ("0".equals(leaseApplyDetails.getManageType()) && !CollectionUtils.isEmpty(leaseApplyDetails.getRepairMaCodeDtoList())){ if ("0".equals(leaseApplyDetails.getManageType()) && !CollectionUtils.isEmpty(leaseApplyDetails.getRepairMaCodeDtoList())){
leaseApplyDetails.setEndTime(backTime);
AjaxResult error = getMaCodeWxAjaxResult(bean, backApplyInfoId, leaseApplyDetails); AjaxResult error = getMaCodeWxAjaxResult(bean, backApplyInfoId, leaseApplyDetails);
if (error != null) { if (error != null) {
return error; return error;
@ -839,6 +862,7 @@ public class BackApplyServiceImpl implements BackApplyService {
bean.getIsFinishBack() != null && bean.getIsFinishBack() == 1) { bean.getIsFinishBack() != null && bean.getIsFinishBack() == 1) {
//更新结算表 slt_agreement_info //更新结算表 slt_agreement_info
leaseApplyDetails.setAgreementId(bean.getAgreementId()); leaseApplyDetails.setAgreementId(bean.getAgreementId());
leaseApplyDetails.setEndTime(backTime);
int res = updateSlt4Bean(leaseApplyDetails); int res = updateSlt4Bean(leaseApplyDetails);
if (res == 0) { if (res == 0) {
throw new RuntimeException("该机具未被领料使用"); throw new RuntimeException("该机具未被领料使用");

4
sgzb-modules/sgzb-material/src/main/resources/mapper/app/BackReceiveMapper.xml
View File

@ -622,7 +622,7 @@
</update> </update>
<update id="updateStlInfo"> <update id="updateStlInfo">
update slt_agreement_info update slt_agreement_info
set end_time = now(), set end_time = #{record.endTime},
update_time = now(), update_time = now(),
back_id = #{record.parentId}, back_id = #{record.parentId},
status = '1' status = '1'
@ -631,7 +631,7 @@
<update id="updateStlInfoTwo"> <update id="updateStlInfoTwo">
update slt_agreement_info update slt_agreement_info
set num = #{backNum}, set num = #{backNum},
end_time = now(), end_time = #{record.endTime},
update_time = now(), update_time = now(),
back_id = #{record.parentId}, back_id = #{record.parentId},
status = '1' status = '1'

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

@ -415,7 +415,7 @@
</insert> </insert>
<insert id="insSltInfo"> <insert id="insSltInfo">
insert into slt_agreement_info (agreement_id,type_id,ma_id,num,start_time,status,lease_id,lease_price,buy_price,type_name,model_name,replace_type_id,is_slt,company_id,lease_type,create_time,ck_remark) insert into slt_agreement_info (agreement_id,type_id,ma_id,num,start_time,status,lease_id,lease_price,buy_price,type_name,model_name,replace_type_id,is_slt,company_id,lease_type,create_time,ck_remark)
values (#{agreementId},#{record.typeId},#{record.maId},#{record.outNum},now(),0,#{record.parentId},#{ma.finalPrice},#{ma.buyPrice},#{ma.typeName},#{ma.modelName},#{ma.replaceTypeId},'0',#{record.companyId},#{record.leaseType},now(),#{record.remark}); values (#{agreementId},#{record.typeId},#{record.maId},#{record.outNum},#{record.createTime},0,#{record.parentId},#{ma.finalPrice},#{ma.buyPrice},#{ma.typeName},#{ma.modelName},#{ma.replaceTypeId},'0',#{record.companyId},#{record.leaseType},now(),#{record.remark});
</insert> </insert>
<select id="leaseOutRecordList" resultType="com.bonus.sgzb.base.api.domain.LeaseOutDetails"> <select id="leaseOutRecordList" resultType="com.bonus.sgzb.base.api.domain.LeaseOutDetails">