From cb45e5b246f8d0d62bc6d052f1ffbef73f6f7cb6 Mon Sep 17 00:00:00 2001 From: z Date: Sat, 11 Oct 2025 08:35:08 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BA=93=E5=AD=98=E5=AF=BC=E5=85=A5=E5=8F=8A?= =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=88=A0=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../projectorder/ProjectOrderController.java | 9 +- .../heli/dal/mysql/plan/PlanMapper.java | 5 +- .../heli/dal/mysql/plansub/PlanSubMapper.java | 4 + .../plansubdetail/PlanSubDetailMapper.java | 4 +- .../dal/mysql/plantask/PlanTaskMapper.java | 3 + .../mysql/plantaskbom/PlanTaskBomMapper.java | 8 + .../processbom/ProcessBomDetailMapper.java | 8 + .../mysql/processbom/ProcessBomMapper.java | 3 + .../projectorder/ProjectOrderMapper.java | 5 +- .../projectorder/ProjectOrderSubMapper.java | 4 + .../TaskDispatchDetailMapper.java | 9 + .../taskdispatch/TaskDispatchMapper.java | 4 + .../projectorder/ProjectOrderService.java | 2 + .../projectorder/ProjectOrderServiceImpl.java | 83 +++- .../StorageInventoryServiceImpl.java | 7 +- .../src/api/heli/projectorder/index.ts | 5 +- .../src/views/heli/projectorder/delete.vue | 432 ++++++++++++++++++ 17 files changed, 585 insertions(+), 10 deletions(-) create mode 100644 mes-ui/mes-ui-admin-vue3/src/views/heli/projectorder/delete.vue diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/projectorder/ProjectOrderController.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/projectorder/ProjectOrderController.java index 2cb9b0ac..e102ae8e 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/projectorder/ProjectOrderController.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/projectorder/ProjectOrderController.java @@ -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 deleteOrder(@RequestParam("id") Long id) { + projectOrderService.deleteOrder(id); + return success(true); + } @GetMapping("/get") @Operation(summary = "获得项目订单") @Parameter(name = "id", description = "编号", required = true, example = "1024") diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/plan/PlanMapper.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/plan/PlanMapper.java index 59acaffd..b355503a 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/plan/PlanMapper.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/plan/PlanMapper.java @@ -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 { // } List selectfhtj(Long txrid); List selectfhtj1(); - + @Delete("delete from project_plan where project_id=#{id}") + void deleteOrderId(@Param("id") Long id); } \ No newline at end of file diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/plansub/PlanSubMapper.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/plansub/PlanSubMapper.java index 888a5629..d852452b 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/plansub/PlanSubMapper.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/plansub/PlanSubMapper.java @@ -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 { .eq(ProcessBomDO::getId,bomId); return selectOne(query); } +@Delete("delete from project_plan_sub where project_id=#{id}") + void deleteOrderId(@Param("id") Long id); } diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/plansubdetail/PlanSubDetailMapper.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/plansubdetail/PlanSubDetailMapper.java index b2fd04d4..275a7129 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/plansubdetail/PlanSubDetailMapper.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/plansubdetail/PlanSubDetailMapper.java @@ -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 { .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); } diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/plantask/PlanTaskMapper.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/plantask/PlanTaskMapper.java index b5353448..d3412c6f 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/plantask/PlanTaskMapper.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/plantask/PlanTaskMapper.java @@ -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 { .collect(Collectors.toList()); } +@Delete("DELETE FROM project_plan_task WHERE project_id = #{id}") + void deleteOrderId(@Param("id") Long id); } diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/plantaskbom/PlanTaskBomMapper.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/plantaskbom/PlanTaskBomMapper.java index 7d7807cf..6aed87dc 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/plantaskbom/PlanTaskBomMapper.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/plantaskbom/PlanTaskBomMapper.java @@ -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 { ; return selectList(query); } +@Delete("") + void deleteOrderId(@Param("idList") List idList); } diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/processbom/ProcessBomDetailMapper.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/processbom/ProcessBomDetailMapper.java index d9898937..6fc69622 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/processbom/ProcessBomDetailMapper.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/processbom/ProcessBomDetailMapper.java @@ -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 .eq(ProcessBomDetailDO::getType,1); return selectPage(pageReqVO, query); } +@Delete("") + void deleteOrderId(@Param("idList") List idList); } diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/processbom/ProcessBomMapper.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/processbom/ProcessBomMapper.java index 4c154f6b..5aa2e78a 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/processbom/ProcessBomMapper.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/processbom/ProcessBomMapper.java @@ -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 { 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); } diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/projectorder/ProjectOrderMapper.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/projectorder/ProjectOrderMapper.java index 0d50bd03..29e8a009 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/projectorder/ProjectOrderMapper.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/projectorder/ProjectOrderMapper.java @@ -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 { .disableSubLogicDel(); return selectOne(query); } - +@Delete("delete from project_sale_order where id = #{id}") + void deleteOrderId(@Param("id") Long id); } diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/projectorder/ProjectOrderSubMapper.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/projectorder/ProjectOrderSubMapper.java index bbccdaff..473c02cf 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/projectorder/ProjectOrderSubMapper.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/projectorder/ProjectOrderSubMapper.java @@ -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 { return selectPage(pageReqVO, query); } +@Delete("delete from project_sale_order_sub where project_order_id = #{id}") + void delByProjectOrderId(@Param("id") Long id); } diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/taskdispatch/TaskDispatchDetailMapper.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/taskdispatch/TaskDispatchDetailMapper.java index 2505ecf4..1fbc4896 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/taskdispatch/TaskDispatchDetailMapper.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/taskdispatch/TaskDispatchDetailMapper.java @@ -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" + + "DELETE FROM pro_task_dispatch_detail WHERE dispatch_id IN " + + "" + + "#{id}" + + "" + + "") + void deleteOrderId(@Param("idList") List idList); } diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/taskdispatch/TaskDispatchMapper.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/taskdispatch/TaskDispatchMapper.java index 1e8b6929..ec478f4e 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/taskdispatch/TaskDispatchMapper.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/taskdispatch/TaskDispatchMapper.java @@ -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 { return selectList(query); } + @Delete("delete from pro_task_dispatch where project_id=#{id}") + void deleteOrderId(@Param("id") Long id); } diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/projectorder/ProjectOrderService.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/projectorder/ProjectOrderService.java index b363b639..2464e393 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/projectorder/ProjectOrderService.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/projectorder/ProjectOrderService.java @@ -89,4 +89,6 @@ public interface ProjectOrderService { void showzbmoney(Long id); List getProjectOrderSubListByProjectOrderIdGt(Long projectOrderId); + + void deleteOrder(Long id); } diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/projectorder/ProjectOrderServiceImpl.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/projectorder/ProjectOrderServiceImpl.java index 3fff11fb..5a870f7f 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/projectorder/ProjectOrderServiceImpl.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/projectorder/ProjectOrderServiceImpl.java @@ -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 wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(PlanTaskDO::getProjectId, id); + List planTaskDOList = planTaskMapper.selectList(wrapper); + planTaskMapper.deleteOrderId( id); + //任务单子表 + if (ObjectUtil.isNotEmpty(planTaskDOList)){ + List collect = planTaskDOList.stream().map(PlanTaskDO::getId).collect(Collectors.toList()); + if (ObjectUtil.isNotEmpty( collect)){ + planTaskBomMapper.deleteOrderId( collect); + } + } + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(TaskDispatchDO::getProjectId, id); + List taskDispatchDOS = taskDispatchMapper.selectList(queryWrapper); + //任务派工单表 + taskDispatchMapper.deleteOrderId(id); + if (ObjectUtil.isNotEmpty(taskDispatchDOS)){ + List collect = taskDispatchDOS.stream().map(TaskDispatchDO::getId).collect(Collectors.toList()); + if (ObjectUtil.isNotEmpty( collect)){ + //任务派工单明细表 + taskDispatchDetailMapper.deleteOrderId( collect); + } + } + LambdaQueryWrapper queryWrapper1 = new LambdaQueryWrapper<>(); + queryWrapper1.eq(ProcessBomDO::getId, id); + List processBomDOS = processBomMapper.selectList(queryWrapper1); + //bom表 + processBomMapper.deleteOrderId( id); + if (ObjectUtil.isNotEmpty(processBomDOS)){ + List 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) { diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/storageinventory/StorageInventoryServiceImpl.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/storageinventory/StorageInventoryServiceImpl.java index 0c8c3263..a2a7c2c2 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/storageinventory/StorageInventoryServiceImpl.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/storageinventory/StorageInventoryServiceImpl.java @@ -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())) { diff --git a/mes-ui/mes-ui-admin-vue3/src/api/heli/projectorder/index.ts b/mes-ui/mes-ui-admin-vue3/src/api/heli/projectorder/index.ts index 6b58858c..affc914e 100644 --- a/mes-ui/mes-ui-admin-vue3/src/api/heli/projectorder/index.ts +++ b/mes-ui/mes-ui-admin-vue3/src/api/heli/projectorder/index.ts @@ -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 }) +} diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/projectorder/delete.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/projectorder/delete.vue new file mode 100644 index 00000000..6379fcfe --- /dev/null +++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/projectorder/delete.vue @@ -0,0 +1,432 @@ + + + + +