diff --git a/ICSSoft.FromERP/ICSSoft.FromERP/ICSSAPDocGet.cs b/ICSSoft.FromERP/ICSSoft.FromERP/ICSSAPDocGet.cs
index 4522f65..77bee11 100644
--- a/ICSSoft.FromERP/ICSSoft.FromERP/ICSSAPDocGet.cs
+++ b/ICSSoft.FromERP/ICSSoft.FromERP/ICSSAPDocGet.cs
@@ -82,6 +82,9 @@ namespace ICSSoft.FromERP
                             SAPGetDocInfoZS.ZWMS_SK_WS_HEADResponse result = new SAPGetDocInfoZS.ZWMS_SK_WS_HEADResponse();
                             client.Timeout = 300000;
                             result = client.CallZWMS_SK_WS_HEAD(DocInfo);
+
+                            log.Info(JsonConvert.SerializeObject(result));
+
                             List<SAPGetDocInfoZS.ZWMS_SK_HEAD> HeadInfoList = new List<SAPGetDocInfoZS.ZWMS_SK_HEAD>();
                             HeadInfoList.AddRange(result.Z_HEAD);
                             List<SAPGetDocInfoZS.ZWEBSERVICE_ITEM> ItemInfoList = new List<SAPGetDocInfoZS.ZWEBSERVICE_ITEM>();
@@ -527,7 +530,7 @@ namespace ICSSoft.FromERP
                                             line.EATTRIBUTE = Info.LEIXING;
                                             line.VenCode = Info.TEST2;//供应商编码
                                             line.VenName = Info.TEST3;//供应商名称
-                                           
+
                                             if (isNew == true)
                                             {
                                                 db.ICSOApply.InsertOnSubmit(line);
@@ -632,7 +635,7 @@ namespace ICSSoft.FromERP
                                                 line.EATTRIBUTE = Info.LEIXING;
                                                 line.VenCode = Info.TEST2;//供应商编码
                                                 line.VenName = Info.TEST3;//供应商名称
-                                               
+
                                                 if (isNew == true)
                                                 {
                                                     db.ICSOApply.InsertOnSubmit(line);
@@ -837,7 +840,7 @@ namespace ICSSoft.FromERP
                                             line.EATTRIBUTE = Info.LEIXING;//单据类型
 
                                             //售后领料 同步 客户名称和分页
-                                            if (Info.LEIXING=="17") 
+                                            if (Info.LEIXING == "17")
                                             {
                                                 line.CustomerName = Info.TEST4;
                                                 line.Pagination = Info.TEST5;
@@ -1140,7 +1143,7 @@ namespace ICSSoft.FromERP
                                     client.Timeout = 300000;
                                     client.CallZWMS_SK_WS_HEAD(DocInfo);
                                     #endregion
-                                    log.Error(ex.ToString());
+                                    log.Error(ex.Message.ToString());
                                 }
                             }
                             #endregion
@@ -1817,7 +1820,7 @@ namespace ICSSoft.FromERP
                                             line.MTIME = DateTime.Now;
                                             line.WorkPoint = Info.WERKS;//站点
                                             line.EATTRIBUTE1 = Item.WERKS_JS;//接收站点
-                                            line.Memo=Item.BEIZHU2;//拣料条码
+                                            line.Memo = Item.BEIZHU2;//拣料条码
 
                                             //单据类型
                                             line.OrderType = Info.LEIXING;
@@ -3130,7 +3133,7 @@ namespace ICSSoft.FromERP
                     }
                     catch (Exception ex)
                     {
-                        log.Error(ex.ToString());
+                        log.Error(ex.Message.ToString());
                     }
                 }
             }
diff --git a/ICSSoft.WMS.WebAPI/ICSSoft.DataProject/ICSSubmitService.cs b/ICSSoft.WMS.WebAPI/ICSSoft.DataProject/ICSSubmitService.cs
index 88a0907..7d8277b 100644
--- a/ICSSoft.WMS.WebAPI/ICSSoft.DataProject/ICSSubmitService.cs
+++ b/ICSSoft.WMS.WebAPI/ICSSoft.DataProject/ICSSubmitService.cs
@@ -1940,7 +1940,7 @@ namespace ICSSoft.DataProject
                                 END 
                                 IF EXISTS(SELECT a.ID FROM ICSWareHouseLotInfo a WHERE a.LotNo= '{2}' AND a.WorkPoint= '{3}')
                                     BEGIN
-
+                                        --生产退料增加卡控，禁止原条码退料 20240315 yangtianm
                                         RAISERROR('" + string.Format(language.GetNameByCode("WMSAPIInfo039"), "{2}") + @"', 16, 1);
                                 RETURN
                             END
diff --git a/ICSSoft.WMS.WebAPI/ICSSoft.DataProject/ICSWareHouseLotInfoService.cs b/ICSSoft.WMS.WebAPI/ICSSoft.DataProject/ICSWareHouseLotInfoService.cs
index 2dd2c36..48be7c9 100644
--- a/ICSSoft.WMS.WebAPI/ICSSoft.DataProject/ICSWareHouseLotInfoService.cs
+++ b/ICSSoft.WMS.WebAPI/ICSSoft.DataProject/ICSWareHouseLotInfoService.cs
@@ -1468,7 +1468,8 @@ namespace ICSSoft.DataProject
                 }
                 ///更新库存
                 sql = @"UPDATE ICSWareHouseLotInfo SET Quantity=ISNULL(Quantity,0)-'{2}',--LocationCode = '{3}',
-		                            WorkPoint ='{4}',MTIME='{5}',InDate='{5}'  WHERE LotNo='{0}' AND WorkPoint='{1}';
+		                            WorkPoint ='{4}'--,MTIME='{5}',InDate='{5}' --分批后的原条码入库时间不变 20240320 yangtianm
+                                WHERE LotNo='{0}' AND WorkPoint='{1}';
                            UPDATE ICSInventoryLot SET WorkPoint='{4}' WHERE LotNo='{0}' AND WorkPoint='{1}';
 
                                IF EXISTS(SELECT a.LotNo FROM ICSWareHouseLotInfo a WHERE a.LotNo='{0}' AND a.WorkPoint='{1}' AND Quantity<0)