wms成品下线入库修改

src/pages.json

@@ -392,6 +392,14 @@
         "navigationBarTextStyle": "white"
       }
     },
+    {
+      "path": "pages/wms/product/OfflineStorage/detail",
+      "style": {
+        "navigationBarTitleText": "下线入库托盘箱码关系",
+        "navigationStyle": "custom",
+        "navigationBarTextStyle": "white"
+      }
+    },
     {
       "path": "pages/mes/PalletChange/index",
       "style": {

src/pages/wms/product/OfflineStorage/detail.vue

@@ -0,0 +1,367 @@
+<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>
+
+    <view class="scroll">
+      <view v-for="item in list" :key="item.id">
+        <u-form style="margin-top: 10rpx" class="form2">
+          <view class="list">
+            <view class="row-list">
+              <view class="list-item"> 托盘号: </view>
+              <view> {{ item.sn }}</view>
+            </view>
+            <view class="row-list">
+              <view class="list-item"> 箱码: </view>
+              <view> {{ item.barcode }} </view>
+            </view>
+            <view class="rowright">
+              <view class="righttitle">
+                <view @click.stop="onPassdelet(item)" class="boder-icon-rigth"> 解除关联 </view>
+              </view>
+            </view>
+          </view>
+        </u-form>
+      </view>
+    </view>
+    <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>
+    <view>
+      <u-popup v-model="show" mode="center" width="550rpx" height="450rpx">
+        <view class="form5">
+          <view class="poupitem">
+            <view class="pouptitle">托盘号：</view>
+            <u-input class="poupcontent" :clearable="false" v-model="sn" placeholder="" style="overflow: hidden" />
+          </view>
+          <view class="poupitem">
+            <view class="pouptitle">箱码：</view>
+            <u-input class="poupcontent" :clearable="false" v-model="barcode" placeholder="" style="overflow: hidden" />
+          </view>
+          <!-- <view class="poupitem">
+            <view class="pouptitle">箱数：</view>
+            <u-input class="poupcontent" :clearable="false" v-model="form5.number" placeholder="" style="overflow: hidden" />
+          </view> -->
+        </view>
+        <view class="poupbutton">
+          <!-- 确定 -->
+          <u-button @click="onOk" type="primary">确定</u-button>
+          <!-- 返回 -->
+          <u-button type="error" @click="nopoup">取消</u-button>
+        </view>
+      </u-popup>
+      <view v-if="show" class="mask"></view>
+    </view>
+  </view>
+</template>
+<script lang="ts">
+import { Component } from 'vue-property-decorator';
+import { BasePage } from '@/components/base/page';
+import jPicker from '@/components/J-Picker/jPicker.vue';
+import model from './model';
+import { session } from '@/store/modules/session';
+@Component({
+  components: {
+    jPicker,
+  },
+})
+export default class OfflineStoragedetail extends BasePage {
+  model = model;
+  sn = '';
+  barcode = '';
+  show = false;
+  list: any[] = [];
+  onLoad(options) {
+    this.sn = options.sn;
+    this.query();
+  }
+  async query() {
+    await this.model.selectSnCorrelationBarcode(this.sn);
+    if (model.selectcode == '200') {
+      this.list = model.selectdata;
+    } else {
+      this.list = [];
+    }
+  }
+  onSubmit() {
+    this.show = true;
+  }
+  nopoup() {
+    this.show = false;
+    this.barcode = '';
+  }
+  async onOk() {
+    if (this.sn == '' || this.barcode == '') {
+      (this.$refs.uToast as any).show({
+        title: '不能为空',
+        // url: '/pages/user/index'
+      });
+      return;
+    }
+    let item = {
+      sn: this.sn,
+      barcode: this.barcode,
+      siteCode: session.FactoryCode,
+    };
+    await this.model.addSnCorrelationBarcode(item);
+    if (model.addsncode == '200') {
+      this.query();
+      this.nopoup();
+    } else {
+      (this.$refs.uToast as any).show({
+        title: '绑定失败',
+        // url: '/pages/user/index'
+      });
+      return;
+    }
+  }
+  async onPassdelet(item) {
+    console.log('item', item);
+    await this.model.deletSnCorrelationBarcode(item.storageId);
+    if (model.addsncode == '200') {
+      this.query();
+    } else {
+      (this.$refs.uToast as any).show({
+        title: '取消关联失败',
+        // url: '/pages/user/index'
+      });
+      return;
+    }
+  }
+}
+</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;
+    }
+  }
+
+  .scroll {
+    // margin-top: 120rpx;
+    // padding-left: 30rpx;
+    // padding-right: 16rpx;
+    // margin-bottom: 20rpx;
+    // overflow: scroll;
+    // padding-top: 20rpx;
+    .form2 {
+      background-color: #fff;
+      padding: 25rpx 25rpx 25rpx;
+      border-radius: 10rpx;
+      box-shadow: 0 0 20rpx 0 rgba(128, 128, 128, 0.2);
+
+      .row-list {
+        display: flex;
+        flex-direction: row;
+        justify-content: space-between;
+        .row-list-item {
+          display: flex;
+          flex-direction: row;
+          justify-content: space-between;
+          width: 40%;
+        }
+        .list-item {
+          display: flex;
+          flex-direction: row;
+          flex: 1;
+        }
+      }
+
+      .righttitle {
+        display: flex;
+        justify-content: flex-end;
+
+        .boder-icon-rigth {
+          border: 1rpx solid #fa3534;
+          width: 130rpx;
+          text-align: center;
+          background: #fa3534;
+          color: #ffffff;
+          margin-top: 10px;
+        }
+
+        .zhuangtai {
+          background: #a7a0a04a;
+          width: 224rpx;
+          margin-right: -27rpx;
+          border: 2rpx solid #a7a0a04a;
+          border-radius: 12rpx;
+          text-align: center;
+          margin-bottom: 10rpx;
+        }
+
+        .zhuangtai[data-state='1'] {
+          color: green;
+        }
+
+        .zhuangtai[data-state='0'] {
+          color: blue;
+        }
+      }
+    }
+  }
+
+  .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;
+  }
+
+  .button-bar {
+  }
+
+  .photoList {
+    display: flex;
+    padding-top: 12rpx;
+
+    .chooseBtn {
+      width: 202rpx;
+      height: 202rpx;
+      background: #fafafa;
+      border-radius: 12rpx;
+      border: 2rpx dashed #e2e2e2;
+      display: flex;
+      justify-content: center;
+      align-items: center;
+
+      .inner {
+        text-align: center;
+        display: flex;
+        flex-direction: column;
+        justify-content: center;
+        align-items: center;
+      }
+
+      .desc {
+        font-size: 28rpx;
+        font-weight: 400;
+        color: #24252a;
+        line-height: 40rpx;
+      }
+
+      .img {
+        width: 50rpx;
+        height: 50rpx;
+        margin-bottom: 6rpx;
+      }
+    }
+
+    .photoBox {
+      width: 202rpx;
+      height: 202rpx;
+      background: #fafafa;
+      border-radius: 12rpx;
+      position: relative;
+
+      .closeBtn {
+        position: absolute;
+        top: -12rpx;
+        right: -12rpx;
+        z-index: 2;
+        width: 36rpx;
+        height: 36rpx;
+
+        .img {
+          width: 36rpx;
+          height: 36rpx;
+        }
+      }
+
+      .img {
+        width: 202rpx;
+        height: 202rpx;
+        border-radius: 12rpx;
+      }
+    }
+
+    .itemBox {
+      flex: 0 0 202rpx;
+      margin-right: 20rpx;
+
+      &:last-child {
+        margin-right: 0;
+      }
+    }
+
+    // /deep/ .remarksBox textarea {
+    //   font-size: 24rpx;
+    // }
+  }
+  .form5 {
+    padding: 20rpx;
+    //border-radius: 10rpx;
+    //box-shadow: 0 0 20rpx 0 rgba(128, 128, 128, 0.2);
+    .poupitem {
+      display: flex;
+      flex-direction: row;
+      justify-content: space-around;
+      margin: 20rpx;
+      align-items: center;
+      .pouptitle {
+        // width: 25%;
+        min-width: 35%;
+        // white-space: nowrap;
+      }
+      .poupcontent {
+        border: 1px solid rgba(128, 128, 128, 0.2);
+      }
+    }
+  }
+  .poupbutton {
+    display: flex;
+    justify-content: center;
+  }
+}
+</style>

src/pages/wms/product/OfflineStorage/index.vue

@@ -73,7 +73,7 @@
     </view>
     <view style="height: 14rpx"></view>
     <view style="margin-top: 180rpx" class="scroll">
-      <view v-for="item in list" :key="item.id">
+      <view v-for="(item, index) in list" :key="item.id" @dblclick="onFormDoubleClick(item, index)">
         <u-form style="margin-top: 10rpx" class="form2">
           <view class="list">
             <view class="rowleft">
@@ -130,10 +130,10 @@
             <view class="pouptitle">入库库位：</view>
             <u-input class="poupcontent" :clearable="false" v-model="form5.wlCode" placeholder="" style="overflow: hidden" />
           </view>
-          <view class="poupitem">
+          <!-- <view class="poupitem">
             <view class="pouptitle">箱数：</view>
             <u-input class="poupcontent" :clearable="false" v-model="form5.number" placeholder="" style="overflow: hidden" />
-          </view>
+          </view> -->
         </view>
         <view class="poupbutton">
           <!-- 确定 -->
@@ -154,6 +154,7 @@ import { BasePage } from '@/components/base/page';
 import jPicker from '@/components/J-Picker/jPicker.vue';
 import model from './model';
 import { session } from '@/store/modules/session';
+import { usedata } from '@/store/use/data';
 interface OptionType {
   label: string;
   value: string;
@@ -174,7 +175,7 @@ export default class OfflineStorage extends BasePage {
   itemdetail: any = '';
   showmodal = false;
   content: any = '';
-  number1: number;
+  number1: any = '';
   border = true;
   delindex = -1;
   cimWl = {} as OptionType;
@@ -191,6 +192,9 @@ export default class OfflineStorage extends BasePage {
   histroyItem: any = {};
   barcode: any = '';
   productCodeList: any = {};
+  biaojiindex = '';
+  biaojisn = '';
+  number = '';
   async onReady() {
     await this.model.getwarehouselist();
     this.warehouselist = model.warehouselist;
@@ -201,6 +205,29 @@ export default class OfflineStorage extends BasePage {
       this.cimWl = this.warehouselist[0];
     }
   }
+  // 在页面A中
+  onUnload() {
+    // 清空缓存数据
+    usedata.cacheData(null);
+  }
+  async onShow() {
+    const cacheData = usedata.OfflineStoragedata;
+    console.log('cacheData执行了', cacheData);
+    if (cacheData) {
+      console.log('cacheData执行了', cacheData);
+      this.orderNo = cacheData?.orderNo;
+      this.list = cacheData?.list;
+      this.cimWl.value = cacheData?.kuwei;
+      this.biaojiindex = cacheData?.index;
+      this.biaojisn = cacheData?.sn;
+      this.number = cacheData?.number;
+      await this.query();
+      await this.model.selectSnCorrelationBarcode(this.biaojisn);
+      if (model.selectcode) {
+        this.list[this.biaojiindex].number = model.selectdata.length;
+      }
+    }
+  }
   //列表删除按钮
   async onPassdelet(item, index) {
     console.log('1234567', item);
@@ -216,20 +243,6 @@ export default class OfflineStorage extends BasePage {
     this.itemdetail.orderNo = this.orderNo;
     console.log(this.itemdetail, this.orderNo);
     this.list.splice(this.delindex, 1);
-    // await this.model.deleteTray(this.itemdetail);
-    // if (this.model.SubmitCode == '200') {
-    //   (this.$refs.uToast as any).show({
-    //     title: '删除成功',
-    //     type: 'success',
-    //   });
-    //   this.getlist();
-    // } else {
-    //   (this.$refs.uToast as any).show({
-    //     title: '删除失败',
-    //     type: 'error',
-    //   });
-    //   this.getlist();
-    // }
   }
   //选择出库仓库
   warehouseChange(e: any) {
@@ -252,11 +265,10 @@ export default class OfflineStorage extends BasePage {
     await this.model.queryOrderNo(this.orderNo);
     if (model.orderNoItemList) {
       this.orderNoItemList = model.orderNoItemList;
-      this.number1 = this.orderNoItemList.attr3;
+      this.number1 = this.number ? this.number : this.orderNoItemList.attr3;
     } else {
       this.orderNoItemList = {};
     }
-    //this.getlist();
   }
   //入库确认按钮
   async onSubmit() {
@@ -280,7 +292,7 @@ export default class OfflineStorage extends BasePage {
       insertTarynumber = insertTarynumber + parseInt(item.number);
     });
     //console.log(insertTarynumber, model.orderNoItemList.putQuantity, insertTarynumber == model.orderNoItemList.putQuantity);
-    if (insertTarynumber <= this.number1) {
+    if (insertTarynumber <= parseFloat(this.number1)) {
       let params = {
         workOrder: this.orderNoItemList.workOrder,
         factoryCode: session.FactoryCode,
@@ -289,7 +301,7 @@ export default class OfflineStorage extends BasePage {
         productCode: this.orderNoItemList.productCode,
         planQuantity: this.orderNoItemList.planQuantity,
         putQuantity: this.number1,
-        batchNumber: this.orderNoItemList.batchNumbe, //――批次
+        batchNumber: this.orderNoItemList.batchNumber, //――批次
         createBy: session.loginName,
         unitOfMeasure: this.orderNoItemList.unitOfMeasure,
         productOrder: this.orderNoItemList.productOrder, //――单位
@@ -305,14 +317,12 @@ export default class OfflineStorage extends BasePage {
         this.show = false;
         this.list = [];
         this.query();
-        //this.getlist();
       } else {
         (this.$refs.uToast as any).show({
           title: '失败',
           type: 'error',
         });
         this.show = false;
-        //this.getlist();
       }
     } else {
       (this.$refs.uToast as any).show({
@@ -321,15 +331,7 @@ export default class OfflineStorage extends BasePage {
       });
     }
   }
-  async getlist() {
+
-    await (this.model as any).list(this.orderNo);
-    if (model.productCodeList.length > 0) {
-      this.list = model.productCodeList;
-    } else {
-      this.list = [];
-    }
-    console.log(model.productCodeList);
-  }
   async rukubutn() {
     this.form5 = {};
     if (this.orderNo == '' || this.orderNo.length == 0) {
@@ -344,7 +346,7 @@ export default class OfflineStorage extends BasePage {
       this.list.forEach((item) => {
         insertTarynumber = insertTarynumber + parseInt(item.number);
       });
-      let ordernumber = this.number1 || 0;
+      let ordernumber = parseFloat(this.number1) || 0;
       if (insertTarynumber >= ordernumber) {
         (this.$refs.uToast as any).show({
           title: '实际入库数量不能大于入库数量,请先删除再入库',
@@ -360,39 +362,38 @@ export default class OfflineStorage extends BasePage {
   //弹窗入库按钮
   async onOk() {
     console.log(this.form5);
-    if (this.form5.sn == '' || this.form5.wlCode == '' || this.form5.number == '') {
+    if (this.form5.sn == '' || this.form5.wlCode == '') {
       (this.$refs.uToast as any).show({
         title: '不能为空',
         // url: '/pages/user/index'
       });
       return;
     }
-    this.list.push({
+    // this.list.push({
-      number: this.form5.number,
+    //   number: 0,
-      wlCode: this.form5.wlCode,
+    //   wlCode: this.form5.wlCode,
-      sn: this.form5.sn,
+    //   sn: this.form5.sn,
-      //batchNumber: this.orderNoItemList.batchNumber,
+    //   //batchNumber: this.orderNoItemList.batchNumber,
+    // });
+    // this.show = false;
+    await this.model.selectSnCorrelationBarcode(this.form5.sn);
+    if (model.selectcode) {
+      this.list.push({
+        number: model.selectdata.length || 0,
+        wlCode: this.form5.wlCode,
+        sn: this.form5.sn,
+        //batchNumber: this.orderNoItemList.batchNumber,
+      });
+      this.show = false;
+    }
+  }
+  async onFormDoubleClick(item, index) {
+    console.log('双击', item);
+    //await this.model.OnSubmit(item.id);
+    usedata.cacheData({ orderNo: this.orderNo, number: this.number1, kuwei: this.cimWl.value, list: this.list, index: index, sn: item.sn });
+    this.uni.navigateTo({
+      url: this.page.wms.OfflineStoragedetail + '?sn=' + item.sn,
     });
-    this.show = false;
-    // await this.model.insertTary(this.form5);
-    // if (this.model.SubmitCode == '200') {
-    //   (this.$refs.uToast as any).show({
-    //     title: '成功',
-    //     type: 'success',
-    //   });
-    //   this.show = false;
-    //   this.getlist();
-    // } else {
-    //   (this.$refs.uToast as any).show({
-    //     title: '失败',
-    //     type: 'error',
-    //   });
-    //   this.show = false;
-    //   this.getlist();
-    // }
-    // //入库后的查询下面列表的接口
-    // await this.model.queryOrderNo(this.form5);
-    // this.list = model.orderNoItemList;
   }
 }
 </script>

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

@@ -66,6 +66,35 @@ export class OfflineStorage extends VuexModule {
     }));
     return { warehouselist };
   }
+  selectdata: any = [];
+  selectcode: any = '';
+  @MutationAction
+  async selectSnCorrelationBarcode(sn: string) {
+    const result: any = await http.post(url.lanjuwms.product.OfflineStorage.selectSnCorrelationBarcode, {
+      siteCode: session.FactoryCode,
+      sn: sn,
+    });
+    const selectdata = result.data;
+    const selectcode = result.code;
+    return { selectdata, selectcode };
+  }
+  addsncode: any = '';
+  @MutationAction
+  async addSnCorrelationBarcode(params: any) {
+    const result: any = await http.post(url.lanjuwms.product.OfflineStorage.addSnCorrelationBarcode, params);
+    const addsncode = result.code;
+    return { addsncode };
+  }
+  delsncode: any = '';
+  @MutationAction
+  async deletSnCorrelationBarcode(params: any) {
+    const result: any = await http.post(url.lanjuwms.product.OfflineStorage.deletSnCorrelationBarcode, {
+      siteCode: session.FactoryCode,
+      storageId: params,
+    });
+    const delsncode = result.code;
+    return { delsncode };
+  }
 }
 
 export default getModule(OfflineStorage);

src/store/use/data.ts

@@ -0,0 +1,30 @@
+import { Action, getModule, Module, Mutation, VuexModule } from 'vuex-module-decorators';
+import store from '@/store';
+
+export interface OfflineStoragedata {
+  orderNo?: string;
+  number?: string;
+  kuwei?: string;
+  list?: any[];
+  index?: string;
+  sn?: string;
+}
+@Module({
+  dynamic: true,
+  store,
+  namespaced: true,
+  name: 'data',
+})
+class usedataService extends VuexModule {
+  OfflineStoragedata: OfflineStoragedata | null = null;
+  @Mutation
+  setOfflineStoragedata(data: OfflineStoragedata) {
+    this.OfflineStoragedata = data;
+  }
+
+  @Action
+  cacheData(data: OfflineStoragedata) {
+    this.context.commit('setOfflineStoragedata', data);
+  }
+}
+export const usedata = getModule(usedataService);

src/utils/page.ts

@@ -30,6 +30,7 @@ export const page = {
     Requisition: '/pages/wms/Raw/Requisition/index',
     SaleOutWH: '/pages/wms/product/SaleOutWH/index',
     OfflineStorage: '/pages/wms/product/OfflineStorage/index',
+    OfflineStoragedetail: '/pages/wms/product/OfflineStorage/detail',
     ProductionREQ: '/pages/wms/Raw/ProductionREQ/index',
     TrayStatusUpdate: '/pages/wms/Raw/TrayStatusUpdate/index',
     SpecifyPalletOut: '/pages/wms/Raw/SpecifyPalletOut/index',

src/utils/url.ts

@@ -47,6 +47,9 @@ export const url = {
         handPut: qianzhuione + '/wms/tray/wms/handPut',
         list: qianzhuione + '/wms/tray/listTary',
         WmsProductPutByWorkOrderConfirm: qianzhuione + '/wms/WmsToWCSmission/WmsProductPutByWorkOrderConfirm',
+        selectSnCorrelationBarcode: qianzhuione + '/wms/WmsToWCSmission/selectSnCorrelationBarcode',
+        addSnCorrelationBarcode: qianzhuione + '/wms/WmsToWCSmission/addSnCorrelationBarcode',
+        deletSnCorrelationBarcode: qianzhuione + '/wms/WmsToWCSmission/deletSnCorrelationBarcode',
       },
       // 销售出库/sellout/showProduceCode/  /sellout/s/订单号/产品编码