过期物料不能入

myproject/src/main/java/com/myproject/webapp/controller/storage/NLPShelfController.java

@@ -114,28 +114,18 @@ public class NLPShelfController extends BaseController {
                         return getText("shelf.msg.noTask",new String[]{inPos.getPosName()},request.getLocale(),"操作失败,已在库位["+inPos.getPosName()+"]中,未找到对应的出库任务");
                     }
 
-                    log.info("开始保存任务:"+barcode.getBarcode());
-                    putIn(StorageDataController.getLoginUsername(),storage.getId(),barcode);
-                    return "操作成功,请放入料架";
-
-//                    List<Storage> storageList = Lists.newArrayList(storage);
-//                    StoragePos pos = taskService.findEmptyPosForPutIn(storageList, barcode);
-//                    int delayCloseTime = 30000;
-//                    String color = "green";
-//                    if(pos != null){
-//                        log.info(barcode.getPartNumber()+" [ "+barcode.getBarcode()+" ] " + "入库到:" + storage.getName()+"["+cid+"] " + pos.getPosName());
-//                        taskService.addTaskToFinished(pos,barcode,null);
-//                        openAndCloseLights(storage,pos.getPosName(),delayCloseTime,color);
-//                        pos.setCanCheckOutTime(System.currentTimeMillis() + delayCloseTime);
-//                        return "OK"+getText("shelf.msg.inOk",new String[]{pos.getPosName()},request.getLocale(),"操作成功,请放入库位["+pos.getPosName()+"]");
-//                    }else{
-//                        //库位没找到
-//                        String sizeInfo = barcode.getPlateSize()+" x "+ barcode.getHeight();
-//                        String msg = "未找到适合["+sizeInfo +"]的库位";
-//                        log.info(msg);
-//                        msg = getText("shelf.msg.inError",new String[]{sizeInfo},request.getLocale(),msg);
-//                        return msg;
-//                    }
+                    List<Storage> storageList = Lists.newArrayList(storage);
+                    StoragePos pos = taskService.findEmptyPosForPutIn(storageList, barcode);
+                    if(pos != null){
+                        putIn(StorageDataController.getLoginUsername(),storage.getId(),barcode);
+                        return "操作成功,请放入料架";
+                    }else{
+                        //库位没找到
+                        String msg = "未找到适合的库位";
+                        log.info(msg);
+                        msg = getText("shelf.msg.inError",new String[]{},request.getLocale(),msg);
+                        return msg;
+                    }
                 } catch (Exception e) {
                     log.error("Error:"+e.getMessage());
                     return getText(e.getMessage(), null,request.getLocale(),e.getMessage());