From c20fcc180c5f5acfff82a4fbe9c828d78e16bb5f Mon Sep 17 00:00:00 2001 From: chj <16637853242@163.com> Date: Tue, 8 Aug 2023 18:00:19 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=A1=E5=88=92=E6=A8=A1=E5=9D=97=E2=80=94?= =?UTF-8?q?=E2=80=94=E5=88=A0=E9=99=A4=E5=B7=A5=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProOrderWorkorderController.java | 51 ++++++++++++------- .../plan/mapper/ProOrderWorkorderMapper.java | 2 + .../service/IProOrderWorkorderService.java | 7 +++ .../service/impl/ProOrderServiceImpl.java | 2 - .../impl/ProOrderWorkorderServiceImpl.java | 12 +++++ .../mapper/plan/ProOrderWorkorderMapper.xml | 10 ++++ 6 files changed, 65 insertions(+), 19 deletions(-) diff --git a/op-modules/op-plan/src/main/java/com/op/plan/controller/ProOrderWorkorderController.java b/op-modules/op-plan/src/main/java/com/op/plan/controller/ProOrderWorkorderController.java index 428f93f19..9b1cacfeb 100644 --- a/op-modules/op-plan/src/main/java/com/op/plan/controller/ProOrderWorkorderController.java +++ b/op-modules/op-plan/src/main/java/com/op/plan/controller/ProOrderWorkorderController.java @@ -1,8 +1,10 @@ package com.op.plan.controller; +import java.util.ArrayList; import java.util.List; import javax.servlet.http.HttpServletResponse; +import com.op.common.core.exception.ServiceException; import com.op.plan.domain.ProOrder; import com.op.plan.domain.dto.SplitOrderDTO; import org.springframework.beans.factory.annotation.Autowired; @@ -143,24 +145,39 @@ public class ProOrderWorkorderController extends BaseController { @DeleteMapping("/{workorderIds}") public AjaxResult remove(@PathVariable String[] workorderIds) { //什么时候可以删除工单？TODO;没进入生产之前都可以？ - ProOrderWorkorder proOrderWorkorder = new ProOrderWorkorder(); - String status = proOrderWorkorder.getStatus(); - ProOrder proOrder = new ProOrder(); - String status1 = proOrder.getStatus(); - if (proOrderWorkorder != null) { - int parsedStatus1 = Integer.parseInt(status1); - int parsedStatus = Integer.parseInt(status); - - if (parsedStatus1 == 1 && parsedStatus == 0) { - proOrderWorkorderService.deleteProOrderWorkorderByWorkorderIds(workorderIds); - } else { - System.out.println("订单未拆分或工单已经下单"); - } +// 根据工单的ids查工单的信息 + List proOrderWorkorders = proOrderWorkorderService.selectProOrderWorkorderByWorkIds(workorderIds); + if (ObjectUtils.isEmpty(proOrderWorkorders)){ + throw new ServiceException("所查询的工单为空！！"); } -// if (!ObjectUtils.isEmpty(proOrderWorkorder) && Integer.parseInt(status1)==1 && Integer.parseInt(status)==0){ -// proOrderWorkorderService.deleteProOrderWorkorderByWorkorderIds(workorderIds); -// }else { -// System.out.println("订单未拆分或工单已经下单"); + ArrayList strings = new ArrayList<>(); + for (ProOrderWorkorder proOrderWorkorder : proOrderWorkorders) { + String status = proOrderWorkorder.getStatus(); + strings.add(status); + } + String[] orderWorkerIds= strings.toArray(new String[0]); + for (String orderWorkerId : orderWorkerIds) { + if (orderWorkerId.equals("w0")){ + return toAjax(proOrderWorkorderService.deleteProOrderWorkorderByWorkorderIds(workorderIds)); + } else { + throw new ServiceException("工单已经下单，不能删除！"); + } + } + + +// ProOrderWorkorder proOrderWorkorder = new ProOrderWorkorder(); +// String status = proOrderWorkorder.getStatus(); +// ProOrder proOrder = new ProOrder(); +// String status1 = proOrder.getStatus(); +// if (proOrderWorkorder != null) { +// int parsedStatus1 = Integer.parseInt(status1); +// int parsedStatus = Integer.parseInt(status); +// +// if (parsedStatus1 == 1 && parsedStatus == 0) { +// proOrderWorkorderService.deleteProOrderWorkorderByWorkorderIds(workorderIds); +// } else { +// throw new ServiceException("订单未拆分或工单已经下单"); +// } // } return toAjax(proOrderWorkorderService.deleteProOrderWorkorderByWorkorderIds(workorderIds)); } diff --git a/op-modules/op-plan/src/main/java/com/op/plan/mapper/ProOrderWorkorderMapper.java b/op-modules/op-plan/src/main/java/com/op/plan/mapper/ProOrderWorkorderMapper.java index 541af6504..3f5801ad6 100644 --- a/op-modules/op-plan/src/main/java/com/op/plan/mapper/ProOrderWorkorderMapper.java +++ b/op-modules/op-plan/src/main/java/com/op/plan/mapper/ProOrderWorkorderMapper.java @@ -121,5 +121,7 @@ public interface ProOrderWorkorderMapper { int deleteProOrderWorkorderByOrderId(String id); void createPrepare(MesPrepare mesPrepare); + + List selectProOrderWorkerderByWorkerIds(String[] ids); } diff --git a/op-modules/op-plan/src/main/java/com/op/plan/service/IProOrderWorkorderService.java b/op-modules/op-plan/src/main/java/com/op/plan/service/IProOrderWorkorderService.java index 82e10dace..8edf5ecee 100644 --- a/op-modules/op-plan/src/main/java/com/op/plan/service/IProOrderWorkorderService.java +++ b/op-modules/op-plan/src/main/java/com/op/plan/service/IProOrderWorkorderService.java @@ -102,4 +102,11 @@ public interface IProOrderWorkorderService { */ AjaxResult checkWorkOrder(String id); + /** + * 根据workerIds查询ProOrderWorkorder + * @param workerIds + * @return + */ + public List selectProOrderWorkorderByWorkIds(String[] workerIds); + } diff --git a/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderServiceImpl.java b/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderServiceImpl.java index b350947a1..f4b3b04e8 100644 --- a/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderServiceImpl.java +++ b/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderServiceImpl.java @@ -337,7 +337,6 @@ public class ProOrderServiceImpl implements IProOrderService { if (checkPlan) { errMsg.append("第" + (i + 1) + "行:" + "订单号为:" + orderList.get(i).getOrderCode() + ",该订单下工单已有湿料计划，不允许更新;" + "
"); } - } // 如果存在不可编辑信息 @@ -716,7 +715,6 @@ public class ProOrderServiceImpl implements IProOrderService { return error(500, "计划完成日期不能为空！信息导入失败！"); } } - return success(); } diff --git a/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderWorkorderServiceImpl.java b/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderWorkorderServiceImpl.java index 1531ad711..857d0c5a2 100644 --- a/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderWorkorderServiceImpl.java +++ b/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderWorkorderServiceImpl.java @@ -428,6 +428,18 @@ public class ProOrderWorkorderServiceImpl implements IProOrderWorkorderService { return success(); } + + /** + * 根据workerIds查询ProOrderWorkorder + * @param workerIds + * @return + */ + @Override + @DS("#header.poolName") + public List selectProOrderWorkorderByWorkIds(String[] workerIds) { + return proOrderWorkorderMapper.selectProOrderWorkerderByWorkerIds(workerIds); + } + /** * 格式化工单信息（递归处理） * diff --git a/op-modules/op-plan/src/main/resources/mapper/plan/ProOrderWorkorderMapper.xml b/op-modules/op-plan/src/main/resources/mapper/plan/ProOrderWorkorderMapper.xml index 7a2048b74..1c7c163dd 100644 --- a/op-modules/op-plan/src/main/resources/mapper/plan/ProOrderWorkorderMapper.xml +++ b/op-modules/op-plan/src/main/resources/mapper/plan/ProOrderWorkorderMapper.xml @@ -129,6 +129,16 @@ where order_code = #{orderCode} + insert into pro_order_workorder