Merge remote-tracking branch 'origin/dev_天津_阳光彩印' into dev_天津_阳光彩印

buhuazhen

2026-04-24 400169d87dee7a40802824875167a4dec4ef3bc0

Merge remote-tracking branch 'origin/dev_天津_阳光彩印' into dev_天津_阳光彩印

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

@@ -185,7 +185,7 @@
        salesLedgerService.exportProcessContract(id);
    }

    @GetMapping("/importSalsesLedger")
    @PostMapping("/importSalsesLedger")
    @ApiOperation("阳光导入销售台账新")
    public AjaxResult importSalsesLedger( MultipartFile file) {
        return salesLedgerService.importSalsesLedger(file);

 src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java

@@ -608,7 +608,7 @@
                    }
                    lastDate = date;
                    salesLedger.setEntryDate(date);
                    salesLedger.setContractAmount(importDto.getAmount());

                    salesLedger.setEntryPerson(loginUser.getUserId().toString());
                    salesLedger.setTenantId(matchedCustomer.getTenantId());
                    salesLedgerMapper.insert(salesLedger);
@@ -644,6 +644,8 @@
                        Long productModelId = productModelService.productModelAnticlockwise(productModelAnticlockwiseDto);
                        product.setProductModelId(productModelId);
                    }
                    salesLedger.setContractAmount(product.getTaxInclusiveTotalPrice());
                    salesLedgerMapper.updateById(salesLedger);

                    salesLedgerProductMapper.insert(product);
                    salesLedgerProductServiceImpl.addProductionData(product);

 src/main/resources/mapper/basic/ProductModelMapper.xml

@@ -9,7 +9,6 @@
        <result column="product_id" property="productId" />
        <result column="model" property="model" />
        <result column="unit" property="unit" />
        <result column="speculative_trading_name" property="speculativeTradingName" />
        <result column="tenant_id" property="tenantId" />
        <result column="product_name" property="productName" />
        <result column="product_id" property="productId" />

 src/main/resources/mapper/production/ProcessRouteItemMapper.xml

@@ -17,7 +17,6 @@
        select pri.*,
               pr.description ,
               pp.name as process_name,
               pm.speculative_trading_name,
               pm.product_id,
               pm.model,
               p.product_name,

 src/main/resources/mapper/production/SalesLedgerSchedulingMapper.xml

@@ -15,7 +15,6 @@
        T2.quantity,
        T2.product_category,
        T2.specification_model,
        T2.speculative_trading_name,
        T2.unit
        FROM
        sales_ledger_product T2
@@ -76,7 +75,6 @@
        T2.status,
        T2.scheduling_user_id,
        T2.scheduling_user_name,
        T2.speculative_trading_name,
        T2.scheduling_date,
        ifNull(T2.scheduling_num,0) AS schedulingNum,
        ifNull(T2.finished_num,0) AS successNum,

 src/main/resources/mapper/production/SalesLedgerWorkMapper.xml

@@ -23,7 +23,6 @@
        t3.product_category,
        t3.specification_model,
        t3.unit,
        t2.speculative_trading_name,
        t4.production_line
        FROM
        sales_ledger_work t4