微服务拆分

package.json

@@ -45,6 +45,7 @@
     "js-beautify": "1.13.0",
     "js-cookie": "3.0.1",
     "jsencrypt": "3.0.0-rc.1",
+    "moment": "^2.29.4",
     "nprogress": "0.2.0",
     "quill": "1.3.7",
     "screenfull": "5.0.2",

src/api/plan/order.js

@@ -84,3 +84,10 @@ export function delOrder(id) {
 		method: 'delete'
 	});
 }
+// 同步SAP订单
+export function syncSAP() {
+	return request({
+		url: '/mes/order/syncSAP',
+		method: 'post'
+	});
+}

src/components/TopNav/index.vue

@@ -7,7 +7,8 @@
     <template v-for="(item, index) in topMenus">
       <el-menu-item :style="{'--theme': theme}" :index="item.path" :key="index" v-if="index < visibleNumber"
         ><svg-icon :icon-class="item.meta.icon" />
-        {{ item.meta.title }}</el-menu-item
+        {{ item.meta.title }}
+        </el-menu-item
       >
     </template>
 
@@ -120,6 +121,7 @@ export default {
     },
     // 菜单选择事件
     handleSelect(key, keyPath) {
+
       this.currentIndex = key;
       const route = this.routers.find(item => item.path === key);
       if (this.ishttp(key)) {

src/layout/components/Navbar.vue

@@ -18,7 +18,7 @@
       <template v-if="device !== 'mobile'">
         <el-select
           v-model="poolName"
-          placeholder="请选择园区"
+          placeholder="请选择工厂数据源"
           @change="handleChange"
           :disabled="poolNameList.length <= 1"
           class="right-menu-item hover-effect"

src/settings.js

@@ -13,6 +13,10 @@ module.exports = {
    * 是否显示顶部导航
    */
   topNav: true,
+  /**
+   * 是否显示数据源选择下拉框
+   */
+  poolNav:true,
 
   /**
    * 是否显示 tagsView

src/store/modules/settings.js

@@ -1,6 +1,6 @@
 import defaultSettings from '@/settings'
 
-const { sideTheme, showSettings, topNav, tagsView, fixedHeader, sidebarLogo, dynamicTitle } = defaultSettings
+const { sideTheme, showSettings,poolNav, topNav, tagsView, fixedHeader, sidebarLogo, dynamicTitle } = defaultSettings
 
 const storageSetting = JSON.parse(localStorage.getItem('layout-setting')) || ''
 const state = {
@@ -9,6 +9,7 @@ const state = {
   sideTheme: storageSetting.sideTheme || sideTheme,
   showSettings: showSettings,
   topNav: storageSetting.topNav === undefined ? topNav : storageSetting.topNav,
+  poolNav: poolNav,
   tagsView: storageSetting.tagsView === undefined ? tagsView : storageSetting.tagsView,
   fixedHeader: storageSetting.fixedHeader === undefined ? fixedHeader : storageSetting.fixedHeader,
   sidebarLogo: storageSetting.sidebarLogo === undefined ? sidebarLogo : storageSetting.sidebarLogo,

src/views/plan/order/index.vue

@@ -75,7 +75,7 @@
           plain
           icon="el-icon-download"
           size="mini"
-          @click="handleExport"
+          @click="handleSyncSAP"
           v-hasPermi="['mes:pro:order:add']"
         >SAP同步
         </el-button>
@@ -366,8 +366,9 @@
     getOrder,
     delOrder,
     addOrder,
-    updateOrder
-  } from "@/api/mes/pro/order";
+    updateOrder,
+    syncSAP
+  } from "@/api/plan/order";
   import Treeselect from "@riophae/vue-treeselect";
   import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 
@@ -967,8 +968,18 @@
         if (this.productData[0].atrr1 == '' || this.productData[0].atrr1 == null) {
           this.formFields[this.formFields.length - 1].batchQuantity = '';
         }
-      }
+      },
+      /** SAP同步按钮操作 */
+      handleSyncSAP() {
+        this.$modal.confirm('是否确认SAP同步操作步骤？').then(function() {
+          return syncSAP(contentIds);
+        }).then(() => {
+          this.getList();
+          this.$modal.msgSuccess("同步成功");
+        }).catch(() => {});
+      },
     }
+
   };
 </script>
 <style>

src/views/plan/plan/index.vue

@@ -318,7 +318,7 @@
 </template>
 
 <script>
-import { updatePlanDetail,getPlanDetailList,addWetPlan,getBMSList,getProductList,getBucketList,getWorkOrderList,listPlan, getPlan, delPlan, addPlan, updatePlan } from "@/api/mes/plan";
+import { updatePlanDetail,getPlanDetailList,addWetPlan,getBMSList,getProductList,getBucketList,getWorkOrderList,listPlan, getPlan, delPlan, addPlan, updatePlan } from "@/api/plan/plan";
 
 export default {
 	name: "Plan",

src/views/plan/workorder/index.vue

@@ -268,7 +268,7 @@
 </template>
 
 <script>
-import { listWorkorder, getWorkorder, delWorkorder,downWorkorder, addWorkorder, updateWorkorder } from "@/api/mes/pro/workorder";
+import { listWorkorder, getWorkorder, delWorkorder,downWorkorder, addWorkorder, updateWorkorder } from "@/api/plan/workorder";
 import moment from 'moment';
 export default {
 	name: "Workorder",

src/views/technology/baseFile/index.vue

@@ -140,7 +140,7 @@
 </template>
 
 <script>
-import { listBaseFile, getBaseFile, delBaseFile, addBaseFile, updateBaseFile } from "@/api/mes/pro/baseFile";
+import { listBaseFile, getBaseFile, delBaseFile, addBaseFile, updateBaseFile } from "@/api/technology/baseFile";
 
 export default {
 	name: "BaseFile",

src/views/technology/process/content.vue

@@ -134,7 +134,7 @@
 </template>
 
 <script>
-import { listProcesscontent, getProcesscontent, delProcesscontent, addProcesscontent, updateProcesscontent } from "@/api/mes/pro/processcontent";
+import { listProcesscontent, getProcesscontent, delProcesscontent, addProcesscontent, updateProcesscontent } from "@/api/technology/processcontent";
 import ItemSelect  from "@/components/itemSelect/index.vue";
 export default {
   name: "Processcontent",

src/views/technology/process/index.vue

@@ -324,7 +324,7 @@
 </template>
 
 <script>
-import { listProcess, getProcess, delProcess, addProcess, updateProcess } from "@/api/mes/pro/process";
+import { listProcess, getProcess, delProcess, addProcess, updateProcess } from "@/api/technology/process";
 import { listEquipment, getEquipment, delEquipment, addEquipment, updateEquipment } from "@/api/wms/equipment";
 import Processcontent from "./content.vue";
 

src/views/technology/proroute/index.vue

@@ -288,7 +288,7 @@
 </template>
 
 <script>
-import { listProroute, getProroute, delProroute, addProroute, updateProroute } from "@/api/mes/pro/proroute";
+import { listProroute, getProroute, delProroute, addProroute, updateProroute } from "@/api/technology/proroute";
 import Routeprocess from "./routeprocess";
 import Routeprodproduct from "./routeprodproduct";
 export default {

src/views/technology/proroute/routeprocess.vue

@@ -133,7 +133,7 @@
 </template>
 
 <script>
-import { listRouteprocess, getRouteprocess, delRouteprocess, addRouteprocess, updateRouteprocess } from "@/api/mes/pro/routeprocess";
+import { listRouteprocess, getRouteprocess, delRouteprocess, addRouteprocess, updateRouteprocess } from "@/api/technology/routeprocess";
 import {listAllProcess} from "@/api/mes/pro/process";
 export default {
   name: "Routeprocess",

src/views/technology/proroute/routeprodproduct.vue

@@ -5,7 +5,7 @@
 </template>
 
 <script>
-import { getListProduct, addProduct , updateProduct, getProduct, delProduct} from "@/api/mes/pro/routeprodproduct";
+import { getListProduct, addProduct , updateProduct, getProduct, delProduct} from "@/api/technology/routeprodproduct";
 
 export default {
   name: "Routeprodproduct",

src/views/technology/recipe/content.vue

@@ -160,7 +160,7 @@
 </template>
 
 <script>
-import { listProcesscontent, getProcesscontent, delProcesscontent, addProcesscontent, updateProcesscontent } from "@/api/mes/pro/recipecontent";
+import { listProcesscontent, getProcesscontent, delProcesscontent, addProcesscontent, updateProcesscontent } from "@/api/technology/recipecontent";
 import ItemSelect  from "@/components/itemSelect/index.vue";
 export default {
   name: "Processcontent",

src/views/technology/recipe/index.vue

@@ -207,7 +207,7 @@
 </template>
 
 <script>
-import { listProcess, getProcess, delProcess, addProcess, updateProcess } from "@/api/mes/pro/recipe";
+import { listProcess, getProcess, delProcess, addProcess, updateProcess } from "@/api/technology/recipe";
 import Processcontent from "./content.vue";
 
 export default {