二级库编码设备归还问题修复

sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/SecondaryWarehouseMapper.java

@@ -95,4 +95,11 @@ public interface SecondaryWarehouseMapper {
     List<SecondCcrapApplyDetails> getSecondScrapListDetails(SecondCcrapApplyDetails bean);
 
     List<SecondCcrapApplyDetails> getSecondScrapByMaId(@Param("maId") String maId, @Param("typeId") String typeId);
+
+    /**
+     * 根据maId和typeId查询父级id
+     * @param teamLeaseInfo
+     * @return
+     */
+    TeamLeaseInfo getParentIdByMaIdAndTypeId(TeamLeaseInfo teamLeaseInfo);
 }

sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/SecondaryWarehouseServiceImpl.java

@@ -327,7 +327,14 @@ public class SecondaryWarehouseServiceImpl implements SecondaryWarehouseService
                             teamLeaseInfo.setMaId(maId);
                             teamLeaseInfo.setTypeId(bean.getTypeId());
                             teamLeaseInfo.setOutNum(1);
-                            teamLeaseInfo.setId(bean.getId());
+
+                            //此处需要根据maId和typeId去查询领料出库表，获取parentId
+                            TeamLeaseInfo bean1=mapper.getParentIdByMaIdAndTypeId(teamLeaseInfo);
+                            if (bean1!=null && bean1.getParentId()!=null){
+                                teamLeaseInfo.setId(Long.valueOf(bean1.getParentId()));
+                            } else {
+                                teamLeaseInfo.setId(bean.getId());
+                            }
                             num = mapper.addNewOperate(teamLeaseInfo);
                             mapper.updateMachine(maId, 15);
 //                            // 修改库存总量

sgzb-modules/sgzb-material/src/main/resources/mapper/material/SecondaryWarehouseMapper.xml

@@ -108,7 +108,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </if>
         GROUP BY
         bui.unit_id,
-        lod.parent_id,
         lod.type_id
     </select>
     <select id="getList1" resultType="com.bonus.sgzb.material.domain.SecondaryWarehouse">
@@ -335,7 +334,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         FROM
             receive_detail rd
         WHERE
-            parent_id = #{id}
+            unit_id = #{unitId}
         AND type_id = #{typeId}
     </select>
     <select id="getNewRecords" resultType="com.bonus.sgzb.material.domain.TeamLeaseInfo">
@@ -507,7 +506,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         AND rd4.team_group_id = rd2.team_group_id
         AND rd4.unit_id = rd2.unit_id)))
         )
-        GROUP BY rd.type_id, rd.parent_id
+        GROUP BY rd.type_id
     </select>
     <select id="getDevCount" resultType="java.lang.Integer">
         SELECT
@@ -676,6 +675,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                         left join ma_machine mm on ssd.ma_id = mm.ma_id
                         where ssd.ma_id = #{maId} and ssd.type_id = #{typeId} and ssd.status in (0,1)
     </select>
+    <select id="getParentIdByMaIdAndTypeId" resultType="com.bonus.sgzb.material.domain.TeamLeaseInfo">
+        select parent_id as parentId
+        from lease_out_details
+        where ma_id = #{maId}
+          and type_id = #{typeId}
+        order by create_time desc limit 1
+    </select>
 
     <insert id="addConfig">
         insert into second_lot_config (name,unit_id,creater,create_time)