src/main/java/com/ruoyi/procurementrecord/dto/ProcurementRecordOutPageDto.java
@@ -47,7 +47,7 @@ * 出入库时间 */ // @Excel(name = "出库时间") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") private LocalDateTime createTime; private String timeStr; src/main/java/com/ruoyi/procurementrecord/pojo/CustomStorage.java
@@ -92,8 +92,8 @@ * 入库时间 */ @TableField(fill = FieldFill.INSERT) @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @DateTimeFormat(pattern = "yyyy-MM-dd") private LocalDateTime createTime; /** src/main/java/com/ruoyi/production/dto/SalesLedgerWorkDto.java
@@ -65,6 +65,14 @@ @ApiModelProperty(value = "工序") @Excel(name = "工序") private String process; /** * 产线 */ @ApiModelProperty(value = "产线") @Excel(name = "产线") private String productionLine; /** * 排产日期 */ src/main/java/com/ruoyi/purchase/controller/TicketRegistrationController.java
@@ -26,6 +26,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.core.parameters.P; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; @@ -127,8 +128,13 @@ */ @Log(title = "来票登记", businessType = BusinessType.INSERT) @PostMapping("/addOrUpdateRegistration") public AjaxResult addOrUpdateRegistration(@RequestBody TicketRegistrationDto ticketRegistrationDto) throws IOException { return toAjax(ticketRegistrationService.addOrUpdateRegistration(ticketRegistrationDto)); @Transactional(rollbackFor = Exception.class) public AjaxResult addOrUpdateRegistration(@RequestBody List<TicketRegistrationDto> ticketRegistrationDto) throws IOException { if(CollectionUtils.isEmpty(ticketRegistrationDto)) return AjaxResult.error("请选择要保存的记录"); for (TicketRegistrationDto ticketRegistrationDto1 : ticketRegistrationDto) { ticketRegistrationService.addOrUpdateRegistration(ticketRegistrationDto1); } return toAjax(1); }
@@ -31,7 +31,7 @@ //增值税 private String invoiceAmount = "0"; private String invoiceNumber = "0"; private String invoiceNumber; private String unTicketsPrice = "0";
@@ -10,8 +10,10 @@ import com.ruoyi.purchase.dto.TicketRegistrationDto; import com.ruoyi.purchase.mapper.ProductRecordMapper; import com.ruoyi.purchase.mapper.PurchaseLedgerMapper; import com.ruoyi.purchase.mapper.TicketRegistrationMapper; import com.ruoyi.purchase.pojo.ProductRecord; import com.ruoyi.purchase.pojo.PurchaseLedger; import com.ruoyi.purchase.pojo.TicketRegistration; import com.ruoyi.purchase.service.IProductRecordService; import com.ruoyi.sales.mapper.CommonFileMapper; import com.ruoyi.sales.mapper.SalesLedgerProductMapper; @@ -70,6 +72,8 @@ return productRecordDtoIPage; } private final TicketRegistrationMapper ticketRegistrationMapper; @Override public AjaxResult updateRecord(ProductRecordDto productRecordDto) { SalesLedgerProduct salesLedgerProduct = salesLedgerProductMapper.selectById(productRecordDto.getSaleLedgerProjectId()); @@ -88,7 +92,12 @@ BeanUtils.copyProperties(productRecordDto,productRecord); productRecord.setFutureTicketsAmount(productRecord.getFutureTickets().multiply(productRecord.getTaxInclusiveUnitPrice())); productRecordMapper.updateById(productRecord); // 修改发票号 TicketRegistration ticketRegistration = ticketRegistrationMapper.selectById(productRecord.getTicketRegistrationId()); if(ticketRegistration != null){ ticketRegistration.setInvoiceNumber(productRecordDto.getInvoiceNumber()); ticketRegistrationMapper.updateById(ticketRegistration); } return AjaxResult.success("修改成功"); }
@@ -1,12 +1,15 @@ package com.ruoyi.sales.controller; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ruoyi.framework.aspectj.lang.annotation.Log; import com.ruoyi.framework.web.domain.AjaxResult; import com.ruoyi.sales.dto.InvoiceRegistrationDto; import com.ruoyi.sales.dto.InvoiceRegistrationProductDto; import com.ruoyi.sales.dto.SalesLedgerDto; import com.ruoyi.sales.service.InvoiceRegistrationService; import io.jsonwebtoken.lang.Collections; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletResponse; @@ -25,8 +28,14 @@ * @return */ @PostMapping("/save") public AjaxResult invoiceRegistrationSave(@RequestBody SalesLedgerDto salesLedgerDto) { invoiceRegistrationService.invoiceRegistrationSave(salesLedgerDto); @Log(title = "开票登记", businessType = com.ruoyi.framework.aspectj.lang.enums.BusinessType.INSERT) @Transactional(rollbackFor = Exception.class) public AjaxResult invoiceRegistrationSave(@RequestBody List<SalesLedgerDto> salesLedgerDto) { if(Collections.isEmpty(salesLedgerDto)) return AjaxResult.error("请选择要保存的记录"); salesLedgerDto.forEach(item ->{ invoiceRegistrationService.invoiceRegistrationSave(item); }); return AjaxResult.success(); }
@@ -46,7 +46,7 @@ private List<String> tempFileIds; private List<CommonFile> SalesLedgerFiles; private Integer Type; private Integer type; @ApiModelProperty(value = "签订日期") private LocalDate executionDate;
@@ -26,7 +26,7 @@ dl.un_tax_including_price_total, dl.create_time, dl.update_time , su.user_name AS createUser, su.nick_name AS createUser, dl.update_user, dl.tenant_id FROM device_ledger dl src/main/resources/mapper/procurementrecord/ProcurementRecordOutMapper.xml
@@ -30,6 +30,7 @@ and t1.create_time like concat('%',#{req.timeStr},'%') </if> </where> order by t1.create_time desc </select> <select id="list" resultType="com.ruoyi.procurementrecord.dto.ProcurementRecordOutPageDto"> select @@ -122,6 +123,7 @@ and t1.create_time like concat('%',#{req.timeStr},'%') </if> </where> order by t1.create_time desc </select> <select id="listPageByCustom" resultType="com.ruoyi.procurementrecord.dto.ProcurementRecordOutPageDto"> select @@ -149,5 +151,6 @@ and t1.create_time like concat('%',#{req.timeStr},'%') </if> </where> order by t1.create_time desc </select> </mapper> src/main/resources/mapper/production/SalesLedgerWorkMapper.xml
@@ -23,7 +23,8 @@ t3.product_category, t3.specification_model, t3.unit, t2.speculative_trading_name t2.speculative_trading_name, t4.production_line FROM sales_ledger_work t4 LEFT JOIN sales_ledger T1 ON T1.id = t4.sales_ledger_id
