销售出库

zkqy-custom-business/src/main/java/com/zkqy/business/domain/vo/ProductInvoiceVO.java

@@ -565,6 +565,11 @@ public class ProductInvoiceVO extends BaseEntity {
          */
         private boolean isHistoryBatch;
 
+        /**
+         * 通知箱数
+         */
+        private Integer productWeight;
+
         public int getBatchNumber() {
             return batchNumber;
         }
@@ -726,6 +731,14 @@ public class ProductInvoiceVO extends BaseEntity {
             this.oldActualBoxNum = oldActualBoxNum;
         }
 
+        public Integer getProductWeight() {
+            return productWeight;
+        }
+
+        public void setProductWeight(Integer productWeight) {
+            this.productWeight = productWeight;
+        }
+
         public Double getOldActualWeight() {
             return oldActualWeight;
         }

zkqy-custom-business/src/main/resources/mapper/business/SaleProductsMapper.xml

@@ -448,6 +448,7 @@
                pt.product_type                                      AS productType,
                sp.remark                                            AS productRemark,
                sp.product_number                                    AS actualWeight,
+               sp.product_weight                                    AS productWeight,
                sp.colours                                           AS productColor,
                sp.`level`                                           AS levels
         FROM {DBNAME}.sale_products sp
@@ -527,7 +528,7 @@
                   r.product_colour,
                   r.levels) AS a
                  LEFT JOIN {DBNAME}.sale_products sp
-        ON sp.sale_order_no = a.sale_order_no  AND sp.`level` = a.levels
+        ON sp.sale_order_no = a.sale_order_no  AND sp.`level` = a.levels 	AND sp.colours = a.productColor
             AND sp.product_no = a.productCode and sp.del_flag = '0'
     </select>
 

zkqy-ui/src/views/orderMange/outStock/index.vue

@@ -238,6 +238,12 @@
                 </template>
               </el-table-column>
               <el-table-column align="center" label="通知">
+                <el-table-column v-if="hasNonEmptyMaterialName"
+                  align="center"
+                  label="箱数"
+                  prop="productWeight"
+                >
+                </el-table-column>
                 <el-table-column
                   align="center"
                   label="重量"
@@ -644,7 +650,7 @@ export default {
           item.coutweight = codeColorSums[key].weight.toFixed(2);
         }
       });
-      console.log("list", list);
+      console.log("list=========", list);
       return list;
     },
     // 重置查询
@@ -978,6 +984,10 @@ export default {
     tableData() {
       return this.batchMap[this.activeName].list;
     },
+    hasNonEmptyMaterialName() {
+      return this.saleProductInfoList.some(item => item.productWeight !== '');
+    },
+
   },
   mounted() {
     this.initData();