备货选择订单商品箱明细优化

src/api/ecw/order.js

@@ -1025,9 +1025,10 @@ export function getParentOrder(orderId){
 }
 
 // 获取订单入仓商品明细通用属性集合，用于备货选择订单商品到明细
-export function getOrderItemCommonAttr(orderId){
+export function getOrderItemCommonAttr(orderId, excludeOrderWarehouseInId){
   return request({
-    url: '/order/order-warehouse-in/get-order-warehouse-in-common-attr-list?orderId=' + orderId,
-    method: 'get'
+    url: '/order/order-warehouse-in/get-order-warehouse-in-common-attr-list',
+    method: 'get',
+    params: {orderId, excludeOrderWarehouseInId}
   })
 }

src/views/ecw/order/stocking/components/ChooseOrderProducts.vue

@@ -52,7 +52,8 @@ export default {
     orderId: {
       type: Number,
       default: undefined
-    }
+    },
+    warehouseInId:Number
   },
   data(){
     return {
@@ -70,7 +71,7 @@ export default {
     },
   },
   async created() {
-    getOrderItemCommonAttr(this.orderId).then(res => {
+    getOrderItemCommonAttr(this.orderId, this.warehouseInId).then(res => {
       this.orderItemDetails = res.data
     })
   },
@@ -80,7 +81,21 @@ export default {
       this.multipleSelection = e
     },
     handleSubmit(){
-      this.$emit("success", this.multipleSelection)
+      // 品名+品牌＋材质＋商品特性＋用途一致的会合并，数量累加
+      // https://zentao.test.jdshangmen.com/task-view-3423.html
+      let arr = []
+      this.multipleSelection.forEach(item => {
+        let index = arr.findIndex(i => {
+          return i.prodId == item.prodId && i.brand == item.brand && i.material == item.material && i.prodAttrIds == item.prodAttrIds && i.usageIds == item.usageIds
+        })
+        if (index == -1) {
+          arr.push({...item})
+        } else {
+          arr[index].quantityAll += item.quantityAll
+        }
+      })
+
+      this.$emit("success", arr)
     },
     handleClose() {
       this.visible = false

src/views/ecw/order/stocking/components/Package.vue

@@ -196,7 +196,12 @@
           </el-table-column>
           <el-table-column :label="$t('操作')">
             <template v-slot="{ row, column, $index}">
-							<WarehouseRecordDetail v-model="form.table[$index].orderWarehouseInDetailsVOList" show-choose-order-item :order-id="order.orderId" />
+							<WarehouseRecordDetail
+                v-model="form.table[$index].orderWarehouseInDetailsVOList"
+                show-choose-order-item
+                :order-id="order.orderId"
+                :warehouse-in-id="row.id"
+              />
               <el-popconfirm
                 v-if="$index >= protectRowCount"
                 title="确定要删除该行记录吗？"

src/views/ecw/order/warehousing/components/WarehouseRecordDetail.vue

@@ -37,7 +37,12 @@
         <el-button type="primary" @click="handleSave">确 定</el-button>
       </span>
     </el-dialog>
-    <choose-order-products v-if="showChooseDialog" :order-id="orderId" @close="showChooseDialog=false" @success="handleChooseOrderProducts"></choose-order-products>
+    <choose-order-products
+      v-if="showChooseDialog"
+      :order-id="orderId"
+      :warehouse-in-id="warehouseInId"
+      @close="showChooseDialog=false"
+      @success="handleChooseOrderProducts"></choose-order-products>
   </div>
 </template>
 
@@ -74,7 +79,8 @@ export default {
     },
     // 是否显示添加订单商品按钮
     showChooseOrderItem:Boolean,
-    orderId: Number
+    orderId: Number,
+    warehouseInId: Number
   },
 
   data() {