lcj/xinnengyuan
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

材料

Browse Source
This commit is contained in:
罗成
2025-08-06 20:22:09 +08:00
parent 7b9e3a52f0
commit ede1b40039
15 changed files with 122 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/controller/BusMaterialbatchdemandplanController.java
View File

@ -67,7 +67,7 @@ public class BusMaterialbatchdemandplanController extends BaseController {
@GetMapping("/pcList")
public TableDataInfo<BusCailiaoshebeiPiciVo> pcList(BusCailiaoshebeiPiciPcListReq bo, PageQuery pageQuery) {
BusCailiaoshebeiPiciBo busCailiaoshebeiPiciBo = BeanUtil.copyProperties(bo, BusCailiaoshebeiPiciBo.class);
busCailiaoshebeiPiciBo.setBatchType("2 ");
busCailiaoshebeiPiciBo.setBatchType("2");
return busCailiaoshebeiPiciService.queryPageList(busCailiaoshebeiPiciBo, pageQuery);
}
@ -104,14 +104,14 @@ public class BusMaterialbatchdemandplanController extends BaseController {
return toAjax(busMaterialbatchdemandplanService.add(bo));
}
// /**
// * 查询物资-批次需求计划列表
// */
// @SaCheckPermission("cailiaoshebei:materialbatchdemandplan:list")
// @GetMapping("/list")
// public TableDataInfo<BusMaterialbatchdemandplanVo> list(BusMaterialbatchdemandplanBo bo, PageQuery pageQuery) {
// return busMaterialbatchdemandplanService.queryPageList(bo, pageQuery);
// }
/**
* 查询物资-批次需求计划列表
*/
@SaCheckPermission("cailiaoshebei:materialbatchdemandplan:list")
@GetMapping("/list")
public TableDataInfo<BusMaterialbatchdemandplanVo> list(BusMaterialbatchdemandplanBo bo, PageQuery pageQuery) {
return busMaterialbatchdemandplanService.queryPageList(bo, pageQuery);
}
//
// /**
// * 导出物资-批次需求计划列表

12
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/controller/BusMaterialsorderController.java
View File

@ -44,6 +44,18 @@ public class BusMaterialsorderController extends BaseController {
//================================订货================================
/**
* 测试
*/
@SaCheckPermission("cailiaoshebei:materialsorder:cs")
@Log(title = "测试", businessType = BusinessType.UPDATE)
@RepeatSubmit()
@PutMapping("/cs")
public R<Void> cs(@Validated(EditGroup.class) @RequestBody MaterialsorderPcPlanEditReq req) {
busMaterialsorderService.extractDataNewAddition(req.getCbatchNumber(),req.getCprojectId() );
return toAjax(true);
}
/**
* 订货-批次号列表

16
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/domain/BusMaterialsorder.java
View File

@ -4,6 +4,8 @@ import org.dromara.common.mybatis.core.domain.BaseEntity;
import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.time.LocalDate;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
@ -77,7 +79,7 @@ public class BusMaterialsorder extends BaseEntity {
/**
* 计划到场时间
*/
private Date arrivalTime;
private LocalDate arrivalTime;
/**
* 订货数量
@ -87,12 +89,12 @@ public class BusMaterialsorder extends BaseEntity {
/**
* 预计到货时间
*/
private Date expectedArrival;
private LocalDate expectedArrival;
/**
* 预计生产完成时间
*/
private Date productionTime;
private LocalDate productionTime;
/**
* 备注
@ -107,22 +109,22 @@ public class BusMaterialsorder extends BaseEntity {
/**
* 实际到货时间
*/
private Date actualArrival;
private LocalDate actualArrival;
/**
* 需求提交时间
*/
private Date requiredTime;
private LocalDate requiredTime;
/**
* 订货时间
*/
private Date orderTime;
private LocalDate orderTime;
/**
* 验收时间
*/
private Date receptionTime;
private LocalDate receptionTime;
/**
* 物资执行状态(字典)

4
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/domain/bo/BusMaterialbatchdemandplanBo.java
View File

@ -8,6 +8,8 @@ import io.github.linpeilie.annotations.AutoMapper;
import lombok.Data;
import lombok.EqualsAndHashCode;
import jakarta.validation.constraints.*;
import java.time.LocalDate;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
@ -86,7 +88,7 @@ public class BusMaterialbatchdemandplanBo extends BaseEntity {
/**
* 计划到场时间
*/
private Date arrivalTime;
private LocalDate arrivalTime;
/**
* 备注

8
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/domain/bo/BusMaterialsorderBo.java
View File

@ -8,6 +8,8 @@ import io.github.linpeilie.annotations.AutoMapper;
import lombok.Data;
import lombok.EqualsAndHashCode;
import jakarta.validation.constraints.*;
import java.time.LocalDate;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
@ -76,7 +78,7 @@ public class BusMaterialsorderBo extends BaseEntity {
/**
* 计划到场时间
*/
private Date arrivalTime;
private LocalDate arrivalTime;
/**
* 订货数量
@ -86,12 +88,12 @@ public class BusMaterialsorderBo extends BaseEntity {
/**
* 预计到货时间
*/
private Date expectedArrival;
private LocalDate expectedArrival;
/**
* 预计生产完成时间
*/
private Date productionTime;
private LocalDate productionTime;
/**
* 备注

2
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/domain/bo/MasterDataListReq.java
View File

@ -21,7 +21,7 @@ public class MasterDataListReq implements Serializable {
private Long projectId;
/**
* 批次ID
* 批次号
*/
private String batchNumber;

14
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/domain/bo/MaterialsorderPcPlanEditReq.java
View File

@ -7,6 +7,7 @@ import org.dromara.cailiaoshebei.domain.BusMaterialsorder;
import org.dromara.common.core.validate.EditGroup;
import java.io.Serializable;
import java.time.LocalDate;
import java.util.Date;
import java.util.List;
@ -31,7 +32,7 @@ public class MaterialsorderPcPlanEditReq implements Serializable {
/**
* 订货-采购时间
*/
private Date purchasingPeriod;
private LocalDate purchasingPeriod;
/**
* 订货-合同号
*/
@ -47,4 +48,15 @@ public class MaterialsorderPcPlanEditReq implements Serializable {
private List<BusMaterialsorder> list;
/**
* 不管
*/
private Long cprojectId;
/**
* 不管
*/
private String cbatchNumber;
}

7
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/domain/dto/BusCailiaoshebeiEditPlanDto.java
View File

@ -1,12 +1,17 @@
package org.dromara.cailiaoshebei.domain.dto;
import lombok.Data;
import java.io.Serializable;
import java.math.BigDecimal;
/**
* @Author 铁憨憨
* @Date 2025/7/31 18:26
* @Version 1.0
*/
@Data
public class BusCailiaoshebeiEditPlanDto implements Serializable {
/**
* 材料设备ID
@ -16,7 +21,7 @@ public class BusCailiaoshebeiEditPlanDto implements Serializable {
/**
* 单价
*/
private Long unitPrice;
private BigDecimal unitPrice;
/**
* 合同号

3
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/domain/vo/BusMaterialbatchdemandplanVo.java
View File

@ -1,5 +1,6 @@
package org.dromara.cailiaoshebei.domain.vo;
import java.time.LocalDate;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.dromara.cailiaoshebei.domain.BusMaterialbatchdemandplan;
@ -106,7 +107,7 @@ public class BusMaterialbatchdemandplanVo implements Serializable {
* 计划到场时间
*/
@ExcelProperty(value = "计划到场时间")
private Date arrivalTime;
private LocalDate arrivalTime;
/**
* 备注

7
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/domain/vo/BusMaterialsorderVo.java
View File

@ -1,5 +1,6 @@
package org.dromara.cailiaoshebei.domain.vo;
import java.time.LocalDate;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.dromara.cailiaoshebei.domain.BusMaterialsorder;
@ -94,7 +95,7 @@ public class BusMaterialsorderVo implements Serializable {
* 计划到场时间
*/
@ExcelProperty(value = "计划到场时间")
private Date arrivalTime;
private LocalDate arrivalTime;
/**
* 订货数量
@ -106,13 +107,13 @@ public class BusMaterialsorderVo implements Serializable {
* 预计到货时间
*/
@ExcelProperty(value = "预计到货时间")
private Date expectedArrival;
private LocalDate expectedArrival;
/**
* 预计生产完成时间
*/
@ExcelProperty(value = "预计生产完成时间")
private Date productionTime;
private LocalDate productionTime;
/**
* 备注

2
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/domain/vo/BusSuppliespriceAddPlanSonRes.java
View File

@ -116,5 +116,5 @@ public class BusSuppliespriceAddPlanSonRes implements Serializable {
/**
* 材料设备ID
*/
private List<BusSuppliesprice> addPlanSonList;
private List<BusSuppliesprice> listOfMaterialInventory;
}

2
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/mapper/BusCailiaoshebeiMapper.java
View File

@ -18,5 +18,5 @@ import java.util.List;
* @date 2025-07-31
*/
public interface BusCailiaoshebeiMapper extends BaseMapperPlus<BusCailiaoshebei, BusCailiaoshebeiVo> {
Page<MasterDataListRes> masterDataList(@Param("bo") MasterDataListReq bo,@Param("ew") PageQuery pageQuery);
Page<MasterDataListRes> masterDataList(@Param("bo") MasterDataListReq bo,@Param("page") Page<MasterDataListReq> page);
}

54
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/service/impl/BusCailiaoshebeiServiceImpl.java
View File

@ -1,7 +1,10 @@
package org.dromara.cailiaoshebei.service.impl;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.convert.Convert;
import cn.hutool.core.util.ObjectUtil;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import lombok.extern.slf4j.Slf4j;
import org.dromara.cailiaoshebei.domain.BusSuppliesprice;
import org.dromara.cailiaoshebei.domain.bo.*;
import org.dromara.cailiaoshebei.domain.dto.BusCailiaoshebeiEditPlanDto;
@ -10,6 +13,10 @@ import org.dromara.cailiaoshebei.domain.vo.BusSuppliespriceAddPlanSonRes;
import org.dromara.cailiaoshebei.domain.vo.MasterDataListRes;
import org.dromara.cailiaoshebei.service.IBusRepertoryService;
import org.dromara.cailiaoshebei.service.IBusSuppliespriceService;
import org.dromara.common.core.domain.event.ProcessDeleteEvent;
import org.dromara.common.core.domain.event.ProcessEvent;
import org.dromara.common.core.domain.event.ProcessTaskEvent;
import org.dromara.common.core.enums.BusinessStatusEnum;
import org.dromara.common.core.utils.MapstructUtils;
import org.dromara.common.core.utils.StringUtils;
import org.dromara.common.mybatis.core.page.TableDataInfo;
@ -18,7 +25,11 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import lombok.RequiredArgsConstructor;
import org.dromara.common.oss.core.OssClient;
import org.dromara.common.oss.factory.OssFactory;
import org.dromara.common.utils.BatchNumberGenerator;
import org.dromara.design.domain.DesTechnicalStandard;
import org.springframework.context.event.EventListener;
import org.springframework.stereotype.Service;
import org.dromara.cailiaoshebei.domain.vo.BusCailiaoshebeiVo;
import org.dromara.cailiaoshebei.domain.BusCailiaoshebei;
@ -37,6 +48,7 @@ import java.util.concurrent.atomic.AtomicInteger;
*/
@RequiredArgsConstructor
@Service
@Slf4j
public class BusCailiaoshebeiServiceImpl extends ServiceImpl<BusCailiaoshebeiMapper, BusCailiaoshebei> implements IBusCailiaoshebeiService {
private final BusCailiaoshebeiMapper baseMapper;
@ -183,7 +195,7 @@ public class BusCailiaoshebeiServiceImpl extends ServiceImpl<BusCailiaoshebeiMap
new LambdaQueryWrapper<BusSuppliesprice>()
.eq(BusSuppliesprice::getCailiaoshebeiId, id)
);
res.setAddPlanSonList(list);
res.setListOfMaterialInventory(list);
//3、获取到实际数量
AtomicInteger num = new AtomicInteger();
list.forEach(
@ -197,7 +209,7 @@ public class BusCailiaoshebeiServiceImpl extends ServiceImpl<BusCailiaoshebeiMap
@Override
public TableDataInfo<MasterDataListRes> masterDataList(MasterDataListReq bo, PageQuery pageQuery) {
Page<MasterDataListRes> masterDataListResPage = baseMapper.masterDataList(bo, pageQuery);
Page<MasterDataListRes> masterDataListResPage = baseMapper.masterDataList(bo, pageQuery.build());
return TableDataInfo.build(masterDataListResPage);
}
@ -245,9 +257,45 @@ public class BusCailiaoshebeiServiceImpl extends ServiceImpl<BusCailiaoshebeiMap
return TableDataInfo.build(convertedPage);
}
/**
* 总体流程监听(例如: 草稿，撤销，退回，作废，终止，已完成，单任务完成等)
* 正常使用只需#processEvent.flowCode=='leave1'
* 示例为了方便则使用startsWith匹配了全部示例key
*
* @param processEvent 参数
*/
@org.springframework.context.event.EventListener(condition = "#processEvent.flowCode.endsWith('technical')")
public void processHandler(ProcessEvent processEvent) {
log.info("技术标准文件审核任务执行了{}", processEvent.toString());
//1、根据批次号改编审核状态
}
/**
* 执行任务创建监听
* 示例：也可通过 @EventListener(condition = "#processTaskEvent.flowCode=='leave1'")进行判断
* 在方法中判断流程节点key
* if ("xxx".equals(processTaskEvent.getNodeCode())) {
* //执行业务逻辑
* }
*
* @param processTaskEvent 参数
*/
@org.springframework.context.event.EventListener(condition = "#processTaskEvent.flowCode.endsWith('technical')")
public void processTaskHandler(ProcessTaskEvent processTaskEvent) {
log.info("技术标准文件审核任务创建了{}", processTaskEvent.toString());
}
/**
* 监听删除流程事件
* 正常使用只需#processDeleteEvent.flowCode=='leave1'
* 示例为了方便则使用startsWith匹配了全部示例key
*
* @param processDeleteEvent 参数
*/
@EventListener(condition = "#processDeleteEvent.flowCode.endsWith('technical')")
public void processDeleteHandler(ProcessDeleteEvent processDeleteEvent) {
log.info("监听删除流程事件，技术标准文件审核任务执行了{}", processDeleteEvent.toString());
}
}

5
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/service/impl/BusMaterialbatchdemandplanServiceImpl.java
View File

@ -149,10 +149,7 @@ public class BusMaterialbatchdemandplanServiceImpl extends ServiceImpl<BusMateri
//1、删除数据
LambdaQueryWrapper<BusMaterialbatchdemandplan> eq = new LambdaQueryWrapper<BusMaterialbatchdemandplan>()
.eq(BusMaterialbatchdemandplan::getBatchNumber, bo.getBatchNumber());
int delete = baseMapper.delete(eq);
if (delete != 1) {
throw new RuntimeException("删除失败");
}
baseMapper.delete(eq);
//2、新增数据
List<BusMaterialbatchdemandplan> ts = BeanUtil.copyToList(bo.getAddDataList(), BusMaterialbatchdemandplan.class);
boolean b = baseMapper.insertBatch(ts);

9
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/resources/mapper/cailiaoshebei/BusCailiaoshebeiMapper.xml
View File

@ -6,7 +6,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="masterDataList" resultType="org.dromara.cailiaoshebei.domain.vo.MasterDataListRes">
select
bc.batch_id as batchId,
bc.batch_number as batchNumber,
bc.project_id as projectId,
bc.supplier_id as supplierId,
bc.supplier as supplier,
@ -16,7 +16,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
bc.material_code as materialCode,
bsp.id as id,
bsp.cailiaoshebei_id as cailiaoshebeiId,
bsp.unit_price as unit_price,
bsp.unit_price as unitPrice,
bsp.num as num,
bsp.contract_num as contractNum,
bsp.estimated_cycle as estimatedCycle,
@ -28,8 +28,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="bo.projectId != null">
and bc.project_id = #{bo.projectId}
</if>
<if test="bo.batchId != null">
and bc.batch_id = #{bo.batchId}
<if test="bo.batchNumber != null">
and bc.batch_number = #{bo.batchNumber}
</if>
<if test="bo.materialCode != null">
and bc.material_code like concat('%', #{bo.materialCode}, '%')
@ -44,7 +44,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</foreach>
</if>
</where>
${ew.customSqlSegment}
</select>