Browse Source

feat: 临期品添加折扣率

checkBack
Yen 1 year ago
parent
commit
3804d34089
  1. 4
      src/main/java/com/qs/serve/modules/oms/entity/OmsOrder.java
  2. 2
      src/main/java/com/qs/serve/modules/oms/entity/OmsXltOrder.java
  3. 4
      src/main/java/com/qs/serve/modules/oms/entity/bo/OmsOrderImminentBo.java
  4. 2
      src/main/java/com/qs/serve/modules/oms/service/impl/OmsOrderServiceImpl.java

4
src/main/java/com/qs/serve/modules/oms/entity/OmsOrder.java

@ -1,5 +1,6 @@
package com.qs.serve.modules.oms.entity; package com.qs.serve.modules.oms.entity;
import java.math.BigDecimal;
import java.time.LocalDate; import java.time.LocalDate;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.io.Serializable; import java.io.Serializable;
@ -112,6 +113,9 @@ public class OmsOrder implements Serializable {
/** CD单据备注 */ /** CD单据备注 */
private String cdOrderRemark; private String cdOrderRemark;
/** 临期品订单折扣率 */
private BigDecimal discountRate;
/** 订单状态 /** 订单状态
* 0->草稿 * 0->草稿
* 1->下单(同步到调度系统) * 1->下单(同步到调度系统)

2
src/main/java/com/qs/serve/modules/oms/entity/OmsXltOrder.java

@ -186,5 +186,7 @@ public class OmsXltOrder implements Serializable {
/** CD单备注(单号) */ /** CD单备注(单号) */
private String cdOrderRemark; private String cdOrderRemark;
private BigDecimal discountRate;
} }

4
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 lombok.Data;
import java.math.BigDecimal;
import java.util.List; import java.util.List;
/** /**
@ -27,6 +28,9 @@ public class OmsOrderImminentBo {
/** 立刻下单标识 */ /** 立刻下单标识 */
private Integer instantFlag; private Integer instantFlag;
/** 临期品订单折扣率 */
private BigDecimal discountRate;
/** CD单据备注 */ /** CD单据备注 */
private String cdOrderRemark; private String cdOrderRemark;

2
src/main/java/com/qs/serve/modules/oms/service/impl/OmsOrderServiceImpl.java

@ -745,6 +745,7 @@ public class OmsOrderServiceImpl extends ServiceImpl<OmsOrderMapper, OmsOrder> i
} }
order.setLatitudeFrom("sp"); order.setLatitudeFrom("sp");
order.setCdOrderRemark(param.getCdOrderRemark()); order.setCdOrderRemark(param.getCdOrderRemark());
order.setDiscountRate(param.getDiscountRate());
order.setOrderType(3); order.setOrderType(3);
order.setSupplierId(Long.parseLong(supplier.getId())); order.setSupplierId(Long.parseLong(supplier.getId()));
order.setSupplierCode(supplier.getCode()); order.setSupplierCode(supplier.getCode());
@ -978,6 +979,7 @@ public class OmsOrderServiceImpl extends ServiceImpl<OmsOrderMapper, OmsOrder> i
xltOrder.setShouHuoDiZhi(supplierAddress.getDetail()); xltOrder.setShouHuoDiZhi(supplierAddress.getDetail());
xltOrder.setRenYuanBianHao(omsOrder.getUserCode()); xltOrder.setRenYuanBianHao(omsOrder.getUserCode());
xltOrder.setCdOrderRemark(omsOrder.getCdOrderRemark()); xltOrder.setCdOrderRemark(omsOrder.getCdOrderRemark());
xltOrder.setDiscountRate(omsOrder.getDiscountRate());
String remark = sysUser.getName() + "(" + sysUser.getMobile() + ")" + omsOrder.getRemark() + supplierAddress.getDetail(); String remark = sysUser.getName() + "(" + sysUser.getMobile() + ")" + omsOrder.getRemark() + supplierAddress.getDetail();
if (remark.length() > 120) { if (remark.length() > 120) {
remark = remark.substring(0, 120); remark = remark.substring(0, 120);

Loading…
Cancel
Save