From 20460ffa7e68caaa2263ecbd02b6a33f47170519 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E9=9D=96?= <2217640373@qq.com>
Date: Thu, 7 Sep 2023 17:57:17 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8B=E7=BA=BF=E5=85=A5=E5=BA=93=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E5=AF=B9=E6=8E=A5=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/mes/ProductionQtyInsp/index.vue     |  3 -
 .../wms/product/OfflineStorage/index.vue      | 77 +++++++++----------
 src/pages/wms/product/OfflineStorage/model.ts | 29 ++++---
 src/utils/url.ts                              | 26 +++++--
 4 files changed, 74 insertions(+), 61 deletions(-)

diff --git a/src/pages/mes/ProductionQtyInsp/index.vue b/src/pages/mes/ProductionQtyInsp/index.vue
index cae2a6d..c1888f4 100644
--- a/src/pages/mes/ProductionQtyInsp/index.vue
+++ b/src/pages/mes/ProductionQtyInsp/index.vue
@@ -354,9 +354,6 @@ export default class productCheckReceipt extends BasePage {
     padding: 20rpx;
   }
 
-  .button-bar {
-  }
-
   .photoList {
     display: flex;
     padding-top: 12rpx;
diff --git a/src/pages/wms/product/OfflineStorage/index.vue b/src/pages/wms/product/OfflineStorage/index.vue
index aa41890..32f495e 100644
--- a/src/pages/wms/product/OfflineStorage/index.vue
+++ b/src/pages/wms/product/OfflineStorage/index.vue
@@ -30,33 +30,33 @@
         <view class="list">
           <view class="row-list">
             <view class="list-item"> 生产订单: </view>
-            <view> {{ orderNodetail.aa }} </view>
+            <view> {{ model.orderNoItemList.productOrder }} </view>
           </view>
           <view class="row-list">
             <view class="list-item"> 产品编码: </view>
-            <view> {{ orderNodetail.aa }} </view>
+            <view> {{ model.orderNoItemList.productCode }} </view>
           </view>
           <view class="row-list">
             <view class="list-item"> 产品名称: </view>
-            <view> {{ orderNodetail.aa }} </view>
+            <view> {{ model.orderNoItemList.productName }} </view>
           </view>
           <view class="row-list">
             <view class="row-list-item">
               <view class="list-item"> 订单数量: </view>
-              <view> {{ orderNodetail.aa }} </view>
+              <view> {{ model.orderNoItemList.planQuantity }} </view>
             </view>
             <view class="row-list-item">
               <view class="list-item"> 单位: </view>
-              <view> {{ orderNodetail.aa }} </view>
+              <view> {{ model.orderNoItemList.unitOfMeasure }} </view>
             </view>
           </view>
           <view class="row-list">
             <view class="list-item">入库数量: </view>
-            <view> {{ orderNodetail.aa }} </view>
+            <view> {{ model.orderNoItemList.putQuantity }} </view>
           </view>
         </view>
       </u-form>
-      <u-form class="form4">
+      <u-form class="form4" style="">
         <!-- <u-search placeholder="请扫描" v-model="boxnumber" :show-action="false"></u-search> -->
         <view class="buttontostore" @click="rukubutn">入库</view>
         <!-- <u-input style="border: 0.5rpx solid #8d8989; border-radius: 10rpx" v-model="boxnumber" @click="clickscan"></u-input> -->
@@ -115,15 +115,15 @@
         <view class="form5">
           <view class="poupitem">
             <view class="pouptitle">托盘号：</view>
-            <u-input class="poupcontent" :clearable="false" v-model="form5.productDescZh" placeholder="" style="overflow: hidden" />
+            <u-input class="poupcontent" :clearable="false" v-model="form5.sn" placeholder="" style="overflow: hidden" />
           </view>
           <view class="poupitem">
             <view class="pouptitle">入库库位：</view>
-            <u-input class="poupcontent" :clearable="false" v-model="form5.productDescZh" placeholder="" style="overflow: hidden" />
+            <u-input class="poupcontent" :clearable="false" v-model="form5.wlCode" placeholder="" style="overflow: hidden" />
           </view>
           <view class="poupitem">
             <view class="pouptitle">箱数：</view>
-            <u-input class="poupcontent" :clearable="false" v-model="form5.productDescZh" placeholder="" style="overflow: hidden" />
+            <u-input class="poupcontent" :clearable="false" v-model="form5.number" placeholder="" style="overflow: hidden" />
           </view>
         </view>
         <view class="poupbutton">
@@ -141,6 +141,7 @@
       </u-popup>
       <view v-if="show" class="mask"></view>
     </view>
+    <u-modal v-model="showmodal" @confirm="confirm" :content="content" show-cancel-button="true"></u-modal>
   </view>
 </template>
 <script lang="ts">
@@ -175,6 +176,8 @@ export default class OfflineStorage extends BasePage {
       value: '0',
     },
   ];
+  showmodal = false;
+  content: any = '';
   // remove: any = {};
   // async onReady() {
   //   await this.model.queryLocation();
@@ -206,9 +209,17 @@ export default class OfflineStorage extends BasePage {
     this.aimWl = e.pickerName;
   }
   //列表删除按钮
-  onPassdelet(item) {
+  async onPassdelet(item) {
     console.log('1234567', item);
+    // this.showmodal = true
+    // this.content = '是否删除?';
+    // let  params = {
+    //   item
+    // }
+    await this.model.deleteTray(item);
   }
+  // confirm(item) {
+  // }
   //取消按钮
   nopoup() {
     this.show = false;
@@ -220,14 +231,16 @@ export default class OfflineStorage extends BasePage {
       this.customToast('请输入nficl');
       return;
     }
-    // await this.model.queryOrderNo(this.orderNo);
+    console.log(model.orderNoItemList);
+    await this.model.queryOrderNo(this.orderNo);
     // this.orderNodetail = model.orderNoItemList;
   }
   histroyItem: any = {};
   barcode: any = '';
   //入库确认按钮
-  onSubmit() {
+  async onSubmit() {
     console.log('1234567');
+    await this.model.handPut(this.list);
   }
   rukubutn() {
     this.show = true;
@@ -239,32 +252,11 @@ export default class OfflineStorage extends BasePage {
     //   this.customToast('请输入nficl');
     //   return;
     // }
-    // await this.model.queryOrderNo(this.form5);
+    await this.model.insertTary(this.form5);
     // //入库后的查询下面列表的接口
     // await this.model.queryOrderNo(this.form5);
     // this.list = model.orderNoItemList;
   }
-  clickscan() {
-    const self: OfflineStorage = this as OfflineStorage;
-    const showToast = (message: string) => {
-      uni.showToast({
-        title: message,
-        icon: 'none',
-      });
-    };
-    uni.scanCode({
-      onlyFromCamera: true,
-      success: function (res) {
-        console.log('条码类型：' + res.scanType);
-        console.log('条码内容：' + res.result);
-        self.boxnumber = res.result;
-        //that.getByPoint();
-      },
-      fail: function () {
-        showToast('扫码不成功');
-      },
-    });
-  }
 }
 </script>
 <style lang="scss" scoped>
@@ -414,14 +406,17 @@ export default class OfflineStorage extends BasePage {
     display: flex;
     justify-content: flex-end;
     .buttontostore {
+      margin-top: 5px;
       background: red;
-      width: 10%;
+      width: 13%;
       /* height: 100%; */
-      height: 60rpx;
+      height: 33px;
       text-align: center;
       /* margin: auto; */
       color: #ffff;
       line-height: 30px;
+      margin-bottom: 5px;
+      border-radius: 5px;
     }
     .u-input__input {
       min-height: 36px;
@@ -525,9 +520,6 @@ export default class OfflineStorage extends BasePage {
     padding: 20rpx;
   }
 
-  .button-bar {
-  }
-
   .photoList {
     display: flex;
     padding-top: 12rpx;
@@ -614,8 +606,11 @@ export default class OfflineStorage extends BasePage {
       flex-direction: row;
       justify-content: space-around;
       margin: 20rpx;
+      align-items: center;
       .pouptitle {
-        width: 25%;
+        // width: 25%;
+        min-width: 35%;
+        // white-space: nowrap;
       }
       .poupcontent {
         border: 1px solid rgba(128, 128, 128, 0.2);
diff --git a/src/pages/wms/product/OfflineStorage/model.ts b/src/pages/wms/product/OfflineStorage/model.ts
index 46622df..dc223c3 100644
--- a/src/pages/wms/product/OfflineStorage/model.ts
+++ b/src/pages/wms/product/OfflineStorage/model.ts
@@ -27,22 +27,31 @@ export class OfflineStorage extends VuexModule {
   productCodeList: any = [];
   @MutationAction
   async queryOrderNo(orderNo: any) {
-    const result: any = await http.post(url.warehouse.wholeTransfer.queryDownshelfOrder, {
-      // factoryCode: session.factoryCode,
-      loginName: session.loginName,
-      orderNo,
+    const result: any = await http.get(url.lanjuwms.product.OfflineStorage.queryinformation, {
+      //loginName: session.loginName,
+      params: {
+        rfid: orderNo,
+      },
     });
     const orderNoItemList = result.data;
-    // const productCodeList = result.data.map((_: any) => ({
-    //   label: _.productCode,
-    //   value: _.productCode,
-    // }));
     return { orderNoItemList };
   }
   SubmitCode: any = '';
   @MutationAction
-  async OnSubmit(params: any) {
-    const result: any = await http.post(url.warehouse.wholeTransfer.offshelf, params);
+  async insertTary(params: any) {
+    const result: any = await http.post(url.lanjuwms.product.OfflineStorage.insertTary, params);
+    const SubmitCode = result.code;
+    return { SubmitCode };
+  }
+  @MutationAction
+  async deleteTray(params: any) {
+    const result: any = await http.delete(url.lanjuwms.product.OfflineStorage.deleteTray, params);
+    const SubmitCode = result.code;
+    return { SubmitCode };
+  }
+  @MutationAction
+  async handPut(params: any) {
+    const result: any = await http.delete(url.lanjuwms.product.OfflineStorage.handPut, params);
     const SubmitCode = result.code;
     return { SubmitCode };
   }
diff --git a/src/utils/url.ts b/src/utils/url.ts
index 4fdb8e4..4b5d2af 100644
--- a/src/utils/url.ts
+++ b/src/utils/url.ts
@@ -16,13 +16,6 @@ export const url = {
       orderType: '/wmspda/fg/orderType',
     },
   },
-  lanjumes: {
-    product: {
-      getInfoByRfid: '/api/dev-api/quality/handCheck/getInfoByRfid',
-      saveQcProCheck: '/api/dev-api/quality/handCheck/saveQcProCheck',
-      queryhandChecklist: '/api/dev-api/quality/handCheck/list',
-    },
-  },
   sys: {
     log: {
       error: '/wmspda/sys/log/error',
@@ -406,4 +399,23 @@ export const url = {
       hzlist: '/wmspda/virtual/u/hzlist',
     },
   },
+  //正式接口
+  lanjumes: {
+    product: {
+      getInfoByRfid: '/api/dev-api/quality/handCheck/getInfoByRfid',
+      saveQcProCheck: '/api/dev-api/quality/handCheck/saveQcProCheck',
+      queryhandChecklist: '/api/dev-api/quality/handCheck/list',
+    },
+  },
+  lanjuwms: {
+    product: {
+      // 下线入库
+      OfflineStorage: {
+        queryinformation: '/api/dev-api/put/s',
+        insertTary: '/api/dev-api/tray/insertTary',
+        deleteTray: '/api/dev-api/tray/deleteTray',
+        handPut: '/api/dev-api/tray/handPut',
+      },
+    },
+  },
 };