diff --git a/src/main/java/com/qs/serve/modules/oms/entity/OmsOrder.java b/src/main/java/com/qs/serve/modules/oms/entity/OmsOrder.java index 61c83fbe..775e5a78 100644 --- a/src/main/java/com/qs/serve/modules/oms/entity/OmsOrder.java +++ b/src/main/java/com/qs/serve/modules/oms/entity/OmsOrder.java @@ -1,5 +1,6 @@ package com.qs.serve.modules.oms.entity; +import java.math.BigDecimal; import java.time.LocalDate; import java.time.LocalDateTime; import java.io.Serializable; @@ -112,6 +113,9 @@ public class OmsOrder implements Serializable { /** CD单据备注 */ private String cdOrderRemark; + /** 临期品订单折扣率 */ + private BigDecimal discountRate; + /** 订单状态 * 0->草稿; * 1->下单(同步到调度系统); diff --git a/src/main/java/com/qs/serve/modules/oms/entity/OmsXltOrder.java b/src/main/java/com/qs/serve/modules/oms/entity/OmsXltOrder.java index 1c9258cb..3756df0b 100644 --- a/src/main/java/com/qs/serve/modules/oms/entity/OmsXltOrder.java +++ b/src/main/java/com/qs/serve/modules/oms/entity/OmsXltOrder.java @@ -186,5 +186,7 @@ public class OmsXltOrder implements Serializable { /** CD单备注(单号) */ private String cdOrderRemark; + private BigDecimal discountRate; + } diff --git a/src/main/java/com/qs/serve/modules/oms/entity/bo/OmsOrderImminentBo.java b/src/main/java/com/qs/serve/modules/oms/entity/bo/OmsOrderImminentBo.java index af718024..67f2a9bd 100644 --- a/src/main/java/com/qs/serve/modules/oms/entity/bo/OmsOrderImminentBo.java +++ b/src/main/java/com/qs/serve/modules/oms/entity/bo/OmsOrderImminentBo.java @@ -2,6 +2,7 @@ package com.qs.serve.modules.oms.entity.bo; import lombok.Data; +import java.math.BigDecimal; import java.util.List; /** @@ -27,6 +28,9 @@ public class OmsOrderImminentBo { /** 立刻下单标识 */ private Integer instantFlag; + /** 临期品订单折扣率 */ + private BigDecimal discountRate; + /** CD单据备注 */ private String cdOrderRemark; diff --git a/src/main/java/com/qs/serve/modules/oms/service/impl/OmsOrderServiceImpl.java b/src/main/java/com/qs/serve/modules/oms/service/impl/OmsOrderServiceImpl.java index 1dde486b..14440d0a 100644 --- a/src/main/java/com/qs/serve/modules/oms/service/impl/OmsOrderServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/oms/service/impl/OmsOrderServiceImpl.java @@ -745,6 +745,7 @@ public class OmsOrderServiceImpl extends ServiceImpl i } order.setLatitudeFrom("sp"); order.setCdOrderRemark(param.getCdOrderRemark()); + order.setDiscountRate(param.getDiscountRate()); order.setOrderType(3); order.setSupplierId(Long.parseLong(supplier.getId())); order.setSupplierCode(supplier.getCode()); @@ -978,6 +979,7 @@ public class OmsOrderServiceImpl extends ServiceImpl i xltOrder.setShouHuoDiZhi(supplierAddress.getDetail()); xltOrder.setRenYuanBianHao(omsOrder.getUserCode()); xltOrder.setCdOrderRemark(omsOrder.getCdOrderRemark()); + xltOrder.setDiscountRate(omsOrder.getDiscountRate()); String remark = sysUser.getName() + "(" + sysUser.getMobile() + ")" + omsOrder.getRemark() + supplierAddress.getDetail(); if (remark.length() > 120) { remark = remark.substring(0, 120);