工单出库bug修改。hella工单号改为使用eventId。

src/main/java/com/neotel/smfcore/core/device/handler/impl/NLShelfHandler.java

@@ -65,7 +65,8 @@ public class NLShelfHandler extends BaseDeviceHandler {
         if(operateBean != null){
         if(operateBean != null){
             StoragePos posToClose = operateBean.getPosToClose();
             StoragePos posToClose = operateBean.getPosToClose();
             if(posToClose != null){
             if(posToClose != null){
-                log.info(sessionId + "关闭上一个操作库位:"+ posToClose.getPosName());
+                String psession=sessionId.substring(sessionId.length()-10);
+                log.info(  psession+ "关闭上一个操作库位:"+ posToClose.getPosName());
                 operateBean.setPosToClose(null);
                 operateBean.setPosToClose(null);
                 shelfPutInBeanMap.put(sessionId, operateBean);
                 shelfPutInBeanMap.put(sessionId, operateBean);
                 opPosLight("close", posToClose, "");
                 opPosLight("close", posToClose, "");
@@ -196,8 +197,15 @@ public class NLShelfHandler extends BaseDeviceHandler {
         String putInColor = "green";
         String putInColor = "green";
 
 
         StoragePos pos = storagePosManager.getByPosName(code);
         StoragePos pos = storagePosManager.getByPosName(code);
+        if(pos==null){
+            //库位的条码有可能是前面带了SOxxx-,所以这里去除SO-再查一遍库位,保持与之前的兼容
+            int index=code.indexOf("-");
+            if(index>=0){
+                String posNameStr=code.substring(index+1);
+                pos=storagePosManager.getByPosName(posNameStr);
+            }
+        }
         if (pos != null) {
         if (pos != null) {
-
              //判断库位是否是对应设备或者租
              //判断库位是否是对应设备或者租
             if (currentStorage != null) {
             if (currentStorage != null) {
                 if ( !  pos.getStorageId().equals(storageId)) {
                 if ( !  pos.getStorageId().equals(storageId)) {

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

@@ -182,9 +182,13 @@ public class LiteOrderCache implements ITaskListener {
         liteOrder.setTaskReelCount(taskReelCount);
         liteOrder.setTaskReelCount(taskReelCount);
         liteOrder.setTotalTaskReelCount(liteOrder.getTotalTaskReelCount()+taskReelCount);
         liteOrder.setTotalTaskReelCount(liteOrder.getTotalTaskReelCount()+taskReelCount);
         log.info("工单[" + liteOrder.getOrderNo() + "]任务分配结束,任务数[" + taskReelCount + "]");
         log.info("工单[" + liteOrder.getOrderNo() + "]任务分配结束,任务数[" + taskReelCount + "]");
-        //有需要出库的
+
         if (taskReelCount <= 0) {
         if (taskReelCount <= 0) {
+            //没有任务，直接结束
             liteOrder.finishedTasks();
             liteOrder.finishedTasks();
+        }else{
+            //有需要出库的 ,更新状态
+            liteOrder.setStatus(LITEORDER_STATUS.TAILS);
         }
         }
         liteOrder = liteOrderManager.save(liteOrder);
         liteOrder = liteOrderManager.save(liteOrder);
         liteOrderMap.put(liteOrder.getOrderNo(),liteOrder);
         liteOrderMap.put(liteOrder.getOrderNo(),liteOrder);
@@ -320,6 +324,12 @@ public class LiteOrderCache implements ITaskListener {
             return "smfcore.order.out.maxOrder";
             return "smfcore.order.out.maxOrder";
         }
         }
 
 
+        //先查找是否已经锁定过库位，如果已经锁定过，出锁定的库位
+        List<StoragePos> lockPosList = storagePosManager.findLockPos(cacheOrder.getOrderNo());
+        if(lockPosList!=null&& lockPosList.size()>0){
+            return  checkOutOrder(cacheOrder).getMsgKey();
+        }
+
         log.info("开始执行工单[" + orderNo + "] outBom=" + outBom);
         log.info("开始执行工单[" + orderNo + "] outBom=" + outBom);
         cacheOrder.setTaskReelCount(0);
         cacheOrder.setTaskReelCount(0);
         cacheOrder.setTaskFinishedTime(-1);
         cacheOrder.setTaskFinishedTime(-1);

src/main/java/com/neotel/smfcore/hella/handler/HellaServiceHandler.java

@@ -405,6 +405,7 @@ public class HellaServiceHandler extends IoHandlerAdapter implements ITaskListen
         String responseEventId = resposArr[1];
         String responseEventId = resposArr[1];
         String groupName = resposArr[2];
         String groupName = resposArr[2];
         String workorderNumber = resposArr[3];
         String workorderNumber = resposArr[3];
+        workorderNumber=responseEventId;
         //currentWorkorderflag 0 for current workorder; 1 for next workorder
         //currentWorkorderflag 0 for current workorder; 1 for next workorder
         String currentWorkorderflag = resposArr[4];
         String currentWorkorderflag = resposArr[4];
         String reflowgroupNumber = resposArr[5];
         String reflowgroupNumber = resposArr[5];

src/main/resources/config/application.yml

@@ -25,7 +25,8 @@ spring:
         database: smf        # 数据库
         database: smf        # 数据库
   messages:
   messages:
     encoding: utf-8
     encoding: utf-8
-
+  main:
+    allow-circular-references: true
 
 
 #密码加密传输，前端公钥加密，后端私钥解密
 #密码加密传输，前端公钥加密，后端私钥解密
 rsa:
 rsa: