wms成品sap收获按钮中过账时批次的截取规则部分修改

op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsProductPutServiceImpl.java

@@ -487,7 +487,8 @@ public class WmsProductPutServiceImpl implements IWmsProductPutService {
                 map.put("QUANTITY", mesReportWork.getQuantityQualified());
                 map.put("ERFME", mesReportWork.getUnit());
                 if (mesReportWork.getBatch().length()>12){
-                    String batch = mesReportWork.getBatch().substring(12);
+                    //String batch = mesReportWork.getBatch().substring(12);
+                    String batch  = InterceptionRules(mesReportWork.getBatch());
                     map.put("BATCH", batch);
                 }else {
                     map.put("BATCH", mesReportWork.getBatch());
@@ -526,7 +527,7 @@ public class WmsProductPutServiceImpl implements IWmsProductPutService {
                 map.put("QUANTITY", mesReportWork.getQuantityQualified());
                 map.put("ERFME", mesReportWork.getUnit());
                 if (mesReportWork.getBatch().length()>12){
-                    String batch = mesReportWork.getBatch().substring(12);
+                    String batch  = InterceptionRules(mesReportWork.getBatch());
                     map.put("BATCH", batch);
                 }else {
                     map.put("BATCH", mesReportWork.getBatch());
@@ -583,6 +584,10 @@ public class WmsProductPutServiceImpl implements IWmsProductPutService {
 
 
 
+
+
+
+
     @Override
     public ProOrderWorkorder selectWmsOdsWhiteEmbryoInhAnd(WmsOdsWhiteEmbryoIn wmsOdsWhiteEmbryoIns) {
         //pro order workorder
@@ -1133,4 +1138,16 @@ public class WmsProductPutServiceImpl implements IWmsProductPutService {
     public List<WmsRuturnPutEmbryo> selectWmsRuturnPutEmbryoList(WmsRuturnPutEmbryo wmsRuturnPutEmbryo) {
         return wmsRuturnPutEmbryoMapper.selectWmsRuturnPutEmbryoList(wmsRuturnPutEmbryo);
     }
+
+
+
+    //去除空格，截取规则，例子：20270106LJ20240107CBCD0J——》240107CBCD
+    public  String InterceptionRules(String batchString){
+        boolean containsSpace = batchString.contains(" ");
+        if (containsSpace) {//去除空格
+            batchString = batchString.replace(" ", "");
+        }
+        batchString =batchString.substring(12,22);
+        return  batchString;
+    }
 }