From 76ccd680a099a9dc97247b81147d202696f9381a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Tue, 26 May 2026 10:26:48 +0800 Subject: [PATCH] =?UTF-8?q?bug-1504=20=E5=90=84=E5=87=BA=E5=BA=93=E5=8D=95?= =?UTF-8?q?=E6=8D=AE=E7=9A=84=E7=BC=96=E8=BE=91=E5=92=8C=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=EF=BC=8C=E6=9C=AA=E8=BF=87=E8=B4=A6=E5=8D=95?= =?UTF-8?q?=E6=8D=AE=E5=85=81=E8=AE=B8=E7=BC=96=E8=BE=91=E6=95=B0=E9=87=8F?= =?UTF-8?q?=EF=BC=88=E5=8F=AA=E8=83=BD=E6=94=B9=E5=B0=8F,=E4=B8=8D?= =?UTF-8?q?=E8=83=BD=E6=94=B9=E5=A4=A7=EF=BC=89=EF=BC=8C=E4=B9=9F=E5=8F=AF?= =?UTF-8?q?=E5=88=A0=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/OutAssistanceController.java | 26 ++++++++++++++++++- .../controller/OutCostCenterController.java | 23 ++++++++++++++++ .../controller/OutProduceController.java | 23 ++++++++++++++++ .../controller/PurchaseReturnController.java | 24 +++++++++++++++++ .../controller/TransferCompanyController.java | 23 ++++++++++++++++ .../controller/TransferFactoryController.java | 23 ++++++++++++++++ 6 files changed, 141 insertions(+), 1 deletion(-) diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutAssistanceController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutAssistanceController.java index b5577e74..ebb0537d 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutAssistanceController.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutAssistanceController.java @@ -96,6 +96,7 @@ public class OutAssistanceController extends BaseController { private IOptRecordService optRecordService; @Resource private IWmsOutProduceService outProduceService; + /** * 查询SAP领料订单数据 */ @@ -138,7 +139,7 @@ public class OutAssistanceController extends BaseController { List itemLocks = inventoryService.getLockList(order.getWerks(), order.getLgort1(), item.getMatnr1()); VUtil.trueThrowBusinessError(CollectionUtil.isEmpty(itemLocks)).throwMessage("库存不足:" + item.getMatnr1()); lockVOS.addAll(itemLocks); - }else { + } else { data.setLeft(data.getNum()); data.setOrderId(order.getId()); outAssistanceItemService.save(data); @@ -212,6 +213,29 @@ public class OutAssistanceController extends BaseController { return ApiResult.success(); } + /** + * 删除订单项 + * @param ids 订单项id列表 + */ + @Transactional + @PostMapping("deleteItems") + public ApiResult deleteItems(@RequestBody @NotEmpty List ids) { + List items = outAssistanceItemService.lambdaQuery() + .in(WmsOutAssistanceItem::getId, ids) + .list(); + VUtil.trueThrowBusinessError(CollectionUtil.isEmpty(items)).throwMessage("订单项不存在"); + items.removeIf(item -> item.getNum().compareTo(item.getLeft()) != 0); + VUtil.trueThrowBusinessError(CollectionUtil.isEmpty(items)).throwMessage("没有可以删除的订单项"); + outAssistanceItemService.removeByIds(items.stream().map(WmsOutAssistanceItem::getId).collect(Collectors.toList())); + if (!outAssistanceItemService.lambdaQuery() + .eq(WmsOutAssistanceItem::getOrderId, items.get(0).getOrderId()) + .exists() + ) { + outAssistanceService.removeById(items.get(0).getOrderId()); + } + return ApiResult.success(); + } + /** * 获取订单项（PDA使用） */ diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutCostCenterController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutCostCenterController.java index 2e86b4e8..a9fbb691 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutCostCenterController.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutCostCenterController.java @@ -216,6 +216,29 @@ public class OutCostCenterController extends BaseController { return ApiResult.success(); } + /** + * 删除订单项 + * @param ids 订单项id列表 + */ + @Transactional + @PostMapping("deleteItems") + public ApiResult deleteItems(@RequestBody @NotEmpty List ids) { + List items = outCostcenterItemService.lambdaQuery() + .in(WmsOutCostcenterItem::getId, ids) + .list(); + VUtil.trueThrowBusinessError(CollectionUtil.isEmpty(items)).throwMessage("订单项不存在"); + items.removeIf(item -> item.getNum().compareTo(item.getLeft()) != 0); + VUtil.trueThrowBusinessError(CollectionUtil.isEmpty(items)).throwMessage("没有可以删除的订单项"); + outCostcenterItemService.removeByIds(items.stream().map(WmsOutCostcenterItem::getId).collect(Collectors.toList())); + if (!outCostcenterItemService.lambdaQuery() + .eq(WmsOutCostcenterItem::getOrderId, items.get(0).getOrderId()) + .exists() + ) { + outCostcenterService.removeById(items.get(0).getOrderId()); + } + return ApiResult.success(); + } + /** * 获取订单项（PDA使用） */ diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutProduceController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutProduceController.java index 2939e55b..4baa9a5e 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutProduceController.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutProduceController.java @@ -342,6 +342,29 @@ public class OutProduceController extends BaseController { return ApiResult.success(); } + /** + * 删除订单项 + * @param ids 订单项id列表 + */ + @Transactional + @PostMapping("deleteItems") + public ApiResult deleteItems(@RequestBody @NotEmpty List ids) { + List items = outProduceItemService.lambdaQuery() + .in(WmsOutProduceItem::getId, ids) + .list(); + VUtil.trueThrowBusinessError(CollectionUtil.isEmpty(items)).throwMessage("订单项不存在"); + items.removeIf(item -> item.getNum().compareTo(BigDecimal.ZERO) != 0); + VUtil.trueThrowBusinessError(CollectionUtil.isEmpty(items)).throwMessage("没有可以删除的订单项"); + outProduceItemService.removeByIds(items.stream().map(WmsOutProduceItem::getId).collect(Collectors.toList())); + if (!outProduceItemService.lambdaQuery() + .eq(WmsOutProduceItem::getOrderId, items.get(0).getOrderId()) + .exists() + ) { + outProduceService.removeById(items.get(0).getOrderId()); + } + return ApiResult.success(); + } + /** * 获取订单项（PDA使用） */ diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/PurchaseReturnController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/PurchaseReturnController.java index 41363c55..592a06c3 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/PurchaseReturnController.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/PurchaseReturnController.java @@ -32,6 +32,7 @@ import com.nflg.wms.starter.annotation.ApiMark; import jakarta.annotation.Resource; import jakarta.servlet.http.HttpServletResponse; import jakarta.validation.Valid; +import jakarta.validation.constraints.NotEmpty; import jakarta.validation.constraints.NotNull; import lombok.extern.slf4j.Slf4j; import org.springframework.transaction.annotation.Transactional; @@ -125,6 +126,29 @@ public class PurchaseReturnController extends BaseController { return ApiResult.success(); } + /** + * 删除订单项 + * @param ids 订单项id列表 + */ + @Transactional + @PostMapping("deleteItems") + public ApiResult deleteItems(@RequestBody @NotEmpty List ids) { + List items = returnRequestItemService.lambdaQuery() + .in(WmsReturnRequestItem::getId, ids) + .list(); + VUtil.trueThrowBusinessError(CollectionUtil.isEmpty(items)).throwMessage("订单项不存在"); + items.removeIf(item -> item.getRequestQuantity().compareTo(item.getLeft()) != 0); + VUtil.trueThrowBusinessError(CollectionUtil.isEmpty(items)).throwMessage("没有可以删除的订单项"); + returnRequestItemService.removeByIds(items.stream().map(WmsReturnRequestItem::getId).collect(Collectors.toList())); + if (!returnRequestItemService.lambdaQuery() + .eq(WmsReturnRequestItem::getApplicationId, items.get(0).getApplicationId()) + .exists() + ) { + returnRequestService.removeById(items.get(0).getApplicationId()); + } + return ApiResult.success(); + } + /** * 获取送货单的入库信息 * diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/TransferCompanyController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/TransferCompanyController.java index 39beb135..603b5ba4 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/TransferCompanyController.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/TransferCompanyController.java @@ -240,6 +240,29 @@ public class TransferCompanyController extends BaseController { return ApiResult.success(); } + /** + * 删除订单项 + * @param ids 订单项id列表 + */ + @Transactional + @PostMapping("deleteItems") + public ApiResult deleteItems(@RequestBody @NotEmpty List ids) { + List items = transferCompanyItemService.lambdaQuery() + .in(WmsTransferCompanyItem::getId, ids) + .list(); + VUtil.trueThrowBusinessError(CollectionUtil.isEmpty(items)).throwMessage("订单项不存在"); + items.removeIf(item -> item.getNum().compareTo(item.getLeft()) != 0); + VUtil.trueThrowBusinessError(CollectionUtil.isEmpty(items)).throwMessage("没有可以删除的订单项"); + transferCompanyItemService.removeByIds(items.stream().map(WmsTransferCompanyItem::getId).collect(Collectors.toList())); + if (!transferCompanyItemService.lambdaQuery() + .eq(WmsTransferCompanyItem::getOrderId, items.get(0).getOrderId()) + .exists() + ) { + transferCompanyService.removeById(items.get(0).getOrderId()); + } + return ApiResult.success(); + } + /** * 获取转储单（PDA使用） */ diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/TransferFactoryController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/TransferFactoryController.java index d3c97925..bd8f8572 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/TransferFactoryController.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/TransferFactoryController.java @@ -238,6 +238,29 @@ public class TransferFactoryController extends BaseController { return ApiResult.success(); } + /** + * 删除订单项 + * @param ids 订单项id列表 + */ + @Transactional + @PostMapping("deleteItems") + public ApiResult deleteItems(@RequestBody @NotEmpty List ids) { + List items = transferFactoryItemService.lambdaQuery() + .in(WmsTransferFactoryItem::getId, ids) + .list(); + VUtil.trueThrowBusinessError(CollectionUtil.isEmpty(items)).throwMessage("订单项不存在"); + items.removeIf(item -> item.getNum().compareTo(item.getLeft()) != 0); + VUtil.trueThrowBusinessError(CollectionUtil.isEmpty(items)).throwMessage("没有可以删除的订单项"); + transferFactoryItemService.removeByIds(items.stream().map(WmsTransferFactoryItem::getId).collect(Collectors.toList())); + if (!transferFactoryItemService.lambdaQuery() + .eq(WmsTransferFactoryItem::getOrderId, items.get(0).getOrderId()) + .exists() + ) { + transferFactoryService.removeById(items.get(0).getOrderId()); + } + return ApiResult.success(); + } + /** * 获取调拨单（PDA使用） */