手动出入库逻辑

src/main/java/com/neotel/smfcore/core/barcode/bean/BarcodeRule.java

@@ -907,8 +907,9 @@ public class BarcodeRule {
 
 
 
 
 
 
-        //codeStr = "B0700001A";
-        //rule = "RI[0:8:1]PN[0:3:6]";
+        codeStr = "B0700001A";
+        codeStr = "CS0413A-1";
+        rule = "RI[-1:6:1]PN[0:2:5]";
 
 
         //codeStr = "=7x8=131S00650-017131|20240422-0831|20000|L130171311724000EK|TAIYO|";
         //codeStr = "=7x8=131S00650-017131|20240422-0831|20000|L130171311724000EK|TAIYO|";
         //rule = "PN[-1:50:-1]PROVIDERNUMBER[-1:50:-1]|BATCH[-1:50:-1]DATECODE[-1:50:-1]|QTY|RI|SP|6";
         //rule = "PN[-1:50:-1]PROVIDERNUMBER[-1:50:-1]|BATCH[-1:50:-1]DATECODE[-1:50:-1]|QTY|RI|SP|6";

src/main/java/com/neotel/smfcore/core/barcode/service/manager/IBarcodeManager.java

@@ -31,5 +31,5 @@ public interface IBarcodeManager extends IBaseManager<Barcode> {
 
 
     int countByQuery(Query query);
     int countByQuery(Query query);
 
 
-    boolean partNumberIsAlreadyInThisOrNever(String bin, String partNumber);
+    String getPNCurrGeKou(  String partNumber);
 }
 }

src/main/java/com/neotel/smfcore/core/barcode/service/manager/impl/BarcodeManagerImpl.java

@@ -23,7 +23,6 @@ import org.springframework.stereotype.Service;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.io.IOException;
 import java.util.*;
 import java.util.*;
-import java.util.function.Function;
 import java.util.regex.Pattern;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 import java.util.stream.Collectors;
 
 
@@ -215,17 +214,18 @@ public class BarcodeManagerImpl implements IBarcodeManager {
     }
     }
 
 
     @Override
     @Override
-    public boolean partNumberIsAlreadyInThisOrNever(String bin, String partNumber) {
+    public String getPNCurrGeKou(  String partNumber) {
         Query query = new Query(Criteria.where("subCodeList.partNumber").is(partNumber));
         Query query = new Query(Criteria.where("subCodeList.partNumber").is(partNumber));
         List<String> barcodes = new ArrayList<>();
         List<String> barcodes = new ArrayList<>();
         for (Barcode barcode : (List<Barcode>) barcodeDao.findByQuery(query)) {
         for (Barcode barcode : (List<Barcode>) barcodeDao.findByQuery(query)) {
             barcodes.addAll(barcode.getSubCodeList().stream()
             barcodes.addAll(barcode.getSubCodeList().stream()
+                    .filter(b -> b.getPartNumber().equals(partNumber))
                     .map(Barcode::getBarcode).collect(Collectors.toList()));
                     .map(Barcode::getBarcode).collect(Collectors.toList()));
         }
         }
         for (String barcode : barcodes) {
         for (String barcode : barcodes) {
-            return barcode.equals(bin);
+           return barcode;
         }
         }
-        return true;
+        return "";
     }
     }
 
 
     protected boolean validateComponent(Barcode barcode) {
     protected boolean validateComponent(Barcode barcode) {

src/main/java/com/neotel/smfcore/core/storage/service/po/StoragePos.java

@@ -149,7 +149,9 @@ public class StoragePos extends BasePo implements Serializable {
      */
      */
     private String source;
     private String source;
 
 
-
+    /**
+     * 库别
+     */
     private String wareHouseCode;
     private String wareHouseCode;
 
 
     public String getLabelStr(){
     public String getLabelStr(){