src/main/java/com/ruoyi/procurementrecord/controller/ProcurementRecordController.java
@@ -35,6 +35,18 @@ private ProcurementRecordService procurementRecordService; /** * 通过销售产品id获取入库数量 * @param salesProductId * @return */ @GetMapping("/getProcurementAmount") @ApiOperation(value = "通过销售产品id获取入库数量") public AjaxResult getProcurementAmount(@RequestParam("salesProductId") Long salesProductId) { return AjaxResult.success(procurementRecordService.getProcurementAmount(salesProductId)); } @GetMapping("/productlist") @Log(title = "采购入库-入库管理-新增入库查询", businessType = BusinessType.OTHER) public AjaxResult list(ProcurementDto procurementDto) { src/main/java/com/ruoyi/procurementrecord/dto/ProcurementRecordOutPageDto.java
@@ -6,6 +6,7 @@ import java.math.BigDecimal; import java.time.LocalDateTime; import java.util.Date; /** * @author :yys src/main/java/com/ruoyi/procurementrecord/pojo/CustomStorage.java
@@ -29,6 +29,12 @@ @Excel(name = "入库时间", width = 30, dateFormat = "yyyy-MM-dd") private Date inboundDate; /** * 编号 */ @Excel(name = "编号") private String code; @TableField(exist = false) private String timeStr;
@@ -9,6 +9,7 @@ import com.ruoyi.procurementrecord.pojo.ProcurementRecordStorage; import javax.servlet.http.HttpServletResponse; import java.math.BigDecimal; import java.util.List; import java.util.Map; @@ -54,4 +55,6 @@ AjaxResult deleteCustom(List<Long> ids); int updateManagementByCustom(ProcurementManagementUpdateDto procurementDto); BigDecimal getProcurementAmount(Long salesProductId); } src/main/java/com/ruoyi/procurementrecord/service/impl/ProcurementRecordServiceImpl.java
@@ -4,6 +4,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.OrderUtils; import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.framework.security.LoginUser; @@ -467,6 +468,7 @@ Long aLong = customStorageMapper.selectCount(null); item.setInboundBatches(aLong.equals(0L) ? "第1批次(自定义入库)" : "第"+ (aLong + 1) + "批次(自定义入库)" ); item.setCreateBy(loginUser.getNickName()); item.setCode(OrderUtils.countTodayByCreateTime(customStorageMapper, "")); customStorageMapper.insert(item); }); return AjaxResult.success("自定义入库成功"); @@ -662,6 +664,20 @@ } @Override public BigDecimal getProcurementAmount(Long salesProductId) { LambdaQueryWrapper<ProcurementRecordStorage> procurementRecordStorageLambdaQueryWrapper = new LambdaQueryWrapper<>(); procurementRecordStorageLambdaQueryWrapper.eq(ProcurementRecordStorage::getSalesLedgerProductId, salesProductId) .eq(ProcurementRecordStorage::getType, 2); List<ProcurementRecordStorage> procurementRecordStorages = procurementRecordMapper.selectList(procurementRecordStorageLambdaQueryWrapper); if(CollectionUtils.isEmpty( procurementRecordStorages)){ return BigDecimal.ZERO; } return procurementRecordStorages.stream() .map(ProcurementRecordStorage::getInboundNum) .reduce(BigDecimal.ZERO, BigDecimal::add); } @Override public int add(ProcurementAddDto procurementDto) { LoginUser loginUser = SecurityUtils.getLoginUser(); // 批量新增 src/main/java/com/ruoyi/production/dto/SalesLedgerSchedulingDto.java
@@ -125,6 +125,9 @@ @Excel(name = "状态") private String status; @Excel(name = "进度") private BigDecimal progress; @ApiModelProperty(value = "租户ID") private Long tenantId;
@@ -85,12 +85,14 @@ // 状态 = 数量和完工数量比较 if(i.getSchedulingNum().compareTo(new BigDecimal(0)) == 0){ i.setStatus("未完成"); i.setStatus("未开始"); } else if(i.getQuantity().compareTo(i.getSchedulingNum()) <= 0){ i.setStatus("已完成"); }else{ i.setStatus("生产中"); } // 进度保留两位小数 i.setProgress(i.getSchedulingNum().divide(i.getQuantity(),4,RoundingMode.CEILING).multiply(new BigDecimal(100))); }); return list; src/main/java/com/ruoyi/sales/pojo/SalesLedger.java
@@ -48,6 +48,14 @@ private String shippingCarNumber; /** * 发货日期 */ @Excel(name = "发货日期", width = 30, dateFormat = "yyyy-MM-dd") @TableField(exist = false) @JsonFormat(pattern = "yyyy-MM-dd") private Date shippingDate; /** * 项目名称 */ @Excel(name = "项目名称") src/main/resources/mapper/procurementrecord/ProcurementRecordOutMapper.xml
@@ -142,7 +142,6 @@ t2.supplier_name, t2.product_category, t1.id, t1.code, t2.specification_model, t2.unit, t2.tax_rate, @@ -152,7 +151,8 @@ t1.inbound_num, t1.create_time, t1.create_by, t2.item_type t2.item_type, t2.code from procurement_record_out t1 left join custom_storage t2 on t2.id = t1.procurement_record_storage_id <where> src/main/resources/mapper/sales/SalesLedgerMapper.xml
@@ -59,7 +59,8 @@ T1.execution_date, T2.nick_name AS entry_person_name, T1.payment_method, t3.shipping_car_number t3.shipping_car_number, t3.shipping_date FROM sales_ledger T1 LEFT JOIN sys_user T2 ON T1.entry_person = T2.user_id
