条码显示创建时间。准备更新暂停出入库。

src/main/java/com/neotel/smfcore/core/barcode/rest/bean/dto/BarcodeDto.java

@@ -233,4 +233,9 @@ public class BarcodeDto implements Serializable {
         DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:SS");
         DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:SS");
         return   dateFormat.format( new Date(putInTime));
         return   dateFormat.format( new Date(putInTime));
     }
     }
+
+    @ApiModelProperty("创建时间")
+    private Date createDate ;
+    @ApiModelProperty("更新时间")
+    private Date updateDate;
 }
 }

src/main/java/com/neotel/smfcore/core/system/util/TaskService.java

@@ -5,6 +5,7 @@ import com.google.common.base.Strings;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.google.common.collect.Maps;
 import com.neotel.smfcore.common.exception.ValidateException;
 import com.neotel.smfcore.common.exception.ValidateException;
+import com.neotel.smfcore.common.utils.Constants;
 import com.neotel.smfcore.common.utils.ReelLockPosUtil;
 import com.neotel.smfcore.common.utils.ReelLockPosUtil;
 import com.neotel.smfcore.common.utils.SecurityUtils;
 import com.neotel.smfcore.common.utils.SecurityUtils;
 import com.neotel.smfcore.common.utils.StorageConstants;
 import com.neotel.smfcore.common.utils.StorageConstants;
@@ -392,7 +393,10 @@ public class TaskService {
      */
      */
     public StatusBean checkOut(Storage storage, StatusBean statusBean) {
     public StatusBean checkOut(Storage storage, StatusBean statusBean) {
         try {
         try {
-
+            //准备更新暂停出入库
+            if (dataCache.getCache(Constants.CACHE_StopOut)) {
+                return statusBean;
+            }
             String cid = storage.getCid();
             String cid = storage.getCid();
             //有入库任务的料仓不分配出库任务
             //有入库任务的料仓不分配出库任务
             if (!hasExecutingTask(cid, OP.PUT_IN)) {
             if (!hasExecutingTask(cid, OP.PUT_IN)) {