Merge remote-tracking branch 'origin/master'

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

@@ -298,7 +298,7 @@ public class WmsProductPutServiceImpl implements IWmsProductPutService {
                         map.put("BATCH", wmsProductPut3.getAttr4());
                         map.put("STCK_TYPE", wmsProductPut1.getAttr3());
 
-                        if (wmsProductPut3.getBatchNumber().length()==24){
+                        if (wmsProductPut3.getBatchNumber().trim().length()==24){
 
                             String HSDAT  = InterceptionSJRules(wmsProductPut3.getBatchNumber());
                             map.put("HSDAT", HSDAT);
@@ -516,8 +516,8 @@ public class WmsProductPutServiceImpl implements IWmsProductPutService {
                 map.put("ERFME", mesReportWork.getUnit());
                 map.put("BATCH", mesReportWork.getBatchSK());
                 map.put("STCK_TYPE", selectedType);
-                if (mesReportWork.getBatch().length()==24){
-                    //String batch = mesReportWork.getBatch().substring(12);
+                if (mesReportWork.getBatch().trim().length()==24){
+
                     String HSDAT  = InterceptionSJRules(mesReportWork.getBatch());
                     map.put("HSDAT", HSDAT);
                 }else {
@@ -559,7 +559,7 @@ public class WmsProductPutServiceImpl implements IWmsProductPutService {
                 map.put("ERFME", mesReportWork.getUnit());
                 map.put("BATCH", mesReportWork.getBatchSK());
                 map.put("STCK_TYPE", selectedType);
-                if (mesReportWork.getBatch().length()==24){
+                if (mesReportWork.getBatch().trim().length()==24){
                     //String batch = mesReportWork.getBatch().substring(12);
                     String HSDAT  = InterceptionSJRules(mesReportWork.getBatch());
                     map.put("HSDAT", HSDAT);
@@ -1172,7 +1172,7 @@ public class WmsProductPutServiceImpl implements IWmsProductPutService {
            wmsProductPutk.setStatus("2");//
            wmsProductPutk.setSapStatus("0");
            wmsProductPutk.setAttr3(formattedDate);//
-           if (wmsProductPutk.getBatchNumber().length()==24){
+           if (wmsProductPutk.getBatchNumber().trim().length()==24){
                //String batch = mesReportWork.getBatch().substring(12);
                String batch  = InterceptionRules(wmsProductPutk.getBatchNumber());
                wmsProductPutk.setAttr4(batch);