盘点问题修改。

src/main/java/com/neotel/smfcore/common/init/MenuInit.java

@@ -202,7 +202,7 @@ public class MenuInit {
         addDefaultFunctionMenu(111, pMenuUser,"用户管理", "peoples", "system/user/index", "peoples",DEFAULT_SHOW_MENU);
         addDefaultFunctionMenu(112, pMenuUser,"角色管理", "role", "system/role/index", "role",DEFAULT_SHOW_MENU);
         //条形码:条码管理,条码设置
-        Menu selfAudit = Menu.CreatePMenu("盘点管理", 12, "selfAuditManagerment", "selfAuditM",null);
+        Menu selfAudit = Menu.CreatePMenu("盘点管理", 12, "selfAuditManagerment", "selfAudit",null);
         addDefaultFunctionMenu(121,selfAudit, "盘点", "selfAudit", "system/selfAudit/index","selfAudit");
         addDefaultFunctionMenu(122, selfAudit, "盘点记录","selfAuditLog", "system/selfAuditLog/index", "selfAuditLog");
 

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

@@ -28,6 +28,10 @@ import com.neotel.smfcore.core.msd.bean.MSDSettiings;
 import com.neotel.smfcore.core.order.LiteOrderCache;
 import com.neotel.smfcore.core.order.service.po.LiteOrder;
 import com.neotel.smfcore.core.order.service.po.LiteOrderItem;
+import com.neotel.smfcore.core.selfAudit.enums.SELFAUDIT_STATUS;
+import com.neotel.smfcore.core.selfAudit.service.manager.ISelfAuditManager;
+import com.neotel.smfcore.core.selfAudit.service.po.SelfAudit;
+import com.neotel.smfcore.core.selfAudit.util.SelfAuditUtil;
 import com.neotel.smfcore.core.storage.enums.DeviceType;
 import com.neotel.smfcore.core.device.bean.StatusBean;
 import com.neotel.smfcore.core.storage.service.manager.IStoragePosManager;
@@ -96,6 +100,8 @@ public class BaseDeviceHandler implements IDeviceHandler {
 
     @Autowired
     protected IComponentManager componentManager;
+    @Autowired
+    private ISelfAuditManager selfAuditManager;
 
     /**
      * CID的服务器消息(key 为 cid)
@@ -174,7 +180,24 @@ public class BaseDeviceHandler implements IDeviceHandler {
         try {
             String batchNo = dataCache.getCache(Constants.CACHE_SELFAUDIT_BATCHNO);
             if (ObjectUtil.isNotEmpty(batchNo)) {
-                statusBean.addData("selfAudit", batchNo);
+                //盘点是否暂停
+                SelfAudit selfAudit = SelfAuditUtil.getSelfAudit(batchNo);
+                if (selfAudit == null) {
+                    selfAudit = selfAuditManager.findByBatchNo(batchNo);
+                    if(selfAudit!=null){
+                        SelfAuditUtil.updateShelfAudit(selfAudit);
+                    }
+                }
+
+                if (selfAudit != null) {
+                    Storage storage = dataCache.getStorage(statusBean.getCid());
+                    if (storage != null && selfAudit.getStorageIds().contains(storage.getId())){
+                        if (selfAudit.getStatus().equals(SELFAUDIT_STATUS.NEW.name()) || selfAudit.getStatus().equals(SELFAUDIT_STATUS.EXECUTING.name())) {
+                            statusBean.addData("selfAudit", batchNo);
+                        }
+
+                    }
+                }
             }
         } catch (Exception ex) {
             log.error("handleSelfAudit error:" + ex.getMessage());

src/main/java/com/neotel/smfcore/core/selfAudit/rest/SelfAuditController.java

@@ -115,7 +115,7 @@ public class SelfAuditController {
                     storageIdList.add(id);
                     for (StoragePos pos :posList
                     ) {
-                        SelfAuditItem item = SelfAuditItem.newItem(no,storage.getCid(), pos);
+                        SelfAuditItem item = SelfAuditItem.newItem( storage.getCid(),no, pos);
                         items.add(item);
                     }
                 }

src/main/java/com/neotel/smfcore/core/selfAudit/rest/SelfAuditDeviceController.java

@@ -216,6 +216,13 @@ public class SelfAuditDeviceController {
         }
         if (findOk) {
             selfAudit.setItems(newItems);
+            selfAudit.setEndItemNum(selfAudit.getEndItemNum()+1);
+            if(selfAudit.getEndItemNum()>=selfAudit.getTotalItemNum()){
+                selfAudit.setStatus(SELFAUDIT_STATUS.FINISHED.name());
+                log.info(" 盘点[" + selfAudit.getBatchNo() + "] 已完成库位数[" + selfAudit.getEndItemNum() + "]总库位数[" + selfAudit.getTotalItemNum() + "]，更改盘点状态为已完成");
+            }
+
+            selfAuditManager.save(selfAudit);
             SelfAuditUtil.updateShelfAudit(selfAudit);
             return ResultBean.newOkResult("ok");
         }

src/main/java/com/neotel/smfcore/core/selfAudit/service/manager/impl/SelfAuditItemManager.java

@@ -5,6 +5,7 @@ import com.neotel.smfcore.common.exception.ValidateException;
 import com.neotel.smfcore.core.selfAudit.service.dao.ISelfAuditItemDao;
 import com.neotel.smfcore.core.selfAudit.service.manager.ISelfAuditItemManager;
 import com.neotel.smfcore.core.selfAudit.service.po.SelfAuditItem;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.stereotype.Service;
@@ -14,6 +15,7 @@ import java.util.List;
 @Service
 public class SelfAuditItemManager implements ISelfAuditItemManager {
 
+    @Autowired
     private ISelfAuditItemDao selfAuditItemDao;
 
     @Override