库存导入及订单删除
This commit is contained in:
parent
611461c859
commit
cb45e5b246
@ -166,7 +166,14 @@ public class ProjectOrderController {
|
||||
projectOrderService.deleteProjectOrder(id);
|
||||
return success(true);
|
||||
}
|
||||
|
||||
@DeleteMapping("/deleteOrder")
|
||||
@Operation(summary = "删除项目订单")
|
||||
@Parameter(name = "id", description = "编号", required = true)
|
||||
@PreAuthorize("@ss.hasPermission('heli:project-order:delete')")
|
||||
public CommonResult<Boolean> deleteOrder(@RequestParam("id") Long id) {
|
||||
projectOrderService.deleteOrder(id);
|
||||
return success(true);
|
||||
}
|
||||
@GetMapping("/get")
|
||||
@Operation(summary = "获得项目订单")
|
||||
@Parameter(name = "id", description = "编号", required = true, example = "1024")
|
||||
|
@ -16,8 +16,10 @@ import com.chanko.yunxi.mes.module.heli.dal.dataobject.taskreport.TaskReportDO;
|
||||
import com.chanko.yunxi.mes.module.heli.enums.ProjectPlanStatusEnum;
|
||||
import com.chanko.yunxi.mes.module.system.dal.dataobject.user.AdminUserDO;
|
||||
import com.github.yulichang.wrapper.MPJLambdaWrapper;
|
||||
import org.apache.ibatis.annotations.Delete;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
import com.chanko.yunxi.mes.module.heli.controller.admin.plan.vo.*;
|
||||
import org.apache.ibatis.annotations.Param;
|
||||
import org.springframework.util.StringUtils;
|
||||
|
||||
/**
|
||||
@ -124,5 +126,6 @@ public interface PlanMapper extends BaseMapperX<PlanDO> {
|
||||
// }
|
||||
List<PlanDO> selectfhtj(Long txrid);
|
||||
List<PlanDO> selectfhtj1();
|
||||
|
||||
@Delete("delete from project_plan where project_id=#{id}")
|
||||
void deleteOrderId(@Param("id") Long id);
|
||||
}
|
@ -18,8 +18,10 @@ import com.chanko.yunxi.mes.module.heli.dal.dataobject.processbom.ProcessBomDeta
|
||||
import com.chanko.yunxi.mes.module.heli.dal.dataobject.projectorder.ProjectOrderDO;
|
||||
import com.chanko.yunxi.mes.module.heli.dal.dataobject.projectorder.ProjectOrderSubDO;
|
||||
import com.github.yulichang.wrapper.MPJLambdaWrapper;
|
||||
import org.apache.ibatis.annotations.Delete;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
import com.chanko.yunxi.mes.module.heli.controller.admin.plansub.vo.*;
|
||||
import org.apache.ibatis.annotations.Param;
|
||||
|
||||
/**
|
||||
* 生产计划子项目 Mapper
|
||||
@ -291,4 +293,6 @@ public interface PlanSubMapper extends BaseMapperX<PlanSubDO> {
|
||||
.eq(ProcessBomDO::getId,bomId);
|
||||
return selectOne(query);
|
||||
}
|
||||
@Delete("delete from project_plan_sub where project_id=#{id}")
|
||||
void deleteOrderId(@Param("id") Long id);
|
||||
}
|
||||
|
@ -16,6 +16,7 @@ import com.chanko.yunxi.mes.module.heli.dal.dataobject.projectorder.ProjectOrder
|
||||
import com.chanko.yunxi.mes.module.heli.enums.ProcessDesignTypeEnum;
|
||||
import com.chanko.yunxi.mes.module.system.dal.dataobject.user.AdminUserDO;
|
||||
import com.github.yulichang.wrapper.MPJLambdaWrapper;
|
||||
import org.apache.ibatis.annotations.Delete;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
import com.chanko.yunxi.mes.module.heli.controller.admin.plansubdetail.vo.*;
|
||||
import org.apache.ibatis.annotations.Param;
|
||||
@ -70,5 +71,6 @@ public interface PlanSubDetailMapper extends BaseMapperX<PlanSubDetailDO> {
|
||||
.in(PlanSubDetailDO::getIsOverProcess,0,2);
|
||||
return selectList(query);
|
||||
}
|
||||
|
||||
@Delete("delete from project_plan_sub_detail where project_id = #{id}")
|
||||
void deleteOrderId(@Param("id") Long id);
|
||||
}
|
||||
|
@ -17,6 +17,7 @@ import com.chanko.yunxi.mes.module.heli.dal.dataobject.projectorder.ProjectOrder
|
||||
import com.chanko.yunxi.mes.module.system.dal.dataobject.dept.DeptDO;
|
||||
import com.chanko.yunxi.mes.module.system.dal.dataobject.user.AdminUserDO;
|
||||
import com.github.yulichang.wrapper.MPJLambdaWrapper;
|
||||
import org.apache.ibatis.annotations.Delete;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
import com.chanko.yunxi.mes.module.heli.controller.admin.plantask.vo.*;
|
||||
import org.apache.ibatis.annotations.Param;
|
||||
@ -104,4 +105,6 @@ public interface PlanTaskMapper extends BaseMapperX<PlanTaskDO> {
|
||||
.collect(Collectors.toList());
|
||||
|
||||
}
|
||||
@Delete("DELETE FROM project_plan_task WHERE project_id = #{id}")
|
||||
void deleteOrderId(@Param("id") Long id);
|
||||
}
|
||||
|
@ -14,6 +14,7 @@ import com.chanko.yunxi.mes.module.heli.dal.dataobject.projectorder.ProjectOrder
|
||||
import com.chanko.yunxi.mes.module.heli.dal.dataobject.projectorder.ProjectOrderSubDO;
|
||||
import com.chanko.yunxi.mes.module.system.dal.dataobject.user.AdminUserDO;
|
||||
import com.github.yulichang.wrapper.MPJLambdaWrapper;
|
||||
import org.apache.ibatis.annotations.Delete;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
import org.apache.ibatis.annotations.Param;
|
||||
import org.springframework.util.StringUtils;
|
||||
@ -109,4 +110,11 @@ public interface PlanTaskBomMapper extends BaseMapperX<PlanTaskBomDO> {
|
||||
;
|
||||
return selectList(query);
|
||||
}
|
||||
@Delete("<script>" +
|
||||
"DELETE FROM project_plan_task_bom WHERE task_id IN " +
|
||||
"<foreach collection='idList' item='id' open='(' separator=',' close=')'>" +
|
||||
"#{id}" +
|
||||
"</foreach>" +
|
||||
"</script>")
|
||||
void deleteOrderId(@Param("idList") List<Long> idList);
|
||||
}
|
||||
|
@ -28,6 +28,7 @@ import com.chanko.yunxi.mes.module.heli.dal.dataobject.projectorder.ProjectOrder
|
||||
import com.chanko.yunxi.mes.module.heli.dal.dataobject.storagelogNow.StorageLogNowDO;
|
||||
import com.chanko.yunxi.mes.module.system.dal.dataobject.user.AdminUserDO;
|
||||
import com.github.yulichang.wrapper.MPJLambdaWrapper;
|
||||
import org.apache.ibatis.annotations.Delete;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
import org.apache.ibatis.annotations.Param;
|
||||
import org.apache.ibatis.annotations.Select;
|
||||
@ -301,4 +302,11 @@ public interface ProcessBomDetailMapper extends BaseMapperX<ProcessBomDetailDO>
|
||||
.eq(ProcessBomDetailDO::getType,1);
|
||||
return selectPage(pageReqVO, query);
|
||||
}
|
||||
@Delete("<script>" +
|
||||
"DELETE FROM pro_process_bom_detail WHERE bom_id IN " +
|
||||
"<foreach collection='idList' item='id' open='(' separator=',' close=')'>" +
|
||||
"#{id}" +
|
||||
"</foreach>" +
|
||||
"</script>")
|
||||
void deleteOrderId(@Param("idList") List<Long> idList);
|
||||
}
|
||||
|
@ -13,6 +13,7 @@ import com.chanko.yunxi.mes.module.heli.dal.dataobject.processbom.ProcessBomDeta
|
||||
import com.chanko.yunxi.mes.module.heli.dal.dataobject.projectorder.ProjectOrderDO;
|
||||
import com.chanko.yunxi.mes.module.heli.dal.dataobject.projectorder.ProjectOrderSubDO;
|
||||
import com.github.yulichang.wrapper.MPJLambdaWrapper;
|
||||
import org.apache.ibatis.annotations.Delete;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
import org.apache.ibatis.annotations.Param;
|
||||
import org.springframework.util.StringUtils;
|
||||
@ -207,4 +208,6 @@ public interface ProcessBomMapper extends BaseMapperX<ProcessBomDO> {
|
||||
void delMaterialPlan(@Param("id")Long id);
|
||||
|
||||
BigDecimal outsourcingExpenses(@Param("id") Long id,@Param("projectSubId") Long projectSubId);
|
||||
@Delete("delete from pro_process_bom where project_id=#{id}")
|
||||
void deleteOrderId(@Param("id") Long id);
|
||||
}
|
||||
|
@ -13,7 +13,9 @@ import com.chanko.yunxi.mes.module.heli.dal.dataobject.projectorder.ProjectOrder
|
||||
import com.chanko.yunxi.mes.module.system.dal.dataobject.dept.DeptDO;
|
||||
import com.chanko.yunxi.mes.module.system.dal.dataobject.user.AdminUserDO;
|
||||
import com.github.yulichang.wrapper.MPJLambdaWrapper;
|
||||
import org.apache.ibatis.annotations.Delete;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
import org.apache.ibatis.annotations.Param;
|
||||
import org.springframework.util.StringUtils;
|
||||
|
||||
/**
|
||||
@ -137,5 +139,6 @@ public interface ProjectOrderMapper extends BaseMapperX<ProjectOrderDO> {
|
||||
.disableSubLogicDel();
|
||||
return selectOne(query);
|
||||
}
|
||||
|
||||
@Delete("delete from project_sale_order where id = #{id}")
|
||||
void deleteOrderId(@Param("id") Long id);
|
||||
}
|
||||
|
@ -15,7 +15,9 @@ import com.chanko.yunxi.mes.module.heli.enums.ProjectOrderStatusEnum;
|
||||
import com.chanko.yunxi.mes.module.heli.enums.YesOrNoEnum;
|
||||
import com.chanko.yunxi.mes.module.infra.dal.dataobject.file.FileDO;
|
||||
import com.github.yulichang.wrapper.MPJLambdaWrapper;
|
||||
import org.apache.ibatis.annotations.Delete;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
import org.apache.ibatis.annotations.Param;
|
||||
import org.springframework.util.StringUtils;
|
||||
|
||||
import java.util.List;
|
||||
@ -147,4 +149,6 @@ public interface ProjectOrderSubMapper extends BaseMapperX<ProjectOrderSubDO> {
|
||||
|
||||
return selectPage(pageReqVO, query);
|
||||
}
|
||||
@Delete("delete from project_sale_order_sub where project_order_id = #{id}")
|
||||
void delByProjectOrderId(@Param("id") Long id);
|
||||
}
|
||||
|
@ -33,6 +33,7 @@ import com.chanko.yunxi.mes.module.heli.dal.dataobject.taskreport.TaskReportDO;
|
||||
import com.chanko.yunxi.mes.module.heli.dal.mysql.materialplanboom.MaterialPlanBoomMapper;
|
||||
import com.chanko.yunxi.mes.module.system.dal.dataobject.user.AdminUserDO;
|
||||
import com.github.yulichang.wrapper.MPJLambdaWrapper;
|
||||
import org.apache.ibatis.annotations.Delete;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
import org.apache.ibatis.annotations.Param;
|
||||
import org.springframework.beans.BeanUtils;
|
||||
@ -869,4 +870,12 @@ public interface TaskDispatchDetailMapper extends BaseMapperX<TaskDispatchDetail
|
||||
|
||||
|
||||
}
|
||||
|
||||
@Delete("<script>" +
|
||||
"DELETE FROM pro_task_dispatch_detail WHERE dispatch_id IN " +
|
||||
"<foreach collection='idList' item='id' open='(' separator=',' close=')'>" +
|
||||
"#{id}" +
|
||||
"</foreach>" +
|
||||
"</script>")
|
||||
void deleteOrderId(@Param("idList") List<Long> idList);
|
||||
}
|
||||
|
@ -24,7 +24,9 @@ import com.chanko.yunxi.mes.module.system.dal.dataobject.dept.PostDO;
|
||||
import com.chanko.yunxi.mes.module.system.dal.dataobject.dept.UserPostDO;
|
||||
import com.chanko.yunxi.mes.module.system.dal.dataobject.user.AdminUserDO;
|
||||
import com.github.yulichang.wrapper.MPJLambdaWrapper;
|
||||
import org.apache.ibatis.annotations.Delete;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
import org.apache.ibatis.annotations.Param;
|
||||
import org.springframework.util.StringUtils;
|
||||
|
||||
import java.util.List;
|
||||
@ -204,4 +206,6 @@ public interface TaskDispatchMapper extends BaseMapperX<TaskDispatchDO> {
|
||||
return selectList(query);
|
||||
|
||||
}
|
||||
@Delete("delete from pro_task_dispatch where project_id=#{id}")
|
||||
void deleteOrderId(@Param("id") Long id);
|
||||
}
|
||||
|
@ -89,4 +89,6 @@ public interface ProjectOrderService {
|
||||
void showzbmoney(Long id);
|
||||
|
||||
List<ProjectOrderSubDO> getProjectOrderSubListByProjectOrderIdGt(Long projectOrderId);
|
||||
|
||||
void deleteOrder(Long id);
|
||||
}
|
||||
|
@ -18,21 +18,34 @@ import com.chanko.yunxi.mes.module.heli.dal.dataobject.attentiontodo.Attentionto
|
||||
import com.chanko.yunxi.mes.module.heli.dal.dataobject.bdgzsomthing.bdgzsomthingDO;
|
||||
import com.chanko.yunxi.mes.module.heli.dal.dataobject.deliverorder.DeliverOrderDO;
|
||||
import com.chanko.yunxi.mes.module.heli.dal.dataobject.deliverorder.DeliverOrderSubDO;
|
||||
import com.chanko.yunxi.mes.module.heli.dal.dataobject.materialplan.MaterialPlanDO;
|
||||
import com.chanko.yunxi.mes.module.heli.dal.dataobject.orderys.OrderYsDO;
|
||||
import com.chanko.yunxi.mes.module.heli.dal.dataobject.plan.PlanDO;
|
||||
import com.chanko.yunxi.mes.module.heli.dal.dataobject.plansub.PlanSubDO;
|
||||
import com.chanko.yunxi.mes.module.heli.dal.dataobject.plansubdetail.PlanSubDetailDO;
|
||||
import com.chanko.yunxi.mes.module.heli.dal.dataobject.plantask.PlanTaskDO;
|
||||
import com.chanko.yunxi.mes.module.heli.dal.dataobject.plantaskbom.PlanTaskBomDO;
|
||||
import com.chanko.yunxi.mes.module.heli.dal.dataobject.processbom.ProcessBomDO;
|
||||
import com.chanko.yunxi.mes.module.heli.dal.dataobject.processbom.ProcessBomDetailDO;
|
||||
import com.chanko.yunxi.mes.module.heli.dal.dataobject.projectorder.ProjectOrderDO;
|
||||
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;
|
||||
import com.chanko.yunxi.mes.module.heli.dal.dataobject.taskdispatch.TaskDispatchDetailDO;
|
||||
import com.chanko.yunxi.mes.module.heli.dal.mysql.bdgzsomthing.bdgzsomthingMapper;
|
||||
import com.chanko.yunxi.mes.module.heli.dal.mysql.deliverorder.DeliverOrderSubMapper;
|
||||
import com.chanko.yunxi.mes.module.heli.dal.mysql.orderys.OrderYsMapper;
|
||||
import com.chanko.yunxi.mes.module.heli.dal.mysql.plan.PlanMapper;
|
||||
import com.chanko.yunxi.mes.module.heli.dal.mysql.plansub.PlanSubMapper;
|
||||
import com.chanko.yunxi.mes.module.heli.dal.mysql.plansubdetail.PlanSubDetailMapper;
|
||||
import com.chanko.yunxi.mes.module.heli.dal.mysql.plantask.PlanTaskMapper;
|
||||
import com.chanko.yunxi.mes.module.heli.dal.mysql.plantaskbom.PlanTaskBomMapper;
|
||||
import com.chanko.yunxi.mes.module.heli.dal.mysql.processbom.ProcessBomDetailMapper;
|
||||
import com.chanko.yunxi.mes.module.heli.dal.mysql.processbom.ProcessBomMapper;
|
||||
import com.chanko.yunxi.mes.module.heli.dal.mysql.projectorder.ProjectOrderMapper;
|
||||
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;
|
||||
import com.chanko.yunxi.mes.module.heli.enums.BusinesTypeEnum;
|
||||
import com.chanko.yunxi.mes.module.heli.enums.DeliverOrderStatusEnum;
|
||||
import com.chanko.yunxi.mes.module.heli.enums.ProjectOrderStatusEnum;
|
||||
@ -63,11 +76,11 @@ import java.text.SimpleDateFormat;
|
||||
import java.time.LocalDateTime;
|
||||
import java.util.*;
|
||||
import java.util.stream.Collectors;
|
||||
import java.util.stream.Stream;
|
||||
|
||||
import static com.chanko.yunxi.mes.framework.common.exception.util.ServiceExceptionUtil.exception;
|
||||
import static com.chanko.yunxi.mes.module.heli.enums.CodeEnum.PROJECT_ORDER;
|
||||
import static com.chanko.yunxi.mes.module.heli.enums.ErrorCodeConstants.INVALID_OPERATE;
|
||||
import static com.chanko.yunxi.mes.module.heli.enums.ErrorCodeConstants.PROJECT_ORDER_NOT_EXISTS;
|
||||
import static com.chanko.yunxi.mes.module.heli.enums.ErrorCodeConstants.*;
|
||||
|
||||
/**
|
||||
* 项目订单 Service 实现类
|
||||
@ -117,6 +130,20 @@ public class ProjectOrderServiceImpl implements ProjectOrderService {
|
||||
private ProcessBomDetailMapper processBomDetailDOMapper;
|
||||
@Resource
|
||||
private PlanSubMapper planSubMapper;
|
||||
@Resource
|
||||
private PlanMapper planMapper;
|
||||
@Resource
|
||||
private PlanTaskMapper planTaskMapper;
|
||||
@Resource
|
||||
private PlanTaskBomMapper planTaskBomMapper;
|
||||
@Resource
|
||||
private TaskDispatchMapper taskDispatchMapper;
|
||||
@Resource
|
||||
private TaskDispatchDetailMapper taskDispatchDetailMapper;
|
||||
@Resource
|
||||
private PlanSubDetailMapper planSubDetailMapper;
|
||||
@Resource
|
||||
private ProcessBomDetailMapper processBomDetailMapper;
|
||||
|
||||
@Override
|
||||
@Transactional(rollbackFor = Exception.class)
|
||||
@ -286,6 +313,58 @@ public class ProjectOrderServiceImpl implements ProjectOrderService {
|
||||
return projectOrderSubDOList;
|
||||
}
|
||||
|
||||
@Override
|
||||
@Transactional(rollbackFor = Exception.class)
|
||||
public void deleteOrder(Long id) {
|
||||
//订单子表
|
||||
projectOrderSubMapper.delByProjectOrderId(id);
|
||||
//订单表
|
||||
projectOrderMapper.deleteOrderId(id);
|
||||
//生产计划表
|
||||
planMapper.deleteOrderId(id);
|
||||
//计划子表
|
||||
planSubMapper.deleteOrderId( id);
|
||||
//计划明细子表
|
||||
planSubDetailMapper.deleteOrderId( id);
|
||||
//生产任务单表
|
||||
LambdaQueryWrapper<PlanTaskDO> wrapper = new LambdaQueryWrapper<>();
|
||||
wrapper.eq(PlanTaskDO::getProjectId, id);
|
||||
List<PlanTaskDO> planTaskDOList = planTaskMapper.selectList(wrapper);
|
||||
planTaskMapper.deleteOrderId( id);
|
||||
//任务单子表
|
||||
if (ObjectUtil.isNotEmpty(planTaskDOList)){
|
||||
List<Long> collect = planTaskDOList.stream().map(PlanTaskDO::getId).collect(Collectors.toList());
|
||||
if (ObjectUtil.isNotEmpty( collect)){
|
||||
planTaskBomMapper.deleteOrderId( collect);
|
||||
}
|
||||
}
|
||||
LambdaQueryWrapper<TaskDispatchDO> queryWrapper = new LambdaQueryWrapper<>();
|
||||
queryWrapper.eq(TaskDispatchDO::getProjectId, id);
|
||||
List<TaskDispatchDO> taskDispatchDOS = taskDispatchMapper.selectList(queryWrapper);
|
||||
//任务派工单表
|
||||
taskDispatchMapper.deleteOrderId(id);
|
||||
if (ObjectUtil.isNotEmpty(taskDispatchDOS)){
|
||||
List<Long> collect = taskDispatchDOS.stream().map(TaskDispatchDO::getId).collect(Collectors.toList());
|
||||
if (ObjectUtil.isNotEmpty( collect)){
|
||||
//任务派工单明细表
|
||||
taskDispatchDetailMapper.deleteOrderId( collect);
|
||||
}
|
||||
}
|
||||
LambdaQueryWrapper<ProcessBomDO> queryWrapper1 = new LambdaQueryWrapper<>();
|
||||
queryWrapper1.eq(ProcessBomDO::getId, id);
|
||||
List<ProcessBomDO> processBomDOS = processBomMapper.selectList(queryWrapper1);
|
||||
//bom表
|
||||
processBomMapper.deleteOrderId( id);
|
||||
if (ObjectUtil.isNotEmpty(processBomDOS)){
|
||||
List<Long> collect = processBomDOS.stream().map(ProcessBomDO::getId).collect(Collectors.toList());
|
||||
if (ObjectUtil.isNotEmpty( collect)){
|
||||
//bom明细子表
|
||||
processBomDetailMapper.deleteOrderId(collect);
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
@Transactional(rollbackFor = Exception.class)
|
||||
public void updateProjectOrderPrice(ProjectOrderSaveReqVO updateReqVO) {
|
||||
|
@ -36,6 +36,7 @@ import org.springframework.transaction.annotation.Transactional;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.math.BigDecimal;
|
||||
import java.math.RoundingMode;
|
||||
import java.rmi.RemoteException;
|
||||
import java.time.LocalDateTime;
|
||||
import java.util.*;
|
||||
@ -189,7 +190,7 @@ public class StorageInventoryServiceImpl implements StorageInventoryService {
|
||||
Long rgId = null;
|
||||
Long pnId = null;
|
||||
if (ObjectUtil.isNotEmpty(vo.getYardAmount())) {
|
||||
if (!vo.getYardAmount().matches("[0-9]+")) {
|
||||
if (!vo.getYardAmount().matches("\\d+(\\.\\d+)?")) {
|
||||
errorMessages.add("第" + (i + 1) + "行库存数量必须是数字");
|
||||
} else {
|
||||
storageInventoryDO.setYardAmount(new BigDecimal(vo.getYardAmount()));
|
||||
@ -197,10 +198,10 @@ public class StorageInventoryServiceImpl implements StorageInventoryService {
|
||||
}
|
||||
}
|
||||
if (ObjectUtil.isNotEmpty(vo.getPrice())) {
|
||||
if (!vo.getPrice().matches("[0-9]+")) {
|
||||
if (!vo.getPrice().matches("\\d+(\\.\\d+)?")) {
|
||||
errorMessages1.add("第" + (i + 1) + "行平均单价必须是数字");
|
||||
} else {
|
||||
storageInventoryDO.setPrice(new BigDecimal(vo.getPrice()));
|
||||
storageInventoryDO.setPrice(new BigDecimal(vo.getPrice()).setScale(2, RoundingMode.HALF_UP));
|
||||
}
|
||||
}
|
||||
if (ObjectUtil.isEmpty(vo.getCode())) {
|
||||
|
@ -95,7 +95,10 @@ export const getProjectOrderSubPage = async (params) => {
|
||||
export const getProjectOrderSubListByProjectOrderIdGt = async (projectOrderId) => {
|
||||
return await request.get({ url: `/heli/project-order/project-order-sub/list-by-project-order-id-gt?projectOrderId=` + projectOrderId })
|
||||
}
|
||||
|
||||
// 删除项目订单
|
||||
export const deleteOrder = async (id: number) => {
|
||||
return await request.delete({ url: `/heli/project-order/deleteOrder?id=` + id })
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
432
mes-ui/mes-ui-admin-vue3/src/views/heli/projectorder/delete.vue
Normal file
432
mes-ui/mes-ui-admin-vue3/src/views/heli/projectorder/delete.vue
Normal file
@ -0,0 +1,432 @@
|
||||
<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="108px">
|
||||
<el-form-item label="项目编号" prop="code">
|
||||
<el-input v-model="queryParams.code" placeholder="请输入项目编号" clearable @keyup.enter="handleQuery" class="!w-240px" />
|
||||
</el-form-item>
|
||||
|
||||
<el-form-item label="客户名称" prop="customerName">
|
||||
<el-input v-model="queryParams.customerName" placeholder="请输入客户名称" clearable @keyup.enter="handleQuery" class="!w-240px" />
|
||||
</el-form-item>
|
||||
<el-form-item label="业务员" prop="businessManName">
|
||||
<el-input v-model="queryParams.businessManName" placeholder="请输入业务员" clearable @keyup.enter="handleQuery" class="!w-240px" />
|
||||
</el-form-item>
|
||||
<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="hasPrice">
|
||||
<el-select v-model="queryParams.hasPrice" placeholder="请选择是否有价格" clearable class="!w-240px">
|
||||
<el-option v-for="dict in getIntDictOptions(DICT_TYPE.HELI_COMMON_IS_OR_NOT)" :key="dict.value" :label="dict.label" :value="dict.value" />
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="是否已变更" prop="hasAlter">
|
||||
<el-select v-model="queryParams.hasAlter" placeholder="请选择是否已变更" clearable class="!w-240px">
|
||||
<el-option v-for="dict in getIntDictOptions(DICT_TYPE.HELI_COMMON_IS_OR_NOT)" :key="dict.value" :label="dict.label" :value="dict.value" />
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="单据状态" prop="orderStatus">
|
||||
<el-select v-model="queryParams.orderStatus" placeholder="请选择单据状态" clearable class="!w-240px">
|
||||
<el-option v-for="dict in getIntDictOptions(DICT_TYPE.HELI_PROJECT_ORDER_STATUS)" :key="dict.value" :label="dict.label" :value="dict.value" />
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="发货状态" prop="deliveryStatus">
|
||||
<el-select v-model="queryParams.deliveryStatus" placeholder="请选择发货状态" clearable class="!w-240px">
|
||||
<el-option v-for="dict in getIntDictOptions(DICT_TYPE.HELI_DELIVERY_STATUS)" :key="dict.value" :label="dict.label" :value="dict.value" />
|
||||
</el-select>
|
||||
</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"
|
||||
@selection-change="handleSelectionChange"
|
||||
v-loading="loading" :data="list" :stripe="true" :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 fixed label="项目编号" align="center" prop="code" width="240">
|
||||
<template #default="scope">
|
||||
<el-button type="text" @click="openDetail('detail', scope.row.id)">{{
|
||||
scope.row.code
|
||||
}}</el-button></template>
|
||||
</el-table-column>
|
||||
<el-table-column fixed label="订单日期" align="center" prop="orderTime" :formatter="dateFormatter2" width="180" />
|
||||
<!-- <el-table-column label="提出部门" align="center" prop="businessDeptName" width="150" /> -->
|
||||
<!-- <el-table-column label="业务员" align="center" prop="businessManName" width="150" /> -->
|
||||
<el-table-column label="客户名称" align="center" prop="customerName" width="240" />
|
||||
<el-table-column label="合同编号" align="center" prop="contractNo" width="180" />
|
||||
<el-table-column label="项目名称" align="center" prop="projectName" width="180" />
|
||||
<!-- <el-table-column label="所属业务线" align="center" prop="businessLine" width="150">
|
||||
<template #default="scope">
|
||||
<dict-tag :type="DICT_TYPE.HELI_BUSINESS_LINE" :value="scope.row.businessLine" />
|
||||
</template>
|
||||
</el-table-column> -->
|
||||
<el-table-column label="是否有价格" align="center" prop="hasPrice" width="150">
|
||||
<template #default="scope">
|
||||
<dict-tag :type="DICT_TYPE.HELI_COMMON_IS_OR_NOT" :value="scope.row.hasPrice" />
|
||||
</template>
|
||||
</el-table-column>
|
||||
<!-- <el-table-column label="价格(元)" align="center" prop="price" width="150" /> -->
|
||||
<!-- <el-table-column label="币种" align="center" prop="currency" width="150">
|
||||
<template #default="scope">
|
||||
<dict-tag :type="DICT_TYPE.HELI_CURRENCY" :value="scope.row.currency" />
|
||||
</template>
|
||||
</el-table-column> -->
|
||||
<el-table-column label="是否紧急" align="center" prop="isUrgency" width="150">
|
||||
<template #default="scope">
|
||||
<dict-tag :type="DICT_TYPE.HELI_COMMON_IS_OR_NOT" :value="scope.row.isUrgency" />
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="性质" align="center" prop="property" width="120">
|
||||
<template #default="scope">
|
||||
<dict-tag :type="DICT_TYPE.HELI_PROJECT_PROPERTY" :value="scope.row.property" />
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="起止日期" align="center" prop="projectStartTime" width="260">
|
||||
<template #default="scope">
|
||||
{{
|
||||
formatDate(scope.row.projectStartTime, 'YYYY-MM-DD') +
|
||||
'~' +
|
||||
formatDate(scope.row.projectEndTime, 'YYYY-MM-DD')
|
||||
}}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<!-- <el-table-column label="是否已变更" align="center" prop="hasAlter" width="150">
|
||||
<template #default="scope">
|
||||
<dict-tag :type="DICT_TYPE.HELI_COMMON_IS_OR_NOT" :value="scope.row.hasAlter" />
|
||||
</template>
|
||||
</el-table-column>
|
||||
-->
|
||||
<el-table-column label="单据状态" align="center" prop="orderStatus" fixed="right" width="120">
|
||||
<template #default="scope">
|
||||
<dict-tag :type="DICT_TYPE.HELI_PROJECT_ORDER_STATUS" :value="scope.row.orderStatus" />
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="发货状态" align="center" prop="deliveryStatus" fixed="right" width="120">
|
||||
<template #default="scope">
|
||||
<dict-tag :type="DICT_TYPE.HELI_DELIVERY_STATUS" :value="scope.row.deliveryStatus" />
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column align="center" fixed="right" min-width="200">
|
||||
<template #header> <span style="margin-right: 30%">操作</span> </template>
|
||||
<template #default="scope">
|
||||
<el-row>
|
||||
<el-col>
|
||||
<el-button link type="danger" @click="handleDelete(scope.row)">
|
||||
删除
|
||||
</el-button>
|
||||
|
||||
</el-col>
|
||||
</el-row>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
<!-- 分页 -->
|
||||
<Pagination :total="total" v-model:page="queryParams.pageNo" v-model:limit="queryParams.pageSize" @pagination="getList" />
|
||||
</ContentWrap>
|
||||
</el-card>
|
||||
<!-- 【打印启动单】 - 弹框-->
|
||||
<Print ref="printRef" />
|
||||
|
||||
<ReportDialog
|
||||
ref="reportRef"
|
||||
:key="dialogKey"
|
||||
:type="reportBusinessType"
|
||||
:file-type="reportBusinessFileType"
|
||||
:id="reportBusinessId"
|
||||
:title="reportBusinessTitle" />
|
||||
</template>
|
||||
|
||||
<script setup lang="ts">
|
||||
import { getIntDictOptions, DICT_TYPE } from '@/utils/dict'
|
||||
import { dateFormatter2, formatDate } from '@/utils/formatTime'
|
||||
import download from '@/utils/download'
|
||||
import * as ProjectOrderApi from '@/api/heli/projectorder'
|
||||
import Print from './startprint.vue' // 引入打印弹框
|
||||
import { ref } from 'vue'
|
||||
import {useCommonStore} from "@/store/modules/common";
|
||||
import {ElMessageBox, ElTable} from "element-plus";
|
||||
import {deleteOrder, ProjectOrderVO} from "@/api/heli/projectorder";
|
||||
import routeParamsCache from '@/utils/routeParamsCache'
|
||||
defineOptions({ name: 'OrderDelete' })
|
||||
|
||||
const message = useMessage() // 消息弹窗
|
||||
const { t } = useI18n() // 国际化
|
||||
const router = useRouter()
|
||||
const commonStore = useCommonStore()
|
||||
|
||||
const loading = ref(true) // 列表的加载中
|
||||
const list = ref([]) // 列表的数据
|
||||
const total = ref(0) // 列表的总页数
|
||||
const queryParams = reactive({
|
||||
pageNo: 1,
|
||||
pageSize: 10,
|
||||
code: undefined,
|
||||
orderStatus: undefined,
|
||||
deliveryStatus: 1,
|
||||
businessDeptId: undefined,
|
||||
customerName: undefined,
|
||||
projectName: undefined,
|
||||
businessLine: undefined,
|
||||
blueprintNo: undefined,
|
||||
hasPrice: undefined,
|
||||
price: undefined,
|
||||
currency: undefined,
|
||||
projectStartTime: [],
|
||||
projectEndTime: [],
|
||||
isUrgency: undefined,
|
||||
property: undefined,
|
||||
referenceTechnology: undefined,
|
||||
hasAlter: undefined,
|
||||
lastAlterTime: [],
|
||||
qualityRequirement: undefined,
|
||||
remark: undefined,
|
||||
hasContract: undefined,
|
||||
hasTechnologyProtocol: undefined,
|
||||
hasBlueprint: undefined,
|
||||
blueprintRemark: undefined,
|
||||
status: undefined,
|
||||
createTime: [],
|
||||
businessManName: undefined,
|
||||
isSnapshot: 0,
|
||||
snapshotId: undefined,
|
||||
snapshotCode: undefined,
|
||||
orderTime: [],
|
||||
snapshotOrderTime: []
|
||||
})
|
||||
const queryFormRef = ref() // 搜索的表单
|
||||
const exportLoading = ref(false) // 导出的加载中
|
||||
|
||||
const reportRef = ref()
|
||||
const reportBusinessType = ref('PROJECT_ORDER_REPORT')
|
||||
const reportBusinessFileType = ref('')
|
||||
const reportBusinessId = ref()
|
||||
const reportBusinessTitle = ref('')
|
||||
const reportKey = ref(0)
|
||||
const dialogKey = ref(0)
|
||||
|
||||
const multipleTableRef = ref<InstanceType<typeof ElTable>>()
|
||||
const multipleSelection = ref<ProjectOrderVO[]>([])
|
||||
const handleSelectionChange = (val: ProjectOrderVO[]) => {
|
||||
multipleSelection.value = val
|
||||
}
|
||||
|
||||
const openReport = () => {
|
||||
reportRef.value.open()
|
||||
}
|
||||
|
||||
/** 查询列表 */
|
||||
const getList = async () => {
|
||||
loading.value = true
|
||||
try {
|
||||
const route = useRoute();
|
||||
|
||||
if(route){
|
||||
const idid = route.query.idid;
|
||||
if (idid){
|
||||
queryParams.code=idid
|
||||
}
|
||||
}
|
||||
|
||||
const data = await ProjectOrderApi.getProjectOrderPage(queryParams)
|
||||
list.value = data.list
|
||||
total.value = data.total
|
||||
} finally {
|
||||
loading.value = false
|
||||
}
|
||||
}
|
||||
const actionmoney = (id?: number) => {
|
||||
ElMessageBox.confirm('是否确认已收取质保金?', '提示', {
|
||||
confirmButtonText: '确定',
|
||||
cancelButtonText: '取消',
|
||||
type: 'warning',
|
||||
})
|
||||
.then(async () => {
|
||||
|
||||
selectshowmoneyok(id)
|
||||
ElMessage({
|
||||
type: 'success',
|
||||
message: '确认成功!'
|
||||
});
|
||||
})
|
||||
.catch(() => {
|
||||
ElMessage({
|
||||
type: 'info',
|
||||
message: '已取消确认'
|
||||
});
|
||||
});
|
||||
};
|
||||
|
||||
const selectshowmoneyok = async (id: number) => {
|
||||
try {
|
||||
await ProjectOrderApi.showzbmoneyok(id);
|
||||
await getList()
|
||||
} catch (error) { console.error(error); }
|
||||
}
|
||||
/** 搜索按钮操作 */
|
||||
const handleQuery = () => {
|
||||
queryParams.pageNo = 1
|
||||
getList()
|
||||
}
|
||||
|
||||
/** 重置按钮操作 */
|
||||
const resetQuery = () => {
|
||||
queryFormRef.value.resetFields()
|
||||
handleQuery()
|
||||
}
|
||||
|
||||
/** 添加/修改操作 */
|
||||
const openDetail = (type: string, id?: number) => {
|
||||
router.push({
|
||||
name: 'ProjectOrderDetail',
|
||||
query: {
|
||||
active: type,
|
||||
id: id
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
/** 删除按钮操作 */
|
||||
const handleDelete = async (row) => {
|
||||
ElMessageBox.confirm('是否删除订单'+row.projectName+',删除所有数据清除?', '提示', {
|
||||
confirmButtonText: '确定',
|
||||
cancelButtonText: '取消',
|
||||
type: 'warning',
|
||||
})
|
||||
.then(async () => {
|
||||
await ProjectOrderApi.deleteOrder(row.id)
|
||||
message.success(t('common.delSuccess'))
|
||||
// 刷新列表
|
||||
await getList()
|
||||
})
|
||||
.catch(() => {
|
||||
|
||||
});
|
||||
|
||||
}
|
||||
|
||||
/** 导出按钮操作 */
|
||||
const handleExport = async () => {
|
||||
try {
|
||||
if(!multipleSelection.value || multipleSelection.value.length == 0){
|
||||
message.warning(t('common.selectText'))
|
||||
return
|
||||
}
|
||||
let idList = [];
|
||||
multipleSelection.value.forEach(p => {
|
||||
idList.push(p.id)
|
||||
})
|
||||
// 导出的二次确认
|
||||
await message.exportConfirm()
|
||||
// 发起导出
|
||||
exportLoading.value = true
|
||||
const data = await ProjectOrderApi.exportProjectOrder({"idList": idList})
|
||||
download.excel(data, '项目订单.xls')
|
||||
} catch {
|
||||
} finally {
|
||||
exportLoading.value = false
|
||||
}
|
||||
}
|
||||
|
||||
const handleCommand = async (command, id,property, code) => {
|
||||
switch (command) {
|
||||
case 'detail':
|
||||
openDetail('detail', id)
|
||||
break
|
||||
case 'printProject':
|
||||
printHandle(id,property)
|
||||
break
|
||||
case 'alter':
|
||||
openDetail('alter', id)
|
||||
break
|
||||
case 'viewArchive':
|
||||
router.push({
|
||||
name: 'ProjectOrderArchive',
|
||||
query: {
|
||||
code: code
|
||||
}
|
||||
})
|
||||
break
|
||||
case 'delivery':
|
||||
router.push({
|
||||
name: 'DeliverOrderDetail',
|
||||
query: {
|
||||
active: 'deliver',
|
||||
projectOrderId: id,
|
||||
operateId: Math.random()
|
||||
}
|
||||
})
|
||||
break
|
||||
case 'trialReport':
|
||||
reportKey.value++
|
||||
reportBusinessFileType.value = 'TRIAL_REPORT'
|
||||
reportBusinessId.value = id
|
||||
reportBusinessTitle.value = '试模报告'
|
||||
openReport()
|
||||
break
|
||||
case 'confirmReport':
|
||||
reportKey.value++
|
||||
reportBusinessFileType.value = 'CONFIRM_REPORT'
|
||||
reportBusinessId.value = id
|
||||
reportBusinessTitle.value = '认可报告'
|
||||
openReport()
|
||||
break
|
||||
}
|
||||
}
|
||||
|
||||
// 打印启动单
|
||||
const printRef = ref() // 打印弹框
|
||||
const dialogInfo = ref({}) // 打印弹框数据
|
||||
// 打印启动单
|
||||
const printHandle = (id,property) => {
|
||||
printRef.value.open(id,property)
|
||||
}
|
||||
|
||||
/** 初始化 **/
|
||||
const route = useRoute()
|
||||
const routeValue = ref('')
|
||||
onMounted(async () => {
|
||||
let params = routeParamsCache.get(route.path);
|
||||
routeValue.value = route.path
|
||||
if (params ) {
|
||||
Object.assign(queryParams, params);
|
||||
}
|
||||
getList()
|
||||
})
|
||||
onActivated(() => {
|
||||
getList()
|
||||
})
|
||||
onBeforeUnmount(() => {
|
||||
const plainParams = JSON.parse(JSON.stringify(queryParams));
|
||||
routeParamsCache.set(routeValue.value, plainParams);
|
||||
});
|
||||
|
||||
window.addEventListener('beforeunload', () => {
|
||||
const plainParams = JSON.parse(JSON.stringify(queryParams));
|
||||
routeParamsCache.set(routeValue.value, plainParams);
|
||||
});
|
||||
</script>
|
||||
|
||||
<style scoped>
|
||||
.el-dropdown-link {
|
||||
cursor: pointer;
|
||||
margin: 5px;
|
||||
color: var(--el-color-primary);
|
||||
display: flex;
|
||||
align-items: center;
|
||||
}
|
||||
</style>
|
Loading…
Reference in New Issue
Block a user