Merge remote-tracking branch 'origin/master'

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderreturnvehapply/BusSalesOrderReturnVehApplyService.java

@@ -746,7 +746,7 @@ public class BusSalesOrderReturnVehApplyService extends MybatisBaseService<BusSa
                         //修改出库申请车辆状态
                         busDeliveredApplyDetailsService.updateIsDel(vehSid);
                         //删除推送的单车返利管理
-                        scmVehRebateFeign.delByVehSid(vehSid,busSalesOrderReturnVehApply.getUseOrgSid(),"029");
+                        scmVehRebateFeign.delByVehSid2(vehSid,busSalesOrderReturnVehApply.getUseOrgSid(),"029");
                     }
                     //------------------------修改车辆持久状态--------------------------
                     BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleService.fetchBySid(busSalesOrderReturnVehDetailsVo.getBusVinSid());

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoService.java

@@ -624,9 +624,16 @@ public class SysStaffinfoService extends MybatisBaseService<SysStaffinfoMapper,
         if (reduce1.size() > 0) {
             //根据staffSid查询token
             String token = sysUserService.selectByStaffsid(sid).getToken();
+            if(StringUtils.isNotBlank(token)){
+                //查询redis中是否包含该token
+                String userName = redisUtil.get(token);
+                if(StringUtils.isNotBlank(userName)){
                     //清空该token
                     redisUtil.remove(token);
                 }
+            }
+
+        }
         return rb.success().setMsg("更新员工信息成功");
     }
 

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserRest.java

@@ -286,7 +286,9 @@ public class SysUserRest implements SysUserFeign {
         if (i == 0) {
             return ResultBean.fireFail().setMsg("修改失败");
         }
+        if(StringUtils.isNotBlank(token)){
             redisUtil.remove(token);
+        }
         return ResultBean.fireSuccess().setMsg("修改成功");
     }
 

anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/dailyreport/DailyReportMapper.java

@@ -12,6 +12,7 @@ import org.apache.ibatis.annotations.Param;
 import org.springframework.web.bind.annotation.RequestParam;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * @description:
@@ -41,8 +42,10 @@ public interface DailyReportMapper extends BaseMapper<DailyReport> {
     String select3(@Param("busOrgSid") String busOrgSid, @Param("brandSid") String brandSid, @Param("vehModelSid") String vehModelSid, @Param("vehMConfigSid") String vehMConfigSid, @Param("createTime") String createTime);
 
     List<BrandVo> selectByBrand(@Param("sybOrgSid") String sybOrgSid, @Param("queryTime") String queryTime);
+    List<BrandVo> selectByBrandNew(@Param("sybOrgSid") String sybOrgSid, @Param("startDate") String startDate,@Param("endDate") String endDate);
 
     List<DailyReportVo> selectReport(@Param("join") List<String> brandList, @Param("sybOrgSid") String sybOrgSid, @Param("queryTime") String queryTime);
+    List<DailyReportVo> selectReportNew(@Param("join") List<String> brandList, @Param("sybOrgSid") String sybOrgSid, @Param("startDate") String startDate,@Param("endDate") String endDate);
 
     IPage<DailyReportListVo> pageList1(IPage<DailyReport> page, @Param(Constants.WRAPPER) QueryWrapper<DailyReport> qw);
     IPage<DailyReportListVo> pageList2(IPage<DailyReport> page, @Param(Constants.WRAPPER) QueryWrapper<DailyReport> qw);
@@ -50,14 +53,28 @@ public interface DailyReportMapper extends BaseMapper<DailyReport> {
     ReportVo getReport(@Param(Constants.WRAPPER) QueryWrapper<DailyReport> qw);
 
     List<DailyReportVo> selectReport2(String date);
+    List<DailyReportVo> selectReport2New(@Param("startDate") String startDate,@Param("endDate") String endDate);
 
     List<BrandVo> list2(String date);
+    List<BrandVo> list2New(@Param("startDate") String startDate,@Param("endDate") String endDate);
 
     List<BrandVo> list3(@Param("date") String date, @Param("busOrgSid") String busOrgSid);
+    List<BrandVo> list3New(@Param("startDate") String startDate,@Param("endDate") String endDate, @Param("busOrgSid") String busOrgSid);
 
     List<DailyReportVo> selectReport3(@Param("date") String date, @Param("busOrgSid") String busOrgSid);
+    List<DailyReportVo> selectReport3New(@Param("startDate") String startDate,@Param("endDate") String endDate, @Param("busOrgSid") String busOrgSid);
 
     List<BrandVo> selectByBrand2(@Param("useOrgSid") String useOrgSid, @Param("date") String date,@Param(Constants.WRAPPER) QueryWrapper<DailyReport> qw);
+    List<BrandVo> selectByBrand2New(@Param("useOrgSid") String useOrgSid,@Param("startDate") String startDate,@Param("endDate") String endDate,@Param(Constants.WRAPPER) QueryWrapper<DailyReport> qw);
 
     List<DailyReportVo> selectReport4(@Param("join") List<String> brandList, @Param("useOrgSid") String useOrgSid, @Param("date") String date,@Param(Constants.WRAPPER) QueryWrapper<DailyReport> qw);
+    List<DailyReportVo> selectReport4New(@Param(Constants.WRAPPER) QueryWrapper<DailyReport> qw);
+
+    List<DailyReportListVo> selectRecordList(@Param("map") Map<String, Object> map, @Param(Constants.WRAPPER)QueryWrapper<DailyReport> qw);
+
+    int selectRecordCount(@Param(Constants.WRAPPER)QueryWrapper<DailyReport> qw);
+
+    List<DailyReportListVo> selectRecordList2(@Param("map") Map<String, Object> map, @Param(Constants.WRAPPER)QueryWrapper<DailyReport> qw);
+
+    List<DailyReportListVo> selectRecordList3(@Param("map") Map<String, Object> map, @Param(Constants.WRAPPER)QueryWrapper<DailyReport> qw);
 }

anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/dailyreport/DailyReportMapper.xml

@@ -301,6 +301,36 @@
         GROUP BY dr.brandSid
         order by dr.brandSid desc
     </select>
+
+    <select id="selectByBrandNew" resultType="com.yxt.anrui.reportcenter.api.dailyreport.BrandVo">
+        SELECT dr.brandSid  linkSid,
+               dr.brandName NAME,
+               b.colspan
+        FROM daily_report dr
+                 left join
+             (
+                 select count(a.brandSid) as colspan,
+                        a.brandSid
+                 from (SELECT ddr.brandSid
+                       FROM daily_report ddr
+                                left join
+                            anrui_base.base_model_config bmv
+                            on ddr.vehMConfigSid = bmv.sid
+                                left join
+                            anrui_base.base_vehicle_model bm
+                            on bm.sid = ddr.vehModelSid
+                       WHERE ddr.createTime between #{startDate} and #{endDate}
+                         and ddr.busOrgSid = #{sybOrgSid}
+                       group by ddr.brandSid,
+                                bm.fuelTypeValue,
+                                bm.emissionStandardValue) a
+                 group by a.brandSid) b
+             on b.brandSid = dr.brandSid
+        WHERE dr.busOrgSid = #{sybOrgSid}
+          AND dr.createTime between #{startDate} and #{endDate}
+        GROUP BY dr.brandSid
+        order by dr.brandSid desc
+    </select>
     <select id="selectReport" resultType="com.yxt.anrui.reportcenter.api.dailyreport.DailyReportVo">
         select <!--ifnull(sum(SUBSTRING_INDEX(dr.saleOfStockRatio, ':', 1) / SUBSTRING_INDEX(dr.saleOfStockRatio, ':', -1)),
                       0)                                      as saleOfStockRatio,-->
@@ -372,10 +402,78 @@
         order by dr.brandSid desc
     </select>
 
+    <select id="selectReportNew" resultType="com.yxt.anrui.reportcenter.api.dailyreport.DailyReportVo">
+        select
+        ifnull(sum(dr.saleOfStockRatio), 0) as saleOfStockRatio,
+        ifnull(sum(dr.stock_total), 0) as stock_total,
+        ifnull(sum(dr.stock_unreserve), 0) as stock_unreserve,
+        ifnull(sum(dr.stock_reserve), 0) as stock_reserve,
+        ifnull(sum(dr.stock_subtotal), 0) as stock_subtotal,
+        ifnull(sum(dr.stock_buyout_unreserve), 0) as stock_buyout_unreserve,
+        ifnull(sum(dr.stock_buyout_reserve), 0) as stock_buyout_reserve,
+        ifnull(sum(dr.stock_buyout_subtotal), 0) as stock_buyout_subtotal,
+        ifnull(sum(dr.pcOrder_unreserve), 0) as pcOrder_unreserve,
+        ifnull(sum(dr.pcOrder_reserve), 0) as pcOrder_reserve,
+        ifnull(sum(dr.pcOrder_subtotal), 0) as pcOrder_subtotal,
+        ifnull(sum(dr.simpleOrder_day), 0) as simpleOrder_day,
+        ifnull(sum(dr.simpleOrder_month), 0) as simpleOrder_month,
+        ifnull(sum(dr.saleOrder_full_day), 0) as saleOrder_full_day,
+        ifnull(sum(dr.saleOrder_loan_day), 0) as saleOrder_loan_day,
+        ifnull(sum(dr.saleOrder_subtotal_day), 0) as saleOrder_subtotal_day,
+        ifnull(sum(dr.saleOrder_full_month), 0) as saleOrder_full_month,
+        ifnull(sum(dr.saleOrder_loan_month), 0) as saleOrder_loan_month,
+        ifnull(sum(dr.saleOrder_subtotal_month), 0) as saleOrder_subtotal_month,
+        ifnull(sum(dr.saleOrder_waitVeh_total), 0) as saleOrder_waitVeh_total,
+        ifnull(sum(dr.sale_full_day), 0) as sale_full_day,
+        ifnull(sum(dr.sale_loan_day), 0) as sale_loan_day,
+        ifnull(sum(dr.sale_subtotal_day), 0) as sale_subtotal_day,
+        ifnull(sum(dr.sale_full_month), 0) as sale_full_month,
+        ifnull(sum(dr.sale_loan_month), 0) as sale_loan_month,
+        ifnull(sum(dr.sale_subtotal_month), 0) as sale_subtotal_month,
+        ifnull(sum(dr.sale_full_year), 0) as sale_full_year,
+        ifnull(sum(dr.sale_loan_year), 0) as sale_loan_year,
+        ifnull(sum(dr.sale_subtotal_year), 0) as sale_subtotal_year,
+        ifnull(sum(dr.manufacturer_invoicing_year), 0) as manufacturer_invoicing_year,
+        ifnull(sum(dr.buyout_day), 0) as buyout_day,
+        ifnull(sum(dr.buyout_month), 0) as buyout_month,
+        ifnull(sum(dr.buyout_year), 0) as buyout_year,
+        ifnull(sum(dr.arrears_carry_veh_count), 0) as arrears_carry_veh_count,
+        ifnull(sum(dr.arrears_carry_veh_amount), 0) as arrears_carry_veh_amount,
+        ifnull(sum(dr.loan_not_count), 0) as loan_not_count,
+        ifnull(sum(dr.loan_not_amount), 0) as loan_not_amount,
+        dr.remarks,
+        ifnull(sum(dr.deliver_loan_day), 0) as deliver_loan_day,
+        ifnull(sum(dr.deliver_full_day), 0) as deliver_full_day,
+        ifnull(sum(dr.deliver_subtotal_day), 0) as deliver_subtotal_day,
+        ifnull(sum(dr.deliver_loan_month), 0) as deliver_loan_month,
+        ifnull(sum(dr.deliver_full_month), 0) as deliver_full_month,
+        ifnull(sum(dr.deliver_subtotal_month), 0) as deliver_subtotal_month,
+        ifnull(sum(dr.deliver_loan_year), 0) as deliver_loan_year,
+        ifnull(sum(dr.deliver_full_year), 0) as deliver_full_year,
+        ifnull(sum(dr.deliver_subtotal_year), 0) as deliver_subtotal_year,
+        ifnull(sum(dr.saleAllToThree), 0) as saleAllToThree
+        ,
+        bm.fuelTypeValue,
+        bm.emissionStandardValue,
+        ifnull(sum(dr.loan_not_counts), 0) as loan_not_counts,
+        ifnull(sum(dr.loan_not_amounts), 0) as loan_not_amounts,
+        dr.brandSid
+        from daily_report dr
+        left join anrui_base.base_vehicle_model bm on bm.sid = dr.vehModelSid
+        left join anrui_base.base_model_config bmc on bmc.sid = dr.vehMConfigSid
+        where dr.busOrgSid = #{sybOrgSid}
+        AND dr.createTime between #{startDate} and #{endDate}
+        and dr.brandSid in
+        <foreach collection="join" item="item" index="index" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+        group by dr.brandSid, bm.fuelTypeValue, bm.emissionStandardValue
+        order by dr.brandSid desc
+    </select>
+
+
     <select id="pageList1" resultType="com.yxt.anrui.reportcenter.api.dailyreport.DailyReportListVo">
-        select DATE_FORMAT(createTime, '%Y-%m-%d') as date,
-        <!--sum(SUBSTRING_INDEX(saleOfStockRatio, ':', 1) /
-            SUBSTRING_INDEX(saleOfStockRatio, ':', -1)) as saleOfStockRatio,-->
+        select DATE(createTime) as date,
         sum(saleOfStockRatio) as saleOfStockRatio,
         sum(stock_subtotal) as stock_subtotal,
         sum(pcOrder_subtotal) as pcOrder_subtotal,
@@ -392,8 +490,8 @@
         <where>
             ${ew.sqlSegment}
         </where>
-        group by DATE_FORMAT(createTime, '%Y-%m-%d')
-        order by DATE_FORMAT(createTime, '%Y-%m-%d') desc
+        group by DATE(createTime)
+        order by DATE(createTime) desc
     </select>
 
     <select id="pageList2" resultType="com.yxt.anrui.reportcenter.api.dailyreport.DailyReportListVo">
@@ -421,8 +519,6 @@
 
     <select id="getReport" resultType="com.yxt.anrui.reportcenter.api.dailyreport.ReportVo">
         select DATE_FORMAT(createTime, '%Y-%m-%d') as date,
-        <!--ifnull(sum(SUBSTRING_INDEX(saleOfStockRatio, ':', 1) / SUBSTRING_INDEX(saleOfStockRatio, ':', -1)),
-               0)                                   as saleOfStockRatio,-->
         ifnull(sum(saleOfStockRatio), 0) as saleOfStockRatio,
         ifnull(sum(stock_total), 0) as stock_total,
         ifnull(sum(stock_subtotal), 0) as stock_subtotal,
@@ -544,6 +640,65 @@
         order by busOrgSid desc
     </select>
 
+    <select id="selectReport2New" resultType="com.yxt.anrui.reportcenter.api.dailyreport.DailyReportVo">
+        select
+        ifnull(sum(saleOfStockRatio), 0) as saleOfStockRatio,
+        ifnull(sum(stock_subtotal), 0) as stock_subtotal,
+        ifnull(sum(stock_total), 0) as stock_total,
+        ifnull(sum(stock_unreserve), 0) as stock_unreserve,
+        ifnull(sum(stock_reserve), 0) as stock_reserve,
+        ifnull(sum(stock_buyout_unreserve), 0) as stock_buyout_unreserve,
+        ifnull(sum(stock_buyout_reserve), 0) as stock_buyout_reserve,
+        ifnull(sum(stock_buyout_subtotal), 0) as stock_buyout_subtotal,
+        ifnull(sum(pcOrder_unreserve), 0) as pcOrder_unreserve,
+        ifnull(sum(pcOrder_reserve), 0) as pcOrder_reserve,
+        ifnull(sum(pcOrder_subtotal), 0) as pcOrder_subtotal,
+
+        ifnull(sum(simpleOrder_day), 0) as simpleOrder_day,
+        ifnull(sum(simpleOrder_month), 0) as simpleOrder_month,
+        ifnull(sum(saleOrder_full_day), 0) as saleOrder_full_day,
+        ifnull(sum(saleOrder_loan_day), 0) as saleOrder_loan_day,
+        ifnull(sum(saleOrder_subtotal_day), 0) as saleOrder_subtotal_day,
+        ifnull(sum(saleOrder_full_month), 0) as saleOrder_full_month,
+        ifnull(sum(saleOrder_loan_month), 0) as saleOrder_loan_month,
+        ifnull(sum(saleOrder_subtotal_month), 0) as saleOrder_subtotal_month,
+        ifnull(sum(saleOrder_waitVeh_total), 0) as saleOrder_waitVeh_total,
+
+        ifnull(sum(sale_full_day), 0) as sale_full_day,
+        ifnull(sum(sale_loan_day), 0) as sale_loan_day,
+        ifnull(sum(sale_subtotal_day), 0) as sale_subtotal_day,
+        ifnull(sum(sale_full_month), 0) as sale_full_month,
+        ifnull(sum(sale_loan_month), 0) as sale_loan_month,
+        ifnull(sum(sale_subtotal_month), 0) as sale_subtotal_month,
+        ifnull(sum(sale_full_year), 0) as sale_full_year,
+        ifnull(sum(sale_loan_year), 0) as sale_loan_year,
+        ifnull(sum(sale_subtotal_year), 0) as sale_subtotal_year,
+        ifnull(sum(deliver_loan_day), 0) as deliver_loan_day,
+        ifnull(sum(deliver_full_day), 0) as deliver_full_day,
+        ifnull(sum(deliver_subtotal_day), 0) as deliver_subtotal_day,
+        ifnull(sum(deliver_loan_month), 0) as deliver_loan_month,
+        ifnull(sum(deliver_full_month), 0) as deliver_full_month,
+        ifnull(sum(deliver_subtotal_month), 0) as deliver_subtotal_month,
+        ifnull(sum(deliver_loan_year), 0) as deliver_loan_year,
+        ifnull(sum(deliver_full_year), 0) as deliver_full_year,
+        ifnull(sum(deliver_subtotal_year), 0) as deliver_subtotal_year,
+        ifnull(sum(manufacturer_invoicing_year), 0) as manufacturer_invoicing_year,
+        ifnull(sum(buyout_day), 0) as buyout_day,
+        ifnull(sum(buyout_month), 0) as buyout_month,
+        ifnull(sum(buyout_year), 0) as buyout_year,
+        ifnull(sum(arrears_carry_veh_count), 0) as arrears_carry_veh_count,
+        ifnull(sum(arrears_carry_veh_amount), 0) as arrears_carry_veh_amount,
+        ifnull(sum(loan_not_count), 0) as loan_not_count,
+        ifnull(sum(loan_not_amount), 0) as loan_not_amount,
+        ifnull(sum(saleAllToThree), 0) as saleAllToThree,
+        ifnull(sum(loan_not_counts), 0) as loan_not_counts,
+        ifnull(sum(loan_not_amounts), 0) as loan_not_amounts
+        from daily_report
+        where createTime between #{startDate} and #{endDate}
+        group by busOrgSid
+        order by busOrgSid desc
+    </select>
+
     <select id="list2" resultType="com.yxt.anrui.reportcenter.api.dailyreport.BrandVo">
         select dr.busOrgSid linkSid, dr.busOrgName name, '1' as colspan
         from daily_report dr
@@ -552,6 +707,14 @@
         order by dr.busOrgSid desc
     </select>
 
+    <select id="list2New" resultType="com.yxt.anrui.reportcenter.api.dailyreport.BrandVo">
+        select dr.busOrgSid linkSid, dr.busOrgName name, '1' as colspan
+        from daily_report dr
+        where createTime between #{startDate} and #{endDate}
+        group by dr.busOrgSid
+        order by dr.busOrgSid desc
+    </select>
+
     <select id="list3" resultType="com.yxt.anrui.reportcenter.api.dailyreport.BrandVo">
         select dr.useOrgSid linkSid, dr.useOrgName name, '1' as colspan
         from daily_report dr
@@ -561,6 +724,15 @@
         order by dr.useOrgSid desc
     </select>
 
+    <select id="list3New" resultType="com.yxt.anrui.reportcenter.api.dailyreport.BrandVo">
+        select dr.useOrgSid linkSid, dr.useOrgName name, '1' as colspan
+        from daily_report dr
+        where createTime between #{startDate} and #{endDate}
+          and busOrgSid = #{busOrgSid}
+        group by dr.useOrgSid
+        order by dr.useOrgSid desc
+    </select>
+
     <select id="selectReport3" resultType="com.yxt.anrui.reportcenter.api.dailyreport.DailyReportVo">
         select <!--ifnull(sum(SUBSTRING_INDEX(saleOfStockRatio, ':', 1) / SUBSTRING_INDEX(saleOfStockRatio, ':', -1)),
                       0)                                   as saleOfStockRatio,-->
@@ -622,6 +794,67 @@
         order by useOrgSid desc
     </select>
 
+    <select id="selectReport3New" resultType="com.yxt.anrui.reportcenter.api.dailyreport.DailyReportVo">
+        select
+        ifnull(sum(saleOfStockRatio), 0) as saleOfStockRatio,
+        ifnull(sum(stock_subtotal), 0) as stock_subtotal,
+        ifnull(sum(stock_unreserve), 0) as stock_unreserve,
+        ifnull(sum(stock_total), 0) as stock_total,
+        ifnull(sum(stock_reserve), 0) as stock_reserve,
+        ifnull(sum(stock_buyout_unreserve), 0) as stock_buyout_unreserve,
+        ifnull(sum(stock_buyout_reserve), 0) as stock_buyout_reserve,
+        ifnull(sum(stock_buyout_subtotal), 0) as stock_buyout_subtotal,
+        ifnull(sum(pcOrder_unreserve), 0) as pcOrder_unreserve,
+        ifnull(sum(pcOrder_reserve), 0) as pcOrder_reserve,
+        ifnull(sum(pcOrder_subtotal), 0) as pcOrder_subtotal,
+
+        ifnull(sum(simpleOrder_day), 0) as simpleOrder_day,
+        ifnull(sum(simpleOrder_month), 0) as simpleOrder_month,
+        ifnull(sum(saleOrder_full_day), 0) as saleOrder_full_day,
+        ifnull(sum(saleOrder_loan_day), 0) as saleOrder_loan_day,
+        ifnull(sum(saleOrder_subtotal_day), 0) as saleOrder_subtotal_day,
+        ifnull(sum(saleOrder_full_month), 0) as saleOrder_full_month,
+        ifnull(sum(saleOrder_loan_month), 0) as saleOrder_loan_month,
+        ifnull(sum(saleOrder_subtotal_month), 0) as saleOrder_subtotal_month,
+        ifnull(sum(saleOrder_waitVeh_total), 0) as saleOrder_waitVeh_total,
+
+        ifnull(sum(sale_full_day), 0) as sale_full_day,
+        ifnull(sum(sale_loan_day), 0) as sale_loan_day,
+        ifnull(sum(sale_subtotal_day), 0) as sale_subtotal_day,
+        ifnull(sum(sale_full_month), 0) as sale_full_month,
+        ifnull(sum(sale_loan_month), 0) as sale_loan_month,
+        ifnull(sum(sale_subtotal_month), 0) as sale_subtotal_month,
+        ifnull(sum(sale_full_year), 0) as sale_full_year,
+        ifnull(sum(sale_loan_year), 0) as sale_loan_year,
+        ifnull(sum(sale_subtotal_year), 0) as sale_subtotal_year,
+        ifnull(sum(deliver_loan_day), 0) as deliver_loan_day,
+        ifnull(sum(deliver_full_day), 0) as deliver_full_day,
+        ifnull(sum(deliver_subtotal_day), 0) as deliver_subtotal_day,
+        ifnull(sum(deliver_loan_month), 0) as deliver_loan_month,
+        ifnull(sum(deliver_full_month), 0) as deliver_full_month,
+        ifnull(sum(deliver_subtotal_month), 0) as deliver_subtotal_month,
+        ifnull(sum(deliver_loan_year), 0) as deliver_loan_year,
+        ifnull(sum(deliver_full_year), 0) as deliver_full_year,
+        ifnull(sum(deliver_subtotal_year), 0) as deliver_subtotal_year,
+        ifnull(sum(manufacturer_invoicing_year), 0) as manufacturer_invoicing_year,
+        ifnull(sum(buyout_day), 0) as buyout_day,
+        ifnull(sum(buyout_month), 0) as buyout_month,
+        ifnull(sum(buyout_year), 0) as buyout_year,
+        ifnull(sum(arrears_carry_veh_count), 0) as arrears_carry_veh_count,
+        ifnull(sum(arrears_carry_veh_amount), 0) as arrears_carry_veh_amount,
+        ifnull(sum(loan_not_count), 0) as loan_not_count,
+        ifnull(sum(loan_not_amount), 0) as loan_not_amount,
+        ifnull(sum(saleAllToThree), 0) as saleAllToThree,
+        ifnull(sum(loan_not_counts), 0) as loan_not_counts,
+        ifnull(sum(loan_not_amounts), 0) as loan_not_amounts
+        from daily_report
+        where createTime between #{startDate} and #{endDate}
+        and busOrgSid = #{busOrgSid}
+        group by useOrgSid
+        order by useOrgSid desc
+    </select>
+
+
     <select id="selectByBrand2" resultType="com.yxt.anrui.reportcenter.api.dailyreport.BrandVo">
         SELECT dr.brandSid linkSid,
         dr.brandName NAME,
@@ -650,6 +883,34 @@
         order by dr.brandSid desc
     </select>
 
+    <select id="selectByBrand2New" resultType="com.yxt.anrui.reportcenter.api.dailyreport.BrandVo">
+        SELECT dr.brandSid linkSid,
+        dr.brandName NAME,
+        b.colspan
+        FROM daily_report dr
+        left join
+        (
+        select count(a.brandSid) as colspan,
+        a.brandSid
+        from (SELECT ddr.brandSid
+        FROM daily_report ddr
+        left join
+        anrui_base.base_model_config bmc
+        on ddr.vehMConfigSid = bmc.sid
+        left join
+        anrui_base.base_vehicle_model bm
+        on bm.sid = ddr.vehModelSid
+        <where>
+            ${ew.sqlSegment}
+        </where>) a
+        group by a.brandSid) b
+        on b.brandSid = dr.brandSid
+        WHERE dr.useOrgSid = #{useOrgSid}
+        AND dr.createTime between #{startDate} and #{endDate}
+        GROUP BY dr.brandSid
+        order by dr.brandSid desc
+    </select>
+
     <select id="selectReport4" resultType="com.yxt.anrui.reportcenter.api.dailyreport.DailyReportVo">
         select <!--ifnull(dr.saleOfStockRatio, 0)            as saleOfStockRatio,
                ifnull(dr.stock_total, 0)                 as stock_total,
@@ -813,4 +1074,175 @@
             ${ew.sqlSegment}
         </where>
     </select>
+
+    <select id="selectReport4New" resultType="com.yxt.anrui.reportcenter.api.dailyreport.DailyReportVo">
+        select
+        ifnull(sum(dr.saleOfStockRatio), 0) as saleOfStockRatio,
+        ifnull(sum(dr.stock_total), 0) as stock_total,
+        ifnull(sum(dr.stock_unreserve), 0) as stock_unreserve,
+        ifnull(sum(dr.stock_reserve), 0) as stock_reserve,
+        ifnull(sum(dr.stock_subtotal), 0) as stock_subtotal,
+        ifnull(sum(dr.stock_buyout_unreserve), 0) as stock_buyout_unreserve,
+        ifnull(sum(dr.stock_buyout_reserve), 0) as stock_buyout_reserve,
+        ifnull(sum(dr.stock_buyout_subtotal), 0) as stock_buyout_subtotal,
+        ifnull(sum(dr.pcOrder_unreserve), 0) as pcOrder_unreserve,
+        ifnull(sum(dr.pcOrder_reserve), 0) as pcOrder_reserve,
+        ifnull(sum(dr.pcOrder_subtotal), 0) as pcOrder_subtotal,
+        ifnull(sum(dr.simpleOrder_day), 0) as simpleOrder_day,
+        ifnull(sum(dr.simpleOrder_month), 0) as simpleOrder_month,
+        ifnull(sum(dr.saleOrder_full_day), 0) as saleOrder_full_day,
+        ifnull(sum(dr.saleOrder_loan_day), 0) as saleOrder_loan_day,
+        ifnull(sum(dr.saleOrder_subtotal_day), 0) as saleOrder_subtotal_day,
+        ifnull(sum(dr.saleOrder_full_month), 0) as saleOrder_full_month,
+        ifnull(sum(dr.saleOrder_loan_month), 0) as saleOrder_loan_month,
+        ifnull(sum(dr.saleOrder_subtotal_month), 0) as saleOrder_subtotal_month,
+        ifnull(sum(dr.saleOrder_waitVeh_total), 0) as saleOrder_waitVeh_total,
+        ifnull(sum(dr.sale_full_day), 0) as sale_full_day,
+        ifnull(sum(dr.sale_loan_day), 0) as sale_loan_day,
+        ifnull(sum(dr.sale_subtotal_day), 0) as sale_subtotal_day,
+        ifnull(sum(dr.sale_full_month), 0) as sale_full_month,
+        ifnull(sum(dr.sale_loan_month), 0) as sale_loan_month,
+        ifnull(sum(dr.sale_subtotal_month), 0) as sale_subtotal_month,
+        ifnull(sum(dr.sale_full_year), 0) as sale_full_year,
+        ifnull(sum(dr.sale_loan_year), 0) as sale_loan_year,
+        ifnull(sum(dr.sale_subtotal_year), 0) as sale_subtotal_year,
+        ifnull(sum(dr.manufacturer_invoicing_year), 0) as manufacturer_invoicing_year,
+        ifnull(sum(dr.buyout_day), 0) as buyout_day,
+        ifnull(sum(dr.buyout_month), 0) as buyout_month,
+        ifnull(sum(dr.buyout_year), 0) as buyout_year,
+        ifnull(sum(dr.arrears_carry_veh_count), 0) as arrears_carry_veh_count,
+        ifnull(sum(dr.arrears_carry_veh_amount), 0) as arrears_carry_veh_amount,
+        ifnull(sum(dr.loan_not_count), 0) as loan_not_count,
+        ifnull(sum(dr.loan_not_amount), 0) as loan_not_amount,
+        dr.remarks,
+        ifnull(sum(dr.deliver_loan_day), 0) as deliver_loan_day,
+        ifnull(sum(dr.deliver_full_day), 0) as deliver_full_day,
+        ifnull(sum(dr.deliver_subtotal_day), 0) as deliver_subtotal_day,
+        ifnull(sum(dr.deliver_loan_month), 0) as deliver_loan_month,
+        ifnull(sum(dr.deliver_full_month), 0) as deliver_full_month,
+        ifnull(sum(dr.deliver_subtotal_month), 0) as deliver_subtotal_month,
+        ifnull(sum(dr.deliver_loan_year), 0) as deliver_loan_year,
+        ifnull(sum(dr.deliver_full_year), 0) as deliver_full_year,
+        ifnull(sum(dr.deliver_subtotal_year), 0) as deliver_subtotal_year,
+        ifnull(sum(dr.saleAllToThree), 0) as saleAllToThree
+        ,
+        ifnull(sum(dr.loan_not_counts), 0) as loan_not_counts,
+        ifnull(sum(dr.loan_not_amounts), 0) as loan_not_amounts,
+        bm.fuelTypeValue,
+        bm.emissionStandardValue,
+        bmc.carColor,
+        bmc.specification,
+        bmc.fuelTank,
+        bmc.baffleModel,
+        bmc.independentSources,
+        bmc.tireCover,
+        bmc.saddle,
+        bmc.airConditioner,
+        bmc.rearAxleRatio,
+        bmc.rearAxleValue,
+        bmc.tireSize,
+        bmc.slowMachine,
+        bmc.rearViewMirror,
+        bmc.wheelbase,
+        bmc.suspension,
+        bmc.packingCase,
+        bmc.seat,
+        bmc.hubMaterial,
+        bmc.configuringBao,
+        bmc.multimedia,
+        bmc.bumper,
+        bmc.clutchValue,
+        bmc.dirMachineValue,
+        bmc.proponsValue,
+        bmc.doorAndWindowValue,
+        bmc.doorLockValue,
+        bmc.headlightValue,
+        bmc.boardPedalValue,
+        bmc.steerWheelValue,
+        bmc.storagBatteryValue,
+        bmc.comfortPackValue,
+        bmc.cheBasePackValue,
+        bmc.savingPackValue,
+        bmc.conPackValue,
+        bm.vehicleTypeValue,
+        bm.emissionStandardValue,
+        bm.productLineValue,
+        bm.driveFormValue,
+        bm.powerValue,
+        bm.tranCaseTypeValue,
+        bm.gearboxTypeValue,
+        bm.fuelTypeValue,
+        bm.vehicleVersionValue,
+        bm.engineTypeValue,
+        bm.specifications,
+        dr.brandSid
+        from daily_report dr
+        left join anrui_base.base_vehicle_model bm on bm.sid = dr.vehModelSid
+        left join anrui_base.base_model_config bmc on bmc.sid = dr.vehMConfigSid
+        <where>
+            ${ew.sqlSegment}
+        </where>
+    </select>
+
+
+    <select id="selectRecordList" resultType="com.yxt.anrui.reportcenter.api.dailyreport.DailyReportListVo" parameterType="java.util.Map">
+        select DATE(createTime) as date,
+        sum(saleOfStockRatio) as saleOfStockRatio,
+        sum(stock_subtotal) as stock_subtotal,
+        sum(pcOrder_subtotal) as pcOrder_subtotal,
+        sum(saleOrder_subtotal_day) as saleOrder_subtotal_day,
+        sum(sale_subtotal_day) as sale_subtotal_day,
+        sum(arrears_carry_veh_amount) as arrears_carry_veh_amount,
+        sum(loan_not_amount) as loan_not_amount,
+        ifnull(sum(loan_not_amounts), 0) as loan_not_amounts,
+        sum(buyout_day) as buyout_day,
+        sum(saleAllToThree) as saleAllToThree,
+        SUM(stock_total) as stock_total,
+        useOrgSid
+        from daily_report
+        <where>
+            ${ew.sqlSegment}
+        </where>
+        group by createTime
+        order by createTime desc
+        LIMIT #{map.page},#{map.size}
+    </select>
+
+    <select id="selectRecordCount" resultType="int">
+        SELECT COUNT(DISTINCT DATE(createTime))
+        FROM daily_report
+        <where>
+            ${ew.sqlSegment}
+        </where>
+    </select>
+
+    <select id="selectRecordList2" resultType="com.yxt.anrui.reportcenter.api.dailyreport.DailyReportListVo" parameterType="java.util.Map">
+        select DATE(createTime) as date,
+        sum(saleOfStockRatio) as saleOfStockRatio,
+        sum(stock_subtotal) as stock_subtotal,
+        sum(pcOrder_subtotal) as pcOrder_subtotal,
+        sum(saleOrder_subtotal_day) as saleOrder_subtotal_day,
+        sum(sale_subtotal_day) as sale_subtotal_day,
+       <!-- sum(arrears_carry_veh_amount) as arrears_carry_veh_amount,-->
+        sum(COALESCE(arrears_carry_veh_amount,0)) as arrears_carry_veh_amount,
+        sum(loan_not_amount) as loan_not_amount,
+        <!--ifnull(sum(loan_not_amounts), 0) as loan_not_amounts,-->
+        sum(COALESCE(loan_not_amounts,0)) as loan_not_amounts,
+        sum(buyout_day) as buyout_day,
+        sum(saleAllToThree) as saleAllToThree,
+        SUM(stock_total) as stock_total,
+        useOrgSid,
+        busOrgSid
+        from daily_report
+        <where>
+            ${ew.sqlSegment}
+        </where>
+        group by createTime
+        order by createTime desc
+        LIMIT #{map.page},#{map.size}
+    </select>
+
+    <select id="selectRecordList3" resultType="com.yxt.anrui.reportcenter.api.dailyreport.DailyReportListVo">
+
+    </select>
 </mapper>

anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/dailyreport/DailyReportRest.java

@@ -74,7 +74,7 @@ public class DailyReportRest implements DailyReportFeign {
 
     @Override
     public ResultBean<DailyReportAppVo> list1Old(String date, String busOrgSid) {
-        return dailyReportService.list1(date, busOrgSid);
+        return dailyReportService.list1Old(date, busOrgSid);
     }
 
     @Override
@@ -106,7 +106,7 @@ public class DailyReportRest implements DailyReportFeign {
 
     @Override
     public ResultBean<DailyReportAppVo> list4Old(String date, String useOrgSid) {
-        return dailyReportService.list4(date, useOrgSid);
+        return dailyReportService.list4Old(date, useOrgSid);
     }
 
     @Override

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmSpecialRebateQuery.java

@@ -85,6 +85,22 @@ public class ScmSpecialRebateQuery implements Query {
     @ApiModelProperty("页面分配数量（0查询分配数量大于0的 1查询所有）")
     private String isPage;
 
+    @ApiModelProperty("所属年月")
+    private String palceGenDate;
+    @ApiModelProperty("预提日期")
+    private String withholdingDate;
+    @ApiModelProperty("上传日期")
+    private String uploadStartDate;
+    private String uploadEndDate;
+    @ApiModelProperty("上传状态")
+    private String uploadState;
+    @ApiModelProperty("是否调整")
+    private String isAdjustment;
+    @ApiModelProperty("是否上传完成")
+    private String isUploadFinish;
+    @ApiModelProperty("二次上传状态")
+    private String secondUploadState;
+
     private String userSid;
     private String orgPath;
     private String menuUrl;

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateQuery.java

@@ -80,6 +80,24 @@ public class ScmVehRebateQuery implements Query {
     @ApiModelProperty("采购系统")
     private String purchaseSystemName;
 
+    @ApiModelProperty("所属年月")
+    private String palceGenDate;
+    @ApiModelProperty("预提日期")
+    private String withholdingDate;
+    @ApiModelProperty("上传日期")
+    private String uploadStartDate;
+    private String uploadEndDate;
+    @ApiModelProperty("上传状态")
+    private String uploadState;
+    @ApiModelProperty("是否调整")
+    private String isAdjustment;
+    @ApiModelProperty("是否上传完成")
+    private String isUploadFinish;
+    @ApiModelProperty("一次核对状态")
+    private String onceCheckState;
+    @ApiModelProperty("二次上传状态")
+    private String secondUploadState;
+
     private String userSid;
     private String orgPath;
     private String menuUrl;

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateService.java

@@ -149,11 +149,53 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
         if (StringUtils.isNotBlank(query.getPurchaseSystemName())) {
             qw.like("purchaseSystemName", query.getPurchaseSystemName());
         }
+        if (StringUtils.isNotBlank(query.getPalceGenDate())) {
+            qw.like("palceGenDate", query.getPalceGenDate());
+        }
+        if (StringUtils.isNotBlank(query.getWithholdingDate())) {
+            qw.like("withholdingDate", query.getWithholdingDate());
+        }
+        if (StringUtils.isNotBlank(query.getUploadState())) {
+            if (query.getUploadState().equals("未上传")) {
+                qw.and(wrapper -> wrapper.eq("uploadDate", "")
+                        .or().isNull("uploadDate")
+                );
+            } else {
+                qw.ne("uploadDate", "");
+                qw.isNotNull("uploadDate");
+            }
+        }
+        if (StringUtils.isNotBlank(query.getIsAdjustment())) {
+            qw.like("isAdjustment", query.getIsAdjustment());
+        }
+        if (StringUtils.isNotBlank(query.getIsUploadFinish())) {
+            if (query.getIsUploadFinish().equals("是")) {
+                qw.eq("estimateRebate - uploadMoney - secondaryUploadMoney + adjustmentMoney", 0);
+            } else {
+                qw.ne("estimateRebate - uploadMoney - secondaryUploadMoney + adjustmentMoney", 0);
+            }
+        }
+        if (StringUtils.isNotBlank(query.getOnceCheckState())) {
+            qw.eq("onceCheckState", query.getOnceCheckState());
+        }
+        if (StringUtils.isNotBlank(query.getSecondUploadState())) {
+            if (query.getSecondUploadState().equals("是")){
+                //qw.eq()
+            }
+        }
         String createStartTime = query.getCreateStartTime();
         String createEndTime = query.getCreateEndTime();
         qw.apply(StringUtils.isNotBlank(createStartTime), "date_format (createTime,'%Y-%m-%d') >= date_format('" + createStartTime + "','%Y-%m-%d')").
                 apply(StringUtils.isNotBlank(createEndTime), "date_format (createTime,'%Y-%m-%d') <= date_format('" + createEndTime + "','%Y-%m-%d')"
                 );
+        String uploadStartDate = query.getUploadStartDate();
+        String uploadEndDate = query.getUploadEndDate();
+        qw.apply(StringUtils.isNotBlank(uploadStartDate), "date_format (uploadDate,'%Y-%m-%d') >= date_format('" + uploadStartDate + "','%Y-%m-%d')").
+                apply(StringUtils.isNotBlank(uploadEndDate), "date_format (uploadDate,'%Y-%m-%d') <= date_format('" + uploadEndDate + "','%Y-%m-%d')").
+                or().
+                apply(StringUtils.isNotBlank(uploadStartDate), "date_format (secondaryUploadDate,'%Y-%m-%d') >= date_format('" + uploadStartDate + "','%Y-%m-%d')").
+                apply(StringUtils.isNotBlank(uploadEndDate), "date_format (secondaryUploadDate,'%Y-%m-%d') <= date_format('" + uploadEndDate + "','%Y-%m-%d')"
+                );
         qw.orderByDesc("createTime");
         IPage<ScmVehRebate> page = PagerUtil.queryToPage(pq);
         IPage<ScmVehRebateVo> pagging = baseMapper.selectPageVo(page, qw);

yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouserack/WmsWarehouseRackService.java

@@ -42,6 +42,7 @@ public class WmsWarehouseRackService extends MybatisBaseService<WmsWarehouseRack
     private WmsWarehouseAreaService wmsWarehouseAreaService;
     @Autowired
     private WmsWarehouseZoneService wmsWarehouseZoneService;
+
     public ResultBean<PagerVo<WmsWarehouseRackVo>> listPage(PagerQuery<WmsWarehouseRackQuery> pq) {
         ResultBean rb = ResultBean.fireFail();
         WmsWarehouseRackQuery query = pq.getParams();

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsgoodstag/WmsGoodsTagMapper.xml

@@ -45,6 +45,8 @@
         FROM
         (
         SELECT
+        CONCAT(z.zoneName, '-', ar.areaName,' ',r.rackCode) houseInfo,
+        i.warehouseName store,
         CONCAT( i.warehouseName, '-', ar.areaName ) AS houseName,
         r.sid AS houseSid,
         r.printCount AS printNum,
@@ -54,6 +56,7 @@
         wms_warehouse_rack AS r
         LEFT JOIN wms_warehouse_info AS i ON r.warehouseSid = i.sid
         LEFT JOIN wms_warehouse_area as ar ON r.locationSid = ar.sid
+        LEFT JOIN wms_warehouse_zone AS z ON r.zoneSid = z.sid
         ) AS a
         <where>
             ${ew.sqlSegment}

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsgoodstag/WmsGoodsTagService.java

@@ -203,8 +203,8 @@ public class WmsGoodsTagService extends MybatisBaseService<WmsGoodsTagMapper, Wm
             qw.eq("a.useOrgSid", useOrgSid);
         }
         if (StringUtils.isNotBlank(query.getName())) {
-            qw.and(wrapper -> wrapper.like("a.houseName", query.getName())
-                    .or().like("a.houseNum", query.getName())
+            qw.and(wrapper -> wrapper.like("a.store", query.getName())
+                    .or().like("a.houseInfo", query.getName())
             );
         }
         //ToDo:添加查询条件

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsgoodstag/app/HouseRackVo.java

@@ -26,4 +26,13 @@ public class HouseRackVo implements Vo {
      * 打印次数
      */
     private String printNum;
+
+    /**
+     * 仓库
+     */
+    private String store;
+    /**
+     * 格式例：区域-库区 库位编码
+     */
+    private String houseInfo;
 }

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryMapper.xml

@@ -351,6 +351,7 @@
     <select id="selGoodsListForScanRackTag"
             resultType="com.yxt.wms.biz.inventory.wmsinventory.appH5.HouseRackListVo">
         SELECT wi.goodsID,
+               wi.manufacturerName,
                b.supplierName  provider,
                wi.goodsSpuName goodsName,
                wi.goodsSkuCode numId,
@@ -364,6 +365,7 @@
     </select>
     <select id="selGoodsH5Vo" resultType="com.yxt.wms.biz.inventory.wmsinventory.appH5.GoodsTagH5Vo">
         SELECT wi.goodsID,
+               wi.manufacturerName,
                b.supplierName  provider,
                wi.goodsSpuName goodsName,
                wi.goodsSkuCode numId,
@@ -381,11 +383,13 @@
             resultType="com.yxt.wms.biz.inventory.wmsinventory.appH5.GoodsListTagH5Vo">
         SELECT wi.count                                 num,
                r.rackCode                               houseAddress,
-               CONCAT(i.warehouseName, '-', a.areaName) houseName
+               CONCAT(z.zoneName, '-', a.areaName,' ',r.rackCode) houseInfo,
+               i.warehouseName store
         FROM wms_inventory AS wi
                  LEFT JOIN wms_warehouse_info AS i ON wi.warehouseSid = i.sid
                  LEFT JOIN wms_warehouse_rack AS r ON wi.warehouseRackSid = r.sid
                  LEFT JOIN wms_warehouse_area AS a ON r.locationSid = a.sid
+                 LEFT JOIN wms_warehouse_zone AS z ON r.zoneSid = z.sid
         WHERE wi.goodsID = #{goodsID}
     </select>
 

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryService.java

@@ -698,7 +698,7 @@ public class WmsInventoryService extends MybatisBaseService<WmsInventoryMapper,
         WmsHouseInfoVo infoVo = wmsWarehouseRackService.selHouseInfoByFullCode(houseRackSid).getData();
         String houseName = "";
         String areaName = "";
-        String rackName = "";
+        String rackCode = "";
         String zoneName = "";
         if (null != infoVo) {
             if (StringUtils.isNotBlank(infoVo.getWarehouseName())) {
@@ -707,16 +707,14 @@ public class WmsInventoryService extends MybatisBaseService<WmsInventoryMapper,
             if (StringUtils.isNotBlank(infoVo.getWareAreaName())) {
                 areaName = infoVo.getWareAreaName();
             }
-            if (StringUtils.isNotBlank(infoVo.getWarehouseRackName())) {
-                rackName = infoVo.getWarehouseRackName();
+            if (StringUtils.isNotBlank(infoVo.getWarehouseRackCode())) {
+                rackCode = infoVo.getWarehouseRackCode();
             }
             if (StringUtils.isNotBlank(infoVo.getWarehouseZoneName())) {
                 zoneName = infoVo.getWarehouseZoneName();
             }
-            vo.setHouseName(houseName + "-" + zoneName + "-" + areaName);
-            if (StringUtils.isNotBlank(infoVo.getWarehouseRackCode())) {
-                vo.setHouseAddress(infoVo.getWarehouseRackCode());
-            }
+            vo.setHouseInfo(zoneName + "-" + areaName + " " + rackCode);
+            vo.setStore(houseName);
         } else {
             return null;
         }
@@ -766,7 +764,8 @@ public class WmsInventoryService extends MybatisBaseService<WmsInventoryMapper,
                 goodsTwoListVo.setStoreSid(wmsInventory.getWarehouseSid());
                 goodsTwoListVo.setCount(wmsInventory.getCount().toString());
                 goodsTwoListVo.setMaxCount(wmsInventory.getCount().toString());
-                goodsTwoListVo.setHouseInfo("保内-" + wmsInventory.getWarehouseName() + " " + wmsInventory.getWarehouseRackCode());
+                WmsHouseInfoVo houseInfoVo = wmsWarehouseRackService.selHouseInfoByFullCode(wmsInventory.getWarehouseRackSid()).getData();
+                goodsTwoListVo.setHouseInfo(houseInfoVo.getWarehouseZoneName() + "-" + houseInfoVo.getWareAreaName() + " " + wmsInventory.getWarehouseRackCode());
                 if (wmsInventory.getCount().compareTo(BigDecimal.ONE) == 0) {
                     goodsTwoListVo.setForbid(true);
                 }
@@ -792,7 +791,8 @@ public class WmsInventoryService extends MybatisBaseService<WmsInventoryMapper,
             goodsTwoListVo.setStoreSid(wmsInventory.getWarehouseSid());
             goodsTwoListVo.setCount(wmsInventory.getCount().toString());
             goodsTwoListVo.setMaxCount(wmsInventory.getCount().toString());
-            goodsTwoListVo.setHouseInfo("保内-" + wmsInventory.getWarehouseName() + " " + wmsInventory.getWarehouseRackCode());
+            WmsHouseInfoVo houseInfoVo = wmsWarehouseRackService.selHouseInfoByFullCode(wmsInventory.getWarehouseRackSid()).getData();
+            goodsTwoListVo.setHouseInfo(houseInfoVo.getWarehouseZoneName() + "-" + houseInfoVo.getWareAreaName() + " " + wmsInventory.getWarehouseRackCode());
             if (wmsInventory.getCount().compareTo(BigDecimal.ONE) == 0) {
                 goodsTwoListVo.setForbid(true);
             }

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/appH5/GoodsListTagH5Vo.java

@@ -23,4 +23,13 @@ public class GoodsListTagH5Vo {
      */
     private String num;
 
+
+    /**
+     * 仓库
+     */
+    private String store;
+    /**
+     * 格式例：区域-库区 库位编码
+     */
+    private String houseInfo;
 }

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/appH5/GoodsTagH5Vo.java

@@ -1,8 +1,8 @@
 package com.yxt.wms.biz.inventory.wmsinventory.appH5;
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -13,6 +13,11 @@ import java.util.List;
 @Data
 public class GoodsTagH5Vo {
 
+    @ApiModelProperty("商品ID（唯一编码，入库时生成，生成规则为商品编码+YYMMdd+4位流水）")
+    private String goodsID;
+
+    @ApiModelProperty("厂家名称")
+    private String manufacturerName;
     /**
      * 商品名称
      */

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/appH5/GoodsTwoListVo.java

@@ -38,7 +38,7 @@ public class GoodsTwoListVo {
      */
     private String maxCount;
     /**
-     * 格式例：保内-仓库 库位编码
+     * 格式例：保内-库区 库位编码
      */
     private String houseInfo;
     /**

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/appH5/HouseRackH5Vo.java

@@ -1,13 +1,8 @@
 package com.yxt.wms.biz.inventory.wmsinventory.appH5;
 
-import com.yxt.wms.biz.inventory.wmsgoodstag.app.ListElement;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import javax.validation.constraints.NotBlank;
-import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.Date;
 import java.util.List;
 
 /**
@@ -26,6 +21,16 @@ public class HouseRackH5Vo {
      * 库区名+库位名
      */
     private String houseName;
+
+    /**
+     * 仓库
+     */
+    private String store;
+    /**
+     * 格式例：区域-库区 库位编码
+     */
+    private String houseInfo;
+
     @ApiModelProperty("列表")
     public List<HouseRackListVo> list;
 

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/appH5/HouseRackListVo.java

@@ -1,5 +1,6 @@
 package com.yxt.wms.biz.inventory.wmsinventory.appH5;
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 /**
@@ -10,6 +11,8 @@ import lombok.Data;
 @Data
 public class HouseRackListVo {
 
+    @ApiModelProperty("厂家名称")
+    private String manufacturerName;
     /**
      * 商品id
      */