成品发运修改

be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.MesAgent/Incoming/MesIncomingBackgroundWorker.cs

@@ -45,20 +45,20 @@ public class MesIncomingBackgroundWorker : AsyncPeriodicBackgroundWorkerBase
             return;
         }
 
-        Logger.LogInformation($"Read MesOut");//缴库
+        //Logger.LogInformation($"Read MesOut");//缴库
-        var mesOutReader = workerContext.ServiceProvider.GetRequiredService<MesOutReader>();
+        //var mesOutReader = workerContext.ServiceProvider.GetRequiredService<MesOutReader>();
-        var mesOutConverter = workerContext.ServiceProvider.GetRequiredService<MesOutConverter>();
+        //var mesOutConverter = workerContext.ServiceProvider.GetRequiredService<MesOutConverter>();
-        var TransferNoteConverter = workerContext.ServiceProvider.GetRequiredService<QtyrfeConverter>();
+        //var TransferNoteConverter = workerContext.ServiceProvider.GetRequiredService<QtyrfeConverter>();
-        //读取mes缴库
+        ////读取mes缴库
-        var mesOutsFromExternalList = await mesOutReader.ReadAsync().ConfigureAwait(false);
+        //var mesOutsFromExternalList = await mesOutReader.ReadAsync().ConfigureAwait(false);
-        var mesOutsFromExternalList_ProductReceipt = mesOutsFromExternalList.Where(r => r.DataType == EnumIncomingDataType.ProductReceipt.ToString()).ToList();
+        //var mesOutsFromExternalList_ProductReceipt = mesOutsFromExternalList.Where(r => r.DataType == EnumIncomingDataType.ProductReceipt.ToString()).ToList();
-        var mesOutsFromExternalList_TransferNote = mesOutsFromExternalList.Where(r => r.DataType == EnumIncomingDataType.TransferNote.ToString()).ToList();
+        //var mesOutsFromExternalList_TransferNote = mesOutsFromExternalList.Where(r => r.DataType == EnumIncomingDataType.TransferNote.ToString()).ToList();
-        //转换缴库数据（如果有质量补得数据直接生产移库数据移到客户库位）
+        ////转换缴库数据（如果有质量补得数据直接生产移库数据移到客户库位）
-        await mesOutConverter.ConvertAsync(mesOutsFromExternalList_ProductReceipt).ConfigureAwait(false);
+        //await mesOutConverter.ConvertAsync(mesOutsFromExternalList_ProductReceipt).ConfigureAwait(false);
-        if (mesOutsFromExternalList_TransferNote.Count > 0)//如果有质量补则生产储位调拨任务
+        //if (mesOutsFromExternalList_TransferNote.Count > 0)//如果有质量补则生产储位调拨任务
-        {
+        //{
-            await TransferNoteConverter.ConvertAsync(mesOutsFromExternalList_TransferNote).ConfigureAwait(false);
+        //    await TransferNoteConverter.ConvertAsync(mesOutsFromExternalList_TransferNote).ConfigureAwait(false);
-        }
+        //}
 
 
         //上海和安徽无此接口
@@ -69,14 +69,14 @@ public class MesIncomingBackgroundWorker : AsyncPeriodicBackgroundWorkerBase
         //var pullTaskFromExternalList = await pullTaskReader.ReadAsync().ConfigureAwait(false);
         ////转换PullTask
         //await pullTaskConverter.ConvertAsync(pullTaskFromExternalList).ConfigureAwait(false);
-        Logger.LogInformation($"Read Scrap");//报废
+        //Logger.LogInformation($"Read Scrap");//报废
 
-        var scrapReader = workerContext.ServiceProvider.GetRequiredService<ScrapReader>();
+        //var scrapReader = workerContext.ServiceProvider.GetRequiredService<ScrapReader>();
-        var scrapConverter = workerContext.ServiceProvider.GetRequiredService<ScrapConverter>();
+        //var scrapConverter = workerContext.ServiceProvider.GetRequiredService<ScrapConverter>();
-        //读取并保存Scrap
+        ////读取并保存Scrap
-        var scrapsFromExternalList = await scrapReader.ReadAsync().ConfigureAwait(false);
+        //var scrapsFromExternalList = await scrapReader.ReadAsync().ConfigureAwait(false);
-        //转换Scrap
+        ////转换Scrap
-        await scrapConverter.ConvertAsync(scrapsFromExternalList).ConfigureAwait(false);
+        //await scrapConverter.ConvertAsync(scrapsFromExternalList).ConfigureAwait(false);
 
         //上海和安徽无此接口
         //Logger.LogInformation($"Read Issue");
@@ -87,30 +87,30 @@ public class MesIncomingBackgroundWorker : AsyncPeriodicBackgroundWorkerBase
         ////转换Pck
         //await pckConverter.ConvertAsync(pcksFromExternalList).ConfigureAwait(false);
 
-        Logger.LogInformation($"Read BackFlush");//耗用单
+        //Logger.LogInformation($"Read BackFlush");//耗用单
-        var BackFlushReader = workerContext.ServiceProvider.GetRequiredService<BackFluReader>();
+        //var BackFlushReader = workerContext.ServiceProvider.GetRequiredService<BackFluReader>();
-        var BackFlushConverter = workerContext.ServiceProvider.GetRequiredService<BackFluConverter>();
+        //var BackFlushConverter = workerContext.ServiceProvider.GetRequiredService<BackFluConverter>();
-        //读取并保存BackFlush
+        ////读取并保存BackFlush
-        var backFlushsFromExternalList = await BackFlushReader.ReadAsync().ConfigureAwait(false);
+        //var backFlushsFromExternalList = await BackFlushReader.ReadAsync().ConfigureAwait(false);
-        //转换BackFlush
+        ////转换BackFlush
-        await BackFlushConverter.ConvertAsync(backFlushsFromExternalList).ConfigureAwait(false);
+        //await BackFlushConverter.ConvertAsync(backFlushsFromExternalList).ConfigureAwait(false);
-
+
-
+
-        Logger.LogInformation($"Read TransferNote");//储位调拨
+        //Logger.LogInformation($"Read TransferNote");//储位调拨
-        var TransferNoteReader = workerContext.ServiceProvider.GetRequiredService<QtyrfeReader>();
+        //var TransferNoteReader = workerContext.ServiceProvider.GetRequiredService<QtyrfeReader>();
-        // var TransferNoteConverter = workerContext.ServiceProvider.GetRequiredService<QtyrfeConverter>();
+        //// var TransferNoteConverter = workerContext.ServiceProvider.GetRequiredService<QtyrfeConverter>();
-        //读取并保存TransferNote
+        ////读取并保存TransferNote
-        var transferNoteFromExternalList = await TransferNoteReader.ReadAsync().ConfigureAwait(false);
+        //var transferNoteFromExternalList = await TransferNoteReader.ReadAsync().ConfigureAwait(false);
-        //转换TransferNote
+        ////转换TransferNote
-        await TransferNoteConverter.ConvertAsync(transferNoteFromExternalList).ConfigureAwait(false);
+        //await TransferNoteConverter.ConvertAsync(transferNoteFromExternalList).ConfigureAwait(false);
-
+
-        Logger.LogInformation($"Read Frozen");//冻结解冻
+        //Logger.LogInformation($"Read Frozen");//冻结解冻
-        var FrozenReader = workerContext.ServiceProvider.GetRequiredService<FrozenReader>();
+        //var FrozenReader = workerContext.ServiceProvider.GetRequiredService<FrozenReader>();
-        var FrozenConverter = workerContext.ServiceProvider.GetRequiredService<FrozenConverter>();
+        //var FrozenConverter = workerContext.ServiceProvider.GetRequiredService<FrozenConverter>();
-        //读取并保存Frozen
+        ////读取并保存Frozen
-        var mesNoteFromExternalList = await FrozenReader.ReadAsync().ConfigureAwait(false);
+        //var mesNoteFromExternalList = await FrozenReader.ReadAsync().ConfigureAwait(false);
-        //转换Frozen
+        ////转换Frozen
-        await FrozenConverter.ConvertAsync(mesNoteFromExternalList).ConfigureAwait(false);
+        //await FrozenConverter.ConvertAsync(mesNoteFromExternalList).ConfigureAwait(false);
 
 
         Logger.LogInformation($"Read Delivery");//成品发运

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/DeliverRequests/DeliverRequestFisAppService.cs

@@ -163,7 +163,13 @@ public class DeliverRequestFisAppService :
     #endregion
 
     #endregion
-
+    /// <summary>
+    /// 获取看板件待审核状态的数据
+    /// </summary>
+    /// <param name="sfsRequestInput"></param>
+    /// <param name="includeDetails"></param>
+    /// <param name="cancellationToken"></param>
+    /// <returns></returns>
     [HttpPost("list")]
     public override Task<PagedResultDto<DeliverRequestDTO>> GetPagedListByFilterAsync(
         SfsStoreRequestInputBase sfsRequestInput,
@@ -172,7 +178,8 @@ public class DeliverRequestFisAppService :
     {
         sfsRequestInput.Condition.Filters.Add(
             new Filter(nameof(DeliverRequest.DeliverRequestType), "Normal"));
-
+        sfsRequestInput.Condition.Filters.Add(
+           new Filter(nameof(DeliverRequest.RequestStatus), "Reviewing"));
         return base.GetPagedListByFilterAsync(sfsRequestInput, includeDetails, cancellationToken);
     }
 

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/DeliverRequests/DeliverRequestManager.cs

@@ -83,6 +83,8 @@ public class DeliverRequestManager : SfsStoreRequestManagerBase<DeliverRequest,
     {
         foreach (var entity in entitys)
         {
+            entity.DirectCreateNote = true;
+            entity.Agree();
             entity.Handle();
             await AddOrUpdateAsync(entity).ConfigureAwait(false);
         }