设置栈板id

src/main/java/com/neotel/smfcore/custom/luxsan/factory_c/wipstor/controller/BoxTransferController.java

@@ -156,21 +156,21 @@ public class BoxTransferController {
                 taskService.updateFinishedTask(task);
                 taskService.updateFinishedTask(task);
             }
             }
             if (OP_STATUS.FINISHED.name().equals(statusStr)) {
             if (OP_STATUS.FINISHED.name().equals(statusStr)) {
-
+                task.setStatus(statusStr);
+                taskService.moveTaskToFinished(task);
+                taskService.updateFinishedTask(task);
                 String targetPos = task.getExtraDataMap("targetPos").toString();
                 String targetPos = task.getExtraDataMap("targetPos").toString();
                 StoragePos pos = storagePosManager.getByPosName(targetPos);
                 StoragePos pos = storagePosManager.getByPosName(targetPos);
-                Storage storage = dataCache.getStorageById(pos.getId());
+                Storage storage = dataCache.getStorageById(pos.getStorageId());
                 Barcode barcode = barcodeManager.findByBarcode(task.getBarcode());
                 Barcode barcode = barcodeManager.findByBarcode(task.getBarcode());
 
 
                 DataLog dataLog = new DataLog(storage, barcode, pos);
                 DataLog dataLog = new DataLog(storage, barcode, pos);
                 dataLog.setType(OP.PUT_IN);
                 dataLog.setType(OP.PUT_IN);
                 dataLog.setStatus(OP_STATUS.FINISHED.name());
                 dataLog.setStatus(OP_STATUS.FINISHED.name());
                 dataLog.setOperator(SecurityUtils.getLoginUsername()+"手动移库位");
                 dataLog.setOperator(SecurityUtils.getLoginUsername()+"手动移库位");
+                dataLog.setCartonId(barcode.getPalletId());
                 dataLogManager.save(dataLog);
                 dataLogManager.save(dataLog);
                 boxInPos(dataLog);
                 boxInPos(dataLog);
-            } else {
-                task.setStatus(statusStr);
-                taskService.updateFinishedTask(task);
             }
             }
         }
         }
         return ResultBean.newOkResult("");
         return ResultBean.newOkResult("");