提交

heshaofeng

2025-11-26 1331e9edaf52ec0820dd1c7efc605127aa3a2c36

提交

 ÏîÄ¿´úÂë/WIDESEA_WMSClient/src/extension/inbound/extend/Pallet.vue

@@ -1,37 +1,16 @@
<template>
   <vol-box
    v-model="groupPalletVisible"
    :title="'组盘操作 - å•æ®å·ï¼š' + currentDocNo"
    :height="1000"  
    :width="1100"   
    :padding="20"  
    :modal="true"   
  
     @open="handleDialogOpen"
    @close="handleDialogClose"
  >
  <vol-box v-model="groupPalletVisible" :title="'组盘操作 - å•æ®å·ï¼š' + currentDocNo" :height="1000" :width="1100" :padding="20"
    :modal="true" @open="handleDialogOpen" @close="handleDialogClose">
  <div class="barcode-scanner-container">
      
      <!-- ä»“库选择 - ç´§å‡‘布局 -->
      <div class="location-section compact">
        <el-form :model="form" :rules="rules" ref="locationForm" class="compact-form">
          <el-form-item label="仓库" prop="warehouseType" class="location-select compact-item">
            <el-select
              v-model="form.warehouseType"
              placeholder="请选择仓库"
              clearable
              filterable
              @change="handleWarehouseChange"
              style="width: 100%"
              :loading="warehouseLoading"
              size="medium"
            >
              <el-option
                v-for="item in warehouseTypes"
                :key="item.warehouseType"
                :label="item.warehouseTypeDesc"
                :value="item.warehouseType"
              />
            <el-select v-model="form.warehouseType" placeholder="请选择仓库" clearable filterable
              @change="handleWarehouseChange" style="width: 100%" :loading="warehouseLoading" size="medium">
              <el-option v-for="item in warehouseTypes" :key="item.warehouseType" :label="item.warehouseTypeDesc"
                :value="item.warehouseType" />
            </el-select>
          </el-form-item>
        </el-form>
@@ -41,22 +20,10 @@
      <div class="location-section compact">
        <el-form :model="form" :rules="rules" ref="locationForm" class="compact-form">
          <el-form-item label="仓库区域" prop="locationType" class="location-select compact-item">
            <el-select
              v-model="form.locationType"
              placeholder="请先选择仓库"
              clearable
              filterable
              @change="handleLocationChange"
              style="width: 100%"
              :loading="locationLoading"
              size="medium"
            >
              <el-option
                v-for="item in locationTypes"
                :key="item.locationType"
                :label="item.locationTypeDesc"
                :value="item.locationType"
              />
            <el-select v-model="form.locationType" placeholder="请先选择仓库" clearable filterable
              @change="handleLocationChange" style="width: 100%" :loading="locationLoading" size="medium">
              <el-option v-for="item in locationTypes" :key="item.locationType" :label="item.locationTypeDesc"
                :value="item.locationType" />
            </el-select>
          </el-form-item>
        </el-form>
@@ -87,26 +54,12 @@
          <!-- æ‰˜ç›˜æ¡ç è¾“å…¥ -->
          <div class="input-wrapper custom-input-group compact-input">
            <div class="input-label">料箱码</div>
            <el-input
              ref="trayInput"
              v-model="trayBarcode"
              placeholder="请扫描或输入料箱码后按回车键"
              clearable
              :disabled="!form.locationType || !form.warehouseType"
              @keyup.enter.native="handleTraySubmit"
              @clear="handleTrayClear"
              @input="handleTrayInput"
              class="custom-input"
              size="medium"
            >
            <el-input ref="trayInput" v-model="trayBarcode" placeholder="请扫描或输入料箱码后按回车键" clearable
              :disabled="!form.locationType || !form.warehouseType" @keyup.enter.native="handleTraySubmit"
              @clear="handleTrayClear" @input="handleTrayInput" class="custom-input" size="medium">
              <template slot="append">
                <el-button 
                  @click="handleTraySubmit"
                  type="primary"
                  icon="el-icon-position"
                  :disabled="!form.locationType || !trayBarcode || !form.warehouseType"
                  size="medium"
                >
                <el-button @click="handleTraySubmit" type="primary" icon="el-icon-position"
                  :disabled="!form.locationType || !trayBarcode || !form.warehouseType" size="medium">
                  ç¡®è®¤
                </el-button>
              </template>
@@ -116,27 +69,13 @@
          <!-- ç‰©æ–™æ¡ç è¾“å…¥ -->
          <div class="input-wrapper custom-input-group compact-input">
            <div class="input-label">物料条码</div>
            <el-input
              ref="barcodeInput"
              v-model="barcode"
              placeholder="请扫描或输入物料条码后按回车键"
              clearable
            <el-input ref="barcodeInput" v-model="barcode" placeholder="请扫描或输入物料条码后按回车键" clearable
              :disabled="!form.locationType || !trayBarcode || !form.warehouseType"
              @keyup.enter.native="handleBarcodeSubmit"
              @clear="handleClear"
              @input="handleBarcodeInput"
              class="custom-input"
              size="medium"
            >
              @keyup.enter.native="handleBarcodeSubmit" @clear="handleClear" @input="handleBarcodeInput"
              class="custom-input" size="medium">
              <template slot="append">
                <el-button 
                  :loading="loading" 
                  @click="handleBarcodeSubmit"
                  type="primary"
                  icon="el-icon-search"
                  :disabled="!form.locationType || !trayBarcode || !barcode || !from.warehouseType"
                  size="medium"
                >
                <el-button :loading="loading" @click="handleBarcodeSubmit" type="primary" icon="el-icon-search"
                  :disabled="!form.locationType || !trayBarcode || !barcode || !from.warehouseType" size="medium">
                  {{ loading ? '查询中...' : '查询' }}
                </el-button>
              </template>
@@ -161,13 +100,7 @@

      <!-- é”™è¯¯æç¤º -->
      <div v-if="error" class="error-message compact">
        <el-alert
          :title="error"
          type="error"
          show-icon
          closable
          @close="error = ''"
        />
        <el-alert :title="error" type="error" show-icon closable @close="error = ''" />
      </div>

      <!-- ç‰©æ–™åˆ—表 - å›ºå®šé«˜åº¦å¸¦æ»šåŠ¨æ¡ -->
@@ -194,13 +127,7 @@
          </div>
          
          <div class="table-container" v-else>
            <el-table
              :data="materials"
              stripe
              style="width: 100%"
              height="100%"
              size="small"
            >
            <el-table :data="materials" stripe style="width: 100%" height="100%" size="small">
              <el-table-column type="index" label="序号" width="60" align="center"></el-table-column>
              <el-table-column prop="barcode" label="条码" min-width="140" show-overflow-tooltip></el-table-column>
              <el-table-column prop="materielCode" label="物料编码" min-width="150" show-overflow-tooltip></el-table-column>
@@ -601,9 +528,18 @@
                    inputEl.focus();
                    this.currentFocus = 'material';
                    this.scanTarget = 'material';
          
          
            inputEl.select();
            console.log('物料输入框内容已选中');
          
                }
            }
        },

     
    
    
         // é‡ç½®æ‰€æœ‰æ•°æ®
    resetData() {
      console.log('重置弹框数据');
@@ -804,6 +740,7 @@
          this.isScanning = false;
        },
        

        // å¤„理物料条码提交
        async handleBarcodeSubmit() {
                    if (!await this.validateForm()) return;
@@ -820,6 +757,7 @@
            return;
          }

      this.focusBarcodeInput();
          this.error = '';
          this.loading = true;

@@ -842,6 +780,7 @@
                type: 'warning',
                duration: 2000
              });
          
            } else {

                materialData.forEach(item => {
@@ -855,9 +794,6 @@
               scanTime: this.formatTime(new Date())
          });
        });
            
        
 
              
              this.$message({
                message: `成功添加条码: ${currentBarcode}`,
@@ -877,6 +813,12 @@
          }
          } catch (err) {
            this.error = err.message || '查询条码信息失败，请重试';
        this.focusBarcodeInput();
        setTimeout(() => {
      // é€‰ä¸­è¾“入框内的错误内容（确保focus完成后执行）
      const inputEl = this.$refs.barcodeInput?.$el?.querySelector('input');
      if (inputEl) inputEl.select();
    }, 100);
          } finally {
            this.loading = false;
          }
@@ -1106,7 +1048,8 @@
    /* ç‰©æ–™åˆ—表 - å›ºå®šé«˜åº¦å¸¦æ»šåŠ¨ */
    .material-list.compact {
      flex: 1;
      min-height: 0; /* é‡è¦ï¼šå…è®¸flex子项收缩 */
  min-height: 0;
  /* é‡è¦ï¼šå…è®¸flex子项收缩 */
      display: flex;
      flex-direction: column;
    }
@@ -1180,9 +1123,17 @@
    }
    
    @keyframes pulse {
      0% { opacity: 1; }
      50% { opacity: 0.4; }
      100% { opacity: 1; }
  0% {
    opacity: 1;
  }

  50% {
    opacity: 0.4;
  }

  100% {
    opacity: 1;
  }
    }
    
    .input-wrapper {

 ÏîÄ¿´úÂë/WIDESEA_WMSClient/src/extension/inbound/extend/SelectedStock.vue

@@ -182,14 +182,19 @@
          "查询中"
        )
        .then((x) => {
          
          var label=[
              { label: '已分配', value: 0 },
              { label: '出库中', value: 1 },
              { label: '出库完成', value: 2 },
              { label: '拣选完成', value: 3 },
              { label: '部分拣选', value: 2 },
              { label: '已拣选', value: 3 },
              { label: '已出库', value: 4 },
              { label: '出库完成', value: 5 },
              { label: '拣选完成', value: 6 },
              { label: '回库中', value: 7 },
              { label: '已回库', value: 8 },
              { label: '撤销', value: 99 }
          ]
          
          this.tableData=x.map((i) => ({
            ...i,
            status:label.find((j) => j.value === i.status).label

 ÏîÄ¿´úÂë/WIDESEA_WMSClient/src/extension/outbound/extend/SelectedStock.vue

@@ -192,10 +192,15 @@
          var label=[
              { label: '已分配', value: 0 },
              { label: '出库中', value: 1 },
              { label: '出库完成', value: 2 },
              { label: '拣选完成', value: 3 },
              { label: '部分拣选', value: 2 },
              { label: '已拣选', value: 3 },
              { label: '已出库', value: 4 },
              { label: '出库完成', value: 5 },
              { label: '拣选完成', value: 6 },
              { label: '回库中', value: 7 },
              { label: '已回库', value: 8 },
              { label: '撤销', value: 99 }
          ]
          ];
          this.tableData=x.map((i) => ({
            ...i,
            status:label.find((j) => j.value === i.status).label

 ÏîÄ¿´úÂë/WIDESEA_WMSClient/src/extension/outbound/outboundOrder.js

@@ -17,7 +17,8 @@
      modelFooter: ''
    },
    tableAction: '', //指定某张表的权限(这里填写表名,默认不用填写)
    buttons: { view: [
  buttons: {
    view: [
       /* {
        name: '出库',
        type: 'primary',
@@ -297,7 +298,8 @@
    render(vnode, mountNode);
  }
}
    ], box: [], detail: [] }, //扩展的按钮
    ], box: [], detail: []
  }, //扩展的按钮
    methods: {
       //下面这些方法可以保留也可以删除
      onInit() {  
@@ -362,4 +364,3 @@
    }
  };
  export default extension;
  

 ÏîÄ¿´úÂë/WIDESEA_WMSClient/src/views/inbound/inboundOrder.vue

@@ -57,6 +57,7 @@
          type: "select",
          dataKey: "inOrderType",
          data: [],
          hidden:true
        },
        {
          field: "inboundOrderNo",
@@ -94,6 +95,7 @@
          type: "select",
          dataKey: "inOrderType",
          data: [0],
          hidden:true
        },
        {
          title: "单据状态",
@@ -148,6 +150,7 @@
        width: 150,
        align: "left",
        bind: { key: "inOrderType", data: [] },
        hidden:true
      },
      {
        field: "businessType",

 ÏîÄ¿´úÂë/WIDESEA_WMSClient/src/views/outbound/outboundOrder.vue

@@ -114,6 +114,7 @@
          type: "select",
          dataKey: "outOrderType",
          data: [],
          hidden:true
        },
        {
          title: "单据状态",
@@ -168,6 +169,7 @@
        width: 150,
        align: "left",
        bind: { key: "outOrderType", data: [] },
        hidden:true
      },
      {
        field: "businessType",

 ÏîÄ¿´úÂë/WIDESEA_WMSClient/src/views/stock/stockInfo.vue

@@ -92,6 +92,7 @@
          width: 100,
          align: "left",
          bind: { key: "warehouses", data: [] },
          hidden:true
        },
        {
          field: "creater",
@@ -113,7 +114,7 @@
          type: "string",
          width: 100,
          align: "left",
          hidden:true
          // hidden:true
        },
        {
          field: "modifyDate",
@@ -121,7 +122,7 @@
          type: "datetime",
          width: 160,
          align: "left",
          hidden:true
          // hidden:true
        },
        {
          field: "remark",

 ÏîÄ¿´úÂë/WMSÎÞ²Ö´¢°æ/WIDESEA_WMSServer/WIDESEA_InboundService/InboundOrderService.cs

@@ -647,7 +647,7 @@
            {
                return WebResponseContent.Instance.Error("托盘号不能为空");
            }
           var stock= _stockRepository.Db.Queryable<Dt_StockInfo>().Includes(o=>o.Details).First(x => x.PalletCode == palletCode );
           var stock= _stockRepository.Db.Queryable<Dt_StockInfo>().Includes(o=>o.Details).First(x => x.PalletCode == palletCode &&  x.StockStatus ==(int)StockStatusEmun.组盘暂存);
            if (stock == null)
            {
                return WebResponseContent.Instance.Error($"未找到托盘号{palletCode}对应的库存记录");