合并修改

src/pages/shouye/me.vue

@@ -66,7 +66,7 @@ export default class RawHome extends BasePage {
   model = model;
   src: 'http://pic2.sc.chinaz.com/Files/pic/pic9/202002/hpic2119_s.jpg';
   today = dayjs().format('YYYY-MM-DD dddd');
-  version = '0.0.53';
+  version = '0.0.55';
   checkversion: any = {};
   sessiondata: any = '';
   onLoad() {

src/pages/wms/Raw/PurchaseWHPO/index.vue

@@ -11,7 +11,7 @@
       <!-- 单号 -->
       <view class="single">
         <view class="single-left">
-          <view>送货单号:</view>
+          <view>采购单号:</view>
           <u-search placeholder="请扫描" v-model="orderNo" @search="query" :show-action="false"></u-search>
         </view>
         <view class="single-right">
@@ -20,7 +20,7 @@
       </view>
       <!-- 订单 -->
       <u-form-item label="物料编码">
-        <jPicker sureColor="#ff0000" @bindpicker="bookTypeChange" showKey="value" valKey="value" :val="aimWl.value" :options="materilist" />
+        <jPicker sureColor="#ff0000" @bindpicker="bookTypeChange" showKey="value" valKey="value" :val="aimWl.value" :options="materilistonly" />
         <!-- <u-input :border="true" v-model="materialCode" placeholder="" @confirm="query" style="overflow: hidden" /> -->
       </u-form-item>
       <!-- 机台 -->
@@ -151,6 +151,7 @@ export default class PurchaseWHPO extends BasePage {
   form3: any = {};
   aimWl = {} as OptionType;
   materilist = [];
+  materilistonly = [];
   // remove: any = {};
   // async onReady() {
   //   await this.model.queryLocation();
@@ -248,7 +249,15 @@ export default class PurchaseWHPO extends BasePage {
     this.materilist = model.orderNoItemList;
     this.list = [];
     if (this.materilist.length) {
-      this.aimWl = this.materilist[0];
+      const filteredArray = this.materilist.reduce((acc, curr) => {
+        // 检查是否已经存在相同的 code
+        if (!acc.map((item) => item.materialCode).includes(curr.materialCode)) {
+          acc.push({ value: curr.materialCode, lable: curr.materialCode, materialCode: curr.materialCode, materialDesc: curr.materialDesc });
+        }
+        return acc;
+      }, []);
+      this.materilistonly = filteredArray;
+      this.aimWl = this.materilistonly[0];
       this.list.push(this.materilist[0]);
     } else {
       this.aimWl = {} as OptionType;

src/pages/wms/Raw/ReceivePO/index.vue

@@ -11,7 +11,7 @@
       <!-- 单号 -->
       <view class="single">
         <view class="single-left">
-          <view>送货单号:</view>
+          <view>采购单号:</view>
           <u-search placeholder="请扫描" v-model="procureCode" @search="query" :show-action="false"></u-search>
         </view>
         <view class="single-right">
@@ -23,20 +23,12 @@
         <!-- <u-input :border="true" v-model="materialCode" placeholder="" @confirm="query" style="overflow: hidden" /> -->
         <jPicker sureColor="#ff0000" @bindpicker="bookTypeChange" showKey="value" valKey="value" :val="aimWl.value" :options="materilist" />
       </u-form-item>
-      <!-- 机台 -->
+      <view class="creatshow">
-      <!-- <u-form-item>
+        <u-button class="buttonshow" type="primary" @click="generate">生成收货单号</u-button>
-        <view class="row">
+        <u-input border placeholder="" class="inputshow" disabled v-model="receiptNoCode" />
-          <view>收货仓库：</view>
+      </view>
-          <view></view>
-        </view>
-        <view class="row">
-          <view>工厂：</view>
-          <view></view>
-        </view>
-      </u-form-item> -->
     </u-form>
-
+    <view class="matshow">
-    <view class="scroll">
       <view v-for="item in list" :key="item.id" @dblclick="onFormDoubleClick(item)">
         <u-form style="margin-top: 10rpx" class="form2">
           <view class="list">
@@ -71,20 +63,56 @@
         </u-form>
       </view>
     </view>
+
+    <view class="scroll">
+      <view v-for="item in receivedlist" :key="item.id" @dblclick="onFormDoubleClick(item)">
+        <u-form style="margin-top: 10rpx" class="form2">
+          <view class="list">
+            <view class="righttitle">
+              <!-- ０是未收货，１是正在收货，２是收货完成 -->
+              <view class="boder-icon-top zhuangtai" data-state="0">已收货</view>
+            </view>
+            <view class="row-list">
+              <view class="list-item"> 采购单号: </view>
+              <view> {{ item.procureCode }} </view>
+            </view>
+            <view class="row-list">
+              <view class="list-item"> 物料编码: </view>
+              <view> {{ item.materialCode }}</view>
+            </view>
+            <view class="row-list">
+              <view class="list-item"> 物料描述: </view>
+              <view>{{ item.materialDesc }}</view>
+            </view>
+            <view class="row-list">
+              <view class="list-item"> 工厂号: </view>
+              <view>{{ item.siteCode }}</view>
+            </view>
+            <view class="row-list">
+              <view class="list-item"> 应收/已收: </view>
+              <view>{{ item.planNumber }}/{{ item.realityNumber }}</view>
+            </view>
+            <!-- <view a:if="true" class="righttitle">
+              <view @click.stop="onPass(item)" class="boder-icon-rigth"> 收货 </view>
+            </view> -->
+          </view>
+        </u-form>
+      </view>
+    </view>
     <view class="bottom-bar">
       <u-row class="button-bar">
-        <!-- 确定 -->
+        <u-col :span="6">
-        <!-- <u-col :span="6">
+          <u-button type="error" @click="SignIn">到货登记</u-button>
-          <u-button @click="onSubmit" type="primary">确定</u-button>
-        </u-col> -->
-        <!-- 返回 -->
-        <u-col :span="12">
-          <u-button type="error" @click="uni.navigateBack({})">返回</u-button>
         </u-col>
+        <!-- 确定 -->
+        <u-col :span="6">
+          <u-button @click="onSubmit" type="primary">确定</u-button>
+        </u-col>
+        <!-- 返回 -->
       </u-row>
     </view>
     <view>
-      <u-popup v-model="show" mode="center" width="580rpx" height="550rpx">
+      <u-popup v-model="show" mode="center" width="580rpx" height="580rpx">
         <view class="form3">
           <view class="poupitem">
             <view class="pouptitle">批次号：</view>
@@ -95,9 +123,21 @@
             <u-input class="poupcontent" :clearable="false" v-model="form3.planNumber" placeholder="" style="overflow: hidden" />
           </view>
           <view class="poupitem">
-            <view class="pouptitle">托盘号：</view>
+            <view class="pouptitle">收货方式：</view>
-            <u-input class="poupcontent" :clearable="false" v-model="form3.sn" placeholder="" style="overflow: hidden" />
+            <jPicker sureColor="#ff0000" @bindpicker="bookTypeChangeway" showKey="lable" valKey="value" :val="bimWl.value" :options="waylist" />
+            <!-- <u-select  mode="single-column" :list="waylist" @confirm="bookTypeChangeway"></u-select> -->
           </view>
+          <view v-show="showshow">
+            <view v-show="!selectway" class="poupitem">
+              <view class="pouptitle">物料号：</view>
+              <u-input disabled class="poupcontent" :clearable="false" v-model="aimWl.value" placeholder="" style="overflow: hidden" />
+            </view>
+            <view v-show="selectway" class="poupitem">
+              <view class="pouptitle">托盘号：</view>
+              <u-input class="poupcontent" :clearable="false" v-model="form3.sn" placeholder="" style="overflow: hidden" />
+            </view>
+          </view>
+
           <view class="poupitem">
             <view class="pouptitle">收货仓库：</view>
             <jPicker sureColor="#ff0000" :moren="moren" @bindpicker="selectProductlocCode" showKey="label" valKey="value" :val="productCodeTypeList.value" :options="whList" />
@@ -123,6 +163,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 dayjs from 'dayjs';
 interface OptionType {
   label: string;
   value: string;
@@ -135,6 +176,34 @@ interface OptionType {
 export default class receivePO extends BasePage {
   model = model;
   list: any = [];
+  receivedlist: any = [];
+  //   receivedlist=[{
+  //     orderStatus:'1',
+  //     procureCode:'111',
+  //     materialCode:'ddewcc',
+  //     materialDesc:'ewdcxw',
+  //     siteCode:'1061',
+  //     planNumber:'1',
+  //     realityNumber:'1'
+  //   },{
+  //     orderStatus:'1',
+  //     procureCode:'111',
+  //     materialCode:'ddewcc',
+  //     materialDesc:'ewdcxw',
+  //     siteCode:'1061',
+  //     planNumber:'1',
+  //     realityNumber:'1'
+  //   },
+  //     {
+  //     orderStatus:'1',
+  //     procureCode:'111',
+  //     materialCode:'ddewcc',
+  //     materialDesc:'ewdcxw',
+  //     siteCode:'1061',
+  //     planNumber:'1',
+  //     realityNumber:'1'
+  //   }
+  // ]
   whList: any = [];
   show = false;
   form3: any = {};
@@ -142,6 +211,19 @@ export default class receivePO extends BasePage {
   materilist = [];
   productCodeTypeList: any = {};
   moren = '选择仓库';
+  waylist = [
+    {
+      value: '0',
+      lable: '根据物料',
+    },
+    {
+      value: '1',
+      lable: '根据托盘',
+    },
+  ];
+  bimWl = {} as OptionType;
+  selectway: boolean = null;
+  showshow = false;
   // remove: any = {};
   // async onReady() {
   //   await this.model.queryLocation();
@@ -169,17 +251,26 @@ export default class receivePO extends BasePage {
   ];
   clickitem: any = '';
   productCodeList: any = {};
+  receiptNoCode = '';
   async onReady() {
     await this.model.Stashlist();
     this.whList = model.DictTypeList;
     //this.remove = this.model.WlList[0];
   }
+  //生成收货单号
+  generate() {
+    const today = dayjs().format('YYYYMMDDHHmmss');
+    this.receiptNoCode = `sn${today}`;
+  }
   //收货按钮
   onPass(item) {
     this.clickitem = item;
     this.show = true;
     this.form3 = {};
     this.productCodeTypeList = {};
+    this.showshow = false;
+    this.bimWl = {} as OptionType;
+    this.selectway = null;
   }
   nopoup() {
     this.show = false;
@@ -203,7 +294,7 @@ export default class receivePO extends BasePage {
       });
       return;
     }
-    if (this.form3.sn == '' || this.form3.sn == undefined) {
+    if (this.form3.sn == '' && this.selectway == true) {
       (this.$refs.uToast as any).show({
         title: '托盘号不能为空',
         type: 'default',
@@ -217,15 +308,27 @@ export default class receivePO extends BasePage {
       });
       return;
     }
+    if (this.receiptNoCode == '' || this.receiptNoCode == undefined) {
+      (this.$refs.uToast as any).show({
+        title: '请先生成收货单号',
+        type: 'default',
+      });
+      return;
+    }
     console.log('1234567');
     let query = this.clickitem;
     // query.applyList = this.Sparepartlist;
     query.workStatus = this.form3.workStatus;
-    query.sn = this.form3.sn;
+    if (this.selectway == true) {
+      query.sn = this.form3.sn;
+    } else {
+      query.sn = dayjs().format('YYYYMMDDHHmmss');
+    }
     query.planNumber = this.form3.planNumber;
     query.whCode = this.productCodeTypeList.warehouseCode;
     query.factoryCode = session.FactoryCode;
     query.incomeBatchNo = this.form3.incomeBatchNo;
+    query.receiptNoCode = this.receiptNoCode;
     await this.model.PurchaseOrderdeliPda(query);
     console.log(this.model.SubmitCode);
     if (this.model.SubmitCode.code == 200) {
@@ -235,6 +338,7 @@ export default class receivePO extends BasePage {
       });
       this.show = false;
       this.query();
+      // this.ProcureOrderAlready();
     } else {
       (this.$refs.uToast as any).show({
         title: '失败',
@@ -278,6 +382,7 @@ export default class receivePO extends BasePage {
     } else {
       this.aimWl = {} as OptionType;
     }
+    this.ProcureOrderAlready();
     //this.list = model.orderNoItemList;
   }
   //提单按钮
@@ -292,6 +397,7 @@ export default class receivePO extends BasePage {
     let item = {
       procureCode: this.procureCode,
       factoryCode: session.FactoryCode,
+      createBy: session.loginName,
     };
     await this.model.sapPurchaseOrderSync(item);
     if (model.sapPurchasecode == '200') {
@@ -301,7 +407,20 @@ export default class receivePO extends BasePage {
         factoryCode: session.FactoryCode,
       };
       await this.model.PurchaseOrderPda(query);
-      this.list = model.orderNoItemList;
+      this.materilist = model.orderNoItemList;
+      this.aimWl = this.materilist[0];
+      this.list = this.materilist[0];
+    }
+  }
+  //查询所有已经收货的信息
+  async ProcureOrderAlready() {
+    let item = {
+      procureCode: this.procureCode,
+      factoryCode: session.FactoryCode,
+    };
+    await this.model.selectOdsProcureOrderAlready(item);
+    if (model.Alreadycode == '200') {
+      this.receivedlist = model.ProcureOrderAlreadylist;
     }
   }
   histroyItem: any = {};
@@ -318,38 +437,34 @@ export default class receivePO extends BasePage {
   }
   //完成送货单
   async onSubmit() {
-    // if (this.procureCode == '' || this.procureCode.length == 0) {
+    if (this.procureCode == '' || this.procureCode.length == 0) {
-    //   this.customToast('请输入nficl');
+      (this.$refs.uToast as any).show({
-    //   return;
+        title: '请输入采购单号',
-    // }
+        type: 'default',
-    // if (this.histroyItem == {} || !this.histroyItem.productCode) {
+      });
-    //   this.customToast(this.$t('message.AppendMateriel5') as string);
+      return;
-    //   return;
+    }
-    // }
+    if (this.receiptNoCode == '' || this.receiptNoCode.length == 0) {
-    // if (this.barcode == '' || this.barcode.length == 0) {
+      (this.$refs.uToast as any).show({
-    //   this.customToast(this.$t('message.barcode') as string);
+        title: '请先生成收货单号',
-    //   return;
+        type: 'default',
-    // }
+      });
-    // let params = {
+      return;
-    //   loginName: session.loginName,
+    }
-    //   factoryCode: session.factoryCode,
+    let params = {
-    //   procureCode: this.procureCode,
+      factoryCode: session.FactoryCode,
-    //   orderItem: this.histroyItem.orderItem,
+      procureCode: this.procureCode,
-    //   productCode: this.histroyItem.productCode,
+      receiptNoCode: this.receiptNoCode,
-    //   productDescZh: this.histroyItem.productDescZh,
+    };
-    //   orderType: this.histroyItem.orderType,
+    await this.model.OnSubmit(params);
-    //   barcode: this.barcode,
+    if (this.model.submitcode == '200') {
-    //   // locCode: this.remove.value,
+      (this.$refs.uToast as any).show({
-    // };
+        title: '成功',
-    // await this.model.OnSubmit(params);
+        type: 'success',
-    // if (this.model.SubmitCode == '1') {
+      });
-    //   this.customToast(this.$t('message.Warehouse_Tip9') as string);
+      await this.query();
-    //   this.barcode = '';
+      this.receiptNoCode = '';
-    //   this.histroyItem = {};
+    }
-    //   this.productCodeList = {};
-    //   this.model.empty();
-    //   await this.query();
-    // }
   }
   bookTypeChange(e: any) {
     this.aimWl = e.pickerName;
@@ -363,6 +478,36 @@ export default class receivePO extends BasePage {
     //this.queryinformation();
     //this.getlist();
   }
+  bookTypeChangeway(e) {
+    this.showshow = true;
+    this.bimWl.value = e.pickerName.value;
+    console.log(e);
+    if (e.pickerName.value == '0') {
+      this.selectway = false;
+    } else {
+      this.selectway = true;
+    }
+  }
+  async SignIn() {
+    if (this.procureCode == '' || this.procureCode.length == 0) {
+      (this.$refs.uToast as any).show({
+        title: '请输入采购单号',
+        type: 'default',
+      });
+      return;
+    }
+    let params = {
+      factoryCode: session.FactoryCode,
+      procureCode: this.procureCode,
+    };
+    await this.model.ArrivalRegistration(params);
+    if (this.model.Arrivalcode == '200') {
+      (this.$refs.uToast as any).show({
+        title: '成功',
+        type: 'success',
+      });
+    }
+  }
 }
 </script>
 <style lang="scss" scoped>
@@ -407,7 +552,7 @@ export default class receivePO extends BasePage {
 
   .form {
     background-color: #fff;
-    padding: 40rpx;
+    padding: 20rpx;
     border-radius: 10rpx;
     box-shadow: 0 0 20rpx 0 rgba(128, 128, 128, 0.2);
 
@@ -456,15 +601,82 @@ export default class receivePO extends BasePage {
       justify-content: space-around;
       flex: 1;
     }
+    .creatshow {
+      display: flex;
+      margin-top: 5px;
+      .buttonshow {
+        flex: 1;
+      }
+      .inputshow {
+        flex: 4;
+        //border: 1px solid #9f9a9a8f;
+        border-radius: 5px;
+        margin-left: 4px;
+      }
+    }
   }
 
-  .scroll {
+  .matshow {
     // margin-top: 120rpx;
     // padding-left: 30rpx;
     // padding-right: 16rpx;
     // margin-bottom: 20rpx;
     // overflow: scroll;
     // padding-top: 20rpx;
+    .form2 {
+      background-color: #fff;
+      padding: 0rpx 25rpx 25rpx;
+      border-radius: 10rpx;
+      box-shadow: 0 0 20rpx 0 rgba(128, 128, 128, 0.2);
+      color: #292c32;
+
+      .row-list {
+        display: flex;
+        flex-direction: row;
+        justify-content: space-between;
+      }
+
+      .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: -25rpx;
+          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;
+        }
+      }
+    }
+  }
+  .scroll {
+    // margin-top: 120rpx;
+    // padding-left: 30rpx;
+    // padding-right: 16rpx;
+    // margin-bottom: 20rpx;
+    height: 370rpx;
+    overflow: scroll;
+    // padding-top: 20rpx;
     .form2 {
       background-color: #fff;
       padding: 0rpx 25rpx 25rpx;
@@ -494,7 +706,7 @@ export default class receivePO extends BasePage {
         .zhuangtai {
           background: #a7a0a04a;
           width: 224rpx;
-          margin-right: -27rpx;
+          margin-right: -25rpx;
           border: 2rpx solid #a7a0a04a;
           border-radius: 12rpx;
           text-align: center;

src/pages/wms/Raw/ReceivePO/model.ts

@@ -28,6 +28,15 @@ export class receivePO extends VuexModule {
     }
     return { orderNoItemList };
   }
+  Alreadycode: any = '';
+  ProcureOrderAlreadylist: any = '';
+  @MutationAction
+  async selectOdsProcureOrderAlready(data: any) {
+    const result: any = await http.post(url.lanjuwms.raw.ReceivePO.selectOdsProcureOrderAlready, data);
+    const Alreadycode = result.code;
+    const ProcureOrderAlreadylist = result.data;
+    return { Alreadycode, ProcureOrderAlreadylist };
+  }
   sapPurchasecode: any = '';
   @MutationAction
   async sapPurchaseOrderSync(data: any) {
@@ -63,6 +72,24 @@ export class receivePO extends VuexModule {
     }));
     return { DictTypeList };
   }
+  submitcode: any = '';
+  @MutationAction
+  async OnSubmit(data: any) {
+    const result: any = await http.post(url.lanjuwms.raw.ReceivePO.PurchaseOrderdeliPdaConfirm, data);
+    const submitcode = result.code;
+    return {
+      submitcode,
+    };
+  }
+  Arrivalcode: any = '';
+  @MutationAction
+  async ArrivalRegistration(data: any) {
+    const result: any = await http.post(url.lanjuwms.raw.ReceivePO.ArrivalRegistration, data);
+    const Arrivalcode = result.code;
+    return {
+      Arrivalcode,
+    };
+  }
 }
 
 export default getModule(receivePO);

src/utils/url.ts

@@ -96,6 +96,9 @@ export const url = {
         // 手持 查询仓库管理列表
         list: qianzhuione + '/wms/order/listCK',
         sapPurchaseOrderSync: qianzhuione + '/wms/WmsToWCSmission/sapPurchaseOrderSync',
+        selectOdsProcureOrderAlready: qianzhuione + '/wms/WmsToWCSmission/selectOdsProcureOrderAlready',
+        PurchaseOrderdeliPdaConfirm: qianzhuione + '/wms/WmsToWCSmission/PurchaseOrderdeliPdaConfirm',
+        ArrivalRegistration: qianzhuione + '/wms/WmsToWCSmission/ArrivalRegistration',
       },
       PurchaseWHPO: {
         // 手持 －－包材采购单采购收货查询