Browse Source
# Conflicts: # oms/src/main/java/com/yxt/oms/feign/portal/sysstafforg/SysStaffOrgFeign.javamaster
fanzongzhe
9 months ago
22 changed files with 336 additions and 110 deletions
@ -0,0 +1,33 @@ |
|||
package com.yxt.oms.apiadmin.aggregation; |
|||
|
|||
import com.yxt.common.core.result.ResultBean; |
|||
import com.yxt.oms.biz.func.basegoodssku.BaseGoodsSkuService; |
|||
import com.yxt.oms.biz.func.basegoodssku.BaseGoodsSkuVo; |
|||
import com.yxt.oms.utils.OrgPathQuery; |
|||
import io.swagger.annotations.ApiOperation; |
|||
import org.springframework.beans.factory.annotation.Autowired; |
|||
import org.springframework.web.bind.annotation.PostMapping; |
|||
import org.springframework.web.bind.annotation.RequestBody; |
|||
import org.springframework.web.bind.annotation.RequestMapping; |
|||
import org.springframework.web.bind.annotation.RestController; |
|||
|
|||
import java.util.List; |
|||
|
|||
/** |
|||
* @author wangpengfei |
|||
* @date 2024/4/12 11:20 |
|||
*/ |
|||
@RestController() |
|||
@RequestMapping("/apiadmin/basegoodssku") |
|||
public class BaseGoodsSkuRest { |
|||
|
|||
|
|||
@Autowired |
|||
BaseGoodsSkuService baseGoodsSkuService; |
|||
|
|||
@ApiOperation("查询组织下所有商品") |
|||
@PostMapping("/listAllByOrg") |
|||
public ResultBean<List<BaseGoodsSkuVo>> listAllByOrg(@RequestBody OrgPathQuery query) { |
|||
return baseGoodsSkuService.listAllByOrg(query); |
|||
} |
|||
} |
|||
@ -0,0 +1,24 @@ |
|||
package com.yxt.oms.biz.func.basegoodssku; |
|||
|
|||
import com.yxt.common.core.result.ResultBean; |
|||
import com.yxt.oms.feign.goods.basegoodssku.BaseGoodsSkuFeign; |
|||
import com.yxt.oms.utils.OrgPathQuery; |
|||
import org.springframework.beans.factory.annotation.Autowired; |
|||
import org.springframework.stereotype.Service; |
|||
|
|||
import java.util.List; |
|||
|
|||
/** |
|||
* @author wangpengfei |
|||
* @date 2024/2/26 13:40 |
|||
*/ |
|||
@Service |
|||
public class BaseGoodsSkuService{ |
|||
|
|||
@Autowired |
|||
BaseGoodsSkuFeign baseGoodsSkuFeign; |
|||
|
|||
public ResultBean<List<BaseGoodsSkuVo>> listAllByOrg(OrgPathQuery query) { |
|||
return baseGoodsSkuFeign.listAllByOrg(query); |
|||
} |
|||
} |
|||
@ -0,0 +1,38 @@ |
|||
package com.yxt.oms.biz.func.basegoodssku; |
|||
|
|||
import com.baomidou.mybatisplus.annotation.TableField; |
|||
import com.fasterxml.jackson.annotation.JsonFormat; |
|||
import com.yxt.common.core.vo.Vo; |
|||
import com.yxt.oms.biz.func.basegoodsskuextend.BaseGoodsSkuExtendVo; |
|||
import lombok.Data; |
|||
|
|||
import java.util.Date; |
|||
|
|||
/** |
|||
* @author wangpengfei |
|||
* @date 2024/2/26 13:37 |
|||
*/ |
|||
@Data |
|||
public class BaseGoodsSkuVo implements Vo { |
|||
private String id; |
|||
private String sid; |
|||
private String lockVersion; |
|||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") |
|||
private Date createTime; |
|||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") |
|||
private Date modifyTime; |
|||
private String remarks; |
|||
private String isEnable; |
|||
private String state; |
|||
private String isDelete; |
|||
private String goodsSkuCode;//商品Sku代码
|
|||
private String title;//商品标题
|
|||
private String goodsSpuSid;//商品基础信息Sid
|
|||
private String externalCode;//外部编码
|
|||
private String indexes;//特有规格属性在spu表中special_spec字段对应每个参数值数组下标的组合，如0_0_0,1_0_0，相当于SKU这条记录的编码。
|
|||
@TableField(value = "own_spec") |
|||
private String ownSpec;//sku的特有规格参数键值对，json格式，反序列化时请使用linkedHashMap，保证有序
|
|||
private String goodsName; |
|||
private BaseGoodsSkuExtendVo baseGoodsSkuExtend; |
|||
|
|||
} |
|||
@ -0,0 +1,53 @@ |
|||
package com.yxt.oms.biz.func.basegoodsskuextend; |
|||
|
|||
import com.baomidou.mybatisplus.annotation.TableField; |
|||
import com.fasterxml.jackson.annotation.JsonFormat; |
|||
import com.yxt.common.core.vo.Vo; |
|||
import lombok.Data; |
|||
|
|||
import java.util.Date; |
|||
import java.util.List; |
|||
|
|||
/** |
|||
* @author wangpengfei |
|||
* @date 2024/2/26 13:37 |
|||
*/ |
|||
@Data |
|||
public class BaseGoodsSkuExtendVo implements Vo { |
|||
private String id; |
|||
private String sid; |
|||
private String lockVersion; |
|||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") |
|||
private Date createTime; |
|||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") |
|||
private Date modifyTime; |
|||
private String remarks; |
|||
private String isEnable; |
|||
private String state; |
|||
private String isDelete; |
|||
private String goodsSkuSid;//商品Skusid
|
|||
private String finalPurchasePrice;//最后采购价
|
|||
private String safetyStockDays;//安全库存天数
|
|||
private String isOriginalFactory;//是否原厂
|
|||
private String isInventoryAlert;//是否库存警戒
|
|||
@TableField(value = "InventoryAlertUpperLimit") |
|||
private String inventoryAlertUpperLimit;//库存警戒上线
|
|||
@TableField(value = "InventoryAlertLowerLimit") |
|||
private String inventoryAlertLowerLimit;//库存警戒下线
|
|||
private String costPrice;//成本价
|
|||
private String tagPrice;//吊牌价
|
|||
private String salesPrice;//销售单价
|
|||
private String standardPurchasePrice;//标准进价
|
|||
private String agencyPrice;//代理价
|
|||
private String discount;//折扣
|
|||
private String minimumSalesPrice;//最低零售价
|
|||
private String isLockingSalesPrice;//是否锁定销售价
|
|||
private String isIntegralExchange;//是否可以积分兑换
|
|||
private String integralAmount;//积分数量
|
|||
private String sortNo;//排序
|
|||
private String picUrl;//商品的图片，多个图片以‘,’分割
|
|||
// private String [] Urls={};//图片数组
|
|||
private List<UrlsVo> urls;//图片数组
|
|||
private String title;//sku标题
|
|||
|
|||
} |
|||
@ -0,0 +1,12 @@ |
|||
package com.yxt.oms.biz.func.basegoodsskuextend; |
|||
|
|||
import lombok.Data; |
|||
|
|||
/** |
|||
* @author wangpengfei |
|||
* @date 2024/3/22 10:20 |
|||
*/ |
|||
@Data |
|||
public class UrlsVo { |
|||
private String url; |
|||
} |
|||
@ -0,0 +1,50 @@ |
|||
package com.yxt.oms.feign.goods.basegoodssku; |
|||
|
|||
import com.fasterxml.jackson.annotation.JsonProperty; |
|||
import io.swagger.annotations.ApiModelProperty; |
|||
import lombok.Data; |
|||
|
|||
/** |
|||
* @description: |
|||
* @author: dimengzhe |
|||
* @date: 2024/3/20 |
|||
**/ |
|||
@Data |
|||
public class BaseGoodsSkuDetailsVo { |
|||
|
|||
@ApiModelProperty("商品代码") |
|||
private String goodsCode; |
|||
@ApiModelProperty("条形码") |
|||
private String barCode; |
|||
@ApiModelProperty("商品名称") |
|||
private String goodsName; |
|||
@ApiModelProperty("副标题") |
|||
private String subTitle; |
|||
@ApiModelProperty("拼音缩写") |
|||
private String goodsPY; |
|||
@ApiModelProperty("商品简称") |
|||
private String goodsShortName; |
|||
@ApiModelProperty("商品分类sid") |
|||
private String goodsTypeSid; |
|||
@ApiModelProperty("品牌sid") |
|||
private String brandSid; |
|||
@ApiModelProperty("厂家sid") |
|||
private String manufacturersid; |
|||
@ApiModelProperty("商品单位sid") |
|||
private String goodsUnitSid; |
|||
@ApiModelProperty("商品spuSid") |
|||
private String goodsSpuSid; |
|||
@ApiModelProperty("商品单位名称") |
|||
private String goodsUnitName; |
|||
|
|||
@ApiModelProperty("商品Sku代码") |
|||
private String goodsSkuCode; |
|||
@ApiModelProperty("商品标题") |
|||
private String title; |
|||
|
|||
@ApiModelProperty("是否一品一码（goodID），0否，1是") |
|||
@JsonProperty("isGoodsID") |
|||
private int isGoodsID; |
|||
@ApiModelProperty("商品类别名称") |
|||
private String goodsTypeName; |
|||
} |
|||
@ -0,0 +1,28 @@ |
|||
package com.yxt.oms.feign.goods.basegoodssku; |
|||
|
|||
import com.yxt.common.core.result.ResultBean; |
|||
import com.yxt.oms.biz.func.basegoodssku.BaseGoodsSkuVo; |
|||
import com.yxt.oms.utils.OrgPathQuery; |
|||
import io.swagger.annotations.ApiOperation; |
|||
import org.springframework.cloud.openfeign.FeignClient; |
|||
import org.springframework.web.bind.annotation.PostMapping; |
|||
import org.springframework.web.bind.annotation.RequestBody; |
|||
|
|||
import java.util.List; |
|||
|
|||
/** |
|||
* @description: |
|||
* @author: dimengzhe |
|||
* @date: 2024/3/20 |
|||
**/ |
|||
@FeignClient( |
|||
contextId = "yss-common-goods-GoodsSku", |
|||
name = "ss-common-goods", |
|||
path = "/apiadmin/base/basegoodssku") |
|||
public interface BaseGoodsSkuFeign { |
|||
|
|||
@ApiOperation("查询组织下所有商品") |
|||
@PostMapping("/listAllByOrg") |
|||
public ResultBean<List<BaseGoodsSkuVo>> listAllByOrg(@RequestBody OrgPathQuery query); |
|||
|
|||
} |
|||
@ -1,22 +1,18 @@ |
|||
package com.yxt.oms.feign.purchase.purchaseflownode; |
|||
|
|||
import com.yxt.common.core.query.PagerQuery; |
|||
import com.yxt.common.core.result.ResultBean; |
|||
import com.yxt.common.core.vo.PagerVo; |
|||
import com.yxt.oms.biz.func.purchasebill.*; |
|||
import com.yxt.oms.biz.func.purchaseflownode.PurchaseFlowNodeQuery; |
|||
import com.yxt.oms.biz.func.purchaseflownode.PurchaseFlowNodeVo; |
|||
import io.swagger.annotations.ApiOperation; |
|||
import org.springframework.cloud.openfeign.FeignClient; |
|||
import org.springframework.web.bind.annotation.*; |
|||
|
|||
import java.util.List; |
|||
|
|||
@FeignClient( |
|||
contextId = "ss-common-purchase-PurchaseFlowNode", |
|||
name = "ss-common-purchase", |
|||
path = "/apiadmin/purchaseflownode") |
|||
public interface PurchaseFlowNodeFeign { |
|||
|
|||
@ApiOperation("根据条件分页查询数据的列表") |
|||
@PostMapping("/listPage") |
|||
public ResultBean<PagerVo<PurchaseFlowNodeVo>> listPage(@RequestBody PagerQuery<PurchaseFlowNodeQuery> pq); |
|||
public ResultBean<List<PurchaseFlowNodeVo>> listPage(@RequestParam("sid") String sid); |
|||
} |
|||
Loading…
Reference in new issue