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 ec21f708..05c8fc38 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
@@ -493,6 +493,7 @@ public class OrderApiImpl implements OrderApi {
             ordDtlDTO.setSendFactoryName(o.getSendFactoryName());
             ordDtlDTO.setSendFactoryNumber(o.getSendFactoryNumber());
             ordDtlDTO.setSendWarehouseName(o.getSendWarehouseName());
+            ordDtlDTO.setSendWarehouseNumber(o.getSendWarehouseNumber());
             ordDtlDTO.setUnit(o.getUnit());
             ordDtlDTO.setReceiveFactoryName(o.getReceiveFactoryName());
             ordDtlDTO.setReceiveFactoryNumber(o.getReceiveFactoryNumber());
diff --git a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/contract/ContractServiceImpl.java b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/contract/ContractServiceImpl.java
index 65fd408c..06fe0659 100644
--- a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/contract/ContractServiceImpl.java
+++ b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/contract/ContractServiceImpl.java
@@ -2215,17 +2215,27 @@ public class ContractServiceImpl implements ContractService {
         //查询当前订单是否已经绑定订单了
         ContractMainDO contractMainDO = contractMainMapper.selectById(relationContractVO.getContractId());
         if (contractMainDO != null && contractMainDO.getRelatedContractId() != null) {
-            ContractMainDO updateObj = contractMainMapper.selectById(contractMainDO.getRelatedContractId());
-            updateObj.setRelatedContractId(null);
-            contractMainMapper.updateById(updateObj);
+            LambdaUpdateWrapper<ContractMainDO> updateWrapper = new LambdaUpdateWrapper<>();
+            updateWrapper.eq(ContractMainDO::getId, contractMainDO.getRelatedContractId())
+                    .set(ContractMainDO::getRelatedContractId, null); // 强制设置为null
+            int update = contractMainMapper.update(updateWrapper);
+            log.info("解绑合同订单成功，合同ID：{},影响行数：{}", contractMainDO.getRelatedContractId(),update);
         }
         contractMainDO.setRelatedContractId(relationContractVO.getRelationContractId());
         contractMainMapper.updateById(contractMainDO);// 绑定合同订单
         ContractMainDO relationContract = contractMainMapper.selectById(relationContractVO.getRelationContractId());
         if (relationContract != null) {
+            if (relationContract.getRelatedContractId()!=null) {
+                LambdaUpdateWrapper<ContractMainDO> updateWrapper = new LambdaUpdateWrapper<>();
+                updateWrapper.eq(ContractMainDO::getId, relationContract.getId())
+                        .set(ContractMainDO::getRelatedContractId, null); // 强制设置为null
+                int update = contractMainMapper.update(updateWrapper);
+                log.info("解绑合同订单成功，合同ID：{},影响行数：{}", relationContract.getId(),update);
+            }
             // 绑定合同订单
             relationContract.setRelatedContractId(relationContractVO.getContractId());
             contractMainMapper.updateById(relationContract);
+            log.info("绑定合同订单成功，合同ID：{}", relationContractVO.getRelationContractId());
         }else {
             throw exception(CONTRACT_NOT_EXISTS);
         }
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 5d24234c..cc61b8fe 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
@@ -983,15 +983,23 @@ public class PurchaseOrderServiceImpl implements PurchaseOrderService {
         }
         if (orderDO.getRelatedOrderId() != null) {
             //将已绑定的订单置空
-            PurchaseOrderDO relatedOrder = purchaseOrderMapper.selectById(orderDO.getRelatedOrderId());
-            relatedOrder.setRelatedOrderId(null);
-            purchaseOrderMapper.updateById(relatedOrder);
-            log.info("已绑定的订单已解绑，订单ID：{}", relatedOrder.getId());
+            LambdaUpdateWrapper<PurchaseOrderDO> updateWrapper = new LambdaUpdateWrapper<>();
+            updateWrapper.eq(PurchaseOrderDO::getId, orderDO.getRelatedOrderId())
+                    .set(PurchaseOrderDO::getRelatedOrderId, null);
+            int update = purchaseOrderMapper.update(updateWrapper);
+            log.info("已绑定的订单已解绑，订单ID：{},影响行数：{}",orderDO.getRelatedOrderId(),update);
         }
         orderDO.setRelatedOrderId(reqVO.getBoundId());
         purchaseOrderMapper.updateById(orderDO);
         log.info("订单ID：{} 已绑定订单ID：{}", reqVO.getId(), reqVO.getBoundId());
         //修改已绑定的的订单
+        if (boundOrder.getRelatedOrderId() != null){
+            LambdaUpdateWrapper<PurchaseOrderDO> updateWrapper = new LambdaUpdateWrapper<>();
+            updateWrapper.eq(PurchaseOrderDO::getId, boundOrder.getRelatedOrderId())
+                    .set(PurchaseOrderDO::getRelatedOrderId, null);
+            int update = purchaseOrderMapper.update(updateWrapper);
+            log.info("已绑定的订单已解绑，订单ID：{},影响行数：{}",boundOrder.getRelatedOrderId(),update);
+        }
         boundOrder.setRelatedOrderId(reqVO.getId());
         purchaseOrderMapper.updateById(boundOrder);
         log.info("绑定订单操作完成，订单ID：{}", reqVO.getId());