diff --git a/yxt-sms-biz/src/main/java/com/yxt/sms/apiadmin/SmsGoodsRest.java b/yxt-sms-biz/src/main/java/com/yxt/sms/apiadmin/SmsGoodsRest.java index 78a5e56c94..d2246ae0a3 100644 --- a/yxt-sms-biz/src/main/java/com/yxt/sms/apiadmin/SmsGoodsRest.java +++ b/yxt-sms-biz/src/main/java/com/yxt/sms/apiadmin/SmsGoodsRest.java @@ -2,6 +2,7 @@ package com.yxt.sms.apiadmin; import com.yxt.common.core.result.ResultBean; import com.yxt.sms.biz.smsgoods.SmsGoods; +import com.yxt.sms.biz.smsgoods.SmsGoodsDto; import com.yxt.sms.biz.smsgoods.SmsGoodsService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -29,4 +30,13 @@ public class SmsGoodsRest { return rb.success().setData(goods); } + + @ApiOperation("保存修改") + @PostMapping("/saveSmsGoods") + public ResultBean saveSmsGoods(@RequestBody SmsGoodsDto dto) { + ResultBean rb = ResultBean.fireFail(); + String sid = smsGoodsService.saveSmsGoods(dto); + return rb.success().setData(sid); + } + } diff --git a/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smsgoods/SmsGoods.java b/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smsgoods/SmsGoods.java index 70b60ee42e..9ef11cc2d9 100644 --- a/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smsgoods/SmsGoods.java +++ b/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smsgoods/SmsGoods.java @@ -76,8 +76,10 @@ public class SmsGoods extends BaseEntity { private String supplierName; // 供应商名称 @ApiModelProperty("计量单位") private String unit; // 计量单位 - @ApiModelProperty("组织全路径") + @ApiModelProperty("销售单价") private BigDecimal price; // 销售单价 + @ApiModelProperty("入库单价") + private BigDecimal cost; // 入库单价 @ApiModelProperty("使用组织sid") private String useOrgSid; // 使用组织sid @ApiModelProperty("创建组织sid") diff --git a/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smsgoods/SmsGoodsDto.java b/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smsgoods/SmsGoodsDto.java new file mode 100644 index 0000000000..d59c5f8ee0 --- /dev/null +++ b/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smsgoods/SmsGoodsDto.java @@ -0,0 +1,44 @@ +package com.yxt.sms.biz.smsgoods; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +public class SmsGoodsDto { + + private String sid; + private String createBySid; + @ApiModelProperty("商品ID") + private String goodsID; // 商品ID + @ApiModelProperty("商品类别sid") + private String goodsTypeSid; // 商品类别sid + @ApiModelProperty("商品类别名称") + private String goodsTypeName; // 商品类别名称 + @ApiModelProperty("商品基础信息Sid") + private String goodsSpuSid; // 商品基础信息Sid + @ApiModelProperty("商品名称") + private String goodsSpuName; // 商品名称 + @ApiModelProperty("商品SkuSid") + private String goodsSkuSid; // 商品SkuSid + @ApiModelProperty("商品Sku名称") + private String goodsSkuTitle; // 商品Sku名称 + @ApiModelProperty("商品编码(图号)") + private String goodsSkuCode; // 商品编码(图号) + @ApiModelProperty("规格型号") + private String goodsSkuOwnSpec; // 规格型号 + @ApiModelProperty("供应商sid") + private String supplierSid; // 供应商sid + @ApiModelProperty("供应商名称") + private String supplierName; // 供应商名称 + @ApiModelProperty("计量单位") + private String unit; // 计量单位 + @ApiModelProperty("销售单价") + private String price; // 销售单价 + @ApiModelProperty("入库单价") + private String cost; // 入库单价 + @ApiModelProperty("使用组织sid") + private String useOrgSid; // 使用组织sid + @ApiModelProperty("创建组织sid") + private String createOrgSid; // 创建组织sid + +} diff --git a/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smsgoods/SmsGoodsService.java b/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smsgoods/SmsGoodsService.java index 1727caa19f..1c5e3f40f6 100644 --- a/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smsgoods/SmsGoodsService.java +++ b/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smsgoods/SmsGoodsService.java @@ -26,13 +26,8 @@ package com.yxt.sms.biz.smsgoods; import cn.hutool.core.bean.BeanUtil; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; import com.yxt.common.base.service.MybatisBaseService; -import com.yxt.common.base.utils.PagerUtil; -import com.yxt.common.core.query.PagerQuery; -import com.yxt.common.core.vo.PagerVo; -import com.yxt.sms.biz.smspricestrategy.*; +import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; @@ -42,4 +37,20 @@ public class SmsGoodsService extends MybatisBaseService SELECT i.sid inventorySid, - e.salesPrice price, + s.price, i.goodsSpuSid, i.goodsSkuSid, i.goodsSpuName, @@ -126,7 +126,7 @@ yxt_wms.wms_inventory as i LEFT JOIN yxt_wms.wms_warehouse_area as wa ON wa.warehouseSid = i.warehouseSid LEFT JOIN yxt_wms.wms_warehouse_info as wi ON wi.sid = i.warehouseSid - LEFT JOIN yxt_base.base_goods_sku_extend as e ON e.goodsSkuSid = i.goodsSkuSid + LEFT JOIN yxt_sms.sms_goods as s ON s.goodsID = i.goodsID ${ew.sqlSegment}