From 53462b232aa874023c9252636854fd3fa30b768c Mon Sep 17 00:00:00 2001 From: Yen Date: Wed, 20 Dec 2023 09:25:10 +0800 Subject: [PATCH] =?UTF-8?q?sku=E5=88=97=E8=A1=A8=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../goods/controller/GoodsSkuController.java | 4 ++-- .../serve/modules/goods/entity/GoodsSku.java | 16 ++++++++++++++++ .../qs/serve/modules/oms/entity/OmsOrder.java | 1 + .../oms/entity/bo/CreateOrderParam.java | 1 + .../oms/service/impl/OmsOrderServiceImpl.java | 10 +++++++--- .../TbsScheduleItemBudgetServiceImpl.java | 1 + .../resources/mapper/goods/GoodsSkuMapper.xml | 19 ++++++++++++++++--- 7 files changed, 44 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/qs/serve/modules/goods/controller/GoodsSkuController.java b/src/main/java/com/qs/serve/modules/goods/controller/GoodsSkuController.java index 8123c4d3..4d77b91a 100644 --- a/src/main/java/com/qs/serve/modules/goods/controller/GoodsSkuController.java +++ b/src/main/java/com/qs/serve/modules/goods/controller/GoodsSkuController.java @@ -74,8 +74,8 @@ public class GoodsSkuController { Random rd = new Random(); for (GoodSkuVo goodSkuVo : list) { goodSkuVo.setStock(rd.nextInt(3)); - List skuSpecValueVos = goodsSkuSpecValueService.listSpecValueBySkuId(goodSkuVo.getId()); - goodSkuVo.setSpecValueList(skuSpecValueVos); +// List skuSpecValueVos = goodsSkuSpecValueService.listSpecValueBySkuId(goodSkuVo.getId()); +// goodSkuVo.setSpecValueList(skuSpecValueVos); } return R.ok(list); } diff --git a/src/main/java/com/qs/serve/modules/goods/entity/GoodsSku.java b/src/main/java/com/qs/serve/modules/goods/entity/GoodsSku.java index 196f4979..0d0bfc8e 100644 --- a/src/main/java/com/qs/serve/modules/goods/entity/GoodsSku.java +++ b/src/main/java/com/qs/serve/modules/goods/entity/GoodsSku.java @@ -156,5 +156,21 @@ public class GoodsSku implements Serializable { @TableField(exist = false) private Integer qty; + /** + * 品牌 + */ + @TableField(exist = false) + private String brandName; + /** + * 分类 + */ + @TableField(exist = false) + private String categoryName; + /** + * 系列 + */ + @TableField(exist = false) + private String seriesName; + } 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 6bdb4f93..ef9b53a9 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 @@ -80,6 +80,7 @@ public class OmsOrder implements Serializable { @NotNull(message = "品牌ID不能为空") private Long brandRuleId; + @TableField(condition = SqlCondition.LIKE) private String brandRuleName; /** 制单人id */ 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 c6889bab..f7347fb1 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 @@ -14,4 +14,5 @@ public class CreateOrderParam{ /** 备注 */ private String remark; + } 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 cf337999..77819f5c 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 @@ -232,7 +232,9 @@ public class OmsOrderServiceImpl extends ServiceImpl im order.setSupplierAddrId(param.getSupplierAddrId()); GoodsCategoryRule categoryRule = goodsCategoryRuleMapper.selectById(param.getBrandRuleId()); order.setBrandRuleId(param.getBrandRuleId()); - order.setBrandRuleName(categoryRule.getLabel()); + if(categoryRule!=null){ + order.setBrandRuleName(categoryRule.getLabel()); + } if(param.getSupplierId()!=null && !param.getSupplierId().equals(order.getSupplierId())){ BmsSupplier supplier = bmsSupplierMapper.selectById(param.getSupplierId()); order.setSupplierId(param.getSupplierId()); @@ -368,8 +370,10 @@ public class OmsOrderServiceImpl extends ServiceImpl im order.setLatitudeFrom(confirmOrder.getLatitudeFrom().toLowerCase(Locale.ROOT)); order.setOrderSn("SN"+CodeGenUtil.generate(CodeGenUtil.SourceKey.OmsOrder)); - GoodsCategoryRule categoryRule = goodsCategoryRuleMapper.selectById(order.getBrandRuleId()); - order.setBrandRuleName(categoryRule.getLabel()); + GoodsCategoryRule categoryRule = goodsCategoryRuleMapper.selectById(confirmOrder.getBrandRuleId()); + if(categoryRule!=null){ + order.setBrandRuleName(categoryRule.getLabel()); + } order.setOrderType(confirmOrder.getOrderType()); order.setSupplierId(Long.parseLong(supplier.getId())); diff --git a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsScheduleItemBudgetServiceImpl.java b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsScheduleItemBudgetServiceImpl.java index 5c73a2c4..740697f9 100644 --- a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsScheduleItemBudgetServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsScheduleItemBudgetServiceImpl.java @@ -37,6 +37,7 @@ public class TbsScheduleItemBudgetServiceImpl extends ServiceImpl scheduleItemBudgetList = this.list(lqw); List ids = scheduleItemBudgetList.stream().map(TbsScheduleItemBudget::getId).collect(Collectors.toList()); + ids.add(0L); List amountList = this.baseMapper.getSumAmtInList(ids,Arrays.asList(0,2,3)); for (TbsScheduleItemBudget itemBudget : scheduleItemBudgetList) { for (TbsBudgetLogWithAmount withAmount : amountList) { diff --git a/src/main/resources/mapper/goods/GoodsSkuMapper.xml b/src/main/resources/mapper/goods/GoodsSkuMapper.xml index c86e67ba..4f16ed35 100644 --- a/src/main/resources/mapper/goods/GoodsSkuMapper.xml +++ b/src/main/resources/mapper/goods/GoodsSkuMapper.xml @@ -71,6 +71,7 @@ SELECT FROM `goods_sku` `goods_sku` and `goods_sku`.`id` = #{query.id} + and `goods_sku`.`sku_name` = #{query.skuName} and `goods_sku`.`sku_code` = #{query.skuCode} and `goods_sku`.`spu_id` = #{query.spuId} and `goods_sku`.`sales_price` = #{query.salesPrice} @@ -106,21 +107,28 @@ `goods_spu`.`name`, `goods_spu`.`spu_code`, `goods_spu`.`shelf`, + cate1.`name` as brandName, + cate2.`name` as categoryName, + cate3.`name` as seriesName, FROM `goods_sku` `goods_sku` LEFT JOIN `goods_spu` ON `goods_sku`.`spu_id` = `goods_spu`.id + left join goods_category cate1 on goods_spu.category_first = cate1.id + left join goods_category cate2 on goods_spu.category_second = cate2.id + left join goods_category cate3 on goods_spu.category_third = cate3.id and `goods_sku`.`del_flag` = 0 and `goods_spu`.`del_flag` = 0 and `goods_sku`.`id` = #{query.id} - and `goods_sku`.`sku_code` = #{query.skuCode} + and `goods_sku`.`sku_code` like concat('%',#{query.skuCode},'%') + and `goods_sku`.`sku_name` like concat('%',#{query.skuName},'%') and `goods_sku`.`spu_id` = #{query.spuId} and `goods_sku`.`sales_price` = #{query.salesPrice} and `goods_sku`.`market_price` = #{query.marketPrice} and `goods_sku`.`cost_price` = #{query.costPrice} - and `goods_sku`.`spec_infos` = #{query.specInfos} + and `goods_sku`.`spec_infos` like concat('%',#{query.specInfos},'%') and `goods_sku`.`stock` = #{query.stock} - and `goods_sku`.`belong` = #{query.belong} + and `goods_sku`.`belong` like concat('%',#{query.belong},'%') and `goods_sku`.`unit_id` = #{query.unitId} and `goods_sku`.`unit_name` = #{query.unitName} and `goods_sku`.`weight` = #{query.weight} @@ -145,6 +153,11 @@ and `goods_sku`.`special_flag` = #{query.specialFlag} and `goods_sku`.`order_flag` = #{query.orderFlag} + and `cate1`.`name` like concat('%',#{query.brandName},'%') + and `cate2`.`name` like concat('%',#{query.categoryName},'%') + and `cate3`.`name` like concat('%',#{query.seriesName},'%') + + ORDER BY `goods_sku`.`create_time` DESC