Merge branch 'dev' of http://110.41.163.243:9980/kd-aiot/kd-aiot-frontend-wt into dev

src/views/bpm/outgoingManagement/components/AssetsDialog.vue

@@ -642,6 +642,7 @@
           }
           const params = this.bizType === 10
             ? { ...this.searchForm,
+                includeSalesReturnStock: true,
                 sourceReceiveProductIds: receiveProductIds.join(','),
                 sourceBizNo: this.receiveNo || undefined }
             : this.searchForm;

src/views/bpm/outgoingManagement/outbound.vue

@@ -1329,6 +1329,7 @@
               do {
                 page = await storageApi.getBatchList({
                   sourceBizNo: this.form.receiveNo,
+                  includeSalesReturnStock: true,
                   sourceReceiveProductIds: [...new Set(receiveProductIds)].join(
                     ','
                   ),

src/views/bpm/stockManagement/storage.vue

@@ -1852,6 +1852,7 @@
                   isSave: this.isTask || undefined,
                   purchaseReceiveProductId:
                     filtersItem.purchaseReceiveProductId,
+                  deliveryDetailId: filtersItem.deliveryDetailId,
                   categoryId: item.id, // 物品id
                   categoryName: item.name, // 物品名称
                   categoryCode: item.code, // 物品编码
@@ -1968,10 +1969,10 @@
 
           const mergedList = [];
           this.detailList.forEach((item) => {
-            const key = `${item.productCode}_${item.batchNo}_${item.colorKey}_${item.warehouseId}_${item.modelType}`;
+            const key = `${item.productCode}_${item.batchNo}_${item.colorKey}_${item.warehouseId}_${item.modelType}_${this.bizType == 6 ? item.deliveryDetailId : ''}`;
             const existIndex = mergedList.findIndex(
               (m) =>
-                `${m.productCode}_${m.batchNo}_${m.colorKey}_${m.warehouseId}_${m.modelType}` ===
+                `${m.productCode}_${m.batchNo}_${m.colorKey}_${m.warehouseId}_${m.modelType}_${this.bizType == 6 ? m.deliveryDetailId : ''}` ===
                 key
             );
             if (existIndex > -1) {