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-04 17:22:32 +08:00
parent 37a9d622ee 088a7c3f2d
commit 2cec8e01db
3 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -674,7 +674,9 @@ public class ContractApiImpl implements ContractApi {
@Override @Override
public CommonResult<SalesOrdDtlDTO> getSalesOrderDetailById(Long id) { public CommonResult<SalesOrdDtlDTO> getSalesOrderDetailById(Long id) {
SalesOrderDetailDO salesOrderDetailDO = SpringUtil.getBean(SalesOrderDetailMapper.class).selectOne(SalesOrderDetailDO::getId, id); SalesOrderDetailDO salesOrderDetailDO = SpringUtil.getBean(SalesOrderDetailMapper.class).selectOne(SalesOrderDetailDO::getId, id);
return success(BeanUtils.toBean(salesOrderDetailDO, SalesOrdDtlDTO.class)); SalesOrdDtlDTO salesOrdDtlDTO = BeanUtils.toBean(salesOrderDetailDO, SalesOrdDtlDTO.class);
salesOrdDtlDTO.setUnit(salesOrderDetailDO.getUnt());
return success(salesOrdDtlDTO);
} }
@Override @Override

2
zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/purchaseorder/vo/PrchOrdDtlDetailsRespVO.java
View File

@@ -57,7 +57,7 @@ public class PrchOrdDtlDetailsRespVO {
* 暂估数量;推送ERP（必须） * 暂估数量;推送ERP（必须）
*/ */
private String qty; private BigDecimal qty;
/** /**
* 计量单位;推送ERP（必须） * 计量单位;推送ERP（必须）
*/ */

2
zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/purchaseorder/vo/PrchOrdDtlRespVO.java
View File

@@ -51,7 +51,7 @@ public class PrchOrdDtlRespVO {
@Schema(description = "暂估数量;推送ERP（必须）", requiredMode = Schema.RequiredMode.REQUIRED) @Schema(description = "暂估数量;推送ERP（必须）", requiredMode = Schema.RequiredMode.REQUIRED)
@ExcelProperty("暂估数量;推送ERP（必须）") @ExcelProperty("暂估数量;推送ERP（必须）")
private String qty; private BigDecimal qty;
@Schema(description = "计量单位;推送ERP（必须）", requiredMode = Schema.RequiredMode.REQUIRED) @Schema(description = "计量单位;推送ERP（必须）", requiredMode = Schema.RequiredMode.REQUIRED)
@ExcelProperty("计量单位;推送ERP（必须）") @ExcelProperty("计量单位;推送ERP（必须）")