修改拆包的判断

src/views/produce/components/jobBooking/components/batchPackagingGrouping.vue

@@ -1,5 +1,9 @@
 <template>
-  <div v-if="!objData.isUnpack || objData.isUnpack == '1'">
+  <div
+    v-if="
+      (!objData.isUnpack && objData.isUnpack != 0) || objData.isUnpack == '1'
+    "
+  >
     <div class="col userInp" style="display: flex; align-items: center">
       <div class="label lable150 rx-cc" style="width: 100px !important"
         >规格选择：</div
@@ -294,7 +298,10 @@
             this.formedNumLast = 0;
           }
           console.log(newVal);
-          if (!newVal.isUnpack || newVal.isUnpack == '1') {
+          if (
+            (!newVal.isUnpack && newVal.isUnpack != 0) ||
+            newVal.isUnpack == '1'
+          ) {
             this.packageDispositionFn();
           }
         },

src/views/produce/components/picking/index.vue

@@ -391,6 +391,16 @@
             });
             this.pickName = res[0].productName + '领料';
 
+            arr[0].pickList.forEach((it) => {
+              it.warehouseIdList = [];
+              it.warehouseIdList.push(it.warehouseId);
+
+              it.warehouseList.forEach((i) => {
+                i.warehouse_name = i.name;
+                i.warehouse_id = i.id;
+              });
+            });
+
             // arr.bomDetailDTOS.map(v=>{
             //   this.getInventoryTotalFn(v.id)
             // })
@@ -424,17 +434,6 @@
                 i.warehouse_name = i.name;
                 i.warehouse_id = i.id;
               });
-
-              // const data = it.warehouseList.find((i) => i.id == it.warehouseId);
-
-              // if (data) {
-              //   it.warehousePick.push({
-              //     batchNo: data.batchNo,
-              //     demandQuantity: data.demandQuantity,
-              //     warehouseId: data.id,
-              //     warehouseName: data.name
-              //   });
-              // }
             });
 
             console.log(arr, 'e.pickList');