fix bug

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

@@ -26,31 +26,24 @@ namespace Siger.ApiACC.Controllers
         private readonly ISigerTrMaterialsRepository _materialsRepository;
 
         public AutomationLocationController(IUnitOfWork unitOfWork, IAutomationFixtureToolsCategoryRepository toolsCategoryRepository, 
-            IAutomationFixtureToolsRepository toolsRepository, IAutomationLocationRepository autoLocationRepository, 
-            ISigerTrMaterialsRepository materialsRepository)
+            IAutomationFixtureToolsRepository toolsRepository, IAutomationLocationRepository autoLocationRepository)
         {
             _unitOfWork = unitOfWork;
             _toolsCategoryRepository = toolsCategoryRepository;
             _toolsRepository = toolsRepository;
             _autoLocationRepository = autoLocationRepository;
-            _materialsRepository = materialsRepository;
         }
 
         public IActionResult GetPageList(string wavehouseid, string locationid, int page, int pagesize)
         {
             var data = _autoLocationRepository.GetPagedList(wavehouseid.ToInt(), locationid.ToInt(), ProjectId, page, pagesize);
-            var list = new List<ResponseAutomationLocation>();
-            foreach(var item in data.Data)
-            {
-
-            }
             return new PagedObjectResult(data.Data, data.Total, page, pagesize);
         }
 
         [HttpPost]
         public IActionResult Add([FromBody]RequestAddAutomationLocation req)
         {
-            if (string.IsNullOrEmpty(req.locationid) || string.IsNullOrEmpty(req.fixturetoolid) || string.IsNullOrEmpty(req.materialid))
+            if (string.IsNullOrEmpty(req.locationid) || string.IsNullOrEmpty(req.fixturetoolid))
             {
                 throw new BadRequestException(RequestEnum.ParameterMiss);
             }
@@ -64,31 +57,13 @@ namespace Siger.ApiACC.Controllers
             {
                 throw new BadRequestException(RequestEnum.LocationNull);
             }
-            var material = _materialsRepository.Get(q => q.id == req.materialid.ToInt() && q.projectId == ProjectId && q.status == (int)RowState.Valid);
-            var data = _autoLocationRepository.Get(q => q.projectId == ProjectId && q.status == (int)RowState.Valid && q.fixturetools == fixturetool.guid &&
-                q.locationid == req.locationid.ToInt());
-            if (data != null)
+            var exsit = _autoLocationRepository.Get(q => q.projectId == ProjectId && q.status == (int)RowState.Valid &&
+                (q.fixturetools == req.fixturetoolid || q.locationid == req.locationid.ToInt()));
+            if(exsit != null)
             {
                 throw new BadRequestException(RequestEnum.DataExist);
             }
 
-            var state = 1;
-            if (fixturetool != null && material == null)
-            {
-                state = 1;//有工装 无工件
-            }
-            else if(fixturetool != null && material != null)
-            {
-                state = 2;//有工装 有工件
-            }
-            else if (fixturetool == null && material == null)
-            {
-                state = 3;//无工装 无工件
-            }
-            else if (fixturetool == null && material != null)
-            {
-                state = 4;//无工装 有工件
-            }
             var entity = new siger_automation_location
             {
                 guid = Guid.NewGuid().ToString(),
@@ -120,6 +95,10 @@ namespace Siger.ApiACC.Controllers
                 throw new BadRequestException(RequestEnum.ParameterMiss);
             }
             var entity = _autoLocationRepository.Get(q => q.id == req.id && q.projectId == ProjectId && q.status == (int)RowState.Valid);
+            if(entity == null)
+            {
+                throw new BadRequestException(CommonEnum.RecordNotFound);
+            }
             var fixturetool = _toolsRepository.Get(q => q.id == req.fixturetoolid.ToInt() && q.projectId == ProjectId);
             if (fixturetool == null)
             {
@@ -130,13 +109,13 @@ namespace Siger.ApiACC.Controllers
             {
                 throw new BadRequestException(RequestEnum.LocationNull);
             }
-            var material = _materialsRepository.Get(q => q.id == req.materialid.ToInt() && q.projectId == ProjectId && q.status == (int)RowState.Valid);
-            var data = _autoLocationRepository.Get(q => q.projectId == ProjectId && q.status == (int)RowState.Valid && q.fixturetools == fixturetool.guid &&
-                q.locationid == req.locationid.ToInt() && q.id != req.id);
-            if (data != null)
+            var exsit = _autoLocationRepository.Get(q => q.projectId == ProjectId && q.status == (int)RowState.Valid &&
+                (q.fixturetools == req.fixturetoolid || q.locationid == req.locationid.ToInt()) && q.id != req.id);
+            if (exsit != null)
             {
                 throw new BadRequestException(RequestEnum.DataExist);
             }
+
             entity.locationid = req.locationid.ToInt();
             entity.fixturetools = fixturetool.guid;
             entity.attachment = req.fileurl;

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

@@ -127,7 +127,7 @@ namespace Siger.ApiACC.Controllers
             entity.updator = UserId;
             entity.filename = req.filename;
             entity.attachment = req.fileurl;
-            _toolsProductRepository.Insert(entity);
+            _toolsProductRepository.Update(entity);
             if (_unitOfWork.Commit() > 0)
             {
                 return new ObjectResult(CommonEnum.Succefull);

Server/Infrastructure/Repositories/Siger.Middlelayer.AccRepository/Entities/siger_automation_location.cs

@@ -5,7 +5,7 @@ using System.Text;
 namespace Siger.Middlelayer.AccRepository.Entities
 {
     /// <summary>
-    /// 储位信息
+    /// 储位工装信息
     /// </summary>
     public class siger_automation_location : AccEntityBase
     {

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

@@ -43,12 +43,6 @@ namespace Siger.Middlelayer.AccRepository.Repositories
                             category = c.name,
                             code = t.code,
                             specfication = t.specification,
-                            //materialid = q.materialid,
-                            //materialcode = m.pn,
-                            //processid = q.processid,
-                            //processnumber = p == null ? 0 : p.Process_Seq,
-                            //processname = p.Process_name ?? "",
-                            //materialstate = q.materialstate,
                             fileurl = q.attachment ?? "",
                             filename = q.filename ?? "",
                             remark = q.remark,

Server/Infrastructure/Repositories/Siger.Middlelayer.AccRepository/Request/RequestFixtureToolsCategory.cs

@@ -109,14 +109,6 @@ namespace Siger.Middlelayer.AccRepository.Request
         /// </summary>
         public string fixturetoolid { get; set; }
         /// <summary>
-        /// 物料ID
-        /// </summary>
-        public string materialid { get; set; }
-        /// <summary>
-        /// 工序ID
-        /// </summary>
-        public string processid { get; set; }
-        /// <summary>
         /// 附件
         /// </summary>
         public string fileurl { get; set; }

Server/Infrastructure/Repositories/Siger.Middlelayer.AccRepository/Response/ResponseAutomationLocation.cs

@@ -23,16 +23,11 @@ namespace Siger.Middlelayer.AccRepository.Response
         public string code { get; set; }
         public string specfication { get; set; }
         /// <summary>
-        /// 物料ID
+        /// 工件
         /// </summary>
-        public int materialid { get; set; }
-        public string materialcode { get; set; }
-        /// <summary>
-        /// 工序ID
-        /// </summary>
-        public int processid { get; set; }
-        public int processnumber { get; set; }
-        public string processname { get; set; }
+        public string sn { get; set; }
+        public string routenumber { get; set; }
+        public string route { get; set; }
         /// <summary>
         /// 物料状态
         /// </summary>