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 51d5f1ac..054c1183 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 @@ -228,7 +228,7 @@ public class OrderApiImpl implements OrderApi { ordDtlDTO.setLineNum(p.getLineNum()); ordDtlDTO.setMtrlName(p.getMtrlName()); ordDtlDTO.setMtrlNum(p.getMtrlNum()); - ordDtlDTO.setFactoryName(p.getRcvFactNum()); + ordDtlDTO.setFactoryName(p.getRcvFactName()); ordDtlDTO.setFactoryNum(p.getRcvFactNum()); ordDtlDTO.setWarehouseName(p.getRcvWrhNum()); ordDtlDTO.setWarehouseNum(p.getRcvWrhNum()); diff --git a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/purchaseorder/PrchOrdDtlServiceImpl.java b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/purchaseorder/PrchOrdDtlServiceImpl.java index 69203e24..bab2a959 100644 --- a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/purchaseorder/PrchOrdDtlServiceImpl.java +++ b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/purchaseorder/PrchOrdDtlServiceImpl.java @@ -89,7 +89,7 @@ public class PrchOrdDtlServiceImpl implements PrchOrdDtlService { CommonResult booleanCommonResult = billMainApi.notOffsetIsExistOrderDetailId(id); if (booleanCommonResult.isSuccess() && booleanCommonResult.getData()) { PrchOrdDtlDO prchOrdDtlDO = prchOrdDtlMapper.selectById(id); - throw exception(new ErrorCode(1_008_00_600, "采购订单明细【" + prchOrdDtlDO.getLineNum() + "】已生成采购订单,不能删除")); + throw exception(new ErrorCode(1_008_00_600, "订单明细【" + prchOrdDtlDO.getLineNum() + "】已生成收发货单,不能删除")); } }); } diff --git a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/salesorder/SalesOrderDetailServiceImpl.java b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/salesorder/SalesOrderDetailServiceImpl.java index a2e8f91a..45b9e63a 100644 --- a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/salesorder/SalesOrderDetailServiceImpl.java +++ b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/salesorder/SalesOrderDetailServiceImpl.java @@ -95,7 +95,7 @@ public class SalesOrderDetailServiceImpl implements SalesOrderDetailService { CommonResult booleanCommonResult = billMainApi.notOffsetIsExistOrderDetailId(id); if (booleanCommonResult.isSuccess() && booleanCommonResult.getData()) { SalesOrderDetailDO salesOrderDetailDO = salesOrderDetailMapper.selectById(id); - throw exception(new ErrorCode(1_008_00_600, "销售订单明细【" + salesOrderDetailDO.getMaterialName() + "】已生成销售订单,不能删除")); + throw exception(new ErrorCode(1_008_00_600, "订单明细【" + salesOrderDetailDO.getMaterialName() + "】已生成收发货单,不能删除")); } }); }