diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/BackReceiveController.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/BackReceiveController.java index 7cefc510..060c06da 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/BackReceiveController.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/BackReceiveController.java @@ -116,9 +116,9 @@ public class BackReceiveController extends BaseController { try { int res = backReceiveService.setNumBack(record); if (res > 0) { - return AjaxResult.success("接收成功"); + return AjaxResult.success(); } else { - return AjaxResult.error("接收失败"); + return AjaxResult.error("退料失败,请填写数量"); } } catch (Exception e) { throw new RuntimeException(e); diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/BackReceiveServiceImpl.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/BackReceiveServiceImpl.java index 2887b886..b52d4e36 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/BackReceiveServiceImpl.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/BackReceiveServiceImpl.java @@ -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.TaskTypeEnum; import com.bonus.sgzb.common.core.utils.DateUtils; -import com.bonus.sgzb.common.core.utils.GlobalConstants; -import com.bonus.sgzb.common.core.utils.StringHelper; -import org.apache.commons.lang3.ObjectUtils; +import com.bonus.sgzb.common.core.web.domain.AjaxResult; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -82,11 +80,11 @@ public class BackReceiveServiceImpl implements BackReceiveService { try { int taskId = record.getTaskId(); //修改任务状态 - res = updateTaskStatus(taskId, 39); + updateTaskStatus(taskId, 39); //插入back_check_details res = insertBcd(record); if (res == 0) { - throw new RuntimeException("保存失败,请确认是否填写数量"); + return res; } } catch (Exception e) { throw new RuntimeException(e.getMessage()); diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/BackApplyMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/BackApplyMapper.xml index 2df77eb5..30a5fcf2 100644 --- a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/BackApplyMapper.xml +++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/BackApplyMapper.xml @@ -312,7 +312,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" 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() WHERE - bad.type_id = #{typeId} + bai.id = #{id} and bai.company_id = #{companyId}