出库时,添加验证库位是否已在出库列表中

解析条码后, 若标签中的数量与之前的数量不一致, 更新数量

myproject/src/main/java/com/myproject/webapp/controller/webService/DataCache.java

@@ -258,17 +258,17 @@ public class DataCache{
                         }
                     }
                 }
-                Component component = componentManager.findByPartNumber(barcode.getPartNumber());
-                int validDay = 0;
-                if(component != null){
-                    validDay = component.getValidDay();
-                    codeBeanFromRule.setShowImg(component.getShowImg());
-                }
 
                 Barcode barcodeFromRule = codeBeanFromRule.getBarcode();
                 if(barcodeFromRule != null){
                     Date produceDate = barcodeFromRule.getProduceDate();
                     if(produceDate != null){
+                        Component component = componentManager.findByPartNumber(barcode.getPartNumber());
+                        int validDay = 0;
+                        if(component != null){
+                            validDay = component.getValidDay();
+                            codeBeanFromRule.setShowImg(component.getShowImg());
+                        }
                         //抓取到了生产日期,未抓取到过期日期,重新设置过期日期
                         if(barcode.getExpireDate() == null){
                             if(validDay > 0){
@@ -284,6 +284,16 @@ public class DataCache{
                             }
                         }
                     }
+                    int qtyFromLabel = barcodeFromRule.getAmount();
+                    if(qtyFromLabel>1 && barcode.getAmount() != qtyFromLabel){
+                        try {
+                            log.warn("重新设置"+codeBeanFromRule.getCodeStr()+"数量["+barcode.getAmount()+"]为"+ qtyFromLabel);
+                            barcode.setAmount(qtyFromLabel);
+                            barcodeManager.save(barcode);
+                        }catch (Exception e){
+
+                        }
+                    }
                 }
 
                 codeBeanFromRule.setError(null);

myproject/src/main/java/com/myproject/webapp/controller/webService/StorageDataController.java

@@ -282,6 +282,23 @@ public class StorageDataController extends BaseController {
                 return msg;
             }else{
                 log.info("出库位置仓位【"+pos.getPosName()+"】");
+
+                List<DataLog> allTasks = taskService.getWaitingTasks();
+                List<DataLog> executingTasks = taskService.getExecutingTasks();
+                List<DataLog> finishedTasks = taskService.getFinishedTasks();
+                allTasks.addAll(executingTasks);
+                allTasks.addAll(finishedTasks);
+
+                for(DataLog task : allTasks){
+                    if(task.getPosId() != null && task.isCheckOutTask()){
+                        if(task.getPosId().equals(pos.getId())){
+                            String defaultMsg = "库位【"+pos.getPosName()+"已在出库列表中,忽略】";
+                            log.info(defaultMsg);
+                            return "1" + super.getText("error.pos.inQueue",new String[]{pos.getPosName()},request.getLocale());
+                        }
+                    }
+                }
+
                 String outResult = taskService.checkout(pos,subSourceId, isSingleOut);
                 if(!Strings.isNullOrEmpty(outResult)){
                     return "1"+outResult;