diff --git a/youchain-system/src/main/java/com/youchain/appupdate/service/impl/BydAppServiceImpl.java b/youchain-system/src/main/java/com/youchain/appupdate/service/impl/BydAppServiceImpl.java
index df4ce78..5bf663c 100644
--- a/youchain-system/src/main/java/com/youchain/appupdate/service/impl/BydAppServiceImpl.java
+++ b/youchain-system/src/main/java/com/youchain/appupdate/service/impl/BydAppServiceImpl.java
@@ -370,7 +370,7 @@ public class BydAppServiceImpl implements BydAppService {
 
     public void createAsnDetailsAndItemKeysAndTasks(List<BarCodeVo> barCodeVos, Item item, Stock stock, Point srcPoint, Point endPoint, AgvTask agvTask) {
         for (BarCodeVo barCodeVo : barCodeVos) {
-            AsnDetail asnDetail = asnDetailService.createAsnDetail(item, stock, srcPoint, barCodeVo.getPropC1(), barCodeVo.getBoxNumber(), barCodeVo.getPropC3(), Timestamp.valueOf(DateUtil.formatDateTime(DateUtil.parse(barCodeVo.getPropD1()))), barCodeVo.getOrderQty(), barCodeVo.getMo());
+            AsnDetail asnDetail = asnDetailService.createAsnDetail(item, stock, srcPoint, barCodeVo.getPropC1(), barCodeVo.getBoxNumber(), barCodeVo.getPropC3(), barCodeVo.getPropD1() == null ? null : Timestamp.valueOf(DateUtil.formatDateTime(DateUtil.parse(barCodeVo.getPropD1()))), barCodeVo.getOrderQty(), barCodeVo.getMo());
             ItemKey itemKey = itemKeyService.createItemKey(item, barCodeVo.getPropC1(), asnDetail.getPropD1(), barCodeVo.getBoxNumber());
             Task task = taskService.createTask(item, asnDetail.getOrderQty(), itemKey, asnDetail, BizStatus.ASN, null, null, stock, srcPoint, endPoint, agvTask);
         }
diff --git a/youchain-system/src/main/java/com/youchain/businessdata/service/impl/PickServiceImpl.java b/youchain-system/src/main/java/com/youchain/businessdata/service/impl/PickServiceImpl.java
index c4e2a15..8d0b147 100644
--- a/youchain-system/src/main/java/com/youchain/businessdata/service/impl/PickServiceImpl.java
+++ b/youchain-system/src/main/java/com/youchain/businessdata/service/impl/PickServiceImpl.java
@@ -170,6 +170,8 @@ public class PickServiceImpl implements PickService {
 
     @Override
     public JSONObject returnPickJson(Task task) {
+        Pick pick=task.getPickDetail().getPick();
+        int complete = getCompleteStatus(pick);
         JSONObject jsonObject = new JSONObject(new LinkedHashMap<>());
         //需求工位
         jsonObject.put("OpName", task.getPickDetail().getPick().getStation());
@@ -182,28 +184,20 @@ public class PickServiceImpl implements PickService {
         jsonObject.put("number", task.getMoveQty()== null ? 0 : task.getMoveQty().intValue());
         //taskId
         jsonObject.put("taskId", task.getPickDetail().getPick().getTaskCode());
+        //complete 完成标识；0未完成；1完成
+        jsonObject.put("complete", complete);
         return jsonObject;
     }
 
+    private int getCompleteStatus(Pick pick) {
+        return BizStatus.PICK_ALL.equals(pick.getStatus()) ? 1 : 0;
+    }
+
     @Override
     public void returnPickByTask(Task task) {
         sendPick(UrlApi.stock(), task);
     }
 
-    public void refreshPickReturn(Pick pick) {
-        List<PickDetail> pickDetailList = pickDetailRepository.findByAllPickDetail(pick.getId());
-        List<PickDetail> filteredList = pickDetailList.stream()
-                .filter(detail -> detail.getSourceId() == null || detail.getSourceId() == 0)
-                .collect(Collectors.toList());
-        if (filteredList.isEmpty()) {
-            pick.setSourceId(1L);
-            pickRepository.save(pick);
-            return;
-        }
-        pick.setSourceId(0L);
-        pickRepository.save(pick);
-    }
-
     @Override
     public void sendPick(String url, Task task) {
         String message = null;