多组织仓位

pages/outbound/index.vue

@@ -464,7 +464,6 @@ export default {
                 this.YiJiannum = 0;
                 this.YingJianum = 0;
             }
-			console.log(n,'===========n===========')
             //根据出库单号检索
             this.pageNo = 1;
             this.ckSelectlist = [];
@@ -701,7 +700,6 @@ export default {
         },
         // 一键清除出库单号
         clearnFn(val) {
-            console.log('一键清除出库单号', val);
             if (val == 'ckdhselect') {
                 // this.warehouseName = '';
                 // this.warehouseCode = '';
@@ -802,7 +800,7 @@ export default {
 			        icon: 'none',
 			        duration: 2000
 			    });
-			    return;
+			   return;
 			}
 			let formData = {};
 			formData.taskId = this.fid;
@@ -852,10 +850,12 @@ export default {
 			                    materialNumber: item.materialNumber,
 			                    boxId: item.boxId,
 			                    serialNumbers: [],
+								twoSerialNumbers:[],
 			                    qty: 0
 			                };
 			            }
 			            mergedArray[key].serialNumbers.push(item.serialNumbers);
+						mergedArray[key].twoSerialNumbers.push(item.twoSerialNumbers);
 			            mergedArray[key].qty += item.qty;
 			        });
 			        const result = Object.values(mergedArray);
@@ -864,9 +864,11 @@ export default {
 			    } else {
 			        thedetails = boxdetails;
 			    }
-			    // 过滤为0的数据
+			    // 过滤为0的数
 			    formData.details = [];
 			    formData.details = thedetails.filter((it) => {
+					//去掉空值
+					it.twoSerialNumbers  = it?.twoSerialNumbers?.filter(Boolean)
 			        return it.qty && it.qty > 0;
 			    });
 			}
@@ -875,6 +877,7 @@ export default {
 			    return false;
 			}
 			this.requestStatus = true;
+			
 			this.$api.post('/OutStock/Save', formData).then((res) => {
 			    if (res.status == 200) {
 			        uni.showToast({
@@ -1112,8 +1115,6 @@ export default {
                             return;
                         }
                         let boxwlIds = res.data.details.filter((item) => item.qty > 0).map((item) => item.materialNumber);
-						console.log(boxwlIds,'=boxwlIds=')
-						console.log(this.dataList,'=this.dataList=')
                         let datawlds = this.dataList.map((it) => {
                             return it.materialNumber;
                         });
@@ -1371,6 +1372,7 @@ export default {
         // 扫描序列号数据处理
         setxlhdata(res) {
             let thindx = this.dataList.findIndex((it) => it.materialNumber == res.data.materialNumber);
+		
             // 如果这个序列存在明细信息就缓存
             if (!this.dataList[thindx].itxlhlist && this.dataList[thindx].itxlhlist.length == 0) {
                 this.dqYJnum = 0;
@@ -1382,7 +1384,8 @@ export default {
                 qty: 1,
                 boxId: this.isOldOps && this.isOldboxInfo.boxsubStock ? this.isOldboxInfo.boxId : res.data.boxId,
                 subStockCode: this.isOldOps && this.isOldboxInfo.boxsubStock ? this.isOldboxInfo.boxsubStock : res.data.subStockCode,
-                serialNumbers: res.data.serialNumber
+                serialNumbers: res.data.serialNumber,
+				twoSerialNumbers:res.data.twoSerialNumber
             });
             this.dataList[thindx].itxlhlist.push(this.xlhVal);
             this.dataList[thindx].boxitNo = this.isOldOps && this.isOldboxInfo.boxsubStock ? this.isOldboxInfo.boxName : res.data.boxBillNo;
@@ -1653,7 +1656,6 @@ export default {
         },
         //根据出库单号获取对应的下拉数据
         getCKselectlist(val) {
-			console.log('1232323')
             // if (!val) return
             clearTimeout(this.timer);
             this.pagingSet = false;