财务对账单

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

@@ -292,10 +292,11 @@
         so.sale_custom_no = c.custom_no and c.del_flag = '0'
         left join {DBNAME}.product_invoice pi on pi.sale_order_no = so.sale_no and pi.del_flag = '0'
         where so.del_flag = '0'
-        and so.status = 6
+        and so.status >= 3
         <if test="saleNo != null  and saleNo != ''">and so.sale_no = #{saleNo}</if>
         <if test="customerId != null  and customerId != ''">and c.id = #{customerId}</if>
         <if test="saleDate != null ">and so.sale_date = #{saleDate}</if>
+
         <if test="orderType == 'contractOrder'">
             and so.sale_order_technology_no != 'retailOrder'
         </if>

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

@@ -433,7 +433,7 @@
             LEFT JOIN {DBNAME}.product_invoice pi ON r.notice_number = pi.notice_number
             AND pi.del_flag = '0'
             LEFT JOIN {DBNAME}.customer c ON pi.customer_id = c.id
-            left join {DBNAME}.sale_products sp on p.product_no = sp.product_no and pi.sale_order_no = sp.sale_order_no and sp.del_flag = '0'
+            left join {DBNAME}.sale_products sp on p.product_no = sp.product_no AND r.product_colour = sp.colours and pi.sale_order_no = sp.sale_order_no and sp.del_flag = '0'
         where r.del_flag = '0' and r.notice_number = #{noticeNumber}
         group by r.product_id, r.product_colour, r.levels, r.lot_num
     </select>

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

@@ -220,16 +220,16 @@
                   打印对账单
                 </el-button>
               </el-dropdown-item>
-              <el-dropdown-item>
-                <el-button
-                  type="text"
-                  size="mini"
-                  @click="handleDetail(scope.$index, scope.row)"
-                  v-hasPermi="['system:ProductInvoice:export']"
-                >
-                  详情
-                </el-button>
-              </el-dropdown-item>
+<!--              <el-dropdown-item>-->
+<!--                <el-button-->
+<!--                  type="text"-->
+<!--                  size="mini"-->
+<!--                  @click="handleDetail(scope.$index, scope.row)"-->
+<!--                  v-hasPermi="['system:ProductInvoice:export']"-->
+<!--                >-->
+<!--                  详情-->
+<!--                </el-button>-->
+<!--              </el-dropdown-item>-->
             </el-dropdown-menu>
           </el-dropdown>
         </template>