1695SP移库完成增加日志

src/main/java/com/neotel/smfcore/core/device/rest/SpDeviceController.java

@@ -79,6 +79,12 @@ public class SpDeviceController {
         if (ObjectUtil.isEmpty(cid) || ObjectUtil.isEmpty(posName)) {
         if (ObjectUtil.isEmpty(cid) || ObjectUtil.isEmpty(posName)) {
             return ResultBean.newErrorResult(-1, "smfcore.reelPosMove.paramerror", "参数不完整");
             return ResultBean.newErrorResult(-1, "smfcore.reelPosMove.paramerror", "参数不完整");
         }
         }
+
+        if(posName.equals((targetPosName))){
+            log.info("SPreelPosMove ,cid="+cid+",barcode="+barcode+",posName="+posName+",targetPosName="+targetPosName+"，原库位与目标库位一样，直接返回成功");
+            return ResultBean.newOkResult("OK");
+        }
+
         Storage storage = dataCache.getStorage(cid);
         Storage storage = dataCache.getStorage(cid);
         if (storage == null) {
         if (storage == null) {
             return ResultBean.newErrorResult(-1, "smfcore.valueNotExist", "{0}[{1}]不存在", new String[]{"Storage", cid});
             return ResultBean.newErrorResult(-1, "smfcore.valueNotExist", "{0}[{1}]不存在", new String[]{"Storage", cid});
@@ -105,8 +111,13 @@ public class SpDeviceController {
         }
         }
 
 
         Barcode posBarcode=pos.getBarcode();
         Barcode posBarcode=pos.getBarcode();
-        taskService.addTaskToFinished(pos,pos.getBarcode(),"SpClient");
+        try {
+            taskService.addTaskToFinished(pos, pos.getBarcode(), "SpClient");
+        }catch (Exception ex){
+            log.info("SPreelPosMove ,cid="+cid+",barcode="+barcode+",posName="+posName+",targetPosName="+targetPosName+"，清空原库位异常："+ex.toString());
+        }
         taskService.addTaskToFinished(targetPos,posBarcode,"SpClient");
         taskService.addTaskToFinished(targetPos,posBarcode,"SpClient");
+        log.info("SPreelPosMove ,cid="+cid+",barcode="+barcode+",posName="+posName+",targetPosName="+targetPosName+"成功");
        return ResultBean.newOkResult("OK");
        return ResultBean.newOkResult("OK");
     }
     }
 }
 }

src/main/java/com/neotel/smfcore/custom/sp/SpApi.java

@@ -156,6 +156,10 @@ public class SpApi extends BaseSmfApiListener {
     @Override
     @Override
     public void inTaskStatusChange(String inNotifyUrl, DataLog task){
     public void inTaskStatusChange(String inNotifyUrl, DataLog task){
         if(task.isFinished()){
         if(task.isFinished()){
+            if(ObjectUtil.isNotEmpty(task.getOperator())&&task.getOperator().equals("SpClient")){
+                log.info(task.getBarcode() + "入库完成,posName="+task.getPosName()+"，operator=SpClient,不需要接口通知 " );
+                return;
+            }
             sendInNotify(inNotifyUrl,task);
             sendInNotify(inNotifyUrl,task);
         }
         }
     }
     }
@@ -184,6 +188,11 @@ public class SpApi extends BaseSmfApiListener {
     public void outTaskStatusChange(String outNotifyUrl, DataLog task) {
     public void outTaskStatusChange(String outNotifyUrl, DataLog task) {
 
 
         if (task.isFinished()) {
         if (task.isFinished()) {
+
+            if(ObjectUtil.isNotEmpty(task.getOperator())&&task.getOperator().equals("SpClient")){
+                log.info(task.getBarcode() + "出库完成,posName="+task.getPosName()+"，operator=SpClient,不需要接口通知 " );
+                return;
+            }
             Map<String, Object> paramMap = new HashMap<>();
             Map<String, Object> paramMap = new HashMap<>();
             paramMap.put("reelId", task.getBarcode());
             paramMap.put("reelId", task.getBarcode());
             paramMap.put("partNum", task.getPartNumber());
             paramMap.put("partNum", task.getPartNumber());