接口修改

be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/ItemTransformNoteConverter.cs

@@ -53,46 +53,45 @@ public class ItemTransformNoteConverter : IOutgoingConverter
                 string tyrpNumber = outgoingFromWms.TyrpNumber;
                 var department = await _departmentAppService.GetByUsernameAsync(wmsCountAdjust.Worker).ConfigureAwait(false);
                 var departmentCode = department == null ? "" : department.Code;
-                var details = wmsCountAdjust.Details.GroupBy(r => new { r.ItemCode, r.ToItemCode, r.LocationErpCode, r.ToLocationCode }).Select(p => new ItemTransformNoteDetailExchangeDto { ToQty = p.Sum(itm => itm.ToQty), FromQty = p.Sum(itm => itm.FromQty), ItemCode = p.Key.ItemCode, ToItemCode = p.Key.ToItemCode, LocationErpCode = p.Key.LocationErpCode, ReasonCode = String.Join("、", p.Select(x => x.ReasonCode).ToArray()) });
+                var details = wmsCountAdjust.Details.GroupBy(r => new { r.ItemCode, r.ToItemCode,r.FromLocationErpCode, r.ToLocationErpCode}).Select(p => new ItemTransformNoteDetailExchangeDto { ToQty = p.Sum(itm => itm.ToQty), FromQty = p.Sum(itm => itm.FromQty), ItemCode = p.Key.ItemCode, ToItemCode = p.Key.ToItemCode, FromLocationErpCode = p.Key.FromLocationErpCode, ToLocationErpCode = p.Key.ToLocationErpCode, ReasonCode = String.Join("、", p.Select(x => x.ReasonCode).ToArray()) });
+                List<ItemTransformNoteDetailExchangeDto> ItemTransform = new List<ItemTransformNoteDetailExchangeDto>();
+                ItemTransformNoteDetailExchangeDto ItemTranss = new ItemTransformNoteDetailExchangeDto();
+                ItemTranss.ItemCode = details.First().ToItemCode;
+                ItemTranss.LocationErpCode = details.First().ToLocationErpCode;
+                ItemTranss.FromQty = details.First().ToQty;
+                ItemTranss.ReasonCode = "20108";
+                ItemTransform.Add(ItemTranss);
                 foreach (var detail in details)
-                {
+                {                 
-                    List<ItemTransformNoteDetailExchangeDto> ItemTransform = new List<ItemTransformNoteDetailExchangeDto>();
                     ItemTransformNoteDetailExchangeDto ItemTrans = new ItemTransformNoteDetailExchangeDto();
                     ItemTrans.ItemCode = detail.ItemCode;
-                    ItemTrans.LocationErpCode = detail.LocationErpCode;
+                    ItemTrans.LocationErpCode = detail.FromLocationErpCode;
                     ItemTrans.FromQty = detail.FromQty - detail.FromQty - detail.FromQty;
-                    ItemTrans.ReasonCode = detail.ReasonCode;
+                    ItemTrans.ReasonCode = "20109";
-                    ItemTransform.Add(ItemTrans);
+                    ItemTransform.Add(ItemTrans);                
-                    ItemTransformNoteDetailExchangeDto ItemTranss = new ItemTransformNoteDetailExchangeDto();
+                }
-                    ItemTranss.ItemCode = detail.ToItemCode;
+                foreach (var Item in ItemTransform)
-                    ItemTranss.LocationErpCode = detail.LocationErpCode;
+                {
-                    ItemTranss.FromQty = detail.ToQty;
+                    var outgoingToExternal = new OutgoingToExternal()
-                    ItemTranss.ReasonCode = detail.ReasonCode;
-                    ItemTransform.Add(ItemTranss);
-                    foreach (var Item in ItemTransform)
                     {
-                        var outgoingToExternal = new OutgoingToExternal()
+                        DataType = outgoingFromWms.DataType,
-                        {
+                        DataAction = outgoingFromWms.DataAction,
-                            DataType = outgoingFromWms.DataType,
+                        SerialNumber = tyrpNumber,
-                            DataAction = outgoingFromWms.DataAction,
+                        SourceSystem = EnumSystemType.WMS.ToString(),
-                            SerialNumber= tyrpNumber,
+                        SourceDataId = wmsCountAdjust.Number,
-                            SourceSystem = EnumSystemType.WMS.ToString(),
+                        SourceDataGroupCode = wmsCountAdjust.Number,
-                            SourceDataId = wmsCountAdjust.Number,
+                        SourceDataDetailCode = Item.ItemCode,
-                            SourceDataGroupCode = wmsCountAdjust.Number,
+                        Writer = nameof(TyrpOutgoingBackgroundWorker),
-                            SourceDataDetailCode = Item.ItemCode,
+                        DestinationSystem = EnumSystemType.ERP.ToString(),
-                            Writer = nameof(TyrpOutgoingBackgroundWorker),
+                        DestinationDataId = "",
-                            DestinationSystem = EnumSystemType.ERP.ToString(),
+                    };
-                            DestinationDataId = "",
+                    outgoingToExternal.SetEffectiveDate(outgoingFromWms.EffectiveDate);
-                        };
+                    var exchangeIssue = await BuildPurchaseReceiptExchangeDtoAsync(wmsCountAdjust, Item).ConfigureAwait(false);
-                        outgoingToExternal.SetEffectiveDate(outgoingFromWms.EffectiveDate);
+                    outgoingToExternal.SourceDataContent = JsonSerializer.Serialize(exchangeIssue);
-                        var exchangeIssue = await BuildPurchaseReceiptExchangeDtoAsync(wmsCountAdjust, Item).ConfigureAwait(false);
+                    var arrive = BuildIssue(exchangeIssue, departmentCode);
-                        outgoingToExternal.SourceDataContent = JsonSerializer.Serialize(exchangeIssue);
+                    outgoingToExternal.DestinationDataContent = JsonSerializer.Serialize(arrive);
-                        var arrive = BuildIssue(exchangeIssue, departmentCode);
+
-                        outgoingToExternal.DestinationDataContent = JsonSerializer.Serialize(arrive);
+                    outgoingToExternalList.Add(outgoingToExternal);
-
-                        outgoingToExternalList.Add(outgoingToExternal);
-                    }
-
                 }
             }
         }

be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/RecycledMaterialReceiptNoteConverter.cs

@@ -120,7 +120,7 @@ public class RecycledMaterialReceiptNoteConverter : IOutgoingConverter
             wmsoutm_stat = "Y",
             wmsoutm_tyrp_dt = "",
             wmsoutm_user = "WMS",
-            wmsoutm_dept = "",//根据Worker从UserDepartment中获取
+            wmsoutm_dept = "510800",//根据Worker从UserDepartment中获取
             //wmsoutm_date = exchangeOrder.ActiveDate.ToString("yyyyMMdd"),
             wmsoutm_date = DateTime.Now.ToString("yyyyMMdd"),
             wmsoutm_cust = "",

be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/ScrapNoteConVerter.cs

@@ -80,7 +80,7 @@ IOutgoingFromWmsManager outgoingFromWmsManager
     {
         var detail = exchangeScrap.Detail;
         string asdtype = "";
-        if (exchangeScrap.Type == EnumTransSubType.CountAdjust_WIP.ToString() && detail.FromLocationErpCode.ToLower() == "tv")
+        if ((exchangeScrap.Type == EnumTransSubType.CountAdjust_WIP.ToString() && detail.FromLocationErpCode.ToLower() == "tv")|| (exchangeScrap.Type == EnumTransSubType.Scrap_WIP.ToString() && detail.FromLocationErpCode.ToLower() == "bp"))
         {
             asdtype = "4004";
         }

be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application/ItemTransformNote/ItemTransformNoteDetailExchangeDto.cs

@@ -16,6 +16,11 @@ public class ItemTransformNoteDetailExchangeDto
     [Display(Name = "ERP库位")]
     public string LocationErpCode { get; set; }
     /// <summary>
+    /// 来源储位
+    /// </summary>
+    [Display(Name = "ERP库位")]
+    public string FromLocationErpCode { get; set; }
+    /// <summary>
     /// 原因代码
     /// </summary>
     [Display(Name = "原因代码")]
@@ -31,11 +36,11 @@ public class ItemTransformNoteDetailExchangeDto
     [Display(Name = "目标数量")]
     public decimal ToQty { get; set; }
     /// <summary>
-    /// 目标库位
+    /// 目标储位
     /// </summary>
     [Display(Name = "目标库位")]
     [Required(ErrorMessage = "{0}是必填项")]
-    public string ToLocationCode { get; set; }
+    public string ToLocationErpCode { get; set; }
     /// <summary>
     /// 目标ERP料号
     /// </summary>

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/DataExchanges/PurchaseReceiptNoteEventHandler.cs

@@ -38,7 +38,7 @@ public class PurchaseReceiptNoteEventHandler
             await detail.TrySetLocationAsync(LocationAclService, detail.LocationCode).ConfigureAwait(false);
         }
         //20230915tyrp无此接口
-        var exchangeData = await BuildExchangeDataAsync(StoreEventConsts.WMS, StoreEventConsts.ERP, ExchangeDataType, dtos).ConfigureAwait(false);
+       // var exchangeData = await BuildExchangeDataAsync(StoreEventConsts.WMS, StoreEventConsts.ERP, ExchangeDataType, dtos).ConfigureAwait(false);
-        await AddManyAsync(exchangeData).ConfigureAwait(false);
+        //await AddManyAsync(exchangeData).ConfigureAwait(false);
     }
 }