From 7f93781fd9d3ddccc0c9751af22dedb7977ddcab Mon Sep 17 00:00:00 2001 From: Yen Date: Wed, 25 Dec 2024 09:56:07 +0800 Subject: [PATCH] =?UTF-8?q?opt:=20=E8=AE=A2=E5=8D=95=E7=9B=B8=E5=85=B3?= =?UTF-8?q?=E8=B0=83=E6=95=B4=EF=BC=9Bfix:=E9=A2=84=E7=AE=97=E7=BB=9F?= =?UTF-8?q?=E8=AE=A1=E6=98=BE=E7=A4=BA=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/oms/entity/OmsSaleOrder.java | 4 +++- .../listener/OrderCreateCacheListener.java | 22 ------------------- .../impl/OmsSaleOrderPart1ServiceImpl.java | 5 ++++- .../service/impl/OmsSaleOrderServiceImpl.java | 4 ++-- .../common/util/TbsBudgetConditionUtil.java | 6 +++++ .../modules/third/PortalGoodsController.java | 4 ++++ 6 files changed, 19 insertions(+), 26 deletions(-) diff --git a/src/main/java/com/qs/serve/modules/oms/entity/OmsSaleOrder.java b/src/main/java/com/qs/serve/modules/oms/entity/OmsSaleOrder.java index 3cf2e2b4..2fe6d160 100644 --- a/src/main/java/com/qs/serve/modules/oms/entity/OmsSaleOrder.java +++ b/src/main/java/com/qs/serve/modules/oms/entity/OmsSaleOrder.java @@ -32,6 +32,9 @@ public class OmsSaleOrder implements Serializable { @TableId(type = IdType.AUTO) private Long id; + /** 订单在erp的id */ + private Long orderErpId; + /** 订单号 */ @NotBlank(message = "订单号不能为空") @Length(max = 20,message = "订单号长度不能超过20字") @@ -136,7 +139,6 @@ public class OmsSaleOrder implements Serializable { * 0->草稿； * 1->已确认下单 * 2->同步到调度系统 - * 2->已确认(已生成报价单); * 6->已取消 **/ private Integer status; diff --git a/src/main/java/com/qs/serve/modules/oms/listener/OrderCreateCacheListener.java b/src/main/java/com/qs/serve/modules/oms/listener/OrderCreateCacheListener.java index 6f19d4d7..1149d763 100644 --- a/src/main/java/com/qs/serve/modules/oms/listener/OrderCreateCacheListener.java +++ b/src/main/java/com/qs/serve/modules/oms/listener/OrderCreateCacheListener.java @@ -41,30 +41,8 @@ public class OrderCreateCacheListener { AuthContextUtils.setTenant("001"); // 1.查询订单信息 OmsSaleOrder omsSaleOrder = omsSaleOrderService.getById(event.getOrderId()); - // 2.查询订单明细 - List orderItemList = omsSaleOrderItemService.listByOrderId(omsSaleOrder.getId()); // 3.保存到ERP订单 -// ErpSaleOrder erpSaleOrder = CopierUtil.copy(omsSaleOrder, new ErpSaleOrder()); -// erpSaleOrder.setOrderSource("CMS"); -// erpSaleOrder.setCurrency("人民币"); -// erpSaleOrder.setExchangeRate(1); -// erpSaleOrder.setErpStatus(0); -// erpSaleOrder.setVersion("1"); -// long rs = erpSaleOrderMapper.insert(erpSaleOrder); -// if (rs==0) { -// return; -// } -// for (OmsSaleOrderItem orderItem : orderItemList) { -// ErpSaleOrderItem erpSaleOrderItem = CopierUtil.copy(orderItem, new ErpSaleOrderItem()); -// erpSaleOrderItem.setVersion("1"); -// erpSaleOrderItemMapper.insert(erpSaleOrderItem); -// } - omsSaleOrder.setOrderSource(""); - omsSaleOrder.setCurrency("人民币"); - omsSaleOrder.setExchangeRate(1); - omsSaleOrder.setVersion("1"); omsSaleOrder.setStatus(2); - omsSaleOrderService.updateById(omsSaleOrder); } diff --git a/src/main/java/com/qs/serve/modules/oms/service/impl/OmsSaleOrderPart1ServiceImpl.java b/src/main/java/com/qs/serve/modules/oms/service/impl/OmsSaleOrderPart1ServiceImpl.java index ae90ccb0..9b675b0b 100644 --- a/src/main/java/com/qs/serve/modules/oms/service/impl/OmsSaleOrderPart1ServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/oms/service/impl/OmsSaleOrderPart1ServiceImpl.java @@ -78,7 +78,6 @@ public class OmsSaleOrderPart1ServiceImpl implements OmsSaleOrderPart1Service { List orderItems = omsSaleOrderItemService.list(new LambdaQueryWrapper() .eq(OmsSaleOrderItem::getOrderId, orderId)); OmsSaleOrder order = new OmsSaleOrder(); - order.setId(null); order.setOrderType(orgOrder.getOrderType()); String orderPrefix = null; if (order.getOrderType().equals(0)) { @@ -94,6 +93,10 @@ public class OmsSaleOrderPart1ServiceImpl implements OmsSaleOrderPart1Service { } order.setOrderSn(orderPrefix + CodeGenUtil.generate(CodeGenUtil.SourceKey.OmsOrder)); SysUser user = sysUserService.getById(AuthContextUtils.getSysUserId()); + order.setOrderSource("CMS"); + order.setCurrency("人民币"); + order.setExchangeRate(1); + order.setVersion("cms"); order.setUserId(user.getId()); order.setUserCode(user.getCode()); order.setUserName(user.getName()); diff --git a/src/main/java/com/qs/serve/modules/oms/service/impl/OmsSaleOrderServiceImpl.java b/src/main/java/com/qs/serve/modules/oms/service/impl/OmsSaleOrderServiceImpl.java index ef2f83af..4e42bc05 100644 --- a/src/main/java/com/qs/serve/modules/oms/service/impl/OmsSaleOrderServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/oms/service/impl/OmsSaleOrderServiceImpl.java @@ -590,6 +590,7 @@ public class OmsSaleOrderServiceImpl extends ServiceImpl spuIds = skuList.stream().filter(a->a.getSpecialFlag()!=1) .map(a->a.getSpuId()).collect(Collectors.toList()); + if(CollUtil.isEmpty(spuIds)){ + Assert.throwEx("没有找到对应商品"); + } LambdaQueryWrapper spuLqw = new LambdaQueryWrapper<>(); spuLqw.eq(GoodsSpu::getOrderFlag,1); spuLqw.eq(GoodsSpu::getShelf,1);