diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/zw/InBillTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/zw/InBillTask.java
index b013b19..d154682 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/zw/InBillTask.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/zw/InBillTask.java
@@ -179,6 +179,7 @@ public class InBillTask extends AbstractTask {
         taskObj.setTask_status(TaskStatus.FINISHED.getCode());
         taskObj.setRemark("已完成");
         taskService.updateById(taskObj);
+        rawAssistIStorService.taskFinish(taskObj);
 
         //更改点位的托盘信息，空托盘的点位 2为空托盘放置点位
         pointService.update(new LambdaUpdateWrapper<SchBasePoint>()
@@ -199,13 +200,14 @@ public class InBillTask extends AbstractTask {
                 .set(SchBasePoint::getUpdate_time, DateUtil.now())
                 .eq(SchBasePoint::getPoint_code, taskObj.getPoint_code3()));
 
-        rawAssistIStorService.taskFinish(taskObj);
-
         iStructattrService.update(new LambdaUpdateWrapper<Structattr>()
                 .set(Structattr::getStoragevehicle_code, taskObj.getVehicle_code2())
                 .set(Structattr::getUpdate_time, DateUtil.now())
                 .eq(Structattr::getStruct_code, taskObj.getPoint_code1()));
 
+        iMdPbGroupplateService.update(new LambdaUpdateWrapper<>(GroupPlate.class)
+                .set(GroupPlate::getStatus, IOSEnum.GROUP_PLATE_STATUS.code("入库"))
+                .eq(GroupPlate::getStoragevehicle_code,taskObj.getVehicle_code2()));
 
         //更新formdata
         updateFormData(taskObj);
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/inAndOut/service/impl/InBillServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/inAndOut/service/impl/InBillServiceImpl.java
index 6f3bb53..49fa455 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/inAndOut/service/impl/InBillServiceImpl.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/inAndOut/service/impl/InBillServiceImpl.java
@@ -782,10 +782,10 @@ public class InBillServiceImpl extends ServiceImpl<IOStorInvMapper, IOStorInv> i
         } else if (StatusEnum.IOBILL_TYPE_IN.code("来料入库").equals(invObj.getBill_type())) {
             // 获取组盘信息
             GroupPlate groupPlate = mdPbGroupplateService.getOne(new LambdaQueryWrapper<GroupPlate>()
-                    .eq(GroupPlate::getStoragevehicle_code,  ioStorInvDis.getStoragevehicle_code())
+                    .eq(GroupPlate::getStoragevehicle_code,  whereJson.get("vehicle_code"))
                     .eq(GroupPlate::getStatus, IOSEnum.GROUP_PLATE_STATUS.code("组盘")));
             if (ObjectUtil.isEmpty(groupPlate)) {
-                throw new BadRequestException("托盘[" + ioStorInvDis.getStoragevehicle_code() + "]状态为组盘的信息不存在！");
+                throw new BadRequestException("托盘[" + whereJson.get("vehicle_code") + "]状态为组盘的信息不存在！");
             }
             JSONObject task = new JSONObject();
             task.put("config_code", IOSConstant.IN_BILL_TASK);