From 4fcd7d0e1a131752b14fb956e314c5d688808f57 Mon Sep 17 00:00:00 2001
From: guoshuang <guoshuang@qq.com>
Date: Mon, 24 Jun 2024 20:17:14 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E5=8D=95&wcs=E7=A9=BA=E7=AD=9B?=
 =?UTF-8?q?=E5=9B=9E=E6=B5=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages.json                              |   8 +
 src/pages/login/login/index.vue             |   2 +-
 src/pages/mes/EmptyEflux/index.vue          | 288 ++++++++++++++++++++
 src/pages/mes/EmptyEflux/model.ts           |  24 ++
 src/pages/wms/product/SalesReturn/index.vue |  21 +-
 src/pages/wms/product/SalesReturn/model.ts  |  11 +
 src/utils/page.ts                           |   1 +
 src/utils/request.ts                        |  18 +-
 src/utils/url.ts                            |   2 +
 vue.config.js                               |   5 +-
 10 files changed, 368 insertions(+), 12 deletions(-)
 create mode 100644 src/pages/mes/EmptyEflux/index.vue
 create mode 100644 src/pages/mes/EmptyEflux/model.ts

diff --git a/src/pages.json b/src/pages.json
index ea72621..9b81ecf 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -543,6 +543,14 @@
         "navigationStyle": "custom",
         "navigationBarTextStyle": "white"
       }
+    },
+    {
+      "path": "pages/mes/EmptyEflux/index",
+      "style": {
+        "navigationBarTitleText": "空筛回流",
+        "navigationStyle": "custom",
+        "navigationBarTextStyle": "white"
+      }
     }
     
 
diff --git a/src/pages/login/login/index.vue b/src/pages/login/login/index.vue
index b81cf7b..a2a6ae2 100644
--- a/src/pages/login/login/index.vue
+++ b/src/pages/login/login/index.vue
@@ -142,7 +142,7 @@ export default class LoginPage extends BasePage {
     // console.log('Version////', this.Version);
   }
   ///********版本号修改区域**********
-  version = '0.0.70'; //正式版本号
+  version = '0.0.71'; //正式版本号
   //version = '0.0.3'; //测试版本号
   //***************标志修改区域：是否是测试标志： false 正式版本； true 测试版本****************
   //isTest = true;
diff --git a/src/pages/mes/EmptyEflux/index.vue b/src/pages/mes/EmptyEflux/index.vue
new file mode 100644
index 0000000..64db68c
--- /dev/null
+++ b/src/pages/mes/EmptyEflux/index.vue
@@ -0,0 +1,288 @@
+<template>
+  <view class="page-product-receipt">
+    <view class="header" :style="{ backgroundColor: `rgba(250, 53, 52, ${scrollTop / 100})` }">
+      <view class="left">
+        <u-icon class="icon" name="arrow-left" @click="uni.navigateBack({})" />
+      </view>
+      <view class="title">空筛回流</view>
+      <view class="right"></view>
+    </view>
+    <u-form class="form" ref="form" label-width="180rpx">
+      
+      
+      <u-form-item label="任务类型:">
+        <jPicker sureColor="#ff0000" :moren="moren" @bindpicker="selectProductlocCode" showKey="label" valKey="value" :val="productCodelocList.value" :options="taskType" />
+      </u-form-item>
+
+      <u-form-item label="location:">
+        <jPicker sureColor="#ff0000" :moren="morenStart" @bindpicker="selectProductCode" showKey="label" valKey="value" :val="productCodeList.value" :options="location" />
+      </u-form-item>
+    </u-form>
+    <view class="bottom-bar">
+      <u-row class="button-bar">
+        
+        <!-- 确定 -->
+        <u-col :span="6">
+          <u-button @click="onsubmit" type="primary">确定</u-button>
+        </u-col>
+        <!-- 返回 -->
+        <u-col :span="6">
+          <u-button type="error" @click="uni.navigateBack({})">返回</u-button>
+        </u-col>
+      </u-row>
+    </view>
+    <!-- <u-modal v-model="isshow" class="modal" :show-cancel-button="true" :show-title="false" @cancel="cancel()" @confirm="confirm">
+      <div class="upload-name">
+        <div class="name">托盘绑定</div>
+        <u-input class="input" style="background: #ffffff; border: 1px solid #9f9e9e; margin-top: 10px; width: 80%; margin: auto; border-radius: 9px; text-align: center" :disabled="true" v-model="orderNo" placeholder="" />
+      </div>
+    </u-modal> -->
+    <u-toast ref="uToast" />
+  </view>
+</template>
+<script lang="ts">
+import { Component } from 'vue-property-decorator';
+import { BasePage } from '@/components/base/page';
+import model from './model';
+import chooseOne from '@/components/choose-one/choose-one.vue';
+import jPicker from '@/components/J-Picker/jPicker.vue';
+import { session } from '@/store/modules/session';
+//import { session } from '@/store/modules/session';
+//import store from '@/store';
+@Component({
+  components: {
+    chooseOne,
+    jPicker,
+  },
+})
+export default class EmptyEflux extends BasePage {
+  model = model;
+  moren = '选择任务类型';
+  morenStart = '选择location';
+  taskType = [
+    {
+      label: '取到6楼烘房',
+      value: "1",
+    },
+    {
+      label: '放到4楼回流线',
+      value: "2",
+    },
+  ];
+  location=[
+  {
+    label: 'H61',
+      value: "H61",
+    },
+    {
+      label: 'H62',
+      value: "H62",
+    },
+    {
+      label: 'H63',
+      value: "H63",
+    },
+  ]
+  productCodeList: any = {};
+  productCodelocList: any = {};
+  
+  // 模态框
+  isshow = false;
+  // remove: any = {};
+  async onReady() {
+   
+  }
+  
+  orderNo: any = '';
+  
+  locationStatus: any = 1;
+  
+  generateGUID() {
+    return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function (c) {
+      var r = (Math.random() * 16) | 0,
+        v = c === 'x' ? r : (r & 0x3) | 0x8;
+      return v.toString(16);
+    });
+  }
+  async onsubmit() {
+    console.log(this.productCodeList.value == '' || this.productCodeList.value == undefined, this.productCodeList.value);
+    
+    if (this.productCodelocList.value == '' || this.productCodelocList.value == undefined) {
+      (this.$refs.uToast as any).show({
+        title: '请选择任务类型',
+        type: 'default',
+      });
+      return;
+    }
+    if (this.productCodeList.value == '' || this.productCodeList.value == undefined) {
+      (this.$refs.uToast as any).show({
+        title: '请选择location',
+        type: 'default',
+      });
+      return;
+    }
+    
+   
+    var currentDate = new Date();
+
+    // 获取年份、月份、日期、小时、分钟和秒
+    var year = currentDate.getFullYear();
+    var month = ('0' + (currentDate.getMonth() + 1)).slice(-2);
+    var day = ('0' + currentDate.getDate()).slice(-2);
+    var hours = ('0' + currentDate.getHours()).slice(-2);
+    var minutes = ('0' + currentDate.getMinutes()).slice(-2);
+    var seconds = ('0' + currentDate.getSeconds()).slice(-2);
+
+    // 格式化为 "YYYY-MM-DD HH:mm:ss" 结构
+    var formattedDate = year + '-' + month + '-' + day + ' ' + hours + ':' + minutes + ':' + seconds;
+    let params = {
+      
+      reqTime: formattedDate,
+      taskType:this.productCodelocList.value,
+      location:this.productCodeList.value,
+      reqCode:this.generateGUID(),
+      factory: session.FactoryCode,
+    };
+    await this.model.transferWhiteBilletPlan(params);
+    if (model.SubmitCode.code == 0) {
+      this.uni.showToast({ title: '成功' }); //成功弹窗
+      //this.Clear(); //清除数据
+    } else {
+      (this.$refs.uToast as any).show({
+        title: model.SubmitCode.message, //错误信息展示
+        type: 'default',
+      });
+    }
+  }
+  // Clear() {
+   
+  //   this.productCodeList = {};
+  //   this.productCodelocList = {};
+  // }
+  async selectProductCode(e: any) {
+    this.productCodeList = e.pickerName;
+  }
+  async selectProductlocCode(e: any) {
+    this.productCodelocList = e.pickerName;
+  }
+  
+  
+  
+}
+</script>
+<style lang="scss" scoped>
+.page-product-receipt {
+  background: #f2f2f2 linear-gradient(0deg, #f2f2f2 0%, #f8262c 51%, #d9001b 100%) no-repeat;
+  background-size: 100% 600rpx;
+  padding: 118rpx 30rpx 162rpx;
+  min-height: 100%;
+
+  .header {
+    position: fixed;
+    top: 0rpx;
+    left: 0;
+    right: 0;
+    z-index: 99;
+    display: flex;
+    height: 120rpx;
+    line-height: 88rpx;
+    color: #fff;
+    font-size: 34rpx;
+    font-weight: 500;
+    text-align: center;
+    padding: 45rpx 0rpx 0rpx;
+    .title {
+      flex: 3;
+    }
+
+    .left,
+    .right {
+      flex: 1;
+    }
+
+    .icon {
+      display: flex;
+      justify-content: center;
+      align-items: center;
+      width: 88rpx;
+      height: 88rpx;
+    }
+  }
+
+  .form {
+    background-color: #fff;
+    padding: 40rpx;
+    border-radius: 10rpx;
+    box-shadow: 0 0 20rpx 0 rgba(128, 128, 128, 0.2);
+
+    .u-form-item {
+      padding: 30rpx 0;
+      line-height: 35rpx;
+
+      .Transfer {
+        width: 280rpx;
+        height: 64rpx;
+        background: rgb(242, 242, 242);
+        border-radius: 110rpx;
+      }
+    }
+
+    .single {
+      width: 100%;
+      height: 100rpx;
+      display: flex;
+
+      .single-left {
+        width: 80%;
+        height: 100%;
+        display: flex;
+
+        view {
+          width: 142rpx;
+          height: 100%;
+          line-height: 100rpx;
+        }
+      }
+
+      .single-right {
+        button {
+          margin-top: 15rpx;
+          width: 140rpx;
+          height: 70rpx;
+          background-color: #fa3534;
+        }
+      }
+    }
+  }
+  .bottom-bar {
+    position: fixed;
+    bottom: 0;
+    left: 0;
+    right: 0;
+    z-index: 99;
+    background: #ffffff;
+    box-shadow: 0 1rpx 20rpx 0 rgba(128, 128, 128, 0.2);
+    padding: 20rpx;
+  }
+  .modal {
+    .upload-name {
+      padding: 10px 20px;
+      .name {
+        font-size: 17px;
+        margin-bottom: 15px;
+        // font-weight: 600;
+      }
+    }
+  }
+
+  ::v-deep .yjy-switch-container .yjy-switch-item {
+    width: 100%;
+  }
+  ::v-deep .uni-input-input {
+    background: none;
+  }
+  ::v-deep .yjy-switch-container {
+    width: 50%;
+  }
+}
+</style>
diff --git a/src/pages/mes/EmptyEflux/model.ts b/src/pages/mes/EmptyEflux/model.ts
new file mode 100644
index 0000000..2fd633a
--- /dev/null
+++ b/src/pages/mes/EmptyEflux/model.ts
@@ -0,0 +1,24 @@
+import { getModule, Module, MutationAction, 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';
+@Module({
+  namespaced: true,
+  dynamic: true,
+  store,
+  name: 'page.mes.EmptyEflux',
+})
+export class EmptyEflux extends VuexModule {
+  
+  SubmitCode: any = '';
+  //空筛回流提交
+  @MutationAction
+  async transferWhiteBilletPlan(params: any) {
+    const result: any = await http.post(url.lanjumes.product.transferWhiteBilletPlan, params);
+    const SubmitCode = result;
+    return { SubmitCode };
+  }
+}
+
+export default getModule(EmptyEflux);
diff --git a/src/pages/wms/product/SalesReturn/index.vue b/src/pages/wms/product/SalesReturn/index.vue
index b26959e..60792d3 100644
--- a/src/pages/wms/product/SalesReturn/index.vue
+++ b/src/pages/wms/product/SalesReturn/index.vue
@@ -15,9 +15,9 @@
             <view>退货单号:</view>
             <u-search placeholder="请扫描" v-model="orderNo" @search="query" :show-action="false"></u-search>
           </view>
-          <!-- <view class="single-right">
+          <view class="single-right">
             <u-button type="primary" @click="tidan">提单</u-button>
-          </view> -->
+          </view>
         </view>
         <view class="row-list">
           <view class="list-item">行项目: </view>
@@ -374,6 +374,23 @@ export default class SalesReturn extends BasePage {
       url: this.page.wms.SalesReturndetail + '?sn=' + item.sn,
     });
   }
+  async tidan(){
+    if (this.orderNo == '' || this.orderNo.length == 0) {
+      (this.$refs.uToast as any).show({
+        title: '请输入退货单号',
+        // url: '/pages/user/index'
+      });
+      return;
+    }
+    await this.model.finishedProductSalesReturnTD(this.orderNo);
+    if(model.finishCode == 200){
+      (this.$refs.uToast as any).show({
+        title: '提单成功',
+        // url: '/pages/user/index'
+      });
+      this.query();
+    }
+  }
 }
 </script>
 <style lang="scss" scoped>
diff --git a/src/pages/wms/product/SalesReturn/model.ts b/src/pages/wms/product/SalesReturn/model.ts
index cb95c64..c801e47 100644
--- a/src/pages/wms/product/SalesReturn/model.ts
+++ b/src/pages/wms/product/SalesReturn/model.ts
@@ -91,6 +91,17 @@ export class SalesReturn extends VuexModule {
     const delsncode = result.code;
     return { delsncode };
   }
+  finishCode: any = '';
+  @MutationAction
+  async finishedProductSalesReturnTD(params: any) {
+    const result:any = await http.post(url.lanjuwms.product.SalesReturn.FinishedProductSalesReturnTD, {
+      factoryCode:session.FactoryCode,
+      createBy:session.loginName,
+      productOrder:params,
+    });
+    const finishCode = result.code;
+    return { finishCode };
+  }
 }
 
 export default getModule(SalesReturn);
diff --git a/src/utils/page.ts b/src/utils/page.ts
index 33d338a..daf38b6 100644
--- a/src/utils/page.ts
+++ b/src/utils/page.ts
@@ -15,6 +15,7 @@ export const page = {
     ProductionQtyInsplist: '/pages/mes/ProductionQtyInsp/listdata',
     ProductionQtyInspDetail: '/pages/mes/ProductionQtyInsp/detail',
     ChangePalletNew: '/pages/mes/ChangePalletNew/index',
+    EmptyEflux: '/pages/mes/EmptyEflux/index',
   },
   shouye: '/pages/shouye/index',
   me: '/pages/shouye/me',
diff --git a/src/utils/request.ts b/src/utils/request.ts
index 96edb42..e818e2a 100644
--- a/src/utils/request.ts
+++ b/src/utils/request.ts
@@ -23,13 +23,15 @@ http.interceptors.request.use(
   (config: any) => {
     //console.log('123456',config)
     //生产请将注释解开重要重要
-    // if (config.url.includes('/api')) {
-    //   config.baseURL = 'http://192.168.202.23:5001';
-    // } else {
-    //   config.baseURL = 'http://192.168.202.34:30000'
-    //   //'http://192.168.202.20:9000' ///测试
-    //   //'http://192.168.202.34:30000'; //正式
-    // }
+    if (config.url.includes('/api')) {
+      config.baseURL = 'http://192.168.202.23:5001';
+    }else if(config.url.includes('http')) {
+      //直接使用写死地址
+    }else {
+      config.baseURL = 'http://192.168.202.34:30000'
+      //'http://192.168.202.20:9000' ///测试
+      //'http://192.168.202.34:30000'; //正式
+    }
     // 所有请求默认提示加载中
     if (!loading) {
       uni.showLoading({ title: '加载中' });
@@ -96,6 +98,8 @@ http.interceptors.response.use(
           return dataAxios;
         case 10:
           return dataAxios;
+        case 0:
+          return dataAxios;        
         case 200:
           return dataAxios;
         case 401:
diff --git a/src/utils/url.ts b/src/utils/url.ts
index 517b6e8..cdddee2 100644
--- a/src/utils/url.ts
+++ b/src/utils/url.ts
@@ -35,6 +35,7 @@ export const url = {
       ErrorPalletHandling: '/api/ReceivingAndFeedingMaterials/ErrorPalletHandling',
       // 获取目的地
       getDestination: '/api/ReceivingAndFeedingMaterials/getDestination',
+      transferWhiteBilletPlan: 'http://192.168.202.28:9001/api/v1/ReceiveMesMsg/transferWhiteBilletPlan',
     },
   },
   lanjuwms: {
@@ -79,6 +80,7 @@ export const url = {
       SalesReturn: {
         FinishedProductSalesReturn: qianzhuione + '/wms/WmsToWCSmission/FinishedProductSalesReturn',
         FinishedProductSalesReturnConfirm: qianzhuione + '/wms/WmsToWCSmission/FinishedProductSalesReturnConfirm',
+        FinishedProductSalesReturnTD: qianzhuione + '/wms/WmsToWCSmission/finishedProductSalesReturnTD',
       },
       TransferWarehouse: {
         selectFinishedProductTransferAndOutbound: qianzhuione + '/wms/WmsToWCSmission/selectFinishedProductTransferAndOutbound',
diff --git a/vue.config.js b/vue.config.js
index f70bb23..108d057 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -22,8 +22,9 @@ module.exports = {
       },
       '/api': {
         //target: 'http://192.168.3.93:81',
-        // target: 'http://127.0.0.1:5001',
-        target: 'http://192.168.202.23:5001',
+         //target: 'http://192.168.202.28:9001',
+        target: 'http://192.168.202.23:5001',  //多功能wcs
+        //target: 'http://192168.202.28:9001',  //单独wcs
         changeOrigin: true,
         // pathRewrite: {
         //   '^/dev-api': '',