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.InjectionMoldingTaskAgent/InjectionMoldingTaskOptions.cs

@@ -16,12 +16,14 @@ public class InjectionMoldingTaskOptions
 
 public class InjectionAutoRemote
 {
-
-     public string IpAddress { set; get; } 
-     public string UserName { set; get; }
-     public string Password {  set; get; }  
-     public string Token { set; get; } 
-
+    //  IP 地址
+    public string IpAddress { set; get; }
+    // 用户名
+    public string UserName { set; get; }
+    // 密码
+    public string Password { set; get; }
+    // 令牌
+    public string Token { set; get; }
 }
 
 

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/IssuelRequests/CoatingIssueRequests/CoatingIssueRequestAppService.cs

@@ -76,6 +76,8 @@ public class CoatingIssueRequestAppService : SfsStoreRequestAppServiceBase<Coati
         return null;
     }
 
+
+
     [HttpPost("")]
     public override async Task<CoatingIssueRequestDTO> CreateAsync(CoatingIssueRequestEditInput input)
     {

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Transactions/CustomerProductionReturnNoteEventHandler.cs

@@ -82,9 +82,9 @@ public class CustomerProductionReturnNoteEventHandler
         {
             var transaction = ObjectMapper.Map<CustomerProductionReturnNoteDetail, TransactionEditInput>(detail);
 
-            transaction.PackingCode     =     (!string.IsNullOrEmpty(transaction.PackingCode)    )? transaction.PackingCode     :"NONE" ; 
-            transaction.ContainerCode   =     (!string.IsNullOrEmpty(transaction.ContainerCode)  )? transaction.ContainerCode   :"NONE" ;
-            transaction.Lot             =     (!string.IsNullOrEmpty(transaction.Lot)            )? transaction.Lot             :"NONE" ;
+            transaction.PackingCode     =     (!string.IsNullOrEmpty(transaction.PackingCode)    )? transaction.PackingCode     :"" ; 
+            transaction.ContainerCode   =     (!string.IsNullOrEmpty(transaction.ContainerCode)  )? transaction.ContainerCode   :"" ;
+            transaction.Lot             =     (!string.IsNullOrEmpty(transaction.Lot)            )? transaction.Lot             :"" ;
             transaction.LocationArea    =     (!string.IsNullOrEmpty(transaction.LocationArea)   )? transaction.LocationArea    :"NONE" ;
             transaction.LocationGroup   =     (!string.IsNullOrEmpty(transaction.LocationGroup)  )? transaction.LocationGroup   :"NONE" ;
             transaction.LocationErpCode =     (!string.IsNullOrEmpty(transaction.LocationErpCode))? transaction.LocationErpCode :"NONE" ;