Merge branch 'master' of http://test.siger-data.com:9000/jiawei.su/Laisi_AutoMES2

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

@@ -211,7 +211,7 @@ namespace Siger.ApiACC.Controllers
             var entity = new siger_automation_location
             {
                 guid = Guid.NewGuid().ToString(),
-                locationid = location.locationid,
+                locationid = location.id,
                 fixturetools = fixturetool.guid,
                 productid= fixturetoolProduct != null ? fixturetoolProduct.productid : 0,
                 productcode = fixturetoolProduct!=null? fixturetoolProduct.productcode:"",
@@ -263,7 +263,7 @@ namespace Siger.ApiACC.Controllers
                 throw new BadRequestException(RequestEnum.DataExist);
             }
 
-            entity.locationid = location.locationid;
+            entity.locationid = location.id;
             entity.fixturetools = fixturetool.guid;
             entity.attachment = req.fileurl;
             entity.filename = req.filename;

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

@@ -29,7 +29,7 @@ namespace Siger.Middlelayer.AccRepository.Repositories
             var query = from q in _context.siger_automation_location
                         join t in _context.siger_automation_fixture_tools on q.fixturetools equals t.guid
                         join c in _context.siger_automation_fixture_tools_category on t.category equals c.guid
-                        join l in _context.siger_wms_storage_location on q.locationid equals l.locationid
+                        join l in _context.siger_wms_storage_location on q.locationid equals l.id
                         join w in _context.siger_wms_storage on l.storageid equals w.id
                         join u in _context.siger_project_user on q.updator equals u.mid into uu
                         from u in uu.DefaultIfEmpty()
@@ -100,14 +100,14 @@ namespace Siger.Middlelayer.AccRepository.Repositories
             var query = from q in _context.siger_automation_location
                         join t in _context.siger_automation_fixture_tools on q.fixturetools equals t.guid
                         join c in _context.siger_automation_fixture_tools_category on t.category equals c.guid
-                        join l in _context.siger_wms_storage_location on q.locationid equals l.locationid
+                        join l in _context.siger_wms_storage_location on q.locationid equals l.id
                         join w in _context.siger_wms_storage on l.storageid equals w.id
                         where q.projectId == projectid && q.status == (int)RowState.Valid
                         select new ResponseAutomationLocationList
                         {
                             id = q.id,
                             fixtureguid = t.guid,
-                            locationid = l.locationid,
+                            locationid = l.id,
                             location = l.realname,
                             locationcode = l.serial_number,
                             wavehouseid = w.id,