diff --git a/src/main/java/com/dreamchaser/depository_manage/mapper/DepositoryRecordMapper.java b/src/main/java/com/dreamchaser/depository_manage/mapper/DepositoryRecordMapper.java
index 79a70916..44f3a5c2 100644
--- a/src/main/java/com/dreamchaser/depository_manage/mapper/DepositoryRecordMapper.java
+++ b/src/main/java/com/dreamchaser/depository_manage/mapper/DepositoryRecordMapper.java
@@ -319,6 +319,17 @@ public interface DepositoryRecordMapper {
      */
     ApplicationInRecordP findApplicationInRecordPById(Integer id);
 
+
+    /**
+     * 根据组合入库订单id获取入库记录
+     * @param id
+     * @return
+     */
+    List<ApplicationInRecordP> findApplicationInRecordPByToGroupId(Integer id);
+
+
+
+
     /**
      * 根据id查询出库申请
      * @param id
@@ -458,5 +469,13 @@ public interface DepositoryRecordMapper {
     List<ApplicationOutRecordMin> findApplicationOutMinForComplete(Map<String,Object> map);
 
 
+    /**
+     * 用于修改组合入库审批时创建的子物料订单
+     * @param map
+     * @return
+     */
+    Integer updateApplicationInRecordForToGroupId(Map<String,Object> map);
+
+
 
 }
diff --git a/src/main/java/com/dreamchaser/depository_manage/mapper/DepositoryRecordMapper.xml b/src/main/java/com/dreamchaser/depository_manage/mapper/DepositoryRecordMapper.xml
index 6a68b6ef..f924d184 100644
--- a/src/main/java/com/dreamchaser/depository_manage/mapper/DepositoryRecordMapper.xml
+++ b/src/main/java/com/dreamchaser/depository_manage/mapper/DepositoryRecordMapper.xml
@@ -763,6 +763,14 @@
         where airid = #{id}
     </select>
 
+    <!--根据主键查询入库记录-->
+    <select id="findApplicationInRecordPByToGroupId" parameterType="int" resultMap="applicationInRecord">
+        select
+        <include refid="ApplicationInRecordInfo"/>
+        from applicationInRecordInfo
+        where airtoGroupId = #{id}
+    </select>
+
     <select id="findApplicationInByCode" parameterType="string" resultMap="applicationInRecord">
         select
         <include refid="ApplicationInRecordInfo"/>
@@ -1311,6 +1319,19 @@
         where id = #{id}
     </update>
 
+    <update id="updateApplicationInRecordForToGroupId">
+        update application_in_record
+        <set>
+            <if test="toGroupId != null and toGroupId != ''">
+                toGroupId = #{toGroupId}
+            </if>
+        </set>
+        where id in
+        <foreach collection="list" index="index" item="id" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </update>
+
     <!--    修改数据-->
     <update id="updateApplicationOutRecord" parameterType="map">
         UPDATE application_out_record
diff --git a/src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryRecordServiceImpl.java b/src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryRecordServiceImpl.java
index 394d41d9..ec01645b 100644
--- a/src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryRecordServiceImpl.java
+++ b/src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryRecordServiceImpl.java
@@ -2636,7 +2636,8 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
                 paramForUpdateInventory.put("producedDate", recordP.getMproducedDate());
                 Place placeById = placeMapper.findPlaceById(recordP.getPlaceId());
                 updateInventoryInfoForApproval(paramForUpdateInventory, recordP.getQuantity(), materialById, placeById);
-            } else {
+            }
+            else {
                 // 如果是拆单单位
 
                 // 查询拆单记录
diff --git a/src/main/java/com/dreamchaser/depository_manage/service/impl/GroupServiceImpl.java b/src/main/java/com/dreamchaser/depository_manage/service/impl/GroupServiceImpl.java
index 158943f4..964c1055 100644
--- a/src/main/java/com/dreamchaser/depository_manage/service/impl/GroupServiceImpl.java
+++ b/src/main/java/com/dreamchaser/depository_manage/service/impl/GroupServiceImpl.java
@@ -706,7 +706,7 @@ public class GroupServiceImpl implements GroupService {
      */
     @Transactional(rollbackFor = Exception.class)
     @Override
-    public Integer insertApplicationInRecord(Map<String, Object> map, UserByPort userToken,String userAgent) {
+    public Integer insertApplicationInRecord(Map<String, Object> map, UserByPort userToken, String userAgent) {
 
 
         // 获取当前提交数
@@ -877,7 +877,7 @@ public class GroupServiceImpl implements GroupService {
             insertForApplicationInRecord.put("mid", groupInfo.getMid());
             insertForApplicationInRecord.put("quantity", String.valueOf(groupInfo.getQuantity() * quantityForGroup));
             insertForApplicationInRecord.put("code", groupInfo.getMcode());
-            insertForApplicationInRecord.put("toGroupId",gid);
+            insertForApplicationInRecord.put("toGroupId", gid);
             if ("-1".equals(unit)) {
                 // 如果是基础单位
                 insertForApplicationInRecord.put("price", String.valueOf(0));
@@ -893,8 +893,7 @@ public class GroupServiceImpl implements GroupService {
                     depositoryIds.add(ObjectFormatUtil.toInteger(insertForApplicationInRecord.get("depositoryId")));
                     insertForApplicationInRecord.remove("applicationInId");
                 }
-            }
-            else {
+            } else {
                 insertForApplicationInRecord.put("price", String.valueOf(0));
                 insertForApplicationInRecord.put("unit", unit);
                 insertForApplicationInRecord.put("type", "in");
@@ -921,7 +920,16 @@ public class GroupServiceImpl implements GroupService {
         insertForApplicationInRecord.put("applicant_time", System.currentTimeMillis());
         // 添加一个组合订单用于展示
         depositoryRecordMapper.insertApplicationInRecord(insertForApplicationInRecord);
-        showRecordIds.add(ObjectFormatUtil.toInteger(insertForApplicationInRecord.get("id")));
+        Object parentId = insertForApplicationInRecord.get("id");
+
+        // 用于修改组合入库时物料订单的toGroupId字段
+        if (recordIds.size() > 0) {
+            Map<String, Object> paramForUpdateInRecordToGroupId = new HashMap<>();
+            paramForUpdateInRecordToGroupId.put("toGroupId", parentId);
+            paramForUpdateInRecordToGroupId.put("list", recordIds);
+            depositoryRecordMapper.updateApplicationInRecordForToGroupId(paramForUpdateInRecordToGroupId);
+        }
+        showRecordIds.add(ObjectFormatUtil.toInteger(parentId));
         insertForApplicationInRecord.remove("id");
 
         ResultForGroupReturn resultForGroupReturn = new ResultForGroupReturn();
@@ -1075,15 +1083,42 @@ public class GroupServiceImpl implements GroupService {
 
     /**
      * 入库审核申请
+     *
      * @param map 仓库调度信息
      * @return 受影响的行数
      */
     @Override
     public Integer reviewIn(Map<String, Object> map, Integer userId, UserByPort userToken, String userAgent) {
+        Integer result = 0;
+
         Object id = map.get("id"); // 主订单编号
         // 获取当前主订单
         ApplicationInRecordP mainRecordP = depositoryRecordMapper.findApplicationInRecordPById(ObjectFormatUtil.toInteger(id));
-        return null;
+
+        // 获取当前审批结果
+        Integer approverPass = ObjectFormatUtil.toInteger(map.get("approverPass"));
+        map.put("approverId", userToken.getId());
+        map.put("approverTime", System.currentTimeMillis());
+        // 根据当前主订单获取产生的对应子订单
+        List<ApplicationInRecordP> minInRecordList = depositoryRecordMapper.findApplicationInRecordPByToGroupId(mainRecordP.getId());
+        if (Integer.compare(approverPass, 1) == 0) {
+            for (ApplicationInRecordP minRecordP :
+                    minInRecordList) {
+                map.put("id", minRecordP.getId());
+                result += depositoryRecordService.reviewIn(map, userId, userToken, userAgent);
+            }
+            map.put("id", id);
+        } else {
+            // 如果是要驳回
+            map.put("state", "驳回");
+            List<Integer> deleteIds = new ArrayList<>();
+            for (ApplicationInRecordP minRecordP :
+                    minInRecordList) {
+                deleteIds.add(minRecordP.getId());
+            }
+            depositoryRecordMapper.deleteApplicationInRecordByIds(deleteIds);
+        }
+        return depositoryRecordMapper.updateApplicationInRecord(map);
     }
 
     /**
diff --git a/target/classes/com/dreamchaser/depository_manage/mapper/DepositoryRecordMapper.xml b/target/classes/com/dreamchaser/depository_manage/mapper/DepositoryRecordMapper.xml
index 6a68b6ef..f924d184 100644
--- a/target/classes/com/dreamchaser/depository_manage/mapper/DepositoryRecordMapper.xml
+++ b/target/classes/com/dreamchaser/depository_manage/mapper/DepositoryRecordMapper.xml
@@ -763,6 +763,14 @@
         where airid = #{id}
     </select>
 
+    <!--根据主键查询入库记录-->
+    <select id="findApplicationInRecordPByToGroupId" parameterType="int" resultMap="applicationInRecord">
+        select
+        <include refid="ApplicationInRecordInfo"/>
+        from applicationInRecordInfo
+        where airtoGroupId = #{id}
+    </select>
+
     <select id="findApplicationInByCode" parameterType="string" resultMap="applicationInRecord">
         select
         <include refid="ApplicationInRecordInfo"/>
@@ -1311,6 +1319,19 @@
         where id = #{id}
     </update>
 
+    <update id="updateApplicationInRecordForToGroupId">
+        update application_in_record
+        <set>
+            <if test="toGroupId != null and toGroupId != ''">
+                toGroupId = #{toGroupId}
+            </if>
+        </set>
+        where id in
+        <foreach collection="list" index="index" item="id" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </update>
+
     <!--    修改数据-->
     <update id="updateApplicationOutRecord" parameterType="map">
         UPDATE application_out_record