委外退料修改

src/main/java/com/gaotao/modules/mr/mapper/MrIssueMapper.java

@@ -23,4 +23,6 @@ public interface MrIssueMapper extends BaseMapper<MrIssue> {
     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<HandlingUnit> list);
 }

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<HandlingUnit> 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);
     }
 
     /**

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<HandlingUnit> list);
 }

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<HandlingUnit> 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);
     }
 }

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<HandlingUnit> handlingUnits);
+    void updateHandingUnit(List<HandlingUnit> list);
 }

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}
     </select>
+    <update id="updateHandingUnit" parameterType="java.util.List">
+        <foreach collection="list" item="hu" separator=";">
+            UPDATE handling_unit
+            SET
+            location_id = #{hu.locationId},
+            qty = #{hu.qty},
+            modified_date = GETDATE()
+            WHERE unit_id = #{hu.unitId}
+        </foreach>
+    </update>
 </mapper>

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}
     </select>
-
+    <update id="updateHandingUnit" parameterType="java.util.List">
+        <foreach collection="list" item="hu" separator=";">
+            UPDATE handling_unit
+            SET
+            location_id = #{hu.locationId},
+            qty = #{hu.qty},
+            modified_date = GETDATE()
+            WHERE unit_id = #{hu.unitId}
+        </foreach>
+    </update>
 </mapper>