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

wangxinhui

2025-01-18 6695afe1e1c478dbb599a1d382d8d6628b456d03

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

@@ -64,8 +64,8 @@
                        placeholder="请扫描托盘条码" ref='midInput' @input="inputChangebarcode" />
                  </uni-forms-item>
                  <uni-forms-item label="地址条码">
                     <uni-easyinput type="text" v-model="address" :disabled="addressdisabled" placeholder="请扫描地址条码" ref='midInput'
                        :focus="addressFocus" />
                     <uni-easyinput type="text" v-model="address" :disabled="addressdisabled"
                        placeholder="请扫描地址条码" ref='midInput' :focus="addressFocus" />
                  </uni-forms-item>
                  <uni-forms-item>
                     <button @click="inbound" type="primary" size="default" style="margin-top: 2%;">入库确认</button>
@@ -101,26 +101,6 @@
            </view>
         </view>
         <view v-if="current === 2" class="headerstyle">
            <view class="itemstyle">
               <uni-list :border="true">
                  <uni-list-item direction="column" v-for="(item,index) in orderInfo" :key="index">
                     <template v-slot:body>
                        <view class="uni-list-box">
                           <view class="uni-content">
                              <view style="font-size: 18px;">单据号：{{orderNo}}</view>
                              <view style="font-size: 18px;">物料编码：{{item.materielCode}}</view>
                              <!-- <view style="font-size: 18px;">物料名称：{{item.matName}}</view> -->
                              <view style="font-size: 18px;">数量：{{item.orderQuantity}}</view>
                              <view style="font-size: 18px;">单位：{{item.unit}}</view>
                              <view style="font-size: 18px;">组盘数量：{{item.receiptQuantity}}</view>
                           </view>
                        </view>
                     </template>
                  </uni-list-item>
               </uni-list>
            </view>
         </view>
         <view v-if="current === 3" class="headerstyle">
            <view class="itemstyle">
               <uni-forms label-width="180">
                  <uni-forms-item label="内箱标签:">
@@ -238,8 +218,9 @@
               })
               return;
            }
            this.$u.post('/api/InboundOrder/InPinKu?warehouseId=' + this.warehouseId, this
            this.$u.post('/api/InboundOrder/WMSInPinKu?warehouseId=' + this.warehouseId, this
               .pksns).then(res => {
               debugger
               if (res.status) {
                  this.$refs.uToast.show({
                     title: "入库成功",
@@ -455,7 +436,8 @@
                     this.Testcheck = false;
                     if (res.status) {
                        this.sns.push(res.data.serialNumber);
                        if (this.warehouseId == 6 || this.warehouseId == 2 || this.warehouseId == 3) {
                        if (this.warehouseId == 6 || this.warehouseId == 2 || this.warehouseId ==
                           3) {
                           if (this.matInfos.length > 0) {
                              this.matInfos = [];
                           }