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

Html/src/view/fms/config/accountInfo.vue

@@ -24,9 +24,8 @@
                 <Button type="primary" class="twoWord" icon="ios-search" @click="tosearch()">{{ $t(1001) }}</Button>
                 <Button type="success" class="twoWord" icon="md-add-circle" @click="add()">{{$t('1002')}}</Button>
                 <Button type="warning" class="twoWord" icon="ios-create-outline" @click="edit()">{{$t('1003')}}</Button>
-                <!-- <Button type="error" class="twoWord intervalRight" icon="md-close-circle" @click="dele()">{{ $t(1004) }}</Button> -->
                 <Button type="primary" class="fourWord" icon="md-download" @click="loadexcel()">{{$t('1005')}}</Button>
-                <!-- <Upload
+                <Upload
                     style="display:inline-block"
                     ref="upload"
                     :action="action"
@@ -44,7 +43,7 @@
                         icon="md-cloud-upload"
                     >{{$t('1006')}}</Button>
                 </Upload>
-                <Button type="primary" class="fourWord" icon="ios-cloud-download" @click="Export()">{{$t('1007')}}</Button> -->
+                <Button type="primary" class="fourWord" icon="ios-cloud-download" @click="search(1)">{{$t('1007')}}</Button>
             </div>
         </div>
         <div class="divborder newTableDiv">
@@ -154,6 +153,14 @@
 export default {
     data(){
         return {
+            //导入方法
+            action: this.axios.publicPath + "wms/Upload/Submit?templateName=StorageLocation",
+            headers: {
+                token: localStorage.getItem("token"),
+                timestamp: localStorage.getItem("timestamp"),
+                nonce: localStorage.getItem("nonce"),
+                sign: localStorage.getItem("sign"),
+            },
             //搜索
             frockTypeTree:[],//树形结构
             frockType:[],//工装类型
@@ -532,42 +539,29 @@ export default {
         //下载文件 
         downFile(url,fileName){
             let params = {
-                name: fileName,
                 url: url,
+                name:fileName
             };
             this.axios.request({
                 url: "/config/Download/DownloadFileByUrl",
                 params,
                 method: "get",
-                responseType: "blob",
+                responseType: "blob"
             })
             .then((res) => {
-                console.log(111111)
-                console.log(res)
                 if (res.status == 200) {
-                    if(res.data){
                     let url;
                     let link = document.createElement("a");
-                        url = window.URL.createObjectURL(data);
+                    url = window.URL.createObjectURL(res.data);
                     link.style.display = "none";
                     link.href = url;
                     link.setAttribute("download", fileName);
                     document.body.appendChild(link);
                     link.click();
                 }
-                }
             }).catch(error=>{
                 this.$Message.error('请求错误')
             });
-            // console.log(fileName)
-            // console.log(data)
-            // let url = window.URL.createObjectURL(new Blob([data]));
-            // let link = document.createElement("a");
-            // link.style.display = "none";
-            // link.href = url;
-            // link.setAttribute("download", fileName);
-            // document.body.appendChild(link);
-            // link.click();
         },
         //导出模板
         loadexcel() {
@@ -596,6 +590,26 @@ export default {
             this.page = value;
             this.search(0);
         },
+        handleFormatError(file) {
+            this.$Message.error(
+                this.$t("950396") + file.name + this.$t("950397")
+            );
+        },
+        handleSuccess(res, file) {
+            if (res.ret == 1) {
+                this.$Message.success(this.$t("950398"));
+                this.tosearch();
+            } else {
+                if ((res.msg + "").indexOf(",") != -1) {
+                    inittip(res.msg);
+                } else {
+                    this.$Message.error(this.$t(res.data));
+                }
+            }
+        },
+        handleError() {
+            this.$Message.error(this.$t("2010006") + "!");
+        },
     }
 }
 </script>

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

@@ -105,6 +105,7 @@ namespace Siger.ApiACC.Controllers
         /// <param name="line"></param>
         /// <param name="mode"></param>
         /// <returns></returns>
+        [HttpGet]
         public IActionResult LineMode(int line, int mode)
         {
             var exitObj = _automationLineMode.Get(f => f.section == line);
@@ -148,10 +149,35 @@ namespace Siger.ApiACC.Controllers
                 throw new BadRequestException(CommonEnum.Fail);
             }
         }
+
+        /// <summary>
+        ///  产线 需要检验
+        /// </summary>
+        /// <param name="line"></param>
+        /// <param name="enable"></param>
+        /// <returns></returns>
+        [HttpGet]
+        public IActionResult inspect(int line, int enable)
+        {
+            var exitObj = _automationLineMode.Get(f => f.section == line);
+            if (exitObj == null)
+            {
+                throw new BadRequestException(CommonEnum.RecordNotFound);
+            }
+
+            exitObj.updatetime = DateTime.Now;
+            exitObj.inspect = enable;
+
+            if (_unitOfWork.Commit() > 0)
+                return new ObjectResult(CommonEnum.Succefull);
+            else
+                throw new BadRequestException(CommonEnum.Fail);
+        }
         /// <summary>
         /// 任务状态接口  用于保存PLC 实时任务状态 ()
         /// </summary>
         /// <returns></returns>
+        [HttpPost]
         public IActionResult TaskResult([FromBody]RequestAutomationTaskResult request)
         {
             //1.检查Tasklist

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

@@ -25,26 +25,35 @@ namespace Siger.ApiACC.Controllers
         private readonly ISigerProjectLevelSectionRepository _sigerProjectLevelSection;
         private readonly ISigerDict _sigerDict;
         private readonly IAutomationMachineStatus _automationMachineStatus;
+        private readonly ISigerProjectMachineAttributionRepository _sigerProjectMachineAttribution;
 
-        public AutomationOperateController(IUnitOfWork unitOfWork,ISigerProjectLevelSectionRepository sigerProjectLevelSection , ISigerDict sigerDict,IAutomationMachineStatus  automationMachineStatus)
+        public AutomationOperateController(IUnitOfWork unitOfWork,ISigerProjectLevelSectionRepository sigerProjectLevelSection , ISigerDict sigerDict,IAutomationMachineStatus  automationMachineStatus,ISigerProjectMachineAttributionRepository sigerProjectMachineAttribution)
         {
             _unitOfWork = unitOfWork;
             _sigerProjectLevelSection = sigerProjectLevelSection;
             _sigerDict = sigerDict;
             _automationMachineStatus = automationMachineStatus;
+            _sigerProjectMachineAttribution = sigerProjectMachineAttribution;
         }
 
         public IActionResult Get()
         {
             return new ObjectResult(1);
         }
+
+        /// <summary>
+        /// 获取字典配置 
+        /// </summary>
+        /// <param name="line">产线</param>
+        /// <param name="type">类型：0：上料  1：检验</param>
+        /// <returns></returns>
         [HttpGet]
         public IActionResult GetloadStation(int line,int type)
         {
             var stationDicts = _sigerDict.GetDataByCat(AccDictCost.Automation, ProjectId);
             if (!stationDicts.Any())
             {
-                Logger.WriteLineInfo($"AutoProcess 未配置设备类型字典");
+                Logger.WriteLineInfo($"GetloadStation 未配置设备类型字典");
                 throw new BadRequestException(CommonEnum.RecordNotFound);
             }
 
@@ -55,7 +64,7 @@ namespace Siger.ApiACC.Controllers
                 var dictLoad = stationDicts.Where(s => s.dkey == DictKeyValConst.UploadloadStation);
                 if (!dictLoad.Any())
                 {
-                    Logger.WriteLineInfo($"AutoProcess 未配置上下料工站字典");
+                    Logger.WriteLineInfo($"GetloadStation 未配置上下料工站字典");
                     throw new BadRequestException(CommonEnum.RecordNotFound);
                 }
                 loadStation = dictLoad.Select(s => s.dval).ToList();
@@ -64,7 +73,7 @@ namespace Siger.ApiACC.Controllers
                 var dictLoad = stationDicts.Where(s => s.dkey == DictKeyValConst.CleanStation);
                 if (!dictLoad.Any())
                 {
-                    Logger.WriteLineInfo($"AutoProcess 未配置清洗工站字典");
+                    Logger.WriteLineInfo($"GetloadStation 未配置清洗工站字典");
                     throw new BadRequestException(CommonEnum.RecordNotFound);
                 }
                 loadStation = dictLoad.Select(s => s.dval).ToList();
@@ -75,19 +84,24 @@ namespace Siger.ApiACC.Controllers
 
             foreach (var station in loadStation)
             {
-                var section = _sigerProjectLevelSection.Get(f => f.id == station.ToInt() && f.status == (int)RowState.Valid);
+                var section = _sigerProjectLevelSection.Get(f => f.id == station.ToInt() && f.parentid==line && f.status == (int)RowState.Valid);
                 if (section == null)
                     continue;
-
+                var machintAttr = _sigerProjectMachineAttribution.Get(f => f.station == section.id);
+                if(machintAttr==null)
+                {
+                    Logger.WriteLineInfo($"GetloadStation 未配置清洗工站字典");
+                    continue;
+                }
                 var loadStatus = (int)Automation.MachineStatus.Waiting;
-                var machineStatus = _automationMachineStatus.Get(f => f.section == station.ToInt());
+                var machineStatus = _automationMachineStatus.Get(f => f.section == station.ToInt() && f.status==(int)RowState.Valid);
                 if (machineStatus==null)
                 {
                     _automationMachineStatus.Insert(new siger_automation_machine_status
                     {
                          projectId=ProjectId,
                          enable=1,
-                         machineid=0,
+                         machineid=machintAttr.machine,
                          section=section.id,
                          updatetime=DateTime.Now
                     });

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

@@ -160,5 +160,8 @@ namespace Siger.Middlelayer.AccRepository
 
         public DbSet<siger_wms_storage> siger_wms_storage { get; set; }
         public DbSet<siger_wms_storage_location> siger_wms_storage_location { get; set; }
+
+        public DbSet<siger_automation_line_mode> siger_automation_line_mode { get; set; }
+        public DbSet<siger_automation_machine_status> siger_automation_machine_status { get; set; }
     }
 }

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

@@ -14,6 +14,11 @@ namespace Siger.Middlelayer.AccRepository.Entities
         /// 生产线模式 0:手动 1 自动
         /// </summary>
         public int mode { get; set; }
+
+        /// <summary>
+        /// 是否检验 
+        /// </summary>
+        public int inspect { get; set; }
         /// <summary>
         /// 更新时间
         /// </summary>

Server/Infrastructure/Script/DB.script

@@ -373,7 +373,8 @@ CREATE TABLE `siger_automation_line_mode`  (
   `id` int(11) NOT NULL AUTO_INCREMENT,
   `section` int(11) NOT NULL DEFAULT 0 COMMENT '产线ID',
   `projectid` int(11) NOT NULL DEFAULT 0,
-  `mode` int(11) NOT NULL DEFAULT 1 COMMENT '0:手动模式 1：自动模式',
+  `mode` int(1) NOT NULL DEFAULT 1 COMMENT '0:手动模式 1：自动模式',
+  `inspect` int(1) NOT NULL DEFAULT 1 COMMENT '0:不需要检验 1：检验',
   `updatetime` datetime(0) NULL DEFAULT NULL COMMENT '操作时间',
   PRIMARY KEY (`id`) USING BTREE
 ) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Dynamic;