2022年11月9日19:23:39

blade-service-api/blade-stock-api/src/main/java/org/springblade/stock/entity/StockGoods.java

@@ -22,6 +22,7 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import org.springblade.stock.vo.GoodsDescDto;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
@@ -355,11 +356,11 @@ public class StockGoods implements Serializable {
 	@ApiModelProperty(value = "送货数量")
 	private Integer actualQuantity;
 
-	/**
-	 * 产品名
+/**
+	 * 产品
 	 */
 	@TableField(exist = false)
-	private String goodsName;
+	private GoodsDescDto goodsDescDto;
 
 
 }

blade-service-api/blade-stock-api/src/main/java/org/springblade/stock/vo/GoodsDescDto.java

@@ -0,0 +1,300 @@
+package org.springblade.stock.vo;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 商品详情表视图实体类
+ *
+ * @author BladeX
+ * @since 2021-09-18
+ */
+@Data
+@ApiModel(value = "GoodsDescVO对象", description = "商品详情表")
+public class GoodsDescDto {
+	private static final long serialVersionUID = 1L;
+
+	//主键
+	@TableId
+	private Long id;
+	//商品编码
+	private String code;
+	//商品名称
+	private String cname;
+	/**
+	 * 产品名称提取数字
+	 */
+	private String cnameInt;
+	//英文名称
+	private String ename;
+	//中文描述
+	private String nameDescription;
+	//英文描述
+	private String cnameDescription;
+	//规格编码
+	private String typeno;
+	//英文规格
+	private String etypeno;
+	//海关编码
+	private String customCode;
+	//海关中文
+	private String customName;
+	//海关英文
+	private String customEname;
+	//退税率
+	private BigDecimal customRate;
+	//轮胎条数
+	private String unit;
+	//品牌
+	private String brand;
+	//花纹
+	private String brandItem;
+	//规格尺寸
+	private String specs;
+	//产品类别
+	private String category;
+	//产品分类
+	private String categoryitem;
+	//备注（收费指示）
+	private String providers;
+	//长度单位
+	private String lengthUnit;
+	//重量单位
+	private String weightUnit;
+	//包装单位
+	private String packgeunit;
+	//每箱尺寸
+	private BigDecimal cntrSize;
+	//每个体积
+	private BigDecimal singleVolumn;
+	//每个毛重
+	private BigDecimal singleGrossWeight;
+	//每个净重
+	private BigDecimal singleWeight;
+	//每个箱数
+	private BigDecimal singleCntr;
+	//每箱体积
+	private BigDecimal cntrVolumn;
+	//每箱毛重
+	private BigDecimal cntrGrossWeight;
+	//每箱净重
+	private BigDecimal cntrWeight;
+	//每箱数量
+	private BigDecimal cntrQuantity;
+	//包装描述
+	private String packageDescription;
+	//箱轮胎条数
+	private BigDecimal containerQuantity;
+	//图片
+	private String url;
+	//质保期
+	@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	private Date warrantyPeriod;
+	//频率
+	private String rate;
+	//单价
+	private BigDecimal price;
+	//工时
+	private BigDecimal workingHours;
+	//备注（收费指示）
+	private String remarks;
+	//版本
+	private String version;
+	//租户ID
+	private String tenantId;
+	//修改人
+	private Long updateUser;
+	//创建人
+	private Long createUser;
+	//创建部门
+	private Long createDept;
+	//创建时间
+	@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	private Date createTime;
+	//修改时间
+	@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	private Date updateTime;
+	//状态（0 正常 1停用）
+	private Integer status;
+	//是否已删除（0 否 1是）
+	@TableLogic
+	private Integer isDeleted;
+	//枚举
+	private Long type;
+
+	private String goodsTypeId;
+
+	/**
+	 * 规格尺寸1
+	 */
+	private String specsOne;
+
+	/**
+	 * 规格尺寸2
+	 */
+	private String specsTwo;
+
+	/**
+	 * 级别
+	 */
+	private String level;
+
+	/**
+	 * 产地
+	 */
+	private String placeProduction;
+
+	/**
+	 * 三包
+	 */
+	private String threeGuarantees;
+
+	private String levelOne;
+
+	private String masterUnit;
+
+	private String slaveUnit;
+
+	private BigDecimal swapRate;
+
+	private int tinyNumber;
+
+	private BigDecimal tax;
+
+	private int effectiveDay;
+
+	private String company;
+	/**
+	 * 供应商
+	 */
+	@ApiModelProperty(value = "供应商")
+	private Long corpId;
+	/**
+	 * 供应商名称
+	 */
+	@ApiModelProperty(value = "供应商名称")
+	private String corpName;
+
+
+	@ApiModelProperty(value = "箱重量")
+	private BigDecimal cartonWeight;
+	@ApiModelProperty(value = "积分倍数")
+	private BigDecimal integralMultiples;
+	@ApiModelProperty(value = "兑换积分")
+	private BigDecimal integral;
+
+	@TableField(exist = false)
+	private String goodsTypeName;
+	/**
+	 * 尺寸
+	 */
+	@ApiModelProperty(value = "尺寸")
+	private String size;
+	/**
+	 * 辅助单位
+	 */
+	@ApiModelProperty(value = "辅助单位")
+	private String assistUnit;
+	/**
+	 * 是否按批次号计算 默认 0 否 1是
+	 */
+	@ApiModelProperty(value = "是否按批次号计算 默认 0 否 1是")
+	private int batch;
+	/**
+	 * 所属公司
+	 */
+	@ApiModelProperty(value = "所属公司")
+	private String artsVision;
+	/**
+	 * 所属公司中文名
+	 */
+	@ApiModelProperty(value = "所属公司中文名")
+	private String artsVisionName;
+
+	@TableField(exist = false)
+	private String policyName;
+	/**
+	 * 装箱量
+	 */
+	@ApiModelProperty(value = "装箱量")
+	private String ctn;
+	/**
+	 * 平台商品编码
+	 */
+	@ApiModelProperty(value = "平台商品编码")
+	private String terraceCode;
+	/**
+	 * 销售价浮动系数
+	 */
+	private String coefficient;
+
+	/**
+	 * 提成比例
+	 */
+	private BigDecimal commission;
+
+	/**
+	 * 规格型号
+	 */
+	@ApiModelProperty(value = "规格型号")
+	private String specificationAndModel;
+	/**
+	 * 是否管理批次号
+	 */
+	@ApiModelProperty(value = "是否管理批次号")
+	private String whether;
+
+	/**
+	 * 标准售价
+	 */
+	private BigDecimal standardPrice;
+
+	/**
+	 * 批发售价
+	 */
+	private BigDecimal wholesalePrice;
+
+	/**
+	 * 汽修厂售价
+	 */
+	private BigDecimal repairDepotPrice;
+
+	/**
+	 * 门店售价
+	 */
+	private BigDecimal storePrice;
+	/**
+	 * 采购价
+	 */
+	private BigDecimal purchasePrice;
+
+	/**
+	 * 标签
+	 */
+	private String label;
+
+	/**
+	 * 商品类别及子类别
+	 */
+	@ApiModelProperty(value = "商品类别及子类别")
+	private List<Long> goodsTypeIdList;
+	/**
+	 * 客户编码
+	 */
+	@ApiModelProperty(value = "客户编码")
+	private String corpCode;
+
+}

blade-service/blade-stock/src/main/java/org/springblade/stock/controller/StockGoodsController.java

@@ -46,9 +46,11 @@ import org.springblade.stock.excel.StockGoodsExcel;
 import org.springblade.stock.service.IStockGoodsService;
 import org.springblade.stock.vo.AppStockPartsVO;
 import org.springblade.stock.vo.AppStockVO;
+import org.springblade.stock.vo.GoodsDescDto;
 import org.springblade.stock.vo.StockGoodsVO;
 import org.springblade.system.user.entity.User;
 import org.springblade.system.user.feign.IUserClient;
+import org.springframework.beans.BeanUtils;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -468,9 +470,9 @@ public class StockGoodsController extends BladeController {
 			//获取商品信息
 			R<GoodsDescVO> goodsMessage = goodsDescClient.selectGoodsMessage(stockGoods.getGoodsId());
 			if (goodsMessage.isSuccess() && goodsMessage.getData() != null) {
-				if (StringUtils.isNotBlank(goodsMessage.getData().getCname())) {
-					stockGoods.setGoodsName(goodsMessage.getData().getCname());
-				}
+				GoodsDescDto goodsDescDto = new GoodsDescDto();
+				BeanUtils.copyProperties(goodsMessage.getData(),goodsDescDto);
+				stockGoods.setGoodsDescDto(goodsDescDto);
 			}
 		}
 		return R.data(iPage);