From 4b65097515cdd1cf633b92698ecad43de37ee7d9 Mon Sep 17 00:00:00 2001
From: mengjiao <3338049200@qq,com>
Date: Thu, 11 Jan 2024 14:59:38 +0800
Subject: [PATCH] =?UTF-8?q?wms=E4=BF=AE=E6=94=B918.4-=E6=8A=A5=E5=B7=A5?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E7=9A=84sap=E6=94=B6=E8=B4=A7=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/op/wms/service/impl/WmsProductPutServiceImpl.java   | 6 ++++--
 .../src/main/resources/mapper/wms/WmsProductPutMapper.xml   | 2 +-
 2 files changed, 5 insertions(+), 3 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 94e0d59d..38165841 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
@@ -445,7 +445,8 @@ public class WmsProductPutServiceImpl implements IWmsProductPutService {
 				map.put("LGORT",mesReportWork.getWhCode());
 				map.put("QUANTITY",mesReportWork.getQuantityQualified());
 				map.put("ERFME",mesReportWork.getUnit());
-				map.put("BATCH",mesReportWork.getBatch());
+				String	batch=	mesReportWork.getBatch().substring(13);
+				map.put("BATCH",batch);
 				String	formattedsDate = mesReportWork.getProductDate().replace("-", "");
 				map.put("HSDAT",formattedsDate);
 				mapList.add(map);
@@ -479,7 +480,8 @@ public class WmsProductPutServiceImpl implements IWmsProductPutService {
 				map.put("LGORT",mesReportWork.getWhCode());
 				map.put("QUANTITY",mesReportWork.getQuantityQualified());
 				map.put("ERFME",mesReportWork.getUnit());
-				map.put("BATCH",mesReportWork.getBatch());
+			String	batch=	mesReportWork.getBatch().substring(13);
+				map.put("BATCH",batch);
 			String	formattedsDate = mesReportWork.getProductDate().replace("-", "");
 				map.put("HSDAT",formattedsDate);
 				mapList.add(map);
diff --git a/op-modules/op-wms/src/main/resources/mapper/wms/WmsProductPutMapper.xml b/op-modules/op-wms/src/main/resources/mapper/wms/WmsProductPutMapper.xml
index f73be403..9425abe6 100644
--- a/op-modules/op-wms/src/main/resources/mapper/wms/WmsProductPutMapper.xml
+++ b/op-modules/op-wms/src/main/resources/mapper/wms/WmsProductPutMapper.xml
@@ -303,7 +303,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			mes_report_work.create_time createTime,
 			mes_report_work.product_code productCode,
 			mes_report_work.product_name productName,
-			pro_order_workorder.product_date productDate ,
+			CONVERT(date, GETDATE()) AS productDate,
 			wms_product_put.SAP_status	SAPstatus,
 			wms_product_put.SAP_message	SAPmessage
 		FROM