diff --git a/ERP接口文档.docx b/ERP接口文档.docx
new file mode 100644
index 0000000..2390efb
diff --git a/ICSSoft.WMS.WebAPI/ICSSoft.Common/TransTypeEnum.cs b/ICSSoft.WMS.WebAPI/ICSSoft.Common/TransTypeEnum.cs
index 3e517fe..7d63ac5 100644
--- a/ICSSoft.WMS.WebAPI/ICSSoft.Common/TransTypeEnum.cs
+++ b/ICSSoft.WMS.WebAPI/ICSSoft.Common/TransTypeEnum.cs
@@ -176,6 +176,10 @@ namespace ICSSoft.Common
         [DBValue("32")]
         LOTSplitAfter,
 
+        [Description("合并")]
+        [DBValue("68")]
+        LOTMerge,
+
         [Description("合并前")]
         [DBValue("33")]
         LOTMergeBefore,
diff --git a/ICSSoft.WMS.WebAPI/ICSSoft.DataProject/ICSSubmitService.cs b/ICSSoft.WMS.WebAPI/ICSSoft.DataProject/ICSSubmitService.cs
index 5c5e40d..a896ab8 100644
--- a/ICSSoft.WMS.WebAPI/ICSSoft.DataProject/ICSSubmitService.cs
+++ b/ICSSoft.WMS.WebAPI/ICSSoft.DataProject/ICSSubmitService.cs
@@ -1048,7 +1048,7 @@ namespace ICSSoft.DataProject
                         #endregion
                     }
                     //分批
-                    else if (TransType == TransTypeEnum.LOTSplit.GetDescription())
+                    else if (TransType == TransTypeEnum.LOTSplit.GetDescription()|| TransType == TransTypeEnum.LOTMerge.GetDescription())
                     {
                         sql = @"IF NOT EXISTS(SELECT a.ID FROM ICSWareHouseLotInfo a WHERE a.LotNo='{2}' AND a.WorkPoint='{3}' AND a.Quantity>0)
                                     BEGIN
diff --git a/ICSSoft.WMS.WebAPI/ICSSoft.DataProject/ICSWareHouseLotInfoService.cs b/ICSSoft.WMS.WebAPI/ICSSoft.DataProject/ICSWareHouseLotInfoService.cs
index aafd859..92a504c 100644
--- a/ICSSoft.WMS.WebAPI/ICSSoft.DataProject/ICSWareHouseLotInfoService.cs
+++ b/ICSSoft.WMS.WebAPI/ICSSoft.DataProject/ICSWareHouseLotInfoService.cs
@@ -534,7 +534,7 @@ namespace ICSSoft.DataProject
                 ///更新目标条码库存
                 string sql = @"IF NOT EXISTS(SELECT a.LotNo FROM ICSInventoryLot a 
 							    INNER JOIN ICSInventoryLot b ON b.LotNo='{3}' AND a.InvCode=b.InvCode AND a.WorkPoint=b.WorkPoint
-							    WHERE a.LotNo='{0}' AND a.WorkPoint='6000')
+							    WHERE a.LotNo='{0}' AND a.WorkPoint='{1}')
                             BEGIN
 	                            RAISERROR('" + language.GetNameByCode("WMSAPIInfo170") + @"',16,1);
                                 RETURN
diff --git a/WMS接口文档.docx b/WMS接口文档.docx
new file mode 100644
index 0000000..42c2a0d