Merge branch 'dev'

src/views/order/hook/usePodShipment.ts

@@ -49,11 +49,11 @@ export default function useShipment(callback?: () => void) {
       })
       })
     }
     }
     let rowData
     let rowData
-    const code1 = code?.split('_')[0]
+    const code1 = code?.split('_')[3]
     for (const item of orderList.value) {
     for (const item of orderList.value) {
       // rowData = item.productList?.find((jj) => jj.factorySubOrderNumber === code1)
       // rowData = item.productList?.find((jj) => jj.factorySubOrderNumber === code1)
       rowData = item.productList?.find(
       rowData = item.productList?.find(
-        (jj) => `${item.userMark}-${jj.thirdSubOrderNumber}` === code1,
+        (jj) => `${jj.thirdSubOrderNumber}` === code1,
       )
       )
       if (rowData) {
       if (rowData) {
         rowData.factoryOrderNumber = item.factoryOrderNumber
         rowData.factoryOrderNumber = item.factoryOrderNumber