diff --git a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/entrustorder/vo/EntrustOrderDetailPageReqVO.java b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/entrustorder/vo/EntrustOrderDetailPageReqVO.java
index 0a89d45e..ec7b72b9 100644
--- a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/entrustorder/vo/EntrustOrderDetailPageReqVO.java
+++ b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/entrustorder/vo/EntrustOrderDetailPageReqVO.java
@@ -99,5 +99,9 @@ public class EntrustOrderDetailPageReqVO extends PageParam {
     //税率
     @Schema(description = "税率")
     private BigDecimal taxRate;
+    @Schema(description = "回收率")
+    private BigDecimal recoveryRate;
+    @Schema(description = "行项目号")
+    private Integer lineNumber;
 
 }
\ 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/controller/admin/entrustorder/vo/EntrustOrderDetailRespVO.java b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/entrustorder/vo/EntrustOrderDetailRespVO.java
index 7e588e23..022cffcd 100644
--- a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/entrustorder/vo/EntrustOrderDetailRespVO.java
+++ b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/entrustorder/vo/EntrustOrderDetailRespVO.java
@@ -141,4 +141,10 @@ public class EntrustOrderDetailRespVO {
     @Schema(description = "税率")
     @ExcelProperty("税率")
     private BigDecimal taxRate;
+    @Schema(description = "回收率")
+    @ExcelProperty("回收率")
+    private BigDecimal recoveryRate;
+    @Schema(description = "行项目号")
+    @ExcelProperty("行项目号")
+    private Integer lineNumber;
 }
\ 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/controller/admin/entrustorder/vo/EntrustOrderDetailSaveReqVO.java b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/entrustorder/vo/EntrustOrderDetailSaveReqVO.java
index 53728635..e71129e6 100644
--- a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/entrustorder/vo/EntrustOrderDetailSaveReqVO.java
+++ b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/entrustorder/vo/EntrustOrderDetailSaveReqVO.java
@@ -101,4 +101,8 @@ public class EntrustOrderDetailSaveReqVO {
     private String sendMaterialName;
     @Schema(description = "税率")
     private BigDecimal taxRate;
+    @Schema(description = "回收率")
+    private BigDecimal recoveryRate;
+    @Schema(description = "行项目号")
+    private Integer lineNumber;
 }
\ 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/controller/admin/purchaseorder/PurchaseOrderController.java b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/purchaseorder/PurchaseOrderController.java
index 440d095e..30575532 100644
--- a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/purchaseorder/PurchaseOrderController.java
+++ b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/purchaseorder/PurchaseOrderController.java
@@ -149,7 +149,7 @@ public class PurchaseOrderController implements BusinessControllerMarker {
     public CommonResult<?> submitErp061(@RequestBody @Validated @NotEmpty(message = "采购订单id不能为空") List<String> idsStr) {
         List<Long> ids = idsStr.stream().map(Long::valueOf).toList();
         // todo 推送ERP订单
-        return customize(purchaseOrderService.submitErp061(ids),200,"推送成功");
+        return success(purchaseOrderService.submitErp061(ids));
     }
 
     @PostMapping("/submit-erp062")
diff --git a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/dal/dataobject/entrustorder/EntrustOrderDetailDO.java b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/dal/dataobject/entrustorder/EntrustOrderDetailDO.java
index 72f03e44..e0a2ba5f 100644
--- a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/dal/dataobject/entrustorder/EntrustOrderDetailDO.java
+++ b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/dal/dataobject/entrustorder/EntrustOrderDetailDO.java
@@ -170,4 +170,10 @@ public class EntrustOrderDetailDO extends BusinessBaseDO {
 
     @TableField("TAX_RTE")
     private BigDecimal taxRate;
+
+    @TableField("RCV_RTE")
+    private BigDecimal recoveryRate;
+
+    @TableField("LINE_NUM")
+    private Integer lineNumber;
 }
\ 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/dal/mysql/entrustorder/EntrustOrderDetailMapper.java b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/dal/mysql/entrustorder/EntrustOrderDetailMapper.java
index 630ff0d8..15121fd7 100644
--- a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/dal/mysql/entrustorder/EntrustOrderDetailMapper.java
+++ b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/dal/mysql/entrustorder/EntrustOrderDetailMapper.java
@@ -39,6 +39,8 @@ public interface EntrustOrderDetailMapper extends BaseMapperX<EntrustOrderDetail
                 .betweenIfPresent(EntrustOrderDetailDO::getCreateTime, reqVO.getCreateTime())
                 .likeIfPresent(EntrustOrderDetailDO::getRemark, reqVO.getRemark())
                 .eqIfPresent(EntrustOrderDetailDO::getTaxRate, reqVO.getTaxRate())
+                .eqIfPresent(EntrustOrderDetailDO::getRecoveryRate, reqVO.getRecoveryRate())
+                .eqIfPresent(EntrustOrderDetailDO::getLineNumber, reqVO.getLineNumber())
                 .orderByDesc(EntrustOrderDetailDO::getId));
     }
 
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 5de0497e..d7e3516a 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
@@ -104,6 +104,7 @@ public class PurchaseOrderServiceImpl implements PurchaseOrderService {
     private WarehouseFactoryService warehouseFactoryService;
     @Resource
     private InternalWarehouseService internalWarehouseService;
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     public PurchaseOrderRespVO createPurchaseOrder(PurchaseOrderSaveReqVO createReqVO) {
@@ -116,15 +117,15 @@ public class PurchaseOrderServiceImpl implements PurchaseOrderService {
         purchaseOrder.setSystemOrderNumber(orderNumber);
         purchaseOrderMapper.insert(purchaseOrder);
 
-        if (createReqVO.getDetails()==null||createReqVO.getDetails().isEmpty()) {
-          throw exception(ORDER_DETAIL_NOT_EXISTS);
+        if (createReqVO.getDetails() == null || createReqVO.getDetails().isEmpty()) {
+            throw exception(ORDER_DETAIL_NOT_EXISTS);
         }
         //批量插入订单明细
         createReqVO.getDetails().forEach(details -> details.setOrdId(purchaseOrder.getId()));
         List<PrchOrdDtlRespVO> prchOrdDtlRespVOS = prchOrdDtlService.batchCreatePrchOrdDtl(createReqVO.getDetails());
         PurchaseOrderRespVO purchaseOrderRespVO = BeanUtils.toBean(purchaseOrder, PurchaseOrderRespVO.class);
         purchaseOrderRespVO.setPrchOrdDtlRespVOS(prchOrdDtlRespVOS);
-        return  BeanUtils.toBean(purchaseOrder, PurchaseOrderRespVO.class);
+        return BeanUtils.toBean(purchaseOrder, PurchaseOrderRespVO.class);
     }
 
     @Override
@@ -136,9 +137,9 @@ public class PurchaseOrderServiceImpl implements PurchaseOrderService {
         PurchaseOrderDO updateObj = BeanUtils.toBean(updateReqVO, PurchaseOrderDO.class);
         purchaseOrderMapper.updateById(updateObj);
 //        批量插入订单明细
-        updateReqVO.getDetails().forEach(prchOrdDtlSaveReqVO ->{
+        updateReqVO.getDetails().forEach(prchOrdDtlSaveReqVO -> {
             //表示新增
-            if (prchOrdDtlSaveReqVO.getId() == null){
+            if (prchOrdDtlSaveReqVO.getId() == null) {
                 prchOrdDtlSaveReqVO.setOrdId(updateReqVO.getId());
             }
         });
@@ -148,7 +149,7 @@ public class PurchaseOrderServiceImpl implements PurchaseOrderService {
         //如果erp订单号有值就需要调用erp接口更新
         if (!StringUtils.isBlank(purchaseOrderDO.getOrderSAPNumber())) {
             boolean b = submitErp062ByUpdate(updateReqVO.getId());
-            if (!b){
+            if (!b) {
                 log.error("ERP订单更新失败，订单ID：【{}】", updateReqVO.getId());
                 throw exception(ERP_ORDER_UPDATE_FAILED);
             }
@@ -217,7 +218,7 @@ public class PurchaseOrderServiceImpl implements PurchaseOrderService {
         if (ObjectUtils.isEmpty(purchaseOrderDO)) {
             throw exception(ORDER_ID_NOT_EXISTS);
         }
-        if (purchaseOrderDO.getIsPush()==0) {
+        if (purchaseOrderDO.getIsPush() == 0) {
             throw exception(ORDER_DONT_SUBMIT);
         }
         AdminUserRespDTO adminUserRespDTO = adminUserApi.getUser(SecurityFrameworkUtils.getLoginUserId()).getData();
@@ -278,6 +279,7 @@ public class PurchaseOrderServiceImpl implements PurchaseOrderService {
     @Override
     @Transactional
     public String submitErp061(List<Long> ids) {
+        List<String> results = new ArrayList<>();
         // 通过订单号查询订单
         List<PurchaseOrderWithDetailsVO> purchaseOrderWithDetailsVOS = purchaseOrderMapper.selectOrderByIds(ids);
         if (!purchaseOrderWithDetailsVOS.isEmpty()) {
@@ -311,29 +313,29 @@ public class PurchaseOrderServiceImpl implements PurchaseOrderService {
                 JSONArray jsonArray = JSONArray.from(actsCtgrDtlList);
                 erpOrderSaveReqVO.setAccts(jsonArray);
                 // 3. 处理行项目信息(Item)
-                List<PrchOrdDtlDO> details = prchOrdDtlMapper.selectList(PrchOrdDtlDO::getOrdId,order.getId());
+                List<PrchOrdDtlDO> details = prchOrdDtlMapper.selectList(PrchOrdDtlDO::getOrdId, order.getId());
                 if (details != null && !details.isEmpty()) {
                     List<ErpOrderSaveReqVO.Item> items = new ArrayList<>();
-                    List<ErpOrderSaveReqVO.Itex> itexes=new ArrayList<>();
+                    List<ErpOrderSaveReqVO.Itex> itexes = new ArrayList<>();
                     for (PrchOrdDtlDO detail : details) {
                         ErpOrderSaveReqVO.Item item = new ErpOrderSaveReqVO.Item();
-                        MaterialInfomationPageReqDTO infomationPageReqDTO=new MaterialInfomationPageReqDTO();
+                        MaterialInfomationPageReqDTO infomationPageReqDTO = new MaterialInfomationPageReqDTO();
                         infomationPageReqDTO.setPageSize(10000);
                         infomationPageReqDTO.setCode(detail.getMtrlNum());
                         CommonResult<PageResult<MaterialInfomationRespDTO>> materialInfomationPage = materialInfomationApi.getMaterialInfomationPage(infomationPageReqDTO);
-                        if (materialInfomationPage.getData()==null || materialInfomationPage.getData().getList().isEmpty()){
-                            throw  exception(MTRL_CODE_NOT_EXISTS);
+                        if (materialInfomationPage.getData() == null || materialInfomationPage.getData().getList().isEmpty()) {
+                            throw exception(MTRL_CODE_NOT_EXISTS);
 
                         }
                         MaterialInfomationRespDTO materialInfomationRespDTO = materialInfomationPage.getData().getList().get(0);
                         Map<String, Object> flatAttributes = materialInfomationRespDTO.getFlatAttributes();
                         //获取中铜物料编码
                         String mtrlZhongtongCode = flatAttributes.getOrDefault("mtrlZhongtongCode", "").toString();
-                        if (mtrlZhongtongCode.isEmpty()){
-                            throw  exception(MTRL_CODE_NOT_EXISTS);
+                        if (mtrlZhongtongCode.isEmpty()) {
+                            throw exception(MTRL_CODE_NOT_EXISTS);
                         }
                         //查询库位绑定编码
-                       // WarehouseFactoryRespVO factoryAndWarehouse = getBoundFactoryAndWarehouse(detail.getRcvFactNum(), detail.getRcvWrhNum());
+                        // WarehouseFactoryRespVO factoryAndWarehouse = getBoundFactoryAndWarehouse(detail.getRcvFactNum(), detail.getRcvWrhNum());
                         // 3.1 行项目基本信息
                         item.setPo_item(detail.getLineNum() != null ? detail.getLineNum().intValue() : null); // 行项目 -> 行号
                         item.setMaterial(mtrlZhongtongCode); // 物料编码 -> 物料号
@@ -391,11 +393,8 @@ public class PurchaseOrderServiceImpl implements PurchaseOrderService {
                     erpOrderSaveReqVO.setItems(items);
                     erpOrderSaveReqVO.setItex(itexes);
                 }
-
-
-                //todo 4. 推送ERP并处理返回结果
-
-                String result = erpOrderService.submitOrderToErp061(erpOrderSaveReqVO);
+                String result ="ERP提交失败";
+                result= erpOrderService.submitOrderToErp061(erpOrderSaveReqVO);
                 Long localOrderId = purchaseOrderWithDetailsVO.getPurchaseOrder().getId();
                 log.info("订单推送ERP请求完成，本地订单ID【{}】，ERP返回原始结果【{}】", localOrderId, result);
 
@@ -419,7 +418,7 @@ public class PurchaseOrderServiceImpl implements PurchaseOrderService {
                     if (StringUtils.isNotBlank(erpId)) {
                         // ERP返回有效订单号，更新为成功状态
                         upVo.setOrderSAPNumber(erpId);
-                        upVo.setCause("ERP提交成功，erpID为："+erpId);
+                        upVo.setCause("ERP提交成功，erpID为：" + erpId);
                         upVo.setErpStatus(OrderStatusEnum.FIND.getCode()); // 推送成功状态
                         log.info("订单推送ERP成功，本地订单ID【{}】，ERP订单号【{}】，已更新本地状态", localOrderId, erpId);
                     } else {
@@ -430,17 +429,18 @@ public class PurchaseOrderServiceImpl implements PurchaseOrderService {
                     }
 
                     purchaseOrderMapper.updateById(upVo);
-
-                }catch (Exception e) {
+                    results.add(result);
+                } catch (Exception e) {
                     upVo.setOrderSAPNumber(null);
                     upVo.setErpStatus(OrderStatusEnum.RLBK.getCode()); // 异常时强制置为失败状态
                     upVo.setCause("ERP返回结果解析/处理异常：" + e.getMessage());
                     // 异常时仍需更新数据库，保证订单状态一致性
                     purchaseOrderMapper.updateById(upVo);
                     log.error("订单推送ERP发生异常，本地订单ID【{}】，异常信息如下", localOrderId, e);
+                    results.add("ERP返回结果解析/处理异常：" + e.getMessage());
                 }
             });
-            return "ERP推送成功";
+            return results.get(0);
         } else {
             return "订单不存在";
         }
@@ -457,8 +457,20 @@ public class PurchaseOrderServiceImpl implements PurchaseOrderService {
         }
         ErpOrderUpdateReqVO erpOrderUpdateReqVO = new ErpOrderUpdateReqVO();
         setValue(erpOrderUpdateReqVO, purchaseOrderWithDetailsVOS.get(0));
-        erpOrderService.submitOrderToErp062(erpOrderUpdateReqVO);
-        return true;
+        String s = erpOrderService.submitOrderToErp062(erpOrderUpdateReqVO);
+        JSONObject jsonObject = JSONObject.parseObject(s);
+        if ("S".equals(jsonObject.getString("flag"))) {
+            log.info("订单更新ERP成功，本地订单ID【{}】，ERP返回结果【{}】", id, s);
+            return true;
+        } else if ("E".equals(jsonObject.getString("flag"))) {
+            log.error("订单更新ERP失败，本地订单ID【{}】，ERP返回结果【{}】", id, s);
+            PurchaseOrderDO upVo = new PurchaseOrderDO();
+            upVo.setId(id);
+            upVo.setCause(s);
+            purchaseOrderMapper.updateById(upVo);
+            return false;
+        }
+        return false;
     }
 
     @Override
@@ -565,7 +577,6 @@ public class PurchaseOrderServiceImpl implements PurchaseOrderService {
     }
 
 
-
     private void setValue(ErpOrderUpdateReqVO erpOrderUpdateReqVO, PurchaseOrderWithDetailsVO purchaseOrderWithDetailsVO) {
         //head
         PurchaseOrderDO purchaseOrderDO = purchaseOrderMapper.findOrderById(purchaseOrderWithDetailsVO.getPurchaseOrder().getId());//需要自定义sql，防止框架拼接删除条件后查询不到
@@ -588,21 +599,22 @@ public class PurchaseOrderServiceImpl implements PurchaseOrderService {
 
     private void setItems(ErpOrderUpdateReqVO erpOrderUpdateReqVO, PurchaseOrderWithDetailsVO purchaseOrderWithDetailsVO) {
         List<ErpOrderUpdateReqVO.item> items = new ArrayList<>();
-        purchaseOrderWithDetailsVO.getOrderDetails().forEach(orderDetail -> {
-            MaterialInfomationPageReqDTO infomationPageReqDTO=new MaterialInfomationPageReqDTO();
+        purchaseOrderWithDetailsVO.getOrderDetails().forEach(p -> {
+            PrchOrdDtlDO orderDetail = prchOrdDtlMapper.selectById(p.getId());
+            MaterialInfomationPageReqDTO infomationPageReqDTO = new MaterialInfomationPageReqDTO();
             infomationPageReqDTO.setPageSize(10000);
             infomationPageReqDTO.setCode(orderDetail.getMtrlNum());
             CommonResult<PageResult<MaterialInfomationRespDTO>> materialInfomationPage = materialInfomationApi.getMaterialInfomationPage(infomationPageReqDTO);
-            if (materialInfomationPage.getData()==null || materialInfomationPage.getData().getList().isEmpty()){
-                throw  exception(MTRL_CODE_NOT_EXISTS);
+            if (materialInfomationPage.getData() == null || materialInfomationPage.getData().getList().isEmpty()) {
+                throw exception(MTRL_CODE_NOT_EXISTS);
 
             }
             MaterialInfomationRespDTO materialInfomationRespDTO = materialInfomationPage.getData().getList().get(0);
             Map<String, Object> flatAttributes = materialInfomationRespDTO.getFlatAttributes();
             //获取中铜物料编码
             String mtrlZhongtongCode = flatAttributes.getOrDefault("mtrlZhongtongCode", "").toString();
-            if (mtrlZhongtongCode.isEmpty()){
-                throw  exception(MTRL_CODE_NOT_EXISTS);
+            if (mtrlZhongtongCode.isEmpty()) {
+                throw exception(MTRL_CODE_NOT_EXISTS);
             }
             PrchOrdDtlDO prchOrdDtlDO = prchOrdDtlMapper.findOrdDtlById(orderDetail.getId());
             ErpOrderUpdateReqVO.item item = new ErpOrderUpdateReqVO.item(); // item
@@ -626,13 +638,14 @@ public class PurchaseOrderServiceImpl implements PurchaseOrderService {
     private void setItex(ErpOrderUpdateReqVO erpOrderUpdateReqVO, PurchaseOrderWithDetailsVO purchaseOrderWithDetailsVO) {
         List<ErpOrderUpdateReqVO.itex> itexs = new ArrayList<>();
         purchaseOrderWithDetailsVO.getOrderDetails().forEach(orderDetail -> {
-            if (orderDetail.getActsCtgrDtl()!=null) {
+            if (orderDetail.getActsCtgrDtl() != null) {
                 ErpOrderUpdateReqVO.itex itex = new ErpOrderUpdateReqVO.itex(); // itex
                 itex.setPo_item(orderDetail.getLineNum()); //行号
                 itex.setZpurty(orderDetail.getPrchCtgr());//采购类别
                 itex.setZmatnr(orderDetail.getOrigWet()); // 原料湿重
                 itexs.add(itex);
-            }});
+            }
+        });
         erpOrderUpdateReqVO.setItexs(itexs);
     }
 
@@ -695,7 +708,6 @@ public class PurchaseOrderServiceImpl implements PurchaseOrderService {
 //    }
 
 
-
     @Override
     public List<DownOrUpOrderRespVO> getOrderByOrderIdAndType(DownOrUpOrderReqVO reqVO) {
         PurchaseOrderDO purchaseOrderDO = purchaseOrderMapper.selectById(reqVO.getOrderId());
@@ -774,7 +786,7 @@ public class PurchaseOrderServiceImpl implements PurchaseOrderService {
 
     @Override
     public List<PurchaseOrderDO> getOrderByNos(List<String> orderNos) {
-        return purchaseOrderMapper.selectList(PurchaseOrderDO::getSystemOrderNumber,orderNos);
+        return purchaseOrderMapper.selectList(PurchaseOrderDO::getSystemOrderNumber, orderNos);
     }
 
     @Override
@@ -783,9 +795,8 @@ public class PurchaseOrderServiceImpl implements PurchaseOrderService {
     }
 
 
-
     @Override
-    @Transactional(rollbackFor=Exception.class)
+    @Transactional(rollbackFor = Exception.class)
     public boolean orderPassReject(PurchaseorderReqVO purchaseorderReqVO) {
         // 查询采购单
         PurchaseOrderDO purchaseOrderDO = purchaseOrderMapper.selectById(purchaseorderReqVO.getId());
@@ -917,14 +928,14 @@ public class PurchaseOrderServiceImpl implements PurchaseOrderService {
     @Override
     public boolean submitErp062ByDelete(Long id) {
         log.info("开始执行提交ERP 062 By Delete 操作，ID：{}", id);
-       //查询采购单信息
+        //查询采购单信息
         PurchaseOrderDO purchaseOrderDO = purchaseOrderMapper.selectById(id);
-        if (purchaseOrderDO==null){
+        if (purchaseOrderDO == null) {
             throw exception(PURCHASE_ORDER_NOT_EXISTS);
         }
         //根据订单信息查询采购单详情信息
         List<PrchOrdDtlDO> purchaseOrderDetailsDOS = prchOrdDtlService.getDetailsByOrderId(id);
-        if (purchaseOrderDetailsDOS==null || purchaseOrderDetailsDOS.isEmpty()){
+        if (purchaseOrderDetailsDOS == null || purchaseOrderDetailsDOS.isEmpty()) {
             throw exception(PURCHASE_ORDER_DETAIL_NOT_EXISTS);
         }
         ErpOrderUpdateReqVO erpOrderUpdateReqVO = new ErpOrderUpdateReqVO();
@@ -935,28 +946,32 @@ public class PurchaseOrderServiceImpl implements PurchaseOrderService {
         //如果删除erp提交成功
         this.deletePurchaseOrderListByIds(List.of(id));
         return true;
-    };
+    }
+
+    ;
+
     private void setHeadAndExte(ErpOrderUpdateReqVO erpOrderUpdateReqVO, PurchaseOrderDO purchaseOrderDO) {
         erpOrderUpdateReqVO.setPoNumber(purchaseOrderDO.getOrderSAPNumber()).setDeleteInd("1").setCurrency(purchaseOrderDO.getCurrencyNumber()).setExchRate(purchaseOrderDO.getExchangeRate());
         erpOrderUpdateReqVO.setZzhth(purchaseOrderDO.getPaperContractNumber()).setZxxyh(purchaseOrderDO.getAgreementNumber()).setZnote(purchaseOrderDO.getRemark()).setZlifnr(purchaseOrderDO.getAgreementNumber());
     }
+
     private void setDeleteItems(ErpOrderUpdateReqVO erpOrderUpdateReqVO, List<PrchOrdDtlDO> purchaseOrderDetailsDOS) {
         List<ErpOrderUpdateReqVO.item> items = new ArrayList<>();
         purchaseOrderDetailsDOS.forEach(prchOrdDtlDO -> {
-            MaterialInfomationPageReqDTO infomationPageReqDTO=new MaterialInfomationPageReqDTO();
+            MaterialInfomationPageReqDTO infomationPageReqDTO = new MaterialInfomationPageReqDTO();
             infomationPageReqDTO.setPageSize(10000);
             infomationPageReqDTO.setCode(prchOrdDtlDO.getMtrlNum());
             CommonResult<PageResult<MaterialInfomationRespDTO>> materialInfomationPage = materialInfomationApi.getMaterialInfomationPage(infomationPageReqDTO);
-            if (materialInfomationPage.getData()==null || materialInfomationPage.getData().getList().isEmpty()){
-                throw  exception(MTRL_CODE_NOT_EXISTS);
+            if (materialInfomationPage.getData() == null || materialInfomationPage.getData().getList().isEmpty()) {
+                throw exception(MTRL_CODE_NOT_EXISTS);
 
             }
             MaterialInfomationRespDTO materialInfomationRespDTO = materialInfomationPage.getData().getList().get(0);
             Map<String, Object> flatAttributes = materialInfomationRespDTO.getFlatAttributes();
             //获取中铜物料编码
             String mtrlZhongtongCode = flatAttributes.getOrDefault("mtrlZhongtongCode", "").toString();
-            if (mtrlZhongtongCode.isEmpty()){
-                throw  exception(MTRL_CODE_NOT_EXISTS);
+            if (mtrlZhongtongCode.isEmpty()) {
+                throw exception(MTRL_CODE_NOT_EXISTS);
             }
             ErpOrderUpdateReqVO.item item = new ErpOrderUpdateReqVO.item(); // item
             item.setPo_item(prchOrdDtlDO.getLineNum());//行号
diff --git a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/dal/dataobject/erp/ErpWarehouseDO.java b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/dal/dataobject/erp/ErpWarehouseDO.java
index 88d4c379..0f9a70d4 100644
--- a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/dal/dataobject/erp/ErpWarehouseDO.java
+++ b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/dal/dataobject/erp/ErpWarehouseDO.java
@@ -20,7 +20,7 @@ import lombok.*;
 /**
 * 支持业务基类继承：isBusiness=true 时继承 BusinessBaseDO，否则继承 BaseDO
 */
-public class ErpWarehouseDO extends BusinessBaseDO {
+public class ErpWarehouseDO extends BaseDO {
 
     /**
     * 主键
diff --git a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/dal/mysql/erp/ErpWarehouseMapper.java b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/dal/mysql/erp/ErpWarehouseMapper.java
index 7ef9ea6b..56a1d5ce 100644
--- a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/dal/mysql/erp/ErpWarehouseMapper.java
+++ b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/dal/mysql/erp/ErpWarehouseMapper.java
@@ -8,6 +8,7 @@ import com.zt.plat.module.erp.controller.admin.erp.vo.ErpWarehousePageReqVO;
 import com.zt.plat.module.erp.dal.dataobject.erp.ErpSalesOrganizationDO;
 import com.zt.plat.module.erp.dal.dataobject.erp.ErpWarehouseDO;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -40,5 +41,10 @@ public interface ErpWarehouseMapper extends BaseMapperX<ErpWarehouseDO> {
                 .orderByDesc(ErpWarehouseDO::getId));
     }
 
+    List<ErpWarehouseDO> selectWarehouseByDynamicParams(
+            @Param("paramReqVO") ErpWarehousePageReqVO reqVO,
+            @Param("pageNum") Integer pageNum,
+            @Param("pageSize") Integer pageSize);
 
+    Long selectWarehouseByDynamicParamsCount(@Param("paramReqVO") ErpWarehousePageReqVO reqVO);
 }
\ No newline at end of file
diff --git a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpWarehouseServiceImpl.java b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpWarehouseServiceImpl.java
index 3178287c..2c5eb7af 100644
--- a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpWarehouseServiceImpl.java
+++ b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpWarehouseServiceImpl.java
@@ -192,31 +192,32 @@ public PageResult<ErpWarehouseDO> getErpWarehousePageDistinctByFactory(ErpWareho
 
     @Override
     public PageResult<ErpWarehouseDO> getErpWarehousePage(ErpWarehousePageReqVO pageReqVO) {
-//        PageResult<ErpWarehouseRespVO> erpWarehouseRespVOPageResult = BeanUtils.toBean(erpWarehouseMapper.selectPage(pageReqVO), ErpWarehouseRespVO.class);
+        return new PageResult<>(erpWarehouseMapper.selectWarehouseByDynamicParams(pageReqVO, pageReqVO.getPageNo(), pageReqVO.getPageSize()), erpWarehouseMapper.selectWarehouseByDynamicParamsCount(pageReqVO));
+        //        PageResult<ErpWarehouseRespVO> erpWarehouseRespVOPageResult = BeanUtils.toBean(erpWarehouseMapper.selectPage(pageReqVO), ErpWarehouseRespVO.class);
 //        if (erpWarehouseRespVOPageResult.getList() == null) {
 //            return erpWarehouseRespVOPageResult;
 //        }
 //        erpWarehouseRespVOPageResult.getList().forEach(this::setWarehouseFactoryInfo);
 //        return erpWarehouseRespVOPageResult;
         // 获取分页数据
-        List<ErpWarehouseDO> list = erpWarehouseMapper.getPageByReq(pageReqVO);
-        if (list == null) {
-            list = CollUtil.newArrayList();
-        }
-        // 分页处理
-        int pageNo = pageReqVO.getPageNo();
-        int pageSize = pageReqVO.getPageSize();
-        int total = list.size();
-        // 计算分页起始和结束位置
-        int fromIndex = (pageNo - 1) * pageSize;
-        int toIndex = Math.min(fromIndex + pageSize, total);
-        // 如果起始位置超出范围，则返回空列表
-        if (fromIndex >= total) {
-            return new PageResult<>(new ArrayList<>(), (long) total);
-        }
-        // 截取当前页数据
-        List<ErpWarehouseDO> pageList = list.subList(fromIndex, toIndex);
-        return new PageResult<>(pageList, (long) total);
+//        List<ErpWarehouseDO> list = erpWarehouseMapper.getPageByReq(pageReqVO);
+//        if (list == null) {
+//            list = CollUtil.newArrayList();
+//        }
+//        // 分页处理
+//        int pageNo = pageReqVO.getPageNo();
+//        int pageSize = pageReqVO.getPageSize();
+//        int total = list.size();
+//        // 计算分页起始和结束位置
+//        int fromIndex = (pageNo - 1) * pageSize;
+//        int toIndex = Math.min(fromIndex + pageSize, total);
+//        // 如果起始位置超出范围，则返回空列表
+//        if (fromIndex >= total) {
+//            return new PageResult<>(new ArrayList<>(), (long) total);
+//        }
+//        // 截取当前页数据
+//        List<ErpWarehouseDO> pageList = list.subList(fromIndex, toIndex);
+//        return new PageResult<>(pageList, (long) total);
     }
 
     // 设置主物料信息
diff --git a/zt-module-erp/zt-module-erp-server/src/main/resources/mapper/ErpWarehouseMapper.xml b/zt-module-erp/zt-module-erp-server/src/main/resources/mapper/ErpWarehouseMapper.xml
index 4308b672..2c0d4937 100644
--- a/zt-module-erp/zt-module-erp-server/src/main/resources/mapper/ErpWarehouseMapper.xml
+++ b/zt-module-erp/zt-module-erp-server/src/main/resources/mapper/ErpWarehouseMapper.xml
@@ -10,19 +10,20 @@
      -->
 
     <select id="selectMaxCode" resultType="java.lang.String">
-        SELECT MAX(NUM) FROM sply_erp_wrh
+        SELECT MAX(NUM)
+        FROM sply_erp_wrh
     </select>
 
     <select id="getPageByReq" resultType="com.zt.plat.module.erp.dal.dataobject.erp.ErpWarehouseDO">
         select f.id,
-               f.name as name,
-               f.NUM as number,
-               f.TP as type,
-               f.REL_NAME as relName,
-               f.REL_NUM as relnumber,
-               f.IS_ENB as isEnable,
-               f.FACT_NUM as factoryNumber,
-               c.NAME as factoryName
+        f.name as name,
+        f.NUM as number,
+        f.TP as type,
+        f.REL_NAME as relName,
+        f.REL_NUM as relnumber,
+        f.IS_ENB as isEnable,
+        f.FACT_NUM as factoryNumber,
+        c.NAME as factoryName
         from sply_erp_wrh f left join sply_erp_fact c on f.FACT_NUM = c.NUM
         where f.DELETED = 0
         <if test="name != null">
@@ -41,4 +42,98 @@
             and f.TP like concat('%', #{type}, '%')
         </if>
     </select>
+
+    <!-- 在 ErpWarehouseMapper.xml 中配置 -->
+    <resultMap id="WarehouseWithFactoryResultMap" type="com.zt.plat.module.erp.dal.dataobject.erp.ErpWarehouseDO">
+        <id column="id" property="id"/>
+        <result column="factoryNumber" property="factoryNumber"/>
+        <result column="companyNumber" property="companyNumber"/>
+        <result column="factoryName" property="factoryName"/> <!-- 虚拟字段 -->
+        <result column="name" property="name"/>
+        <result column="number" property="number"/>
+        <result column="type" property="type"/>
+        <result column="relName" property="relName"/>
+        <result column="relnumber" property="relnumber"/>
+        <result column="isEnable" property="isEnable"/>
+        <result column="companyIdCustom" property="companyIdCustom"/>
+        <result column="companyNameCustom" property="companyNameCustom"/>
+        <!-- BaseDO 继承字段 -->
+        <result column="createTime" property="createTime"/>
+        <result column="updateTime" property="updateTime"/>
+        <result column="creator" property="creator"/>
+        <result column="updater" property="updater"/>
+        <result column="deleted" property="deleted"/>
+    </resultMap>
+
+    <select id="selectWarehouseByDynamicParams" resultMap="WarehouseWithFactoryResultMap">
+        SELECT
+        sew.ID AS id,
+        sew.FACT_NUM AS factoryNumber,
+        sef.NAME AS factoryName,
+        sew.NAME AS name,
+        sew.NUM AS number,
+        sew.TP AS type,
+        sew.REL_NAME AS relName,
+        sew.REL_NUM AS relnumber,
+        sew.IS_ENB AS isEnable,
+        sew.CPN_ID_CST AS companyIdCustom,
+        sew.CPN_NAME_CST AS companyNameCustom,
+        sew.CREATE_TIME AS createTime,
+        sew.UPDATE_TIME AS updateTime,
+        sew.CREATOR AS creator,
+        sew.UPDATER AS updater,
+        sew.DELETED AS deleted
+        FROM JYGK_TEST.SPLY_ERP_FACT sef
+        INNER JOIN JYGK_TEST.SPLY_ERP_WRH sew
+        ON sew.FACT_NUM = sef.NUM
+        WHERE 1=1
+        AND sef.DELETED = 0
+        AND sew.DELETED = 0
+        <if test="paramReqVO.companyIdCustom != null and paramReqVO.companyIdCustom != ''">
+            AND sef.CPN_ID = #{paramReqVO.companyIdCustom}
+        </if>
+        <if test="paramReqVO.type != null and paramReqVO.type != ''">
+            AND sef.TP = #{paramReqVO.type}
+        </if>
+        <if test="paramReqVO.number != null and paramReqVO.number != ''">
+            AND sew.NUM = #{paramReqVO.number}
+        </if>
+        <if test="paramReqVO.factoryNumber != null and paramReqVO.factoryNumber != ''">
+            AND sef.NUM = #{paramReqVO.factoryNumber}
+        </if>
+        <if test="paramReqVO.factoryName != null and paramReqVO.factoryName != ''">
+            AND sef.NAME = #{paramReqVO.factoryName}
+        </if>
+        ORDER BY sew.CREATE_TIME DESC
+        <!-- 分页参数直接引用 @Param 指定的 pageNum/pageSize -->
+        LIMIT #{pageNum}, #{pageSize}
+    </select>
+
+    <!-- 总数查询方法：同样修正参数引用 -->
+    <select id="selectWarehouseByDynamicParamsCount" resultType="java.lang.Long">
+        SELECT
+        COUNT(*)
+        FROM JYGK_TEST.SPLY_ERP_FACT sef
+        INNER JOIN JYGK_TEST.SPLY_ERP_WRH sew
+        ON sew.FACT_NUM = sef.NUM
+        WHERE 1=1
+        AND sef.DELETED = 0
+        AND sew.DELETED = 0
+        <if test="paramReqVO.companyIdCustom != null and paramReqVO.companyIdCustom != ''">
+            AND sef.CPN_ID = #{paramReqVO.companyIdCustom}
+        </if>
+        <if test="paramReqVO.type != null and paramReqVO.type != ''">
+            AND sef.TP = #{paramReqVO.type}
+        </if>
+        <if test="paramReqVO.number != null and paramReqVO.number != ''">
+            AND sew.NUM = #{paramReqVO.number}
+        </if>
+        <if test="paramReqVO.factoryNumber != null and paramReqVO.factoryNumber != ''">
+            AND sef.NUM = #{paramReqVO.factoryNumber}
+        </if>
+        <if test="paramReqVO.factoryName != null and paramReqVO.factoryName != ''">
+            AND sef.NAME = #{paramReqVO.factoryName}
+        </if>
+    </select>
+
 </mapper>
\ No newline at end of file