1.散料量测功能提交

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

@@ -20,6 +20,7 @@ import com.neotel.smfcore.core.storage.enums.DeviceType;
 import com.neotel.smfcore.core.storage.service.po.Storage;
 import com.neotel.smfcore.core.storage.service.po.Storage;
 import com.neotel.smfcore.core.storage.service.po.StoragePos;
 import com.neotel.smfcore.core.storage.service.po.StoragePos;
 import com.neotel.smfcore.core.system.bean.OrderSetting;
 import com.neotel.smfcore.core.system.bean.OrderSetting;
+import com.neotel.smfcore.core.system.service.manager.IDataLogManager;
 import com.neotel.smfcore.core.system.service.po.DataLog;
 import com.neotel.smfcore.core.system.service.po.DataLog;
 import com.neotel.smfcore.core.system.util.DevicesStatusUtil;
 import com.neotel.smfcore.core.system.util.DevicesStatusUtil;
 import com.neotel.smfcore.core.system.util.TaskService;
 import com.neotel.smfcore.core.system.util.TaskService;
@@ -65,6 +66,9 @@ public class NLShelfHandler extends BaseDeviceHandler {
     @Autowired
     @Autowired
     private LizhenApi lizhenApi;
     private LizhenApi lizhenApi;
 
 
+    @Autowired
+    private IDataLogManager dataLogManager;
+
     String putInColor = "green";
     String putInColor = "green";
     int delayCloseTime = 30000;
     int delayCloseTime = 30000;
 
 
@@ -449,6 +453,15 @@ public class NLShelfHandler extends BaseDeviceHandler {
                     if (!check) {
                     if (!check) {
                         return ResultBean.newErrorResult(-1, "", barcode.getBarcode() + "散料未量测");
                         return ResultBean.newErrorResult(-1, "", barcode.getBarcode() + "散料未量测");
                     }
                     }
+                } else {
+                    //判断有没有任务
+                   DataLog dataLog =   dataLogManager.findLastTask(barcode.getBarcode());
+                   if (dataLog != null && dataLog.isCheckOutTask() && dataLog.isFinished()){
+                       boolean check = lizhenApi.checkReelMeasure(barcode);
+                       if (!check) {
+                           return ResultBean.newErrorResult(-1, "", barcode.getBarcode() + "散料未量测");
+                       }
+                   }
                 }
                 }
             }
             }
         }
         }

src/main/java/com/neotel/smfcore/core/device/rest/DeviceController.java

@@ -22,6 +22,7 @@ import com.neotel.smfcore.core.message.util.DeviceMessageUtil;
 import com.neotel.smfcore.core.storage.service.manager.IStoragePosManager;
 import com.neotel.smfcore.core.storage.service.manager.IStoragePosManager;
 import com.neotel.smfcore.core.storage.service.po.StoragePos;
 import com.neotel.smfcore.core.storage.service.po.StoragePos;
 import com.neotel.smfcore.core.system.service.dao.IAlarmInfoDao;
 import com.neotel.smfcore.core.system.service.dao.IAlarmInfoDao;
+import com.neotel.smfcore.core.system.service.manager.IDataLogManager;
 import com.neotel.smfcore.core.system.service.po.AlarmInfo;
 import com.neotel.smfcore.core.system.service.po.AlarmInfo;
 import com.neotel.smfcore.core.system.service.po.DataLog;
 import com.neotel.smfcore.core.system.service.po.DataLog;
 import com.neotel.smfcore.core.system.util.DevicesStatusUtil;
 import com.neotel.smfcore.core.system.util.DevicesStatusUtil;
@@ -89,6 +90,9 @@ public class DeviceController {
     @Autowired
     @Autowired
     private WareHouseCodeManager wareHouseCodeManager;
     private WareHouseCodeManager wareHouseCodeManager;
 
 
+    @Autowired
+    private IDataLogManager dataLogManager;
+
     private Map<String, IDeviceHandler> handlerMap = new HashMap<>();
     private Map<String, IDeviceHandler> handlerMap = new HashMap<>();
 
 
     public DeviceController(List<IDeviceHandler> deviceHandlerList) {
     public DeviceController(List<IDeviceHandler> deviceHandlerList) {
@@ -269,6 +273,15 @@ public class DeviceController {
                                 if (!check) {
                                 if (!check) {
                                     throw new ValidateException("", barcode.getBarcode() + "散料未量测");
                                     throw new ValidateException("", barcode.getBarcode() + "散料未量测");
                                 }
                                 }
+                            } else {
+                                //判断有没有任务
+                                DataLog dataLog =   dataLogManager.findLastTask(barcode.getBarcode());
+                                if (dataLog != null && dataLog.isCheckOutTask() && dataLog.isFinished()){
+                                    boolean check = lizhenApi.checkReelMeasure(barcode);
+                                    if (!check) {
+                                        throw new ValidateException("", barcode.getBarcode() + "散料未量测");
+                                    }
+                                }
                             }
                             }
                         }
                         }
                     }
                     }

src/main/java/com/neotel/smfcore/core/system/service/manager/IDataLogManager.java

@@ -26,4 +26,6 @@ public interface IDataLogManager extends IBaseManager<DataLog> {
     DataLog findOne(Query with);
     DataLog findOne(Query with);
 
 
     List<DataLog> getNotBoxInOutDataList(Date dayStartDate, Date dayEndDate, String pn);
     List<DataLog> getNotBoxInOutDataList(Date dayStartDate, Date dayEndDate, String pn);
+
+    DataLog findLastTask(String barcode);
 }
 }

src/main/java/com/neotel/smfcore/core/system/service/manager/impl/DataLogManagerImpl.java

@@ -160,4 +160,13 @@ public class DataLogManagerImpl implements IDataLogManager {
         query.fields().include("barcode", "operator","type","partNumber","subSourceId");
         query.fields().include("barcode", "operator","type","partNumber","subSourceId");
         return dataLogDao.findByQuery(query);
         return dataLogDao.findByQuery(query);
     }
     }
+
+    @Override
+    public DataLog findLastTask(String barcode) {
+        Query query = new Query();
+        Criteria criteria = Criteria.where("barcode").is(barcode);
+        query.addCriteria(criteria);
+        query.with(Sort.by(Sort.Direction.DESC,"createDate"));
+        return dataLogDao.findOne(query);
+    }
 }
 }