diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/controller/GroupController.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/controller/GroupController.java
index 721ec78..f2a4c01 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/controller/GroupController.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/controller/GroupController.java
@@ -24,6 +24,7 @@ import org.nl.wms.basedata_manage.service.dao.MdPbStoragevehicleinfo;
 import org.nl.wms.pm_manage.service.IPmFormDataService;
 import org.nl.wms.pm_manage.service.dao.PmFormData;
 import org.nl.wms.sch_manage.enums.PointStatusEnum;
+import org.nl.wms.sch_manage.enums.StatusEnum;
 import org.nl.wms.sch_manage.service.ISchBasePointService;
 import org.nl.wms.sch_manage.service.dao.SchBasePoint;
 import org.nl.wms.warehouse_manage.enums.IOSEnum;
@@ -117,7 +118,7 @@ public class GroupController {
                 if (groupPlate.getQty().compareTo(pmFormDataList.get(0).getQty().subtract(pmFormDataList.get(0).getAssign_qty())) == 0) {
                     iPmFormDataService.update(
                             new LambdaUpdateWrapper<PmFormData>()
-                                    .set(PmFormData::getStatus, IOSEnum.BILL_STATUS.code("分配完"))
+                                    .set(PmFormData::getStatus, StatusEnum.FORM_STATUS.code("已分配"))
                                     .set(PmFormData::getAssign_qty, pmFormDataList.get(0).getAssign_qty().add(groupPlate.getQty()))
                                     .set(PmFormData::getUpdate_time, DateUtil.now())
                                     .set(PmFormData::getUpdate_name, SecurityUtils.getCurrentNickName())
@@ -126,7 +127,7 @@ public class GroupController {
                     iPmFormDataService.update(
                             new LambdaUpdateWrapper<PmFormData>()
                                     .set(PmFormData::getAssign_qty, pmFormDataList.get(0).getAssign_qty().add(groupPlate.getQty()))
-                                    .set(PmFormData::getStatus, IOSEnum.BILL_STATUS.code("分配中"))
+                                    .set(PmFormData::getStatus,  StatusEnum.FORM_STATUS.code("执行中"))
                                     .set(PmFormData::getUpdate_time, DateUtil.now())
                                     .set(PmFormData::getUpdate_name, SecurityUtils.getCurrentNickName())
                                     .eq(PmFormData::getCode, groupPlate.getExt_code()));
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/ios_manage/service/impl/PdaIosInServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/ios_manage/service/impl/PdaIosInServiceImpl.java
index fe1ab1e..74b0f23 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/ios_manage/service/impl/PdaIosInServiceImpl.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/ios_manage/service/impl/PdaIosInServiceImpl.java
@@ -264,7 +264,7 @@ public class PdaIosInServiceImpl implements PdaIosInService {
                 if (groupDao.getQty().compareTo(pmFormDataList.get(0).getQty().subtract(pmFormDataList.get(0).getAssign_qty())) == 0) {
                     iPmFormDataService.update(
                             new LambdaUpdateWrapper<PmFormData>()
-                                    .set(PmFormData::getStatus, IOSEnum.BILL_STATUS.code("分配完"))
+                                    .set(PmFormData::getStatus, StatusEnum.FORM_STATUS.code("已分配"))
                                     .set(PmFormData::getAssign_qty, pmFormDataList.get(0).getAssign_qty().add(groupDao.getQty()))
                                     .set(PmFormData::getUpdate_time, DateUtil.now())
                                     .set(PmFormData::getUpdate_name, SecurityUtils.getCurrentNickName())
@@ -273,7 +273,7 @@ public class PdaIosInServiceImpl implements PdaIosInService {
                     iPmFormDataService.update(
                             new LambdaUpdateWrapper<PmFormData>()
                                     .set(PmFormData::getAssign_qty, pmFormDataList.get(0).getAssign_qty().add(groupDao.getQty()))
-                                    .set(PmFormData::getStatus, IOSEnum.BILL_STATUS.code("分配中"))
+                                    .set(PmFormData::getStatus,StatusEnum.FORM_STATUS.code("执行中"))
                                     .set(PmFormData::getUpdate_time, DateUtil.now())
                                     .set(PmFormData::getUpdate_name, SecurityUtils.getCurrentNickName())
                                     .eq(PmFormData::getCode, groupDao.getExt_code()));
@@ -375,7 +375,7 @@ public class PdaIosInServiceImpl implements PdaIosInService {
                 .like(whereJson.containsKey("form_data_code"),
                         PmFormData::getCode, whereJson.get("form_data_code"))
                         .eq(PmFormData::getForm_type, dictList.get(0).getValue())
-                .ne(PmFormData::getStatus, IOSEnum.BILL_STATUS.code("完成"))));
+                .ne(PmFormData::getStatus, StatusEnum.FORM_STATUS.code("完成"))));
     }
 
     @Override
@@ -600,7 +600,7 @@ public class PdaIosInServiceImpl implements PdaIosInService {
 
         List<PmFormData> formDataList = iPmFormDataService.list(new LambdaUpdateWrapper<PmFormData>()
                 .eq(PmFormData::getCode, dto.getForm_data_code())
-                .eq(PmFormData::getStatus, IOSEnum.BILL_STATUS.code("完成")));
+                .eq(PmFormData::getStatus, StatusEnum.FORM_STATUS.code("完成")));
 
         if(CollectionUtils.isNotEmpty(formDataList)){
             throw new BadRequestException("单据" +dto.getForm_data_code() +"已完成！");
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 ca113bc..ceec2b0 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
@@ -15,6 +15,7 @@ import org.nl.wms.basedata_manage.service.IStructattrService;
 import org.nl.wms.basedata_manage.service.dao.Structattr;
 import org.nl.wms.pm_manage.service.IPmFormDataService;
 import org.nl.wms.pm_manage.service.dao.PmFormData;
+import org.nl.wms.sch_manage.enums.StatusEnum;
 import org.nl.wms.sch_manage.enums.TaskStatus;
 import org.nl.wms.sch_manage.service.ISchBasePointService;
 import org.nl.wms.sch_manage.service.ISchBaseTaskService;
@@ -232,7 +233,7 @@ public class InBillTask extends AbstractTask {
         if( groupPlate.getQty().compareTo(pmFormDataList.get(0).getQty().subtract(pmFormDataList.get(0).getActual_qty())) ==0){
             iPmFormDataService.update(
                     new LambdaUpdateWrapper<PmFormData>()
-                            .set(PmFormData::getStatus,IOSEnum.BILL_STATUS.code("完成"))
+                            .set(PmFormData::getStatus, StatusEnum.FORM_STATUS.code("完成"))
                             .set(PmFormData::getIs_finish, 1)
                             .set(PmFormData::getActual_qty,pmFormDataList.get(0).getActual_qty().add(groupPlate.getQty()))
                             .set(PmFormData::getUpdate_time,DateUtil.now())