Merge remote-tracking branch 'origin/master'

src/main/java/com/neotel/smfcore/core/solder/handler/SpBoxHandler.java

@@ -692,23 +692,27 @@ public class SpBoxHandler extends BaseDeviceHandler {
 //        theFinishedTaskMap.put(task.getId(), task);
     }
     private void changeSolderStatus(String posName, SOLDER_STATUS solderStatus) throws ValidateException {
-        StoragePos storagePos = storagePosManager.getByPosName(posName);
-        if (storagePos == null) {
-            log.error("更改状态为[" + solderStatus + "]时,未找到库位[" + posName + "]");
-            return;
-        }
-        Barcode barcode = storagePos.getBarcode();
-        if (barcode != null) {
-            if(!solderStatus.name().equals(barcode.getSolderStatus())){
-                log.error(barcode.getBarcode()+"的状态状态从[" + barcode.getSolderStatus() + "]更改为[" + solderStatus + "]");
-                barcode.setSolderStatus(solderStatus.toString());
-                barcode = barcodeManager.save(barcode);
-
-                storagePos.setBarcode(barcode);
-                storagePosManager.save(storagePos);
-            }else{
-                log.error(barcode.getBarcode()+"的状态状态["+barcode.getSolderStatus()+"]与原来一致,无需更改");
+        try {
+            StoragePos storagePos = storagePosManager.getByPosName(posName);
+            if (storagePos == null) {
+                log.error("更改状态为[" + solderStatus + "]时,未找到库位[" + posName + "]");
+                return;
             }
+            Barcode barcode = storagePos.getBarcode();
+            if (barcode != null) {
+                if (!solderStatus.name().equals(barcode.getSolderStatus())) {
+                    log.error(barcode.getBarcode() + "的状态状态从[" + barcode.getSolderStatus() + "]更改为[" + solderStatus + "]");
+                    barcode.setSolderStatus(solderStatus.toString());
+                    barcode = barcodeManager.save(barcode);
+
+                    storagePos.setBarcode(barcode);
+                    storagePosManager.save(storagePos);
+                } else {
+                    log.error(barcode.getBarcode() + "的状态状态[" + barcode.getSolderStatus() + "]与原来一致,无需更改");
+                }
+            }
+        } catch (Exception ex) {
+            log.error("changeSolderStatus posName=" + posName + ",solderStatus=" + solderStatus + " error :" + ex.toString());
         }
 
     }
@@ -716,11 +720,12 @@ public class SpBoxHandler extends BaseDeviceHandler {
         if (mixTask != null) {
             log.info(mixTask.getBarcode() + "搅拌完成,送回原库位["+mixTask.getPosName()+"],更改状态为待出库");
 
+            changeSolderStatus(mixTask.getPosName(), SOLDER_STATUS.TO_BE_OUT);
+            //先更改状态再结束任务
             taskService.removeQueueTask(mixTask);
             mixTask.setStatus(OP_STATUS.FINISHED.name());
             taskService.updateFinishedTask(mixTask);
 
-            changeSolderStatus(mixTask.getPosName(), SOLDER_STATUS.TO_BE_OUT);
         } else {
             log.error("搅拌完成时,未找到任务");
         }