1.异常出库提示语想修改

2.uid出库,有任务的时候 提示红色

src/main/java/com/neotel/smfcore/core/storage/rest/StoragePosController.java

@@ -563,6 +563,7 @@ public class StoragePosController {
         Query query=getPosFindCriteria(criteria);
         Query query=getPosFindCriteria(criteria);
         PageData<StoragePos> pages = storagePosManager.findByPage(query, pageable);
         PageData<StoragePos> pages = storagePosManager.findByPage(query, pageable);
         List<StoragePosDto> StoragePosDtos = storagePosMapper.toDto(pages.getContent());
         List<StoragePosDto> StoragePosDtos = storagePosMapper.toDto(pages.getContent());
+        List<DataLog> allTasks = taskService.getAllTasks();
         for (StoragePosDto storagePosDto : StoragePosDtos) {
         for (StoragePosDto storagePosDto : StoragePosDtos) {
             BarcodeDto barcodeDto = storagePosDto.getBarcode();
             BarcodeDto barcodeDto = storagePosDto.getBarcode();
             if (barcodeDto != null) {
             if (barcodeDto != null) {
@@ -580,6 +581,15 @@ public class StoragePosController {
                     barcodeDto.setReelAmount(0);
                     barcodeDto.setReelAmount(0);
                 }
                 }
             }
             }
+            for (DataLog dataLog : allTasks) {
+                if (storagePosDto.getId().equals(dataLog.getPosId())){
+                    if (!dataLog.isFinished() && !dataLog.isCancel()){
+                        storagePosDto.setHasTask(true);
+                        break;
+                    }
+                }
+            }
+
         }
         }
         return new PageData(StoragePosDtos, pages.getTotalElements());
         return new PageData(StoragePosDtos, pages.getTotalElements());
     }
     }

src/main/java/com/neotel/smfcore/core/storage/rest/dto/StoragePosDto.java

@@ -93,4 +93,6 @@ public class StoragePosDto implements Serializable {
 
 
     @ApiModelProperty("库别")
     @ApiModelProperty("库别")
     private String wareHouseCode;
     private String wareHouseCode;
+
+    private boolean hasTask = false;
 }
 }

src/main/java/com/neotel/smfcore/custom/luxsan/factory_c/rawstor/controller/CDeviceController.java

@@ -1742,10 +1742,10 @@ public class CDeviceController {
                 barcode = clearCurrentBarcodeInfo(barcode);
                 barcode = clearCurrentBarcodeInfo(barcode);
                 barcodeManager.save(barcode);
                 barcodeManager.save(barcode);
                 if (StringUtils.isNotEmpty(errorMsg)) {
                 if (StringUtils.isNotEmpty(errorMsg)) {
-                    return ResultBean.newErrorResult(-1, "", barcode.getBarcode() + "通知WMS报错:" + errorMsg + ",SMF库存已经清空,请手动拿走,重新入库,不要放到料串上");
+                    return ResultBean.newErrorResult(-1, "", barcode.getBarcode() + "通知WMS报错:" + errorMsg + ",SMF库存已经清空,请库存处理后,重新入库,不要放到料串上");
                 }
                 }
                 //返回给客户端信息
                 //返回给客户端信息
-                return ResultBean.newErrorResult(-1, "", barcode.getBarcode() + "不在当前隔口:" + boxPar + "中,SMF库存已经清空,请手动拿走,重新入库,不要放到料串上");
+                return ResultBean.newErrorResult(-1, "", barcode.getBarcode() + "不在当前隔口:" + boxPar + "中,SMF库存已经清空,请库存处理后,重新入库,不要放到料串上");
             } else {
             } else {
                 //如果是相同的隔口,判断是否是当前要出库的物料
                 //如果是相同的隔口,判断是否是当前要出库的物料
                 String currentBoxStr = BoxHandleUtil.getBoxStr(boxPar, true);
                 String currentBoxStr = BoxHandleUtil.getBoxStr(boxPar, true);
@@ -1817,7 +1817,7 @@ public class CDeviceController {
                 barcodeManager.save(barcode);
                 barcodeManager.save(barcode);
 
 
                 if (StringUtils.isNotEmpty(errorMsg)) {
                 if (StringUtils.isNotEmpty(errorMsg)) {
-                    return ResultBean.newErrorResult(-1, "", barcode.getBarcode() + "通知WMS报错:" + errorMsg + ",SMF库存已经清空,请手动拿走,重新入库,不要放到料串上");
+                    return ResultBean.newErrorResult(-1, "", barcode.getBarcode() + "通知WMS报错:" + errorMsg + ",SMF库存已经清空,请库存处理后,重新入库,不要放到料串上");
                 }
                 }
 
 
                 Map<String, String> resultMap = new HashMap<>();
                 Map<String, String> resultMap = new HashMap<>();