Merge branch 'jtwy' of http://114.132.189.42:9002/r/product-inventory-manag...

liyong

8 天以前 a08dce3de307ce138396db5fe7274ead2ef5c573

Merge branch 'jtwy' of http://114.132.189.42:9002/r/product-inventory-management-after into sqd-hb

 src/main/java/com/ruoyi/procurementrecord/dto/ProcurementRecordOutPageDto.java

@@ -30,6 +30,10 @@
     * 客户合同号
     */
    private String customerContractNo;
    /**
     * 采购合同号
     */
    private String purchaseContractNumber;

    /**
     * 客户名称

 src/main/java/com/ruoyi/sales/controller/SalesLedgerProductController.java

@@ -67,7 +67,7 @@
//                ProcurementPageDtoCopy procurementDtoCopy = result.getRecords().get(0);
                if (item.getQuantity().compareTo(stockQuantity) <= 0 && item.getApproveStatus() == 0) {
                    item.setApproveStatus(1);
                    salesLedgerProductService.addOrUpdateSalesLedgerProduct(item);
                    salesLedgerProductService.updateById(item);
                }
            }
        });

 src/main/resources/mapper/procurementrecord/ProcurementRecordOutMapper.xml

@@ -6,6 +6,7 @@
        select
        t3.supplier_name,
        t2.product_category,
        t3.purchase_contract_number,
        t1.id,
        t1.code,
        t2.specification_model,