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<Long> orderIds = orderDTOS.stream().map(OrderDTO::getId).toList();
-        List<PrchOrdDtlDO> prchOrdDtlDOS = prchOrdDtlMapper.selectList(PrchOrdDtlDO::getOrdId, orderIds);
+        List<PrchOrdDtlDO> prchOrdDtlDOS = prchOrdDtlMapper.selectList(PrchOrdDtlDO::getOrdId, orderIds, PrchOrdDtlDO::getIsEnb, 1);
         orderDTOS.forEach(o -> {
             List<OrdDtlDTO> ordDtlDTOS = new ArrayList<>();
             prchOrdDtlDOS.forEach(p -> {
@@ -226,7 +226,7 @@ public class OrderApiImpl implements OrderApi {
         }
         SalesOrderDetailMapper salesOrderDetailMapper = SpringUtil.getBean(SalesOrderDetailMapper.class);
         List<Long> orderIds = orderDTOS.stream().map(OrderDTO::getId).toList();
-        List<SalesOrderDetailDO> salesOrderDetailDOS = salesOrderDetailMapper.selectList(SalesOrderDetailDO::getOrderId, orderIds);
+        List<SalesOrderDetailDO> salesOrderDetailDOS = salesOrderDetailMapper.selectList(SalesOrderDetailDO::getOrderId, orderIds, SalesOrderDetailDO::getIsEnable, 1);
         orderDTOS.forEach(o -> {
             List<OrdDtlDTO> 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,