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

Merge remote-tracking branch 'origin/dev' into test

Browse Source
This commit is contained in:
qianshijiang
2025-12-02 14:06:45 +08:00
parent 7b8787d096 04e94b752f
commit 969882b618
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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());

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

@@ -89,7 +89,7 @@ public class PrchOrdDtlServiceImpl implements PrchOrdDtlService {
CommonResult<Boolean> 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() + "】已生成收发货单，不能删除"));
}
});
}

2
zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/salesorder/SalesOrderDetailServiceImpl.java
View File

@@ -95,7 +95,7 @@ public class SalesOrderDetailServiceImpl implements SalesOrderDetailService {
CommonResult<Boolean> 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() + "】已生成收发货单，不能删除"));
}
});
}