Browse Source

高度

master
han\hanst 4 months ago
parent
commit
60e4b3ec13
  1. 5
      src/main/java/com/gaotao/modules/production/entity/dto/ShopOrderInboundDto.java
  2. 6
      src/main/java/com/gaotao/modules/production/service/impl/ProductionInboundServiceImpl.java
  3. 1
      src/main/java/com/gaotao/modules/salesreturn/entity/SalesReturnDto.java
  4. 5
      src/main/java/com/gaotao/modules/salesreturn/service/impl/SalesReturnServiceImpl.java

5
src/main/java/com/gaotao/modules/production/entity/dto/ShopOrderInboundDto.java

@ -81,6 +81,11 @@ public class ShopOrderInboundDto {
private String wdr; private String wdr;
/**
* 高度(mm)
*/
private Double height;
/** /**
* 订单数量 * 订单数量
*/ */

6
src/main/java/com/gaotao/modules/production/service/impl/ProductionInboundServiceImpl.java

@ -711,6 +711,12 @@ public class ProductionInboundServiceImpl implements ProductionInboundService {
handlingUnit.setOriginalQty(BigDecimal.valueOf(huInfo.getPerQty())); handlingUnit.setOriginalQty(BigDecimal.valueOf(huInfo.getPerQty()));
handlingUnit.setReceiveDate(new Date()); handlingUnit.setReceiveDate(new Date());
handlingUnit.setWdr(dto.getWdr()!=null ? dto.getWdr() : "*"); handlingUnit.setWdr(dto.getWdr()!=null ? dto.getWdr() : "*");
// 设置高度
if (dto.getHeight() != null && dto.getHeight() > 0) {
handlingUnit.setHeight(BigDecimal.valueOf(dto.getHeight()));
}
// 保存HandlingUnit主记录 // 保存HandlingUnit主记录
handlingUnitService.save(handlingUnit); handlingUnitService.save(handlingUnit);
} }

1
src/main/java/com/gaotao/modules/salesreturn/entity/SalesReturnDto.java

@ -14,6 +14,7 @@ public class SalesReturnDto {
private String locationNo; private String locationNo;
private String warehouseId; private String warehouseId;
private Integer rmaLineNo; // RMA行号 private Integer rmaLineNo; // RMA行号
private Double height; // 高度(mm)
private List<PackUnitDto> packUnitList; private List<PackUnitDto> packUnitList;
@Data @Data

5
src/main/java/com/gaotao/modules/salesreturn/service/impl/SalesReturnServiceImpl.java

@ -328,6 +328,11 @@ public class SalesReturnServiceImpl implements SalesReturnService {
handlingUnit.setOriginalQty(BigDecimal.valueOf(huInfo.getPerQty())); handlingUnit.setOriginalQty(BigDecimal.valueOf(huInfo.getPerQty()));
handlingUnit.setReceiveDate(new Date()); handlingUnit.setReceiveDate(new Date());
// 设置高度
if (dto.getHeight() != null && dto.getHeight() > 0) {
handlingUnit.setHeight(BigDecimal.valueOf(dto.getHeight()));
}
// 保存HandlingUnit主记录 // 保存HandlingUnit主记录
handlingUnitService.save(handlingUnit); handlingUnitService.save(handlingUnit);
} }

Loading…
Cancel
Save