doc/add.sql

@@ -63,3 +63,8 @@
alter table sales_ledger
    add payment_method varchar(255) null;


alter table payment_registration
    modify sale_ledger_id bigint default 0 null comment '销售台账id';



 src/main/java/com/ruoyi/device/controller/DeviceMaintenanceController.java

@@ -25,32 +25,39 @@
    @Autowired
    private IDeviceMaintenanceService deviceMaintenanceService;

    @ApiModelProperty("设备报修列表")
    @ApiModelProperty("设备保养列表")
    @GetMapping("/page")
    public AjaxResult page(Page page , DeviceMaintenanceDto deviceMaintenanceDto) {
        return AjaxResult.success(deviceMaintenanceService.queryPage(page,deviceMaintenanceDto));
    }

    @PostMapping()
    @ApiModelProperty("添加设备报修")
    @ApiModelProperty("添加设备保养")
    public AjaxResult add(@RequestBody DeviceMaintenance deviceRepair) {
        return deviceMaintenanceService.saveDeviceRepair(deviceRepair);
    }

    @ApiModelProperty("根据id查询设备报修")
    @ApiModelProperty("根据id查询设备保养")
    @GetMapping("/{id}")
    public AjaxResult detail(@PathVariable Long id) {
        return AjaxResult.success(deviceMaintenanceService.getById(id));
        return AjaxResult.success(deviceMaintenanceService.detailById(id));
    }

    @PutMapping ()
    @ApiModelProperty("修改设备报修")
    @ApiModelProperty("修改设备保养")
    public AjaxResult update(@RequestBody DeviceMaintenance deviceMaintenance) {
        return deviceMaintenanceService.updateDeviceRepair(deviceMaintenance);
    }

    @PostMapping ("maintenance")
    @ApiModelProperty("修改设备保养")
    public AjaxResult maintenance(@RequestBody DeviceMaintenance deviceMaintenance) {
        return deviceMaintenanceService.updateDeviceRepair(deviceMaintenance);
    }


    @DeleteMapping("/{id}")
    @ApiModelProperty("删除设备报修")
    @ApiModelProperty("删除设备保养")
    public AjaxResult delete(@PathVariable ArrayList<Long> ids) {
        boolean b = deviceMaintenanceService.removeBatchByIds(ids);
        if (!b) {
@@ -60,7 +67,7 @@
    }

    @PostMapping("export")
    @ApiModelProperty("导出设备报修")
    @ApiModelProperty("导出设备保养")
    public void export(HttpServletResponse response, Long[] ids) {
        deviceMaintenanceService.export(response, ids);
    }

 src/main/java/com/ruoyi/device/controller/DeviceRepairController.java

@@ -18,7 +18,7 @@
import java.util.Arrays;

@Api(tags = "设备报修管理")
@RequestMapping("/device/reppair")
@RequestMapping("/device/repair")
@RestController
public class DeviceRepairController {

@@ -40,7 +40,8 @@
    @ApiModelProperty("根据id查询设备报修")
    @GetMapping("/{id}")
    public AjaxResult detail(@PathVariable Long id) {
        return AjaxResult.success(deviceRepairService.getById(id));
        DeviceRepairDto byId = deviceRepairService.detailById(id);
        return AjaxResult.success(byId);
    }

    @PutMapping ()
@@ -49,6 +50,13 @@
        return deviceRepairService.updateDeviceRepair(deviceRepair);
    }

    @PostMapping ("repair")
    @ApiModelProperty("设备维修")
    public AjaxResult repair( @RequestBody DeviceRepair deviceRepair) {
        deviceRepair.setStatus(1);
        return deviceRepairService.updateDeviceRepair(deviceRepair);
    }

    @DeleteMapping("/{ids}")
    @ApiModelProperty("删除设备报修")
    public AjaxResult delete(@PathVariable("ids") Long[] ids) {

 src/main/java/com/ruoyi/device/dto/DeviceRepairDto.java

@@ -16,7 +16,7 @@
    private Long id;

    @ApiModelProperty("设备台账id")
    private String deviceLedgerId;
    private Long deviceLedgerId;

    @ApiModelProperty("设备名称")
    private String deviceName;

 src/main/java/com/ruoyi/device/mapper/DeviceMaintenanceMapper.java

@@ -13,4 +13,6 @@
public interface DeviceMaintenanceMapper extends BaseMapper<DeviceMaintenance> {

    IPage<DeviceMaintenanceDto> queryPage(Page page, DeviceMaintenanceDto deviceMaintenanceDto);

    DeviceMaintenanceDto detailById(Long id);
}

 src/main/java/com/ruoyi/device/mapper/DeviceRepairMapper.java

@@ -11,4 +11,6 @@
@Mapper
public interface DeviceRepairMapper extends BaseMapper<DeviceRepair> {
    IPage<DeviceRepairDto> queryPage(Page page, @Param("deviceRepairDto") DeviceRepairDto deviceRepairDto);

    DeviceRepairDto detailById(Long id);
}

 src/main/java/com/ruoyi/device/service/IDeviceMaintenanceService.java

@@ -19,4 +19,5 @@

    void export(HttpServletResponse response, Long[] ids);

    DeviceMaintenanceDto detailById(Long id);
}

 src/main/java/com/ruoyi/device/service/IDeviceRepairService.java

@@ -20,4 +20,5 @@

    void export(HttpServletResponse response, Long[] ids);

    DeviceRepairDto detailById(Long id);
}

 src/main/java/com/ruoyi/device/service/impl/DeviceMaintenanceServiceImpl.java

@@ -71,4 +71,10 @@
        ExcelUtil<DeviceMaintenanceExeclDto> util = new ExcelUtil<DeviceMaintenanceExeclDto>(DeviceMaintenanceExeclDto.class);
        util.exportExcel(response, deviceLedgerExeclDtos, "设备报修导出");
    }

    @Override
    public DeviceMaintenanceDto detailById(Long id) {

        return deviceMaintenanceMapper.detailById(id);
    }
}

 src/main/java/com/ruoyi/device/service/impl/DeviceRepairServiceImpl.java

@@ -87,4 +87,10 @@

    }

    @Override
    public DeviceRepairDto detailById(Long id) {

        return deviceRepairMapper.detailById(id);
    }

}

 src/main/java/com/ruoyi/purchase/dto/ProductRecordDto.java

@@ -23,11 +23,11 @@
    //供应商名称
    private String supplierName;
    //增值税
    private String invoiceAmount;
    private String invoiceAmount = "0";

    private String invoiceNumber;
    private String invoiceNumber = "0";

    private String unTicketsPrice;
    private String unTicketsPrice = "0";

    private List<CommonFile> commonFiles;
}

 src/main/java/com/ruoyi/purchase/service/impl/PaymentRegistrationServiceImpl.java

@@ -99,11 +99,12 @@
        PurchaseLedger purchaseLedger = purchaseLedgerMapper.selectById(paymentRegistration.getPurchaseLedgerId());
        SalesLedger salesLedger = salesLedgerMapper.selectOne(new QueryWrapper<SalesLedger>().
                eq("sales_contract_no", purchaseLedger.getSalesContractNo()));
        if (salesLedger == null) {
            throw new RuntimeException("关联销售合同号不存在");
//        if (salesLedger == null) {
//            throw new RuntimeException("关联销售合同号不存在");
//        }
        if (salesLedger != null) {
            paymentRegistration.setSaleLedgerId(salesLedger.getId());
        }

        paymentRegistration.setSaleLedgerId(salesLedger.getId());
        paymentRegistration.setSupplierId(purchaseLedger.getSupplierId());

        TicketRegistration tr = ticketRegistrationMapper.selectOne(new LambdaQueryWrapper<TicketRegistration>().eq(TicketRegistration::getId, paymentRegistration.getTicketRegistrationId()));

 src/main/java/com/ruoyi/purchase/service/impl/TicketRegistrationServiceImpl.java

@@ -133,6 +133,7 @@
        BeanUtils.copyProperties(ticketRegistrationDto, ticketRegistration);
        ticketRegistration.setPurchaseContractNumber(purchaseLedger.getPurchaseContractNumber());
        ticketRegistration.setTenantId(purchaseLedger.getTenantId());
        ticketRegistration.setIssueDate(ticketRegistrationDto.getIssueDate());
        ticketRegistration.setContractAmount(purchaseLedger.getContractAmount());
        ticketRegistration.setSalesLedgerId(purchaseLedger.getSalesLedgerId());


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

@@ -65,6 +65,7 @@
                if (salesLedger.getId().intValue() == invoiceLedgerDto.getSalesLedgerId()) {
                    BigDecimal noInvoiceAmountTotal = salesLedger.getContractAmount().subtract(invoiceLedgerDto.getInvoiceTotal());
                    salesLedger.setNoInvoiceAmountTotal(noInvoiceAmountTotal);

                }
            }
        }

 src/main/java/com/ruoyi/sales/dto/InvoiceLedgerDto.java

@@ -42,4 +42,6 @@

    @ApiModelProperty(value = "销售合同ID")
    private Integer salesLedgerId;

    private String paymentMethod;
}

 src/main/java/com/ruoyi/sales/dto/SalesLedgerDto.java

@@ -1,5 +1,6 @@
package com.ruoyi.sales.dto;

import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.sales.pojo.CommonFile;
import com.ruoyi.sales.pojo.SalesLedgerProduct;
@@ -24,6 +25,17 @@
    private String entryPerson;
    private String remarks;
    private String attachmentMaterials;

    @TableField(exist = false)
    @JsonFormat(pattern = "yyyy-MM-dd")
    private LocalDate issueDate;

    @TableField(exist = false)
    private String invoiceNo;
    @TableField(exist = false)
    private String createUser;


    private Boolean hasChildren = false;
    private List<SalesLedgerProduct> productData;
    private List<String> tempFileIds;

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

@@ -5,6 +5,7 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.sales.dto.InvoiceRegistrationDto;
import com.ruoyi.sales.dto.InvoiceRegistrationProductDto;
@@ -80,8 +81,12 @@
                salesLedgerProductMapper.updateById(productDatum);
                // 新增一条开票台账数据
                InvoiceLedger invoiceLedger = new InvoiceLedger();
                invoiceLedger.setInvoiceDate(salesLedgerDto.getIssueDate());
                invoiceLedger.setInvoiceRegistrationProductId(invoiceRegistrationProduct.getId());
                invoiceLedger.setInvoiceTotal(invoiceRegistrationProduct.getInvoiceAmount());
                invoiceLedger.setInvoiceNo(salesLedgerDto.getInvoiceNo());
                invoiceLedger.setCreateUser(SecurityUtils.getUserId().intValue());

                invoiceLedgerMapper.insert(invoiceLedger);
            }
        }

 src/main/resources/mapper/device/DeviceMaintenanceMapper.xml

@@ -20,5 +20,13 @@
            </if>
        </where>
    </select>
    <select id="detailById" resultType="com.ruoyi.device.dto.DeviceMaintenanceDto">
        select dm.*,
               dl.device_name,
               dl.device_model
        from device_maintenance dm
        left join device_ledger dl on dm.device_ledger_id = dl.id
        where dm.id = #{id}
    </select>

</mapper>

 src/main/resources/mapper/device/DeviceRepairMapper.xml

@@ -20,5 +20,13 @@
            </if>
        </where>
    </select>
    <select id="detailById" resultType="com.ruoyi.device.dto.DeviceRepairDto">
        select dr.*,
               dl.device_name,
               dl.device_model
        from device_repair dr
        left join device_ledger dl on dr.device_ledger_id = dl.id
        where dr.id = #{id}
    </select>

</mapper>

 src/main/resources/mapper/purchase/PurchaseLedgerMapper.xml

@@ -20,7 +20,8 @@
        sum(pr.tickets_amount)as receipt_payment_amount,
        pl.contract_amount-sum(pr.tickets_amount) AS unReceipt_payment_amount,
        pl.entry_date,
        pl.recorder_name
        pl.recorder_name,
        pl.payment_method
        from purchase_ledger pl
        left join product_record pr on pl.id = pr.purchase_ledger_id
        <where>

 src/main/resources/mapper/sales/SalesLedgerMapper.xml

@@ -30,6 +30,7 @@
            T1.contract_amount,
            T1.execution_date,
            T2.nick_name AS entry_person_name
            T1.payment_method
        FROM
            sales_ledger T1
        LEFT JOIN sys_user T2 ON T1.entry_person = T2.user_id
@@ -56,7 +57,8 @@
        T1.tenant_id,
        T1.contract_amount,
        T1.execution_date,
        T2.nick_name AS entry_person_name
        T2.nick_name AS entry_person_name,
        T1.payment_method
        FROM
        sales_ledger T1
        LEFT JOIN sys_user T2 ON T1.entry_person = T2.user_id

 src/main/resources/mapper/system/SysUserMapper.xml

@@ -94,7 +94,7 @@
    </select>
    
    <select id="selectAllocatedList" parameterType="com.ruoyi.project.system.domain.SysUser" resultMap="SysUserResult">
        select distinct u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.phonenumber, u.status, u.create_time
        select distinct u.user_id,  u.user_name, u.nick_name, u.email, u.phonenumber, u.status, u.create_time
        from sys_user u
             left join sys_user_role ur on u.user_id = ur.user_id
             left join sys_role r on r.role_id = ur.role_id
@@ -110,7 +110,7 @@
    </select>
    
    <select id="selectUnallocatedList" parameterType="com.ruoyi.project.system.domain.SysUser" resultMap="SysUserResult">
        select distinct u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.phonenumber, u.status, u.create_time
        select distinct u.user_id, u.user_name, u.nick_name, u.email, u.phonenumber, u.status, u.create_time
        from sys_user u
             left join sys_user_role ur on u.user_id = ur.user_id
             left join sys_role r on r.role_id = ur.role_id