From 2910295b67c70b153fafbc6e943919cacf13f803 Mon Sep 17 00:00:00 2001 From: sxu <602087911@qq.com> Date: Fri, 23 Aug 2024 13:04:14 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E4=BB=A3=E7=A0=81=E5=B7=A5?= =?UTF-8?q?=E5=9C=B0=E7=9B=B4=E8=BD=AC=E5=92=8C=E9=80=80=E6=96=99=E7=94=B3?= =?UTF-8?q?=E8=AF=B7=E5=B1=82=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sgzb/material/mapper/BackApplyMapper.java | 6 ++ .../mapper/WorkSiteDirectManageMapper.java | 2 +- .../service/impl/BackApplyServiceImpl.java | 14 +++- .../impl/WorkSiteDirectManageImpl.java | 9 +-- .../mapper/material/BackApplyMapper.xml | 76 +++++++++++++++++++ .../material/WorkSiteDirectManageMapper.xml | 4 +- 6 files changed, 102 insertions(+), 9 deletions(-) diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/BackApplyMapper.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/BackApplyMapper.java index 02555a5..69b857f 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/BackApplyMapper.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/BackApplyMapper.java @@ -120,6 +120,12 @@ public interface BackApplyMapper { */ List getUseTypeTree(BackApplyInfo bean); + List getUseTypeTreeL4(BackApplyInfo bean); + + List getUseTypeTreeL3(List list); + + List getUseTypeTreeL21(List list); + /** * 退料申请导出 * @param bean diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/WorkSiteDirectManageMapper.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/WorkSiteDirectManageMapper.java index 1b6f6ab..fc72833 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/WorkSiteDirectManageMapper.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/WorkSiteDirectManageMapper.java @@ -44,7 +44,7 @@ public interface WorkSiteDirectManageMapper { int batchDel(@Param("ids") ArrayList ids); - String getMachineStatus(LeaseOutDetails leaseOutDetails); + DirectApplyInfo getMachineStatus(LeaseOutDetails leaseOutDetails); int updateLeaseApplyDetailsOutNum(@Param("record")LeaseOutDetails leaseOutDetails); diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/BackApplyServiceImpl.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/BackApplyServiceImpl.java index 66e71d9..e9eb008 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/BackApplyServiceImpl.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/BackApplyServiceImpl.java @@ -19,6 +19,7 @@ import org.springframework.stereotype.Service; import java.text.SimpleDateFormat; import java.util.*; +import java.util.stream.Collectors; /** * @author hay @@ -364,8 +365,19 @@ public class BackApplyServiceImpl implements BackApplyService { public AjaxResult getUseTypeTree(BackApplyInfo bean) { List groupList = new ArrayList<>(); List list = new ArrayList<>(); + List listL4 = new ArrayList<>(); + List listL3 = new ArrayList<>(); + List listL21 = new ArrayList<>(); try { - list = backApplyMapper.getUseTypeTree(bean); + //list = backApplyMapper.getUseTypeTree(bean); + listL4 = backApplyMapper.getUseTypeTreeL4(bean); + List list4ParentIds = listL4.stream().map(o -> o.getParentId()).collect(Collectors.toList()); + listL3 = backApplyMapper.getUseTypeTreeL3(list4ParentIds); + List list3ParentIds = listL3.stream().map(o -> o.getParentId()).collect(Collectors.toList()); + listL21 = backApplyMapper.getUseTypeTreeL21(list3ParentIds); + list.addAll(listL4); + list.addAll(listL3); + list.addAll(listL21); if (CollectionUtils.isNotEmpty(list)) { // 创建树形结构（数据集合作为参数） TypeTreeBuild treeBuild = new TypeTreeBuild(list); diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/WorkSiteDirectManageImpl.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/WorkSiteDirectManageImpl.java index 0d03f25..379471c 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/WorkSiteDirectManageImpl.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/WorkSiteDirectManageImpl.java @@ -13,7 +13,6 @@ import com.bonus.sgzb.material.service.*; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; - import javax.annotation.Resource; import java.text.SimpleDateFormat; import java.util.ArrayList; @@ -179,7 +178,7 @@ public class WorkSiteDirectManageImpl implements WorkSiteDirectManageService { @Transactional(rollbackFor = Exception.class) public int insertLeaseOutDetail(List leaseOutDetails, TmTask lTask) { int res = 0; - String maStatus = "15"; + String maStatus = "16"; double outNum = 0.1; if (StringUtils.isNull(leaseOutDetails)) { log.info("领料出库失败,请检查参数是否填写完整!"); @@ -187,9 +186,9 @@ public class WorkSiteDirectManageImpl implements WorkSiteDirectManageService { } for (LeaseOutDetails leaseOutDetail : leaseOutDetails) { if (!(Objects.equals(Integer.valueOf(0), leaseOutDetail.getMaId()) || leaseOutDetail.getMaId() == null)) { - String status = workSiteDirectManageMapper.getMachineStatus(leaseOutDetail); - if (!maStatus.equals(status)) { - log.info("领料出库失败,该设备不是在库状态！"); + DirectApplyInfo directApplyInfo = workSiteDirectManageMapper.getMachineStatus(leaseOutDetail); + if (!maStatus.equals(directApplyInfo.getStatus())) { + log.info("领料出库失败,该设备不是再用状态！"); return res; } } 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 e0a9c7c..238721d 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 @@ -690,6 +690,82 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" LEVEL ASC, type_id; + + + + + + select * from direct_apply_info where id = #{id} - + select ma_status as status from ma_machine where ma_id = #{maId}