修改

main.js

@@ -35,7 +35,9 @@ import {
 // uni.$baseUrl = "http://192.168.1.97:48080";
 // uni.$baseUrl = "";
 // uni.$baseUrl = "http://113.105.183.190:48028";
-uni.$baseUrl = "http://61.155.26.34:36936";
+// uni.$baseUrl = "http://192.168.1.26:48080";
+uni.$baseUrl = "http://113.105.183.190:15980";
+// uni.$baseUrl = "http://61.155.26.34:36936";
 // uni.$baseUrl = "http://2227el9013.iok.la";
 // uni.$baseUrl = "http://218.2.10.30:48080";
 // uni.$baseUrl = "http://192.168.1.85:48080"; // dev

pages/workbranch/production/FQC/fqcCheckout.vue

@@ -99,6 +99,14 @@
             <text>检验数量</text>
             <text>{{ OQCParams.receiptQty }}</text>
           </view>
+		  <view class="card-list-item">
+		    <text>图号</text>
+		    <text>{{ OQCParams.drawingNo }}</text>
+		  </view>
+		  <view class="card-list-item">
+		    <text>客户料号</text>
+		    <text>{{ OQCParams.customerMaterialNo }}</text>
+		  </view>
         </view>
 
         <!-- 表格 -->
@@ -561,6 +569,8 @@ export default defineComponent({
           OQCParams.value.saleOutNo = data?.saleOutNo
           OQCParams.value.receiptQty = data?.receiptQty
           OQCParams.value.purchaseOrderNo = data?.purchaseOrderNo
+		  OQCParams.value.drawingNo = data?.drawingNo
+		  OQCParams.value.customerMaterialNo = data?.customerMaterialNo
         })
     }
 

pages/workbranch/warehouse/scanInOut/In/scannedMaterials.vue

@@ -66,6 +66,7 @@
 					<uni-table border stripe empty-text="暂无更多数据">
 						<!-- 表头行 -->
 						<uni-tr class="custom-table-head">
+							<uni-th align="center" width="180px" class="break-col">推荐库位(数量)</uni-th>
 							<uni-th align="center" width="180px">物料</uni-th>
 							<uni-th align="center" width="120px">应备数</uni-th>
 							<uni-th align="center" width="120px">已备数</uni-th>
@@ -75,6 +76,7 @@
 						<uni-tr v-for="(item, key) in tableData" :key="key" @click="handleToDetails(item)">
               <!-- 不可点击行 -->
 						<!-- <uni-tr v-for="(item, key) in tableData" :key="key"> -->
+							<uni-td align="center" class="break-cell">{{ item.recommendStockLocation }}</uni-td>
 							<uni-td align="center">{{ item.materialNo }}({{ item.materialName }})</uni-td>
 							<uni-td align="center">{{ item.nowDeliveredQty }}</uni-td>
 							<uni-td align="center"
@@ -372,9 +374,10 @@ const checkFifo = (qrCode) => {
 
       const qrCode = ret.resp_result
 
-      // 2. FIFO 校验
-      const pass = await checkFifo(qrCode)
-      if (!pass) return                         // 用户点了“取消”
+      // 2. FIFO 校验（暂时注释）
+      // const pass = await checkFifo(qrCode)
+      // if (!pass) return // 用户点了“取消”
+	  const pass = true          // FIFO校验直接放行
 
       // 3. 业务接口
       uni.$reqGet('scanPrepareMaterial', {
@@ -384,9 +387,12 @@ const checkFifo = (qrCode) => {
       .then(async ({ code, data, msg }) => {
         if (code === 0) {
           scanBatchNumber.value = qrCode
-          // 更新仓库和货位名称
+          // 更新仓库和货位名称（直接覆盖）
           erpStockName.value = data[0]?.erpStockName || ''
           wmsStoreName.value = data[0]?.wmsStoreName || ''
+		  // 更新仓库和货位名称（非空才覆盖，保留原有值）
+          // erpStockName.value = data[0]?.erpStockName || erpStockName.value
+          // wmsStoreName.value = data[0]?.wmsStoreName || wmsStoreName.value
           if (Object.prototype.toString.call(data) === '[object Array]') {
             fdIndex.value = tableData.value.findIndex(item => item?.materialNo === data[0]?.materialNo)
           }
@@ -472,9 +478,10 @@ const checkFifo = (qrCode) => {
         return
       }
       
-      // FIFO 校验
-      const pass = await checkFifo(e)
-      if (!pass && !fifoGo.value) return
+      // FIFO 校验（暂时关闭）
+      // const pass = await checkFifo(e)
+      // if (!pass && !fifoGo.value) return
+		const pass = true          // FIFO校验直接放行
         uni.$reqGet('scanPrepareMaterial', {
           qrCode: e,
           locationCode: storeName.value // 传入库位编码
@@ -483,9 +490,12 @@ const checkFifo = (qrCode) => {
           fifoGo.value = false
           if (code === 0) {
             scanBatchNumber.value = e
-            // 更新仓库和货位名称
+            // 更新仓库和货位名称（直接覆盖）
             erpStockName.value = data[0]?.erpStockName || ''
             wmsStoreName.value = data[0]?.wmsStoreName || ''
+			// 更新仓库和货位名称（非空才覆盖，保留原有值）
+            // erpStockName.value = data[0]?.erpStockName || erpStockName.value
+            // wmsStoreName.value = data[0]?.wmsStoreName || wmsStoreName.value
             if (Object.prototype.toString.call(data) === '[object Array]') {
               fdIndex.value = tableData.value.findIndex(item => item?.materialNo === data[0]?.materialNo)
             }
@@ -1294,4 +1304,18 @@ const checkFifo = (qrCode) => {
 		opacity: 0.5;
 		pointer-events: none;
 	}
+	// /* 表头也允许换行，保证与列宽对齐 */
+	// ::v-deep .break-col {
+	//   white-space: normal !important;
+	//   word-break: break-all !important;
+	//   line-height: 1.2;
+	// }
+	
+	// /* 单元格超长自动分段 */
+	// ::v-deep .break-cell {
+	//   white-space: normal !important;
+	//   word-break: break-all !important;
+	//   line-height: 1.2;
+	//   padding: 4px 2px;          /* 上下留一点空隙，视觉更舒服 */
+	// }
 </style>

pages/workbranch/warehouse/scanInOut/Out/scanOutPage.vue

@@ -31,7 +31,7 @@
 					<view class="search-item">
 						<text class="search-label">申请单号</text>
 						<view class="search-input-wrapper">
-							<input type="text" v-model="requestNo" placeholder="请输入申请单号" class="search-input" focus />
+							<input type="text" v-model="requestNo" placeholder="请输入申请单号" class="search-input" focus @confirm="handleSearch"/>
 							<text class="scan-icon font-icons" @tap="scanCode">
 								&#xe6b7;
 							</text>

pages/workbranch/warehouse/scanInOut/Out/scannedMaterials.vue

@@ -39,6 +39,7 @@
 					<uni-table border stripe empty-text="暂无更多数据">
 						<!-- 表头行 -->
 						<uni-tr class="custom-table-head">
+							<uni-th align="center" width="180px" class="break-col">可出库位(数量)</uni-th>
 							<uni-th align="center" width="180px">物料</uni-th>
 							<uni-th align="center" width="120px">应备数</uni-th>
 							<uni-th align="center" width="120px">已备数</uni-th>
@@ -48,6 +49,7 @@
 						<uni-tr v-for="(item, key) in tableData" :key="key" @click="handleToDetails(item)">
              <!-- 不可点击行 -->
 						<!-- <uni-tr v-for="(item, key) in tableData" :key="key"> -->
+							<uni-td align="center" class="break-cell">{{ item.ableStockLocation }}</uni-td>
 							<uni-td align="center">{{ item.materialNo }}({{ item.materialName }})</uni-td>
 							<uni-td align="center">{{ item.nowDeliveredQty }}</uni-td>
 							<uni-td align="center"
@@ -310,7 +312,7 @@ export default defineComponent({
       if (!ok && !fifoGo.value) return;
 
       /* 3. 业务接口 */
-      uni.$reqGet('scanPrepareMaterial', { qrCode })
+      uni.$reqGet('scanPrepareMaterial', { qrCode,requestNo: receiveList.value.requestNo,businessType:receiveList.value.businessType })
         .then(({ code, data, msg }) => {
           fifoGo.value = false;
           if (code !== 0) {
@@ -458,7 +460,7 @@ export default defineComponent({
       if (!ok && !fifoGo.value) return;
       /* ========================= */
 
-      uni.$reqGet('scanPrepareMaterial', { qrCode })
+      uni.$reqGet('scanPrepareMaterial', { qrCode,requestNo: receiveList.value.requestNo,businessType:receiveList.value.businessType })
         .then(async ({ code, data, msg }) => {
           scanBatchNumber.value = qrCode;
         fifoGo.value = false;
@@ -1193,4 +1195,18 @@ const checkFifo = (qrCode) => {
 		z-index:1;
 		border-radius: 4px;
 	}
+	// /* 表头也允许换行，保证与列宽对齐 */
+	// ::v-deep .break-col {
+	//   white-space: normal !important;
+	//   word-break: break-all !important;
+	//   line-height: 1.2;
+	// }
+	
+	// /* 单元格超长自动分段 */
+	// ::v-deep .break-cell {
+	//   white-space: normal !important;
+	//   word-break: break-all !important;
+	//   line-height: 1.2;
+	//   padding: 4px 2px;          /* 上下留一点空隙，视觉更舒服 */
+	// }
 </style>