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

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/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/Controllers/Inventories/BalanceController.cs

@@ -536,7 +536,7 @@ public class BalanceController : AbpController
         }
         else
         {
-            throw new UserFriendlyException($"未找到 生产线【{productLine}】零件【{itemCode}】关系");
+            throw new UserFriendlyException($"未找到生产线【{productLine}】零件【{itemCode}】关系");
         }
     }
 

be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application/DocumentSettings/DocumentSettingAppService.cs

@@ -35,6 +35,7 @@ public class DocumentSettingAppService
     {
         var type = input.Type;
         var time = DateTime.ParseExact(input.Time, SharedConst.TimeFormat, CultureInfo.InvariantCulture);
+
         return await _documentManager.GenerateNumberAsync(type, time).ConfigureAwait(false);
     }
 }

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/ScrapNotes/ScrapNotePermissions.cs

@@ -23,4 +23,14 @@ public static class ScrapNotePermissions
         scrapNotePermission.AddChild(Update, StorePermissionDefinitionProvider.L(StorePermissions.UpdateStr));
         scrapNotePermission.AddChild(Delete, StorePermissionDefinitionProvider.L(StorePermissions.DeleteStr));
     }
+
+    public static void AddProductScrapNotePermissions(this PermissionGroupDefinition permissionGroup)
+    {
+        _ = permissionGroup.AddPermission(ProductScrapNote, StorePermissionDefinitionProvider.L("ProductScrapNote"));
+    }
+
+    public static void AddWipScrapNotePermissions(this PermissionGroupDefinition permissionGroup)
+    {
+        _ = permissionGroup.AddPermission(WipScrapNote, StorePermissionDefinitionProvider.L("WipScrapNote"));
+    }
 }

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Permissions/StorePermissionDefinitionProvider.cs

@@ -105,6 +105,9 @@ public class StorePermissionDefinitionProvider : PermissionDefinitionProvider
 
         storeGroup.AddKittingPackagingNotePermission();
 
+        storeGroup.AddProductScrapNotePermissions();
+        storeGroup.AddWipScrapNotePermissions();
+
         #region Jobs
 
         storeGroup.AddPurchaseReceiptJobPermission();

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/CountJobs/CountJobAppService.cs

@@ -4,6 +4,7 @@ using System.ComponentModel.DataAnnotations;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using Castle.Components.DictionaryAdapter;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
@@ -243,7 +244,7 @@ public class CountJobAppService
     public virtual async Task<List<CountJobDTO>> CreateWithConditionAsync(CountJobCreateRequestInput input)
     {
         var entity = ObjectMapper.Map<CountJobCreateRequestInput, CountPlan>(input);
-
+        
         var entityList = await _countJobManager.CreateWithConditionAsync(entity, input.PartCondition, input.LocCondition, input.StatusList).ConfigureAwait(false);
 
         var dtoList = ObjectMapper.Map<List<CountJob>, List<CountJobDTO>>(entityList);

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Requests/IssueRequest/AssembleIssueRequestEventHandler.cs

@@ -433,7 +433,7 @@ public class AssembleIssueRequestEventHandler
 
         detail.PositionCode = assembleIssueRequestDetail.PositionCode;
         detail.RecommendType = assembleIssueRequestDetail.RecommendType;
-        detail.ProdLine = assembleIssueRequestDetail.ToLocationCode;
+        detail.ProdLine = assembleIssueRequestDetail.ProdLine;
 
         detail.ItemCode = assembleIssueRequestDetail.ItemCode;
         detail.ItemName = assembleIssueRequestDetail.ItemName;

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Requests/IssueRequest/CoatingIssueRequestEventHandler.cs

@@ -433,7 +433,7 @@ public class CoatingIssueRequestEventHandler
 
         detail.PositionCode = coatingIssueRequestDetail.PositionCode;
         detail.RecommendType = coatingIssueRequestDetail.RecommendType;
-        detail.ProdLine = coatingIssueRequestDetail.ToLocationCode;
+        detail.ProdLine = coatingIssueRequestDetail.ProdLine;
 
         detail.ItemCode = coatingIssueRequestDetail.ItemCode;
         detail.ItemName = coatingIssueRequestDetail.ItemName;

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Requests/IssueRequest/InjectionIssueRequestEventHandler.cs

@@ -433,7 +433,7 @@ public class InjectionIssueRequestEventHandler
 
         detail.PositionCode = injectionIssueRequestDetail.PositionCode;
         detail.RecommendType = injectionIssueRequestDetail.RecommendType;
-        detail.ProdLine = injectionIssueRequestDetail.ToLocationCode;
+        detail.ProdLine = injectionIssueRequestDetail.ProdLine;
 
         detail.ItemCode = injectionIssueRequestDetail.ItemCode;
         detail.ItemName = injectionIssueRequestDetail.ItemName;

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Requests/IssueRequest/KittingIssueRequestEventHandler.cs

@@ -431,7 +431,7 @@ public class KittingIssueRequestEventHandler
 
         detail.PositionCode = kittingIssueRequestDetail.PositionCode;
         detail.RecommendType = kittingIssueRequestDetail.RecommendType;
-        detail.ProdLine = kittingIssueRequestDetail.ToLocationCode;
+        detail.ProdLine = kittingIssueRequestDetail.ProdLine;
 
         detail.ItemCode = kittingIssueRequestDetail.ItemCode;
         detail.ItemName = kittingIssueRequestDetail.ItemName;

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Requests/IssueRequest/SparePartIssueRequestEventHandler.cs

@@ -431,7 +431,7 @@ public class SparePartIssueRequestEventHandler
 
         detail.PositionCode = sparePartIssueRequestDetail.PositionCode;
         detail.RecommendType = sparePartIssueRequestDetail.RecommendType;
-        detail.ProdLine = sparePartIssueRequestDetail.ToLocationCode;
+        detail.ProdLine = sparePartIssueRequestDetail.ProdLine;
 
         detail.ItemCode = sparePartIssueRequestDetail.ItemCode;
         detail.ItemName = sparePartIssueRequestDetail.ItemName;