diff --git a/src/main/java/com/qs/serve/modules/bms/controller/BmsSupplierController.java b/src/main/java/com/qs/serve/modules/bms/controller/BmsSupplierController.java index 88f45adc..d286b49d 100644 --- a/src/main/java/com/qs/serve/modules/bms/controller/BmsSupplierController.java +++ b/src/main/java/com/qs/serve/modules/bms/controller/BmsSupplierController.java @@ -1198,6 +1198,7 @@ public class BmsSupplierController { supplier.setBelong(a.getAffiliatedCompany()); supplier.setCostFlag(a.getIsExpendableExpense()); supplier.setStopFlag(a.getCloseAccountStatus()); + supplier.setCdOrderFlag(a.getCdOrderFlag()); supplier.setStopFlagDate(a.getCloseAccountDate()); supplier.setCooperatePauseFlag(a.getSuspendCooperationStatus()); supplier.setCooperatePauseFlagDate(a.getSuspendCooperationDate()); @@ -1266,6 +1267,7 @@ public class BmsSupplierController { supplier.setCostFlag(a.getIsExpendableExpense()); supplier.setBelong(a.getAffiliatedCompany()); supplier.setStopFlag(a.getCloseAccountStatus()); + supplier.setCdOrderFlag(a.getCdOrderFlag()); supplier.setStopFlagDate(a.getCloseAccountDate()); supplier.setCooperatePauseFlag(a.getSuspendCooperationStatus()); supplier.setCooperatePauseFlagDate(a.getSuspendCooperationDate()); 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 bfe25914..e4d8e9b0 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 @@ -109,6 +109,9 @@ public class OmsOrder implements Serializable { /** 是否加急 */ private Integer urgentFlag; + /** CD单据备注 */ + private String cdOrderRemark; + /** 订单状态 * 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 1b8c9728..1c9258cb 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 @@ -183,5 +183,8 @@ public class OmsXltOrder implements Serializable { /** 物流系统的id */ private String tmsSysId; + /** CD单备注(单号) */ + private String cdOrderRemark; + } diff --git a/src/main/java/com/qs/serve/modules/oms/entity/bo/CreateOrderParam.java b/src/main/java/com/qs/serve/modules/oms/entity/bo/CreateOrderParam.java index f7347fb1..4cee275f 100644 --- a/src/main/java/com/qs/serve/modules/oms/entity/bo/CreateOrderParam.java +++ b/src/main/java/com/qs/serve/modules/oms/entity/bo/CreateOrderParam.java @@ -5,6 +5,9 @@ import lombok.Data; @Data public class CreateOrderParam{ + /** CD单据备注 */ + private String cdOrderRemark; + /** 发票类型:0->普通发票;1->增值税发票; */ private Integer billType; diff --git a/src/main/java/com/qs/serve/modules/oms/entity/bo/OmsOrderModifyParam.java b/src/main/java/com/qs/serve/modules/oms/entity/bo/OmsOrderModifyParam.java index 388ca32a..af06734e 100644 --- a/src/main/java/com/qs/serve/modules/oms/entity/bo/OmsOrderModifyParam.java +++ b/src/main/java/com/qs/serve/modules/oms/entity/bo/OmsOrderModifyParam.java @@ -50,6 +50,9 @@ public class OmsOrderModifyParam { /** 供应商ID */ private Long supplierId; + /** 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 c2afcc61..8944d204 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 @@ -247,6 +247,7 @@ public class OmsOrderServiceImpl extends ServiceImpl im order.setSupplierName(supplier.getSupplierName()); order.setSupplierCode(supplier.getSupplierCode()); } + order.setCdOrderRemark(param.getCdOrderRemark()); //if(StringUtils.hasText(param.getUserId())){ // SysUser sysUser = sysUserService.getById(AuthContextUtils.getSysUserId()); // order.setUserId(param.getUserId()); @@ -469,6 +470,7 @@ public class OmsOrderServiceImpl extends ServiceImpl im order.setBrandRuleName(categoryRule.getLabel()); } + order.setCdOrderRemark(createOrderParam.getCdOrderRemark()); order.setOrderType(confirmOrder.getOrderType()); order.setSupplierId(Long.parseLong(supplier.getId())); order.setSupplierCode(supplier.getCode()); @@ -691,6 +693,9 @@ public class OmsOrderServiceImpl extends ServiceImpl im BmsSupplierAddress supplierAddress = bmsSupplierAddressService.getById(omsOrder.getSupplierAddrId()); String brands = Arrays.stream(categoryRule.getBrandNames()).collect(Collectors.joining(",")); BmsSupplier supplier = bmsSupplierMapper.selectById(omsOrder.getSupplierId()); + if(supplier.getCdOrderFlag().equals(1) && !StringUtils.hasText(omsOrder.getCdOrderRemark()) ){ + Assert.throwEx("请补充CD单号"); + } String lastRegionId = supplier.getRegionLast(); BmsRegion bmsRegion = bmsRegionMapper.selectById(lastRegionId); if(bmsRegion==null){ @@ -705,6 +710,7 @@ public class OmsOrderServiceImpl extends ServiceImpl im xltOrder.setKeHuBianHao(omsOrder.getSupplierCode()); xltOrder.setShouHuoDiZhi(supplierAddress.getDetail()); xltOrder.setRenYuanBianHao(omsOrder.getUserCode()); + xltOrder.setCdOrderRemark(omsOrder.getCdOrderRemark()); String remark = sysUser.getName()+"("+sysUser.getMobile()+")"+omsOrder.getRemark()+supplierAddress.getDetail(); if(remark.length()>120){ remark = remark.substring(0,120);