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

wangxinhui

2025-03-31 638a684258fb4bc6adf76a1964bdf0d7f99e404f

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

@@ -68,8 +68,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>
@@ -87,8 +87,7 @@
                              <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.orderQuantity+item.unit}}</view>
                              <view style="font-size: 18px;">组盘数量：{{item.receiptQuantity}}</view>
                           </view>
                        </view>
@@ -442,13 +441,26 @@
            if (this.Test) {
               if (!this.Testcheck) {
                  this.Testcheck = true;
                  this.$refs.uToast.show({
                     title: "请确认初始寿命",
                     type: 'error'
                  })
                  if (this.warehouseId == 2) {
                     this.$refs.uToast.show({
                        title: "请确认数量",
                        type: 'error'
                     })
                  } else if (this.warehouseId == 6) {
                     this.$refs.uToast.show({
                        title: "请确认初始寿命",
                        type: 'error'
                     })
                  }
                  return;
               }
            }
            if (this.warehouseId == 2) { //油墨仓库区ID
               this.sn = this.sns[0];
               for (var i = 0; i < this.Initiallife - 1; i++) {
                  this.sns.push(this.sn);
               }
            }
            this.$u.post('/api/InboundOrder/MaterielGroup', {
               MainData: {
                  "palletCode": this.barcode,