From 99f82629da4da8bb804d56e1af45b7a99d7f2f1c 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 14:17:55 +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 --- .../module/contractorder/enums/ErpConstants.java | 13 +++++++++---- .../plat/module/contractorder/api/OrderApiImpl.java | 4 ++-- .../purchaseorder/PurchaseOrderServiceImpl.java | 4 ++-- .../service/salesorder/SalesOrderServiceImpl.java | 4 ++-- 4 files changed, 15 insertions(+), 10 deletions(-) diff --git a/zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/enums/ErpConstants.java b/zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/enums/ErpConstants.java index e3fab99d..b30145eb 100644 --- a/zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/enums/ErpConstants.java +++ b/zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/enums/ErpConstants.java @@ -4,8 +4,13 @@ package com.zt.plat.module.contractorder.enums; * ERP相关常量类 */ public class ErpConstants { - public static final String PO_WAREHOUSE_TYPE = "into"; - public static final String PO_WAREHOUSE_MMSITYPE = "PUR"; - public static final String SALE_WAREHOUSE_TYPE = "out"; - public static final String SALE_WAREHOUSE_MMSITYPE = "SALE"; + public static final String WAREHOUSE_TYPE_MOVE = "MOVE";//移库 + public static final String WAREHOUSE_TYPE_RECEIVING = "RECEIVING";// 入库 + public static final String WAREHOUSE_TYPE_SHIPPING = "SHIPPING";// 出库 + + public static final String WAREHOUSE_MMSITYPE_PUR = "PUR";//采购 + public static final String WAREHOUSE_MMSITYPE_SALE = "SALE"; //销售 + public static final String WAREHOUSE_MMSITYPE_ENT = "ENT";//委托加工 + public static final String WAREHOUSE_MMSITYPE_ENTED = "ENTED";//来料加工 + } diff --git a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/api/OrderApiImpl.java b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/api/OrderApiImpl.java index b3036b0b..bc88dd6e 100644 --- a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/api/OrderApiImpl.java +++ b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/api/OrderApiImpl.java @@ -203,7 +203,7 @@ public class OrderApiImpl implements OrderApi { } PrchOrdDtlMapper prchOrdDtlMapper = SpringUtil.getBean(PrchOrdDtlMapper.class); List orderIds = orderDTOS.stream().map(OrderDTO::getId).toList(); - List prchOrdDtlDOS = prchOrdDtlMapper.selectList(PrchOrdDtlDO::getOrdId, orderIds); + List prchOrdDtlDOS = prchOrdDtlMapper.selectList(PrchOrdDtlDO::getOrdId, orderIds, PrchOrdDtlDO::getIsEnb, 1); orderDTOS.forEach(o -> { List ordDtlDTOS = new ArrayList<>(); prchOrdDtlDOS.forEach(p -> { @@ -226,7 +226,7 @@ public class OrderApiImpl implements OrderApi { } SalesOrderDetailMapper salesOrderDetailMapper = SpringUtil.getBean(SalesOrderDetailMapper.class); List orderIds = orderDTOS.stream().map(OrderDTO::getId).toList(); - List salesOrderDetailDOS = salesOrderDetailMapper.selectList(SalesOrderDetailDO::getOrderId, orderIds); + List salesOrderDetailDOS = salesOrderDetailMapper.selectList(SalesOrderDetailDO::getOrderId, orderIds, SalesOrderDetailDO::getIsEnable, 1); orderDTOS.forEach(o -> { List salesOrdDtlDTOS = new ArrayList<>(); salesOrderDetailDOS.forEach(s -> { diff --git a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/purchaseorder/PurchaseOrderServiceImpl.java b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/purchaseorder/PurchaseOrderServiceImpl.java index 1a7b2b3b..c0c4126b 100644 --- a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/purchaseorder/PurchaseOrderServiceImpl.java +++ b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/purchaseorder/PurchaseOrderServiceImpl.java @@ -881,8 +881,8 @@ public class PurchaseOrderServiceImpl implements PurchaseOrderService { return warehouseFactoryService.getWarehouseFactoryByMainId(String.valueOf(internalWarehouseDO.getId())) .stream() // 过滤条件：MMSI类型+操作类型匹配ERP常量 - .filter(vo -> ErpConstants.PO_WAREHOUSE_MMSITYPE.equals(vo.getMmsiType()) - && ErpConstants.PO_WAREHOUSE_TYPE.equals(vo.getOperationType())) + .filter(vo -> ErpConstants.WAREHOUSE_MMSITYPE_PUR.equals(vo.getMmsiType()) + && ErpConstants.WAREHOUSE_TYPE_RECEIVING.equals(vo.getOperationType())) // 取第一个匹配结果（无结果则抛指定异常） .findFirst() .orElseThrow(() -> exception(WAREHOUSE_CODE_OR_FACTORY_CODE_NOT_EXISTS, diff --git a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/salesorder/SalesOrderServiceImpl.java b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/salesorder/SalesOrderServiceImpl.java index 5f86fb3c..f10db3ec 100644 --- a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/salesorder/SalesOrderServiceImpl.java +++ b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/salesorder/SalesOrderServiceImpl.java @@ -626,8 +626,8 @@ public class SalesOrderServiceImpl implements SalesOrderService { return warehouseFactoryService.getWarehouseFactoryByMainId(String.valueOf(internalWarehouseDO.getId())) .stream() // 过滤条件：MMSI类型+操作类型匹配ERP常量 - .filter(vo -> ErpConstants.SALE_WAREHOUSE_MMSITYPE.equals(vo.getMmsiType()) - && ErpConstants.SALE_WAREHOUSE_TYPE.equals(vo.getOperationType())) + .filter(vo -> ErpConstants.WAREHOUSE_MMSITYPE_SALE.equals(vo.getMmsiType()) + && ErpConstants.WAREHOUSE_TYPE_SHIPPING.equals(vo.getOperationType())) // 取第一个匹配结果（无结果则抛指定异常） .findFirst() .orElseThrow(() -> exception(WAREHOUSE_CODE_OR_FACTORY_CODE_NOT_EXISTS,