Merge branch 'master' of http://dev.ccwin-in.com:6090/Win.Sfs.SmartSettlementSystem.PG

src/Modules/SettleAccount/src/SettleAccount.Application/Entities/HQ_F/HQ_F_PlatformAppService.cs

@@ -98,7 +98,7 @@ namespace Win.Sfs.SettleAccount.Entities.HQ_F
             _bomList.Add(new HQ_F_PlatformVersion(_id, branchId, year, period, version, customerCode));
             foreach (var itm in entityList)
             {
-                if (string.IsNullOrEmpty(itm.HQHKanBan) && itm.StorageLocationDesc.Contains("备品库"))
+                if (string.IsNullOrEmpty(itm.HQHKanBan) && itm.StorageLocationDesc.Contains("备品"))
                 {
                     itm.SetValue(GuidGenerator.Create(), branchId, year, period, version,"BJ");
                 }

src/Modules/SettleAccount/src/SettleAccount.Application/Entities/HQ_H/HQ_H_PlatformAppService.cs

@@ -99,7 +99,7 @@ namespace Win.Sfs.SettleAccount.Entities.HQ_H
             _bomList.Add(new HQ_H_PlatformVersion(_id, branchId, year, period, version, customerCode));
             foreach (var itm in entityList)
             {
-                if (string.IsNullOrEmpty(itm.HQHKanBan) && itm.StorageLocationDesc.Contains("备品库"))
+                if (string.IsNullOrEmpty(itm.HQHKanBan) && itm.StorageLocationDesc.Contains("备品"))
                 {
                     //赋值上主键ID
                     itm.SetValue(GuidGenerator.Create(), branchId, year, period, version, "BJ");//备品库没有看板号，需要特殊标识一下BJ,已经和客户确认

src/Modules/SettleAccount/src/SettleAccount.Application/Entities/HQ_M/HQ_M_PlatformAppService.cs

@@ -98,7 +98,7 @@ namespace Win.Sfs.SettleAccount.Entities.HQ_M
             _bomList.Add(new HQ_M_PlatformVersion(_id, branchId, year, period, version, customerCode));
             foreach (var itm in entityList)
             {
-                if (string.IsNullOrEmpty(itm.HQMKanBan) && itm.StorageLocationDesc.Contains("备品库"))
+                if (string.IsNullOrEmpty(itm.HQMKanBan) && itm.StorageLocationDesc.Contains("备品"))
                 {
                     itm.SetValue(GuidGenerator.Create(), branchId, year, period, version,"BJ");
                 }