diff --git a/src/main/java/com/gaotao/modules/api/entity/PushPalletDetailDto.java b/src/main/java/com/gaotao/modules/api/entity/PushPalletDetailDto.java
index 6ee1932..264f477 100644
--- a/src/main/java/com/gaotao/modules/api/entity/PushPalletDetailDto.java
+++ b/src/main/java/com/gaotao/modules/api/entity/PushPalletDetailDto.java
@@ -16,7 +16,7 @@ public class PushPalletDetailDto {
     private boolean autoSort;  //自动分拣
     private Integer soreType;//分拣方式  0人工  1气胀轴  2抱箱
     private String assemblyPosition;//托盘码
-    private String endFlag;
+    private boolean endFlag;
     private List<PalletStationVo> cargoInfos;//明细数据
     private PartTypeEnum partType;
     public String getSite() {
@@ -115,11 +115,11 @@ public class PushPalletDetailDto {
         this.partType = partType;
     }
 
-    public String getEndFlag() {
+    public boolean isEndFlag() {
         return endFlag;
     }
 
-    public void setEndFlag(String endFlag) {
+    public void setEndFlag(boolean endFlag) {
         this.endFlag = endFlag;
     }
 }
diff --git a/src/main/java/com/gaotao/modules/api/service/impl/WmsMessageServiceImpl.java b/src/main/java/com/gaotao/modules/api/service/impl/WmsMessageServiceImpl.java
index 7be8c02..3f8bbdb 100644
--- a/src/main/java/com/gaotao/modules/api/service/impl/WmsMessageServiceImpl.java
+++ b/src/main/java/com/gaotao/modules/api/service/impl/WmsMessageServiceImpl.java
@@ -137,6 +137,9 @@ public class WmsMessageServiceImpl implements WmsMessageService {
                     throw new RuntimeException("入库操作时目标货架不能为空");
                 }
                 AgvStation station= wcsIntegrationMapper.getStationDataByCode(stationCode);
+                if(station==null){
+                    throw new RuntimeException("入参站点ToBarcode不存在");
+                }
                 toWarehouseId = station.getWarehouseCode();
                 toLocationId = station.getLocationCode();
                 
diff --git a/src/main/java/com/gaotao/modules/automatedWarehouse/service/impl/WcsIntegrationServiceImpl.java b/src/main/java/com/gaotao/modules/automatedWarehouse/service/impl/WcsIntegrationServiceImpl.java
index 7e7fe42..38de33f 100644
--- a/src/main/java/com/gaotao/modules/automatedWarehouse/service/impl/WcsIntegrationServiceImpl.java
+++ b/src/main/java/com/gaotao/modules/automatedWarehouse/service/impl/WcsIntegrationServiceImpl.java
@@ -990,6 +990,7 @@ public class WcsIntegrationServiceImpl implements WcsIntegrationService {
             //如果是分次组托 说明在分拣 需要查下是否有相关订单
 
         }
+        Boolean boFlag="Y".equals(endFlag);
         //有常用料就有这个标记
         boolean hasCommonlyUsed = newDetail.stream()
                 .anyMatch(pallet -> "Y".equals(pallet.getIsCommonlyUsed()));
@@ -1013,7 +1014,7 @@ public class WcsIntegrationServiceImpl implements WcsIntegrationService {
         inData.setAutoSort(isAutoSort);
         inData.setSoreType(soreType);
         inData.setAssemblyPosition(locationCode);
-        inData.setEndFlag(endFlag);
+        inData.setEndFlag(boFlag);
         //明细根据点位拆分
         Map<String, List<PalletDetailData>> groupedHUs = newDetail.stream()
                 .collect(Collectors.groupingBy(hu ->