应收明细一篮子BUG

zkqy-custom-business/src/main/java/com/zkqy/business/service/impl/SaleAccountsReceivableDetailServiceImpl.java

@@ -90,7 +90,7 @@ public class SaleAccountsReceivableDetailServiceImpl implements ISaleAccountsRec
                 Double amount = customer.getAmount();
                 for (SaleAccountsReceivableDetail detail : list) {
                     if (detail.getCustomerId().equals(customerId)) {
-                        amount += detail.getAmountReceivable();
+                        amount -= detail.getAmountReceivable();
                         detail.setAmounts(handlingWeight(amount));
                     }
                 }
@@ -199,7 +199,7 @@ public class SaleAccountsReceivableDetailServiceImpl implements ISaleAccountsRec
         //客户余额
         Double amount = customer.getAmount();
         //加后余额
-        Double subtractAmount = amount + saleAccountsReceivableDetail.getAmountReceivable();
+        Double subtractAmount = amount - saleAccountsReceivableDetail.getAmountReceivable();
         saleAccountsReceivableDetail.setAmounts(handlingWeight(subtractAmount));
         saleAccountsReceivableDetailMapper.updateSaleAccountsReceivableDetail(saleAccountsReceivableDetail);
 

zkqy-custom-business/src/main/java/com/zkqy/business/service/impl/SaleOrderServiceImpl.java

@@ -513,8 +513,8 @@ public class SaleOrderServiceImpl implements ISaleOrderService {
             if (item.getBatchNumber() == null || item.getBatchNumber() == 0) {
                 item.setCustomerId(customer.getId());
                 //加后余额
-                Double subtractAmount = amount + item.getAmountReceivable();
-                amount += item.getAmountReceivable();
+                Double subtractAmount = amount - item.getAmountReceivable();
+                amount -= item.getAmountReceivable();
                 item.setAmounts(handlingWeight(subtractAmount));
                 item.setBatchNumber(batchNumber);
                 item.setCreateBy(SecurityUtils.getUsername());

zkqy-custom-business/src/main/java/com/zkqy/business/service/impl/SaleRegistrationCollectionServiceImpl.java

@@ -182,8 +182,8 @@ public class SaleRegistrationCollectionServiceImpl implements ISaleRegistrationC
         } else {
             // 添加应收明细
             SaleAccountsReceivableDetail saleAccountsReceivableDetail = new SaleAccountsReceivableDetail();
-            //减后余额
-            Double addedBalance = amount - saleRegistrationCollection.getAmounts();
+            //加后余额
+            Double addedBalance = amount + saleRegistrationCollection.getAmounts();
             saleAccountsReceivableDetail.setAccountingType("2");// 账务类型  收款
             saleAccountsReceivableDetail.setReceivedAmount(saleRegistrationCollection.getAmounts());//已收金额
             saleAccountsReceivableDetail.setAmounts(handlingWeight(addedBalance));//余额

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

@@ -430,7 +430,8 @@
               group by por.product_id, por.levels, por.lot_num, por.product_colour, por.batch_number) as a
                  left join (select sp.product_no                                      as productNo,        -- 产品编号
                                    sp.product_unit_price                              as productUnitPrice, -- 产品单价
-                                   CONCAT(m.materie_encoding, m.materie_color_number) as productColour     -- 产品转码+色泽
+                                   CONCAT(m.materie_encoding, m.materie_color_number) as productColour,     -- 产品转码+色泽
+                                   sp.`level` as `level`
                             from `huaxian`.sale_order so -- 订单表
                                      left join `huaxian`.sale_products sp
                                                on so.sale_no = sp.sale_order_no and sp.del_flag = '0' -- 销售产品表
@@ -440,7 +441,7 @@
                                                on m.materiel_code = sp.colour_number and m.del_flag = '0' -- 物料信息表
                             where so.del_flag = '0'
                               and so.sale_no = #{saleNo}) as b -- 根据销售单编号得到当前订单包含的所有产品
-                           on a.productNo = b.productNo and a.productColour = b.productColour;
+                           on a.productNo = b.productNo AND a.productLevel = b.`level` and a.productColour = b.productColour;
     </select>
 
     <select id="printOutsourceOrderListNowEnd" resultType="com.zkqy.business.domain.vo.SaleProductsVo">

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

@@ -490,7 +490,7 @@
                   r.product_colour,
                   r.levels) AS a
                  LEFT JOIN {DBNAME}.sale_products sp
-        ON sp.sale_order_no = a.sale_order_no
+        ON sp.sale_order_no = a.sale_order_no  AND sp.`level` = a.levels
             AND sp.product_no = a.productCode and sp.del_flag = '0'
 
     </select>
@@ -527,7 +527,7 @@
                   r.product_colour,
                   r.levels) AS a
                  LEFT JOIN {DBNAME}.sale_products sp
-        ON sp.sale_order_no = a.sale_order_no
+        ON sp.sale_order_no = a.sale_order_no  AND sp.`level` = a.levels
             AND sp.product_no = a.productCode and sp.del_flag = '0'
 
     </select>

zkqy-ui/src/views/system/financialManage/waitDetailsReview.vue

@@ -476,7 +476,6 @@ export default {
   methods: {
     // 审核通过回调
     passHandler(row) {
-      console.log(row);
       this.$confirm("是否通过该条数据的审批", "提示", {
         confirmButtonText: "通过",
         cancelButtonText: "取消",
@@ -542,7 +541,6 @@ export default {
     /** 查询应收账明细列表 */
     getList() {
       this.loading = true;
-      console.log("getList", this.queryParams);
       SaleAccountsReceivableDetailList(this.queryParams).then((response) => {
         this.SaleAccountsReceivableDetailList = response.rows;
         this.total = response.total;