From 32f78bd5cccd912896d3fed92e02c07229167d08 Mon Sep 17 00:00:00 2001
From: guoshuang <guoshuang@qq.com>
Date: Sat, 28 Sep 2024 17:22:13 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8C=85=E6=9D=90=E5=B0=8F=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/login/login/index.vue        |  2 +-
 src/pages/wms/Raw/ReceivePO/index.vue  | 29 +++++++++++++-----
 src/pages/wms/Raw/ReceiveSRM/index.vue | 41 +++++++++++++++-----------
 3 files changed, 45 insertions(+), 27 deletions(-)

diff --git a/src/pages/login/login/index.vue b/src/pages/login/login/index.vue
index ab5affd..0b1d510 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.109'; //正式版本号
+  version = '0.0.110'; //正式版本号
   //version = '0.0.14'; //测试版本号
   //***************标志修改区域：是否是测试标志： false 正式版本； true 测试版本****************
   //isTest = true;
diff --git a/src/pages/wms/Raw/ReceivePO/index.vue b/src/pages/wms/Raw/ReceivePO/index.vue
index 0b1ca1b..920792a 100644
--- a/src/pages/wms/Raw/ReceivePO/index.vue
+++ b/src/pages/wms/Raw/ReceivePO/index.vue
@@ -18,8 +18,11 @@
           <u-button type="primary" @click="tidan">提单</u-button>
         </view>
       </view>
-      <u-form-item label="物料">
-        <jPicker sureColor="#ff0000" @bindpicker="selectProductCodeType" showKey="label" valKey="value" :val="bimWl.value" :options="reducelist" />
+      <u-form-item label="物料编码">
+        <jPicker sureColor="#ff0000" @bindpicker="selectProductCodeType" showKey="value" valKey="value" :val="bimWl.value" :options="reducelist" />
+      </u-form-item>
+      <u-form-item label="物料描述">
+        <u-input border height="50" placeholder="" disabled v-model="bimWl.label" />
       </u-form-item>
       <!-- 订单 -->
       <!-- <u-form-item label="物料描述">
@@ -53,22 +56,22 @@
               <view class="list-item"> 采购单号: </view>
               <view> {{ item.procureCode }} </view>
             </view>
-            <view class="row-list">
+            <!-- <view class="row-list">
               <view class="list-item"> 行项目: </view>
               <view> {{ item.userDefined3 }} </view>
-            </view>
+            </view> -->
             <view class="row-list">
               <view class="list-item"> 物料编码: </view>
               <view> {{ item.handlematerialCode }}</view>
             </view>
-            <view class="row-list">
+            <!-- <view class="row-list">
               <view class="list-item"> 物料描述: </view>
               <view>{{ item.materialDesc }}</view>
-            </view>
-            <view class="row-list">
+            </view> -->
+            <!-- <view class="row-list">
               <view class="list-item"> 工厂号: </view>
               <view>{{ item.siteCode }}</view>
-            </view>
+            </view> -->
             <view class="row-list">
               <view class="list-item"> 应收/已收: </view>
               <view>{{ item.planNumber }}/{{ item.realityNumber }}</view>
@@ -241,6 +244,16 @@ export default class receivePO extends BasePage {
   }
   //标志卡查询
   async querybyidcard() {
+    if (this.receivedlist.length) {
+      let ischongfu = this.receivedlist.some((item) => item.userDefined1 == this.Idcard);
+      if (ischongfu) {
+        (this.$refs.uToast as any).show({
+          title: '请勿重复扫描标志卡',
+        });
+        this.Idcard = '';
+        return;
+      }
+    }
     let item = {
       factoryCode: session.FactoryCode,
       userDefined1: this.Idcard,
diff --git a/src/pages/wms/Raw/ReceiveSRM/index.vue b/src/pages/wms/Raw/ReceiveSRM/index.vue
index ff09d66..6606fd1 100644
--- a/src/pages/wms/Raw/ReceiveSRM/index.vue
+++ b/src/pages/wms/Raw/ReceiveSRM/index.vue
@@ -19,8 +19,11 @@
             <u-button type="primary" @click="tidandelivery">提单</u-button>
           </view>
         </view>
-        <u-form-item label="物料">
-          <jPicker sureColor="#ff0000" :showCode="true" @bindpicker="selectProductCodeType" showKey="label" valKey="value" :val="bimWl.value" :options="reducelist" />
+        <u-form-item label="物料编码">
+          <jPicker sureColor="#ff0000" @bindpicker="selectProductCodeType" showKey="value" valKey="value" :val="bimWl.value" :options="reducelist" />
+        </u-form-item>
+        <u-form-item label="物料描述">
+          <u-input border height="50" placeholder="" disabled v-model="bimWl.label" />
         </u-form-item>
         <u-form-item label="库区">
           <u-search placeholder="请扫描" v-model="areaCode" @search="queryloc" :show-action="false"></u-search>
@@ -46,30 +49,30 @@
                 <!-- ０是未收货，１是正在收货，２是收货完成 -->
                 <view class="boder-icon-top zhuangtai" data-state="0">{{ item.orderStatus == 0 ? '未收货' : item.orderStatus == 1 ? '正在收货' : '收货完成' }}</view>
               </view>
-              <view v-if="item.userDefined5" class="row-list">
+              <!-- <view v-if="item.userDefined5" class="row-list">
                 <view class="list-item"> 送货单号: </view>
                 <view> {{ item.userDefined5 }} </view>
-              </view>
+              </view> -->
               <view v-if="item.procureCode" class="row-list">
                 <view class="list-item"> 采购单号: </view>
                 <view> {{ item.procureCode }} </view>
               </view>
-              <view class="row-list">
+              <!-- <view class="row-list">
                 <view class="list-item"> 行项目: </view>
                 <view> {{ item.userDefined3 }} </view>
-              </view>
+              </view> -->
               <view class="row-list">
                 <view class="list-item"> 物料编码: </view>
                 <view> {{ item.handlematerialCode }}</view>
               </view>
-              <view class="row-list">
+              <!-- <view class="row-list">
                 <view class="list-item"> 物料描述: </view>
                 <view>{{ item.materialDesc }}</view>
-              </view>
-              <view class="row-list">
+              </view> -->
+              <!-- <view class="row-list">
                 <view class="list-item"> 工厂号: </view>
                 <view>{{ item.siteCode }}</view>
-              </view>
+              </view> -->
               <view class="row-list">
                 <view class="list-item"> 应收/实收: </view>
                 <view>{{ item.planNumber }}/{{ item.realityNumber }}</view>
@@ -328,14 +331,16 @@ export default class receiveSRM extends BasePage {
   }
   //标志卡查询
   async querybyidcard() {
-    // if(this.receivedlist.length!=0){
-    //   const result = this.receivedlist.every(item => item.userDefined4 == this.prodobj.id);
-    //   (this.$refs.uToast as any).show({
-    //     title: '不允许在不同采购单下扫描标志卡',
-    //     type: 'default',
-    //   });
-    //   return;
-    // }
+    if (this.receivedlist.length) {
+      let ischongfu = this.receivedlist.some((item) => item.userDefined1 == this.Idcard);
+      if (ischongfu) {
+        (this.$refs.uToast as any).show({
+          title: '请勿重复扫描标志卡',
+        });
+        this.Idcard = '';
+        return;
+      }
+    }
     let item = {
       factoryCode: session.FactoryCode,
       userDefined1: this.Idcard,