Merge branch 'master' of http://115.159.85.185:8098/r/MeiRuiAn/HuaiAn

wangxinhui

2025-01-10 939818b48199e2c77d5639d3f43741aa29c160bb

 ´úÂë¹ÜÀí/»´°²PDA/pages/stash/pickingMat.vue

@@ -15,24 +15,22 @@
                  </uni-forms-item>
               </uni-forms>
               <uni-list>
                  <uni-list-item direction="column" v-for="item in matInfos" :key="item.sn">
                  <uni-list-item direction="column" v-for="item in matInfos" :key="item.palletCode">
                     <template v-slot:body>
                        <view class="uni-list-box">
                           <!-- <uni-icons type="trash" size="22" style="position: absolute;right: 5%;"
                              @click="deleteList(item.sn)">
                           </uni-icons> -->
                           <view class="uni-content">
                              <view class="uni-title-sub uni-ellipsis-2">单据编号：{{item.orderNo}}</view>
                              <view class="uni-note">托盘编号：{{item.palletCode}}</view>
                              <view class="uni-note">物料批次：{{item.batchNo}}</view>
                              <view class="uni-note">物料编码：{{item.materielCode}}</view>
                              <view class="uni-note">物料名称：{{item.materielName}}</view>
                              <view class="uni-note">单据数量：{{item.orderQuantity}}</view>
                              <view class="uni-note">原始库存：{{item.originalQuantity}}</view>
                              <view class="uni-note">分配库存：{{item.assignQuantity}}</view>
                              <view class="uni-note">剩余库存：{{item.originalQuantity-item.assignQuantity}}</view>
                              <view>单据编号：{{item.orderNo}}</view>
                              <view>托盘编号：{{item.palletCode}}</view>
                              <view>物料批次：{{item.batchNo}}</view>
                              <view>物料编码：{{item.materielCode}}</view>
                              <view>物料名称：{{item.materielName}}</view>
                              <view>单据数量：{{item.orderQuantity}}</view>
                              <view>原始库存：{{item.originalQuantity}}</view>
                              <view>分配库存：{{item.assignQuantity}}</view>
                              <view>剩余库存：{{item.originalQuantity-item.assignQuantity}}</view>
                           </view>
                        </view>
                     </template>
                  </uni-list-item>
               </uni-list>
@@ -113,7 +111,11 @@
      onLoad(res) {
         this.barcodefocus = false;
         this.warehouseId = res.warehouseId;
         if (this.warehouseId == 5) {
            this.address = "8005"
         }
         this.istrue = false;
         this.addressFocus = false;
      },
      methods: {
         onClickItem(e) {
@@ -185,6 +187,10 @@
            }
            this.$u.post('/api/OutStockLockInfo/MaterialPick?palletCode=' + this.barcode, {}).then(res => {
               if (res.status) {
                  // if(this.warehouseId==5){
                  //    this.Finish("8005");
                  // }

                  uni.$showMsg('拣选成功!')
                  this.barcode = "";
                  this.matInfos = [];
@@ -196,6 +202,23 @@
               }
            })
         },
         Finish(code) {
            this.$u.post('http://127.0.0.1:9291/api/CTU_AGV/PutFinish?&code=' + code).then(
               res => {
                  if (res.status) {
                     // this.$refs.uToast.show({
                     //    title: "完成成功",
                     //    type: "success"
                     // })
                     // this.barcode = "";
                  } else {
                     // this.$refs.uToast.show({
                     //    title: res.message,
                     //    type: "error"
                     // })
                  }
               })
         },
         inputChange(e) {
            this.$nextTick(() => {
               this.istrue = false;