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

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

@@ -6651,6 +6651,10 @@ export default {
     '300159': '设备正在使用中',
     '300160': '任务进行中',
     '300161': '产品工装未找到',
-    '300162': '未找到工装信息'
+    '300162': '未找到工装信息',
+    '300163': '设备正在空闲中',
+    '300164': '设备已经生产完成',
+    '300165': '该设备当前无工装状态',
+    '300166': '未配置字典信息',
 
 }

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

@@ -6923,7 +6923,12 @@ export default {
     '300159': '设备正在使用中',
     '300160': '任务进行中',
     '300161': '产品工装未找到',
-    '300162': '未找到工装信息'
+    '300162': '未找到工装信息',
+    '300163': '设备正在空闲中',
+    '300164': '设备已经生产完成',
+    '300165': '该设备当前无工装状态',
+    '300166': '未配置字典信息',
+
 
 
 

Html/src/view/fml/statistical_analysis/taskList.vue

@@ -199,7 +199,7 @@ export default {
                 {
                     title: "任务编号",
                     key: "taskno",
-                    width:300
+                    width: 300,
                 },
                 {
                     title: "产线层级",
@@ -272,7 +272,7 @@ export default {
                                 str = "取消";
                                 break;
                         }
-                        return h('div',str)
+                        return h("div", str);
                     },
                 },
                 {
@@ -298,14 +298,14 @@ export default {
             performType: 0,
             startTime: "",
             endTime: "",
-            detailobj:{}
+            detailobj: {},
         };
     },
     created() {
         this.columns1 = this.$time.initTableTitle(this.columns1);
         this.initlevel();
         this.iniproducts();
-        this.search(1,10);
+        this.search(1, 10);
     },
     methods: {
         search(page, pagesize) {
@@ -333,14 +333,15 @@ export default {
                         console.log(res.data.data);
                         this.data1 = res.data.data.data;
                     }
+                    this.total = res.data.data.total;
                 });
         },
         cancel() {
-            if (this.detailobj.status !=1) {
+            if (this.detailobj.status != 1) {
                 this.$Message.error("该任务清单状态不能取消");
                 return false;
             }
-            return
+            return;
             let data = {
                 section: this.sectionid,
             };
@@ -368,17 +369,15 @@ export default {
             let data = {
                 id: this.detailobj.id,
             };
-            this.request(
-                "/acc/AutomationOperate/Send",
-                data,
-                "get"
-            ).then((res) => {
+            this.request("/acc/AutomationOperate/Send", data, "get").then(
+                (res) => {
                     if (res.data.ret == 1) {
                         this.$Message.success(this.$t(res.data.msg));
                     } else {
                         this.$Message.error(this.$t(res.data.msg));
                     }
-            });
+                }
+            );
         },
         exportExcel() {
             // this.axios.request({

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);
@@ -202,7 +202,7 @@ namespace Siger.ApiACC.Controllers
                 throw new BadRequestException(RequestEnum.LocationNull);
             }
             var exsit = _autoLocationRepository.Get(q => q.projectId == ProjectId && q.status == (int)RowState.Valid &&
-                (q.fixturetools == req.fixturetoolid || q.locationid == req.locationid.ToInt()));
+                (q.fixturetools == fixturetool.guid || q.location_cid == req.locationid.ToInt()));
             if(exsit != null)
             {
                 throw new BadRequestException(RequestEnum.DataExist);
@@ -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:"",
@@ -257,13 +258,14 @@ namespace Siger.ApiACC.Controllers
                 throw new BadRequestException(RequestEnum.LocationNull);
             }
             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);
+                (q.fixturetools == fixturetool.guid || q.location_cid == req.locationid.ToInt()) && q.id != req.id);
             if (exsit != null)
             {
                 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/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; }

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,

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

@@ -268,6 +268,7 @@ CREATE TABLE IF NOT EXISTS `siger_automation_fixture_tools_product`  (
 CREATE TABLE IF NOT EXISTS `siger_automation_location`  (
   `id` int(11) NOT NULL AUTO_INCREMENT,
    `guid` varchar(45) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL,
+   `location_cid` int(11) NOT NULL DEFAULT 0 COMMENT '储位自增ID',
   `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',