fix bug

Html/src/locale/lang/en-US.js

@@ -742,6 +742,7 @@ export default {
     '9000517': '请填写子工装编号',
     '9000518': '请填写储位ID',
     '9000519': '请填写仓库名称',
+    '9000520': '请输入工件编号',
 
     '9100000': 'Departments cannot be empty',
     '9100001': 'Position cannot be empty',

Html/src/locale/lang/zh-CN.js

@@ -769,6 +769,7 @@ export default {
     '9000517': '请填写子工装编号',
     '9000518': '请填写储位ID',
     '9000519': '请填写仓库名称',
+    '9000520': '请输入工件编号',
 
 
     '9100000': '部门不能为空',

Html/src/view/fml/operation_manage/feedingBlanking.vue

@@ -295,7 +295,7 @@ export default {
                 },
                 {
                     title: "储位编号",
-                    key: "locationcode",
+                    key: "locationid",
                 },
                 {
                     title: "工装编号",
@@ -318,7 +318,7 @@ export default {
                 },
                 {
                     title: "储位编号",
-                    key: "locationcode",
+                    key: "locationid",
                 },
                 {
                     title: "工装编号",

Server/Apis/Siger.ApiACC/Controllers/QmsCheckController.cs

@@ -38,13 +38,15 @@ namespace Siger.ApiACC.Controllers
         private readonly ISigerTrMaterialsRepository _materialsRepository;
         private readonly IAutomationTaskListRepository _automationTaskList;
         private readonly IAutomationFixtureMonitor _fixtureMonitor;
+        private readonly IProductionBeatSetRepository _beatSetRepository;
 
         public QmsCheckController(IUnitOfWork unitOfWork, IAutomationFixtureToolsProductRepository automationFixtureToolsProduct,
             ISigerProjectProductRepository productRepository, ISigerProjectLevelRepository levelRepository,
             ISigerProjectLevelSectionRepository levelSectionRepository, IInspectStandardRepository inspectStandard,
             ICheckSnTraceInspectionRepository traceInspectionRepository, ICheckSnTraceDetailRepository traceDetailRepository,
             ICheckSnListRepository checkSnListRepository, ISigerTrMaterialsRepository materialsRepository,
-            IAutomationTaskListRepository automationTaskListRepository, IAutomationFixtureMonitor fixtureMonitor)
+            IAutomationTaskListRepository automationTaskListRepository, IAutomationFixtureMonitor fixtureMonitor,
+            IProductionBeatSetRepository beatSetRepository)
         {
             _unitOfWork = unitOfWork;
             _automationFixtureToolsProduct = automationFixtureToolsProduct;
@@ -58,6 +60,7 @@ namespace Siger.ApiACC.Controllers
             _materialsRepository = materialsRepository;
             _automationTaskList = automationTaskListRepository;
             _fixtureMonitor = fixtureMonitor;
+            _beatSetRepository = beatSetRepository;
         }
         [HttpPost]
         public IActionResult AddManual([FromBody]RequestAddDataCollection req)
@@ -68,6 +71,15 @@ namespace Siger.ApiACC.Controllers
             {
                 throw new BadRequestException(RequestEnum.ProductNotFound);
             }
+            var route = _beatSetRepository.Get(q => q.projectID == ProjectId && q.status == (int)RowState.Valid && q.id == req.routeid.ToInt());
+            if (route == null)
+            {
+                throw new BadRequestException(RequestEnum.ProcessNotFind);
+            }
+            if (string.IsNullOrEmpty(req.sn))
+            {
+                throw new BadRequestException(RequestEnum.PleaseInputPartSerialNumber);
+            }
             var maxLevel = _levelRepository.GetList(t => t.status == (int)RowState.Valid && t.projectid == ProjectId).Max(q => q.id);
             var section = _levelSectionRepository.Get(t => t.status == (int)RowState.Valid && t.projectid == ProjectId && t.id == req.sectionid);
             if (section == null || section.levelid != maxLevel)

Server/Common/Siger.Middlelayer.Share/Enum/RequestEnum.cs

@@ -1544,5 +1544,8 @@ namespace Siger.Middlelayer.Common
 
         [Description("请填写仓库名称")]
         PleaseInputWarehouseName,
+
+        [Description("请输入工件编号")]
+        PleaseInputPartSerialNumber,
     }
 }