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

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

@@ -71,7 +71,7 @@ namespace Siger.ApiACC.Controllers
                     item.materialstate = 4;//无工装有工件
                 }
 
-                var loca = locations.FirstOrDefault(q => q.locationid == item.locaid);
+                var loca = locations.FirstOrDefault(q => q.id == item.locationid);
                 if(loca != null)
                 {
                     var locas = GetParentLocations(loca.id, locations);
@@ -211,7 +211,8 @@ namespace Siger.ApiACC.Controllers
             var entity = new siger_automation_location
             {
                 guid = Guid.NewGuid().ToString(),
-                locationid = location.id,
+                locationid = location.locationid,
+                location_cid = location.id,
                 fixturetools = fixturetool.guid,
                 productid= fixturetoolProduct != null ? fixturetoolProduct.productid : 0,
                 productcode = fixturetoolProduct!=null? fixturetoolProduct.productcode:"",
@@ -263,7 +264,8 @@ namespace Siger.ApiACC.Controllers
                 throw new BadRequestException(RequestEnum.DataExist);
             }
 
-            entity.locationid = location.id;
+            entity.locationid = location.locationid;
+            entity.location_cid = location.id;
             entity.fixturetools = fixturetool.guid;
             entity.attachment = req.fileurl;
             entity.filename = req.filename;

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

@@ -357,9 +357,6 @@ namespace Siger.ApiACC.Controllers
             }
             //移出 上料位
             monitor.status = (int)Automation.MachineStatus.Waiting;
-
-       
-
             var taskNo = _automationTaskList.CrateTaskNumber(Automation.TaskTrigerType.Manual);
             _automationTaskList.Insert(new siger_automation_task_list
             {

Server/Apis/Siger.ApiWMS/Controllers/LocationController.cs

@@ -940,7 +940,7 @@ namespace Siger.ApiWMS.Controllers
                 if (Location.id == locationTypeId)
                 {
                     var locationIdExist = location.Get(q => q.projectid == ProjectId && q.status == (int)RowState.Valid && q.typeid == locationTypeId &&
-                        q.locationid == req.storeID.ToInt());
+                        q.locationid == req.storeID.ToInt() && q.storageid == req.warehouseid);
                     if (locationIdExist != null)
                     {
                         throw new BadRequestException(RequestEnum.IDExist);
@@ -1074,7 +1074,7 @@ namespace Siger.ApiWMS.Controllers
                 if(Location.id == locationTypeId)
                 {
                     var locationIdExist = location.Get(q => q.projectid == ProjectId && q.status == (int)RowState.Valid && q.typeid == locationTypeId &&
-                        q.locationid == req.storeID.ToInt() && q.id != Location.locationid.ToInt());
+                        q.locationid == req.storeID.ToInt() && q.id != Location.locationid.ToInt() && q.storageid == req.warehouseid);
                     if (locationIdExist != null)
                     {
                         throw new BadRequestException(RequestEnum.IDExist);

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

@@ -190,6 +190,8 @@ namespace Siger.Middlelayer.Utility.ImportEntities
 
     public class AutomationLocationTemplate : ImportBase
     {
+        [ExcelColumn("*仓库名称")]
+        public string Warehouse { get; set; }
         [ExcelColumn("*储位ID")]
         public string LocationId { get; set; }
 

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

@@ -11,6 +11,10 @@ namespace Siger.Middlelayer.AccRepository.Entities
     {
         public string guid { get; set; }
         /// <summary>
+        /// 储位自增ID
+        /// </summary>
+        public int location_cid { get; set; }
+        /// <summary>
         /// 储位位置
         /// </summary>
         public int locationid { get; set; }
@@ -18,9 +22,11 @@ namespace Siger.Middlelayer.AccRepository.Entities
         /// 工装GUID
         /// </summary>
         public string fixturetools { get; set; }
+
+        public string fixturename { get; set; }
         public int productid { get; set; }
         public string productcode { get; set; }
-
+        public string productname { get; set; }
         /// <summary>
         /// 工件对应的工单号
         /// </summary>

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

@@ -20,6 +20,10 @@ namespace Siger.Middlelayer.AccRepository.Entities
         /// </summary>
         public string fixtureguid { get; set; }
         /// <summary>
+        /// 工装Name
+        /// </summary>
+        public string fixturename { get; set; }
+        /// <summary>
         /// 工位ID
         /// </summary>
         public int sectionid { get; set; }
@@ -47,6 +51,7 @@ namespace Siger.Middlelayer.AccRepository.Entities
         /// 产品code
         /// </summary>
         public string productcode { get; set; }
+        public string productname { get; set; }
         /// <summary>
         /// 工序ID
         /// </summary>

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.id
+                        join l in _context.siger_wms_storage_location on q.location_cid 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.id
+                        join l in _context.siger_wms_storage_location on q.location_cid 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.id,
+                            locationid = l.locationid,
                             location = l.realname,
                             locationcode = l.serial_number,
                             wavehouseid = w.id,
@@ -142,7 +142,12 @@ namespace Siger.Middlelayer.AccRepository.Repositories
                 {
                     errors.Add($"{rowIndex},{(int)RequestEnum.FixtureToolNotFound}");
                 }
-                var location = _context.siger_wms_storage_location.FirstOrDefault(q => q.locationid == item.LocationId.ToInt() && q.projectId == projectid && q.status == (int)RowState.Valid);
+                var warehouse = _context.siger_wms_storage.FirstOrDefault(q => q.status == (int)RowState.Valid && q.projectId == projectid && q.name == item.Warehouse);
+                if(warehouse == null)
+                {
+                    errors.Add($"{rowIndex},{(int)RequestEnum.WaveHouseIDNotExist}");
+                }
+                var location = _context.siger_wms_storage_location.FirstOrDefault(q => q.locationid == item.LocationId.ToInt() && q.storageid == warehouse.id && q.projectId == projectid && q.status == (int)RowState.Valid);
                 if (location == null || item.LocationId.ToInt() <= 0)
                 {
                     errors.Add($"{rowIndex},{(int)RequestEnum.LocationNull}");
@@ -166,7 +171,7 @@ namespace Siger.Middlelayer.AccRepository.Repositories
                 var entity = new siger_automation_location
                 {
                     guid = Guid.NewGuid().ToString(),
-                    locationid = item.LocationId.ToInt(),
+                    locationid = location.id,
                     fixturetools = fixturetool.guid,
                     attachment = "",
                     filename = "",

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

@@ -32,10 +32,13 @@ namespace Siger.Middlelayer.AccRepository.Response
     public class ResponseAutomationLocationRouteInfo
     {
         public string fixture { get; set; }
+        public string fixturename { get; set; }
         public string ordernumber { get; set; }
         public string sn { get; set; }
         public int location { get; set; }
+        public int productId { get; set; }
         public string productCode { get; set; }
+        public string productName { get; set; }
         public string route { get; set; }
         public string pn { get; set; }
 

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

@@ -8,9 +8,12 @@ namespace Siger.Middlelayer.AccRepository.Response
     {
         public int id { get; set; }
         /// <summary>
-        /// 储位位置
+        /// 储位自增ID
         /// </summary>
         public int locationid { get; set; }
+        /// <summary>
+        /// 储位填写ID
+        /// </summary>
         public int locaid { get; set; }
         public string location { get; set; }
         public int wavehouseid { get; set; }

Server/Infrastructure/Script/DB.script

@@ -270,8 +270,11 @@ CREATE TABLE IF NOT EXISTS `siger_automation_location`  (
    `guid` varchar(45) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL,
   `locationid` int(11) NOT NULL DEFAULT 0 COMMENT '储位位置',
   `fixturetools` varchar(45) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '工装GUID',
+  `fixturename` varchar(45) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '工装GUID',
+  `productid` int(11) NULL DEFAULT 0 COMMENT '产品ID',
   `productid` int(11) NULL DEFAULT 0 COMMENT '产品ID',
   `productcode` varchar(200) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '产品CODE',
+  `productname` varchar(200) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '产品name',
   `ordernumber` varchar(200) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '工件对应工单号',
   `sn` varchar(200) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '工件',
   `routeid` int(11) NULL DEFAULT 0,
@@ -333,6 +336,7 @@ CREATE TABLE IF NOT EXISTS `siger_automation_task_list`  (
   `id` int(11) NOT NULL AUTO_INCREMENT,
   `no` varchar(45) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL,
   `fixtureguid` varchar(45) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '工装GUID',
+  `fixturename` varchar(45) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '工装name',
   `sectionid` int(11) NOT NULL DEFAULT 0 COMMENT '工位ID',
   `trigger` int(1) NOT NULL DEFAULT 0 COMMENT '触发方',
   `tasktype` int(1)  NOT NULL DEFAULT 0 COMMENT '任务类型',
@@ -340,6 +344,7 @@ CREATE TABLE IF NOT EXISTS `siger_automation_task_list`  (
   `ordercode` varchar(200) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '工单号',
   `productid` int(11) NOT NULL DEFAULT 0 COMMENT '产品ID',
   `productcode` varchar(200) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '产品CODE',
+  `productname` varchar(200) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '产品NAME',
   `processid` int(11) NOT NULL DEFAULT 0 COMMENT '工序ID',
   `programnumber` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '程序号',
   `locationid` int(11) NOT NULL COMMENT '储位位置',