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 17:16:34 +08:00
parent 969882b618 0a803c367d
commit ac06ad62d0
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -28,7 +28,7 @@ public interface OrderApi {
@PostMapping(PREFIX + "/update-lst-qty-by-order-id")
@Operation(summary = "根据订单明细id更新累积量", description = "根据订单明细id更新收货量")
CommonResult<Boolean> UpdateOrderLstQty(@RequestBody @Validated List<UpdateOrderLstQtyDTO> updateOrderLstQtyDTOS);
CommonResult<Boolean> updateOrderLstQty(@RequestBody @Validated List<UpdateOrderLstQtyDTO> updateOrderLstQtyDTOS);
@PostMapping(PREFIX + "/void -lst-qty-by-order-id")
@Operation(summary = "根据订单明细id更新累积量(冲销)", description = "根据订单明细id更新收货量(冲销)")

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

@@ -96,7 +96,7 @@ public class OrderApiImpl implements OrderApi {
@Override
@Transactional(rollbackFor = Exception.class)
public CommonResult<Boolean> UpdateOrderLstQty(List<UpdateOrderLstQtyDTO> updateOrderLstQtyDTOS) {
public CommonResult<Boolean> updateOrderLstQty(List<UpdateOrderLstQtyDTO> updateOrderLstQtyDTOS) {
if (updateOrderLstQtyDTOS == null || updateOrderLstQtyDTOS.isEmpty()) {
throw new RuntimeException("请求数据错误");
}
@@ -116,7 +116,7 @@ public class OrderApiImpl implements OrderApi {
} else if ("PUR".equals(f.getSplyBsnTp())) {
// 采购
PrchOrdDtlDO prchOrdDtlDO = prchOrdDtlMapper.selectById(f.getOrderDetailId());
BigDecimal lstQty = Optional.ofNullable(prchOrdDtlDO.getTrfQty())
BigDecimal lstQty = Optional.ofNullable(prchOrdDtlDO.getLstQty())
.orElse(BigDecimal.ZERO);
PrchOrdDtlDO updateDO = new PrchOrdDtlDO();
updateDO.setId(f.getOrderDetailId());
@@ -154,7 +154,7 @@ public class OrderApiImpl implements OrderApi {
} else if ("PUR".equals(f.getSplyBsnTp())) {
// 采购
PrchOrdDtlDO prchOrdDtlDO = prchOrdDtlMapper.selectById(f.getOrderDetailId());
BigDecimal lstQty = Optional.ofNullable(prchOrdDtlDO.getTrfQty())
BigDecimal lstQty = Optional.ofNullable(prchOrdDtlDO.getLstQty())
.orElse(BigDecimal.ZERO);
if (lstQty.equals(BigDecimal.ZERO)) {
throw exception(new ErrorCode(1_008_00_609,"积累量不能等于0"));

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.getLineNumber() + "】已生成收发货单，不能删除"));
}
});
}