no message

mall-server-api/src/main/java/com/gree/mall/manager/bean/material/stock/WebsitSalesGoodsVO.java

@@ -54,4 +54,7 @@ public class WebsitSalesGoodsVO {
 
     @ApiModelProperty(value = "配件类型")
     private String partType;
+
+    @ApiModelProperty(value = "物料组")
+    private String materialGroupName;
 }

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

@@ -176,7 +176,6 @@ public class WebsitPartsNewInLogic {
                     .setPartsNumber(partsNumber)
                     .setPartsName(parts.getGoodsName())
                     .setMaterialGroupName(parts.getMaterialGroupName())
-                    .setMaterialGroupName(parts.getMaterialGroupName())
                     .setGoodsStockUnit(parts.getGoodsStockUnit())
                     .setPrice(new BigDecimal(StringUtils.isNotBlank(priceStr) ? priceStr : "0"))
                     .setQty(new BigDecimal(StringUtils.isNotBlank(qtyStr) ? qtyStr : "0"))

mall-server-api/src/main/resources/mapper/CommonMapper.xml

@@ -219,7 +219,7 @@
         join worker_goods b on a.goods_id = b.goods_id
         left join websit_goods_category c on b.parent_category_id = c.category_id
         left join websit_goods_category d on b.goods_category_id = d.category_id
-        join user e on e.worker_number = a.worker_id
+        left join user e on e.worker_number = a.worker_id
           ${ex.query}
           and a.goods_type='M'
         order by a.id desc
@@ -233,7 +233,7 @@
         join worker_goods b on a.goods_id = b.goods_id
         left join websit_goods_category c on b.parent_category_id = c.category_id
         left join websit_goods_category d on b.goods_category_id = d.category_id
-        join user e on e.worker_number = a.worker_id
+        left join user e on e.worker_number = a.worker_id
           ${ex.query}
           and a.goods_type='M'
         order by a.id desc
@@ -244,7 +244,7 @@
           ${ex.selected}
         from worker_stock a
         join websit_goods b on a.goods_id = b.goods_id
-        join user e on e.worker_number = a.worker_id
+        left join user e on e.worker_number = a.worker_id
           ${ex.query}
         and a.goods_type='P'
         order by a.id desc
@@ -255,7 +255,7 @@
           ${ex.selected}
         from worker_stock_acc a
         join websit_goods b on a.goods_id = b.goods_id
-        join user e on e.worker_number = a.worker_id
+        left join user e on e.worker_number = a.worker_id
           ${ex.query}
           and a.goods_type='P'
         order by a.id desc

mall-server-api/src/main/resources/mapper/MaterialMapper.xml

@@ -224,7 +224,8 @@
             SUM(a.qty) AS qty,
             'BASE' AS itemSourceType,
             a.goods_id AS itemSourceId,
-            b.norm_type
+            b.norm_type,
+            b.material_group_name
         FROM
             websit_stock a
                 JOIN websit_goods b ON