From 37714cafb9c6a7a6192849f9d90df28cb84c7db1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=BD=98=E8=8D=A3=E6=99=9F?= <9691125+pan-rongsheng@user.noreply.gitee.com> Date: Fri, 30 Jan 2026 11:31:26 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=BA=93=E4=BD=8D=E7=BB=91?= =?UTF-8?q?=E5=AE=9AFeign=E6=8E=A5=E5=8F=A3=E4=B8=8E=E5=90=88=E5=B9=B6?= =?UTF-8?q?=E9=87=87=E8=B4=AD=E9=94=80=E5=94=AE=E8=AE=A2=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/entrustorder/EntrustOrderDetailService.java | 7 +++++++ .../entrustorder/EntrustOrderDetailServiceImpl.java | 5 +++++ .../entrustorder/EntrustOrderOrderServiceImplImpl.java | 2 ++ .../OriginalMaterialProcessingDetailService.java | 7 +++++++ .../OriginalMaterialProcessingDetailServiceImpl.java | 5 +++++ .../OriginalMaterialProcessingServiceImplImpl.java | 7 +++++++ .../com/zt/plat/module/erp/api/InternalWarehouseApi.java | 2 +- 7 files changed, 34 insertions(+), 1 deletion(-) diff --git a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/entrustorder/EntrustOrderDetailService.java b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/entrustorder/EntrustOrderDetailService.java index 7e6983b2..171456de 100644 --- a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/entrustorder/EntrustOrderDetailService.java +++ b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/entrustorder/EntrustOrderDetailService.java @@ -83,4 +83,11 @@ public interface EntrustOrderDetailService { * @return 委托加工订单明细列表 */ List getEntrustOrderDetailListByOrderId(Long orderId); + /** + * 通过订单ID删除订单 + * + * @param orderId 编号 + * + */ + void deleteEntrustOrderDetailByOrderId(List orderId); } \ No newline at end of file diff --git a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/entrustorder/EntrustOrderDetailServiceImpl.java b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/entrustorder/EntrustOrderDetailServiceImpl.java index 51f9b342..bf0288c8 100644 --- a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/entrustorder/EntrustOrderDetailServiceImpl.java +++ b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/entrustorder/EntrustOrderDetailServiceImpl.java @@ -110,4 +110,9 @@ public class EntrustOrderDetailServiceImpl implements EntrustOrderDetailService return BeanUtils.toBean(entrustOrderDetailMapper.selectList(EntrustOrderDetailDO::getOrderId, orderId), EntrustOrderDetailRespVO.class); } + @Override + public void deleteEntrustOrderDetailByOrderId(List orderId) { + entrustOrderDetailMapper.delete(EntrustOrderDetailDO::getOrderId,orderId); + } + } \ No newline at end of file diff --git a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/entrustorder/EntrustOrderOrderServiceImplImpl.java b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/entrustorder/EntrustOrderOrderServiceImplImpl.java index 7125cd6b..af88655b 100644 --- a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/entrustorder/EntrustOrderOrderServiceImplImpl.java +++ b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/entrustorder/EntrustOrderOrderServiceImplImpl.java @@ -122,6 +122,8 @@ public class EntrustOrderOrderServiceImplImpl implements EntrustOrderOrderServic validateEntrustOrderOrderExists(ids); // 删除 entrustOrderOrderMapper.deleteByIds(ids); + // 删除委托加工订单明细 + entrustOrderDetailService.deleteEntrustOrderDetailByOrderId(ids); } private void validateEntrustOrderOrderExists(List ids) { diff --git a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/originalmaterialprocessing/OriginalMaterialProcessingDetailService.java b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/originalmaterialprocessing/OriginalMaterialProcessingDetailService.java index 0cd183f7..83d4b94a 100644 --- a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/originalmaterialprocessing/OriginalMaterialProcessingDetailService.java +++ b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/originalmaterialprocessing/OriginalMaterialProcessingDetailService.java @@ -87,4 +87,11 @@ public interface OriginalMaterialProcessingDetailService { * @return 来料加工订单明细列表 */ List getOriginalMaterialProcessingDetailListByOrderId(Long orderId); + /** + * 根据订单ids删除来料加工订单明细列表 + * + * @param orderIds 订单编号 + * + */ + void deleteOriginalMaterialProcessingDetailByOrderIds(List orderIds); } \ No newline at end of file diff --git a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/originalmaterialprocessing/OriginalMaterialProcessingDetailServiceImpl.java b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/originalmaterialprocessing/OriginalMaterialProcessingDetailServiceImpl.java index 18bdb4f9..8caf440e 100644 --- a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/originalmaterialprocessing/OriginalMaterialProcessingDetailServiceImpl.java +++ b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/originalmaterialprocessing/OriginalMaterialProcessingDetailServiceImpl.java @@ -110,4 +110,9 @@ public class OriginalMaterialProcessingDetailServiceImpl implements OriginalMate return BeanUtils.toBean(originalMaterialProcessingDetails, OriginalMaterialProcessingDetailRespVO.class); } + @Override + public void deleteOriginalMaterialProcessingDetailByOrderIds(List orderIds) { + originalMaterialProcessingDetailMapper.delete(OriginalMaterialProcessingDetailDO::getOrderId,orderIds); + } + } \ No newline at end of file diff --git a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/originalmaterialprocessing/OriginalMaterialProcessingServiceImplImpl.java b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/originalmaterialprocessing/OriginalMaterialProcessingServiceImplImpl.java index 08887969..4afe09fd 100644 --- a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/originalmaterialprocessing/OriginalMaterialProcessingServiceImplImpl.java +++ b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/originalmaterialprocessing/OriginalMaterialProcessingServiceImplImpl.java @@ -107,19 +107,26 @@ public class OriginalMaterialProcessingServiceImplImpl implements OriginalMateri } @Override + @Transactional(rollbackFor = Exception.class) public void deleteOriginalMaterialProcessing(Long id) { // 校验存在 validateEntrustOrderOrderExists(id); // 删除 originalMaterialProcessingMapper.deleteById(id); + // 删除委托加工订单明细 + originalMaterialProcessingDetailService.deleteOriginalMaterialProcessingDetailByOrderIds(List.of(id)); + } @Override + @Transactional(rollbackFor = Exception.class) public void deleteOriginalMaterialProcessingListByIds(List ids) { // 校验存在 validateEntrustOrderOrderExists(ids); // 删除 originalMaterialProcessingMapper.deleteByIds(ids); + // 删除委托加工订单明细 + originalMaterialProcessingDetailService.deleteOriginalMaterialProcessingDetailByOrderIds(ids); } private void validateEntrustOrderOrderExists(List ids) { diff --git a/zt-module-erp/zt-module-erp-api/src/main/java/com/zt/plat/module/erp/api/InternalWarehouseApi.java b/zt-module-erp/zt-module-erp-api/src/main/java/com/zt/plat/module/erp/api/InternalWarehouseApi.java index e414b86c..0005af05 100644 --- a/zt-module-erp/zt-module-erp-api/src/main/java/com/zt/plat/module/erp/api/InternalWarehouseApi.java +++ b/zt-module-erp/zt-module-erp-api/src/main/java/com/zt/plat/module/erp/api/InternalWarehouseApi.java @@ -23,7 +23,7 @@ public interface InternalWarehouseApi { * @return 仓库列表 */ @GetMapping(PREFIX + "/list-by-factory-code-and-warehouse-code") - @Operation(summary = "根据工厂代码和仓库代码获取仓库列表", description = "根据工厂代码和仓库代码获取仓库列表;factoryCode是工厂编码,warehouseCode是仓库编码,mmsiType是业务类型,operationType是操作类型") + @Operation(summary = "根据工厂代码和仓库代码获取仓库列表", description = "根据工厂代码和仓库代码获取仓库列表;factoryCode是工厂编码,warehouseCode是仓库编码,mmsiType是业务类型(字典：SPLY_BSN_TP),operationType是操作类型(字典：WAREHOUSE_OPERATION)") CommonResult> getInternalWarehouseListByFactoryCodeAndWarehouseCode(@RequestParam(value = "factoryCode") String factoryCode, @RequestParam(value = "warehouseCode") String warehouseCode, @RequestParam(value = "mmsiType", required = false) String mmsiType, @RequestParam(value = "operationType", required = false) String operationType); }