原材料仓退料 退料单同步等

ProductionMgr/Tnb.ProductionMgr.Entities/Entity/WmsPrdReturnD.cs

@@ -69,4 +69,18 @@ public partial class WmsPrdReturnD : BaseEntity<string>
     /// </summary>
     public string? unit_id { get; set; }
 
+    /// <summary>
+    /// 子表主键
+    /// </summary>
+    public string erp_line_pk { get; set; }
+
+    /// <summary>
+    /// 行号
+    /// </summary>
+    public string? lineno { get; set; }
+    /// <summary>
+    /// 批号
+    /// </summary>
+    public string? code_batch { get; set; }
+
 }

ProductionMgr/Tnb.ProductionMgr.Entities/Entity/WmsPrdReturnH.cs

@@ -64,4 +64,19 @@ public partial class WmsPrdReturnH : BaseEntity<string>
     /// </summary>
     public string? status { get; set; }
 
+    /// <summary>
+    /// erp转库单号
+    /// </summary>
+    public string? erp_bill_code { get; set; }
+
+    /// <summary>
+    /// 转库类型
+    /// </summary>
+    public string? transfer_type { get; set; }
+
+    /// <summary>
+    /// 主表主键
+    /// </summary>
+    public string erp_pk { get; set; }
+
 }

ProductionMgr/Tnb.ProductionMgr/RedisBackGround.cs

@@ -1964,6 +1964,7 @@ where carry_code = '{coderesult}' and status = '{WmsWareHouseConst.TASK_BILL_STA
                                     {
                                         wmsDistaskHs[0].device_id = e.device_id;
                                     }
+                                    LoggerElevatorTask.Information($"【GenTaskExecute】呼叫电梯");
                                     await _wareHouseService.ExecuteTargetFloorTask(wmsDistaskHs);
                                 }
                             }
@@ -2257,7 +2258,6 @@ where carry_code = '{coderesult}' and status = '{WmsWareHouseConst.TASK_BILL_STA
         /// <param name="args"></param>
         private async void Floor4MJX2MJC(object? args)
         {
-            BasLocation startlocation = await db_Floor4MJX2MJC.Queryable<BasLocation>().Where(r => r.location_code == "MJQ-QU02").FirstAsync();
             if (s_taskFloor4MJX2MJCService.CurrentCount == 0)
                 return;
             await s_taskFloor4MJX2MJCService.WaitAsync();
@@ -2296,7 +2296,7 @@ where carry_code = '{coderesult}' and status = '{WmsWareHouseConst.TASK_BILL_STA
                         var endlocation = items.First();
 
                         await db_Floor4MJX2MJC.Ado.BeginTranAsync();
-                        startlocation = await db_Floor4MJX2MJC.Queryable<BasLocation>().Where(r => r.location_code == key).FirstAsync();
+                        BasLocation startlocation = await db_Floor4MJX2MJC.Queryable<BasLocation>().Where(r => r.location_code == key).FirstAsync();
 
                         if (startlocation.is_lock == 1)
                         {