取消任务时清除锁定位置

src/main/java/com/neotel/smfcore/core/barcode/utils/CodeResolve.java

 package com.neotel.smfcore.core.barcode.utils;
 package com.neotel.smfcore.core.barcode.utils;
 
 
+import cn.hutool.core.util.ObjectUtil;
 import com.google.common.base.Strings;
 import com.google.common.base.Strings;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Lists;
 import com.neotel.smfcore.common.exception.ValidateException;
 import com.neotel.smfcore.common.exception.ValidateException;
@@ -306,7 +307,9 @@ public class CodeResolve {
                         try{
                         try{
 
 
                             String mixSpeed=component.getAppendData("mixingSpeed");
                             String mixSpeed=component.getAppendData("mixingSpeed");
+                            if(ObjectUtil.isNotEmpty(mixSpeed)){
                                 barcode.updateAppendData("mixingSpeed",mixSpeed);
                                 barcode.updateAppendData("mixingSpeed",mixSpeed);
+                            }
                         }catch (Exception ex) {
                         }catch (Exception ex) {
                             log.error("设置mixingSpeed出错", ex);
                             log.error("设置mixingSpeed出错", ex);
                         }
                         }

src/main/java/com/neotel/smfcore/core/order/LiteOrderCache.java

@@ -332,11 +332,16 @@ public class LiteOrderCache {
                     liteOrderManager.save(order);
                     liteOrderManager.save(order);
                     liteOrderMap.put(orderNo, order);
                     liteOrderMap.put(orderNo, order);
                 } else {
                 } else {
+
+                    //取消任务料架位置锁定
+                    TaskShelfUtil.cancelReelTask(task);
+                    if(!orderNo.equalsIgnoreCase("PN")){
                         log.error("完成任务时,未找到工单[" + orderNo + "]信息");
                         log.error("完成任务时,未找到工单[" + orderNo + "]信息");
                     }
                     }
                 }
                 }
             }
             }
         }
         }
+    }
 
 
     private LiteOrder checkoutAgain(DataLog task,LiteOrder order) {
     private LiteOrder checkoutAgain(DataLog task,LiteOrder order) {
         try{
         try{

src/main/java/com/neotel/smfcore/core/shelf/rest/TaskShelfController.java

@@ -120,7 +120,7 @@ public class TaskShelfController {
 
 
         } catch (Exception e) {
         } catch (Exception e) {
             log.error("getLocation 出错 rfid=" + rfid + "; ;codeStr=" + codeStr, e);
             log.error("getLocation 出错 rfid=" + rfid + "; ;codeStr=" + codeStr, e);
-            return ResultBean.newErrorResult(305, "", "出错："+e.toString());
+            return ResultBean.newErrorResult(305, "", "出错："+e.toString(),resultMap);
         }
         }
         //返回数据：//Response:{"code":0,"msg":"ok","data":{"w":"7","realRfid":"","h":"8","rfid":"1-2F","usedRfidList":"F102","rfidLoc":"11","barcode":"985022*35030377*0822*3000*08220350"}}
         //返回数据：//Response:{"code":0,"msg":"ok","data":{"w":"7","realRfid":"","h":"8","rfid":"1-2F","usedRfidList":"F102","rfidLoc":"11","barcode":"985022*35030377*0822*3000*08220350"}}
 
 

src/main/java/com/neotel/smfcore/core/shelf/util/TaskShelfUtil.java

@@ -100,9 +100,11 @@ public class TaskShelfUtil {
             if (shelfMap != null) {
             if (shelfMap != null) {
                 for (ShelfInfo shelf :
                 for (ShelfInfo shelf :
                         shelfMap.values()) {
                         shelfMap.values()) {
+                    if(ObjectUtil.isNotEmpty(shelf.getRealRfid())){
                         updateShelfLoc(shelf.getRealRfid(),"");
                         updateShelfLoc(shelf.getRealRfid(),"");
                         log.info("清理[" + orderNo + "]使用过的料架["+shelf.getRealRfid()+"] 成功");
                         log.info("清理[" + orderNo + "]使用过的料架["+shelf.getRealRfid()+"] 成功");
                     }
                     }
+                }
                 taskShelfMap.remove(orderNo);
                 taskShelfMap.remove(orderNo);
                 saveShelfMap(taskShelfMap,true);
                 saveShelfMap(taskShelfMap,true);
                 return true;
                 return true;

修改记录.txt

@@ -30,3 +30,34 @@
 
 
 20220318：
 20220318：
 安全库存和 呆滞物料功能
 安全库存和 呆滞物料功能
+
+
+
+20230620 格力
+
+POST
+/rest/api/agv/getShelfTargetLoc
+agv获取指定料架的目标位置，参数：rfid 料架号
+返回 code=0时获取成功，data为目标位置
+
+
+POST
+/rest/api/agv/shelfArriveLine
+料架到达产线位置后通知服务器
+参数：rfid 料架号，loc 到达位置
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+