From eedeb2386c9f16461e789351d7edcaca17e55b62 Mon Sep 17 00:00:00 2001 From: shenzhouyu Date: Sun, 5 Oct 2025 15:43:09 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A7=94=E5=A4=96=E9=80=80=E6=96=99=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/gaotao/modules/mr/mapper/MrIssueMapper.java | 2 ++ .../gaotao/modules/mr/service/impl/MrServiceImpl.java | 10 +++++++++- .../outsourcing/dao/OutsourcingReturnMapper.java | 2 ++ .../service/impl/OutsourcingReturnServiceImpl.java | 11 +++++++++++ .../production/dao/ProductionReturnMapper.java | 2 +- src/main/resources/mapper/mr/MrIssueMapper.xml | 10 ++++++++++ .../mapper/outsourcing/OutsourcingReturnMapper.xml | 11 ++++++++++- 7 files changed, 45 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/gaotao/modules/mr/mapper/MrIssueMapper.java b/src/main/java/com/gaotao/modules/mr/mapper/MrIssueMapper.java index 0d23bbe..fff2e05 100644 --- a/src/main/java/com/gaotao/modules/mr/mapper/MrIssueMapper.java +++ b/src/main/java/com/gaotao/modules/mr/mapper/MrIssueMapper.java @@ -23,4 +23,6 @@ public interface MrIssueMapper extends BaseMapper { HandlingUnit scanMaterialLabel(@Param("site") String site,@Param("labelCode")String labelCode,@Param("partNo")String partNo); HandlingUnit scanMaterialLabelNotInStock(@Param("site") String site,@Param("labelCode")String labelCode,@Param("partNo")String partNo); + + void updateHandingUnit(List list); } diff --git a/src/main/java/com/gaotao/modules/mr/service/impl/MrServiceImpl.java b/src/main/java/com/gaotao/modules/mr/service/impl/MrServiceImpl.java index 2767b5c..39f44e7 100644 --- a/src/main/java/com/gaotao/modules/mr/service/impl/MrServiceImpl.java +++ b/src/main/java/com/gaotao/modules/mr/service/impl/MrServiceImpl.java @@ -292,7 +292,15 @@ public class MrServiceImpl implements MrService { String s = ifsApiIssueAndReturnService.addMaterialRequisitionUnIssue(materialRequisitionUnIssueDto); System.out.println("s = " + s); } - + List handlingUnits = new ArrayList<>(); + for (MrUnIssueMaterialDto material : mrUnissueDto.getSelectedMaterials()) { + HandlingUnit hu = new HandlingUnit(); + hu.setUnitId(material.getLabelCode()); + hu.setLocationId(material.getLocationId()); + hu.setQty(material.getIssueQty()); + handlingUnits.add(hu); + } + mrIssueMapper.updateHandingUnit(handlingUnits); } /** diff --git a/src/main/java/com/gaotao/modules/outsourcing/dao/OutsourcingReturnMapper.java b/src/main/java/com/gaotao/modules/outsourcing/dao/OutsourcingReturnMapper.java index 31caeae..3faa48d 100644 --- a/src/main/java/com/gaotao/modules/outsourcing/dao/OutsourcingReturnMapper.java +++ b/src/main/java/com/gaotao/modules/outsourcing/dao/OutsourcingReturnMapper.java @@ -29,4 +29,6 @@ public interface OutsourcingReturnMapper { * 扫描委外退料标签 */ HandlingUnit scanMaterialLabelForOutsourcing(@Param("scannedLabel") String scannedLabel, @Param("site") String site, @Param("componentPartNo") String componentPartNo); + + void updateHandingUnit(List list); } diff --git a/src/main/java/com/gaotao/modules/outsourcing/service/impl/OutsourcingReturnServiceImpl.java b/src/main/java/com/gaotao/modules/outsourcing/service/impl/OutsourcingReturnServiceImpl.java index abe95cb..076126d 100644 --- a/src/main/java/com/gaotao/modules/outsourcing/service/impl/OutsourcingReturnServiceImpl.java +++ b/src/main/java/com/gaotao/modules/outsourcing/service/impl/OutsourcingReturnServiceImpl.java @@ -3,11 +3,13 @@ package com.gaotao.modules.outsourcing.service.impl; import com.gaotao.modules.api.entity.issueAndReturnVo.*; import com.gaotao.modules.api.service.IfsApiIssueAndReturnService; import com.gaotao.modules.handlingunit.entity.HandlingUnit; +import com.gaotao.modules.handlingunit.service.HandlingUnitService; import com.gaotao.modules.outsourcing.dao.OutsourcingReturnMapper; import com.gaotao.modules.outsourcing.entity.dto.OutsourcingReturnDto; import com.gaotao.modules.outsourcing.entity.dto.MrIssueMaterialDto; import com.gaotao.modules.outsourcing.service.OutsourcingReturnService; import com.gaotao.modules.production.entity.dto.MaterialLabelInfo; +import com.gaotao.modules.production.entity.dto.WorkOrderMaterialDto; import com.gaotao.modules.trans.entity.TransCommonRequestDto; import com.gaotao.modules.trans.entity.TransCommonSubDto; import com.gaotao.modules.trans.entity.TransDetail; @@ -138,5 +140,14 @@ public class OutsourcingReturnServiceImpl implements OutsourcingReturnService { reserveComponentDto.setIfsQty(dto.getAllQty()); // 退料 String s = ifsApiIssueAndReturnService.addPurchaseOrderUnIssueComponent(reserveComponentDto); } + List handlingUnits = new ArrayList<>(); + for (MrIssueMaterialDto material : dto.getSelectedMaterials()) { + HandlingUnit hu = new HandlingUnit(); + hu.setUnitId(material.getLabelCode()); + hu.setLocationId(material.getLocationId()); + hu.setQty(material.getIssueQty()); + handlingUnits.add(hu); + } + outsourcingReturnMapper.updateHandingUnit(handlingUnits); } } diff --git a/src/main/java/com/gaotao/modules/production/dao/ProductionReturnMapper.java b/src/main/java/com/gaotao/modules/production/dao/ProductionReturnMapper.java index 8772bb0..0168518 100644 --- a/src/main/java/com/gaotao/modules/production/dao/ProductionReturnMapper.java +++ b/src/main/java/com/gaotao/modules/production/dao/ProductionReturnMapper.java @@ -20,5 +20,5 @@ public interface ProductionReturnMapper { HandlingUnit scanMaterialLabel(@Param("labelCode") String labelCode, @Param("site") String site,@Param("batchNo") String batchNo,@Param("partNo") String partNo); - void updateHandingUnit(List handlingUnits); + void updateHandingUnit(List list); } diff --git a/src/main/resources/mapper/mr/MrIssueMapper.xml b/src/main/resources/mapper/mr/MrIssueMapper.xml index 822d742..68a0218 100644 --- a/src/main/resources/mapper/mr/MrIssueMapper.xml +++ b/src/main/resources/mapper/mr/MrIssueMapper.xml @@ -58,4 +58,14 @@ from handling_unit a where a.site=#{site} and a.unit_id=#{labelCode} and (a.in_stock_flag='N' or a.in_stock_flag='X') and a.part_no = #{partNo} + + + UPDATE handling_unit + SET + location_id = #{hu.locationId}, + qty = #{hu.qty}, + modified_date = GETDATE() + WHERE unit_id = #{hu.unitId} + + diff --git a/src/main/resources/mapper/outsourcing/OutsourcingReturnMapper.xml b/src/main/resources/mapper/outsourcing/OutsourcingReturnMapper.xml index bee7bd7..908d354 100644 --- a/src/main/resources/mapper/outsourcing/OutsourcingReturnMapper.xml +++ b/src/main/resources/mapper/outsourcing/OutsourcingReturnMapper.xml @@ -56,5 +56,14 @@ from handling_unit a where a.site=#{site} and a.unit_id=#{scannedLabel} and (a.in_stock_flag='N' or a.in_stock_flag='X') and a.part_no = #{componentPartNo} - + + + UPDATE handling_unit + SET + location_id = #{hu.locationId}, + qty = #{hu.qty}, + modified_date = GETDATE() + WHERE unit_id = #{hu.unitId} + +