|
|
|
@ -565,11 +565,11 @@ public class OmsSaleOrderServiceImpl extends ServiceImpl<OmsSaleOrderMapper, Oms |
|
|
|
OmsSaleOrder order = new OmsSaleOrder(); |
|
|
|
String orderPrefix = null; |
|
|
|
if (order.getOrderType() == null || order.getOrderType().equals(0)) { |
|
|
|
orderPrefix = "SSN"; |
|
|
|
orderPrefix = "SN"; |
|
|
|
} else if (order.getOrderType().equals(1)) { |
|
|
|
orderPrefix = "SZP"; |
|
|
|
orderPrefix = "ZP"; |
|
|
|
} else if (order.getOrderType().equals(2)) { |
|
|
|
orderPrefix = "SSC"; |
|
|
|
orderPrefix = "SC"; |
|
|
|
} |
|
|
|
order.setOrderSn(orderPrefix + CodeGenUtil.generate(CodeGenUtil.SourceKey.OmsOrder)); |
|
|
|
|
|
|
|
@ -1081,99 +1081,13 @@ public class OmsSaleOrderServiceImpl extends ServiceImpl<OmsSaleOrderMapper, Oms |
|
|
|
String brands, |
|
|
|
BmsSupplierAddress supplierAddress, |
|
|
|
BmsRegion bmsRegion) { |
|
|
|
SysUser sysUser = sysUserService.getById(omsOrder.getCreateBy()); |
|
|
|
//保存到临时表-主表
|
|
|
|
// LocalDateTime nowTime = LocalDateTime.now();
|
|
|
|
// OmsXltOrder xltOrder = new OmsXltOrder();
|
|
|
|
// xltOrder.setId(IdUtil.getSnowFlakeId() + "");
|
|
|
|
// xltOrder.setOrderType(omsOrder.getOrderType());
|
|
|
|
// xltOrder.setDingDanHao(omsOrder.getOrderSn());
|
|
|
|
// xltOrder.setShenQingRiQi(nowTime);
|
|
|
|
// xltOrder.setKeHuBianHao(omsOrder.getSupplierCode());
|
|
|
|
// 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);
|
|
|
|
// }
|
|
|
|
// xltOrder.setZhuYiShiXian(remark);
|
|
|
|
// xltOrder.setXieRuShiJian(nowTime);
|
|
|
|
// xltOrder.setChuLiShiJian(null);
|
|
|
|
// xltOrder.setRowCreateDate(nowTime);
|
|
|
|
// xltOrder.setRenYuanXingMing(omsOrder.getUserName());
|
|
|
|
// xltOrder.setRenYuanDianHua(omsOrder.getUserPhone());
|
|
|
|
// xltOrder.setXianZhiWeiDu("品牌");
|
|
|
|
// xltOrder.setXianZhiWeiDuMingChen(brands);
|
|
|
|
// xltOrder.setZhuangTai(0);
|
|
|
|
// //状态:0未使用；1报价单；2销售订单
|
|
|
|
// xltOrder.setStatus(0);
|
|
|
|
//
|
|
|
|
// xltOrder.setTmsSysId(supplierAddress.getId() + "");
|
|
|
|
// xltOrder.setEmpName(omsOrder.getUserName());
|
|
|
|
// xltOrder.setCusCode(omsOrder.getSupplierCode());
|
|
|
|
// xltOrder.setCusName(omsOrder.getSupplierName());
|
|
|
|
//
|
|
|
|
// try {
|
|
|
|
// String[] regions = bmsRegion.getPathNames().split("_");
|
|
|
|
// if (regions.length > 1) {
|
|
|
|
// xltOrder.setDealerProvince(regions[1]);
|
|
|
|
// }
|
|
|
|
// if (regions.length > 0) {
|
|
|
|
// xltOrder.setDealerCity(regions[0]);
|
|
|
|
// }
|
|
|
|
// } catch (Exception e) {
|
|
|
|
// log.warn("区域档案异常：{}",bmsRegion.getName());
|
|
|
|
// }
|
|
|
|
// xltOrder.setDealerArea(bmsRegion.getPathNames());
|
|
|
|
//
|
|
|
|
// //保存到临时表-明细表
|
|
|
|
// List<OmsXltOrderItem> xltOrderItemList = new ArrayList<>();
|
|
|
|
// for (int i = 0; i < orderItemList.size(); i++) {
|
|
|
|
// OmsSaleOrderItem orderItem = orderItemList.get(i);
|
|
|
|
// OmsXltOrderItem xltOrderItem = new OmsXltOrderItem();
|
|
|
|
// xltOrderItem.setId(xltOrder.getId() + "_" + (i + 1));
|
|
|
|
// xltOrderItem.setDingDanID(xltOrder.getId());
|
|
|
|
// xltOrderItem.setSpuCode(orderItem.getSpuCode());
|
|
|
|
// boolean eq = orderItem.getSkuCode().equals(orderItem.getSpuCode());
|
|
|
|
// if (!StringUtils.hasText(orderItem.getSkuCode()) || eq) {
|
|
|
|
// GoodsSku sku = goodsSkuService.getById(orderItem.getSkuId());
|
|
|
|
// GoodsSpu spu = goodsSpuService.getById(orderItem.getSpuId());
|
|
|
|
// if (!sku.getSkuCode().equals(spu.getSpuCode())) {
|
|
|
|
// Assert.throwEx("SKU【" + orderItem.getSpuCode() + "】存货缺失，请联系档案负责人");
|
|
|
|
// }
|
|
|
|
// }
|
|
|
|
// xltOrderItem.setChanPinBianHao(orderItem.getSkuCode());
|
|
|
|
// xltOrderItem.setChanPinDanWei(orderItem.getSkuUnit());
|
|
|
|
// xltOrderItem.setDingHuoShuLiang(orderItem.getQuantity());
|
|
|
|
// xltOrderItem.setDaZengShuLiang(BigDecimal.ZERO);
|
|
|
|
// xltOrderItem.setChanPinYuanJia(orderItem.getMarketPrice());
|
|
|
|
// xltOrderItem.setChanPinXianJia(orderItem.getSalesPrice());
|
|
|
|
// xltOrderItem.setXieRuShiJian(nowTime);
|
|
|
|
// xltOrderItem.setChuLiShiJian(null);
|
|
|
|
// xltOrderItem.setRowCreateDate(nowTime);
|
|
|
|
// if (omsOrder.getOrderType().equals(3)) {
|
|
|
|
// String itemRm = orderItem.getRemark() == null ? "" : orderItem.getRemark();
|
|
|
|
// xltOrderItem.setBeiZhu("批号[" + orderItem.getSkuBatchCode() + "]" + itemRm);
|
|
|
|
// } else {
|
|
|
|
// xltOrderItem.setBeiZhu(orderItem.getRemark());
|
|
|
|
// }
|
|
|
|
// xltOrderItem.setZhuangTai(0);
|
|
|
|
// xltOrderItemList.add(xltOrderItem);
|
|
|
|
// }
|
|
|
|
// XltOrderDTO xltOrderDTO = new XltOrderDTO(xltOrder, xltOrderItemList);
|
|
|
|
// //请求到中间服务保存
|
|
|
|
// seeYonRequestBaseService.postBase(ERP_ORDER_CREATE, xltOrderDTO, "创建订单：" + xltOrder.getDingDanHao());
|
|
|
|
omsOrder.setStatus(1); |
|
|
|
omsOrder.setStatus(2); |
|
|
|
omsOrder.setCheckTime(LocalDateTime.now()); |
|
|
|
omsOrder.setCheckUserId(omsOrder.getCreateBy()); |
|
|
|
if(!omsOrder.getOrderType().equals(3)){ |
|
|
|
omsOrder.setCheckUserId(AuthContextUtils.getSysUserId()); |
|
|
|
} |
|
|
|
this.updateById(omsOrder); |
|
|
|
//更新订单
|
|
|
|
applicationEventPublisher.publishEvent(new OrderCreateCacheEvent(this,omsOrder.getId().toString())); |
|
|
|
} |
|
|
|
|
|
|
|
@Override |
|
|
|
|
