feat: 拣胚完成功能开发

src/views/order/factoryOrderNew/component/OperateDetailsDialog.vue

@@ -336,7 +336,7 @@ const handleConfirm = async () => {
       `<div>
       `<div>
         <span>当前库存数量: ${selectedRow.value?.inventory}</span>
         <span>当前库存数量: ${selectedRow.value?.inventory}</span>
         <span style="margin: 0 4px">生产中数量: ${selectedRow.value?.producingQuantity}</span>
         <span style="margin: 0 4px">生产中数量: ${selectedRow.value?.producingQuantity}</span>
-        <span>最多只能拣胚 ${selectedRow.value?.allOrderIds?.length} 个</span>
+        <span>最多只能拣胚 ${selectedRow.value?.availableOrderIds?.length} 个</span>
         <div>请重新选择!</div>
         <div>请重新选择!</div>
       </div>`,
       </div>`,
       '提示',
       '提示',
@@ -347,7 +347,12 @@ const handleConfirm = async () => {
       },
       },
     )
     )
   }
   }
-  emit('adjustPickOrderSuccess',selectedItems.value.map((item) => item.id))
+  emit(
+    'adjustPickOrderSuccess',
+    null,
+    selectedItems.value.map((item) => item.id),
+    selectedRow.value,
+  )
   visible.value = false
   visible.value = false
 }
 }
 
 

src/views/order/factoryOrderNew/component/PickCompleteDialog.vue

@@ -187,7 +187,12 @@ const columns = [
   },
   },
 ]
 ]
 
 
-const open = async (ids: (number | string)[]) => {
+const open = async (
+  ids: (number | string)[],
+  adjustOrderIds: number[],
+  selectedRow: PickCompleteData,
+) => {
+  const previousPickList = pickData.value?.pickingSituationList ?? []
   selections.value = []
   selections.value = []
   pickData.value = null
   pickData.value = null
   const loading = ElLoading.service({
   const loading = ElLoading.service({
@@ -195,7 +200,20 @@ const open = async (ids: (number | string)[]) => {
     background: 'rgba(0, 0, 0, 0.3)',
     background: 'rgba(0, 0, 0, 0.3)',
   })
   })
   try {
   try {
-    const res = await pickCompleteByIdsDataApi(ids)
+    let pickIds
+    if (selectedRow && adjustOrderIds.length > 0 && !ids) {
+      const adjustPickData = previousPickList.find(
+        (item: PickCompleteData) =>
+          item.thirdSkuCode === selectedRow.thirdSkuCode,
+      )
+      if (adjustPickData) {
+        adjustPickData.allOrderIds = adjustOrderIds
+      }
+      pickIds = previousPickList
+        .map((item: PickCompleteData) => item.allOrderIds)
+        .flat()
+    }
+    const res = await pickCompleteByIdsDataApi(ids || pickIds)
     if (res.code !== 200) return
     if (res.code !== 200) return
     pickData.value = res.data || null
     pickData.value = res.data || null
     visible.value = true
     visible.value = true