no message

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

@@ -72,4 +72,7 @@ public class WebsitSalesGoodsVO {
 
     @ApiModelProperty(value = "销售价格")
     private BigDecimal salesPrice;
+
+    @ApiModelProperty(value = "旧件库存数量")
+    private BigDecimal oldQty;
 }

mall-server-api/src/main/java/com/gree/mall/manager/logic/material/stock/WorkerStockLogic.java

@@ -103,8 +103,9 @@ public class WorkerStockLogic {
      * @return
      */
     public IPage<WorkerStockAccPVO> workerStockAccPList(ZfireParamBean zfireParamBean) {
+        final AdminUserCom adminUser = commonLogic.getAdminUser();
         zfireParamBean.setCompanyWechatId(commonLogic.getAdminUser().getCompanyWechatId());
-        FieldUtils.supplyParam(zfireParamBean, WorkerStockAccPVO.class);
+        FieldUtils.supplyParam(zfireParamBean, WorkerStockAccPVO.class, adminUser);
         IPage<WorkerStockAccPVO> page = commonMapper.workerStockAccPList(new Page(zfireParamBean.getPageNum(), zfireParamBean.getPageSize()), zfireParamBean);
         return page;
     }

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

@@ -265,6 +265,14 @@
         join websit_goods b on a.goods_id = b.goods_code
         left join user e on e.worker_number = a.worker_id
           ${ex.query}
+        <if test="ex.adminWebsitIds != null and ex.adminWebsitIds.size > 0">
+            AND (
+            a.websit_id IN
+            <foreach item="item" index="index" collection="ex.adminWebsitIds" open="(" separator="," close=")">
+                #{item}
+            </foreach>
+            )
+        </if>
           and a.goods_type='P'
         order by a.id desc
     </select>

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

@@ -230,7 +230,8 @@
             'BASE' AS itemSourceType,
             a.goods_id AS itemSourceId,
             b.norm_type,
-            b.material_group_name
+            b.material_group_name,
+            a.old_qty
         FROM
             websit_stock a
                 JOIN websit_goods b ON