入库优化

src/views/warehouseManagement/stockManagement/add.vue

@@ -568,7 +568,6 @@ export default {
       pickingPageNum: 1, // 包装虚拟分页页数
       materielPageNum: 1, // 物料虚拟分页页数
       packingSpecificationOption: [], // 包装规格下拉
-      proData: []
     };
   },
   computed: {
@@ -1082,7 +1081,9 @@ export default {
             align: 'center',
             showOverflowTooltip: true
           };
-        });
+        }).filter(item => item.label !== '包装规格');
+
+        console.log(newRes, 'newRes');
         this.newColumns = [...newRes];
       });
     },
@@ -1789,8 +1790,9 @@ export default {
     },
     // 添加物品明细
     async addGoods(data) {
+      if (data.length === 0) return this.$message.warning('请选择产品信息')
       console.log(data, 'datadatadatadatadatadatadata111')
-      this.proData = data;
+
       // 获取批次号
       const batchNo = await getCode('lot_number_code');
       // 获取供应商
@@ -1827,6 +1829,9 @@ export default {
               1
               : this.productList.length + index,
 
+          // extField: {
+          //   packingSpecification: item.extField.packingSpecification
+          // }, // 包装规格
           categoryId: item.id, // 物品id
           categoryName: item.name, // 物品名称
           categoryCode: item.code, // 物品编码
@@ -2310,7 +2315,7 @@ export default {
         let measureQuantity = 1;
         let packingQuantity = 1;
         let packingUnit = row.packingUnit;
-        console.log(packingUnit, 'packingUnit 立方ma ')
+
         // 处理单位为KG类,计算每桶KG值
         if (packingBoolen) {
           if (!row.isUnpack && row.packingUnit == '立方') {
@@ -2327,10 +2332,11 @@ export default {
                 ? filterArr[0].packageCell
                 : Number(row.packingQuantity) -
                 this.$math.format(filterArr[0].packageCell * index, 14);
+            console.log(measureQuantity, 'measureQuantity')
           }
         } else {
           if (row.isUnpack == 1) {
-            console.log('1 不拆--------', measureBoolen)
+            console.log('1 拆--------', measureBoolen)
             if (measureBoolen) {
               // 处理单位不为KG类,计量单位为KG类的情况
               let splitIndex = row.packingSpecificationOption.findIndex(
@@ -2346,27 +2352,30 @@ export default {
                 );
               }
             } else {
-              console.log('2 不拆--------')
-              let splitIndex = row.packingSpecificationOption.findIndex(
-                (item) =>
-                  item.conversionUnit == row.packingUnit &&
-                  item.packageUnit != item.conversionUnit
-              );
-              for (; splitIndex > 0; splitIndex--) {
-                measureQuantity = this.$math.format(
-                  measureQuantity *
-                  row.packingSpecificationOption[splitIndex].packageCell,
-                  14
-                );
-              }
+              // let splitIndex = row.packingSpecificationOption.findIndex(
+              //   (item) =>
+              //     item.conversionUnit == row.packingUnit &&
+              //     item.packageUnit != item.conversionUnit
+              // );
+              // for (; splitIndex > 0; splitIndex--) {
+              //   measureQuantity = this.$math.format(
+              //     measureQuantity *
+              //     row.packingSpecificationOption[splitIndex].packageCell,
+              //     14
+              //   );
+              // }
+              measureQuantity = row.packingSpecificationOption[1]?.packageCell;
+
+              console.log('3 拆--------', measureQuantity)
+
             }
           } else {
-            console.log('3 不拆--------')
+            console.log('4 拆--------')
             if (row.packingQuantity) {
               measureQuantity = row.measureQuantity / row.packingQuantity;
             }
-            console.log(measureQuantity, 'measureQuantity')
           }
+          console.log(measureQuantity, 'measureQuantity')
         }
         console.log(filterArr[0], 'filterArr[0]')
 
@@ -2386,6 +2395,17 @@ export default {
           packageNo: packingCodeList[index]?.onlyCode, // 包装编码
           packingQuantity: packingQuantity, // 包装数量
 
+          // packingUnit: row.isUnpack
+          //   ? packingBoolen
+          //     ? filterArr[0].conversionUnit
+          //     : measureBoolen
+          //       ? row.packingSpecificationOption[1]
+          //         ? row.packingSpecificationOption[1].conversionUnit
+          //         : row.packingSpecificationOption[0].conversionUnit
+          //       : row.measureUnit
+          //   : packingBoolen
+          //     ? row.packingUnit === '立方' ? row.packingUnit : filterArr[0]?.conversionUnit
+          //     : row.packingUnit,
           packingUnit: row.isUnpack
             ? packingBoolen
               ? filterArr[0].conversionUnit
@@ -2393,11 +2413,16 @@ export default {
                 ? row.packingSpecificationOption[1]
                   ? row.packingSpecificationOption[1].conversionUnit
                   : row.packingSpecificationOption[0].conversionUnit
-                : row.measureUnit
+                : (() => {
+                  if (row.packingUnit === row.measureUnit) {
+                    return row.measureUnit;
+                  } else {
+                    return row.packingSpecificationOption[1]?.conversionUnit;
+                  }
+                })()
             : packingBoolen
               ? row.packingUnit === '立方' ? row.packingUnit : filterArr[0]?.conversionUnit
               : row.packingUnit,
-
           measureQuantity: row.isUnpack
             ? packingBoolen
               ? measureQuantity
@@ -2613,11 +2638,14 @@ export default {
                   row.categoryLevelPathIdParent
                 );
               } else {
-                console.log(packingBoolen, measureBoolen, '33333');
+                console.log(packingBoolen, measureBoolen, row, '33333');
 
                 let num = Math.ceil(
                   row.measureQuantity / row.packingSpecificationOption[1]?.packageCell
                 );
+                console.log(num, 'num')
+                console.log(row.measureQuantity, 'row.measureQuantity')
+
                 this.$refs.wareHouseDailogRef.open(num ? num : 0, row.measureQuantity, idx, row.warehouseId, row.warehouseName + '',
                   row.categoryLevelPathIdParent);
               }
@@ -2661,14 +2689,21 @@ export default {
           } else {
             //如果此行不拆包，并且测量单位=包装单位 packingQuantity=0
 
-            row.forEach(item => {
-              if (!item.isUnpack && item.measureUnit === item.packingUnit) {
-                item.packingQuantity2 = 0;
-              } else {
-                item.packingQuantity2 = item.packingQuantity;
+            for (let i = 0; i < row.length; i++) {
+              if (row[i].isUnpack === 0 && row[i].measureUnit === row[i].packingUnit) {
+                row[i].packingQuantity2 = 0;
+              } else if (row[i].isUnpack === 1) {
+                const packageCell = row[i].packingSpecificationOption[1]?.packageCell;
+                if (packageCell) {
+                  row[i].packingQuantity2 = Number(row[i].measureQuantity) / packageCell;
+                } else {
+                  row[i].packingQuantity2 = 0; // 处理 packageCell 不存在的情况
+                }
               }
-            });
+            }
+
             console.log(row, 'rowrowrowrowrowrow我看看')
+
             const pNum = row.reduce((sum, item) => {
               if (item.packingQuantity2 !== undefined && item.packingQuantity2 !== null) {
                 return sum + Number(item.packingQuantity2);

src/views/warehouseManagement/stockManagement/details.vue

@@ -322,21 +322,14 @@
             </el-table-column>
             <el-table-column label="序号" type="index" width="50">
             </el-table-column>
-            <el-table-column
-              label="编码"
-              prop="categoryCode"
-              :show-overflow-tooltip="true"
-            ></el-table-column>
-            <el-table-column
-              label="名称"
-              prop="categoryName"
-              :show-overflow-tooltip="true"
-            ></el-table-column>
-            <el-table-column
-              label="批次号"
-              prop="batchNo"
-              :show-overflow-tooltip="true"
-            ></el-table-column>
+            
+            <el-table-column label="批次号" prop="batchNo" width="80" :show-overflow-tooltip="true"></el-table-column>
+            <el-table-column label="包装编码" prop="packageNo" width="130" :show-overflow-tooltip="true"></el-table-column>
+            <el-table-column label="名称" prop="categoryName" width="120" :show-overflow-tooltip="true"></el-table-column>
+            <el-table-column label="编码" prop="categoryCode" width="120" :show-overflow-tooltip="true"></el-table-column>
+            <el-table-column label="型号" prop="categoryModel" width="80" :show-overflow-tooltip="true"></el-table-column>
+            <el-table-column label="规格" prop="specification" width="80" :show-overflow-tooltip="true"></el-table-column>
+            <el-table-column label="牌号" prop="brandNum" width="80" :show-overflow-tooltip="true"></el-table-column>
             <el-table-column
               label="发货条码"
               prop="barcodes"