Merge remote-tracking branch 'origin/develop' into develop

mall-server-api/src/main/java/com/gree/mall/manager/bean/listvo/material/WebsitStockAccPVO.java

@@ -45,9 +45,9 @@ public class WebsitStockAccPVO {
     private BigDecimal price;
     @ApiModelProperty("发生时间")
     private Date sdate;
-    @ZfireField(tbName = "c")
-    @ApiModelProperty("仓库")
-    private String storageName;
+//    @ZfireField(tbName = "c")
+//    @ApiModelProperty("仓库")
+//    private String storageName;
     @ApiModelProperty("发生方向")
     private DirectFlagEnum directFlag;
     @ApiModelProperty("发生数量")

mall-server-api/src/main/java/com/gree/mall/manager/bean/listvo/material/WebsitStockPVO.java

@@ -1,7 +1,6 @@
 package com.gree.mall.manager.bean.listvo.material;
 
 import com.gree.mall.manager.annotation.ZfireField;
-import com.gree.mall.manager.enums.material.PartsApplyCategoryEnum;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -40,7 +39,7 @@ public class WebsitStockPVO {
     private String goodsCode;
     @ZfireField(tbName = "b")
     @ApiModelProperty("配件类型")
-    private PartsApplyCategoryEnum partType;
+    private String partType;
     @ZfireField(tbName = "b")
     @ApiModelProperty("适用品牌")
     private String brandRelaName;
@@ -55,7 +54,7 @@ public class WebsitStockPVO {
     private BigDecimal oldQty;
     @ApiModelProperty("更新时间")
     private Date updateTime;
-    @ZfireField(tbName = "c")
-    @ApiModelProperty("仓库")
-    private String storageName;
+//    @ZfireField(tbName = "c")
+//    @ApiModelProperty("仓库")
+//    private String storageName;
 }

mall-server-api/src/main/java/com/gree/mall/manager/logic/material/manage/WebsitPartsSalesOrderLogic.java

@@ -929,6 +929,7 @@ public class WebsitPartsSalesOrderLogic {
                 workerStockDTO.setGoodsType(WebsitGoodsTypeEnum.P.getKey());
                 workerStockDTO.setGoodsId(item.getPartsNumber());
                 workerStockDTO.setGoodsName(item.getPartsName());
+                workerStockDTO.setGoodsStockUnit(item.getGoodsStockUnit());
                 workerStockDTO.setMaterialGroupName(item.getMaterialGroupName());
                 workerStockDTO.setPrice(item.getSalesPrice());
                 workerStockDTO.setGoodsStockUnit(item.getGoodsStockUnit());