11692908/TMS-BOOT
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

发货数量类型修改

Browse Source
This commit is contained in:
王帅 2025-06-11 11:25:23 +08:00
parent dd608fe24d
commit aa37b20015
5 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/outbound/deliverydemand/entity/DeliveryDemand.java
View File

@ -71,7 +71,7 @@ public class DeliveryDemand implements Serializable {
/**发货数量*/ /**发货数量*/
@Excel(name = "发货数量", width = 15) @Excel(name = "发货数量", width = 15)
@ApiModelProperty(value = "发货数量") @ApiModelProperty(value = "发货数量")
private java.lang.Integer shipNumber; private BigDecimal shipNumber;
/**单位*/ /**单位*/
// @Excel(name = "单位", width = 15, dicCode = "unit") // @Excel(name = "单位", width = 15, dicCode = "unit")
@Dict(dicCode = "unit") @Dict(dicCode = "unit")

3
jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/outbound/deliverydemand/entity/DeliveryDemandExcel.java
View File

@ -15,6 +15,7 @@ import org.jeecgframework.poi.excel.annotation.ExcelCollection;
import org.springframework.format.annotation.DateTimeFormat; import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable; import java.io.Serializable;
import java.math.BigDecimal;
import java.util.List; import java.util.List;
/** /**
@ -66,7 +67,7 @@ public class DeliveryDemandExcel implements Serializable {
/**发货数量*/ /**发货数量*/
@Excel(name = "发货数量", width = 15, needMerge = true) @Excel(name = "发货数量", width = 15, needMerge = true)
@ApiModelProperty(value = "发货数量") @ApiModelProperty(value = "发货数量")
private java.lang.Integer shipNumber; private BigDecimal shipNumber;
/**单位*/ /**单位*/
@Dict(dicCode = "unit") @Dict(dicCode = "unit")
@ApiModelProperty(value = "单位") @ApiModelProperty(value = "单位")

14
jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/outbound/deliverydemand/service/impl/DeliveryDemandServiceImpl.java
View File

@ -79,8 +79,10 @@ public class DeliveryDemandServiceImpl extends ServiceImpl<DeliveryDemandMapper,
(merged2.getTotalPallets() == null ? 0 : merged2.getTotalPallets()) (merged2.getTotalPallets() == null ? 0 : merged2.getTotalPallets())
); );
merged1.setTotalShips( merged1.setTotalShips(
(merged1.getTotalShips() == null ? 0 : merged1.getTotalShips()) + /*(merged1.getTotalShips() == null ? 0 : merged1.getTotalShips()) +
(merged2.getTotalShips() == null ? 0 : merged2.getTotalShips()) (merged2.getTotalShips() == null ? 0 : merged2.getTotalShips())*/
Optional.ofNullable(merged1.getTotalShips()).orElse(BigDecimal.ZERO)
.add(Optional.ofNullable(merged2.getTotalShips()).orElse(BigDecimal.ZERO))
); );
return merged1; return merged1;
} }
@ -140,8 +142,10 @@ public class DeliveryDemandServiceImpl extends ServiceImpl<DeliveryDemandMapper,
(merged2.getTotalPallets() == null ? 0 : merged2.getTotalPallets()) (merged2.getTotalPallets() == null ? 0 : merged2.getTotalPallets())
); );
merged1.setTotalShips( merged1.setTotalShips(
(merged1.getTotalShips() == null ? 0 : merged1.getTotalShips()) + /*(merged1.getTotalShips() == null ? 0 : merged1.getTotalShips()) +
(merged2.getTotalShips() == null ? 0 : merged2.getTotalShips()) (merged2.getTotalShips() == null ? 0 : merged2.getTotalShips())*/
Optional.ofNullable(merged1.getTotalShips()).orElse(BigDecimal.ZERO)
.add(Optional.ofNullable(merged2.getTotalShips()).orElse(BigDecimal.ZERO))
); );
return merged1; return merged1;
} }
@ -177,7 +181,7 @@ public class DeliveryDemandServiceImpl extends ServiceImpl<DeliveryDemandMapper,
// return Result.error("数据为空"); // return Result.error("数据为空");
continue; continue;
} }
BigDecimal dividend = new BigDecimal(deliveryDemand.getShipNumber()); BigDecimal dividend = deliveryDemand.getShipNumber();
BigDecimal divisor = new BigDecimal(qty); BigDecimal divisor = new BigDecimal(qty);
// 向上取整 // 向上取整

12
jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/outbound/vehicledemand/controller/VehicleDemandController.java
View File

@ -1,9 +1,7 @@
package org.jeecg.modules.tms.outbound.vehicledemand.controller; package org.jeecg.modules.tms.outbound.vehicledemand.controller;
import java.util.ArrayList; import java.math.BigDecimal;
import java.util.Arrays; import java.util.*;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import java.io.IOException; import java.io.IOException;
import java.io.UnsupportedEncodingException; import java.io.UnsupportedEncodingException;
@ -278,8 +276,10 @@ public class VehicleDemandController extends JeecgController<VehicleDemand, IVeh
(merged2.getPreTotalPallets() == null ? 0 : merged2.getPreTotalPallets()) (merged2.getPreTotalPallets() == null ? 0 : merged2.getPreTotalPallets())
); );
merged1.setTotalShips( merged1.setTotalShips(
(merged1.getTotalShips() == null ? 0 : merged1.getTotalShips()) + /*(merged1.getTotalShips() == null ? 0 : merged1.getTotalShips()) +
(merged2.getTotalShips() == null ? 0 : merged2.getTotalShips()) (merged2.getTotalShips() == null ? 0 : merged2.getTotalShips())*/
Optional.ofNullable(merged1.getTotalShips()).orElse(BigDecimal.ZERO)
.add(Optional.ofNullable(merged2.getTotalShips()).orElse(BigDecimal.ZERO))
); );
return merged1; return merged1;
} }

2
jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/outbound/vehicledemand/entity/VehicleDemand.java
View File

@ -84,7 +84,7 @@ public class VehicleDemand implements Serializable {
/**总发货数量*/ /**总发货数量*/
@Excel(name = "总发货数量", width = 15) @Excel(name = "总发货数量", width = 15)
@ApiModelProperty(value = "总发货数量") @ApiModelProperty(value = "总发货数量")
private Integer totalShips; private BigDecimal totalShips;
/**送货区域*/ /**送货区域*/
// @Excel(name = "送货区域", width = 15) // @Excel(name = "送货区域", width = 15)
@ApiModelProperty(value = "送货区域") @ApiModelProperty(value = "送货区域")