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

重庆测试问题修改

This commit is contained in:
csyue 2024-06-14 17:28:18 +08:00
parent 6b8ba4129b
commit 245c841248
3 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -116,9 +116,9 @@ public class BackReceiveController extends BaseController {
try { try {
int res = backReceiveService.setNumBack(record); int res = backReceiveService.setNumBack(record);
if (res > 0) { if (res > 0) {
return AjaxResult.success("接收成功"); return AjaxResult.success();
} else { } else {
return AjaxResult.error("接收失败"); return AjaxResult.error("退料失败，请填写数量");
} }
} catch (Exception e) { } catch (Exception e) {
throw new RuntimeException(e); throw new RuntimeException(e);

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

@ -11,9 +11,7 @@ import com.bonus.sgzb.common.core.constant.TaskTypeConstants;
import com.bonus.sgzb.common.core.enums.TaskStatusEnum; import com.bonus.sgzb.common.core.enums.TaskStatusEnum;
import com.bonus.sgzb.common.core.enums.TaskTypeEnum; import com.bonus.sgzb.common.core.enums.TaskTypeEnum;
import com.bonus.sgzb.common.core.utils.DateUtils; import com.bonus.sgzb.common.core.utils.DateUtils;
import com.bonus.sgzb.common.core.utils.GlobalConstants; import com.bonus.sgzb.common.core.web.domain.AjaxResult;
import com.bonus.sgzb.common.core.utils.StringHelper;
import org.apache.commons.lang3.ObjectUtils;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
@ -82,11 +80,11 @@ public class BackReceiveServiceImpl implements BackReceiveService {
try { try {
int taskId = record.getTaskId(); int taskId = record.getTaskId();
//修改任务状态 //修改任务状态
res = updateTaskStatus(taskId, 39); updateTaskStatus(taskId, 39);
//插入back_check_details //插入back_check_details
res = insertBcd(record); res = insertBcd(record);
if (res == 0) { if (res == 0) {
throw new RuntimeException("保存失败，请确认是否填写数量"); return res;
} }
} catch (Exception e) { } catch (Exception e) {
throw new RuntimeException(e.getMessage()); throw new RuntimeException(e.getMessage());

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

@ -312,7 +312,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
LEFT JOIN back_apply_details bad on bad.parent_id=bai.id LEFT JOIN back_apply_details bad on bad.parent_id=bai.id
SET bad.audit_num=#{auditNum},bai.direct_audit_by=#{createBy},bai.status=#{status},bai.direct_audit_time=NOW() SET bad.audit_num=#{auditNum},bai.direct_audit_by=#{createBy},bai.status=#{status},bai.direct_audit_time=NOW()
WHERE WHERE
bad.type_id = #{typeId} bai.id = #{id}
<if test="companyId != null and companyId != ''"> <if test="companyId != null and companyId != ''">
and bai.company_id = #{companyId} and bai.company_id = #{companyId}
</if> </if>