diff --git a/zi-wms-pda/src/main/java/com/cim/idm/controller/FGStockInController.java b/zi-wms-pda/src/main/java/com/cim/idm/controller/FGStockInController.java
index e31def9..56bf99e 100644
--- a/zi-wms-pda/src/main/java/com/cim/idm/controller/FGStockInController.java
+++ b/zi-wms-pda/src/main/java/com/cim/idm/controller/FGStockInController.java
@@ -180,7 +180,7 @@ public class FGStockInController {
 	 * @throws Exception 如果处理过程中发生异常
 	 */
 	@RequestMapping(value = "/FGStockIn", method = RequestMethod.POST)
-	public BaseResponse<Object> fgStockIn(@RequestBody JSONObject in)   {
+	public BaseResponse fgStockIn(@RequestBody JSONObject in)   {
 	    // 将输入的JSONObject转换为MaterialReceiveRequest对象
 	    MaterialReceiveRequest sl = JSON.toJavaObject(in, MaterialReceiveRequest.class);
 
diff --git a/zi-wms-pda/src/main/java/com/cim/idm/dao/ToSapDao.java b/zi-wms-pda/src/main/java/com/cim/idm/dao/ToSapDao.java
index 4fe3669..ff1d565 100644
--- a/zi-wms-pda/src/main/java/com/cim/idm/dao/ToSapDao.java
+++ b/zi-wms-pda/src/main/java/com/cim/idm/dao/ToSapDao.java
@@ -17,9 +17,9 @@ public interface ToSapDao {
     public List<ToSAPFgStockInDto> getFgStockInInfo(@Param("boxList") List<MaterialPacking> boxList) throws Exception;
 
     //基于boxList更新物料凭证及库存状态
-    public void updateStockState(@Param("boxList") List<MaterialPacking> boxList,@Param("stockState") String stockState,@Param("undoId") String undoId) throws Exception;
+    public void updateStockState(@Param("boxList") List<MaterialPacking> boxList,@Param("stockState") String stockState,@Param("undoId") String undoId,@Param("user") String user) throws Exception;
     //基于boxList更新物料凭证及库存状态
-    public void updateLocationStockState(@Param("boxList") List<MaterialPacking> boxList,@Param("stockState") String stockState,@Param("undoId") String undoId,@Param("aimErpFactory") String aimErpFactory,@Param("aimErpLocation") String aimErpLocation,@Param("aimLOcationName") String aimLOcationName) throws Exception;
+    public void updateLocationStockState(@Param("boxList") List<MaterialPacking> boxList,@Param("stockState") String stockState,@Param("undoId") String undoId,@Param("aimErpFactory") String aimErpFactory,@Param("aimErpLocation") String aimErpLocation,@Param("aimLOcationName") String aimLOcationName,@Param("user") String user) throws Exception;
 
     //基于boxList写入过账流水表
     public void saveUnDoInfo(@Param("boxList") List<MaterialPacking> boxList, @Param("unDoID") String unDoID, @Param("commitDate") String commitDate) throws Exception;
diff --git a/zi-wms-pda/src/main/java/com/cim/idm/service/Impl/ProductIntoServiceImpl.java b/zi-wms-pda/src/main/java/com/cim/idm/service/Impl/ProductIntoServiceImpl.java
index 8333d7a..5e71fe6 100644
--- a/zi-wms-pda/src/main/java/com/cim/idm/service/Impl/ProductIntoServiceImpl.java
+++ b/zi-wms-pda/src/main/java/com/cim/idm/service/Impl/ProductIntoServiceImpl.java
@@ -327,14 +327,14 @@ public class ProductIntoServiceImpl implements FGStockInService {
 			undoID = toSAPService.NoSourceChangeLocation(arrayList,aimErpFactory,
 					aimErpLocation, aimLOcationName, user );
 			//更新物料凭证和库存状态
-			toSapDao.updateLocationStockState(boxList, "Stocked", undoID,aimErpFactory,aimErpLocation,aimLOcationName);
+			toSapDao.updateLocationStockState(boxList, "Stocked", undoID,aimErpFactory,aimErpLocation,aimLOcationName,user);
 		}else {
 			// 直接入库
 			//封装为Json的字符串
 			String json = JSON.toJSONString(fgStockInInfo);
 			undoID = toSAPService.FGStockInByManulIn(json, user);
 			//更新物料凭证和库存状态
-			toSapDao.updateStockState(boxList, "Stocked", undoID);
+			toSapDao.updateStockState(boxList, "Stocked", undoID, user);
 		}
 
 		//更新过账流水
diff --git a/zi-wms-pda/src/main/resources/com/cim/idm/dao/ToSapDao.xml b/zi-wms-pda/src/main/resources/com/cim/idm/dao/ToSapDao.xml
index e28adf4..86a2af1 100644
--- a/zi-wms-pda/src/main/resources/com/cim/idm/dao/ToSapDao.xml
+++ b/zi-wms-pda/src/main/resources/com/cim/idm/dao/ToSapDao.xml
@@ -37,7 +37,8 @@
     <!-- 更新库存状态 -->
     <update id="updateStockState" parameterType="map">
         UPDATE MATERIALPACKING
-        SET STOCKSTATE = #{stockState},UNDOID = #{undoId}
+        SET STOCKSTATE = #{stockState},UNDOID = #{undoId},LASTEVENTTIME = SYSDATE,
+        LASTEVENTUSER = #{user}
         WHERE MATERIALPACKINGNAME IN
         <foreach item="box" index="index" collection="boxList" open="(" separator="," close=")">
             #{box.materialPackingName}
@@ -46,7 +47,9 @@
     <!-- 更新库存状态 -->
     <update id="updateLocationStockState" parameterType="map">
         UPDATE MATERIALPACKING
-        SET STOCKSTATE = #{stockState},UNDOID = #{undoId}, ERPLOCATION = #{aimErpLocation}, LOCATIONNAME = #{aimLOcationName}, ERPFACTORY = #{aimErpFactory}
+        SET STOCKSTATE = #{stockState},UNDOID = #{undoId}, ERPLOCATION = #{aimErpLocation}, LOCATIONNAME = #{aimLOcationName}, ERPFACTORY = #{aimErpFactory},
+            LASTEVENTTIME = SYSDATE,
+            LASTEVENTUSER = #{user}
         WHERE MATERIALPACKINGNAME IN
         <foreach item="box" index="index" collection="boxList" open="(" separator="," close=")">
             #{box.materialPackingName}