no message

mall-server-api/src/main/java/com/gree/mall/manager/bean/material/manage/ImportMaterialSalesBean.java

@@ -18,4 +18,5 @@ public class ImportMaterialSalesBean {
     private BigDecimal price;
     private String salesId;
     private String storageId;
+    private BigDecimal origPrice;
 }

mall-server-api/src/main/java/com/gree/mall/manager/bean/material/manage/WebsitSalesItemBean.java

@@ -125,4 +125,7 @@ public class WebsitSalesItemBean {
 
     @ApiModelProperty(value = "收费类型 M=物料收费 S=服务收费")
     private String normType;
+
+    @ApiModelProperty(value = "原配件单价")
+    private BigDecimal origPartsPrice;
 }

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

@@ -1147,6 +1147,7 @@ public class WebsitSalesLogic {
                 default:
                     throw new RemoteServiceException("未找到对应配件类型倍率");
             }
+            BigDecimal origPrice = goods.getMarketPrice();
 
             ImportMaterialSalesBean bean = new ImportMaterialSalesBean();
 
@@ -1156,6 +1157,7 @@ public class WebsitSalesLogic {
             bean.setGoods(goods);
             bean.setQty(qty);
             bean.setPrice(salesPrice);
+            bean.setOrigPrice(origPrice);
 
             if (StringUtils.isNotBlank(storageStr) && storageMap.containsKey(bean.getAdminWebsit().getWebsitId() + storageStr)) {
                 bean.setStorageId(storageMap.get(bean.getAdminWebsit().getWebsitId() + storageStr).getStorageId());
@@ -1242,14 +1244,17 @@ public class WebsitSalesLogic {
                         salesItemBean.setProductCategory(bean.getGoods().getProductRelaName());
                         salesItemBean.setPayType(salesBean.getPayType());
                         salesItemBean.setManageWorkerStock(bean.getGoods().getManageWorkerStock());
+                        salesItemBean.setConvertPrice(bean.getPrice());
                         salesItemBean.setConvertQty(bean.getQty());
                         salesItemBean.setItemSourceType(ItemSourceTypeEnum.BASE.getKey());
                         salesItemBean.setItemSourceId(bean.getGoods().getGoodsId());
                         salesItemBean.setNormType(bean.getGoods().getNormType());
+                        salesItemBean.setOrigPartsPrice(bean.getOrigPrice());
 
                         salesItemBeanList.add(salesItemBean);
                     } else {
                         itemBean.setSalesQty(itemBean.getSalesQty().add(bean.getQty()));
+                        itemBean.setConvertQty(itemBean.getConvertQty().add(bean.getQty()));
                         itemBean.setSaleAmount(itemBean.getSalesQty().multiply(bean.getPrice()));
                     }
                 }