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

be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.EosAgent/Incoming/ShipConverter.cs

@@ -118,7 +118,7 @@ public class ShipConverter : IIncomingConverter
         purchaseLabel.LabelType = EnumLabelType.PurchaseLabel;
         var supplierDto = await _supplierAppService.GetByCodeAsync(exchangeAsn.SupplierCode).ConfigureAwait(false);
         purchaseLabel.SupplierCode = exchangeAsn.SupplierCode;
-        purchaseLabel.PoNumber = exchangeAsn.Number;
+        purchaseLabel.PoNumber = exchangeAsn.PoNumber;
         purchaseLabel.Qty = exchangeAsn.Detail.Qty;
        
        

be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Agent/AgentModule.cs

@@ -149,7 +149,7 @@ public class AgentModule : AbpModule
     public override void OnApplicationInitialization(
              ApplicationInitializationContext context)
     {
-        context.AddBackgroundWorkerAsync<IncomingToWmsWorker>();
-       // context.AddBackgroundWorkerAsync<OutgoingFromWmsWorker>();
+        //context.AddBackgroundWorkerAsync<IncomingToWmsWorker>();
+        context.AddBackgroundWorkerAsync<OutgoingFromWmsWorker>();
     }
 }

be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Agent/appsettings.json

@@ -29,7 +29,7 @@
       "BaseUrl": "http://dev.ccwin-in.com:60084/"
     },
     "Store": {
-      "BaseUrl": "http://localhost:59095/"
+      "BaseUrl": "http://dev.ccwin-in.com:60085/"
     },
     "Label": {
       "BaseUrl": "http://dev.ccwin-in.com:60082/"

be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/SplitPackings/Inputs/SplitPackingRecEditInput.cs

@@ -134,6 +134,12 @@ public class SplitPackingRecEditInput : SfsBaseDataCreateOrUpdateInputBase
     [StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")]
     public string PurchaseInfo_AsnNumber { get; set; }
 
+    /// <summary>
+    /// 供应商代码
+    /// </summary>
+    [StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")]
+    public string PurchaseInfo_SupplierCode { get; set; }
+
     /// <summary>
     /// 到货通知
     /// </summary>

be/Modules/Label/src/Win_in.Sfs.Label.Application/InventoryLabels/InventoryLabelAppService.cs

@@ -189,6 +189,7 @@ public class InventoryLabelAppService
             packRec.ToLot = inputObj.Lot;
             packRec.PurchaseInfo_PoNumber = inputObj.PoNumber; // 采购订单
             packRec.PurchaseInfo_AsnNumber = inputObj.AsnNumber; //供应商发货单
+            packRec.PurchaseInfo_SupplierCode = inputObj.SupplierCode; //供应商发货单
             packRec.ArrivalNoticNumber = null; //到货通知
             packRec.TaskOrderNumber = null; //任务单
             packRec.ReceiptRecNumber = null; //收货记录单

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Notes/PutawayNotes/PutawayNoteAppService.cs

@@ -87,6 +87,7 @@ public class PutawayNoteAppService :
             tempEditInput.ProductReceiptNumber = string.Empty;
             tempEditInput.PurchaseReceiptRequestNumber = string.Empty;
             tempEditInput.Type = EnumPutawayType.PurchasePutaway;
+            tempEditInput.Number = groupWhere.Key.PoNumber;
             foreach (var packingCode in groupWhere)
             {
                 var detailInput=input.Details.First(p => p.ToPackingCode == packingCode.ToPackingCode);

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Notes/TransferNotes/TransferNoteAppService.cs

@@ -474,6 +474,7 @@ public class TransferNoteAppService : SfsStoreWithDetailsAppServiceBase
             {
                 packRec.PurchaseInfo_PoNumber = inventoryLabelDto.PoNumber;
                 packRec.PurchaseInfo_AsnNumber = inventoryLabelDto.AsnNumber;
+                packRec.PurchaseInfo_SupplierCode = inventoryLabelDto.SupplierCode;
 
                 #region InventoryLabel兼容成员
                 var inputObj = inventoryLabelDto;