已在库位中的料自动出库时标记NG.

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

@@ -796,10 +796,19 @@ public class TaskService {
         }
         }
 
 
         if (pos != null) {
         if (pos != null) {
-            //如果已在库位中,那么自动将该库位的物料出库
-            log.info("出库已在库位中的物料[" + barcodeSave.getBarcode() + "]");
+
+            //判斷配置
+            Integer barcodeSet=dataCache.getCache(Constants.CACHE_SAME_BARCODE_SETTINGS);
             Storage storage = dataCache.getStorageById(pos.getStorageId());
             Storage storage = dataCache.getStorageById(pos.getStorageId());
-            checkout(storage, pos, true, "");
+            if(barcodeSet==null||barcodeSet==1) {
+                //如果已在库位中,那么自动将该库位的物料出库
+                log.info("CACHE_SAME_BARCODE_SETTINGS=1，自动出库已在库位中的物料[" + barcodeSave.getBarcode() + "],设置ngReel=true");
+                checkout(storage, pos, true, true, "", "");
+            }else{
+                log.info("CACHE_SAME_BARCODE_SETTINGS=2，标记库位["+pos.getPosName()+"]中的物料[" + barcodeSave.getBarcode() + "]为ngReel=NG");
+                pos.getBarcode().updateAppendData("ngReel",true);
+                storagePosManager.save(pos);
+            }
 
 
             throw new ValidateException("smfcore.error.barcode.exist", "[{0}}]已在{1}}[{2}}]中", new String[]{barcodeSave.getBarcode(), storage.getName(), pos.getPosName()});
             throw new ValidateException("smfcore.error.barcode.exist", "[{0}}]已在{1}}[{2}}]中", new String[]{barcodeSave.getBarcode(), storage.getName(), pos.getPosName()});
         }
         }