From 39c42e931f12c261d45c15292743a8a38fa52550 Mon Sep 17 00:00:00 2001 From: "liang.chao" Date: Fri, 15 Mar 2024 13:55:04 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E5=9C=B0=E7=9B=B4=E8=BD=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../base/api/domain/DirectApplyDetails.java | 21 +++++++---- .../sgzb/base/api/domain/DirectApplyInfo.java | 16 +++++++-- .../WorkSiteDirectManageController.java | 35 ++++++++++++++----- .../sgzb/material/domain/BackApplyInfo.java | 6 ++++ .../material/domain/LeaseApplyDetails.java | 7 ++++ .../sgzb/material/mapper/ApplyInfoMapper.java | 2 ++ .../material/service/ApplyInfoService.java | 4 +++ .../service/WorkSiteDirectManageService.java | 2 +- .../service/impl/ApplyInfoServiceImpl.java | 6 ++++ .../impl/WorkSiteDirectManageImpl.java | 18 ++++------ .../mapper/material/ApplyInfoMapper.xml | 4 ++- .../material/WorkSiteDirectManageMapper.xml | 1 + 12 files changed, 92 insertions(+), 30 deletions(-) diff --git a/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/DirectApplyDetails.java b/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/DirectApplyDetails.java index 178623c1..47fc060e 100644 --- a/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/DirectApplyDetails.java +++ b/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/DirectApplyDetails.java @@ -12,22 +12,29 @@ public class DirectApplyDetails extends BaseEntity { /** * id */ - private int id; + private Integer id; /** * 直转单号 */ - private int directId; + private Integer directId; /** - * 退料单位协议 + * 机具类型 */ - private int typeId; + private Integer typeId; /** - * 退料人 + * 机具id */ - private int maId; + private Integer maId; /** - * 手机号 + * 直转数量 */ private String directNum; + private String typeName; + private String kindName; + private String modelName; + private String maCode; + private String unitName; + private String useNum; + private String companyId; } diff --git a/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/DirectApplyInfo.java b/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/DirectApplyInfo.java index 1cd84db7..f6626151 100644 --- a/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/DirectApplyInfo.java +++ b/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/DirectApplyInfo.java @@ -3,6 +3,8 @@ package com.bonus.sgzb.base.api.domain; import com.bonus.sgzb.common.core.web.domain.BaseEntity; import lombok.Data; +import java.util.List; + /** * @Author：梁超 * @date：2024/3/4 - 15:17 @@ -13,7 +15,7 @@ public class DirectApplyInfo extends BaseEntity { /** * id */ - private int id; + private Integer id; /** * 直转单号(ZZ20240226-1) */ @@ -21,7 +23,7 @@ public class DirectApplyInfo extends BaseEntity { /** * 退料单位协议 */ - private int backAgreementId; + private Integer backAgreementId; /** * 退料工程id @@ -105,5 +107,15 @@ public class DirectApplyInfo extends BaseEntity { * 审核备注 */ private String auditRemark; + /** + * 退料单位协议 + */ + private String backAgreementCode; + /** + * 领料单位协议 + */ + private String leaseAgreementCode; + + private List directApplyDetails; } diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/WorkSiteDirectManageController.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/WorkSiteDirectManageController.java index 1a0b759d..401050c0 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/WorkSiteDirectManageController.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/WorkSiteDirectManageController.java @@ -11,10 +11,7 @@ import com.bonus.sgzb.common.core.web.domain.AjaxResult; import com.bonus.sgzb.common.core.web.page.TableDataInfo; import com.bonus.sgzb.common.log.enums.BusinessType; import com.bonus.sgzb.common.security.utils.SecurityUtils; -import com.bonus.sgzb.material.domain.BackApplyInfo; -import com.bonus.sgzb.material.domain.DirectApplyInfoDetails; -import com.bonus.sgzb.material.domain.DirectPassApplyInfoDetails; -import com.bonus.sgzb.material.domain.TmTask; +import com.bonus.sgzb.material.domain.*; import com.bonus.sgzb.material.service.ApplyInfoService; import com.bonus.sgzb.material.service.TaskService; import com.bonus.sgzb.material.service.WorkSiteDirectManageService; @@ -44,6 +41,9 @@ public class WorkSiteDirectManageController extends BaseController { @Resource private TaskService tmTaskService; + @Resource + private ApplyInfoService applyInfoService; + /** * 列表展示 @@ -145,12 +145,27 @@ public class WorkSiteDirectManageController extends BaseController { return AjaxResult.error("领料信息和详情新增失败"); } - List leaseOutDetails = directApplyInfoDetails.getLeaseOutDetails(); - if (CollUtil.isEmpty(leaseOutDetails)) { + List leaseApplyDetails = task.getLeaseApplyDetails(); + if (CollUtil.isEmpty(leaseApplyDetails)) { return AjaxResult.error("领料出库信息为空"); } + List leaseApplyInfoList = applyInfoService.selectIdByTaskId(task.getTaskId().intValue()); + List list = new ArrayList(); + for (LeaseApplyDetails leaseApplyDetail : leaseApplyDetails) { + LeaseOutDetails leaseOutDetails = new LeaseOutDetails(); + for (LeaseApplyInfo leaseApplyInfo : leaseApplyInfoList) { + if (leaseApplyInfo.getCompanyId().equals(leaseApplyDetail.getCompanyId())) { + leaseOutDetails.setParentId(leaseApplyInfo.getId()); + } + } + leaseOutDetails.setTypeId(leaseApplyDetail.getTypeId()); + leaseOutDetails.setMaId(leaseApplyDetail.getMaId()); + leaseOutDetails.setOutNum(leaseApplyDetail.getPreNum()); + leaseOutDetails.setCompanyId(leaseApplyDetail.getCompanyId()); + list.add(leaseOutDetails); + } // 新增出库记录 - int res4 = workSiteDirectManageService.insertLeaseOutDetail(leaseOutDetails); + int res4 = workSiteDirectManageService.insertLeaseOutDetail(list); if (res4 == 0) { return AjaxResult.error("新增出库记录失败"); } @@ -182,7 +197,11 @@ public class WorkSiteDirectManageController extends BaseController { return AjaxResult.error("退料信息和详情新增失败"); } - int res8 = workSiteDirectManageService.insertBackCheckDetails(backApplyInfo); + List backApplyDetails = backApplyInfo.getBackApplyDetails(); + if (CollUtil.isEmpty(backApplyDetails)) { + return AjaxResult.error("退料详情信息为空"); + } + int res8 = workSiteDirectManageService.insertBackCheckDetails(backApplyDetails); if (res8 == 0) { return AjaxResult.error("新增入库记录失败"); } diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/BackApplyInfo.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/BackApplyInfo.java index fd5987fd..0f8b21b4 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/BackApplyInfo.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/BackApplyInfo.java @@ -51,6 +51,12 @@ public class BackApplyInfo extends BaseEntity { */ private String backStatus; + /** + * 退料数量 + */ + private Integer backNum; + private Integer directNum; + /** 退料单号 */ @Excel(name = "退料单号") @ApiModelProperty(value = "退料单号") diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/LeaseApplyDetails.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/LeaseApplyDetails.java index a4d071c8..be73efdb 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/LeaseApplyDetails.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/LeaseApplyDetails.java @@ -36,6 +36,13 @@ public class LeaseApplyDetails implements Serializable { @ApiModelProperty(value = "规格ID") private Integer typeId; + + /** + * 机具ID + */ + @ApiModelProperty(value = "机具Id") + private Integer maId; + /** * 类型名称 */ diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/ApplyInfoMapper.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/ApplyInfoMapper.java index 3f5572f7..244d79bf 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/ApplyInfoMapper.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/ApplyInfoMapper.java @@ -14,4 +14,6 @@ import java.util.List; public interface ApplyInfoMapper { int insertSelective(LeaseApplyInfo record); + + List selectIdByTaskId(Integer id); } diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/ApplyInfoService.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/ApplyInfoService.java index 41fbbb16..db532bab 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/ApplyInfoService.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/ApplyInfoService.java @@ -2,10 +2,14 @@ package com.bonus.sgzb.material.service; import com.bonus.sgzb.material.domain.LeaseApplyInfo; +import java.util.List; + /** * @Author：梁超 * @date：2024/3/6 - 17:41 */ public interface ApplyInfoService { int genderLeaseCode(LeaseApplyInfo record); + + List selectIdByTaskId(Integer id); } diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/WorkSiteDirectManageService.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/WorkSiteDirectManageService.java index 41ace409..654e4b0d 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/WorkSiteDirectManageService.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/WorkSiteDirectManageService.java @@ -39,7 +39,7 @@ public interface WorkSiteDirectManageService { int insertAgreementByBackInfo(BackApplyInfo backApplyInfo); - int insertBackCheckDetails(BackApplyInfo backApplyInfo); + int insertBackCheckDetails(List backApplyDetails); DirectApplyInfo getInfoById(String id); } diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/ApplyInfoServiceImpl.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/ApplyInfoServiceImpl.java index 39090697..a85d25e3 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/ApplyInfoServiceImpl.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/ApplyInfoServiceImpl.java @@ -7,6 +7,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import javax.annotation.Resource; +import java.util.List; /** * @Author：梁超 @@ -22,4 +23,9 @@ public class ApplyInfoServiceImpl implements ApplyInfoService { public int genderLeaseCode(LeaseApplyInfo record) { return leaseApplyInfoMapper.insertSelective(record); } + + @Override + public List selectIdByTaskId(Integer id) { + return leaseApplyInfoMapper.selectIdByTaskId(id); + } } 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 25bd8168..ae2f2d14 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 @@ -323,9 +323,9 @@ public class WorkSiteDirectManageImpl implements WorkSiteDirectManageService { } @Override - public int insertBackCheckDetails(BackApplyInfo backApplyInfo) { + public int insertBackCheckDetails(List backApplyDetails) { //插入back_check_details - return insertBcd(backApplyInfo); + return insertBcd(backApplyDetails); } @Override @@ -336,16 +336,12 @@ public class WorkSiteDirectManageImpl implements WorkSiteDirectManageService { return directApplyInfo; } - public int insertBcd(BackApplyInfo backApplyInfo) { + public int insertBcd(List backApplyDetails) { int res = 0; - BackApplyInfo[] arr = backApplyInfo.getArr(); - if (arr.length > 0) { - for (int i = 0; i < arr.length; i++) { - res = backRecordMapper.insertCheckDetails(arr[i]); - int maId = arr[i].getMaId(); - //退料完成状态改成在库 - backRecordMapper.updateMaStatus(maId, "15"); - } + for (BackApplyInfo backApplyDetail : backApplyDetails) { + backApplyDetail.setBackNum(Integer.valueOf(backApplyDetail.getDirectNum())); + backApplyDetail.setBackStatus("1"); + res = backRecordMapper.insertCheckDetails(backApplyDetail); } return res; } diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/ApplyInfoMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/ApplyInfoMapper.xml index ca47c1b6..7a54fe29 100644 --- a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/ApplyInfoMapper.xml +++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/ApplyInfoMapper.xml @@ -112,5 +112,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + \ No newline at end of file diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/WorkSiteDirectManageMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/WorkSiteDirectManageMapper.xml index 7f03de0b..2679398a 100644 --- a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/WorkSiteDirectManageMapper.xml +++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/WorkSiteDirectManageMapper.xml @@ -438,6 +438,7 @@ SELECT dad.direct_num AS directNum, dad.type_id AS typeId, + mt.company_id AS companyId, mt3.type_name AS typeName, mt2.type_name AS kindName, mt.type_name AS modelName,