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

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

@@ -716,7 +716,7 @@ export default {
     '9000491': '人员未找到',
     '9000492': '默认展示已存在',
     '9000493': '未找到储位类别',
-    '9000494': '未找到工装类别',
+    '9000494': '未找到工装类型',
     '9000495': '未找到工装信息',
     '9000496': 'ID重复',
     '9000497': '父级和子级不能相同',

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

@@ -743,7 +743,7 @@ export default {
     '9000491': '人员未找到',
     '9000492': '默认展示已存在',
     '9000493': '未找到储位类别',
-    '9000494': '未找到工装类别',
+    '9000494': '未找到工装类型',
     '9000495': '未找到工装信息',
     '9000496': 'ID重复',
     '9000497': '父级和子级不能相同',

Html/src/view/fms/associate/assemblyInfo.vue

@@ -71,8 +71,8 @@
                         @click="loadExcel()"
                         >{{ $t("1005") }}</Button
                     >
-                    <!-- <Upload
-                        style="display: inline-block"
+                    <Upload
+                        style="display:inline-block"
                         ref="upload"
                         :action="action"
                         name="excel-file"
@@ -81,15 +81,14 @@
                         :on-format-error="handleFormatError"
                         :on-success="handleSuccess"
                         :on-error="handleError"
-                        :format="['xlsx']"
-                    > -->
+                        :format="['xlsx','xls']"
+                    >
                         <Button
                             type="primary"
                             class="fourWord"
                             icon="md-cloud-upload"
-                        >{{ $t("1006") }}</Button
-                    >
-                    <!-- </Upload> -->
+                        >{{$t('1006')}}</Button>
+                    </Upload>
                     <Button
                         type="primary"
                         class="fourWord"
@@ -260,7 +259,7 @@ export default {
             //导入方法
             action:
                 this.axios.publicPath +
-                "acc/Upload/Submit?templateName=FixtureToolsAssmeblyTemplate",
+                "acc/Upload/UploadExcel?templateName=FixtureToolsAssmeblyTemplate",
             headers: {
                 token: localStorage.getItem("token"),
                 timestamp: localStorage.getItem("timestamp"),
@@ -810,6 +809,26 @@ export default {
                     .catch((error) => error);
             }
         },
+        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>

Html/src/view/fms/associate/associateProduct.vue

@@ -150,7 +150,7 @@ export default {
     data(){
         return {
             //导入方法
-            action: this.axios.publicPath + "acc/Upload/Submit?templateName=FixtureToolsProductTemplate",
+            action: this.axios.publicPath + "acc/Upload/UploadExcel?templateName=FixtureToolsProductTemplate",
             headers: {
                 token: localStorage.getItem("token"),
                 timestamp: localStorage.getItem("timestamp"),

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

@@ -154,7 +154,7 @@ export default {
     data(){
         return {
             //导入方法
-            action: this.axios.publicPath + "acc/Upload/Submit?templateName=FixtureToolsTemplate",
+            action: this.axios.publicPath + "acc/Upload/UploadExcel?templateName=FixtureToolsTemplate",
             headers: {
                 token: localStorage.getItem("token"),
                 timestamp: localStorage.getItem("timestamp"),

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

@@ -86,7 +86,7 @@ export default {
     data(){
         return{
             //导入方法
-            action: this.axios.publicPath + "acc/Upload/Submit?templateName=FixtureToolsCategoryTemplate",
+            action: this.axios.publicPath + "acc/Upload/UploadExcel?templateName=FixtureToolsCategoryTemplate",
             headers: {
                 token: localStorage.getItem("token"),
                 timestamp: localStorage.getItem("timestamp"),

Html/src/view/wms/whStatusQuery/storageInfoQuery.vue

@@ -275,7 +275,7 @@ export default {
             addremark:'',//备注
             filename:'',
             fileurl:'',
-            action: this.axios.publicPath + "acc/Upload/Submit?templateName=AutomationLocationTemplate",
+            action: this.axios.publicPath + "acc/Upload/UploadExcel?templateName=AutomationLocationTemplate",
             UploadAction: this.axios.publicPath + "config/upload/UploadImage",
             headers: {
                 token: localStorage.getItem("token"),

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

@@ -124,7 +124,7 @@ namespace Siger.ApiACC.Controllers
                             ParentPartNumber = son.parentpartnumber,
                             ParentFixtureTool = son.parentname,
                             ParentSpecfication = son.parentspecfication,
-                            ParentCode = item.parentcode,
+                            ParentCode = son.parentcode,
                             Category = son.category,
                             FixtureTool = son.name,
                             PartNumber = son.partnumber,

Server/Common/Siger.Middlelayer.Share/Enum/RequestEnum.cs

@@ -1465,7 +1465,7 @@ namespace Siger.Middlelayer.Common
         [Description("未找到储位类别")]
         LocationTypeNotFound,
 
-        [Description("未找到工装类别")]
+        [Description("未找到工装类型")]
         FixtureToolCatgeoryNotFound,
 
         [Description("未找到工装信息")]

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

@@ -134,7 +134,8 @@ namespace Siger.Middlelayer.AccRepository.Repositories
                             parentcategoryid = c1 == null ? 0 : c1.id,
                             parentcategory = c1.name ?? "",
                             parentpartnumber = t1.partnumber ?? "",
-                            parentspecfication = t1.specification ?? ""
+                            parentspecfication = t1.specification ?? "",
+                            parentcode = t1.code ?? ""
                         };
             var entities = query.OrderByDescending(q => q.id).AsNoTracking().ToList();
             return entities;

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

@@ -103,6 +103,8 @@ namespace Siger.Middlelayer.AccRepository.Repositories
                         name = item.Fixture,
                         parent = parent,
                         createtime = DateTime.Now,
+                        updatetime = DateTime.Now,
+                        projectId = projectid
                     };
                     _context.siger_automation_fixture_tools_category.Add(entity);
                     _context.SaveChanges();

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

@@ -161,7 +161,7 @@ namespace Siger.Middlelayer.AccRepository.Repositories
                 {
                     errors.Add($"{rowIndex},{(int)RequestEnum.FixtureToolNotFound}");
                 }
-                var product = _context.siger_project_product.FirstOrDefault(q => q.projectid == projectid && q.status == (int)RowState.Valid && q.code == item.Product);
+                var product = _context.siger_project_product.FirstOrDefault(q => q.projectid == projectid && q.status == (int)RowState.Valid && q.name == item.Product);
                 if (product == null)
                 {
                     errors.Add($"{rowIndex},{(int)RequestEnum.ProductNotFound}");

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

@@ -157,7 +157,7 @@ namespace Siger.Middlelayer.AccRepository.Repositories
                     errors.Add($"{rowIndex},{(int)RequestEnum.DataExist}");
                 }
 
-                var category = _context.siger_automation_fixture_tools.FirstOrDefault(q => q.name == item.Catgeory && q.projectId == projectid && q.status == (int)RowState.Valid);
+                var category = _context.siger_automation_fixture_tools_category.FirstOrDefault(q => q.name == item.Catgeory && q.projectId == projectid && q.status == (int)RowState.Valid);
                 if (category == null)
                 {
                     errors.Add($"{rowIndex},{(int)RequestEnum.FixtureToolCatgeoryNotFound}");