1

647556386

2025-12-25 f104d52506663454f66cc2d06e5c391366bd4a0c

1

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

@@ -185,7 +185,6 @@
<script setup>
import { ref, reactive, onMounted, nextTick, watch, defineEmits, computed } from "vue";
import { ElMessage, ElTag, ElMessageBox } from "element-plus";
import { Search, Check, Return } from "@element-plus/icons-vue";

import VolBox from "@/components/basic/VolBox.vue";
import http from "@/api/http";

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

@@ -19,6 +19,10 @@
                                    <span class="label">供应商编码</span>
                                    <span class="value full-width">{{ item.suplierCode }}</span>
                                </div>
                                <div class="column">
                                    <span class="label">数量/总数</span>
                                    <span class="value full-width">{{ item.quantity }}</span>
                                </div>
                            </div>

                            <div class="row dual-column">
@@ -37,10 +41,7 @@
                                    <span class="label">规格</span>
                                    <span class="value full-width">{{ item.materialSpec }}</span>
                                </div>
                                <div class="column">
                                    <span class="label">数量/总数</span>
                                    <span class="value full-width">{{ item.quantity }}</span>
                                </div>
                                
                            </div>

                            <div class="row dual-column">
@@ -89,6 +90,10 @@
                                        <span class="label-preview">供应商编码</span>
                                        <span class="value-preview full-width">{{ item.suplierCode }}</span>
                                    </div>
                                    <div class="column-preview">
                                        <span class="label-preview">数量/总数</span>
                                        <span class="value-preview full-width">{{ item.quantity }}</span>
                                    </div>
                                </div>

                                <div class="row-preview dual-column">
@@ -107,10 +112,7 @@
                                        <span class="label-preview">规格</span>
                                        <span class="value-preview full-width">{{ item.materialSpec }}</span>
                                    </div>
                                    <div class="column-preview">
                                        <span class="label-preview">数量/总数</span>
                                        <span class="value-preview full-width">{{ item.quantity }}</span>
                                    </div>
                                    
                                </div>

                                <div class="row-preview dual-column">
@@ -305,7 +307,7 @@
                  .row {
                    display: flex !important;
                    margin-bottom: 1.2mm !important;
                    min-height: 6.5mm !important;
                    min-height: 5.5mm !important;
                    align-items: stretch !important;
                  }
                  
@@ -318,15 +320,11 @@
                    flex: 1 !important;
                    display: flex !important;
                    align-items: center !important;
                    min-height: 5mm !important;
                    min-height: 4mm !important;
                  }
                  
                  .column:first-child {
                    margin-right: 2.5mm !important;
                  }
                  
                  .label {
                    flex: 0 0 8mm !important;
                    white-space: nowrap !important;
                    font-size: 2.5mm !important;
                    line-height: 1.3 !important;

 ÏîÄ¿´úÂë/WIDESEA_WMSClient/src/extension/stock/stockView.js

@@ -281,15 +281,11 @@
                      return;
                    }

                    // æž„造请求参数：
                    // 1. è¯·æ±‚体：直接传递stockViews数组（对应后端List<StockViewDTO>）
                    // 2. outStation：通过查询参数传递（因后端未指定[FromBody]接收该参数）
                    const requestBody = stockViews; // ç›´æŽ¥ä¼ é€’选中数组（确保数组内对象结构与StockViewDTO一致）
                    const requestBody = stockViews;
                    const outStation = formData.outStation;

                    // æŽ¥å£è¯·æ±‚：Post方式，请求体传stockViews数组，outStation拼到URL查询参数
                    try {
                      // æ‹¼æŽ¥æŸ¥è¯¢å‚数（如果outStation有特殊字符，可使用encodeURIComponent处理）

                      const url = `api/Task/TakeOutbound?outStation=${encodeURIComponent(outStation)}`;
                      
                      const x = await this.http.post(

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

@@ -32,25 +32,25 @@
              />
            </el-form-item>

            <el-form-item label="规格" prop="specification">
            <el-form-item label="规格" prop="materialSpec">
              <el-input
                v-model="printForm.specification"
                v-model="printForm.materialSpec"
                placeholder="请输入物料规格"
                clearable
              />
            </el-form-item>

            <el-form-item label="批号" prop="batchNumber">
            <el-form-item label="批号" prop="barcode">
              <el-input
                v-model="printForm.batchNumber"
                v-model="printForm.barcode"
                placeholder="请输入批号（生成二维码用）"
                clearable
              />
            </el-form-item>

            <el-form-item label="厂区" prop="factory">
            <el-form-item label="厂区" prop="factoryArea">
              <el-input
                v-model="printForm.factory"
                v-model="printForm.factoryArea"
                placeholder="请输入厂区名称"
                clearable
              />
@@ -59,33 +59,33 @@

          <!-- ç¬¬äºŒåˆ— -->
          <el-col :span="12">
            <el-form-item label="供应商编码" prop="supplierCode">
            <el-form-item label="供应商编码" prop="suplierCode">
              <el-input
                v-model="printForm.supplierCode"
                v-model="printForm.suplierCode"
                placeholder="请输入供应商编码"
                clearable
              />
            </el-form-item>

            <el-form-item label="采购单号" prop="purchaseOrderNo">
            <el-form-item label="采购单号" prop="pruchaseOrderNo">
              <el-input
                v-model="printForm.purchaseOrderNo"
                v-model="printForm.pruchaseOrderNo"
                placeholder="请输入采购单号"
                clearable
              />
            </el-form-item>

            <el-form-item label="数量/总数" prop="quantityTotal">
            <el-form-item label="数量/总数" prop="quantity">
              <el-input
                v-model="printForm.quantityTotal"
                v-model="printForm.quantity"
                placeholder="例：100/5000"
                clearable
              />
            </el-form-item>

            <el-form-item label="批次" prop="batch">
            <el-form-item label="批次" prop="batchNo">
              <el-input
                v-model="printForm.batch"
                v-model="printForm.batchNo"
                placeholder="请输入批次号"
                clearable
              />
@@ -141,14 +141,14 @@
      // è¡¨å•æ•°æ®ï¼ˆå¯¹åº”printView所需的参数）
      printForm: {
        materialCode: "", // æ–™å·
        supplierCode: "", // ä¾›åº”商编码
        suplierCode: "", // ä¾›åº”商编码
        materialName: "", // å“å
        purchaseOrderNo: "", // é‡‡è´­å•å·
        specification: "", // è§„æ ¼
        quantityTotal: "", // æ•°é‡/总数
        batchNumber: "", // æ‰¹å·ï¼ˆäºŒç»´ç å†…容）
        batch: "", // æ‰¹æ¬¡
        factory: "", // åŽ‚区
        pruchaseOrderNo: "", // é‡‡è´­å•å·
        materialSpec: "", // è§„æ ¼
        quantity: "", // æ•°é‡/总数
        barcode: "", // æ‰¹å·ï¼ˆäºŒç»´ç å†…容）
        batchNo: "", // æ‰¹æ¬¡
        factoryArea: "", // åŽ‚区
        date: "", // æ—¥æœŸï¼ˆé»˜è®¤å½“前日期）
      },
      // æ‰“印份数（支持批量生成多条相同数据）
@@ -157,7 +157,7 @@
      formRules: {
        materialCode: [{ required: true, message: "请输入料号", trigger: "blur" }],
        materialName: [{ required: true, message: "请输入品名", trigger: "blur" }],
        batchNumber: [{ required: true, message: "请输入批号", trigger: "blur" }],
        barcode: [{ required: true, message: "请输入批号", trigger: "blur" }],
        date: [{ required: true, message: "请选择日期", trigger: "change" }],
      },
    };

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

@@ -2483,7 +2483,7 @@
                        Operator = App.User.UserName,
                        lineNo = outboundOrderDetail.lineNo,
                        WarehouseCode = outboundOrderDetail.WarehouseCode ?? "无",
                        BarcodeQty = outboundOrderDetail.NoStockOutQty,
                        BarcodeQty = outboundOrderDetail.BarcodeQty,
                        BarcodeUnit = outboundOrderDetail.BarcodeUnit,
                        BatchNo = outboundOrderDetail.BatchNo
                    };
@@ -2618,6 +2618,8 @@
                              }).ToList()
                          }).ToList();
                    outfeedmodel.details.AddRange(groupdata);

                    _outStockLockInfoService.DeleteData(detailLocks);
                }
                //存储回传参数，保证异常手动回传
                Dt_InterfaceLog interfaceLog = new Dt_InterfaceLog