Merge branch 'master' of http://119.3.29.177:3000/Luy/NWeiWMS

ICSSoft.WMS.WebAPI/ICSSoft.DataProject/ICSSubmitService.cs

@@ -7614,7 +7614,7 @@ WHERE WorkPoint='{0}' AND Quantity>ISNULL(TransferQuantity, 0) order by Transfer
         }
         #endregion
 
-        #region 叉车搬运结束后回调（入库）
+        #region 叉车搬运结束后回调（入库:PTWY上架 出库：PICK出库）
         public static ForkLiftResult ForkLiftTaskEndIn(ForkLiftCallBackModel JsonData, string Jsonstr)
         {
             var language = LanguageHelper.GetName("WMSAPIInfo");
@@ -7653,7 +7653,7 @@ WHERE WorkPoint='{0}' AND Quantity>ISNULL(TransferQuantity, 0) order by Transfer
                     }
                     else
                     {
-                        ICSWareHouseLotInfoService.ActionForkLiftTaskEnd(JsonData.TaskID, cmd, language);
+                        ICSWareHouseLotInfoService.ActionForkLiftTaskEnd(JsonData.TaskID, JsonData.TaskType, JsonData.DestBin, cmd, language);
                     }
                     res.Ret = 1;
                     res.RetMsg = "success";// "接口调用成功！";

ICSSoft.WMS.WebAPI/ICSSoft.DataProject/ICSWareHouseLotInfoService.cs

@@ -3489,10 +3489,14 @@ namespace ICSSoft.DataProject
         /// <param name="TaskID"></param>
         /// <param name="cmd"></param>
         /// <param name="language"></param>
-        public static void ActionForkLiftTaskEnd(string TaskID, SqlCommand cmd, Dictionary<string, string> language)
+        public static void ActionForkLiftTaskEnd(string TaskID, string TaskType, string DestBin, SqlCommand cmd, Dictionary<string, string> language)
         {
             try
             {
+                if (TaskType == "PTWY上架")
+                {
+                    #region 入库
+
                     #region 获取任务ID相关的料架条码及目标库位信息
                     string ContainerCode = "";
                     string StartLocation = "";
@@ -3712,6 +3716,23 @@ namespace ICSSoft.DataProject
                         }
                     }
                     #endregion
+
+                    #endregion
+                }
+                else if (TaskType == "PICK出库")
+                {
+                    #region 出库(仅记录叉车搬运到的出库点位，用于后面的回库)
+
+                    string sql = @" Update ICSForkLiftTaskLog SET EndLocation='{0}'
+                                    where ReqCode='{1}'";
+                    sql = string.Format(sql, DestBin, TaskID);
+                    if (!DBHelper.ExecuteNonQuery(sql, cmd))
+                    {
+                        //throw new Exception("任务编码:" + TaskCode + ",日志记录失败");//料架状态更新失败
+                    }
+
+                    #endregion
+                }
             }
             catch (Exception ex)
             {

ICSSoft.WMS.WebAPI/ICSSoft.WMS.WebAPI/Controllers/WMSBarCoreController.cs

@@ -2834,7 +2834,7 @@ namespace ICSSoft.WebAPI.Controllers
         }
         #endregion
 
-        #region 提供给叉车调用的回写接口，用于叉车完成搬运任务后回传任务编号，WMS入库并过账SAP（入库）
+        #region 提供给叉车调用的回写接口，用于叉车完成搬运任务后回传任务编号，WMS入库并过账SAP（入库:PTWY上架 出库：PICK出库）
         /// <summary>
         /// 提供给AGV调用的回写接口
         /// </summary>