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

src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/appsettings.Development.json

@@ -2,17 +2,17 @@
   "App": {
     "CorsOrigins": "https://*.abc.com,http://localhost:9528,http://149.223.116.5:8088"
   },
-  //"ConnectionStrings": {
-  //  "Default": "Server=LAPTOP-V3U07C2O;Database=ABP;user id=sa;Password=1q2w!@#",
-  //  "SettleAccountService": "Server=LAPTOP-V3U07C2O;Database=SettleAccountService;user id=sa;Password=1q2w!@#;"
-  //},
   "ConnectionStrings": {
-    "Default": "Server=127.0.0.1;Database=ABP;user id=sa;Password=1",
-    "SettleAccountService": "Server=127.0.0.1;Database=SettleAccountService1;user id=sa;Password=1;"
-    //"Default": "Server=192.168.0.67;Database=ABP;User ID=sa;Password=Microsoft2008;",
-    //"SettleAccountService": "Server=192.168.0.67;Database=SettleAccountService;user id=sa;password=Microsoft2008;",
-    //"Wms": "Server=192.168.0.63;Database=CPAT_WMS;user id=sa;password=Microsoft2008;"
+    "Default": "Server=LAPTOP-V3U07C2O;Database=ABP;user id=sa;Password=1q2w!@#",
+    "SettleAccountService": "Server=LAPTOP-V3U07C2O;Database=SettleAccountService;user id=sa;Password=1q2w!@#;"
   },
+  //"ConnectionStrings": {
+  //  "Default": "Server=127.0.0.1;Database=ABP;user id=sa;Password=1",
+  //  "SettleAccountService": "Server=127.0.0.1;Database=SettleAccountService1;user id=sa;Password=1;"
+  //  //"Default": "Server=192.168.0.67;Database=ABP;User ID=sa;Password=Microsoft2008;",
+  //  //"SettleAccountService": "Server=192.168.0.67;Database=SettleAccountService;user id=sa;password=Microsoft2008;",
+  //  //"Wms": "Server=192.168.0.63;Database=CPAT_WMS;user id=sa;password=Microsoft2008;"
+  //},
   "Logging": {
     "LogLevel": {
       "Default": "Information",

src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/appsettings.json

@@ -2,18 +2,18 @@
   "App": {
     "CorsOrigins": "https://*.abc.com,http://localhost:9528,http://149.223.116.5:8088"
   },
-  //"ConnectionStrings": {
-  //  "Default": "Server=LAPTOP-V3U07C2O;Database=ABP;user id=sa;Password=1q2w!@#",
-  //  "SettleAccountService": "Server=LAPTOP-V3U07C2O;Database=SettleAccountService;user id=sa;Password=1q2w!@#;"
-  //},
   "ConnectionStrings": {
-    "Default": "Server=127.0.0.1;Database=ABP;user id=sa;Password=1",
-    "SettleAccountService": "Server=127.0.0.1;Database=SettleAccountService1;user id=sa;Password=1;",
-    //"Default": "Server=192.168.0.67;Database=ABP;User ID=sa;Password=Microsoft2008;",
-    //"SettleAccountService": "Server=192.168.0.67;Database=SettleAccountService;user id=sa;password=Microsoft2008;",
-    //"Wms": "Server=192.168.0.63;Database=CPAT_WMS;user id=sa;password=Microsoft2008;"
-
+    "Default": "Server=LAPTOP-V3U07C2O;Database=ABP;user id=sa;Password=1q2w!@#",
+    "SettleAccountService": "Server=LAPTOP-V3U07C2O;Database=SettleAccountService1;user id=sa;Password=1q2w!@#;"
   },
+  //"ConnectionStrings": {
+  //  //"Default": "Server=127.0.0.1;Database=ABP;user id=sa;Password=1",
+  //  //"SettleAccountService": "Server=127.0.0.1;Database=SettleAccountService1;user id=sa;Password=1;",
+  //  "Default": "Server=192.168.0.67;Database=ABP;User ID=sa;Password=Microsoft2008;",
+  //  "SettleAccountService": "Server=192.168.0.67;Database=SettleAccountService;user id=sa;password=Microsoft2008;",
+  //  "Wms": "Server=192.168.0.63;Database=CPAT_WMS;user id=sa;password=Microsoft2008;"
+
+  //},
   "Logging": {
     "LogLevel": {
       "Default": "Information",

src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BT_Car/BT_Car_PlatformImportDto.cs

@@ -30,21 +30,6 @@ namespace Win.Sfs.SettleAccount.Entities.BT_Car
         [ImporterHeader(Name = "物料凭证号")]
         public string MaterialVoucherNo { get; set; }
 
-        /// <summary>
-        ///会计年度
-        /// </summary>
-        [ImporterHeader(Name = "会计年度")]
-        public string Year { get; set; }
-        /// <summary>
-        /// 期间
-        /// </summary>
-        [ImporterHeader(Name = "期间")]
-        public string Period { set; get; }
-        /// <summary>
-        /// 版本号
-        /// </summary>
-        [ImporterHeader(Name = "版本号")]
-        public string Version { set; get; }
         /// <summary>
         /// 看板号
         /// </summary>

src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BT_Car/BT_Car_PlatformAppService.cs

@@ -84,12 +84,13 @@ namespace Win.Sfs.SettleAccount.Entities.BT_Car
             await _query.BatchDeleteAsync();
             //插入数据前检验
             var checkList = new List<ErrorExportDto>();
-            var _group = entityList.GroupBy(x => new { x.KanbanNumber, x.MaterialCode, x.Version }).Select(p => new { Count = p.Count(), KanbanNumber = p.Key.KanbanNumber, MaterialCode = p.Key.MaterialCode });
+            var _group = entityList.GroupBy(x => new { x.Factory, x.Version }).Select(p => new { Count = p.Count(), Factory = p.Key.Factory });
             foreach (var itm in _group)
             {
-                if (string.IsNullOrEmpty(itm.KanbanNumber))
+                if (itm.Factory != "001")
                 {
-                    checkList.Add(new ErrorExportDto(version, customerCode, string.Empty, string.Empty, string.Empty, string.Empty, string.Format("导入的零件号{0},其看板号{1}有空，请检查！", itm.MaterialCode, itm.KanbanNumber), string.Empty));
+                    checkList.Add(new ErrorExportDto(version, customerCode, string.Empty, string.Empty, string.Empty, string.Empty, string.Format("导入的平台数据不是{0}平台的，请检查！", itm.Factory), string.Empty));
+                    break;
                 }
             }
             var _id = GuidGenerator.Create();

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

@@ -84,12 +84,13 @@ namespace Win.Sfs.SettleAccount.Entities.HQ_F
             await _query.BatchDeleteAsync();
             //插入数据前检验
             var checkList = new List<ErrorExportDto>();
-            var _group = entityList.GroupBy(x => new { x.HQHKanBan, x.MaterialCode, x.Version }).Select(p => new { Count = p.Count(), HQHKanBan = p.Key.HQHKanBan, MaterialCode = p.Key.MaterialCode });
+            var _group = entityList.GroupBy(x => new { x.Factory, x.HQHKanBan, x.Version }).Select(p => new { Count = p.Count(), Factory = p.Key.Factory, HQHKanBan = p.Key.HQHKanBan });
             foreach (var itm in _group)
             {
-                if (string.IsNullOrEmpty(itm.HQHKanBan))
+                if (itm.Factory != "F")
                 {
-                    checkList.Add(new ErrorExportDto(version, customerCode, string.Empty, string.Empty, string.Empty, string.Empty, string.Format("导入的物料号{0},其看板号{1}有空，请检查！", itm.MaterialCode, itm.HQHKanBan), string.Empty));
+                    checkList.Add(new ErrorExportDto(version, customerCode, string.Empty, string.Empty, string.Empty, string.Empty, string.Format("导入的平台数据不是{0}平台的，请检查！", itm.Factory), string.Empty));
+                    break;
                 }
             }
             var _id = GuidGenerator.Create();
@@ -97,8 +98,15 @@ namespace Win.Sfs.SettleAccount.Entities.HQ_F
             _bomList.Add(new HQ_F_PlatformVersion(_id, branchId, year, period, version, customerCode));
             foreach (var itm in entityList)
             {
-                //赋值上主键ID
-                itm.SetValue(GuidGenerator.Create(), branchId, year, period, version);
+                if (string.IsNullOrEmpty(itm.HQHKanBan) && itm.StorageLocationDesc.Contains("备品库"))
+                {
+                    itm.SetValue(GuidGenerator.Create(), branchId, year, period, version,"BJ");
+                }
+                else
+                {
+                    //赋值上主键ID
+                    itm.SetValue(GuidGenerator.Create(), branchId, year, period, version);
+                }
             }
             if (checkList.Count > 0)
             {

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

@@ -82,14 +82,16 @@ namespace Win.Sfs.SettleAccount.Entities.HQ_H
             //删除明细
             var _query = _repository.Where(p => p.Version == version);
             await _query.BatchDeleteAsync();
+
             //插入数据前检验
             var checkList = new List<ErrorExportDto>();
-            var _group = entityList.GroupBy(x => new { x.HQHKanBan, x.MaterialCode, x.Version }).Select(p => new { Count = p.Count(), HQHKanBan = p.Key.HQHKanBan, MaterialCode = p.Key.MaterialCode });
+            var _group = entityList.GroupBy(x => new { x.Factory, x.HQHKanBan, x.Version }).Select(p => new { Count = p.Count(), Factory = p.Key.Factory, HQHKanBan = p.Key.HQHKanBan });
             foreach (var itm in _group)
             {
-                if (string.IsNullOrEmpty(itm.HQHKanBan))
+                if (itm.Factory != "H")
                 {
-                    checkList.Add(new ErrorExportDto(version, customerCode, string.Empty, string.Empty, string.Empty, string.Empty, string.Format("导入的物料号{0},其看板号{1}有空，请检查！", itm.MaterialCode, itm.HQHKanBan), string.Empty));
+                    checkList.Add(new ErrorExportDto(version, customerCode, string.Empty, string.Empty, string.Empty, string.Empty, string.Format("导入的平台数据不是{0}平台的，请检查！", itm.Factory), string.Empty));
+                    break;
                 }
             }
             var _id = GuidGenerator.Create();
@@ -97,8 +99,15 @@ namespace Win.Sfs.SettleAccount.Entities.HQ_H
             _bomList.Add(new HQ_H_PlatformVersion(_id, branchId, year, period, version, customerCode));
             foreach (var itm in entityList)
             {
-                //赋值上主键ID
-                itm.SetValue(GuidGenerator.Create(), branchId, year, period, version);
+                if (string.IsNullOrEmpty(itm.HQHKanBan) && itm.StorageLocationDesc.Contains("备品库"))
+                {
+                    //赋值上主键ID
+                    itm.SetValue(GuidGenerator.Create(), branchId, year, period, version, "BJ");//备品库没有看板号，需要特殊标识一下BJ,已经和客户确认
+                }
+                else
+                {
+                    itm.SetValue(GuidGenerator.Create(), branchId, year, period, version);
+                }
             }
             if (checkList.Count > 0)
             {

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

@@ -84,12 +84,13 @@ namespace Win.Sfs.SettleAccount.Entities.HQ_M
             await _query.BatchDeleteAsync();
             //插入数据前检验
             var checkList = new List<ErrorExportDto>();
-            var _group = entityList.GroupBy(x => new { x.HQMKanBan, x.MaterialCode, x.Version }).Select(p => new { Count = p.Count(), Type = p.Key.HQMKanBan, MaterialCode = p.Key.MaterialCode });
+            var _group = entityList.GroupBy(x => new { x.Factory, x.HQMKanBan, x.Version }).Select(p => new { Count = p.Count(), Factory = p.Key.Factory, HQHKanBan = p.Key.HQMKanBan });
             foreach (var itm in _group)
             {
-                if (string.IsNullOrEmpty(itm.Type))
+                if (itm.Factory != "M")
                 {
-                    checkList.Add(new ErrorExportDto(version, customerCode, string.Empty, string.Empty, string.Empty, string.Empty, string.Format("导入的物料号{0},其看板号{1}有空，请检查！", itm.MaterialCode, itm.Type), string.Empty));
+                    checkList.Add(new ErrorExportDto(version, customerCode, string.Empty, string.Empty, string.Empty, string.Empty, string.Format("导入的平台数据不是{0}平台的，请检查！", itm.Factory), string.Empty));
+                    break;
                 }
             }
             var _id = GuidGenerator.Create();
@@ -97,8 +98,15 @@ namespace Win.Sfs.SettleAccount.Entities.HQ_M
             _bomList.Add(new HQ_M_PlatformVersion(_id, branchId, year, period, version, customerCode));
             foreach (var itm in entityList)
             {
-                //赋值上主键ID
-                itm.SetValue(GuidGenerator.Create(), branchId, year, period, version);
+                if (string.IsNullOrEmpty(itm.HQMKanBan) && itm.StorageLocationDesc.Contains("备品库"))
+                {
+                    itm.SetValue(GuidGenerator.Create(), branchId, year, period, version,"BJ");
+                }
+                else
+                {
+                    //赋值上主键ID
+                    itm.SetValue(GuidGenerator.Create(), branchId, year, period, version);
+                }
             }
             if (checkList.Count > 0)
             {

src/Modules/SettleAccount/src/SettleAccount.Application/SettleAccountApplicationAutoMapperProfile.cs

@@ -86,6 +86,7 @@ using Win.Sfs.SettleAccount.Entities.WMSSparePart;
 using Win.Sfs.SettleAccount.Entities.HQ_H;
 using Win.Sfs.SettleAccount.Entities.HQ_M;
 using Win.Sfs.SettleAccount.Entities.HQ_F;
+using Win.Sfs.SettleAccount.Entities.BT_Car;
 
 namespace Win.Sfs.SettleAccount
 {
@@ -235,11 +236,39 @@ namespace Win.Sfs.SettleAccount
             CreateMapHQ_F_Platform();
             CreateMapHQ_F_PlatformVersion();
 
+            //一汽轿车
+            CreateMapBT_Car_Platform();
+            CreateMapBT_Car_PlatformVersion();
             #endregion
         }
 
         #region PG-派格映射
 
+        /// <summary>
+        /// 红旗F平台导入
+        /// </summary>
+        private void CreateMapBT_Car_Platform()
+
+        {
+            CreateMap<BT_Car_Platform, BT_Car_PlatformDto>().ReverseMap();
+            CreateMap<BT_Car_Platform, BT_Car_PlatformRequestDto>().ReverseMap();
+            CreateMap<BT_Car_Platform, BT_Car_PlatformImportDto>().ReverseMap();
+            CreateMap<BT_Car_Platform, BT_Car_PlatformExportDto>().ReverseMap();
+            CreateMap<BT_Car_Platform, BT_Car_PlatformExportDto>().ReverseMap();
+        }
+
+        /// <summary>
+        /// 红旗F平台-版本
+        /// </summary>
+        private void CreateMapBT_Car_PlatformVersion()
+
+        {
+            CreateMap<BT_Car_PlatformVersion, BT_Car_PlatformVersionDto>().ReverseMap();
+            CreateMap<BT_Car_PlatformVersion, BT_Car_PlatformVersionCreateDto>();
+            CreateMap<BT_Car_PlatformVersion, BT_Car_PlatformVersionUpdateDto>();
+            CreateMap<BT_Car_PlatformVersionCreateDto, BT_Car_PlatformVersion>();
+            CreateMap<BT_Car_PlatformVersionUpdateDto, BT_Car_PlatformVersion>();
+        }
 
         /// <summary>
         /// 红旗F平台导入

src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/HQ_F/HQ_F_Platform.cs

@@ -13,6 +13,16 @@ namespace Win.Sfs.SettleAccount.Entities.HQ_F
         public HQ_F_Platform()
         { }
 
+        public void SetValue(Guid guid, Guid branchId, string year, string peroid, string version,string kanban)
+        {
+            Period = peroid;
+            Year = year;
+            Id = guid;
+            Version = version;
+            BranchId = branchId;
+            HQHKanBan = kanban;
+        }
+
         public void SetValue(Guid guid, Guid branchId, string year, string peroid, string version)
         {
             Period = peroid;

src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/HQ_H/HQ_H_Platform.cs

@@ -13,6 +13,16 @@ namespace Win.Sfs.SettleAccount.Entities.HQ_H
         public HQ_H_Platform()
         { }
 
+        public void SetValue(Guid guid, Guid branchId, string year, string peroid, string version,string kanban)
+        {
+            Period = peroid;
+            Year = year;
+            Id = guid;
+            Version = version;
+            BranchId = branchId;
+            HQHKanBan = kanban;
+        }
+
         public void SetValue(Guid guid, Guid branchId, string year, string peroid, string version)
         {
             Period = peroid;

src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/HQ_M/HQ_M_Platform.cs

@@ -13,6 +13,15 @@ namespace Win.Sfs.SettleAccount.Entities.HQ_M
         public HQ_M_Platform()
         { }
 
+        public void SetValue(Guid guid, Guid branchId, string year, string peroid, string version,string kanban)
+        {
+            Period = peroid;
+            Year = year;
+            Id = guid;
+            Version = version;
+            BranchId = branchId;
+            HQMKanBan = kanban;
+        }
         public void SetValue(Guid guid, Guid branchId, string year, string peroid, string version)
         {
             Period = peroid;

src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/EntityFrameworkCore/SettleAccountDbContextModelCreatingExtensions.cs

@@ -419,10 +419,6 @@ namespace Win.Sfs.SettleAccount
         }
 
 
-
-
-
-
         /// <summary>
         /// 一汽轿车平台验收结算明细-导入
         /// </summary>
@@ -486,7 +482,7 @@ namespace Win.Sfs.SettleAccount
                 b.ToTable($"{options.TablePrefix}_HQ_F_Platform", options.Schema);
 
                 b.ConfigureByConvention();
-                b.Property(x => x.HQHKanBan).IsRequired().HasMaxLength(150);//必填项
+                b.Property(x => x.HQHKanBan).HasMaxLength(150);//看板号有空的情况，如备品库
                 b.Property(x => x.MaterialVoucherNo).HasMaxLength(150);
                 b.Property(x => x.Factory).HasMaxLength(50);
                 b.Property(x => x.MaterialCode).IsRequired().HasMaxLength(150);
@@ -500,7 +496,7 @@ namespace Win.Sfs.SettleAccount
                 b.Property(x => x.StorageLocationDesc).HasMaxLength(150);
                 b.Property(x => x.AcceptanceNo).HasMaxLength(50);
                 //创建组合索引
-                b.HasIndex(x => new { x.Version, x.HQHKanBan, x.MaterialCode }).IsUnique().HasFilter(IsDeletedFilter);
+                //b.HasIndex(x => new { x.Version, x.HQHKanBan, x.MaterialCode }).IsUnique().HasFilter(IsDeletedFilter);
 
             });
         }
@@ -548,7 +544,7 @@ namespace Win.Sfs.SettleAccount
                 b.Property(x => x.StorageLocation).HasMaxLength(50);
                 b.Property(x => x.StorageLocationDesc).HasMaxLength(150);
                 //创建组合索引
-                b.HasIndex(x => new { x.Version, x.KanbanNumber, x.MaterialCode }).IsUnique().HasFilter(IsDeletedFilter);
+                //b.HasIndex(x => new { x.Version, x.KanbanNumber, x.MaterialCode }).IsUnique().HasFilter(IsDeletedFilter);
 
             });
         }
@@ -612,7 +608,7 @@ namespace Win.Sfs.SettleAccount
                 b.ToTable($"{options.TablePrefix}_HQ_M_Platform", options.Schema);
 
                 b.ConfigureByConvention();
-                b.Property(x => x.HQMKanBan).IsRequired().HasMaxLength(150);//必填项
+                b.Property(x => x.HQMKanBan).HasMaxLength(150);//有空的情况
                 b.Property(x => x.MaterialVoucherNo).HasMaxLength(150);
                 b.Property(x => x.Factory).HasMaxLength(50);
                 b.Property(x => x.MaterialCode).IsRequired().HasMaxLength(150);
@@ -625,7 +621,7 @@ namespace Win.Sfs.SettleAccount
                 b.Property(x => x.StorageLocation).HasMaxLength(50);
                 b.Property(x => x.StorageLocationDesc).HasMaxLength(150);
                 //创建组合索引
-                b.HasIndex(x => new { x.Version, x.HQMKanBan, x.MaterialCode }).IsUnique().HasFilter(IsDeletedFilter);
+                //b.HasIndex(x => new { x.Version, x.HQMKanBan, x.MaterialCode }).IsUnique().HasFilter(IsDeletedFilter);
 
             });
         }
@@ -660,7 +656,8 @@ namespace Win.Sfs.SettleAccount
                 b.ToTable($"{options.TablePrefix}_HQ_H_Platform", options.Schema);
 
                 b.ConfigureByConvention();
-                b.Property(x => x.HQHKanBan).IsRequired().HasMaxLength(150);//必填项
+                //b.Property(x => x.HQHKanBan).IsRequired().HasMaxLength(150);//必填项
+                b.Property(x => x.HQHKanBan).HasMaxLength(150);//有空的情况
                 b.Property(x => x.MaterialVoucherNo).HasMaxLength(150);
                 b.Property(x => x.Factory).HasMaxLength(50);
                 b.Property(x => x.MaterialCode).IsRequired().HasMaxLength(150);
@@ -675,7 +672,7 @@ namespace Win.Sfs.SettleAccount
                 b.Property(x => x.AcceptanceNo).HasMaxLength(50);
 
                 //创建组合索引
-                b.HasIndex(x => new { x.Version, x.HQHKanBan, x.MaterialCode }).IsUnique().HasFilter(IsDeletedFilter);
+                //b.HasIndex(x => new { x.Version, x.HQHKanBan, x.MaterialCode }).IsUnique().HasFilter(IsDeletedFilter);
 
             });
         }

vue/src/views/ux/vw/dataInput/hq_h_report/index.vue

@@ -106,33 +106,6 @@
         </template>
       </el-table-column>
 
-      <!-- 操作名称 -->
-      <!-- <el-table-column
-        prop="actionName"
-        label="操作名称(单击箭头过滤)"
-        width="165"
-        column-key="actionName"
-        :filters="[
-          { text: '导出', value: '导出' },
-          { text: '消息', value: '消息' },
-        ]"
-        filter-placement="bottom-end"
-        :filter-method="filterHandler"
-      >
-        <template slot-scope="scope">
-          <div align="center">
-            <el-tag
-              v-for="(item, index) in menuCateMap"
-              v-show="scope.row.actionName == item.value"
-              :key="index"
-              :type="item.cssName"
-            >
-              {{ item.label }}
-            </el-tag>
-          </div>
-        </template>
-      </el-table-column> -->
-      <!-- 状态 -->
       <el-table-column
         prop="stateName"
         label="状态(单击箭头过滤)"
@@ -230,7 +203,7 @@
           <el-col :md="4" :xs="24">
             <el-form-item label="选择版本" required />
           </el-col>
-          <el-col :md="20" :xs="24" style="margin-left: -80px">
+          <el-col :md="10" :xs="24" style="margin-left: -80px">
             <el-form-item prop="versionValue">
               <el-select
                 v-model="formCount.versionValue"
@@ -248,6 +221,22 @@
               </el-select>
             </el-form-item>
           </el-col>
+          <el-col :md="4" :xs="24">
+            <el-form-item label="发货状态" style="margin-left: 10px" />
+          </el-col>
+          <el-col :md="10" :xs="24" style="margin-left: -110px">
+            <el-form-item prop="BillStatus">
+              <el-select
+                size="medium"
+                v-model="formCount.BillStatus"
+                placeholder="请选择"
+                style="width: 188px; margin-right: 25px"
+              >
+                <el-option label="未发货" :value="1"></el-option>
+                <el-option label="已发货" :value="2"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
         </el-row>
         <el-row>
           <el-col :md="4" :xs="24">
@@ -261,7 +250,7 @@
                 multiple
                 filterable
                 clearable
-                style="width: 380px; margin-right: 15px"
+                style="width: 450px; margin-right: 15px"
                 @change="valueChange"
                 placeholder="请选择"
               >
@@ -277,66 +266,43 @@
                   }}</span>
                 </el-option>
               </el-select>
-              <!-- <el-select
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :md="4" :xs="24">
+            <el-form-item label="收货仓库描述" />
+          </el-col>
+          <el-col :md="20" :xs="24" style="margin-left: -80px">
+            <el-form-item prop="materialGroupValue">
+              <el-select
                 v-model="formCount.materialGroupValue"
-                class="my-el-select"
-                style="width: 350px; margin-right: 15px"
                 size="medium"
                 multiple
+                filterable
                 clearable
+                style="width: 450px; margin-right: 15px"
+                @change="valueChange"
                 placeholder="请选择"
               >
                 <el-option
                   v-for="item in materialGroupList"
-                  :key="item.label"
+                  :key="item.value"
                   :label="item.value"
-                  :value="item.label"
+                  :value="item.value"
                 >
                   <span style="float: left">{{ item.label }}</span>
                   <span style="float: right; color: #8492a6; font-size: 13px">{{
                     item.value
                   }}</span>
                 </el-option>
-              </el-select> -->
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :md="4" :xs="24">
-            <el-form-item label="CP5时间：" />
-          </el-col>
-          <el-col :md="10" :xs="24" style="margin-left: -80px">
-            <el-form-item>
-              <el-date-picker
-                v-model="cp5startTime"
-                :picker-options="pickerOptions2"
-                type="datetime"
-                size="small"
-                @change="getdateValueCp5"
-                value-format="yyyy-MM-dd HH:mm:ss"
-                default-time="00:00:00"
-              >
-              </el-date-picker>
-            </el-form-item>
-          </el-col>
-          <el-col :md="10" :xs="24" style="margin-left: -40px">
-            <el-form-item>
-              <el-date-picker
-                v-model="cp5endTime"
-                :picker-options="pickerOptions3"
-                type="datetime"
-                size="small"
-                @change="getdateValCp5"
-                value-format="yyyy-MM-dd HH:mm:ss"
-                default-time="23:59:59"
-              >
-              </el-date-picker>
+              </el-select>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :md="4" :xs="24">
-            <el-form-item label="CP7时间：" />
+            <el-form-item label="交货日期" />
           </el-col>
           <el-col :md="10" :xs="24" style="margin-left: -80px">
             <el-form-item prop="startTime">
@@ -371,45 +337,15 @@
         <el-collapse v-model="activeNames">
           <el-collapse-item name="1">
             <template slot="title">
-              其他搜索条件(单击折叠或伸展)<i
+              其他搜索条件(单击折叠或展开)<i
                 class="header-icon el-icon-info"
                 style="color: #37b328"
               ></i>
             </template>
-            <!-- <el-row>
-              <el-col :md="4" :xs="24">
-                <el-form-item label="KEEN号" />
-              </el-col>
-              <el-col :md="18" :xs="24" style="margin-left: -80px">
-                <el-form-item prop="kennCode">
-                  <el-input
-                    type="textarea"
-                    v-model="formCount.kennCode"
-                    style="width: 380px"
-                    :rows="4"
-                    placeholder="多个KENN号，请以回车换行形式添加！"
-                  />
-                </el-form-item>
-              </el-col>
-              <el-col :md="2" :xs="24">
-                <el-tooltip
-                  content="一键复制粘贴"
-                  placement="bottom"
-                  effect="light"
-                >
-                  <el-button
-                    type="primary"
-                    icon="el-icon-edit"
-                    circle
-                    @click="kennBtn"
-                  ></el-button>
-                </el-tooltip>
-              </el-col>
-            </el-row> -->
 
             <el-row>
               <el-col :md="4" :xs="24">
-                <el-form-item label="KEEN号" />
+                <el-form-item label="订货看板编号" />
               </el-col>
               <el-col :md="10" :xs="24" style="margin-left: -80px">
                 <el-form-item prop="kennCode">
@@ -418,12 +354,12 @@
                     v-model="formCount.kennCode"
                     style="width: 170px"
                     :rows="4"
-                    placeholder="多个KENN号，请以回车换行形式添加！"
+                    placeholder="多个订货看板编号，请以回车换行形式添加！"
                   />
                 </el-form-item>
               </el-col>
               <el-col :md="4" :xs="24">
-                <el-form-item label="底盘号" />
+                <el-form-item label="发货零件号" />
               </el-col>
               <el-col :md="10" :xs="24" style="margin-left: -95px">
                 <el-form-item prop="chassisNumber">
@@ -432,7 +368,7 @@
                     style="width: 170px"
                     type="textarea"
                     :rows="4"
-                    placeholder="多个底盘号，请以回车换行形式添加！"
+                    placeholder="多个发货零件号，请以回车换行形式添加！"
                   />
                 </el-form-item>
               </el-col>
@@ -440,7 +376,7 @@
 
             <el-row>
               <el-col :md="4" :xs="24">
-                <el-form-item label="客户零件号" />
+                <el-form-item label="结算验收单号" />
               </el-col>
               <el-col :md="10" :xs="24" style="margin-left: -80px">
                 <el-form-item prop="materialCode">
@@ -449,12 +385,12 @@
                     style="width: 170px"
                     type="textarea"
                     :rows="4"
-                    placeholder="多个客户零件号，请以回车换行形式添加！"
+                    placeholder="多个结算验收单号，请以回车换行形式添加！"
                   />
                 </el-form-item>
               </el-col>
               <el-col :md="4" :xs="24">
-                <el-form-item label="厂内零件号" />
+                <el-form-item label="结算零件号" />
               </el-col>
               <el-col :md="10" :xs="24" style="margin-left: -95px">
                 <el-form-item prop="sapCode">
@@ -463,6 +399,23 @@
                     style="width: 170px"
                     type="textarea"
                     :rows="4"
+                    placeholder="多个结算零件号，请以回车换行形式添加！"
+                  />
+                </el-form-item>
+              </el-col>
+            </el-row>
+
+            <el-row>
+              <el-col :md="4" :xs="24">
+                <el-form-item label="SAP编号" />
+              </el-col>
+              <el-col :md="10" :xs="24" style="margin-left: -80px">
+                <el-form-item prop="sapCode">
+                  <el-input
+                    v-model="formCount.sapCode"
+                    style="width: 450px"
+                    type="textarea"
+                    :rows="4"
                     placeholder="多个厂内零件号，请以回车换行形式添加！"
                   />
                 </el-form-item>
@@ -573,19 +526,6 @@ export default {
           return time.getTime() <= new Date(this.startTime).getTime();
         },
       },
-
-      pickerOptions2: {
-        disabledDate: (time) => {
-          //if (this.endTime != "") {
-          return time.getTime() > new Date(this.cp5endTime).getTime();
-          //}
-        },
-      },
-      pickerOptions3: {
-        disabledDate: (time) => {
-          return time.getTime() <= new Date(this.cp5startTime).getTime();
-        },
-      },
       pickerOptionsCp7: {
         disabledDate: (time) => {
           let now = new Date();
@@ -637,8 +577,6 @@ export default {
       formCount: {
         startTime: "",
         endTime: "",
-        cp5startTime: "",
-        cp5endTime: "",
         // name: "未结算对比",
         // settledate: "",
         // materialCode: "",
@@ -647,8 +585,6 @@ export default {
         // kennCode: "",
         // version: "",
       },
-      cp5startTime: "",
-      cp5endTime: "",
       dataKenCode: "",
       datachassisNumber: "",
       datamaterialCode: "",
@@ -1129,15 +1065,6 @@ export default {
       this.getbalanceIndexData();
     },
 
-    //cp5
-    getdateValueCp5(val) {
-      this.cp5startTime = val;
-      this.getbalanceIndexData();
-    },
-    getdateValCp5(val) {
-      this.cp5endTime = val;
-      this.getbalanceIndexData();
-    },
     getCurrentMonthFirst() {
       var date = new Date();
       date.setDate(1);
@@ -1224,8 +1151,6 @@ export default {
       this.datetime5 = [];
       this.startTime = "";
       this.endTime = "";
-      this.cp5startTime = "";
-      this.cp5endTime = "";
     },
     save() {
       this.$refs.formCount.validate((valid) => {
@@ -1241,16 +1166,10 @@ export default {
           if (this.formCount.kennCode != "") {
             this.listExportQuery.kenncode = this.formCount.kennCode; //KEEN号
           }
-          this.listExportQuery.begin = this.cp5startTime
-            ? this.cp5startTime
-            : undefined;
-          this.listExportQuery.end = this.cp5endTime
-            ? this.cp5endTime
-            : undefined;
-          this.listExportQuery.cp7Begin = this.startTime
+          this.listExportQuery.begin = this.startTime
             ? this.startTime
             : undefined;
-          this.listExportQuery.cp7End = this.endTime ? this.endTime : undefined;
+          this.listExportQuery.end = this.endTime ? this.endTime : undefined;
           if (this.formCount.chassisNumber != "") {
             this.listExportQuery.chassisNumber = this.formCount.chassisNumber; //底盘号
           }
@@ -1302,8 +1221,6 @@ export default {
       this.datetime5 = [];
       this.startTime = "";
       this.endTime = "";
-      this.cp5startTime = "";
-      this.cp5endTime = "";
       this.dialogFormVisible = true;
     },
     kennBtn() {

vue/src/views/ux/vw/dataInput/hq_y/index.vue

@@ -46,7 +46,7 @@
         v-model="searchContent"
         clearable
         size="small"
-        placeholder="按照看板号搜索..."
+        placeholder="按照看板编号搜索..."
         style="width: 200px"
         class="search-container"
         @keyup.enter.native="handleFilter"
@@ -534,7 +534,7 @@ export default {
       this.getList();
       this.listQuery.Filters = [];
       if (this.searchContent != "") {
-        var column = "btCarKanBan";
+        var column = "kanbanNumber";
         let filter = {
           logic: 0,
           column: column,