From 8fa1a90af51a0690c9c1fdf2a9acc4176c994660 Mon Sep 17 00:00:00 2001
From: mengjiao <3338049200@qq,com>
Date: Thu, 17 Oct 2024 09:58:34 +0800
Subject: [PATCH] =?UTF-8?q?wmsSap=E6=94=B6=E8=B4=A7=E8=BF=87=E8=B4=A6?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=E7=94=9F=E4=BA=A7=E6=97=B6=E9=97=B4=E7=9A=84?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/WmsProductPutServiceImpl.java        | 37 +++++++++++++------
 1 file changed, 26 insertions(+), 11 deletions(-)

diff --git a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsProductPutServiceImpl.java b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsProductPutServiceImpl.java
index 215bb8dc..c832ab72 100644
--- a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsProductPutServiceImpl.java
+++ b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsProductPutServiceImpl.java
@@ -517,15 +517,15 @@ public class WmsProductPutServiceImpl implements IWmsProductPutService {
                 map.put("QUANTITY", mesReportWork.getQuantityQualified());
                 map.put("ERFME", mesReportWork.getUnit());
                 map.put("BATCH", mesReportWork.getBatchSK());
-//                if (mesReportWork.getBatch().length()>12){
-//                    //String batch = mesReportWork.getBatch().substring(12);
-//                    String batch  = InterceptionRules(mesReportWork.getBatch());
-//
-//                }else {
-//                    map.put("BATCH", mesReportWork.getBatch());
-//                }
-                String formattedsDate = mesReportWork.getProductDate().replace("-", "");
-                map.put("HSDAT", formattedsDate);
+                if (mesReportWork.getBatch().length()>12&&mesReportWork.getBatch().length()<30){
+                    //String batch = mesReportWork.getBatch().substring(12);
+                    String HSDAT  = InterceptionSJRules(mesReportWork.getBatch());
+                    map.put("HSDAT", HSDAT);
+                }else {
+                    String formattedsDate = mesReportWork.getProductDate().replace("-", "");
+                    map.put("HSDAT", formattedsDate);
+                }
+
                 mapList.add(map);
             }
             //过账
@@ -565,8 +565,14 @@ public class WmsProductPutServiceImpl implements IWmsProductPutService {
 //                }else {
 //                    map.put("BATCH", mesReportWork.getBatch());
 //                }
-                String formattedsDate = mesReportWork.getProductDate().replace("-", "");
-                map.put("HSDAT", formattedsDate);
+                if (mesReportWork.getBatch().length()>12&&mesReportWork.getBatch().length()<30){
+                    //String batch = mesReportWork.getBatch().substring(12);
+                    String HSDAT  = InterceptionSJRules(mesReportWork.getBatch());
+                    map.put("HSDAT", HSDAT);
+                }else {
+                    String formattedsDate = mesReportWork.getProductDate().replace("-", "");
+                    map.put("HSDAT", formattedsDate);
+                }
                 mapList.add(map);
             }
             //过账
@@ -1485,6 +1491,15 @@ public class WmsProductPutServiceImpl implements IWmsProductPutService {
 
     //去除空格，截取规则，例子：20270106LJ20240107CBCD0J——》240107CBCD
     public  String InterceptionRules(String batchString){
+        boolean containsSpace = batchString.contains(" ");
+        if (containsSpace) {//去除空格
+            batchString = batchString.replace(" ", "");
+        }
+        batchString =batchString.substring(12,22);
+        return  batchString;
+    }
+    //去除空格，截取规则，例子：20270106LJ20240107CBCD0J——》240107CBCD
+    public  String InterceptionSJRules(String batchString){
         boolean containsSpace = batchString.contains(" ");
         if (containsSpace) {//去除空格
             batchString = batchString.replace(" ", "");