some update

Html/src/view/qms/analysis/datasearch.vue

@@ -123,6 +123,10 @@
                 <Input class="searchInput" type="text" id="input1" v-model="editobj.checktype_value" disabled="disabled" />
               </div>
               <div class="filter">
+                <label >{{$t('950232')}}：</label>
+                <Input class="searchInput" type="text" id="input1" v-model="editobj.routename" disabled="disabled" />
+              </div>
+              <div class="filter">
                 <label >{{$t('800008')}}：</label>
                 <Input class="searchInput" type="text" id="input1" v-model="editobj.sn" disabled="disabled" />
               </div>
@@ -330,10 +334,6 @@ export default{
                     title: this.$t('100089'),
                     key: 'productcode'
                 },
-                // {
-                //   title: this.$t('500006'),
-                //   key: 'routename'
-                // },
                 {
                     title: this.$t('100088'),
                     key: 'productname'
@@ -347,6 +347,10 @@ export default{
                     key: 'workorder'
                 },
                 {
+                    title: this.$t('950232'),
+                    key: 'routename'
+                },
+                {
                     title: this.$t('800008'),
                     key: 'sn'
                 },

Html/src/view/qms/manual/collection.vue

@@ -678,6 +678,7 @@ export default {
                         this.stationList = res.data.data;
                         this.station = this.stationList[0];
                         this.initproduct(this.station.id);
+                        this.initSn(this.station.id);
                     });
             }
         },
@@ -719,7 +720,7 @@ export default {
                 axios
                     .request({
                         url:
-                            "/acc/SectionProperty/GetSn?productId=" + productid + "&sectionId=" + sectionid,
+                            "/acc/SectionProperty/GetSn?sectionId=" + sectionid,
                         method: "get",
                     })
                     .then((res) => {

Server/Common/Siger.Middlelayer.Utility/ImportEntities/ManualCollectionList.cs

@@ -14,14 +14,13 @@ namespace Siger.Middlelayer.Utility.ImportEntities
         [ExcelColumn("产品名称")]
         public string ProductName { get; set; }
 
-        [ExcelColumn("工序")]
-        public string RouteName { get; set; }
-
         [ExcelColumn("位置")]
         public string Section { get; set; }
 
         [ExcelColumn("工单")]
         public string WorkOrder { get; set; }
+        [ExcelColumn("工艺")]
+        public string RouteName { get; set; }
         [ExcelColumn("二维码")]
         public string SN { get; set; }
         [ExcelColumn("偏差放行数量")]

Server/Infrastructure/Repositories/Siger.Middlelayer.AccRepository/Repositories/AutomationLocationRepository.cs

@@ -35,7 +35,7 @@ namespace Siger.Middlelayer.AccRepository.Repositories
                         from u in uu.DefaultIfEmpty()
                         join m in _context.siger_automation_fixture_tools_moniter on q.fixturetools equals m.fixtureguid into mm
                         from m in mm.DefaultIfEmpty()
-                        join r in _context.siger_project_product_route on m.route equals r.id into rr
+                        join r in _context.siger_project_beat_set on m.route equals r.id into rr
                         from r in rr.DefaultIfEmpty()
                         where q.projectId == projectid && q.status == (int)RowState.Valid
                         select new ResponseAutomationLocation
@@ -58,8 +58,8 @@ namespace Siger.Middlelayer.AccRepository.Repositories
                             status = q.status,
                             updatetime = q.updatetime.HasValue && q.updatetime > DateTime.MinValue ? q.updatetime.Value.ToString(ParameterConstant.DateTimeFormat) : "",
                             sn = m.sn ?? "",
-                            route = r.name ?? "",
-                            routenumber = r == null ? "" : r.serialNumber.ToString(),
+                            route = r.route_name ?? "",
+                            routenumber = r == null ? "" : r.route_number.ToString(),
                             cate_guid = c.guid ?? "",
                             categoryId = c == null ? 0 : c.id
                         };

Server/Infrastructure/Repositories/Siger.Middlelayer.QmsRepository/ApiQmsDbContext.cs

@@ -157,5 +157,7 @@ namespace Siger.Middlelayer.QmsRepository
 
         public DbSet<siger_tr_sn_trace_detail> siger_tr_sn_trace_detail { get; set; }
 
+        public DbSet<siger_project_beat_set> siger_project_beat_set { get; set; }
+
     }
 }

Server/Infrastructure/Repositories/Siger.Middlelayer.QmsRepository/Entities/siger_project_beat_set.cs

+using System;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace Siger.Middlelayer.QmsRepository.Entities
+{
+    /// <summary>
+    /// siger_project_beat_set Entity Model
+    /// </summary>   
+    public class siger_project_beat_set: QmsEntityBase
+    {
+        /// <summary>
+        /// 产线id
+        /// </summary>
+        public int section_id { get; set; }
+   
+        /// <summary>
+        /// 设备id
+        /// </summary>
+        public int machineID { get; set; }
+   
+        /// <summary>
+        /// 加工程序号
+        /// </summary>
+        public string process_number { get; set; }
+   
+        /// <summary>
+        /// 产品名称 编号
+        /// </summary>
+        public string product_name { get; set; }
+   
+        /// <summary>
+        /// 产品图纸号
+        /// </summary>
+        public string drawing_number { get; set; }
+   
+        /// <summary>
+        /// 标准节拍(单位/ 秒 S )
+        /// </summary>
+        public int standard_besat { get; set; }
+   
+        /// <summary>
+        /// 日标准产量(单位/pcs个)
+        /// </summary>
+        public int daily_standard_output { get; set; }
+   
+        /// <summary>
+        /// 添加时间
+        /// </summary>
+        public DateTime add_time { get; set; }
+   
+        /// <summary>
+        /// 修改时间
+        /// </summary>
+        public DateTime? edit_time { get; set; }
+   
+        /// <summary>
+        /// 产品名称
+        /// </summary>
+        public string product_name_text { get; set; }
+
+        /// <summary>
+        /// 换型时间
+        /// </summary>
+        public int changemodeltime { get; set; }
+
+        /// <summary>
+        /// 工序顺序
+        /// </summary>
+        public string route_number { get; set; } = "";
+
+        /// <summary>
+        /// 工序名称
+        /// </summary>
+        public string route_name { get; set; }
+
+        /// <summary>
+        /// 上下料时间
+        /// </summary>
+        public double updown_besat { get; set; }
+
+        /// <summary>
+        /// 产量比率
+        /// </summary>
+        public int yieldrate { get; set; }
+
+        /// <summary>
+        /// 有效开始时间
+        /// </summary>
+        public DateTime start_time { get; set; }
+
+        /// <summary>
+        /// 有效结束时间
+        /// </summary>
+        public DateTime end_time { get; set; }
+    }
+}

Server/Infrastructure/Repositories/Siger.Middlelayer.QmsRepository/Repositories/CheckSnTraceDetailRepository.cs

@@ -38,7 +38,7 @@ namespace Siger.Middlelayer.QmsRepository.Repositories
                             from m in mm.DefaultIfEmpty()
                             join s in _context.siger_project_level_section on q.sectionid equals s.id into ss
                             from s in ss.DefaultIfEmpty()
-                            join r in _context.siger_project_product_route on q.routeid equals r.id into rr
+                            join r in _context.siger_project_beat_set on q.routeid equals r.id into rr
                             from r in rr.DefaultIfEmpty()
                             join u1 in _context.siger_project_user on q.send_mid equals u1.mid into uu1
                             from u1 in uu1.DefaultIfEmpty()
@@ -60,7 +60,7 @@ namespace Siger.Middlelayer.QmsRepository.Repositories
                                 check_time = (q.check_time.HasValue && q.check_time != DateTime.Now) ?
                                     q.check_time.Value.ToString(ParameterConstant.DateTimeFormat) : "",
                                 routeid = q.routeid,
-                                routename = r.name ?? "",
+                                routename = r.route_name ?? "",
                                 materialid = q.materialid,
                                 materialname = m.name ?? "",
                                 materialpn = m.pn ?? "",

Server/Infrastructure/Repositories/Siger.Middlelayer.QmsRepository/Repositories/CheckSnTraceInspectionRepository.cs

@@ -34,7 +34,7 @@ namespace Siger.Middlelayer.QmsRepository.Repositories
                             join s in _context.siger_project_level_section on q.sectionid equals s.id
                             join m in _context.siger_tr_materials on q.materialid equals m.id into mm
                             from m in mm.DefaultIfEmpty()
-                            join r in _context.siger_project_product_route on q.routeid equals r.id into rr
+                            join r in _context.siger_project_beat_set on q.routeid equals r.id into rr
                             from r in rr.DefaultIfEmpty()
                             join u1 in _context.siger_user on q.send_mid equals u1.id into uu1
                             from u1 in uu1.DefaultIfEmpty()