From 42af246e7ff0ba1e9bc27bc2d9905ce35b0f9979 Mon Sep 17 00:00:00 2001
From: guoshuang <guoshuang@qq.com>
Date: Wed, 10 Jul 2024 11:23:35 +0800
Subject: [PATCH] =?UTF-8?q?mes=E5=B7=A1=E6=A3=80=E4=BF=9D=E5=85=BB?=
 =?UTF-8?q?=EF=BC=8Cwms=E9=87=87=E8=B4=AD=E6=94=B6=E8=8E=B7=E9=80=81?=
 =?UTF-8?q?=E8=B4=A7=E5=8D=95=E6=8F=90=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/equipment/Inspection/index.vue      | 24 ++---
 src/pages/equipment/SparepartsInto/index.vue  | 14 +--
 .../equipment/SparepartsIntoOut/index.vue     | 14 +--
 src/pages/equipment/Upkeep/index.vue          | 16 ++--
 src/pages/equipment/Upkeep/model.ts           |  6 +-
 src/pages/equipment/Upkeep/repairing.vue      |  2 +
 src/pages/login/login/index.vue               |  2 +-
 src/pages/wms/Raw/ReceivePO/index.vue         | 94 +++++++++++++++++--
 src/pages/wms/Raw/ReceivePO/model.ts          | 11 ++-
 src/utils/url.ts                              |  1 +
 10 files changed, 137 insertions(+), 47 deletions(-)

diff --git a/src/pages/equipment/Inspection/index.vue b/src/pages/equipment/Inspection/index.vue
index 6ddfae0..fd1d684 100644
--- a/src/pages/equipment/Inspection/index.vue
+++ b/src/pages/equipment/Inspection/index.vue
@@ -17,11 +17,11 @@
         <u-search style="" placeholder="请扫描" @search="search(orderNo)" :focus="shouciFocus" v-model="orderNo" :show-action="false"> </u-search>
         <uni-icons class="Scan" type="scan" size="22" @click="scanCodeOne" style="color: black; background-color: #0b9eff; margin: auto; padding: 22rpx"></uni-icons>
       </view>
-      <view class="single-left" style="background-color: #ffffff; margin-top: 10px; display: flex; align-items: center">
+      <!-- <view class="single-left" style="background-color: #ffffff; margin-top: 10px; display: flex; align-items: center">
         <view style="margin-right: 10px">日期:</view>
         <u-input @click="onfocus" placeholder="请选择日期" v-model="createTime" />
         <u-icon name="close-circle-fill" @click="clear" color="rgb(96, 98, 102)" size="28"></u-icon>
-      </view>
+      </view> -->
     </div>
     <view class="list" v-show="current == 0" v-for="(item, index) in listdata" :key="index + 'a'" @click="linkdetails(item, isorderNo)">
       <div class="list-top">
@@ -138,8 +138,8 @@ export default class ChangePalletNew extends BasePage {
     if (this.userinfo) {
       let query = {
         userId: this.userinfo.userName,
-        createTime: this.createTime,
-        //createTime: '',
+        //createTime: this.createTime,
+        createTime: '',
       };
       await this.model.getTodayTask(query);
       this.listdata = model.orderNoItemList;
@@ -219,8 +219,8 @@ export default class ChangePalletNew extends BasePage {
       if (this.userinfo) {
         let query = {
           userId: this.userinfo.userName,
-          createTime: this.createTime,
-          //createTime: '',
+          //createTime: this.createTime,
+          createTime: '',
         };
         await this.model.getTodayTask(query);
         this.listdata = model.orderNoItemList;
@@ -229,8 +229,8 @@ export default class ChangePalletNew extends BasePage {
       if (this.userinfo) {
         let query = {
           userId: this.userinfo.userName,
-          createTime: this.createTime,
-          //createTime: '',
+          //createTime: this.createTime,
+          createTime: '',
         };
         await this.model.getTaskRecord(query);
         this.detailsdata = model.getTaskRecordList;
@@ -252,8 +252,8 @@ export default class ChangePalletNew extends BasePage {
       if (this.userinfo) {
         let query = {
           userId: this.userinfo.userName,
-          createTime: this.createTime,
-          //createTime: '',
+          //createTime: this.createTime,
+          createTime: '',
         };
         await this.model.getTodayTask(query);
         this.listdata = model.orderNoItemList;
@@ -262,8 +262,8 @@ export default class ChangePalletNew extends BasePage {
       if (this.userinfo) {
         let query = {
           userId: this.userinfo.userName,
-          createTime: this.createTime,
-          //createTime: '',
+          //createTime: this.createTime,
+          createTime: '',
         };
         await this.model.getTaskRecord(query);
         this.detailsdata = model.getTaskRecordList;
diff --git a/src/pages/equipment/SparepartsInto/index.vue b/src/pages/equipment/SparepartsInto/index.vue
index 2a391f5..a4f00c3 100644
--- a/src/pages/equipment/SparepartsInto/index.vue
+++ b/src/pages/equipment/SparepartsInto/index.vue
@@ -98,13 +98,13 @@ export default class SparepartsInto extends BasePage {
         trigger: ['change', 'blur'],
       },
     ],
-    amount: [
-      {
-        required: true,
-        message: '库存不能为空',
-        trigger: ['change'],
-      },
-    ],
+    // amount: [
+    //   {
+    //     required: true,
+    //     message: '库存不能为空',
+    //     trigger: ['change'],
+    //   },
+    // ],
     quantity: [
       {
         required: true,
diff --git a/src/pages/equipment/SparepartsIntoOut/index.vue b/src/pages/equipment/SparepartsIntoOut/index.vue
index 64b5cff..9ae5186 100644
--- a/src/pages/equipment/SparepartsIntoOut/index.vue
+++ b/src/pages/equipment/SparepartsIntoOut/index.vue
@@ -98,13 +98,13 @@ export default class SparepartsInto extends BasePage {
         trigger: ['change', 'blur'],
       },
     ],
-    amount: [
-      {
-        required: true,
-        message: '库存不能为空',
-        trigger: ['change'],
-      },
-    ],
+    // amount: [
+    //   {
+    //     required: true,
+    //     message: '库存不能为空',
+    //     trigger: ['change'],
+    //   },
+    // ],
     quantity: [
       {
         required: true,
diff --git a/src/pages/equipment/Upkeep/index.vue b/src/pages/equipment/Upkeep/index.vue
index eb98bb4..47ee0f1 100644
--- a/src/pages/equipment/Upkeep/index.vue
+++ b/src/pages/equipment/Upkeep/index.vue
@@ -15,13 +15,13 @@
         <u-search style="border: 1px solid #a19d9d" placeholder="请扫描" @search="search(orderNo)" :focus="shouciFocus" v-model="orderNo" :show-action="false"></u-search>
         <!-- <uni-icons type="scan" size="35" @click="scanCodeOne" style="color: #0b9eff; margin: auto; padding: 22rpx"></uni-icons> -->
       </view>
-      <view class="single-left" style="background-color: #ffffff; margin-top: 10px; display: flex; align-items: center">
+      <!-- <view class="single-left" style="background-color: #ffffff; margin-top: 10px; display: flex; align-items: center">
         <view style="margin-right: 10px">日期:</view>
-        <!-- <u-search style="" placeholder="请选择" @search="search(orderNo)" :focus="shouciFocus" v-model="orderNo" :show-action="false"> </u-search> -->
+       
         <u-input @click="onfocus" placeholder="请选择日期" v-model="createTime" :clearable="false" />
         <u-icon name="close-circle-fill" @click="clear" color="rgb(96, 98, 102)" size="28"></u-icon>
-        <!-- close-circle -->
-      </view>
+        
+      </view> -->
     </div>
     <view class="list" v-show="current == 0" v-for="(item, index) in listdata" :key="index" @click="linkdetails(item, isorderNo)">
       <div class="list-top">
@@ -65,7 +65,7 @@
       <div class="item1">是否停机保养: {{ item.delFlag == 1 ? '是' : '否' }}</div>
     </view>
     <u-toast ref="uToast" />
-    <u-calendar v-model="iscalendar" :mode="mode" @change="changetime"></u-calendar>
+    <!-- <u-calendar v-model="iscalendar" :mode="mode" @change="changetime"></u-calendar> -->
   </view>
 </template>
 <script lang="ts">
@@ -148,7 +148,7 @@ export default class ChangePalletNew extends BasePage {
     if (this.userinfo) {
       let query = {
         userId: this.userinfo.userName,
-        createTime: this.createTime,
+        //createTime: this.createTime,
       };
       await this.model.getTodayTask(query);
       console.log(model.orderNoItemList);
@@ -203,7 +203,7 @@ export default class ChangePalletNew extends BasePage {
       if (this.userinfo) {
         let query = {
           userId: this.userinfo.userName,
-          createTime: this.createTime,
+          //createTime: this.createTime,
         };
         await this.model.getTodayTask(query);
         this.listdata = model.orderNoItemList;
@@ -212,7 +212,7 @@ export default class ChangePalletNew extends BasePage {
       if (this.userinfo) {
         let query = {
           userId: this.userinfo.userName,
-          createTime: this.createTime,
+          //createTime: this.createTime,
         };
         await this.model.getTaskRecord(query);
         this.detailsdata = model.getTaskRecordList;
diff --git a/src/pages/equipment/Upkeep/model.ts b/src/pages/equipment/Upkeep/model.ts
index bf77c77..dbaf602 100644
--- a/src/pages/equipment/Upkeep/model.ts
+++ b/src/pages/equipment/Upkeep/model.ts
@@ -31,8 +31,8 @@ export class Upkeep extends VuexModule {
       params: {
         userId: params.userId,
         planType: 'maintenance',
-        createTime: params.createTime,
-        pageSize: params.pageSize,
+        //createTime: params.createTime,
+        //pageSize: params.pageSize,
       },
     });
     const orderNoItemList = result.data;
@@ -45,7 +45,7 @@ export class Upkeep extends VuexModule {
       params: {
         userId: params.userId,
         planType: 'maintenance',
-        createTime: params.createTime,
+        //createTime: params.createTime,
       },
     });
     const getTaskRecordList = result.data;
diff --git a/src/pages/equipment/Upkeep/repairing.vue b/src/pages/equipment/Upkeep/repairing.vue
index 5619169..368dd1a 100644
--- a/src/pages/equipment/Upkeep/repairing.vue
+++ b/src/pages/equipment/Upkeep/repairing.vue
@@ -627,6 +627,8 @@ export default class ChangePalletNew extends BasePage {
     query.workStatus = this.formdata.workStatus;
     query.workReason = this.formdata.workReason;
     query.orderCost = this.formdata.orderCost;
+    query.planPersonName = session.nickName;
+    query.planPerson = session.userName;
     console.log(query, this.isvalue);
     await this.model.updateInspectionRecord(query);
     if (this.model.SubmitCode.code == '200') {
diff --git a/src/pages/login/login/index.vue b/src/pages/login/login/index.vue
index e75b599..7633472 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.75'; //正式版本号
+  version = '0.0.76'; //正式版本号
   //version = '0.0.4'; //测试版本号
   //***************标志修改区域：是否是测试标志： false 正式版本； true 测试版本****************
   //isTest = true;
diff --git a/src/pages/wms/Raw/ReceivePO/index.vue b/src/pages/wms/Raw/ReceivePO/index.vue
index ac6ba94..781cbfe 100644
--- a/src/pages/wms/Raw/ReceivePO/index.vue
+++ b/src/pages/wms/Raw/ReceivePO/index.vue
@@ -8,6 +8,16 @@
       <view class="right"></view>
     </view>
     <u-form class="form" ref="form" label-width="180rpx">
+      <!-- 送货单 -->
+      <view class="single">
+        <view class="single-left">
+          <view>送货单号:</view>
+          <u-search placeholder="请扫描" v-model="userDefined5" :show-action="false"></u-search>
+        </view>
+        <view class="single-right">
+          <u-button type="primary" @click="tidandelivery">提单</u-button>
+        </view>
+      </view>
       <!-- 单号 -->
       <view class="single">
         <view class="single-left">
@@ -40,6 +50,10 @@
               <view class="list-item"> 采购单号: </view>
               <view> {{ item.procureCode }} </view>
             </view>
+            <view v-if="item.userDefined5" class="row-list">
+              <view class="list-item"> 送货单号: </view>
+              <view> {{ item.userDefined5 }} </view>
+            </view>
             <view class="row-list">
               <view class="list-item"> 行项目: </view>
               <view> {{ item.userDefined3 }} </view>
@@ -80,6 +94,10 @@
               <view class="list-item"> 采购单号: </view>
               <view> {{ item.procureCode }} </view>
             </view>
+            <view v-if="item.userDefined5" class="row-list">
+              <view class="list-item"> 送货单号: </view>
+              <view> {{ item.userDefined5 }} </view>
+            </view>
             <view class="row-list">
               <view class="list-item"> 行项目: </view>
               <view> {{ item.userDefined3 }} </view>
@@ -272,6 +290,7 @@ export default class receivePO extends BasePage {
   //   this.remove = e.pickerName;
   // }
   procureCode: any = '';
+  userDefined5: any = '';
   materialCode: any = '';
   border = true;
   height = 100;
@@ -405,17 +424,18 @@ export default class receivePO extends BasePage {
   //查询货单关联采购单信息
   async query() {
     console.log(session);
-    if (this.procureCode == '' || this.procureCode.length == 0) {
-      (this.$refs.uToast as any).show({
-        title: '请输入rfid',
-        type: 'default',
-      });
-      return;
-    }
+    // if (this.procureCode == '' || this.procureCode.length == 0) {
+    //   (this.$refs.uToast as any).show({
+    //     title: '请输入rfid',
+    //     type: 'default',
+    //   });
+    //   return;
+    // }
     this.aimWl = {} as OptionType;
     let query = {
       procureCode: this.procureCode,
       materialCode: this.aimWl.value ? this.aimWl.value : '',
+      userDefined5: this.userDefined5,
       //this.materialCode,
       factoryCode: session.FactoryCode,
     };
@@ -438,6 +458,42 @@ export default class receivePO extends BasePage {
     this.ProcureOrderAlready();
     //this.list = model.orderNoItemList;
   }
+  // async querydelivery() {
+  //   console.log(session);
+  //   if (this.userDefined5 == '' || this.userDefined5.length == 0) {
+  //     (this.$refs.uToast as any).show({
+  //       title: '请输入送货单号',
+  //       type: 'default',
+  //     });
+  //     return;
+  //   }
+  //   this.aimWl = {} as OptionType;
+  //   let query = {
+  //     userDefined5: this.userDefined5,
+  //     procureCode: this.procureCode,
+  //     materialCode: this.aimWl.value ? this.aimWl.value : '',
+  //     //this.materialCode,
+  //     factoryCode: session.FactoryCode,
+  //   };
+  //   await this.model.PurchaseOrderPda(query);
+  //   let materilist = model.orderNoItemList;
+  //   this.materilist = materilist.map((item) => {
+  //     let newmaterialCode = item.materialCode.slice(item.materialCode.search(/[1-9]/));
+  //     return {
+  //       ...item,
+  //       handlematerialCode: newmaterialCode,
+  //     };
+  //   });
+  //   this.list = [];
+  //   if (this.materilist.length) {
+  //     this.aimWl = this.materilist[0];
+  //     this.list.push(this.materilist[0]);
+  //   } else {
+  //     this.aimWl = {} as OptionType;
+  //   }
+  //   this.ProcureOrderAlready();
+  //   //this.list = model.orderNoItemList;
+  // }
   //提单按钮
   async tidan() {
     if (this.procureCode == '' || this.procureCode.length == 0) {
@@ -457,11 +513,35 @@ export default class receivePO extends BasePage {
       this.query();
     }
   }
+  //送货单提单
+  async tidandelivery() {
+    if (this.userDefined5 == '' || this.userDefined5.length == 0) {
+      (this.$refs.uToast as any).show({
+        title: '请输入送货单',
+        type: 'default',
+      });
+      return;
+    }
+    let item = {
+      userDefined5: this.userDefined5,
+      factoryCode: session.FactoryCode,
+      createBy: session.loginName,
+    };
+    await this.model.getDeliveryNoteDetail(item);
+    if (model.deliverycode == '200') {
+      (this.$refs.uToast as any).show({
+        title: '提单成功',
+        type: 'success',
+      });
+      //this.query();
+    }
+  }
   //查询所有已经收货的信息
   async ProcureOrderAlready() {
     let item = {
       procureCode: this.procureCode,
       factoryCode: session.FactoryCode,
+      userDefined5: this.userDefined5,
     };
     await this.model.selectOdsProcureOrderAlready(item);
     if (model.Alreadycode == '200') {
diff --git a/src/pages/wms/Raw/ReceivePO/model.ts b/src/pages/wms/Raw/ReceivePO/model.ts
index 6d72627..b4aa10e 100644
--- a/src/pages/wms/Raw/ReceivePO/model.ts
+++ b/src/pages/wms/Raw/ReceivePO/model.ts
@@ -44,6 +44,13 @@ export class receivePO extends VuexModule {
     const sapPurchasecode = result.code;
     return { sapPurchasecode };
   }
+  deliverycode: any = '';
+  @MutationAction
+  async getDeliveryNoteDetail(data: any) {
+    const result: any = await http.post(url.lanjuwms.raw.ReceivePO.getDeliveryNoteDetail, data);
+    const deliverycode = result.code;
+    return { deliverycode };
+  }
   SubmitCode: any = '';
   @MutationAction
   async PurchaseOrderdeliPda(data: any) {
@@ -95,8 +102,8 @@ export class receivePO extends VuexModule {
   @MutationAction
   async selectArrivalRegistration(data: any) {
     const result: any = await http.post(url.lanjuwms.raw.ReceivePO.selectArrivalRegistration, data);
-const singcode = result.code;
-const singobj = result.data;
+    const singcode = result.code;
+    const singobj = result.data;
     return { singcode, singobj };
   }
 }
diff --git a/src/utils/url.ts b/src/utils/url.ts
index 9ebc934..fc78d9a 100644
--- a/src/utils/url.ts
+++ b/src/utils/url.ts
@@ -102,6 +102,7 @@ export const url = {
         PurchaseOrderdeliPdaConfirm: qianzhuione + '/wms/WmsToWCSmission/PurchaseOrderdeliPdaConfirm',
         ArrivalRegistration: qianzhuione + '/wms/WmsToWCSmission/ArrivalRegistration',
         selectArrivalRegistration: qianzhuione + '/wms/WmsToWCSmission/selectArrivalRegistration',
+        getDeliveryNoteDetail: qianzhuione + '/wms/WmsToWCSmission/getDeliveryNoteDetail',
       },
       PurchaseWHPO: {
         // 手持 －－包材采购单采购收货查询