生产环境与开发环境区分&无用代码删除

src/pages/mes/PalletChange/index.vue

@@ -110,9 +110,12 @@ export default class PalletChange extends BasePage {
       reqTime: formattedDate,
       location: this.location,
       locationStatus: this.locationStatus,
-      productionState: this.productCodeList.value,
+      productionState: '2', //this.productCodeList.value,
     };
     await this.model.palletInforUpdate(params);
+    if (model.SubmitCode == 10) {
+      this.uni.showToast({ title: '成功' });
+    }
   }
   switchChangeFun(e) {
     //console.log(e);

src/pages/mes/ProductionQtyInsp/index.vue

@@ -42,6 +42,9 @@
       <u-form-item label="工单">
         <u-input :disabled="true" v-model="model.orderNoItemList.workorderName" placeholder="" />
       </u-form-item>
+      <u-form-item>
+        <jPicker sureColor="#ff0000" @bindpicker="selectProductLOC" showKey="label" valKey="value" :val="productLocList.value" :options="model.DictList" />
+      </u-form-item>
       <!-- 是否合格 -->
       <u-form-item label="是否合格">
         <jPicker sureColor="#ff0000" @bindpicker="selectProductCode" showKey="label" valKey="value" :val="productCodeList.value" :options="isqualified" />
@@ -114,6 +117,7 @@ export default class productCheckReceipt extends BasePage {
   //   this.remove = e.pickerName;
   // }
   orderNo: any = '';
+  productLocList: any = {};
   badMeg = '';
   border = true;
   height = 100;
@@ -132,6 +136,10 @@ export default class productCheckReceipt extends BasePage {
   ];
 
   productCodeList: any = {};
+  async onReady() {
+    await this.model.getDictList();
+    //this.remove = this.model.WlList[0];
+  }
   scrollLeft() {
     return 222 * (this.imgList.length + 1);
   }
@@ -143,6 +151,9 @@ export default class productCheckReceipt extends BasePage {
       // loop: true
     });
   }
+  async selectProductLOC(e: any) {
+    this.productLocList = e.pickerName;
+  }
   chooseImg() {
     // if(!this.materialObj){
     // 	this.$refs.toastRef.show({
@@ -223,7 +234,7 @@ export default class productCheckReceipt extends BasePage {
   }
   async selectProductCode(e: any) {
     this.productCodeList = e.pickerName;
-    if (this.productCodeList.value == '1') {
+    if (this.productCodeList.value == '0') {
       // 创建一个新的日期对象
       var currentDate = new Date();
 
@@ -242,6 +253,7 @@ export default class productCheckReceipt extends BasePage {
         reqCode: this.generateGUID(),
         reqTime: formattedDate,
         currentStationNo: model.orderNoItemList.machineCode,
+        productionState: this.productLocList.value,
       };
       await this.model.sendDestinationStations(params);
     }

src/pages/mes/ProductionQtyInsp/model.ts

@@ -13,19 +13,6 @@ export class wholeTransfer extends VuexModule {
   rowdata: any;
   WlList = [];
   Checklist: any = [];
-
-  @MutationAction
-  async queryLocation() {
-    const result: any = await http.post(url.warehouse.wholeTransfer.getSpareMdLocation, {
-      // factoryCode: session.factoryCode,
-      loginName: session.loginName,
-    });
-    const WlList = result.data.map((_: any) => ({
-      label: _.locationCode,
-      value: _.locationCode,
-    }));
-    return { WlList };
-  }
   orderNoItemList: any = [];
   productCodeList: any = [];
   @MutationAction
@@ -72,6 +59,22 @@ export class wholeTransfer extends VuexModule {
     const orderNoItemList = [];
     return { orderNoItemList };
   }
+  //缓存区下拉列表
+  DictList: any = [];
+  @MutationAction
+  async getDictList() {
+    const result: any = await http.get(url.lanjumes.product.getDictList, {
+      params: {
+        equipmentTypeCode: 'cache',
+      },
+    });
+    const DictListoild: [] = result.data;
+    const DictList = DictListoild.map((item: any) => ({
+      label: item.itemName,
+      value: item.itemCode,
+    }));
+    return { DictList };
+  }
 }
 
 export default getModule(wholeTransfer);

src/pages/shouye/model.ts

@@ -1,9 +1,9 @@
-import { getModule, Module, MutationAction, VuexModule } from 'vuex-module-decorators';
+import { getModule, Module, VuexModule } from 'vuex-module-decorators';
 import store from '@/store';
-import http from '@/utils/request';
-import { url } from '@/utils/url';
-import { session } from '@/store/modules/session';
-import { stringify } from 'query-string';
+//import http from '@/utils/request';
+//import { url } from '@/utils/url';
+//import { session } from '@/store/modules/session';
+//import { stringify } from 'query-string';
 
 @Module({
   namespaced: true,
@@ -19,20 +19,20 @@ export class ReceiptModule extends VuexModule {
   /**
    * 查询原材料菜单列表
    */
-  @MutationAction
-  async getMenuList() {
-    const result: any = await http.post(
-      url.menu,
-      stringify({
-        // factoryCode: session.factoryCode,
-        loginName: session.loginName,
-        resType: 4,
-      }),
-    );
-    console.log('aaaa', result);
-    const menuList = result.data;
-    return { menuList };
-  }
+  // @MutationAction
+  // async getMenuList() {
+  //   const result: any = await http.post(
+  //     url.menu,
+  //     stringify({
+  //       // factoryCode: session.factoryCode,
+  //       loginName: session.loginName,
+  //       resType: 4,
+  //     }),
+  //   );
+  //   console.log('aaaa', result);
+  //   const menuList = result.data;
+  //   return { menuList };
+  // }
 }
 
 export default getModule(ReceiptModule);

src/pages/wms/Raw/PurchaseWHPO/model.ts

@@ -1,7 +1,7 @@
 import { getModule, Module, MutationAction, VuexModule } from 'vuex-module-decorators';
 import store from '@/store';
 import http from '@/utils/request';
-import { url } from '@/utils/url';
+// import { url } from '@/utils/url';
 import { session } from '@/store/modules/session';
 @Module({
   namespaced: true,
@@ -11,23 +11,11 @@ import { session } from '@/store/modules/session';
 })
 export class PurchaseWHPO extends VuexModule {
   WlList = [];
-  @MutationAction
-  async queryLocation() {
-    const result: any = await http.post(url.warehouse.wholeTransfer.getSpareMdLocation, {
-      // factoryCode: session.factoryCode,
-      loginName: session.loginName,
-    });
-    const WlList = result.data.map((_: any) => ({
-      label: _.locationCode,
-      value: _.locationCode,
-    }));
-    return { WlList };
-  }
   orderNoItemList: any = [];
   productCodeList: any = [];
   @MutationAction
   async queryOrderNo(orderNo: any) {
-    const result: any = await http.post(url.warehouse.wholeTransfer.queryDownshelfOrder, {
+    const result: any = await http.post('', {
       // factoryCode: session.factoryCode,
       loginName: session.loginName,
       orderNo,
@@ -42,7 +30,7 @@ export class PurchaseWHPO extends VuexModule {
   SubmitCode: any = '';
   @MutationAction
   async OnSubmit(params: any) {
-    const result: any = await http.post(url.warehouse.wholeTransfer.offshelf, params);
+    const result: any = await http.post('', params);
     const SubmitCode = result.code;
     return { SubmitCode };
   }

src/pages/wms/Raw/PurchaseWHSRM/model.ts

@@ -1,7 +1,7 @@
 import { getModule, Module, MutationAction, VuexModule } from 'vuex-module-decorators';
 import store from '@/store';
 import http from '@/utils/request';
-import { url } from '@/utils/url';
+//import { url } from '@/utils/url';
 import { session } from '@/store/modules/session';
 @Module({
   namespaced: true,
@@ -13,7 +13,7 @@ export class PurchaseWHSRM extends VuexModule {
   WlList = [];
   @MutationAction
   async queryLocation() {
-    const result: any = await http.post(url.warehouse.wholeTransfer.getSpareMdLocation, {
+    const result: any = await http.post('', {
       // factoryCode: session.factoryCode,
       loginName: session.loginName,
     });
@@ -27,7 +27,7 @@ export class PurchaseWHSRM extends VuexModule {
   productCodeList: any = [];
   @MutationAction
   async queryOrderNo(orderNo: any) {
-    const result: any = await http.post(url.warehouse.wholeTransfer.queryDownshelfOrder, {
+    const result: any = await http.post('', {
       // factoryCode: session.factoryCode,
       loginName: session.loginName,
       orderNo,
@@ -42,7 +42,7 @@ export class PurchaseWHSRM extends VuexModule {
   SubmitCode: any = '';
   @MutationAction
   async OnSubmit(params: any) {
-    const result: any = await http.post(url.warehouse.wholeTransfer.offshelf, params);
+    const result: any = await http.post('', params);
     const SubmitCode = result.code;
     return { SubmitCode };
   }

src/pages/wms/Raw/ReceivePO/model.ts

@@ -1,7 +1,7 @@
 import { getModule, Module, MutationAction, VuexModule } from 'vuex-module-decorators';
 import store from '@/store';
 import http from '@/utils/request';
-import { url } from '@/utils/url';
+//import { url } from '@/utils/url';
 import { session } from '@/store/modules/session';
 @Module({
   namespaced: true,
@@ -13,7 +13,7 @@ export class receivePO extends VuexModule {
   WlList = [];
   @MutationAction
   async queryLocation() {
-    const result: any = await http.post(url.warehouse.wholeTransfer.getSpareMdLocation, {
+    const result: any = await http.post('', {
       // factoryCode: session.factoryCode,
       loginName: session.loginName,
     });
@@ -27,7 +27,7 @@ export class receivePO extends VuexModule {
   productCodeList: any = [];
   @MutationAction
   async queryOrderNo(orderNo: any) {
-    const result: any = await http.post(url.warehouse.wholeTransfer.queryDownshelfOrder, {
+    const result: any = await http.post('', {
       // factoryCode: session.factoryCode,
       loginName: session.loginName,
       orderNo,
@@ -42,7 +42,7 @@ export class receivePO extends VuexModule {
   SubmitCode: any = '';
   @MutationAction
   async OnSubmit(params: any) {
-    const result: any = await http.post(url.warehouse.wholeTransfer.offshelf, params);
+    const result: any = await http.post('', params);
     const SubmitCode = result.code;
     return { SubmitCode };
   }

src/pages/wms/Raw/ReceiveSRM/model.ts

@@ -1,7 +1,7 @@
 import { getModule, Module, MutationAction, VuexModule } from 'vuex-module-decorators';
 import store from '@/store';
 import http from '@/utils/request';
-import { url } from '@/utils/url';
+//import { url } from '@/utils/url';
 import { session } from '@/store/modules/session';
 @Module({
   namespaced: true,
@@ -13,7 +13,7 @@ export class receiveSRM extends VuexModule {
   WlList = [];
   @MutationAction
   async queryLocation() {
-    const result: any = await http.post(url.warehouse.wholeTransfer.getSpareMdLocation, {
+    const result: any = await http.post('', {
       // factoryCode: session.factoryCode,
       loginName: session.loginName,
     });
@@ -27,7 +27,7 @@ export class receiveSRM extends VuexModule {
   productCodeList: any = [];
   @MutationAction
   async queryOrderNo(orderNo: any) {
-    const result: any = await http.post(url.warehouse.wholeTransfer.queryDownshelfOrder, {
+    const result: any = await http.post('', {
       // factoryCode: session.factoryCode,
       loginName: session.loginName,
       orderNo,
@@ -42,7 +42,7 @@ export class receiveSRM extends VuexModule {
   SubmitCode: any = '';
   @MutationAction
   async OnSubmit(params: any) {
-    const result: any = await http.post(url.warehouse.wholeTransfer.offshelf, params);
+    const result: any = await http.post('', params);
     const SubmitCode = result.code;
     return { SubmitCode };
   }

src/pages/wms/Raw/Requisition/model.ts

@@ -1,7 +1,7 @@
 import { getModule, Module, MutationAction, VuexModule } from 'vuex-module-decorators';
 import store from '@/store';
 import http from '@/utils/request';
-import { url } from '@/utils/url';
+//import { url } from '@/utils/url';
 import { session } from '@/store/modules/session';
 @Module({
   namespaced: true,
@@ -13,7 +13,7 @@ export class Requisition extends VuexModule {
   WlList = [];
   @MutationAction
   async queryLocation() {
-    const result: any = await http.post(url.warehouse.wholeTransfer.getSpareMdLocation, {
+    const result: any = await http.post('', {
       // factoryCode: session.factoryCode,
       loginName: session.loginName,
     });
@@ -27,7 +27,7 @@ export class Requisition extends VuexModule {
   productCodeList: any = [];
   @MutationAction
   async queryOrderNo(orderNo: any) {
-    const result: any = await http.post(url.warehouse.wholeTransfer.queryDownshelfOrder, {
+    const result: any = await http.post('', {
       // factoryCode: session.factoryCode,
       loginName: session.loginName,
       orderNo,
@@ -42,7 +42,7 @@ export class Requisition extends VuexModule {
   SubmitCode: any = '';
   @MutationAction
   async OnSubmit(params: any) {
-    const result: any = await http.post(url.warehouse.wholeTransfer.offshelf, params);
+    const result: any = await http.post('', params);
     const SubmitCode = result.code;
     return { SubmitCode };
   }

src/pages/wms/product/OfflineStorage/model.ts

@@ -12,19 +12,6 @@ import { session } from '@/store/modules/session';
 // http.defaults.headers.common['poolName'] = session.PoolName;
 export class OfflineStorage extends VuexModule {
   WlList = [];
-  @MutationAction
-  async queryLocation() {
-    const result: any = await http.post(url.warehouse.wholeTransfer.getSpareMdLocation, {
-      // factoryCode: session.factoryCode,
-      loginName: session.loginName,
-    });
-
-    const WlList = result.data.map((_: any) => ({
-      label: _.locationCode,
-      value: _.locationCode,
-    }));
-    return { WlList };
-  }
   orderNoItemList: any = [];
   @MutationAction
   async queryOrderNo(orderNo: any) {

src/plugins/app-update/index.ts

@@ -897,7 +897,7 @@ export default async function checkUpdateVersion() {
     //发送ajax 获取版本更新
     let {
       data: { data, code, flag, message },
-    } = await http.post(url.menu, {
+    } = await http.post('', {
       data: {
         versionCode: uni.getStorageSync("versionCode"), //从本地缓存中同步获取指定 key 对应的内容
       },

src/store/modules/auth.ts

@@ -1,8 +1,8 @@
-import { Action, getModule, Module, VuexModule } from 'vuex-module-decorators';
-import request from '@/utils/request';
+import { getModule, Module, VuexModule } from 'vuex-module-decorators';
+//import request from '@/utils/request';
 import store from '@/store';
-import { User } from '@/store/modules/session';
-import { url } from '@/utils/url';
+//import { User } from '@/store/modules/session';
+//import { url } from '@/utils/url';
 
 export interface UserInfo {
   factoryCode: string;
@@ -25,30 +25,29 @@ export interface UserInfo {
   name: 'auth',
 })
 class AuthService extends VuexModule {
-  @Action
-  async getUserInfo({ loginName }: { loginName: User['loginName'] }): Promise<UserInfo> {
-    const r: any = await request.post(url.auth.userInfo, {
-      loginName,
-    });
-    if (r.code !== '1') {
-      throw new Error(r.msg);
-    } else {
-      return r.list[0];
-    }
-  }
-
-  @Action
-  async checkPassword({ rfPwd, loginName }: { rfPwd: string; loginName: User['loginName'] }) {
-    const r: any = await request.post(url.auth.pwd.check, {
-      rfPwd,
-      loginName,
-    });
-    if (r.code !== '1') {
-      throw new Error(r.msg);
-    } else {
-      return r;
-    }
-  }
+  // @Action
+  // async getUserInfo({ loginName }: { loginName: User['loginName'] }): Promise<UserInfo> {
+  //   const r: any = await request.post(url.auth.userInfo, {
+  //     loginName,
+  //   });
+  //   if (r.code !== '1') {
+  //     throw new Error(r.msg);
+  //   } else {
+  //     return r.list[0];
+  //   }
+  //}
+  // @Action
+  // async checkPassword({ rfPwd, loginName }: { rfPwd: string; loginName: User['loginName'] }) {
+  //   const r: any = await request.post(url.auth.pwd.check, {
+  //     rfPwd,
+  //     loginName,
+  //   });
+  //   if (r.code !== '1') {
+  //     throw new Error(r.msg);
+  //   } else {
+  //     return r;
+  //   }
+  // }
 }
 
 export const auth = getModule(AuthService);

src/utils/request.ts

@@ -22,8 +22,13 @@ let loading: any;
 
 http.interceptors.request.use(
   (config: any) => {
-    //生产环境将http://192.168.3.93:81替换为正式服务即可
-    //config.baseURL = 'http://192.168.3.93:81';
+    //console.log('123456',config)
+    //生产请将注释解开
+    // if (config.url.includes('/api')) {
+    //   config.baseURL = 'http://192.168.202.23:5001';
+    // } else {
+    //   config.baseURL = 'http://192.168.202.20:9000';
+    // }
     // 所有请求默认提示加载中
     if (!loading) {
       uni.showLoading({ title: '加载中' });
@@ -86,6 +91,8 @@ http.interceptors.response.use(
           return dataAxios;
         case '2':
           return dataAxios;
+        case 10:
+          return dataAxios;
         case 200:
           return dataAxios;
         case 401:

src/utils/url.ts

@@ -1,19 +1,11 @@
 /* eslint-disable @typescript-eslint/no-unused-vars */
+const qianzhuione = '/prod-api'; // '/dev-api'开发环境
 export const url = {
-  menu: '/wmspda/system/getRFMenus',
   wmspda: {
     system: {
       test: '/wmspda/system/test',
-      login: '/dev-api/auth/login',
-      getInfo: '/dev-api/system/user/mobileGetInfo',
-      getMenus: '/wmspda/system/getMenus',
-    },
-    fg: {
-      xxrkScanValidata: '/wmspda/fg/xxrkScanValidata',
-      offlineRk: '/wmspda/fg/offlineRk',
-      outStorageLoadProduct: '/wmspda/fg/outStorageLoadProduct',
-      outStorageLoadDocumentByCarBatchno: '/wmspda/fg/outStorageLoadDocumentByCarBatchno',
-      orderType: '/wmspda/fg/orderType',
+      login: qianzhuione + '/auth/login',
+      getInfo: qianzhuione + '/system/user/mobileGetInfo',
     },
   },
   sys: {
@@ -21,419 +13,41 @@ export const url = {
       error: '/wmspda/sys/log/error',
     },
   },
-  auth: {
-    locations: '/wmspda/auth/locations',
-    query: {
-      location: '/wmspda/auth/query/location',
-      location1: '/wmspda/material/orderin/receiveloc',
-      queryAppendDetail: '/wmspda/bl/queryAppendDetail',
-      createAppendList: '/wmspda/bl/createAppendList',
-      lock: '/wmspda/bl/unlock',
-      barcode: '/wmspda/bl/getOdsRawStorageSnNew',
-      queryContainer: '/wmspda/material/orderin/queryContainer',
-      dnNo: '/wmspda/fg/findStoDnInfo/russia',
-      findStoDnReceiveInfo: '/wmspda/fg/findStoDnReceiveInfo/russia',
-      queryByFactoryCodeAndWorkAreaCode: '/wmspda/fg/queryByFactoryCodeAndWorkAreaCode',
-      russia: '/wmspda/fg/stoDnConfirm/russia',
-      factoryrussia: '/wmspda/fg/stoDnConfirmCrossPlant/russia',
-      stoDnReceiveConfirm: '/wmspda/fg/stoDnReceiveConfirm/russia',
-      factorystoDnReceiveConfirm: '/wmspda/fg/stoDnReceiveConfirmCrossPlant/russia',
-      stoDnReceiveScan: '/wmspda/fg/stoDnReceiveScan/russia',
-      factorystoDnReceiveScan: '/wmspda/fg/stoDnReceiveScanIn/russia',
-    },
-    systime: '/wmspda/auth/systime',
-    userInfo: '/wmspda/auth/userinfo',
-    pwd: {
-      check: '/wmspda/auth/pwd/check',
-    },
-    factory: {
-      sap: '/wmspda/auth/factory/sap',
-    },
-  },
-  appointmentreg: {
-    platform: {
-      list: '/wmspda/appointmentreg/list/platform',
-    },
-    kd: {
-      query: '/wmspda/appointmentreg/query/kd',
-    },
-    save: '/wmspda/appointmentreg/save',
-    delay: {
-      list: '/wmspda/appointmentreg/list/delay',
-    },
-    leave: {
-      carInfo: '/wmspda/appointmentreg/query/leave/carinfo',
-      save: '/wmspda/appointmentreg/leave/save',
-    },
-  },
-  material: {
-    POorderin: {
-      info: '/wmspda/material/orderin/poInfo',
-      enter: '/wmspda/material/orderin/enter',
-    },
-    prdOrder: {
-      info: '/wmspda/material/comprehensive/detail/q',
-    },
-    DNorderin: {
-      info: '/wmspda/material/orderin/dnInfo',
-      subcDnInfo: '/wmspda/material/orderin/subcDnInfo',
-      spartPartDnInfo: '/wmspda/material/orderin/spartPartDnInfo',
-      ImportInfo: '/wmspda/material/orderin/overseasDnInfo',
-      dnReturnInfo: '/wmspda/material/orderin/dnReturnInfo',
-      queryOrder: '/wmspda/material/poReturn/queryOrder', //dn退货 单号查询
-      enter: '/wmspda/material/orderin/enter',
-      enterRussia: '/wmspda/material/orderin/enter/russia',
-      subcDnEnter: '/wmspda/material/orderin/subcDnEnter',
-      spartPartDnEnter: '/wmspda/material/orderin/spartPartDnEnter',
-      ImportEnter: '/wmspda/material/orderin/overseasDnEnter',
-      subcDnEnterRussia: '/wmspda/material/orderin/subcDnEnter/russia',
-      out: '/wmspda/material/orderin/out',
-      russia: '/wmspda/material/orderin/poinfo/overseas/russia',
-      enterrussia: '/wmspda/material/orderin/enter/overseas/russia',
-    },
-    orderout: {
-      take: '/wmspda/material/orderout/take',
-      detail: '/wmspda/material/orderout/detail',
-      unlock: '/wmspda/material/orderout/unlock',
-      takeout: '/wmspda/material/orderout/takeout',
-    },
-    // 原材料盘点
-    rawMaterialInventory: {
-      // 盘点单号查询检查
-      checkRaw: '/wmspda/product/finished/checkRaw/order',
-      // 扫描物料号检查
-      productCode: '/wmspda/product/finished/checkRaw/productCode',
-      // 3.盘点单中不存在该物料但继续盘点，需要新增单号和物料信息
-      createInfo: '/wmspda/product/finished/checkRaw/createInfo',
-      // 4.物料盘点确定
-      productComplete: '/wmspda/product/finished/checkRaw/productComplete',
-      // 5.盘点完成
-      orderComplete: '/wmspda/product/finished/checkRaw/orderComplete',
-      getRawStorageSnNew: '/wmspda/material/getRawStorageSnNew',
-      barcodeConfirm: '/wmspda/product/finished/sfgPd/barcodeConfirm',
-      barcodeScanPd: '/wmspda/material/barcodeScanPd',
-      newbarcodeScanPd: '/wmspda/material/inventoryPd/barcodeScanPd',
-      sfgPdorderComplete: '/wmspda/product/finished/sfgPd/orderComplete',
-    },
-    // 委外 commission
-    commission: {
-      // 出库 goOut
-      goOut: {
-        // 出库单号查询
-        queryOrder: '/wmspda/material/outsourcing/queryOrder',
-        // 库位下拉列表
-        queryByFactoryCodeAndWorkAreaCode: '/wmspda/fg/queryByFactoryCodeAndWorkAreaCode',
-        // 出库提交
-        materialComplete: '/wmspda/material/outsourcing/materialComplete',
-        // 出库明细查询
-        outInfo: '/wmspda/material/outsourcing/outInfo',
-      },
-      entrant: {
-        // 单号查询
-        queryOrder: '/wmspda/material/outsourcing/into/queryOrder',
-        // 库位下拉列表
-        queryByFactoryCodeAndWorkAreaCode: '/wmspda/fg/queryByFactoryCodeAndWorkAreaCode',
-        // 提交
-        materialComplete: '/wmspda/material/outsourcing/into/materialComplete',
-        // 明细查询
-        info: '/wmspda/material/outsourcing/into/info',
-      },
-    },
-  },
-  SFG: {
-    DumpListFH: {
-      FHDH: '/wmspda/material/orderin/poEubInfo',
-      enter: '/wmspda/material/orderin/enterPoEub',
-    },
-  },
-  so: {
-    soOutbound: {
-      findInfoByDN: '/wmspda/raw/so/findInfoByDN',
-      confirm: '/wmspda/raw/so/confirm',
-    },
-    soInbound: {},
-  },
-  Subcontract: {
-    base: {
-      queryLocList: '/wmspda/subcontractRf/queryLocList',
-    },
-    matReturn: {
-      queryOrderInfo: '/wmspda/subcontractRf/return/queryOrderInfo',
-      submit: '/wmspda/subcontractRf/return/submit',
-      detail: '/wmspda/subcontractRf/return/detail',
-    },
-    matOut: {},
-    matIn: {},
-  },
-  //出库
-  outbound: {
-    stoOutbound: {
-      dnQuery: '/wmspda/fg/findStoDnInfo/fg/russia',
-      stoDnProdScan: '/wmspda/fg/stoDnProdScan/russia',
-      stoDnOutPost: '/wmspda/fg/stoDnOut/post/russia',
-      info: '/wmspda/material/orderout/queryStoPlan',
-      findProdInfoByDN: '/wmspda/fg/findProdInfoByDN',
-      yuetaiType: '/wmspda/fg/queryDocksUnderWareHouse',
-      findSpareInfoByDN: '/wmspda/fg/findSpareInfoByDN',
-      confirmSpareDeliver: '/wmspda/fg/confirmSpareDeliver',
-      Bookkeeping: '/wmspda/fg/scanBarcodeDN',
-      scanBarcodeDNtha: '/wmspda/fg/scanBarcodeDN/tha',
-      close: '/wmspda/material/outsourcing/close',
-      // Bookkeeping: '/wmspda/fg/confirmMove',
-      checkScan: '/wmspda/fg/getMaterialByCode',
-      del: '/wmspda/fg/scanBarcodeDN/del',
-      getMaterialByCode: '/wmspda/fg/getMaterialByCode',
-      queryOrder: '/wmspda/material/outsourcing/into/queryOrder',
-      querySpareListInfoByDnNo: '/wmspda/fg/querySpareListInfoByDnNo',
-      subcDnInfo: '/wmspda/material/orderin/subcDnInfo',
-      submit: '/wmspda/material/outsourcing/into/materialComplete',
-      materialComplete: '/wmspda/material/outsourcing/materialComplete',
-      materialCompleteRussia: '/wmspda/material/outsourcing/materialComplete/russia',
-      confirmSfgDeliver: '/wmspda/fg/confirmSfgDeliver/russia',
-      outsourcingQueryOrder: '/wmspda/material/outsourcing/queryOrder',
-      findSfgInfoByDN: '/wmspda/fg/findSfgInfoByDN/russia',
-      getDetailByorderNo: '/wmspda/fg/queryListInfoByDnNo',
-      scanBarcodeDN: '/wmspda/fg/scanBarcodeDN/del',
-      queryAmount: '/wmspda/fg/queryAmountByDn',
-      Posting: '/wmspda/fg/dnPosting',
-      RusPosting: '/wmspda/fg/dnPosting/russia',
-      stoDnProdScanDel: '/wmspda/fg/stoDnProdScanDel/russia',
-      stoQuery: '/wmspda/fg/stoOutbound/query',
-      stoScan: '/wmspda/fg/stoOutbound/scan',
-      stoConfirm: '/wmspda/fg/stoOutbound/confirm',
-      stoPost: '/wmspda/fg/stoOutbound/post',
-      stoDetailQuery: '/wmspda/fg/stoOutbound/queryDetail',
-      pcListQuery: '/wmspda/fg/stoOutbound/queryPcNoList',
-      stoCancel: '/wmspda/fg/stoOutbound/cancel',
-      stoDelete: '/wmspda/fg/stoOutbound/delete',
-    },
-  },
-  inbound: {
-    finishProductOffline: {
-      kuwei: '/wmspda/fg/getMdLocation',
-      SearchKuwei: '/wmspda/fg/getMdLocationProd',
-      barcode: '/wmspda/product/finished/show-info',
-      confirm: '/wmspda/product/finished/batch-offline',
-      batchOffline: '/wmspda/product/finished/batch-offline/russia',
-      finished: '/wmspda/product/finished/show-info/russia',
-    },
-    semiFinishProductOfflineRefrigerator: {
-      kuwei: '/wmspda/fg/getMdLocation',
-      materialCode: '/wmspda/product/semi-finished/get-product',
-      confirm3: '/wmspda/product/semi-finished/batch-online-turnover-door', //门体上线
-      confirm2: '/wmspda/product/semi-finished/batch-offline', //半成品空调/洗衣机下线
-      confirm: '/wmspda/product/semi-finished/batch-offline-turnover-car', //半成品冰箱下线
-    },
-    semiFinishProductOnlineBox: {
-      materialCode: '/wmspda/product/semi-finished/get-origin-material',
-    },
-  },
-  sortscan: {
-    query: {
-      prdorder: '/wmspda/sortscan/query/prdorder',
-      prdorderList: '/wmspda/sortscan/query/prdorder/list',
-      aggregateList: '/wmspda/sortscan/query/aggregate/list',
-    },
-    save: {
-      aggregateRussia: 'wmspda/sortscan/save/aggregate/russia',
-      aggregate: '/wmspda/sortscan/save/aggregate',
-      order: '/wmspda/sortscan/save/order',
-      pickVN: '/wmspda/sortscan/pickVN',
-      orderRussia: 'wmspda/sortscan/save/order/russia',
-      queryWlByMat: '/wmspda/sortscan/queryWlByMat',
-      queryWlByMatBL: '/wmspda/sortscan/queryWlByMatBL',
-      queryVirtualOrderAmountBl: '/wmspda/bl/queryVirtualOrderAmountBl',
-      queryMrpByUser: '/wmspda/material/queryMrpByUser',
-      checkUserAndMrp: '/wmspda/material/checkUserAndMrp',
-    },
-    unlock: {
-      list: '/wmspda/sortscan/unlock/list',
-      aggregateList: '/wmspda/sortscan/unlock/aggregate/list',
-    },
-    lock: {
-      list: '/wmspda/sortscan/lock/list',
-    },
-  },
-  sumscan: {
-    query: {
-      orderno: '/wmspda/sumscan/query/orderno',
-      ordoutlist: '/wmspda/sumscan/query/ordoutlist',
-      hzlist: '/wmspda/sumscan/query/hzlist',
-      fllist: '/wmspda/sumscan/query/fllist',
-      getSendSpotList: '/wmspda/material/getSendSpotList',
-    },
-    lock: {
-      list: '/wmspda/sumscan/lock/list',
-    },
-    unlock: {
-      list: '/wmspda/sumscan/unlock/list',
-    },
-    u: {
-      order: '/wmspda/sumscan/u/order',
-      hzlist: '/wmspda/sumscan/u/hzlist',
-      fllist: '/wmspdasumscan/u/fllist',
-    },
-  },
-  warehouse: {
-    center: {
-      centerRecordTableRecovery: '/wmspda/bl/centerRecordTableRecovery',
-    },
-    rowTransfer: {
-      list: '/wmspda/fg/listByOrder',
-      listByOrder: '/wmspda/fg/listByOrder',
-      getOdsRawStorageSnNew: 'wmspda/bl/getOdsRawStorageSnNew',
-      commit: '/wmspda/fg/confirmMove',
-      confirmMoveRussia: 'wmspda/fg/confirmMove/russia',
-      confirmMove: 'wmspda/fg/confirmMove/russia',
-      russia: '/wmspda/fg/confirmMove/russia',
-      getMaterialByCode: '/wmspda/fg/getMaterialByCode',
-      getCode: '/wmspda/fg/getCpMoveBatchNo',
-      getSfgMoveBatchNo: '/wmspda/fg/getSfgMoveBatchNo',
-      queryGroupLis: '/wmspda/fg/queryGroupListByMoveCode',
-      queryGroupListByMoveCode: '/wmspda/fg/queryGroupListByMoveCode',
-      //查询明细
-      queryListByMoveCode: '/wmspda/fg/queryListByMoveCode',
-      close: '/wmspda/fg/closeHandOrder',
-      stoAdjusList: '/wmspda/fg/stoAdjusList',
-      confirmMoveStoAdjus: '/wmspda/fg/confirmMoveStoAdjus',
-      getproduct: '/wmspda/product/semi-finished/get-product',
-      findStoOutOrderInfo: '/wmspda/fg/findStoOutOrderInfo/tha',
-      stoOutOrderDelivery: '/wmspda/fg/stoOutOrderDelivery/tha',
-      findStoReceiveOrderInfo: '/wmspda/fg/findStoReceiveOrderInfo/tha',
-      stoOutOrderReceive: '/wmspda/fg/stoOutOrderReceive/tha',
-      getCostCenter: '/wmspda/fg/getCostCenter',
-    },
-    container: {
-      getRawStorageSnNew: '/wmspda/material/getRawStorageSnNew',
-      getOdsRawStorageSnNew: '/wmspda/bl/getOdsRawStorageSnNew',
-      russia: '/wmspda/material/restructureContainer/russia',
-      scrapContainers: '/wmspda/material/scrapContainers',
-      getOdsRawStorageSnNewHalf: '/wmspda/bl/getOdsRawStorageSnNewHalf',
-      odsRawStorageSnNewScrapped: '/wmspda/bl/odsRawStorageSnNewScrapped',
-      getSfgStorageSnPreScrap: '/wmspda/material/getSfgStorageSnPreScrap',
-      preScrapSfgConfirm: '/wmspda/fg/preScrapSfgConfirm',
-      preScrapRawConfirm: '/wmspda/fg/preScrapRawConfirm',
-    },
-    manualOrder: {
-      list: '/wmspda/fg/manualOrderInfo',
-      confirmRaw: '/wmspda/fg/confirmManualRaw',
-      confirmFg: '/wmspda/fg/confirmManualFg',
-    },
-    rowScrap: {
-      list: '/wmspda/fg/listByOrder',
-    },
-    rowCollect: {
-      list: '/wmspda/fg/listByOrder',
-    },
-    MaterialInventory: {
-      list: '/wmspda/fg/findMaterialByPddNoWl',
-      content: '/wmspda/fg/inventoryUploadSn',
-      commit: '/wmspda/fg/completePd',
-    },
-    LocationInventory: {
-      list: '/wmspda/fg/findMaterialByPddNoKw',
-      content: '/wmspda/fg/inventoryUploadSn',
-      commit: '/wmspda/fg/completePd',
-    },
-    wholeTransfer: {
-      list: '/wmspda/fg/getMdLocationFgAll',
-      content: '/wmspda/fg/getMaterialByCode',
-      getOdsRawStorageSnNew: 'wmspda/bl/getOdsRawStorageSnNew',
-      del: '/wmspda/fg/scanBarcodeStock/del',
-      getMdLocationSfgLine: '/wmspda/fg/getMdLocationSfgLine',
-      getMdLocationSfg: '/wmspda/fg/getMdLocationSfg',
-      getMdLocationRawAndLine: '/wmspda/fg/getMdLocationRawAndLine',
-      getSpareMdLocation: '/wmspda/sparePart/getSpareMdLocation',
-      queryOnshelfOrder: '/wmspda/sparePart/queryOnshelfOrder',
-      queryDownshelfOrder: '/wmspda/sparePart/queryDownshelfOrder',
-      findSpareInfoByDN: '/wmspda/fg/findSpareInfoByDN',
-      upshelf: '/wmspda/sparePart/upshelf-scan',
-      offshelf: '/wmspda/sparePart/offshelf-scan',
-      scanBox: '/wmspda/sparePart/scanBox',
-      saleScan: '/wmspda/fg/sparepart/sale/scan',
-      querySpareListInfoByDnNo: '/wmspda/fg/querySpareListInfoByDnNo',
-      getInfoByDoorBarcode: '/wmspda/fg/getInfoByDoorBarcode',
-      scrapSfgOfflineConfirm: '/wmspda/fg/scrapSfgOfflineConfirm',
-      checkDicCode: '/wmspda/fg/checkDicCode',
-      queryPickingOrders: '/wmspda/sparePart/queryPickingOrders',
-      createPickingOrders: '/wmspda/sparePart/createPickingOrders',
-    },
-    wholeLnventory: {
-      content: '/wmspda/fg/findMaterialByPddNo',
-      commit: '/wmspda/fg/completePd',
-      scanCode: '/wmspda/fg/inventoryUploadSn',
-    },
-  },
-  bl: {
-    query: '/wmspda/bl/query',
-    u: '/wmspda/bl/u',
-    uRussia: '/wmspda/bl/uRussia',
-    unlock: '/wmspda/bl/unlock',
-    virtual: '/wmspda/bl/u/virtual',
-  },
-  bj: {
-    query: '/wmspda/material/hei/spareIn/queryOrder',
-    submit: '/wmspda/material/hei/spareIn/complete',
-    detail: '/wmspda/material/hei/spareIn/queryOrder/detail',
-  },
-  tl: {
-    get: {
-      type: '/wmspda/tl/get/type',
-    },
-    u: '/wmspda/tl/u',
-    uRussia: '/wmspda/tl/uRussia',
-  },
-  virtual: {
-    query: {
-      orderno: '/wmspda/virtual/query/orderno',
-      ordoutlist: '/wmspda/virtual/query/ordoutlist',
-      hzlist: '/wmspda/virtual/query/hzlist',
-    },
-    check: {
-      amount: '/wmspda/virtual/check/amount',
-    },
-    unlock: {
-      list: '/wmspda/virtual/unlock/list',
-    },
-    u: {
-      hzlist: '/wmspda/virtual/u/hzlist',
-    },
-  },
   //正式接口
   lanjumes: {
     product: {
-      getInfoByRfid: '/dev-api/quality/handCheck/getInfoByRfid',
-      saveQcProCheck: '/dev-api/quality/handCheck/saveQcProCheck',
-      queryhandChecklist: '/dev-api/quality/handCheck/list',
+      getInfoByRfid: qianzhuione + '/quality/handCheck/getInfoByRfid',
+      saveQcProCheck: qianzhuione + '/quality/handCheck/saveQcProCheck',
+      queryhandChecklist: qianzhuione + '/quality/handCheck/list',
       sendDestinationStations: '/api/ReceivingAndFeedingMaterials/sendDestinationStations',
       palletInforUpdate: '/api/ReceivingAndFeedingMaterials/palletInforUpdate',
-      getDictList: '/dev-api/quality/handCheck/getDictList',
+      getDictList: qianzhuione + '/quality/handCheck/getDictList',
     },
   },
   lanjuwms: {
     product: {
       // 下线入库
       OfflineStorage: {
-        queryinformation: '/dev-api/wms/put/s/',
-        insertTary: '/dev-api/wms/tray/insertTary',
-        deleteTray: '/dev-api/wms/tray/deleteTray',
-        handPut: '/dev-api/wms/tray/wms/handPut',
-        list: '/dev-api/wms/tray/listTary',
+        queryinformation: qianzhuione + '/wms/put/s/',
+        insertTary: qianzhuione + '/wms/tray/insertTary',
+        deleteTray: qianzhuione + '/wms/tray/deleteTray',
+        handPut: qianzhuione + '/wms/tray/wms/handPut',
+        list: qianzhuione + '/wms/tray/listTary',
       },
       // 销售出库/sellout/showProduceCode/  /sellout/s/订单号/产品编码
 
       SaleOutWH: {
         // 根据交货单号查询下面的产品编码
-        showProduceCode: '/dev-api/wms/sellout/showProduceCode',
+        showProduceCode: qianzhuione + '/wms/sellout/showProduceCode',
         // 根据订单号和产品编码查询
-        queryinformation: '/dev-api/wms/sellout/s',
+        queryinformation: qianzhuione + '/wms/sellout/s',
         // 扫描箱码接口
-        selloutconntray: '/dev-api/wms/selloutconntray',
-        deleteTray: '/dev-api/wms/selloutconntray/deleteTray',
+        selloutconntray: qianzhuione + '/wms/selloutconntray',
+        deleteTray: qianzhuione + '/wms/selloutconntray/deleteTray',
         // 根据交货单号和产品编码查询展示接口
-        showTrays: '/dev-api/wms/selloutconntray/showTrays',
+        showTrays: qianzhuione + '/wms/selloutconntray/showTrays',
         // 手持出库确认
-        out: '/dev-api/wms/selloutconntray/out',
+        out: qianzhuione + '/wms/selloutconntray/out',
       },
     },
   },

vue.config.js

@@ -1,9 +1,25 @@
 module.exports = {
   devServer: {
     proxy: {
+      '/prod-api': {
+        //target: 'http://192.168.3.93:81',
+        target: 'http://192.168.202.20:9000',
+        changeOrigin: true,
+        // pathRewrite: {
+        //   '^/dev-api': '',
+        // },
+      },
       '/dev-api': {
-        target: 'http://192.168.3.93:81',
-        //target: 'http://192.168.3.81:80',
+        //target: 'http://192.168.3.93:81',
+        target: 'http://192.168.202.20:9000',
+        changeOrigin: true,
+        // pathRewrite: {
+        //   '^/dev-api': '',
+        // },
+      },
+      '/api': {
+        //target: 'http://192.168.3.93:81',
+        target: 'http://192.168.202.23:5001',
         changeOrigin: true,
         // pathRewrite: {
         //   '^/dev-api': '',