zgty/zt-base
9
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

委托加工更新提交erp优化

Browse Source
This commit is contained in:
潘荣晟
2026-02-12 17:12:31 +08:00
parent 19d2e9896a
commit 5bf2e818e6
3 changed files with 26 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/api/OrderApiImpl.java
View File

@@ -493,6 +493,7 @@ public class OrderApiImpl implements OrderApi {
ordDtlDTO.setSendFactoryName(o.getSendFactoryName()); ordDtlDTO.setSendFactoryName(o.getSendFactoryName());
ordDtlDTO.setSendFactoryNumber(o.getSendFactoryNumber()); ordDtlDTO.setSendFactoryNumber(o.getSendFactoryNumber());
ordDtlDTO.setSendWarehouseName(o.getSendWarehouseName()); ordDtlDTO.setSendWarehouseName(o.getSendWarehouseName());
ordDtlDTO.setSendWarehouseNumber(o.getSendWarehouseNumber());
ordDtlDTO.setUnit(o.getUnit()); ordDtlDTO.setUnit(o.getUnit());
ordDtlDTO.setReceiveFactoryName(o.getReceiveFactoryName()); ordDtlDTO.setReceiveFactoryName(o.getReceiveFactoryName());
ordDtlDTO.setReceiveFactoryNumber(o.getReceiveFactoryNumber()); ordDtlDTO.setReceiveFactoryNumber(o.getReceiveFactoryNumber());

16
zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/contract/ContractServiceImpl.java
View File

@@ -2215,17 +2215,27 @@ public class ContractServiceImpl implements ContractService {
//查询当前订单是否已经绑定订单了 //查询当前订单是否已经绑定订单了
ContractMainDO contractMainDO = contractMainMapper.selectById(relationContractVO.getContractId()); ContractMainDO contractMainDO = contractMainMapper.selectById(relationContractVO.getContractId());
if (contractMainDO != null && contractMainDO.getRelatedContractId() != null) { if (contractMainDO != null && contractMainDO.getRelatedContractId() != null) {
ContractMainDO updateObj = contractMainMapper.selectById(contractMainDO.getRelatedContractId()); LambdaUpdateWrapper<ContractMainDO> updateWrapper = new LambdaUpdateWrapper<>();
updateObj.setRelatedContractId(null); updateWrapper.eq(ContractMainDO::getId, contractMainDO.getRelatedContractId())
contractMainMapper.updateById(updateObj); .set(ContractMainDO::getRelatedContractId, null); // 强制设置为null
int update = contractMainMapper.update(updateWrapper);
log.info("解绑合同订单成功，合同ID：{},影响行数：{}", contractMainDO.getRelatedContractId(),update);
} }
contractMainDO.setRelatedContractId(relationContractVO.getRelationContractId()); contractMainDO.setRelatedContractId(relationContractVO.getRelationContractId());
contractMainMapper.updateById(contractMainDO);// 绑定合同订单 contractMainMapper.updateById(contractMainDO);// 绑定合同订单
ContractMainDO relationContract = contractMainMapper.selectById(relationContractVO.getRelationContractId()); ContractMainDO relationContract = contractMainMapper.selectById(relationContractVO.getRelationContractId());
if (relationContract != null) { 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()); relationContract.setRelatedContractId(relationContractVO.getContractId());
contractMainMapper.updateById(relationContract); contractMainMapper.updateById(relationContract);
log.info("绑定合同订单成功，合同ID：{}", relationContractVO.getRelationContractId());
}else { }else {
throw exception(CONTRACT_NOT_EXISTS); throw exception(CONTRACT_NOT_EXISTS);
} }

16
zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/purchaseorder/PurchaseOrderServiceImpl.java
View File

@@ -983,15 +983,23 @@ public class PurchaseOrderServiceImpl implements PurchaseOrderService {
} }
if (orderDO.getRelatedOrderId() != null) { if (orderDO.getRelatedOrderId() != null) {
//将已绑定的订单置空 //将已绑定的订单置空
PurchaseOrderDO relatedOrder = purchaseOrderMapper.selectById(orderDO.getRelatedOrderId()); LambdaUpdateWrapper<PurchaseOrderDO> updateWrapper = new LambdaUpdateWrapper<>();
relatedOrder.setRelatedOrderId(null); updateWrapper.eq(PurchaseOrderDO::getId, orderDO.getRelatedOrderId())
purchaseOrderMapper.updateById(relatedOrder); .set(PurchaseOrderDO::getRelatedOrderId, null);
log.info("已绑定的订单已解绑，订单ID：{}", relatedOrder.getId()); int update = purchaseOrderMapper.update(updateWrapper);
log.info("已绑定的订单已解绑，订单ID：{},影响行数：{}",orderDO.getRelatedOrderId(),update);
} }
orderDO.setRelatedOrderId(reqVO.getBoundId()); orderDO.setRelatedOrderId(reqVO.getBoundId());
purchaseOrderMapper.updateById(orderDO); purchaseOrderMapper.updateById(orderDO);
log.info("订单ID：{} 已绑定订单ID：{}", reqVO.getId(), reqVO.getBoundId()); 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()); boundOrder.setRelatedOrderId(reqVO.getId());
purchaseOrderMapper.updateById(boundOrder); purchaseOrderMapper.updateById(boundOrder);
log.info("绑定订单操作完成，订单ID：{}", reqVO.getId()); log.info("绑定订单操作完成，订单ID：{}", reqVO.getId());