Merge branch 'master' of http://dev.ccwin-in.com:3000/BoXu.Zheng/WZC2

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

@@ -58,7 +58,7 @@ public class BackFluConverter : IIncomingConverter
     {
         await Task.CompletedTask.ConfigureAwait(false);
         var incomingToWmsList = new List<IncomingToWms>();
-        var groups = incomingDataList.GroupBy(p => p.SourceDataGroupCode);
+        var groups = incomingDataList.GroupBy(p => new { p.SourceDataGroupCode,p.SourceDataDetailCode });
         foreach (var group in groups)
         {
             var first = group.First();
@@ -97,13 +97,17 @@ public class BackFluConverter : IIncomingConverter
             wmsBack.WarehouseCode = "jiekou";
             wmsBack.Lot = "jiekou";
             wmsBack.Details = new List<BackFlushNoteDetailInput>();
-            foreach (var incomingFromExternal in group.ToList())
+            decimal Qty = 0;
+            foreach (var incomingFromExternal in group.ToList())//根据单据号和零件号汇总数量
             {
-                var back = JsonSerializer.Deserialize<BackFlushNoteExchangeDto>(incomingFromExternal.DestinationDataContent);
+                var backflu = JsonSerializer.Deserialize<BackFlushNoteExchangeDto>(incomingFromExternal.DestinationDataContent);
+                var backfluDetail = _objectMapper.Map<BackFlushNoteDetailExchangeDto, BackFlushNoteDetailInput>(backflu.Detail);
+                Qty = backfluDetail.Qty + Qty;
+            }
+                var back = JsonSerializer.Deserialize<BackFlushNoteExchangeDto>(first.DestinationDataContent);
                 var wmsBackDetail = _objectMapper.Map<BackFlushNoteDetailExchangeDto, BackFlushNoteDetailInput>(back.Detail);
                 wmsBackDetail.Lot = "";
                 var item = await _itemBasicAppService.GetByCodeAsync(wmsBackDetail.ItemCode).ConfigureAwait(false);           
-
                 if (item != null)
                 {
                     wmsBackDetail.ItemName = item.Name;
@@ -114,6 +118,7 @@ public class BackFluConverter : IIncomingConverter
                     wmsBackDetail.ItemName = "";
                     wmsBackDetail.Uom = "";
                 }
+                wmsBackDetail.Qty = Qty;
                 var typesAndErpCodeAsync = await _locationAppService.GetListByTypesAndErpCodeAsync(new EditableList<EnumLocationType>() { EnumLocationType.WIP }, wmsBackDetail.LocationErpCode).ConfigureAwait(false);
                 var loctioncode = typesAndErpCodeAsync.First();
                 wmsBackDetail.LocationCode = loctioncode.Code;
@@ -122,7 +127,7 @@ public class BackFluConverter : IIncomingConverter
                 wmsBackDetail.LocationGroup = loctioncode.LocationGroupCode;
                 wmsBackDetail.PackingCode = "jiekou";
                 wmsBack.Details.Add(wmsBackDetail);
-            }
+            //}
             incomingToWms.DataContent = JsonSerializer.Serialize(wmsBack);
             incomingToWmsList.Add(incomingToWms);
     }

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

@@ -135,8 +135,8 @@ public class MesOutReader : IReader
             ItemCode = mesOut.Mesout_part,
             Qty = mesOut.Mesout_move,
             LocationErpCode = mesOut.Mesout_loc,
-            Remark = mesOut.memo
-
+            Remark = mesOut.memo,
+            ReturnQty=mesOut.Mesout_bad
         };
         productReceiptNote.Detail = productReceiptNoteDetail;
         return productReceiptNote;

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

@@ -114,7 +114,7 @@ public class DeliverNoteConverter : IOutgoingConverter
             wmsoutm_user = "WMS",
             wmsoutm_dept = "",
             wmsoutm_date = exchangeOrder.ActiveDate.ToString("yyyyMMdd"),
-            wmsoutm_cust = exchangeOrder.Customer ?? "",
+            wmsoutm_cust = exchangeOrder.CustomerCode ?? "",
             wmsoutm_shm_nbr = "",
             wmsoutm_cust_loc = "",
             wmsoutm_stock_stat = "",

be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/WMS/DeliverNote/DeliverNoteExchangeDto.cs

@@ -25,5 +25,5 @@ public class DeliverNoteExchangeDto
     /// </summary>
     [Display(Name = "客户")]
     [StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")]
-    public string Customer { get; set; }
+    public string CustomerCode { get; set; }
 }

be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/Win_in.Sfs.Wms.DataExchange.Application.Contracts.xml

@@ -546,7 +546,7 @@
             生效日期
             </summary>
         </member>
-        <member name="P:Win_in.Sfs.Wms.DataExchange.WMS.DeliverNote.DeliverNoteExchangeDto.Customer">
+        <member name="P:Win_in.Sfs.Wms.DataExchange.WMS.DeliverNote.DeliverNoteExchangeDto.CustomerCode">
             <summary>
             客户
             </summary>