Merge branch 'master' of https://gitee.com/ericxinstar/jywcs

src/Khd.Core.Domain/Models/WmsRawInstock.cs

@@ -153,6 +153,12 @@ namespace Khd.Core.Domain.Models
         /// </summary>
         [Column("end_time")]
         public DateTime? endTime { get; set; }
+
+        /// <summary>
+        /// 请求返回标识(1是)，execute_status改为2时此return_flag改为null
+        /// </summary>
+        [Column("return_flag")]
+        public string? returnFlag { get; set; }
     }
 }
 

src/Khd.Core.Wcs/Wcs/FiveFloorAGV.cs

@@ -694,6 +694,7 @@ namespace Khd.Core.Wcs.Wcs
                                                 endTime = DateTime.Now,
                                                 locationCode = wmsBaseLocation.locationCode,
                                                 executeStatus = "2",
+                                                returnFlag = null,
                                                 instockAmount = 1,
                                                 instockType = "2",
                                                 materialBatchCode = mesBaseBarcodeInfo.barcodeInfo,