This commit is contained in:
BinBin Song 2025-06-27 08:56:39 +08:00
commit a39a6a1c64
46 changed files with 1032 additions and 203 deletions

View File

@ -102,7 +102,10 @@ public interface ErrorCodeConstants {
ErrorCode PURCHASE_ORDER_MAKE_NOT_EXISTS = new ErrorCode(1_008_007, "采购单主不存在");
ErrorCode PURCHASE_ORDER_MAKE_DETAIL_NOT_EXISTS = new ErrorCode(1_008_008, "采购单明细不存在");
ErrorCode PURCHASE_ORDER_MAKE_DETAIL_IS_EXISTS = new ErrorCode(1_008_009, "存在物料清单已生成采购订单,请刷新界面!");
ErrorCode PURCHASE_ORDER_MAKE_DETAIL_IS_STORAGE = new ErrorCode(1_008_010, "存在物料清单已转库存,请刷新界面!");
ErrorCode PURCHASE_ORDER_MAKE_DETAIL_IS_STORAGE = new ErrorCode(1_008_010, "存在物料清单已转库存,请刷新界面!");
ErrorCode PURCHASE_ORDER_MAKE_DETAIL_MATERIAL_NOT_EXISTS = new ErrorCode(1_008_011, "物料数据不能为空,请选择物料后重试!");
ErrorCode PURCHASE_ORDER_MAKE_DETAIL_BOOM_DETAIL_IS_EXISTS = new ErrorCode(1_008_012, "BOM明细ID不能为空");
ErrorCode PURCHASE_ORDER_MAKE_DETAIL_PROJECTSUB_DETAIL_NOT_EXISTS = new ErrorCode(1_008_013, "子项目ID不能为空");
/************生产管理***********/
ErrorCode TASK_DISPATCH_NOT_EXISTS = new ErrorCode(1_009_001, "派工单不存在");
ErrorCode TASK_REPORT_NOT_EXISTS = new ErrorCode(1_009_002, "任务报工不存在");

View File

@ -124,9 +124,8 @@ public class MaterialController {
}
@GetMapping({"/getbzjList"})
@Operation(summary = "TODO:获取物料标准件信息列表", description = "只包含被开启的物料,主要用于前端的下拉选项")
public CommonResult<List<Map<String, Object>> > getbzjList() {
List<Map<String, Object>> list = materialService.getbzjList();
// 拼接数据
return success(list);
public CommonResult<PageResult<MaterialRespVO> > getbzjList(@Valid MaterialPageReqVO pageReqVO) {
PageResult<MaterialDO> pageResult = materialService.getbzjList(pageReqVO);
return success(BeanUtils.toBean(pageResult, MaterialRespVO.class));
}
}

View File

@ -199,4 +199,18 @@ public class MaterialPlanController {
public CommonResult<Boolean> delMaterial(@RequestParam("id") Long id) {
return materialPlanService.delMaterial(id);
}
// @PostMapping("/getPartPurchasePages")
// @Operation(summary = "获得零件采购分页")
// public CommonResult<PageResult<MaterialPlanBoomDO>> getPartPurchasePages(@Valid @RequestBody MaterialPlanPageReqVO pageReqVO) {
// PageResult<MaterialPlanBoomDO> pageResult = materialPlanService.getPartPurchasePages(pageReqVO);
// return success(pageResult);
// }
@GetMapping("/getPartPurchasePages")
@Operation(summary = "获得零件采购分页")
public CommonResult<PageResult<MaterialPlanBoomDO>> getPartPurchasePages() {
String a ="asdij";
return null;
}
}

View File

@ -69,5 +69,11 @@ public class MaterialPlanPageReqVO extends PageParam {
@Schema(description = "制单日期")
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime[] matPlanDate;
@Schema(description = "物料名称")
private String matName;
@Schema(description = "零件采购需求状态(0-待送审 1 -已送审 2-已批准 3-已打回)")
private Integer mplanStatus;
@Schema(description = "责任人")
private String duEmpName;
}

View File

@ -21,12 +21,13 @@ public class MaterialPlanBoomSaveReqVO {
@NotNull(message = "物料需求计划id不能为空")
private Long projectMaterialPlanId;
@Schema(description = "工艺boom明细id零件类型加工件", requiredMode = Schema.RequiredMode.REQUIRED)
@NotNull(message = "工艺boom明细id零件类型加工件不能为空")
@Schema(description = "工艺boom明细id零件类型加工件")
// @NotNull(message = "工艺boom明细id零件类型加工件不能为空")
private Long boomDetailId;
@Schema(description = "订单子项目id", requiredMode = Schema.RequiredMode.REQUIRED)
@NotNull(message = "订单子项目id不能为空")
// @Schema(description = "订单子项目id", requiredMode = Schema.RequiredMode.REQUIRED)
// @NotNull(message = "订单子项目id不能为空")
@Schema(description = "订单子项目id")
private Long projectPlanSubId;
@Schema(description = "需求数量")

View File

@ -90,6 +90,8 @@ public class MaterialDO extends TenantBaseDO {
* 材质id
*/
private Long compositionId;
@TableField(exist = false)
private String compositionName;
/**
* 销项税率或进项税率 (%)
*/

View File

@ -161,4 +161,15 @@ public class MaterialPlanBoomDO extends BaseDO {
private String customerBriefName;
@TableField(exist = false)
private String boomArriveDates;
/**
* 单位
*/
@TableField(exist = false)
private String unit;
/**
* 责任人姓名
*/
@TableField(exist = false)
private String duEmpName;
}

View File

@ -154,6 +154,7 @@ public class PurchaseOrderMakeDetailDO extends BaseDO {
/**
* 物料id
*/
@TableField(exist = false)
private Long materialId;
}

View File

@ -136,6 +136,8 @@ public class PurchaseOrderNoDO extends BaseDO {
@TableField(exist = false)
private String username;
@TableField(exist = false)
private String auditorName;
@TableField(exist = false)
private String userMobile;
@TableField(exist = false)
private String contactName;
@ -150,6 +152,10 @@ public class PurchaseOrderNoDO extends BaseDO {
@TableField(exist = false)
private Integer receivingStatus1;
@TableField(exist = false)
private BigDecimal estimatedPriceSum;
@TableField(exist = false)
private BigDecimal purchaseAmountSum;
@TableField(exist = false)
private List<PurchaseOrderNoDetailDO> PurchaseOrderNoDetailList;
/**
* 是否打印

View File

@ -170,6 +170,8 @@ public class PurchaseOrderNoDetailDO extends BaseDO {
*/
private Long procedureId;
@TableField(exist = false)
private String blueprintNo;
@TableField(exist = false)
private Long matId;
@TableField(exist = false)
private String matName;
@ -184,6 +186,8 @@ public class PurchaseOrderNoDetailDO extends BaseDO {
@TableField(exist = false)
private BigDecimal matRest;
@TableField(exist = false)
private BigDecimal unitPrice;
@TableField(exist = false)
private BigDecimal requireAmount;
@TableField(exist = false)
private LocalDateTime requireArriveTime;

View File

@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.chanko.yunxi.mes.framework.common.pojo.PageResult;
import com.chanko.yunxi.mes.framework.mybatis.core.mapper.BaseMapperX;
import com.chanko.yunxi.mes.module.heli.controller.admin.material.vo.MaterialPageReqVO;
import com.chanko.yunxi.mes.module.heli.dal.dataobject.composition.CompositionDO;
import com.chanko.yunxi.mes.module.heli.dal.dataobject.material.MaterialDO;
import com.chanko.yunxi.mes.module.heli.dal.dataobject.pn.PnDO;
import com.chanko.yunxi.mes.module.heli.dal.dataobject.supplier.SupplierDO;
@ -31,6 +32,15 @@ public interface MaterialMapper extends BaseMapperX<MaterialDO> {
query.eq(code != null, MaterialDO::getCode, code);
return selectOne( query);
}
//材质为空时查不出来数据注释
// default MaterialDO selectById(Long id) {
// MPJLambdaWrapper<MaterialDO> query = new MPJLambdaWrapper<>();
// query.selectAll(MaterialDO.class)
// .select("c.name as compositionName")
// .leftJoin(CompositionDO.class,"c",CompositionDO::getId,MaterialDO::getCompositionId);
// query.eq(MaterialDO::getId, id);
// return selectOne( query);
// }
default MaterialDO selectMaterial(String code) {
MPJLambdaWrapper<MaterialDO> query = new MPJLambdaWrapper<>();
@ -56,6 +66,7 @@ public interface MaterialMapper extends BaseMapperX<MaterialDO> {
.orderByDesc(MaterialDO::getId);
query.like(!StringUtils.isEmpty(reqVO.getName()), MaterialDO::getName, reqVO.getName())
.like(!StringUtils.isEmpty(reqVO.getCode()), MaterialDO::getCode, reqVO.getCode())
.like(!StringUtils.isEmpty(reqVO.getShortName()), MaterialDO::getShortName, reqVO.getShortName())
.eq(!StringUtils.isEmpty(reqVO.getMaterialType()), MaterialDO::getMaterialType, reqVO.getMaterialType())
.eq(reqVO.getStatus() != null, MaterialDO::getStatus, reqVO.getStatus())
.eq(true,MaterialDO::getVirtualPart, YesOrNoEnum.N.name())
@ -88,8 +99,35 @@ public interface MaterialMapper extends BaseMapperX<MaterialDO> {
}
default List<Map<String, Object>> getbzjList(){
return selectMaps(new QueryWrapper<MaterialDO>().select("id", "name","short_name","code","material_type","spec","unit","brand").eq("material_type", 5));
default PageResult<MaterialDO> getbzjList(MaterialPageReqVO reqVO){
MPJLambdaWrapper<MaterialDO> query = new MPJLambdaWrapper<>();
query.selectAll(MaterialDO.class)
.select("s.name as mainSupplierName")
.leftJoin(SupplierDO.class, "s", SupplierDO::getId, MaterialDO::getMainSupplierId)
.disableSubLogicDel()
.orderByDesc(MaterialDO::getId);
query.like(!StringUtils.isEmpty(reqVO.getName()), MaterialDO::getName, reqVO.getName())
.like(!StringUtils.isEmpty(reqVO.getSpec()), MaterialDO::getSpec, reqVO.getSpec())
.like(!StringUtils.isEmpty(reqVO.getCode()), MaterialDO::getCode, reqVO.getCode())
.like(!StringUtils.isEmpty(reqVO.getShortName()), MaterialDO::getShortName, reqVO.getShortName())
.eq(!StringUtils.isEmpty(reqVO.getMaterialType()), MaterialDO::getMaterialType, reqVO.getMaterialType())
.eq(reqVO.getStatus() != null, MaterialDO::getStatus, reqVO.getStatus())
.eq(true,MaterialDO::getVirtualPart, YesOrNoEnum.N.name())
.apply(!StringUtils.isEmpty(reqVO.getCodeAndName()), " (t.name like {0} or t.code like {0})", "%"+reqVO.getCodeAndName()+"%");
query.eq(MaterialDO::getTenantId,2);
if (!StringUtils.isEmpty(reqVO.getInventoryName())) {
query.and(qw ->
qw.like("t.name", reqVO.getInventoryName())
.or()
.like("t.code", reqVO.getInventoryName())
);
}
// if(!StringUtils.isEmpty(reqVO.getCodeAndName())){
// query.like(MaterialDO::getName, reqVO.getCodeAndName()).or().like(MaterialDO::getCode, reqVO.getCodeAndName());
//
// }
return selectPage(reqVO, query);
}
}

View File

@ -64,7 +64,9 @@ public interface MaterialPlanBoomMapper extends BaseMapperX<MaterialPlanBoomDO>
query.selectAll(MaterialPlanBoomDO.class)
// .select("mat.id as matId","mat.name as matName","mat.code as matCode","mat.spec as matSpec","mat.unit as matUnit","mat.material_type as matType")
.select("b.material_name as matName","m.code as matCode","b.spec as matSpec","b.unit as matUnit","b.blueprint_no as blueprintNo")
// .select("b.material_name as matName","m.code as matCode","b.spec as matSpec","b.unit as matUnit","b.blueprint_no as blueprintNo")
.select("b.spec as matSpec","b.unit as matUnit","b.blueprint_no as blueprintNo")
.select("bc.`name` as compositionName","b.`composition_id` as compositionId")
.select("ma.brief as customerBriefName,ma.project_name as projectName,ma.name as projectSubName,ma.project_id as projectId")
.leftJoin(MaterialPlanDO.class,"ma",MaterialPlanDO::getId, MaterialPlanBoomDO::getProjectMaterialPlanId)
@ -73,7 +75,7 @@ public interface MaterialPlanBoomMapper extends BaseMapperX<MaterialPlanBoomDO>
.leftJoin(CompositionDO.class, "bc", CompositionDO::getId, ProcessBomDetailDO::getCompositionId)
.leftJoin(ProjectOrderDO.class,"po",ProjectOrderDO::getId,MaterialPlanDO::getProjectId)
.leftJoin(AdminUserDO.class,"u",AdminUserDO::getId, MaterialPlanBoomDO::getDuEmpId)
.leftJoin(MaterialDO.class,"m",MaterialDO::getId,MaterialPlanBoomDO::getMaterialId)
// .leftJoin(MaterialDO.class,"m",MaterialDO::getId,MaterialPlanBoomDO::getMaterialId)
.eq(MaterialPlanDO::getMatType,0)
.in(MaterialPlanBoomDO::getIsPurYard,Arrays.asList(0,5))
.disableSubLogicDel()
@ -170,13 +172,13 @@ public interface MaterialPlanBoomMapper extends BaseMapperX<MaterialPlanBoomDO>
default PageResult<MaterialPlanBoomDO> getStandardPartsPages(MaterialPlanPageReqVO pageReqVO){
MPJLambdaWrapper<MaterialPlanBoomDO> query = new MPJLambdaWrapper<>();
query.selectAll(MaterialPlanBoomDO.class)
.select("p.project_name as projectName","p.project_id as projectId","p.name as projectSubName","mat.material_id as matId","m.code as materialName")
.select("p.project_name as projectName","p.project_id as projectId","p.name as projectSubName","mat.material_id as matId","m.code as materialName","m.code as matCode")
.select("d.spec as boomSpec","d.blueprint_no as blueprintNo","d.unit as boomUnit","DATE_FORMAT(t.boom_arrive_date, '%Y-%m-%d') AS boomArriveDates")
.leftJoin(MaterialPlanDO.class, "p", MaterialPlanDO::getId,MaterialPlanBoomDO::getProjectMaterialPlanId)
.leftJoin(ProjectOrderDO.class,"b",ProjectOrderDO::getId,MaterialPlanDO::getProjectId)
.leftJoin(ProcessBomDetailDO.class,"d",ProcessBomDetailDO::getId,MaterialPlanBoomDO::getBoomDetailId)
.leftJoin("project_mat_req_detail mat on (t.id=mat.project_material_plan_detail_id and mat.deleted=0)")
.leftJoin(MaterialDO.class,"m",MaterialDO::getId,MatReqDetailDO::getMaterialId)
.leftJoin("project_mat_req_detail mat on (t.id=mat.project_material_plan_detail_id and mat.deleted=0 and mat.tenant_id = 2)")
.leftJoin("base_material m ON (m.id = mat.material_id and m.tenant_id = 2) ")
.disableSubLogicDel()
.groupBy(MaterialPlanBoomDO::getId)
.orderByDesc(MaterialPlanBoomDO::getCreateTime);
@ -190,6 +192,35 @@ public interface MaterialPlanBoomMapper extends BaseMapperX<MaterialPlanBoomDO>
return selectPage(pageReqVO, query);
}
default PageResult<MaterialPlanBoomDO> getPartsPages(MaterialPlanPageReqVO pageReqVO){
MPJLambdaWrapper<MaterialPlanBoomDO> query = new MPJLambdaWrapper<>();
query.selectAll(MaterialPlanBoomDO.class)
.select("p.project_name as projectName","p.name as projectSubName")
.select("d.blueprint_no as blueprintNo","d.unit as unit")
.select("a.nickname as duEmpName","c.name as procedureName","e.name as compositionName")
.select(MaterialPlanDO::getBrief)
.leftJoin(MaterialPlanDO.class, "p", MaterialPlanDO::getId,MaterialPlanBoomDO::getProjectMaterialPlanId)
.leftJoin(ProcessBomDetailDO.class,"d",ProcessBomDetailDO::getId,MaterialPlanBoomDO::getBoomDetailId)
.leftJoin(AdminUserDO.class, "a", AdminUserDO::getId, MaterialPlanBoomDO::getDuEmpId)
.leftJoin(ProcedureDO.class, "c", ProcedureDO::getId, MaterialPlanBoomDO::getProcedureId)
.leftJoin(CompositionDO.class, "e", CompositionDO::getId, ProcessBomDetailDO::getCompositionId)
.disableSubLogicDel();
query
.like(!StringUtils.isEmpty(pageReqVO.getProjectName()),MaterialPlanDO::getProjectName, pageReqVO.getProjectName())
.like(!StringUtils.isEmpty(pageReqVO.getProjectSubName()), MaterialPlanDO::getName, pageReqVO.getProjectSubName())
.like(!StringUtils.isEmpty(pageReqVO.getMaterialName()), MaterialPlanBoomDO::getMatName, pageReqVO.getMaterialName())
.like(!StringUtils.isEmpty(pageReqVO.getMatName()), MaterialPlanBoomDO::getMatName, pageReqVO.getMatName())
.like(!StringUtils.isEmpty(pageReqVO.getProjectCode()), ProjectOrderDO::getCode, pageReqVO.getProjectCode())
.like(!StringUtils.isEmpty(pageReqVO.getDuEmpName()), AdminUserDO::getNickname, pageReqVO.getDuEmpName())
.eq(!StringUtils.isEmpty(pageReqVO.getMatType()), MaterialPlanDO::getMatType, pageReqVO.getMatType())
.eq(!StringUtils.isEmpty(pageReqVO.getStatus()), MaterialPlanBoomDO::getIsPurYard, pageReqVO.getStatus())
.eq(Objects.nonNull(pageReqVO.getMplanStatus()), MaterialPlanBoomDO::getMplanStatus, pageReqVO.getMplanStatus())
.eq(Objects.nonNull(pageReqVO.getProjectMaterialPlanNo()), MaterialPlanDO::getProjectMaterialPlanNo, pageReqVO.getProjectMaterialPlanNo());
return selectPage(pageReqVO, query);
}
// default PageResult<MaterialPlanBoomDO> selectPage(MaterialPlanBoomPageReqVO reqVO) {
// return selectPage(reqVO, new LambdaQueryWrapperX<MaterialPlanBoomDO>()
// .eqIfPresent(MaterialPlanBoomDO::getId, reqVO.getId())

View File

@ -2,10 +2,14 @@ package com.chanko.yunxi.mes.module.heli.dal.mysql.purchaseordermake;
import java.util.*;
import cn.smallbun.screw.core.util.ArrayUtils;
import com.chanko.yunxi.mes.framework.common.pojo.PageResult;
import com.chanko.yunxi.mes.framework.mybatis.core.query.LambdaQueryWrapperX;
import com.chanko.yunxi.mes.framework.mybatis.core.mapper.BaseMapperX;
import com.chanko.yunxi.mes.module.heli.dal.dataobject.purchaseordermake.PurchaseOrderMakeDO;
import com.chanko.yunxi.mes.module.heli.dal.dataobject.purchaseordermakedetail.PurchaseOrderMakeDetailDO;
import com.chanko.yunxi.mes.module.heli.dal.dataobject.supplier.SupplierDO;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
import org.apache.ibatis.annotations.Mapper;
import com.chanko.yunxi.mes.module.heli.controller.admin.purchaseordermake.vo.*;
@ -43,4 +47,50 @@ public interface PurchaseOrderMakeMapper extends BaseMapperX<PurchaseOrderMakeDO
.orderByDesc(PurchaseOrderMakeDO::getId));
}
default PageResult<PurchaseOrderMakeDO> selectJoinPage(PurchaseOrderMakePageReqVO reqVO) {
// 引入 MPJLambdaWrapperMyBatis-Plus-Join 提供
MPJLambdaWrapper<PurchaseOrderMakeDO> wrapper = new MPJLambdaWrapper<>();
// 构建查询条件
wrapper
.selectAll(PurchaseOrderMakeDO.class) // 查询主表所有字段
.leftJoin(PurchaseOrderMakeDetailDO.class, "a", PurchaseOrderMakeDetailDO::getPurchaseOrderId, PurchaseOrderMakeDO::getId)
.like(Objects.nonNull(reqVO.getProjectSubName()), PurchaseOrderMakeDetailDO::getName, reqVO.getProjectSubName())
.leftJoin(SupplierDO.class, "b", SupplierDO::getId, PurchaseOrderMakeDetailDO::getSupplierId)
.like(Objects.nonNull(reqVO.getSupplierName()), SupplierDO::getName, reqVO.getSupplierName())
// eqIfPresent 替换为 eq 方法并结合 Objects.nonNull 判断
.eq(Objects.nonNull(reqVO.getPurchaseNo()), PurchaseOrderMakeDO::getPurchaseNo, reqVO.getPurchaseNo())
.eq(Objects.nonNull(reqVO.getContractNo()), PurchaseOrderMakeDO::getContractNo, reqVO.getContractNo())
.eq(Objects.nonNull(reqVO.getPurchaseType()), PurchaseOrderMakeDO::getPurchaseType, reqVO.getPurchaseType())
.eq(Objects.nonNull(reqVO.getGoodsType()), PurchaseOrderMakeDO::getGoodsType, reqVO.getGoodsType())
.eq(Objects.nonNull(reqVO.getCurrencyType()), PurchaseOrderMakeDO::getCurrencyType, reqVO.getCurrencyType())
.eq(Objects.nonNull(reqVO.getTaxRatio()), PurchaseOrderMakeDO::getTaxRatio, reqVO.getTaxRatio())
.eq(Objects.nonNull(reqVO.getEstimatedPrice()), PurchaseOrderMakeDO::getEstimatedPrice, reqVO.getEstimatedPrice())
.eq(Objects.nonNull(reqVO.getActualPrice()), PurchaseOrderMakeDO::getActualPrice, reqVO.getActualPrice())
.eq(Objects.nonNull(reqVO.getStatus()), PurchaseOrderMakeDO::getStatus, reqVO.getStatus())
.eq(Objects.nonNull(reqVO.getSubmitUserId()), PurchaseOrderMakeDO::getSubmitUserId, reqVO.getSubmitUserId())
.eq(Objects.nonNull(reqVO.getAuditor()), PurchaseOrderMakeDO::getAuditor, reqVO.getAuditor())
.eq(Objects.nonNull(reqVO.getDescription()), PurchaseOrderMakeDO::getDescription, reqVO.getDescription())
.eq(Objects.nonNull(reqVO.getProjectId()), PurchaseOrderMakeDO::getProjectId, reqVO.getProjectId())
.eq(Objects.nonNull(reqVO.getProjectPlanId()), PurchaseOrderMakeDO::getProjectPlanId, reqVO.getProjectPlanId())
.eq(Objects.nonNull(reqVO.getCustomerId()), PurchaseOrderMakeDO::getCustomerId, reqVO.getCustomerId())
.eq(Objects.nonNull(reqVO.getBrief()), PurchaseOrderMakeDO::getBrief, reqVO.getBrief())
// likeIfPresent 替换为 like
.like(Objects.nonNull(reqVO.getProjectName()), PurchaseOrderMakeDO::getProjectName, reqVO.getProjectName())
.eq(Objects.nonNull(reqVO.getProjectNameSim()), PurchaseOrderMakeDO::getProjectNameSim, reqVO.getProjectNameSim())
.orderByDesc(PurchaseOrderMakeDO::getId);
// 使用 selectJoinPage 进行分页查询
return selectJoinPage(reqVO, PurchaseOrderMakeDO.class, wrapper);
}
}

View File

@ -38,10 +38,9 @@ public interface PurchaseOrderMakeDetailMapper extends BaseMapperX<PurchaseOrder
default PageResult<PurchaseOrderMakeDetailDO> selectPage(PurchaseOrderMakeDetailPageReqVO reqVO) {
MPJLambdaWrapper<PurchaseOrderMakeDetailDO> query = new MPJLambdaWrapper<>();
query.selectAll(PurchaseOrderMakeDetailDO.class)
.select("b.material_name as boomName","m.code as boomCode","b.spec as boomSpec","b.unit as boomUnit")
.select("b.material_name as boomName","b.spec as boomSpec","b.unit as boomUnit")
// .select("pom.purchase_no as purchaseNo")
.leftJoin(ProcessBomDetailDO.class,"b",ProcessBomDetailDO::getId,PurchaseOrderMakeDetailDO::getBoomDetailId)
.leftJoin(MaterialDO.class,"m",MaterialDO::getId,PurchaseOrderMakeDetailDO::getMaterialId)
.leftJoin(ProjectOrderSubDO.class,"pos",ProjectOrderSubDO::getId,PurchaseOrderMakeDetailDO::getProjectPlanSubId)
.leftJoin(ProjectOrderDO.class,"po",ProjectOrderDO::getId, ProjectOrderSubDO::getProjectOrderId)
.leftJoin(PurchaseOrderMakeDO.class,"pom",PurchaseOrderMakeDO::getId,PurchaseOrderMakeDetailDO::getPurchaseOrderId)

View File

@ -58,7 +58,7 @@ public interface PurchaseOrderNoDetailMapper extends BaseMapperX<PurchaseOrderNo
MPJLambdaWrapper<PurchaseOrderNoDetailDO> query = new MPJLambdaWrapper<>();
query.selectAll(PurchaseOrderNoDetailDO.class)
.select("t.composition as compositionName","t.purchase_rem_amount as purchaseRemAmounts","mat.code as matCode","pro.name as procedureName")
.select("t.composition as compositionName","t.purchase_rem_amount as purchaseRemAmounts","mat.code as matCode","pro.name as procedureName","bom.blueprint_no as blueprintNo")
.leftJoin(PurchaseOrderNoDO.class, "pb", PurchaseOrderNoDO::getId, PurchaseOrderBoomDO::getPurchaseOrderId)
.leftJoin(ProcessBomDetailDO.class,"bom", ProcessBomDetailDO::getId, PurchaseOrderNoDetailDO::getBoomDetailId)
.leftJoin(MaterialPlanBoomDO.class,"plan", MaterialPlanBoomDO::getId, PurchaseOrderNoDetailDO::getProjectMaterialPlanBoomId)

View File

@ -59,5 +59,7 @@ public interface MaterialService {
void importExcel(List<MaterialExcelVO> materialExcelVOList, Boolean updateSupport);
List<Map<String, Object>> getbzjList();
PageResult<MaterialDO> getbzjList(MaterialPageReqVO pageReqVO);
}

View File

@ -205,8 +205,9 @@ public class MaterialServiceImpl implements MaterialService {
}
@Override
public List<Map<String, Object>> getbzjList() {
return materialMapper.getbzjList(); }
public PageResult<MaterialDO> getbzjList(MaterialPageReqVO pageReqVO) {
return materialMapper.getbzjList( pageReqVO);
}
private void checkData(List<MaterialExcelVO> materialExcelVOList) {
// 基础校验

View File

@ -80,4 +80,6 @@ public interface MaterialPlanService {
Boolean supplement(List<StorageLogNowDO> list);
CommonResult<Boolean> delMaterial(Long id);
PageResult<MaterialPlanBoomDO> getPartPurchasePages(MaterialPlanPageReqVO pageReqVO);
}

View File

@ -422,7 +422,12 @@ public class MaterialPlanServiceImpl implements MaterialPlanService {
queryWrapper.eq(MaterialPlanBoomDO::getProjectMaterialPlanId, id);
materialPlanBoomMapper.delete(queryWrapper);
materialPlanMapper.deleteById(id);
return null;
return CommonResult.success( true);
}
@Override
public PageResult<MaterialPlanBoomDO> getPartPurchasePages(MaterialPlanPageReqVO pageReqVO) {
return materialPlanBoomMapper.getPartsPages(pageReqVO);
}
}

View File

@ -114,6 +114,12 @@ public class MaterialPlanBoomServiceImpl implements MaterialPlanBoomService {
HashMap<Long, PlanSubDO> planSubMap = new HashMap<>();
for (MaterialPlanBoomDO dp : materialPlanBoomDOList) {
PurchaseOrderMakeDetailDO makeDetailDO = new PurchaseOrderMakeDetailDO();
if (dp.getBoomDetailId() == null){
throw exception(PURCHASE_ORDER_MAKE_DETAIL_BOOM_DETAIL_IS_EXISTS);
}
if(dp.getProjectPlanSubId() == null){
throw exception(PURCHASE_ORDER_MAKE_DETAIL_PROJECTSUB_DETAIL_NOT_EXISTS);
}
makeDetailDO.setBoomDetailId(dp.getBoomDetailId());
makeDetailDO.setBoomName(dp.getMatName());
makeDetailDO.setBoomSpec(dp.getMatSpec());
@ -178,7 +184,8 @@ public class MaterialPlanBoomServiceImpl implements MaterialPlanBoomService {
serialNumberDO.setSerialNumber(serialNumberDO.getSerialNumber()+1);
// 入库前缀
purchaseOrderMakeDO.setPurchaseNo(PURCHASE_ORDER.getCode(serialNumberDO.getSerialNumber().toString()));
String code = PURCHASE_ORDER.getCode(serialNumberDO.getSerialNumber().toString());
purchaseOrderMakeDO.setPurchaseNo(code);
purchaseOrderMakeDO.setGoodsType(1);
purchaseOrderMakeDO.setStatus(1);
purchaseOrderMakeDO.setSubmitUserId(loginUserId);
@ -206,7 +213,7 @@ public class MaterialPlanBoomServiceImpl implements MaterialPlanBoomService {
dp.setMplanStatus(1);
dp.setProjectPurchaseOrderMakeId(purchaseOrderMakeDO.getId());
dp.setProjectPurchaseOrderMakeDetailId(purchaseOrderMakeDetailDO.getId());
dp.setPurchaseNo(purchaseOrderMakeDO.getPurchaseNo());
dp.setPurchaseNo(code);
}
}
}

View File

@ -133,7 +133,7 @@ public class PartPurchaseOrderServiceImpl implements PartPurchaseOrderService{
List<PurchaseOrderMakeDetailDO> list= purchaseOrderMakeDetailMapper.selectList("purchase_order_id", updateReqVO.getId());
list.forEach(detailDO -> {
purchaseOrderNoDetailMapper.deleteById(detailDO.getId());
purchaseOrderNoDetailMapper.deleteById(detailDO);
});
List<MaterialPlanBoomDO> materialPlanBoomDOs= materialPlanBoomMapper.selectList("project_purchase_order_make_id", updateReqVO.getId());

View File

@ -402,8 +402,13 @@ public class ProcessBomServiceImpl implements ProcessBomService {
List<ProcessBomDetailDO> processBomDetails = updateReqVO.getProcessBomDetails();
//不论怎么样都要校验这次的数据它图号是否唯一非标准件的名称是否重复规格是否为空
if (CollUtil.isNotEmpty(processBomDetails)){
for (ProcessBomDetailDO processBomDetail : processBomDetails) {
if (processBomDetail.getId() == null){
processBomDetail.setDeleted(false);
}
}
//校验这次的数据它图号是否唯一
Map<String, List<ProcessBomDetailDO>> groupedByBluePrintfNo = processBomDetails.stream().collect(Collectors.groupingBy(vo -> vo.getBlueprintNo() == null ? "NULL" : vo.getBlueprintNo()));
Map<String, List<ProcessBomDetailDO>> groupedByBluePrintfNo = processBomDetails.stream().filter(e -> e.getDeleted() == false).collect(Collectors.groupingBy(vo -> vo.getBlueprintNo() == null ? "NULL" : vo.getBlueprintNo()));
groupedByBluePrintfNo.forEach((printNo,list)->{
if (printNo.equals("NULL")){
throw exception(PROCESS_BOM_DETAIL_BLUE_PRINT_NO_NOT_EXISTS);
@ -439,6 +444,14 @@ public class ProcessBomServiceImpl implements ProcessBomService {
// processBomDetail.setMaterialCode("");
// }
// }
}else {
if(operateTypeEnum == OperateTypeEnum.SUBMIT){
if (processBomDetail.getSpec() == null){
throw exception(new ErrorCode(1_006_9998,processBomDetail.getMaterialName()+"规格型号不能为空,请确认!"));
}
}
}
}

View File

@ -1,74 +1,74 @@
package com.chanko.yunxi.mes.module.heli.service.purchaseordermake;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import org.springframework.validation.annotation.Validated;
import org.springframework.transaction.annotation.Transactional;
import java.util.*;
import com.chanko.yunxi.mes.module.heli.controller.admin.purchaseordermake.vo.*;
import com.chanko.yunxi.mes.module.heli.dal.dataobject.purchaseordermake.PurchaseOrderMakeDO;
import com.chanko.yunxi.mes.framework.common.pojo.PageResult;
import com.chanko.yunxi.mes.framework.common.pojo.PageParam;
import com.chanko.yunxi.mes.framework.common.util.object.BeanUtils;
import com.chanko.yunxi.mes.module.heli.dal.mysql.purchaseordermake.PurchaseOrderMakeMapper;
import static com.chanko.yunxi.mes.framework.common.exception.util.ServiceExceptionUtil.exception;
import static com.chanko.yunxi.mes.module.heli.enums.ErrorCodeConstants.*;
/**
* 采购单主 Service 实现类
*
* @author 管理员
*/
@Service
@Validated
public class PurchaseOrderMakeServiceImpl implements PurchaseOrderMakeService {
@Resource
private PurchaseOrderMakeMapper purchaseOrderMakeMapper;
@Override
public Long createPurchaseOrderMake(PurchaseOrderMakeSaveReqVO createReqVO) {
// 插入
PurchaseOrderMakeDO purchaseOrderMake = BeanUtils.toBean(createReqVO, PurchaseOrderMakeDO.class);
purchaseOrderMakeMapper.insert(purchaseOrderMake);
// 返回
return purchaseOrderMake.getId();
}
@Override
public void updatePurchaseOrderMake(PurchaseOrderMakeSaveReqVO updateReqVO) {
// 校验存在
validatePurchaseOrderMakeExists(updateReqVO.getId());
// 更新
PurchaseOrderMakeDO updateObj = BeanUtils.toBean(updateReqVO, PurchaseOrderMakeDO.class);
purchaseOrderMakeMapper.updateById(updateObj);
}
@Override
public void deletePurchaseOrderMake(Long id) {
// 校验存在
validatePurchaseOrderMakeExists(id);
// 删除
purchaseOrderMakeMapper.deleteById(id);
}
private void validatePurchaseOrderMakeExists(Long id) {
if (purchaseOrderMakeMapper.selectById(id) == null) {
throw exception(PURCHASE_ORDER_MAKE_NOT_EXISTS);
}
}
@Override
public PurchaseOrderMakeDO getPurchaseOrderMake(Long id) {
return purchaseOrderMakeMapper.selectById(id);
}
@Override
public PageResult<PurchaseOrderMakeDO> getPurchaseOrderMakePage(PurchaseOrderMakePageReqVO pageReqVO) {
return purchaseOrderMakeMapper.selectPage(pageReqVO);
}
}
package com.chanko.yunxi.mes.module.heli.service.purchaseordermake;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import org.springframework.validation.annotation.Validated;
import org.springframework.transaction.annotation.Transactional;
import java.util.*;
import com.chanko.yunxi.mes.module.heli.controller.admin.purchaseordermake.vo.*;
import com.chanko.yunxi.mes.module.heli.dal.dataobject.purchaseordermake.PurchaseOrderMakeDO;
import com.chanko.yunxi.mes.framework.common.pojo.PageResult;
import com.chanko.yunxi.mes.framework.common.pojo.PageParam;
import com.chanko.yunxi.mes.framework.common.util.object.BeanUtils;
import com.chanko.yunxi.mes.module.heli.dal.mysql.purchaseordermake.PurchaseOrderMakeMapper;
import static com.chanko.yunxi.mes.framework.common.exception.util.ServiceExceptionUtil.exception;
import static com.chanko.yunxi.mes.module.heli.enums.ErrorCodeConstants.*;
/**
* 采购单主 Service 实现类
*
* @author 管理员
*/
@Service
@Validated
public class PurchaseOrderMakeServiceImpl implements PurchaseOrderMakeService {
@Resource
private PurchaseOrderMakeMapper purchaseOrderMakeMapper;
@Override
public Long createPurchaseOrderMake(PurchaseOrderMakeSaveReqVO createReqVO) {
// 插入
PurchaseOrderMakeDO purchaseOrderMake = BeanUtils.toBean(createReqVO, PurchaseOrderMakeDO.class);
purchaseOrderMakeMapper.insert(purchaseOrderMake);
// 返回
return purchaseOrderMake.getId();
}
@Override
public void updatePurchaseOrderMake(PurchaseOrderMakeSaveReqVO updateReqVO) {
// 校验存在
validatePurchaseOrderMakeExists(updateReqVO.getId());
// 更新
PurchaseOrderMakeDO updateObj = BeanUtils.toBean(updateReqVO, PurchaseOrderMakeDO.class);
purchaseOrderMakeMapper.updateById(updateObj);
}
@Override
public void deletePurchaseOrderMake(Long id) {
// 校验存在
validatePurchaseOrderMakeExists(id);
// 删除
purchaseOrderMakeMapper.deleteById(id);
}
private void validatePurchaseOrderMakeExists(Long id) {
if (purchaseOrderMakeMapper.selectById(id) == null) {
throw exception(PURCHASE_ORDER_MAKE_NOT_EXISTS);
}
}
@Override
public PurchaseOrderMakeDO getPurchaseOrderMake(Long id) {
return purchaseOrderMakeMapper.selectById(id);
}
@Override
public PageResult<PurchaseOrderMakeDO> getPurchaseOrderMakePage(PurchaseOrderMakePageReqVO pageReqVO) {
return purchaseOrderMakeMapper.selectJoinPage(pageReqVO);
}
}

View File

@ -1,11 +1,15 @@
package com.chanko.yunxi.mes.module.heli.service.purchaseordermakedetail;
import cn.hutool.core.collection.CollUtil;
import com.chanko.yunxi.mes.module.heli.dal.dataobject.composition.CompositionDO;
import com.chanko.yunxi.mes.module.heli.dal.dataobject.material.MaterialDO;
import com.chanko.yunxi.mes.module.heli.dal.dataobject.purchaseorder.PurchaseOrderDO;
import com.chanko.yunxi.mes.module.heli.dal.dataobject.purchaseordermake.PurchaseOrderMakeDO;
import com.chanko.yunxi.mes.module.heli.dal.dataobject.purchaseorderno.PurchaseOrderNoDO;
import com.chanko.yunxi.mes.module.heli.dal.dataobject.purchaseordernodetail.PurchaseOrderNoDetailDO;
import com.chanko.yunxi.mes.module.heli.dal.dataobject.serialnumber.SerialNumberDO;
import com.chanko.yunxi.mes.module.heli.dal.mysql.composition.CompositionMapper;
import com.chanko.yunxi.mes.module.heli.dal.mysql.material.MaterialMapper;
import com.chanko.yunxi.mes.module.heli.dal.mysql.purchaseordermake.PurchaseOrderMakeMapper;
import com.chanko.yunxi.mes.module.heli.dal.mysql.purchaseorderno.PurchaseOrderNoMapper;
import com.chanko.yunxi.mes.module.heli.dal.mysql.purchaseordernodetail.PurchaseOrderNoDetailMapper;
@ -53,7 +57,10 @@ public class PurchaseOrderMakeDetailServiceImpl implements PurchaseOrderMakeDeta
private PurchaseOrderNoDetailMapper purchaseOrderNoDetailMapper;
@Resource
private PurchaseOrderMakeMapper purchaseOrderMakeMapper;
@Resource
private MaterialMapper materialMapper;
@Resource
private CompositionMapper compositionMapper;
@Override
public Long createPurchaseOrderMakeDetail(PurchaseOrderMakeDetailSaveReqVO createReqVO) {
// 插入
@ -75,7 +82,8 @@ public class PurchaseOrderMakeDetailServiceImpl implements PurchaseOrderMakeDeta
serialNumberDO.setSerialNumber(serialNumberDO.getSerialNumber()+1);
// 入库前缀
purchaseOrderNoDO.setPurchaseNo(PURCHASE_ORDER.getCode(serialNumberDO.getSerialNumber().toString()));
String code = PURCHASE_ORDER.getCode(serialNumberDO.getSerialNumber().toString());
purchaseOrderNoDO.setPurchaseNo(code);
serialNumberService.updateSerialNumber(serialNumberDO);
purchaseOrderNoDO.setGoodsType(1);
purchaseOrderNoDO.setPurchaseType(1);
@ -84,16 +92,39 @@ public class PurchaseOrderMakeDetailServiceImpl implements PurchaseOrderMakeDeta
purchaseOrderNoMapper.insert(purchaseOrderNoDO);
List<PurchaseOrderNoDetailDO> insertList =new ArrayList<>();
HashMap<Long,PurchaseOrderMakeDO> insertMap = new HashMap<>();
HashMap<Long, MaterialDO> insertMaterialMap = new HashMap<>();
HashMap<Long ,CompositionDO> compositionDOHashMap = new HashMap<>();
for (PurchaseOrderMakeDetailDO pmd : updateList) {
PurchaseOrderNoDetailDO pd = new PurchaseOrderNoDetailDO();
pd.setMakeDetailId(pmd.getId());
pd.setPurchaseOrderId(purchaseOrderNoDO.getId());
pd.setBoomDetailId(pmd.getBoomDetailId());
pd.setBoomName(pmd.getBoomName());
pd.setBoomSpec(pmd.getBoomSpec());
pd.setBoomUnit(pmd.getBoomUnit());
pd.setComposition(pmd.getComposition());
if (pd.getMakeDetailId() != null) {
MaterialDO materialDO = insertMaterialMap.get(pmd.getMaterialId());
if (materialDO == null) {
materialDO = materialMapper.selectById(pmd.getMaterialId());
insertMaterialMap.put(pd.getMakeDetailId(), materialDO);
}
if (materialDO.getCompositionId() != null) {
CompositionDO compositionDO = compositionDOHashMap.get(materialDO.getCompositionId());
if (compositionDO == null) {
compositionDO = compositionMapper.selectById(materialDO.getCompositionId());
compositionDOHashMap.put(materialDO.getCompositionId(), compositionDO);
}
pd.setComposition(compositionDO == null ?"":compositionDO.getName());
}
pd.setBoomName(materialDO.getName());
pd.setMaterialId(materialDO.getId());
pd.setBoomSpec(materialDO.getSpec());
pd.setBoomUnit(materialDO.getUnit());
}else {
throw exception(PURCHASE_ORDER_MAKE_DETAIL_MATERIAL_NOT_EXISTS);
}
pd.setPurchaseAmount(pmd.getPurchaseAmount());
pd.setEstimatedPrice(pmd.getEstimatedPrice());
pd.setArriveTime(pmd.getArriveTime());
@ -131,6 +162,7 @@ public class PurchaseOrderMakeDetailServiceImpl implements PurchaseOrderMakeDeta
pmd.setPurchaseOrderNoId(purchaseOrderNoDO.getId());
pmd.setPurchaseOrderNoDetailId(pd.getId());
pmd.setOrderStatus(2);
pmd.setPurchaseNo(code);
break;
}
}
@ -143,12 +175,12 @@ public class PurchaseOrderMakeDetailServiceImpl implements PurchaseOrderMakeDeta
validatePurchaseOrderMakeDetailExists(updateReqVO.getId());
// 更新
PurchaseOrderMakeDetailDO updateObj = BeanUtils.toBean(updateReqVO, PurchaseOrderMakeDetailDO.class);
if (updateObj.getMaterialId() == null){
purchaseOrderMakeDetailMapper.clearMaterialId(updateObj.getId());
// if (updateObj.getMaterialId() == null){
// purchaseOrderMakeDetailMapper.clearMaterialId(updateObj.getId());
// purchaseOrderMakeDetailMapper.updateById(updateObj);
// }else {
purchaseOrderMakeDetailMapper.updateById(updateObj);
}else {
purchaseOrderMakeDetailMapper.updateById(updateObj);
}
// }
}

View File

@ -39,6 +39,8 @@ import javax.annotation.Resource;
import org.springframework.validation.annotation.Validated;
import org.springframework.transaction.annotation.Transactional;
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.text.SimpleDateFormat;
import java.time.LocalDateTime;
import java.util.*;
@ -315,6 +317,49 @@ public class PurchaseOrderNoServiceImpl implements PurchaseOrderNoService {
purchaseOrderNoDO.setDeliveryAddress("浙江省杭州市余杭区良渚街道刘林圩路5号");
purchaseOrderNoDO.setBuyer("杭州合立机械有限公司");
List<PurchaseOrderNoDetailDO> detailList = purchaseOrderNoDetailMapper.getPurchaseOrderNoDetailById(id);
// if ("1".equals(purchaseOrderNoDO.getGoodsType())){
if (detailList != null && !detailList.isEmpty()) {
detailList.forEach(detail -> {
// 跳过对象本身为null的情况
if (detail == null) return;
BigDecimal estimatedPrice = detail.getEstimatedPrice();
BigDecimal purchaseAmount = detail.getPurchaseAmount();
if (estimatedPrice != null &&
purchaseAmount != null &&
purchaseAmount.compareTo(BigDecimal.ZERO) != 0) {
// 计算并保留1位小数
BigDecimal result = estimatedPrice
.divide(purchaseAmount, 1, RoundingMode.HALF_UP);
detail.setUnitPrice(result);
} else {
// 设置默认值根据业务需求选择
detail.setUnitPrice(BigDecimal.ZERO);
}
});
// 计算 purchaseAmount 的总和
BigDecimal purchaseAmountSum = detailList.stream()
.filter(Objects::nonNull) // 过滤掉空对象
.map(PurchaseOrderNoDetailDO::getPurchaseAmount)
.filter(Objects::nonNull) // 过滤掉空值
.reduce(BigDecimal.ZERO, BigDecimal::add); // 累加求和
// 计算 estimatedPrice 的总和
BigDecimal estimatedPriceSum = detailList.stream()
.filter(Objects::nonNull) // 过滤掉空对象
.map(PurchaseOrderNoDetailDO::getEstimatedPrice)
.filter(Objects::nonNull) // 过滤掉空值
.reduce(BigDecimal.ZERO, BigDecimal::add); // 累加求和
purchaseOrderNoDO.setPurchaseAmountSum(purchaseAmountSum);
purchaseOrderNoDO.setEstimatedPriceSum(estimatedPriceSum);
}
AdminUserDO users = adminUserService.getUser(purchaseOrderNoDO.getAuditor());
if (ObjectUtil.isNotEmpty(users)){
purchaseOrderNoDO.setAuditorName(users.getNickname());
}
// }
purchaseOrderNoDO.setPurchaseOrderNoDetailList(detailList);
}
return CommonResult.success(purchaseOrderNoDO);
@ -339,6 +384,7 @@ public class PurchaseOrderNoServiceImpl implements PurchaseOrderNoService {
lambdaUpdateWrapper.set(PurchaseOrderMakeDetailDO::getPurchaseOrderNoId, null);
lambdaUpdateWrapper.set(PurchaseOrderMakeDetailDO::getPurchaseOrderNoDetailId,null);
lambdaUpdateWrapper.set(PurchaseOrderMakeDetailDO::getOrderStatus,1);
lambdaUpdateWrapper.set(PurchaseOrderMakeDetailDO::getPurchaseNo,null);
purchaseOrderMakeDetailMapper.update(lambdaUpdateWrapper);
return CommonResult.success(true);
}

View File

@ -71,7 +71,7 @@ public class StorageInServiceImpl implements StorageInService {
for (StorageInDetailDO storageInDetailDO : storageInDetailDOS) {
LambdaQueryWrapper<PurchaseOrderNoDetailDO> wrapper1 = new LambdaQueryWrapper<>();
wrapper1.eq(PurchaseOrderNoDetailDO::getStorageId,storageInDetailDO.getStorageNoId());
wrapper1.eq(PurchaseOrderNoDetailDO::getStorageMatId,storageInDetailDO.getMaterialId());
wrapper1.eq(PurchaseOrderNoDetailDO::getStorageMatId,storageInDetailDO.getId());
PurchaseOrderNoDetailDO purchaseOrderNoDetailDO = purchaseOrderNoDetailMapper.selectOne(wrapper1);
if (ObjectUtil.isNotEmpty(purchaseOrderNoDetailDO)){
LambdaUpdateWrapper<PurchaseOrderNoDetailDO> updateWrapper = new LambdaUpdateWrapper<>();

View File

@ -1,15 +1,18 @@
package com.chanko.yunxi.mes.module.heli.service.taskdispatch;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.ObjectUtil;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.TypeReference;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.generator.IFill;
import com.chanko.yunxi.mes.framework.common.exception.ErrorCode;
import com.chanko.yunxi.mes.framework.common.exception.ServiceException;
import com.chanko.yunxi.mes.framework.common.pojo.PageResult;
import com.chanko.yunxi.mes.framework.common.util.object.BeanUtils;
import com.chanko.yunxi.mes.framework.mybatis.core.query.LambdaQueryWrapperX;
import com.chanko.yunxi.mes.framework.operatelog.core.enums.OperateTypeEnum;
import com.chanko.yunxi.mes.module.heli.controller.admin.materialplanboom.vo.ProcessBoomRespVO;
import com.chanko.yunxi.mes.module.heli.controller.admin.taskdispatch.vo.*;
import com.chanko.yunxi.mes.module.heli.controller.admin.ygjx.vo.YgjxPageReqVO;
import com.chanko.yunxi.mes.module.heli.dal.dataobject.bdgzsomthing.bdgzsomthingDO;
@ -17,6 +20,7 @@ import com.chanko.yunxi.mes.module.heli.dal.dataobject.equipmanufacture.EquipMan
import com.chanko.yunxi.mes.module.heli.dal.dataobject.fpuserdetail.FpUserDetailDO;
import com.chanko.yunxi.mes.module.heli.dal.dataobject.plan.PlanDO;
import com.chanko.yunxi.mes.module.heli.dal.dataobject.procedure.ProcedureDO;
import com.chanko.yunxi.mes.module.heli.dal.dataobject.processbom.ProcessBomDetailDO;
import com.chanko.yunxi.mes.module.heli.dal.dataobject.projectorder.ProjectOrderSubDO;
import com.chanko.yunxi.mes.module.heli.dal.dataobject.serialnumber.SerialNumberDO;
import com.chanko.yunxi.mes.module.heli.dal.dataobject.taskdispatch.TaskDispatchDO;
@ -28,6 +32,7 @@ import com.chanko.yunxi.mes.module.heli.dal.mysql.equipmanufacture.EquipManufact
import com.chanko.yunxi.mes.module.heli.dal.mysql.fpuserdetail.FpUserDetailMapper;
import com.chanko.yunxi.mes.module.heli.dal.mysql.plan.PlanMapper;
import com.chanko.yunxi.mes.module.heli.dal.mysql.procedure.ProcedureMapper;
import com.chanko.yunxi.mes.module.heli.dal.mysql.processbom.ProcessBomDetailMapper;
import com.chanko.yunxi.mes.module.heli.dal.mysql.projectorder.ProjectOrderSubMapper;
import com.chanko.yunxi.mes.module.heli.dal.mysql.taskdispatch.TaskDispatchDetailMapper;
import com.chanko.yunxi.mes.module.heli.dal.mysql.taskdispatch.TaskDispatchMapper;
@ -101,6 +106,8 @@ public class TaskDispatchServiceImpl implements TaskDispatchService {
private bdgzsomthingMapper bdgzsomthingMapper;
@Resource
private ProcedureMapper procedureMapper;
@Resource
private ProcessBomDetailMapper processBomDetailMapper;
@Override
@Transactional(rollbackFor = Exception.class)
public Long createTaskDispatch(TaskDispatchSaveReqVO createReqVO) {
@ -141,7 +148,28 @@ public class TaskDispatchServiceImpl implements TaskDispatchService {
if(!updateObj.canOperate(operateTypeEnum)){
throw exception(INVALID_OPERATE);
}
// 明细工序状态更新
if (updateReqVO.getDispatchType() != null && updateReqVO.getDispatchType().equals("PRODUCTION")){
List<Long> idList = updateReqVO.getTaskDispatchDetails().stream()
.filter(o -> o.getId() != null)
.map(TaskDispatchDetailDO::getId)
.collect(Collectors.toList());
LambdaQueryWrapper<TaskDispatchDetailDO> wrapper = new LambdaQueryWrapper<>();
wrapper.in(TaskDispatchDetailDO::getId, idList);
wrapper.eq(TaskDispatchDetailDO::getDeleted, 0);
List<TaskDispatchDetailDO> detailDOS = taskDispatchDetailMapper.selectList(wrapper);
for (TaskDispatchDetailDO dispatchDetailDO : detailDOS) {
if (dispatchDetailDO.getPlanStatus()==1){
TaskDispatchDO taskDispatchDO = taskDispatchMapper.selectById(dispatchDetailDO.getDispatchId());
ProcessBomDetailDO bomDetailDO = processBomDetailMapper.selectById(taskDispatchDO.getBomDetailId());
ProcedureDO procedureDO = procedureMapper.selectById(dispatchDetailDO.getProcedureId());
if (ObjectUtil.isNotEmpty(bomDetailDO)&&ObjectUtil.isNotEmpty(procedureDO)){
throw exception(new ErrorCode(400,bomDetailDO.getMaterialName()+" "+procedureDO.getName()+"已做物料需求计划,不能更改,请确认"));
}
}
}
}
// 明细工序状态更新
if(operateTypeEnum == OperateTypeEnum.SUBMIT){
if (updateReqVO.getDispatchType() != null && updateReqVO.getDispatchType().equals("ASSEMBLE")){
updateReqVO.getTaskDispatchDetailOwnerDOList().forEach(taskDispatchDetailDO -> {
@ -437,10 +465,20 @@ public class TaskDispatchServiceImpl implements TaskDispatchService {
@Override
public void deleteTaskDispatchDetail(Long id) {
TaskDispatchDetailDO taskDispatchDetailDO = taskDispatchDetailMapper.selectById(id);
if (ObjectUtil.isNotEmpty(taskDispatchDetailDO)&&taskDispatchDetailDO.getPlanStatus()==1){
TaskDispatchDO taskDispatchDO = taskDispatchMapper.selectById(taskDispatchDetailDO.getDispatchId());
ProcessBomDetailDO bomDetailDO = processBomDetailMapper.selectById(taskDispatchDO.getBomDetailId());
ProcedureDO procedureDO = procedureMapper.selectById(taskDispatchDetailDO.getProcedureId());
if (ObjectUtil.isNotEmpty(bomDetailDO)&&ObjectUtil.isNotEmpty(procedureDO)){
throw exception(new ErrorCode(400,bomDetailDO.getMaterialName()+" "+procedureDO.getName()+"已做物料需求计划,不能更改,请确认"));
}
}
taskDispatchDetailMapper.deleteByDispatchId(id);
}
@Override
public void deleteTaskDispatchDetailOwner(Long id) {
taskDispatchDetailMapper.deleteByOwnerId(id,null);
taskDispatchDetailOwnerMapper.deleteById(id);
}

View File

@ -67,6 +67,6 @@ export const deleteMaterial = async (id: number) => {
export const exportMaterial = async (params) => {
return await request.download({ url: `/heli/material/export-excel`, params })
}
export const getbzjList = async () => {
return await request.get({ url: `/heli/material/getbzjList` })
export const getbzjList = async (params) => {
return await request.get({ url: `/heli/material/getbzjList`,params })
}

View File

@ -94,3 +94,13 @@ export const supplement = async (data) => {
export const delMaterial = async (id: number) => {
return await request.delete({ url: `/heli/material-plan/delMaterial?id=` + id })
}
// // 查询零件采购分页
// export const getPartPurchasePages = async (params) => {
// return await request.post({ url: `/heli/material-plan/getPartPurchasePages`, params })
// }
// 更新采购单主驳回
export const getPartPurchasePages = async () => {
return await request.get({ url: `/heli/material-plan/getPartPurchasePage` })
}

View File

@ -11,6 +11,7 @@ export interface MaterialPlanBoomVO {
purchaseAmount:number
estimatedPrice:number
arriveTime:Date
projectPurchaseOrderMakeDetailId:number
supplierId:number
materialPlanBoomDOList:Array<MaterialPlanBoomVO>
}

View File

@ -292,5 +292,6 @@ export enum DICT_TYPE {
HELI_MAT_REQ_STATUS='heli_mat_req_status',
HELI_MATERIAL_STATUS='heli_material_status',
HELI_DOCUMENT_STATUS='heli_document_status',
HELI_STORAGEIN_STATUS='heli_storagein_status'
HELI_STORAGEIN_STATUS='heli_storagein_status',
MATERIAL_PLAN_BOOM_MPLAN_STATUS='material_plan_boom_mplan_status'
}

View File

@ -1,7 +1,7 @@
<template>
<el-card class="hl-card">
<template #header>
<span>标准件物料需求计划</span>
<span>采购订单生成</span>
</template>
<ContentWrap class="borderxx">
<!-- 搜索工作栏 -->
@ -19,7 +19,7 @@
<el-input v-model="queryParams.projectCode" placeholder="请输入项目编号" clearable @keyup.enter="handleQuery" class="!w-240px" />
</el-form-item>
<el-form-item label="采购状态" prop="orderStatus">
<el-select v-model="queryParams.orderStatus" placeholder="请选择标准件状态" class="!w-240px">
<el-select @change="e => clearItem(e)" clearable v-model="queryParams.orderStatus" placeholder="请选择采购状态" class="!w-240px">
<el-option v-for="dict in getIntDictOptions(DICT_TYPE.HELI_PURCHASE_STATUS)" :key="dict.value" :label="dict.label" :value="dict.value" />
</el-select>
</el-form-item>
@ -75,6 +75,7 @@
:remote-method="e => remoteMethod(e,scope.row)"
remote-show-suffix
remote
@click="remoteMethod(scope.row.boomCode,scope.row)"
:disabled="scope.row.orderStatus == 2"
clearable
reserve-keyword
@ -107,6 +108,7 @@
v-model="scope.row.supplierId"
size="large"
disabled
filterable
style="width: 165 px"
>
<el-option
@ -203,7 +205,9 @@ const exportLoading = ref(false) // 导出的加载中
const getList = async () => {
loading.value = true
try {
multipleTable.value.clearSelection();
const data = await purchaseOrderMakeDetailApi.page(queryParams)
list.value = data.list
for (const row of list.value ) {
// boomCoderemoteMethod
@ -262,7 +266,9 @@ const getMateriallist = async(row) =>{
const handleSelectionChange = (selection) => {
ids.value = selection;
}
const clearItem = (e) =>{
multipleTable.value.clearSelection();
}
/** 导出按钮操作 */
const handleExportDetail = async () => {
try {
@ -295,7 +301,7 @@ const changeSupp = async(e,row) => {
// row.boomName = e.materialName;
// row.boomSpec = e.spec;
// row.boomUnit = e.unit
await updateRows(row)
// await updateRows(row)
}else{
row.materialId = null;
await updateRows(row)
@ -316,11 +322,12 @@ const serachLog = (row) => {
const handleQuery = () => {
queryParams.pageNo = 1
getList()
}
const opearteForm = async(type) =>{
loading.value = true;
if(type == 1){
router.push({ path: '/purchase/PurchaseOrder', query: { flush: 1 } })
router.push({ path: '/purchase/purchaseordernomanagement', query: { flush: 1 } })
return;
}
if(ids.value != null && ids.value.length > 0){
@ -472,8 +479,8 @@ const handleExport = async () => {
await message.exportConfirm()
//
exportLoading.value = true
const data = await ProcessBomApi.exportProcessBom(queryParams)
download.excel(data, '工艺bom.xls')
// const data = await ProcessBomApi.exportProcessBom(queryParams)
// download.excel(data, 'bom.xls')
} catch {
} finally {
exportLoading.value = false

View File

@ -28,7 +28,7 @@
/>
</el-form-item>
<el-form-item label="采购状态" prop="mplanStatus">
<el-select v-model="queryParams.mplanStatus" placeholder="请选择标准件状态" class="!w-240px">
<el-select @change="e => clearItem(e)" v-model="queryParams.mplanStatus" placeholder="请选择标准件状态" class="!w-240px">
<el-option v-for="dict in getIntDictOptions(DICT_TYPE.HELI_STANDARD_BUY_TYPE)" :key="dict.value" :label="dict.label" :value="dict.value" />
</el-select>
</el-form-item>
@ -91,12 +91,6 @@
<dict-tag :type="DICT_TYPE.HELI_MATERIAL_UNIT" :value="scope.row.matUnit" />
</template>
</el-table-column>
<el-table-column align="center" prop="purchaseAmount" min-width="180" >
<template #header><span class="hl-table_header">*</span>采购数量</template>
<template #default="scope">
<el-input-number @blur="updateRow(1,scope.row)" v-model="scope.row.purchaseAmount" :precision="2" :step="0.01" />
</template>
</el-table-column>
<el-table-column label="物料编码" align="center" prop="matCode" min-width="180" >
<template #default="scope">
@ -115,6 +109,7 @@
v-model="scope.row.supplierId"
size="large"
clearable
filterable
@change="e => changeSupp(e,scope.row)"
style="width: 165 px"
>
@ -127,6 +122,12 @@
</el-select>
</template>
</el-table-column>
<el-table-column align="center" prop="purchaseAmount" min-width="180" >
<template #header><span class="hl-table_header">*</span>采购数量</template>
<template #default="scope">
<el-input-number :disabled="scope.row.stat" @blur="updateRow(1,scope.row)" v-model="scope.row.purchaseAmount" :precision="2" :step="0.01" />
</template>
</el-table-column>
<el-table-column align="center" prop="estimatedPrice" min-width="180" >
<template #header><span class="hl-table_header">*</span>预估总价</template>
@ -134,7 +135,7 @@
<el-input-number @blur="updateRow(3,scope.row)" v-model="scope.row.estimatedPrice" :precision="2" :step="0.01" />
</template>
</el-table-column>
<el-table-column min-width="200px" align="center" fixed="right">
<el-table-column min-width="200px" align="center" >
<template #header><span class="hl-table_header">*</span>预计到货日期</template>
<template #default="{ row, $index }">
<el-form-item :prop="`${$index}.arriveTime`" class="mb-0px!" >
@ -142,8 +143,13 @@
</el-form-item>
</template>
</el-table-column>
<el-table-column label="状态" align="center" prop="mplanStatusName" min-width="80" />
<el-table-column label="采购单号" align="center" prop="purchaseNo" min-width="180" fixed="right"/>
<el-table-column label="采购单号" align="center" prop="purchaseNo" min-width="180" />
<el-table-column label="状态" align="center" prop="mplanStatus" min-width="90" >
<template #default="scope">
<dict-tag :type="DICT_TYPE.HELI_PROJECT_MATERIAL_PLAN_BOOM_STATUS" :value="scope.row.mplanStatus" />
</template>
</el-table-column>
</el-table>
<!-- 分页 -->
<Pagination :total="total" v-model:page="queryParams.pageNo" v-model:limit="queryParams.pageSize" @pagination="getList" />
@ -214,6 +220,7 @@ const exportLoading = ref(false) // 导出的加载中
const getList = async () => {
loading.value = true
try {
multipleTable.value.clearSelection();
const data = await materialPlanBoomApi.getStandardBuyPage(queryParams)
list.value = data.list
total.value = data.total
@ -230,9 +237,10 @@ const getRowKeys=(row)=>{
const handleSelectionChange = (selection) => {
ids.value = selection;
console.log(ids.value)
}
const clearItem = (e) =>{
multipleTable.value.clearSelection();
}
/** 导出按钮操作 */
const handleExportDetail = async () => {
try {
@ -247,13 +255,14 @@ const handleExportDetail = async () => {
exportLoading.value = false
}
}
const getMat = async (rowids,amount,ids) => {
const getMat = async (rowids,amount,ids,matCodes) => {
//formData.value.boomItemDOList = arrBoom
for(var i = 0 ; i < list.value.length ; i ++){
if(list.value[i].id == rowids){
list.value[i].matRest = amount
list.value[i].matCode = matCodes
list.value[i].materialId = ids
await updateRow(2,list.value[i]);
// await updateRow(2,list.value[i]);
break;
}
}
@ -332,23 +341,24 @@ const opearteForm = async(type) =>{
await materialPlanBoomApi.updateMaterialPlanBoom(form);
message.success("送审成功")
await getList()
}catch(e){
}catch{
loading.value = false
}finally{
loading.value = false
}
}else{
//
for(var i = 0 ; i<ids.value.length ;i++){
var row = ids.value[i];
if(!row.materialId){
message.error('请先查询库存量后进行操作')
loading.value = false
return
}
}
// for(var i = 0 ; i<ids.value.length ;i++){
// var row = ids.value[i];
// if(!row.materialId){
// message.error('')
// loading.value = false
// return
// }
// }
console.log(ids.value)
var form = {
id:1,
projectMaterialPlanId:1,
@ -361,13 +371,13 @@ const opearteForm = async(type) =>{
await materialPlanBoomApi.updateMaterialPlanBoom(form);
message.success("去库存成功")
await getList()
}catch(e){
}catch{
loading.value = false
}finally{
loading.value = false
}
}
}else{
message.error("至少选择一项后进行操作!")
@ -478,8 +488,8 @@ const handleExport = async () => {
await message.exportConfirm()
//
exportLoading.value = true
const data = await ProcessBomApi.exportProcessBom(queryParams)
download.excel(data, '工艺bom.xls')
// const data = await ProcessBomApi.exportProcessBom(queryParams)
// download.excel(data, 'bom.xls')
} catch {
} finally {
exportLoading.value = false

View File

@ -7,7 +7,7 @@
<el-form-item label="物料名称" prop="matName" >
<el-input v-model="queryParams.matName" placeholder="物料名称" clearable @keyup.enter="handleQuery" class="!w-240px" />
</el-form-item>
<el-form-item >
<el-button @click="handleQuery" type="primary">
@ -22,7 +22,9 @@
<!-- 列表 -->
<ContentWrap>
<el-table ref="multipleTableRef" v-loading="loading" :data="list" :stripe="true" highlight-current-row @current-change="handleCurrentChange" :show-overflow-tooltip="true" class="hl-table">
<el-table
ref="multipleTableRef" v-loading="loading" :data="list" :stripe="true"
@row-click="clickRow" @selection-change="handleCurrentChange" :show-overflow-tooltip="true" class="hl-table">
<el-table-column
type="selection"
width="55"/>
@ -114,12 +116,28 @@ const getList = async () => {
}
const clickItem = ref([])
const handleCurrentChange = (val) => {
multipleTableRef.value!.clearSelection()
clickItem.value = val;
if(val.length > 1){
multipleTableRef.value!.clearSelection()
multipleTableRef.value!.toggleRowSelection(val.pop())
}
}
const clickRow = (row) => {
//
if ( clickItem.value[0] == row) {
//
clickItem.value = [];
multipleTableRef.value!.clearSelection()
} else {
//
clickItem.value.push(row);
multipleTableRef.value!.clearSelection()
multipleTableRef.value!.toggleRowSelection(row, true);
}
}
multipleTableRef.value!.toggleRowSelection(val, undefined)
};
/** 搜索按钮操作 */
const handleQuery = () => {
queryParams.pageNo = 1
@ -162,7 +180,8 @@ const emit = defineEmits(['success'])
// emit('success', multipleSelection.value)
const success = () =>{
dialogVisible.value = false;
emit('success',rowid.value,clickItem.value.storageOkQty,clickItem.value.id)
console.log(clickItem.value)
emit('success',rowid.value,clickItem.value[0].storageOkQty,clickItem.value[0].id,clickItem.value[0].matCode)
}
const handleRg = async (rgid) => {
pnCurrentList.value =[]

View File

@ -1,7 +1,7 @@
<template>
<el-card class="hl-card">
<template #header>
<span>物料需求计划管理</span>
<span>标准件库存</span>
</template>
<ContentWrap class="borderxx">
<!-- 搜索工作栏 -->
@ -62,14 +62,21 @@
<el-table-column label="子项目名称" align="center" prop="projectSubName" min-width="180px" />
<el-table-column min-width="200px" align="center" >
<template #header><span class="hl-table_header">*</span>物料编码</template>
<template #default="{ row, $index }">
<el-form-item :prop="`${$index}.matId`" class="mb-0px!" >
<el-select v-model="row.matId" placeholder="请输入物料" clearable filterable >
<el-option v-for="item in materialSelectList" :key="item.id" :label="item.code+' '+item.name" :value="item.id" />
</el-select>
<!-- <MaterialSelect v-model="row.matId" @update:newValue="handleSelected($index, $event)" clearable/>-->
<!-- <template #default="{ row, $index }">-->
<!-- <el-form-item :prop="`${$index}.matId`" class="mb-0px!" >-->
<!-- <el-select v-model="row.matId" placeholder="请输入物料" clearable filterable >-->
<!-- <el-option v-for="item in materialSelectList" :key="item.id" :label="item.code+' '+item.name" :value="item.id" />-->
<!-- </el-select>-->
<!--&lt;!&ndash; <MaterialSelect v-model="row.matId" @update:newValue="handleSelected($index, $event)" clearable/>&ndash;&gt;-->
</el-form-item>
<!-- </el-form-item>-->
<!-- </template>-->
<template #default="scope">
<el-input v-model="scope.row.matCode" disabled>
<template #suffix>
<Icon @click="serachLog(scope.row)" icon="ep:search" color="primary"/>
</template>
</el-input>
</template>
</el-table-column>
<el-table-column label="物料名称" align="center" prop="matName" min-width="180px" />
@ -100,6 +107,7 @@
<el-button
link
type="danger"
v-if="scope.row.isPurYard==2|| scope.row.isPurYard==5"
@click="operation('del',scope.row.id)"
>
删除
@ -116,6 +124,7 @@
</el-row>
</el-card>
</el-card>
<matLog ref="matLogRef" @success="getMat" />
</template>
@ -123,6 +132,7 @@
import {DICT_TYPE, getIntDictOptions} from '@/utils/dict'
import { dateFormatter1} from '@/utils/formatTime'
import * as MaterialPlanApi from '@/api/heli/materialplan'
import matLog from './storageLog.vue'
defineOptions({ name: 'MaterialPlan' })
@ -131,17 +141,14 @@ const formLoading = ref(false) // 表单的加载中1修改时的数据加
const message = useMessage() //
const { t } = useI18n() //
import download from '@/utils/download'
import UserSelect from "@/views/heli/materialplan/userSelectNew.vue";
import MaterialSelect from "@/views/heli/matreq/materialNewSelect.vue";
import {ref} from "vue";
import {ElTable} from "element-plus";
import {getStandardPartsPages} from "@/api/heli/materialplan";
import * as MatReqApi from "@/api/heli/matreq";
import {generate} from "@/api/heli/matreq";
import * as MaterialApi from "@/api/heli/material";
const loading = ref(true) //
const list = ref([]) //
const total = ref(0) //
const matLogRef = ref()
const queryParams = reactive({
pageNo: 1,
pageSize: 10,
@ -168,9 +175,9 @@ const queryFormRef = ref() // 搜索的表单
const exportLoading = ref(false) //
const multipleTable = ref<InstanceType<typeof ElTable>>()
const handleSelected = (currentIndex, newValue: any) => {
list.value[currentIndex].matId = newValue?.id
}
// const handleSelected = (currentIndex, newValue: any) => {
// list.value[currentIndex].matId = newValue?.id
// }
const jump = async () => {
router.push({ path: '/purchase/matreq' })
// tagsViewStore.delVisitedView(router.currentRoute.value)
@ -186,6 +193,19 @@ const getList = async () => {
loading.value = false
}
}
const serachLog = (row) => {
matLogRef.value.open(row.id)
}
const getMat = async (rowids,ids,matCodes) => {
//formData.value.boomItemDOList = arrBoom
for(var i = 0 ; i < list.value.length ; i ++){
if(list.value[i].id == rowids){
list.value[i].matCode = matCodes
list.value[i].matId = ids
break;
}
}
}
const submitForm = async () => {
try {
console.log("开始提交"); // 1
@ -305,7 +325,7 @@ const userInit = ref()
/** 初始化 **/
onMounted(async () => {
//
materialSelectList.value = await MaterialApi.getbzjList() ;
// materialSelectList.value = await MaterialApi.getbzjList() ;
getList()
})
</script>

View File

@ -0,0 +1,175 @@
<template>
<Dialog title="实时库存" v-model="dialogVisible" width="80%">
<el-card class="hl-card">
<ContentWrap class="borderxx">
<el-form class="-mb-15px" :model="queryParams" ref="queryFormRef" :inline="true" label-width="120px">
<el-form-item label="物料名称" prop="matName" >
<el-input v-model="queryParams.name" placeholder="物料名称" clearable @keyup.enter="handleQuery" class="!w-240px" />
</el-form-item>
<el-form-item label="规格型号" prop="matName" >
<el-input v-model="queryParams.spec" placeholder="规格型号" clearable @keyup.enter="handleQuery" class="!w-240px" />
</el-form-item>
<el-form-item label="物料简称" prop="shortName" >
<el-input v-model="queryParams.shortName" placeholder="物料简称" clearable @keyup.enter="handleQuery" class="!w-240px" />
</el-form-item>
<el-form-item >
<el-button @click="handleQuery" type="primary">
<Icon icon="ep:search" class="mr-5px" /> 搜索
</el-button>
<el-button @click="resetQuery">
<Icon icon="ep:refresh" class="mr-5px" /> 重置
</el-button>
</el-form-item>
</el-form>
</ContentWrap>
<!-- 列表 -->
<ContentWrap>
<el-table ref="multipleTableRef" v-loading="loading" :data="list" :stripe="true" @row-click="clickRow" @selection-change="handleCurrentChange" :show-overflow-tooltip="true" class="hl-table">
<el-table-column
type="selection"
width="55"/>
<el-table-column type="index" width="100" fixed label="序号" align="center" />
<el-table-column label="物料编码" align="center" prop="code" fixed min-width="120" />
<el-table-column label="物料名称" align="center" prop="name" fixed min-width="120"/>
<el-table-column label="物料类型" align="center" prop="materialType" min-width="120">
<template #default="scope">
<dict-tag :type="DICT_TYPE.HELI_MATERIAL_TYPE" :value="scope.row.materialType" />
</template>
</el-table-column>
<el-table-column label="物料简称" align="center" prop="shortName" min-width="120"/>
<el-table-column label="规格/型号" align="center" prop="spec" min-width="120"/>
</el-table>
<!-- 分页 -->
<Pagination
:total="total" v-model:page="queryParams.pageNo" v-model:limit="queryParams.pageSize"
@pagination="getList" />
</ContentWrap>
</el-card>
<template #footer>
<span class="dialog-footer">
<el-button @click="dialogVisible = false">取消</el-button>
<el-button type="primary" @click="success">
确认
</el-button>
</span>
</template>
</Dialog>
</template>
<script setup lang="ts">
import {DICT_TYPE} from "@/utils/dict";
import * as MaterialApi from "@/api/heli/material";
defineOptions({ name: 'StorageLog' })
const printref = ref()
const whList = ref([])
const rgList = ref([])
const pnList = ref([])
const dialogVisible = ref(false)
const message = useMessage() //
const { t } = useI18n() //
const loading = ref(true) //
const list = ref([]) //
const total = ref(0) //
const queryParams = reactive({
pageNo: 1,
pageSize: 10,
code: undefined,
name: undefined,
matType: undefined,
lotNo: undefined,
whId: undefined,
rgId:undefined,
pnId: undefined,
headerNo: undefined,
spec:undefined,
materialType:5,
status:1,
shortName:undefined
})
const queryFormRef = ref() //
const currentRow = ref()
const multipleTableRef = ref()
/** 查询列表 */
const getList = async () => {
loading.value = true
try {
const data = await MaterialApi.getbzjList(queryParams) ;
list.value = data.list
total.value = data.total
} finally {
loading.value = false
}
}
const clickItem = ref([])
const handleCurrentChange = (val) => {
clickItem.value = val;
if(val.length > 1){
multipleTableRef.value!.clearSelection()
multipleTableRef.value!.toggleRowSelection(val.pop())
}
};
const clickRow = (row) => {
if (clickItem.value==null){
clickItem.value = [];
}
//
if ( clickItem.value[0] == row) {
//
clickItem.value = [];
multipleTableRef.value!.clearSelection()
} else {
//
clickItem.value.push(row);
multipleTableRef.value!.clearSelection()
multipleTableRef.value!.toggleRowSelection(row, true);
}
}
/** 搜索按钮操作 */
const handleQuery = () => {
queryParams.pageNo = 1
getList()
}
/** 重置按钮操作 */
const resetQuery = () => {
queryFormRef.value.resetFields()
handleQuery()
}
const rowid = ref()
const open = async (rowids) => {
clickItem.value = null;
//multipleTableRef.value!.clearSelection()
dialogVisible.value = true
// queryParams.matName = matCode;
rowid.value = rowids
console.log(rowids)
console.log(rowid.value)
await getList();
}
defineExpose({ open }) // open
const emit = defineEmits(['success'])
// emit('success', multipleSelection.value)
const success = () => {
dialogVisible.value = false;
emit('success', rowid.value, clickItem.value[0].id, clickItem.value[0].code)
}
/** 初始化 **/
onMounted(async () => {
await getList()
})
</script>

View File

@ -0,0 +1,263 @@
<template>
<el-card class="hl-card">
<template #header>
<span>零件采购</span>
</template>
<ContentWrap class="borderxx">
<!-- 搜索工作栏 -->
<el-form class="-mb-15px" :model="queryParams" ref="queryFormRef" :inline="true" label-width="120px">
<el-form-item label="项目名称" prop="projectName">
<el-input v-model="queryParams.projectName" placeholder="请输入项目名称" clearable @keyup.enter="handleQuery" class="!w-240px" />
</el-form-item>
<el-form-item label="子项目名称" prop="projectSubName">
<el-input v-model="queryParams.projectSubName" placeholder="请输入子项目名称" clearable @keyup.enter="handleQuery" class="!w-240px" />
</el-form-item>
<el-form-item label="零件名称" prop="matName">
<el-input v-model="queryParams.matName" placeholder="请输入零件名称" clearable @keyup.enter="handleQuery" class="!w-240px" />
</el-form-item>
<el-form-item label="项目编码" prop="projectCode">
<el-input v-model="queryParams.projectCode" placeholder="请输入项目编号" clearable @keyup.enter="handleQuery" class="!w-240px" />
</el-form-item>
<el-form-item label="责任人" prop="duEmpName">
<el-input v-model="queryParams.duEmpName" placeholder="请输入责任人" clearable @keyup.enter="handleQuery" class="!w-240px"/>
</el-form-item>
<el-form-item label="采购状态" prop="mplanStatus">
<el-select v-model="queryParams.mplanStatus" placeholder="请选择采购状态" clearable class="!w-240px">
<el-option v-for="dict in getIntDictOptions(DICT_TYPE.MATERIAL_PLAN_BOOM_MPLAN_STATUS)" :key="dict.value" :label="dict.label" :value="dict.value" />
</el-select>
</el-form-item>
<el-form-item label="物料需求单号" prop="projectMaterialPlanNo">
<el-input v-model="queryParams.projectMaterialPlanNo" placeholder="请输入物料需求单号" clearable @keyup.enter="handleQuery" class="!w-240px" />
</el-form-item>
<el-form-item style="margin-left:30px">
<el-button @click="handleQuery" type="primary">
<Icon icon="ep:search" class="mr-5px" /> 搜索
</el-button>
<el-button @click="resetQuery">
<Icon icon="ep:refresh" class="mr-5px" /> 重置
</el-button>
<el-button
type="success"
plain
@click="handleExportDetail"
:loading="exportLoading"
>
<Icon icon="ep:download" class="mr-5px" /> 导出
</el-button>
</el-form-item>
</el-form>
</ContentWrap>
<!-- 列表 -->
<el-card class="hl-card-info">
<template #header>
<div class="hl-card-info-icona"></div><span class="hl-card-info-text">零件明细</span>
<el-button style="margin-left: 18px" @click="singleSubmissions()" type="success" size="large">送审</el-button>
</template>
<el-row>
<el-col>
<el-card class="hl-incard">
<el-form ref="multipleTable" :model="list" v-loading="formLoading" label-width="0" >
<el-table v-loading="loading" :data="list" :show-overflow-tooltip="true" class="hl-table" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" />
<el-table-column fixed label="序号" align="center" type="index" width="60" />
<el-table-column label="工序" align="center" prop="procedureName" min-width="100" >
<template #default="scope">
<el-button text type="primary">
{{ scope.row.procedureName }}
</el-button>
</template>
</el-table-column>
<el-table-column label="客户简称" align="center" prop="brief" min-width="180" />
<el-table-column label="项目名称" align="center" prop="projectName" min-width="180" />
<el-table-column label="零件名称" align="center" prop="matName" min-width="180" />
<el-table-column label="材质" align="center" prop="compositionName" min-width="120" />
<el-table-column label="图号" align="center" prop="blueprintNo" min-width="120" />
<el-table-column label="需求数量" align="center" prop="boomAmount" min-width="120" />
<el-table-column label="单位" align="center" prop="unit" min-width="120" />
<el-table-column label="责任人" align="center" prop="duEmpName" min-width="120" />
<el-table-column label="状态" align="center" prop="mplanStatus" min-width="120" />
<el-table-column label="采购单号" align="center" prop="purchaseNo" min-width="120" />
</el-table>
<!-- 分页 -->
<Pagination :total="total" v-model:page="queryParams.pageNo" v-model:limit="queryParams.pageSize" @pagination="getList" />
</el-form>
</el-card>
</el-col>
</el-row>
</el-card>
</el-card>
</template>
<script setup lang="ts">
import { getIntDictOptions, DICT_TYPE } from '@/utils/dict'
import download from '@/utils/download'
import { useCommonStateWithOut } from '@/store/modules/common'
import UserSelect from "@/views/heli/materialplan/userSelectNew.vue";
import {inject, ref} from "vue";
import * as MaterialPlanApi from "@/api/heli/materialplan";
import * as PartPurchaseOrderApi from "@/api/heli/partpurchaseorder";
import {ElTable} from "element-plus";
import {useUserStore} from "@/store/modules/user";
import {dateFormatter1} from "@/utils/formatTime";
import {getPartPurchasePages} from "@/api/heli/materialplan";
const formLoading = ref(false) // 12
defineOptions({ name: 'standard' })
const userStore = useUserStore()
const username = userStore.getUser.nickname
const reload: any = inject('reload')
const commonStore = useCommonStateWithOut()
const message = useMessage() //
const { t } = useI18n() //
const router = useRouter()
const multipleTable = ref<InstanceType<typeof ElTable>>()
const multipleSelection = ref([])
const loading = ref(true) //
const list = ref([]) //
const total = ref(0) //
const queryParams = reactive({
pageNo: 1,
pageSize: 10,
code: undefined,
planCode: undefined,
projectCode: undefined,
projectSubCode: undefined,
customerName: undefined,
projectName: undefined,
projectSubName: undefined,
version: undefined,
bomStatus: undefined,
remark: undefined,
mplanStatus: 0,
createTime: [],
duEmpName:username,
materialName:undefined,
matName:undefined,
projectMaterialPlanNo:undefined,
})
const queryFormRef = ref() //
const exportLoading = ref(false) //
/** 查询列表 */
const getList = async () => {
loading.value = true
try {
// const data = await MaterialPlanApi.getPartPurchasePages(queryParams)
// list.value = data.list
// total.value = data.total
await MaterialPlanApi.getPartPurchasePages()
} finally {
loading.value = false
}
}
/** 导出按钮操作 */
const handleExportDetail = async () => {
try {
//
await message.exportConfirm()
//
exportLoading.value = true
const data = await MaterialPlanApi.exportPart(queryParams)
download.excel(data, '零件物料需求计划.xlsx')
} catch {
} finally {
exportLoading.value = false
}
}
const handleSelectionChange = (val) => {
// multipleTable.value.clearSelection()
multipleTable.value=val
}
/** 搜索按钮操作 */
const handleQuery = () => {
queryParams.pageNo = 1
getList()
}
const handleSelectedUser = (currentIndex, newValue: any) => {
list.value[currentIndex].duEmpId = newValue?.id
}
const singleSubmission= (val) =>{
multipleTable.value=[]
multipleTable.value.push(val)
submitForm();
}
const routerToPurchaseOrderNo=()=>{
router.push({ path: '/purchase/purchaseorderno'});
}
const singleSubmissions=()=>{
submitForm();
}
const submitForm = async () => {
try {
console.log("开始提交"); // 1
const list = multipleTable.value|| []; //
console.log("明细数据:", list);
console.log(list.length)
// 1.
if (!list || list.length==null) {
message.error("提交明细不能为空,请确认");
return;
}
// 2.
const firstSupplierId = list[0].supplierId;
if (list.some(item => item.supplierId !== firstSupplierId)) {
message.error("零件采购订单不属于同一个供应商,请确认");
return;
}
// 4. Element Plus
formLoading.value = true;
// 5.
const res = await Promise.race([
PartPurchaseOrderApi.submitForm(list),
new Promise((_, reject) =>
setTimeout(() => reject(new Error("请求超时")), 30000)
)
]);
message.success("提交成功");
getList(); //
emit('success');
} catch (error) {
console.error("提交失败:", error);
// message.error(`: ${error.message || ""}`);
} finally {
formLoading.value = false;
}
}
const withdraw = async () => {
if (queryParams.projectMaterialPlanNo==null){
message.error("物料需求单号为空,不允许撤回")
return
}
await MaterialPlanApi.withdraw(queryParams.projectMaterialPlanNo)
message.success("撤回成功")
//
getList()
emit('success')
}
/** 重置按钮操作 */
const resetQuery = () => {
queryFormRef.value.resetFields()
handleQuery()
}
/** 初始化 **/
onMounted(() => {
getList()
})
</script>
<style>
/* 占位样式 */
</style>

View File

@ -17,8 +17,8 @@
<el-col :span="6">
<el-row>
<el-col :span="24">
<el-form-item label="采购单号" prop="contractNo">
<el-input class="!w-300px" placeholder="系统自动生成" v-model="formData.contractNo" disabled />
<el-form-item label="采购单号" prop="purchaseNo">
<el-input class="!w-300px" placeholder="系统自动生成" v-model="formData.purchaseNo" disabled />
</el-form-item>
</el-col>
</el-row>
@ -60,8 +60,14 @@
</el-card>
</el-form>
<div class="hl-footer text-center">
<el-button v-if="formData.type === 'check'" @click="approve" size="large"> </el-button>
<el-button v-if="formData.type === 'cehck'" @click="handleReject" size="large"> </el-button>
<template v-if="formData.type === 'check'">
<el-button @click="approve" size="large"> </el-button>
<el-button @click="handleReject" size="large"> </el-button>
<el-button @click="cancel" size="large"> </el-button>
</template>
<template v-if="formData.type === 'detail'">
<el-button @click="cancel" size="large"> </el-button>
</template>
</div>
</el-card>
@ -101,7 +107,7 @@ const dialogVisible = ref(false) // 弹窗的是否展示
const formLoading = ref(false) // 12
const formData = ref({
id: undefined,
contractNo: undefined,
purchaseNo: undefined,
projectId: undefined,
projectPlanId: undefined,
projectPlanNo: undefined,
@ -115,7 +121,7 @@ const formData = ref({
matBoomDOList: [],
matItemRemoveList: [],
attachments: [],
type: query.type
type: undefined,
})
const formRef = ref() // Ref
@ -131,7 +137,8 @@ const updateParams = reactive({
const approve = async () => {
await PartPurchaseOrderApi.updatePurchaseOrderMake(formData.value.id)
console.log("批准成功")
message.success("提交成功");
getList();
}
const handleReject = async () => {
@ -158,9 +165,13 @@ const reject = async(reason) => {
updateParams.reason = reason
//
await PartPurchaseOrderApi.updatePurchaseOrderMakeNo(updateParams)
console.log("驳回成功")
message.success("已驳回");
getList();
}
const cancel = async () => {
router.push({ path: '/purchase/PartPurchaseCheck'});
}
const closeForm = async () => {
router.push({ path: '/purchase/management' })
@ -177,6 +188,7 @@ const queryParams = reactive({
onMounted(async () => {
//
formData.value = await PartPurchaseOrderApi.getPurchaseOrderMake(query.id)
formData.value.type = query.type
getList();
})
const getList = async () => {

View File

@ -6,8 +6,8 @@
<ContentWrap class="borderxx">
<!-- 搜索工作栏 -->
<el-form class="-mb-15px" :model="queryParams" ref="queryFormRef" :inline="true" label-width="130px">
<el-form-item label="采购单号" prop="contractNo">
<el-input v-model="queryParams.contractNo" placeholder="采购单号" clearable @keyup.enter="handleQuery"
<el-form-item label="采购单号" prop="purchaseNo">
<el-input v-model="queryParams.purchaseNo" placeholder="采购单号" clearable @keyup.enter="handleQuery"
class="!w-240px" />
</el-form-item>
<el-form-item label="项目名称" prop="projectName">
@ -46,10 +46,10 @@
<ContentWrap>
<el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true" class="hl-table">
<el-table-column label="序号" type="index" align="center" fixed min-width="70px" />
<el-table-column label="采购单号" align="center" prop="contractNo" min-width="180" fixed>
<el-table-column label="采购单号" align="center" prop="purchaseNo" min-width="180" fixed>
<template #default="scope">
<el-button text type="primary" @click="openForm('detail', scope.row.id)">
{{ scope.row.contractNo }}
{{ scope.row.purchaseNo }}
</el-button>
</template>
</el-table-column>
@ -80,7 +80,7 @@
v-if="scope.row.status === 1"
link
type="primary"
@click="openForm('detail', scope.row.id)"
@click="openForm('check', scope.row.id)"
>
去审核
</el-button>
@ -119,7 +119,7 @@ const queryParams = reactive({
pageNo: 1,
pageSize: 10,
id: undefined,
contractNo: undefined,
purchaseNo: undefined,
projectId: undefined,
projectPlanId: undefined,
submitUserId: undefined,

View File

@ -167,7 +167,7 @@
<el-table-column label="规格型号" prop="spec" min-width="140">
<template #default="{ row, $index }">
<span v-if="row.type == '2'" v-html="row.spec"></span>
<el-form-item v-else :prop="`${$index}.spec`" :rules="subFormRules.spec" class="mb-0px!">
<el-form-item v-else :prop="`${$index}.spec`" class="mb-0px!">
<el-input :disabled="getDisable(row.bomEditStatus)" v-model="row.spec" />
</el-form-item>
</template>

View File

@ -24,12 +24,12 @@
</el-row>
</el-col>
<el-col :span="6">
<el-form-item label="单据日期" prop="ordDate">
<el-form-item label="入库日期" prop="ordDate">
<el-date-picker
v-model="formData.ordDate"
type="date"
value-format="x"
placeholder="单据日期"
placeholder="入库日期"
disabled
/>
</el-form-item>

View File

@ -8,7 +8,7 @@
<el-form class="-mb-15px" :model="queryParams" ref="storageNo" :inline="true" label-width="120px">
<el-form-item label="入库单号" prop="storageNo">
<el-input
v-model="queryParams.purchaseNo" placeholder="采购单号" clearable @keyup.enter="handleQuery"
v-model="queryParams.purchaseNo" placeholder="入库单号" clearable @keyup.enter="handleQuery"
class="!w-240px" />
</el-form-item>
<el-form-item label="项目名称" prop="projectName">

View File

@ -90,7 +90,7 @@ v-for="dict in pnCurrentList" :key="dict.id" :label="dict.pn_name"
<template #header><span class="hl-table_header">*</span>补充数量</template>
<template #default="{ row, $index }">
<el-form-item :prop="`${$index}.storageOkQtys`" class="mb-0px!" style="margin-left:10px ">
<el-input-number v-model="row.storageOkQtys" type="number" :precision="2" />
<el-input-number v-model="row.storageOkQtys" type="number" :precision="2" :min="0" />
</el-form-item>
</template>
</el-table-column>

View File

@ -87,7 +87,6 @@ import { dateFormatter1} from '@/utils/formatTime'
import * as MaterialPlanApi from '@/api/heli/materialplan'
import * as UserApi from '@/api/system/user'
import dayjs from "dayjs";
import {delMaterial} from "@/api/heli/materialplan";
defineOptions({ name: 'MaterialPlan' })
@ -171,11 +170,12 @@ const handleDelete = async (id: number) => {
try {
//
await message.delConfirm()
//
await MaterialPlanApi.delMaterial(id)
message.success(t('common.delSuccess'))
//
await getList()
await getList()
} catch { }
}
const setDefaultDate = () => {

View File

@ -307,7 +307,7 @@ v-for="dict in userInit" :key="dict.id"
<template #header> <span class="hl-table_header">*</span>负责人</template>
<template #default="{ row, $index }">
<el-form-item :prop="`${$index}.ownerNames`" :rules="subFormRules.owner" class="mb-0px!">
<el-input
<el-input
class="!w-265px"
placeholder="负责人"
v-model="row.ownerNames"

View File

@ -800,7 +800,7 @@ const dispatchTypeHasChange = (row) =>{
}else{
row.postId = ownerList2.value[0].id;
}
}
}
watch(
@ -1531,7 +1531,7 @@ const onAddItem = () => {
}else{
row.endTime = formData.value.requiredCompletedDate
}
}
row.testYn = 'N'
// row.isOutsourcing = true;
@ -1652,6 +1652,8 @@ const goback = () => {
var listdetail = ref([]);
/** 删除子项操作 */
const onDeleteItem = async (row,index) => {
let id = row.id
if (id) await TaskDispatchApi.deleteTaskDispatchDetail(id)
var list = [];
listdetail.value = [];
var indexs = 1;
@ -1672,8 +1674,6 @@ const onDeleteItem = async (row,index) => {
}
checkList.value = list;
checkListTemp.value = checkList.value;
let id = row.id
if (id) await TaskDispatchApi.deleteTaskDispatchDetail(id)
message.success(t('common.delSuccess'))
}
const handleOutsourcingChange= async (row: any) => {