Merge remote-tracking branch 'origin/master'

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/BaseDistributorFeign.java

@@ -132,4 +132,8 @@ public interface BaseDistributorFeign {
     @ApiOperation("移动-经销商附件清单保存修改")
     @PostMapping("/saveDistributorFileInfo")
     ResultBean saveDistributorFileInfo(@RequestBody BaseFileDto dto);
+
+    @ApiOperation("二级经销商列表")
+    @GetMapping("/selectDisList")
+    ResultBean<List<BaseDistributorListVo>> selectDisList(@SpringQueryMap BaseDistributorListQuery query);
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/BaseDistributorFeignFallback.java

@@ -142,5 +142,10 @@ public class BaseDistributorFeignFallback implements BaseDistributorFeign {
         return null;
     }
 
+    @Override
+    public ResultBean<List<BaseDistributorListVo>> selectDisList(BaseDistributorListQuery query) {
+        return null;
+    }
+
 
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/BaseDistributorListQuery.java

@@ -0,0 +1,16 @@
+package com.yxt.anrui.base.api.basedistributor;
+
+import com.yxt.common.core.query.Query;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/9/26 15:11
+ * @Description
+ */
+@Data
+public class BaseDistributorListQuery implements Query {
+    private static final long serialVersionUID = -7474049355274135681L;
+
+    private String userSid;
+}

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/BaseDistributorListVo.java

@@ -0,0 +1,19 @@
+package com.yxt.anrui.base.api.basedistributor;
+
+import com.yxt.common.core.vo.Vo;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/9/26 14:56
+ * @Description
+ */
+@Data
+public class BaseDistributorListVo implements Vo {
+    private static final long serialVersionUID = 7567158573644935938L;
+
+    private String name;
+    private String sid;
+
+
+}

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOut.java

@@ -48,4 +48,10 @@ public class BaseVehicleOut extends BaseEntity {
     private String actualCustomer;
     @ApiModelProperty("实际购车人电话")
     private String actualMobile;
+    @ApiModelProperty("实际购车人sid")
+    private String actualSid;
+    @ApiModelProperty("二次经销商sid")
+    private String distributorSid;
+    @ApiModelProperty("客户sid")
+    private String customerSid;
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutDto.java

@@ -35,12 +35,16 @@ public class BaseVehicleOutDto implements Dto {
     private String isTerminal;
     @ApiModelProperty("客户名称")
     private String customerName;
+    @ApiModelProperty("客户sid")
+    private String customerSid;
     @ApiModelProperty("手机号")
     private String mobile;
     @ApiModelProperty("赠品说明")
     private String giftsDescription;
     @ApiModelProperty("二次经销商")
     private String distributorName;
+    @ApiModelProperty("二次经销商sid")
+    private String distributorSid;
     @ApiModelProperty("返利金额")
     private String rebateAmount;
 
@@ -48,4 +52,6 @@ public class BaseVehicleOutDto implements Dto {
     private String actualCustomer;
     @ApiModelProperty("实际购车人电话")
     private String actualMobile;
+    @ApiModelProperty("实际购车人sid")
+    private String actualSid;
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorMapper.java

@@ -118,4 +118,6 @@ public interface BaseDistributorMapper extends BaseMapper<BaseDistributor> {
     BaseDistributor selectBySidOne(String sid);
 
     void updateInvoiceBySid(@Param("invoBankNum") String invoBankNum, @Param("invoBank") String invoBank, @Param("invoPhone") String invoPhone, @Param("sid") String sid);
+
+    List<BaseDistributorListVo> selectDisList(String orgSid);
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorMapper.xml

@@ -187,4 +187,11 @@
             invoBank    = #{invoBank}
         where sid = #{sid}
     </update>
+
+    <select id="selectDisList" resultType="com.yxt.anrui.base.api.basedistributor.BaseDistributorListVo">
+        select disName as name,sid
+        from base_distributor
+        where length(pDistributorSid) > 0
+          and useOrg = #{orgSid}
+    </select>
 </mapper>

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorRest.java

@@ -249,4 +249,9 @@ public class BaseDistributorRest implements BaseDistributorFeign {
     public ResultBean saveDistributorFileInfo(BaseFileDto dto) {
         return baseDistributorService.saveDistributorFileInfo(dto);
     }
+
+    @Override
+    public ResultBean<List<BaseDistributorListVo>> selectDisList(BaseDistributorListQuery query) {
+        return baseDistributorService.selectDisList(query);
+    }
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorService.java

@@ -754,4 +754,12 @@ public class BaseDistributorService extends MybatisBaseService<BaseDistributorMa
         }
         return rb.success();
     }
+
+    public ResultBean<List<BaseDistributorListVo>> selectDisList(BaseDistributorListQuery query) {
+        ResultBean<List<BaseDistributorListVo>> rb = ResultBean.fireFail();
+        String orgSid = sysStaffOrgFeign.getPathSidByUserSid(query.getUserSid()).getData();
+        List<BaseDistributorListVo> list = baseMapper.selectDisList(orgSid);
+        list.removeAll(Collections.singleton(null));
+        return rb.success().setData(list);
+    }
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java

@@ -803,7 +803,7 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
         if (StringUtils.isNotBlank(pagerQuery.getUseOrg())) { // 分公司
             qw.eq("bv.useOrgSid", pagerQuery.getUseOrg());
         }
-        qw.eq("bv.isProblemVeh","0");
+        qw.eq("bv.isProblemVeh", "0");
         return qw;
     }
 
@@ -1553,7 +1553,7 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
             }
             qw.and(wrapper -> wrapper.eq("bv.vehicleState", VehicleState.StockEnum.STOCK.getCode()).or().eq("bv.vehicleState", VehicleState.StockEnum.ING_STOCK.getCode()).or().eq("bv.vehicleState", VehicleState.StockEnum.DR_STOCK.getCode()));
             qw.eq("bv.lockedState", VehicleState.LockEnum.UN_LOCK.getCode());
-            qw.eq("bv.isProblemVeh","0");
+            qw.eq("bv.isProblemVeh", "0");
         }
         return qw;
     }
@@ -1697,7 +1697,9 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
         //条件：本分公司、非删除、库存或采购退库中或调入或调出中
         QueryWrapper<BaseVehicle> qw = new QueryWrapper<>();
         qw.and(wrapper -> wrapper.eq("bv.vehicleState", VehicleState.StockEnum.STOCK.getCode()).or().eq("bv.vehicleState", VehicleState.StockEnum.RETURNING_STOCK.getCode()).or().eq("bv.vehicleState", VehicleState.StockEnum.DCZ_STOCK.getCode()).or().eq("bv.vehicleState", VehicleState.StockEnum.DR_STOCK.getCode()));
-        qw.notIn("bv.vinNo", vinNoList);
+        if (vinNoList.size() > 0) {
+            qw.notIn("bv.vinNo", vinNoList);
+        }
         List<AppScmInventoryRecordsVo> list = baseMapper.selectInventoryRecords(userOrgSid, qw);
         return rb.success().setData(list);
     }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleactualsales/BaseVehicleActualSalesService.java

@@ -382,6 +382,16 @@ public class BaseVehicleActualSalesService extends MybatisBaseService<BaseVehicl
             if (StringUtils.isBlank(dto.getInstanceId())) {
                 return rb.setMsg("参数错误：instanceId");
             }
+            //更新车辆的结算状态为预买断
+            //结算状态设置为预买断
+            List<BaseVehicleActualDetailsDto> detailsList = dto.getDetailsList();
+            for (BaseVehicleActualDetailsDto f : detailsList) {
+                BaseVehicle baseVehicle = baseVehicleService.selectByVinNoAndOrgSid(f.getVinNo(), useOrgSid);
+                baseVehicle.setVinNo(f.getVinNo());
+                baseVehicle.setSettlementStatus(VehicleState.BuyoutEnum.PRE_BUYOUT.getCode());
+                baseVehicle.setSettlementStatusValue(VehicleState.BuyoutEnum.PRE_BUYOUT.getRemarks());
+                baseVehicleService.updateVeh(baseVehicle);
+            }
             bv.setTaskId(baseVehicleActualSales.getTaskId());
             bv.setTaskDefKey(baseVehicleActualSales.getNodeId());
             bv.setComment("重新提交");

anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempFeign.java

@@ -8,6 +8,7 @@ import com.yxt.common.core.vo.PagerVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.cloud.openfeign.SpringQueryMap;
 import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
@@ -149,6 +150,11 @@ public interface CrmCustomerTempFeign {
 
     @ResponseBody
     @GetMapping("/selectCustomerFile/{customerSid}")
-    public ResultBean<List<String>> selectCustomerFile(@PathVariable("customerSid")String customerSid);
+    public ResultBean<List<String>> selectCustomerFile(@PathVariable("customerSid") String customerSid);
+
+    @ResponseBody
+    @GetMapping("/selectCustomerList")
+    @ApiOperation("查询该分公司业务员下的客户列表")
+    ResultBean<List<CrmCustomerTempListVo>> selectCustomerList(@SpringQueryMap CrmCustomerTempListQuery query);
 
 }

anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempFeignFallback.java

@@ -120,5 +120,10 @@ public class CrmCustomerTempFeignFallback implements CrmCustomerTempFeign {
 		return null;
 	}
 
+	@Override
+	public ResultBean<List<CrmCustomerTempListVo>> selectCustomerList(CrmCustomerTempListQuery query) {
+		return null;
+	}
+
 
 }

anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempListQuery.java

@@ -0,0 +1,17 @@
+package com.yxt.anrui.crm.api.crmcustomertemp;
+
+import com.yxt.common.core.query.Query;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/9/26 14:30
+ * @Description
+ */
+@Data
+public class CrmCustomerTempListQuery implements Query {
+    private static final long serialVersionUID = -8235453055415557265L;
+
+    private String userSid;
+    private String staffSid;
+}

anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempListVo.java

@@ -0,0 +1,19 @@
+package com.yxt.anrui.crm.api.crmcustomertemp;
+
+import com.yxt.common.core.vo.Vo;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/9/26 14:28
+ * @Description
+ */
+@Data
+public class CrmCustomerTempListVo implements Vo {
+    private static final long serialVersionUID = 5338688085476236821L;
+
+    private String name;
+    private String sid;
+    private String mobile;
+
+}

anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempMapper.java

@@ -118,4 +118,5 @@ public interface CrmCustomerTempMapper extends BaseMapper<CrmCustomerTemp> {
 
     CrmCustomerTempVo selByMobile(@Param("mobile") String mobile);
 
+    List<CrmCustomerTempListVo> selectCustomerList(@Param("orgSid") String orgSid, @Param("staffSid") String staffSid);
 }

anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempMapper.xml

@@ -205,4 +205,11 @@
         FROM crm_customer_temp
         WHERE mobile = #{mobile}
     </select>
+
+    <select id="selectCustomerList" resultType="com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempListVo">
+        select ct.name,ct.sid,ct.mobile
+        from crm_customer_temp ct
+        where createOrgSid = #{orgSid}
+          and staffSid = #{staffSid}
+    </select>
 </mapper>

anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempRest.java

@@ -268,5 +268,10 @@ public class CrmCustomerTempRest implements CrmCustomerTempFeign {
         return crmCustomerFileService.selectCustomerFile(customerSid);
     }
 
+    @Override
+    public ResultBean<List<CrmCustomerTempListVo>> selectCustomerList(CrmCustomerTempListQuery query) {
+        return crmCustomerTempService.selectCustomerList(query);
+    }
+
 
 }

anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempService.java

@@ -23,6 +23,7 @@ import com.yxt.anrui.crm.biz.crmvehicledemand.CrmVehicledemandService;
 import com.yxt.anrui.crm.biz.crmvisit.CrmVisitService;
 import com.yxt.anrui.portal.api.dictcommon.DictCommonFeign;
 import com.yxt.anrui.portal.api.dictcommon.DictCommonVo;
+import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
 import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
 import com.yxt.anrui.portal.api.sysuser.SysUserInfoVo;
 import com.yxt.anrui.portal.api.sysuser.SysUserVo;
@@ -85,6 +86,8 @@ public class CrmCustomerTempService extends MybatisBaseService<CrmCustomerTempMa
     private CrmFileService crmFileService;
     @Autowired
     private CommonAppendixFeign commonAppendixFeign;
+    @Autowired
+    private SysStaffOrgFeign sysStaffOrgFeign;
 
 
     public PagerVo<CrmCustomerTemp> listPage(PagerQuery<CrmCustomerTempQuery> pq) {
@@ -877,4 +880,14 @@ public class CrmCustomerTempService extends MybatisBaseService<CrmCustomerTempMa
     public CrmCustomerTempVo selByMobile(String mobile) {
         return baseMapper.selByMobile(mobile);
     }
+
+    public ResultBean<List<CrmCustomerTempListVo>> selectCustomerList(CrmCustomerTempListQuery query) {
+        ResultBean<List<CrmCustomerTempListVo>> rb = ResultBean.fireFail();
+        String staffSid = query.getStaffSid();
+        //根据用户sid查询分公司sid
+        String orgSid = sysStaffOrgFeign.getPathSidByUserSid(query.getUserSid()).getData();
+        List<CrmCustomerTempListVo> list = baseMapper.selectCustomerList(orgSid, staffSid);
+        list.removeAll(Collections.singleton(null));
+        return rb.success().setData(list);
+    }
 }

anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrgStaffVo.java

@@ -0,0 +1,17 @@
+package com.yxt.anrui.portal.api.sysorganization;
+
+import com.yxt.common.core.vo.Vo;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/9/26 11:48
+ * @Description
+ */
+@Data
+public class SysOrgStaffVo implements Vo {
+    private static final long serialVersionUID = -4311553944345419092L;
+
+    private String staffName;
+    private String staffSid;
+}

anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationFeign.java

@@ -1,6 +1,5 @@
 package com.yxt.anrui.portal.api.sysorganization;
 
-import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgVo;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
@@ -8,6 +7,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.cloud.openfeign.SpringQueryMap;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
@@ -134,4 +134,9 @@ public interface SysOrganizationFeign {
     @ResponseBody
     @ApiOperation("根据当前用户的所在组织获取当前用户所在的分公司")
     ResultBean<String> getOrgSid(@PathVariable(value = "sid") String sid);
+
+    @GetMapping("/selectOrgList")
+    @ResponseBody
+    @ApiOperation("当前分公司销售部门及部门人员")
+    ResultBean<List<SysOrganizationListVo>> selectOrgList(@SpringQueryMap SysOrganizationListQuery query);
 }

anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationFeignFallback.java

@@ -137,4 +137,9 @@ public class SysOrganizationFeignFallback implements SysOrganizationFeign {
     public ResultBean<String> getOrgSid(String sid) {
         return null;
     }
+
+    @Override
+    public ResultBean<List<SysOrganizationListVo>> selectOrgList(SysOrganizationListQuery query) {
+        return null;
+    }
 }

anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationListQuery.java

@@ -0,0 +1,16 @@
+package com.yxt.anrui.portal.api.sysorganization;
+
+import com.yxt.common.core.query.Query;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/9/26 11:49
+ * @Description
+ */
+@Data
+public class SysOrganizationListQuery implements Query {
+    private static final long serialVersionUID = 8657016527420117948L;
+
+    private String userSid;
+}

anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationListVo.java

@@ -0,0 +1,23 @@
+package com.yxt.anrui.portal.api.sysorganization;
+
+import com.yxt.common.core.vo.Vo;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/9/26 11:42
+ * @Description
+ */
+@Data
+public class SysOrganizationListVo implements Vo {
+    private static final long serialVersionUID = -3709239161608411765L;
+
+    private String orgDeptSid;
+    private String orgDeptName;
+
+    private List<SysOrgStaffVo> staffinfoVoList;
+
+
+}

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationMapper.java

@@ -105,4 +105,7 @@ public interface SysOrganizationMapper extends BaseMapper<SysOrganization> {
 
     SysOrgVo getListOrgByBrand(String sid);
 
+    List<SysOrganizationListVo> selectOrgList(String orgSid);
+
+    List<SysOrgStaffVo> selectByOrgDeptSid(String orgDeptSid);
 }

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationMapper.xml

@@ -5,26 +5,26 @@
     <!--    ${ew.customSqlSegment} -->
     <select id="selectPageVo" resultType="com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo">
         SELECT so.*,
-        (SELECT GROUP_CONCAT(ss.name)
-        FROM `sys_staff_org` sso
-        LEFT JOIN `sys_staffinfo` ss ON sso.`staffSid` = ss.`sid`
-        WHERE so.`sid` = sso.`orgSid`
-        AND sso.manageType = '1') zgNames,
-        (SELECT GROUP_CONCAT(ss.sid)
-        FROM `sys_staff_org` sso
-        LEFT JOIN `sys_staffinfo` ss ON sso.`staffSid` = ss.`sid`
-        WHERE so.`sid` = sso.`orgSid`
-        AND sso.manageType = '1') zgSids,
-        (SELECT GROUP_CONCAT(ss.name)
-        FROM `sys_staff_org` sso
-        LEFT JOIN `sys_staffinfo` ss ON sso.`staffSid` = ss.`sid`
-        WHERE so.`sid` = sso.`orgSid`
-        AND sso.manageType = '2') fgNames,
-        (SELECT GROUP_CONCAT(ss.sid)
-        FROM `sys_staff_org` sso
-        LEFT JOIN `sys_staffinfo` ss ON sso.`staffSid` = ss.`sid`
-        WHERE so.`sid` = sso.`orgSid`
-        AND sso.manageType = '2') fgSids
+               (SELECT GROUP_CONCAT(ss.name)
+                FROM `sys_staff_org` sso
+                         LEFT JOIN `sys_staffinfo` ss ON sso.`staffSid` = ss.`sid`
+                WHERE so.`sid` = sso.`orgSid`
+                  AND sso.manageType = '1') zgNames,
+               (SELECT GROUP_CONCAT(ss.sid)
+                FROM `sys_staff_org` sso
+                         LEFT JOIN `sys_staffinfo` ss ON sso.`staffSid` = ss.`sid`
+                WHERE so.`sid` = sso.`orgSid`
+                  AND sso.manageType = '1') zgSids,
+               (SELECT GROUP_CONCAT(ss.name)
+                FROM `sys_staff_org` sso
+                         LEFT JOIN `sys_staffinfo` ss ON sso.`staffSid` = ss.`sid`
+                WHERE so.`sid` = sso.`orgSid`
+                  AND sso.manageType = '2') fgNames,
+               (SELECT GROUP_CONCAT(ss.sid)
+                FROM `sys_staff_org` sso
+                         LEFT JOIN `sys_staffinfo` ss ON sso.`staffSid` = ss.`sid`
+                WHERE so.`sid` = sso.`orgSid`
+                  AND sso.manageType = '2') fgSids
         FROM sys_organization so
         <where>
             ${ew.sqlSegment}
@@ -108,7 +108,8 @@
 
     <select id="selectOrgCodeByPsid" resultType="com.yxt.anrui.portal.api.sysorganization.SysOrganization">
         SELECT *
-        FROM sys_organization LIMIT 0,1
+        FROM sys_organization
+        LIMIT 0,1
     </select>
 
     <select id="selectTreeList" resultType="com.yxt.anrui.portal.api.sysorganization.SysOrgListVo">
@@ -157,11 +158,9 @@
     </select>
 
     <select id="selectUseOrgSidBySid" resultType="java.util.Map">
-        SELECT
-                sid,
-                name
-        FROM
-                sys_organization
+        SELECT sid,
+               name
+        FROM sys_organization
         WHERE psid = #{psid}
           AND isDelete = 0
           AND isDept = 0
@@ -170,7 +169,22 @@
     <select id="getListOrgByBrand" resultType="com.yxt.anrui.portal.api.sysorganization.SysOrgVo">
         SELECT so.name, so.psid, so.id, so.sid, so.orgSidPath
         FROM sys_organization so
-        WHERE isDept = 0 AND so.sid = #{sid}
+        WHERE isDept = 0
+          AND so.sid = #{sid}
         ORDER BY psid
     </select>
+
+    <select id="selectOrgList" resultType="com.yxt.anrui.portal.api.sysorganization.SysOrganizationListVo">
+        select so.name orgDeptName, so.sid orgDeptSid
+        from sys_organization so
+        where so.psid = #{orgSid}
+          and orgAttributeKey = 'DP03_SYS'
+    </select>
+
+    <select id="selectByOrgDeptSid" resultType="com.yxt.anrui.portal.api.sysorganization.SysOrgStaffVo">
+        select distinct si.name staffName, si.sid staffSid
+        from sys_staff_org so
+                 left join sys_staffinfo si on so.staffSid = si.sid
+        where so.orgSid = #{orgDeptSid}
+    </select>
 </mapper>

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationRest.java

@@ -356,4 +356,9 @@ public class SysOrganizationRest implements SysOrganizationFeign {
         String orgSid = sysOrganizationService.getOrgSid(sid);
         return rb.success().setData(orgSid);
     }
+
+    @Override
+    public ResultBean<List<SysOrganizationListVo>> selectOrgList(SysOrganizationListQuery query) {
+        return sysOrganizationService.selectOrgList(query);
+    }
 }

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationService.java

@@ -477,4 +477,22 @@ public class SysOrganizationService extends MybatisBaseService<SysOrganizationMa
         sid = sysOrganization.getPsid();
         return getOrgSid(sid);
     }
+
+    public ResultBean<List<SysOrganizationListVo>> selectOrgList(SysOrganizationListQuery query) {
+        ResultBean<List<SysOrganizationListVo>> rb = ResultBean.fireFail();
+        //根据用户sid查询分公司sid
+        String orgDeptSid = sysStaffOrgService.selectByUserSid(query.getUserSid());
+        String orgSid = getOrgSid(orgDeptSid);
+        //根据分公司名称查询销售部门的部门
+        List<SysOrganizationListVo> sysOrganizationListVos = baseMapper.selectOrgList(orgSid);
+        sysOrganizationListVos.removeAll(Collections.singleton(null));
+        if (!sysOrganizationListVos.isEmpty()) {
+            for (SysOrganizationListVo vo : sysOrganizationListVos) {
+                orgDeptSid = vo.getOrgDeptSid();
+                List<SysOrgStaffVo> sysOrgStaffVoList = baseMapper.selectByOrgDeptSid(orgDeptSid);
+                vo.setStaffinfoVoList(sysOrgStaffVoList);
+            }
+        }
+        return rb.success().setData(sysOrganizationListVos);
+    }
 }

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstafforg/SysStaffOrgMapper.java

@@ -102,4 +102,6 @@ public interface SysStaffOrgMapper extends BaseMapper<SysStaffOrg> {
     List<SysStaffOrgVo> selectByStaffS(String staffSid);
 
     List<String> selectByOrgSid(String sid);
+
+    String selectByUserSid(String userSid);
 }

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstafforg/SysStaffOrgMapper.xml

@@ -90,6 +90,18 @@
     </select>
 
     <select id="selectByOrgSid" resultType="java.lang.String">
-        select staffSid from sys_staff_org where orgSid = #{sid} and manageType = 2
+        select staffSid
+        from sys_staff_org
+        where orgSid = #{sid}
+          and manageType = 2
+    </select>
+
+    <select id="selectByUserSid" resultType="java.lang.String">
+        select orgSid
+        from sys_staff_org so
+                 left join sys_user su on su.staffSid = so.staffSid
+                 left join sys_staffinfo si on si.sid = su.staffSid
+        where so.manageType = '3'
+          and su.sid = #{userSid}
     </select>
 </mapper>

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstafforg/SysStaffOrgService.java

@@ -281,4 +281,8 @@ public class SysStaffOrgService extends MybatisBaseService<SysStaffOrgMapper, Sy
     public List<String> selectByOrgSid(String sid) {
         return baseMapper.selectByOrgSid(sid);
     }
+
+    public String selectByUserSid(String userSid) {
+        return baseMapper.selectByUserSid(userSid);
+    }
 }

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

@@ -74,7 +74,8 @@ public class ScmSpecialRebateVo implements Vo {
 	@ApiModelProperty("预计返利")
     private String estimateRebate; // 预计返利
 	@ApiModelProperty("预提日期")
-    private String withholdingDate; // 预提日期
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date withholdingDate; // 预提日期
     @ApiModelProperty("预提日期(页面展示)")
     private String withholdingDateCopy; // 预提日期(页面展示)
 	@ApiModelProperty("上传日期")

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatewithapply/ScmSpecialRebateWithApplyVo.java

@@ -64,7 +64,7 @@ public class ScmSpecialRebateWithApplyVo implements Vo {
     @ApiModelProperty("预提申请")
     private String withApply; // 预提申请
     @ApiModelProperty("预提返利合计")
-    private String withRebateTotal; // 预提返利合计
+    private Integer withRebateTotal; // 预提返利合计
     @ApiModelProperty("创建人姓名")
     private String createByName; // 创建人姓名
     @ApiModelProperty("使用组织sid")

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleinventory/ScmVehicleInventoryFeign.java

@@ -59,6 +59,11 @@ public interface ScmVehicleInventoryFeign {
     @ResponseBody
     public ResultBean<PagerVo<ScmVehicleInventoryVo>> listPage(@RequestBody PagerQuery<ScmVehicleInventoryQuery> pq);
 
+    @ApiOperation("待盘库记录列表")
+    @PostMapping("/stayListPage")
+    @ResponseBody
+    public ResultBean<PagerVo<ScmVehicleInventoryVo>> stayListPage(@RequestBody PagerQuery<ScmVehicleStayInventoryQuery> pq);
+
     @ApiOperation("盘库修改状态")
     @PostMapping("/updateState")
     @ResponseBody

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleinventory/ScmVehicleInventoryFeignFallback.java

@@ -52,6 +52,11 @@ public class ScmVehicleInventoryFeignFallback implements ScmVehicleInventoryFeig
 		return rb.setMsg("接口anrui_scm/scmvehicleinventory/listPage无法访问");
 	}
 
+	@Override
+	public ResultBean<PagerVo<ScmVehicleInventoryVo>> stayListPage(PagerQuery<ScmVehicleStayInventoryQuery> pq) {
+		return null;
+	}
+
 	@Override
 	public ResultBean updateState(String sid, String inventoryStateKey, String inventoryState, String certificateKey, String certificate, String remarks) {
 		return null;

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleinventory/ScmVehicleInventoryQuery.java

@@ -51,7 +51,7 @@ import lombok.Data;
 public class ScmVehicleInventoryQuery implements Query {
 
 	@ApiModelProperty("车架号")
-    private String mainSid; // 车架号
+    private String vinNo; // 车架号
     @ApiModelProperty("盘库开始日期")
     @JsonProperty("InventStartDate")
     private String InventStartDate;

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleinventory/ScmVehicleInventoryVo.java

@@ -56,9 +56,13 @@ public class ScmVehicleInventoryVo implements Vo {
     private String sid; // sid
 
 	@ApiModelProperty("车架号")
-    private String mainSid; // 车架号
+    private String vinNo; // 车架号
+    @ApiModelProperty("主表sid")
+    private String mainSid; // 主表sid
 	@ApiModelProperty("存放地点")
     private String location; // 存放地点
+    @ApiModelProperty("存放地点sid")
+    private String locationSid; // 存放地点sid
 	@ApiModelProperty("盘库日期")
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date InventoryDate; // 盘库日期

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleinventory/ScmVehicleStayInventoryQuery.java

@@ -0,0 +1,58 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.api.scmvehicleinventory;
+
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui_scm(anrui_scm) <br/>
+ * File: ScmVehicleInventoryQuery.java <br/>
+ * Class: anrui_scm.api.scmvehicleinventory.ScmVehicleInventoryQuery <br/>
+ * Description: 盘库记录 查询条件. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-06-15 14:30:59 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "盘库记录 查询条件", description = "盘库记录 查询条件")
+public class ScmVehicleStayInventoryQuery implements Query {
+
+	@ApiModelProperty("车架号")
+    private String vinNo; // 车架号
+	@ApiModelProperty("存放地点sid")
+    private String locationSid; // 存放地点sid
+	@ApiModelProperty("创建组织")
+    private String createOrgSid; // 创建组织
+}

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinventorymonth/AppScmVehInventorymonthVo.java

@@ -83,6 +83,4 @@ public class AppScmVehInventorymonthVo implements Vo {
     private String normalNumber;
     @ApiModelProperty("是否显示生成报告按钮 剩余盘库记录=0时显示")
     private Boolean showBtn;
-
-
 }

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinventorymonth/ScmVehInventorymonthFeign.java

@@ -58,7 +58,7 @@ import java.util.List;
         fallback = ScmVehInventorymonthFeignFallback.class)
 public interface ScmVehInventorymonthFeign {
 
-    @ApiOperation("根据条件分页查询数据的列表")
+    @ApiOperation("PC端-获取盘库报告列表")
     @PostMapping("/listPage")
     @ResponseBody
     public ResultBean<PagerVo<ScmVehInventorymonthVo>> listPage(@RequestBody PagerQuery<ScmVehInventorymonthQuery> pq);

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinventorymonth/ScmVehInventorymonthQuery.java

@@ -26,6 +26,7 @@
 package com.yxt.anrui.scm.api.scmvehinventorymonth;
 
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.yxt.common.core.query.Query;
 
 import io.swagger.annotations.ApiModel;
@@ -49,15 +50,12 @@ import lombok.Data;
 @ApiModel(value = "月度盘库 查询条件", description = "月度盘库 查询条件")
 public class ScmVehInventorymonthQuery implements Query {
 
-	@ApiModelProperty("编号（yyyyMMdd）")
-    private String billNo; // 编号（yyyyMMdd）
-	@ApiModelProperty("创建组织")
-    private String createOrgSid; // 创建组织
-	@ApiModelProperty("创建组织名称")
-    private String createOrgName; // 创建组织名称
-	@ApiModelProperty("使用组织")
-    private String useOrgSid; // 使用组织
-	@ApiModelProperty("使用组织名称")
-    private String useOrgName; // 使用组织名称
-
+    @ApiModelProperty("创建人姓名")
+    private String createByName;
+    @ApiModelProperty("创建开始日期")
+    private String createStartTime; // 创建开始日期
+    @ApiModelProperty("创建结束日期")
+    private String createEndTime; // 创建结束日期
+    @ApiModelProperty("创建组织sid")
+    private String createOrgSid; // 创建组织sid
 }

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinventorymonth/ScmVehInventorymonthVo.java

@@ -26,6 +26,7 @@
 package com.yxt.anrui.scm.api.scmvehinventorymonth;
 
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.yxt.common.core.vo.Vo;
 
 import io.swagger.annotations.ApiModel;
@@ -52,18 +53,29 @@ import java.util.Date;
 public class ScmVehInventorymonthVo implements Vo {
 
     private String sid; // sid
-
-	@ApiModelProperty("编号（yyyyMMdd）")
+    @ApiModelProperty("生成报告状态")
+    private String state;
+    @ApiModelProperty("编号（yyyyMMdd）")
     private String billNo; // 编号（yyyyMMdd）
     @ApiModelProperty("创建时间")
-    private Date createTime; // 使用组织名称
-	@ApiModelProperty("创建组织")
-    private String createOrgSid; // 创建组织
-	@ApiModelProperty("创建组织名称")
-    private String createOrgName; // 创建组织名称
-	@ApiModelProperty("使用组织")
-    private String useOrgSid; // 使用组织
-	@ApiModelProperty("使用组织名称")
-    private String useOrgName; // 使用组织名称
-
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date createTime; //
+    @ApiModelProperty("创建人")
+    private String createByName;
+    @ApiModelProperty("剩余盘库记录数量")
+    private String surplusNumber;
+    @ApiModelProperty("盘库记录总数数量")
+    private String totalNumber;
+    @ApiModelProperty("盘亏数量")
+    private String lossNumber;
+    @ApiModelProperty("盘损数量")
+    private String damageNumber;
+    @ApiModelProperty("盘盈数量")
+    private String profitNumber;
+    @ApiModelProperty("实盘数量")
+    private String actualNumber;
+    @ApiModelProperty("正常数量")
+    private String normalNumber;
+    @ApiModelProperty("是否显示生成报告按钮 剩余盘库记录=0时显示")
+    private Boolean showBtn;
 }

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateRest.java

@@ -26,7 +26,11 @@
 package com.yxt.anrui.scm.biz.scmspecialrebate;
 
 import com.yxt.anrui.scm.api.scmspecialrebate.*;
+import com.yxt.anrui.scm.api.scmspecialrebatewithapply.ScmSpecialRebateWithApply;
+import com.yxt.anrui.scm.api.scmspecialrebatewithapply.ScmSpecialRebateWithApplyVo;
 import com.yxt.anrui.scm.api.scmvehrebate.ScmVehRebate;
+import com.yxt.anrui.scm.biz.scmspecialrebatewith.ScmSpecialRebateWithService;
+import com.yxt.anrui.scm.biz.scmspecialrebatewithapply.ScmSpecialRebateWithApplyService;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
@@ -35,6 +39,8 @@ import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
+
 /**
  * Project: anrui-scm(专项返利管理) <br/>
  * File: ScmSpecialRebateFeignFallback.java <br/>
@@ -55,6 +61,10 @@ public class ScmSpecialRebateRest implements ScmSpecialRebateFeign {
 
 	@Autowired
 	private ScmSpecialRebateService scmSpecialRebateService;
+	@Autowired
+	private ScmSpecialRebateWithService scmSpecialRebateWithService;
+	@Autowired
+	private ScmSpecialRebateWithApplyService scmSpecialRebateWithApplyService;
 
 	@Override
 	@ApiOperation("根据条件分页查询数据的列表")
@@ -85,6 +95,13 @@ public class ScmSpecialRebateRest implements ScmSpecialRebateFeign {
     public ResultBean delBySids(@RequestBody String[] sids){
 		ResultBean rb = ResultBean.fireFail();
 		for (String sid : sids) {
+			List<String> stringList = scmSpecialRebateWithService.fetchBySpecialReBateSid(sid);
+			for (String s : stringList) {
+				ScmSpecialRebateWithApply scmSpecialRebateWithApply = scmSpecialRebateWithApplyService.fetchBySid(s);
+				if (!scmSpecialRebateWithApply.getNodeState().equals("待提交")){
+					return rb.setMsg("所选数据中包含已提交专项返利信息，无法删除");
+				}
+			}
 			ScmSpecialRebate scmSpecialRebate = scmSpecialRebateService.fetchBySid(sid);
 			Integer state = scmSpecialRebate.getState();
 			if (state == 1){

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateService.java

@@ -227,10 +227,9 @@ public class ScmSpecialRebateService extends MybatisBaseService<ScmSpecialRebate
         IPage<ScmSpecialRebate> page = PagerUtil.queryToPage(pq);
         IPage<ScmSpecialRebateVo> pagging = baseMapper.selectPageVo(page, qw);
         for (ScmSpecialRebateVo record : pagging.getRecords()) {
-            String withholdingDate = record.getWithholdingDate();
-            Date parse = DateUtil.parse(withholdingDate);
-            int year = DateUtil.year(parse);
-            int month = DateUtil.month(parse) + 1;
+            Date withholdingDate = record.getWithholdingDate();
+            int year = DateUtil.year(withholdingDate);
+            int month = DateUtil.month(withholdingDate) + 1;
             String withholdingDateCopy = year + "年" + month + "月";
             record.setWithholdingDateCopy(withholdingDateCopy);
         }

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatewith/ScmSpecialRebateWithMapper.java

@@ -38,6 +38,7 @@ import com.yxt.anrui.scm.api.scmspecialrebatewith.ScmSpecialRebateWith;
 import com.yxt.anrui.scm.api.scmspecialrebatewith.ScmSpecialRebateWithVo;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * Project: anrui-scm(专项返利) <br/>
@@ -72,4 +73,6 @@ public interface ScmSpecialRebateWithMapper extends BaseMapper<ScmSpecialRebateW
 
     @Select("select specialRebateSid from scm_special_rebate_with where mainSid = #{businessSid}")
     List<String> fetchSpecialReBateSidByMainSid(String businessSid);
+
+    List<String> fetchBySpecialReBateSid(String sid);
 }

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatewith/ScmSpecialRebateWithMapper.xml

@@ -29,4 +29,8 @@
         WHERE ssrw.`mainSid` = #{sid}
         GROUP BY ssr.`calculationModeKey`
     </select>
+
+    <select id="fetchBySpecialReBateSid" resultType="java.lang.String">
+        SELECT mainSid FROM scm_special_rebate_with WHERE specialRebateSid = #{sid}
+    </select>
 </mapper>

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatewith/ScmSpecialRebateWithService.java

@@ -48,6 +48,7 @@ import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 
 /**
  * Project: anrui-scm(专项返利) <br/>
@@ -140,4 +141,8 @@ public class ScmSpecialRebateWithService extends MybatisBaseService<ScmSpecialRe
         }
         return rb.success().setData(scmSpecialRebateDetailsVos);
     }
+
+    public List<String> fetchBySpecialReBateSid(String sid) {
+        return baseMapper.fetchBySpecialReBateSid(sid);
+    }
 }

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionService.java

@@ -677,10 +677,25 @@ public class ScmVehicleGressionService extends MybatisBaseService<ScmVehicleGres
             return rb.setMsg("操作失败!提交的数据不一致");
         }
         String sid = dto.getSid();
-        //存放车架号
-        //判断要提交的车辆sid是否存在于临时表中
-
+        //查询车架号与存放地点是否匹配
         List<ScmVehicleGressionVehDto> scmVehicleGressionVehDtos = dto.getScmVehicleGressionVehs();
+        String vinNo = "";
+        for (ScmVehicleGressionVehDto v : scmVehicleGressionVehDtos) {
+            //根据车辆sid查询存放地点是否与该存放地点一致。将不一致的查询出来
+            ResultBean<BaseVehicleSelectVo> baseVehicleSelectVoResultBean = baseVehicleFeign.details(v.getVehSid());
+            if (!baseVehicleSelectVoResultBean.getSuccess()) {
+                return rb.setMsg("选择的车辆中包含车辆不存在的数据");
+            }
+            BaseVehicleSelectVo baseVehicleSelectVo = baseVehicleSelectVoResultBean.getData();
+            if (!dto.getLocationSid().equals(baseVehicleSelectVo.getLocation())) {
+                vinNo = v.getVehVin() + ",";
+            }
+        }
+        if (StringUtils.isNotBlank(vinNo)) {
+            vinNo = vinNo.replace(",", "");
+            return rb.setMsg(vinNo + "的车辆不再该现存放地点内");
+        }
+        //判断要提交的车辆sid是否存在于临时表中
         for (ScmVehicleGressionVehDto v : scmVehicleGressionVehDtos) {
             List<BaseVehicleTempstateVo> carSidList = baseVehicleTempstateFeign.selectAll("001").getData();
             for (BaseVehicleTempstateVo vv : carSidList) {

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinventory/ScmVehicleInventoryRest.java

@@ -70,6 +70,13 @@ public class ScmVehicleInventoryRest implements ScmVehicleInventoryFeign {
         return rb.success().setData(pv);
     }
 
+    @Override
+    public ResultBean<PagerVo<ScmVehicleInventoryVo>> stayListPage(PagerQuery<ScmVehicleStayInventoryQuery> pq) {
+        ResultBean rb = ResultBean.fireFail();
+        PagerVo<ScmVehicleInventoryVo> pv = scmVehicleInventoryService.stayListPage(pq);
+        return rb.success().setData(pv);
+    }
+
     @Override
     public ResultBean updateState(String sid, String inventoryStateKey, String inventoryState, String certificateKey, String certificate, String remarks) {
         return scmVehicleInventoryService.updateState(sid, inventoryStateKey, inventoryState, remarks);

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinventory/ScmVehicleInventoryService.java

@@ -35,6 +35,7 @@ import com.yxt.anrui.base.api.basevehicle.BaseVehicleVo;
 import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
 import com.yxt.anrui.scm.api.scmfile.ScmFile;
 import com.yxt.anrui.scm.api.scmvehicleinventory.*;
+import com.yxt.anrui.scm.api.scmvehicleinventory.ScmVehicleStayInventoryQuery;
 import com.yxt.anrui.scm.api.scmvehiclepatrolinspectionsheet.ScmVehiclePatrolinspectionsheetDto;
 import com.yxt.anrui.scm.api.scmvehiclestayinventory.*;
 import com.yxt.anrui.scm.api.scmvehinventorymonth.AppScmVehInventorymonthVo;
@@ -104,8 +105,8 @@ public class ScmVehicleInventoryService extends MybatisBaseService<ScmVehicleInv
         ScmVehicleInventoryQuery query = pq.getParams();
         QueryWrapper<ScmVehicleInventory> qw = new QueryWrapper<>();
         qw.eq("createOrgSid", query.getCreateOrgSid());
-        if (StringUtils.isNotBlank(query.getMainSid())) {
-            qw.like("mainSid", query.getMainSid());
+        if (StringUtils.isNotBlank(query.getVinNo())) {
+            qw.like("vinNo", query.getVinNo());
         }
         if (StringUtils.isNotBlank(query.getLocationSid())) {
             qw.eq("locationSid", query.getLocationSid());
@@ -113,14 +114,34 @@ public class ScmVehicleInventoryService extends MybatisBaseService<ScmVehicleInv
         if (StringUtils.isNotBlank(query.getInventoryStateKey())) {
             qw.eq("InventoryStateKey", query.getInventoryStateKey());
         }
+        qw.ne("InventoryStateKey", "");
         String inventStartDate = query.getInventStartDate();
         String inventEndDate = query.getInventEndDate();
         qw.apply(StringUtils.isNotEmpty(inventStartDate), "date_format (InventoryDate,'%Y-%m-%d') >= date_format('" + inventStartDate + "','%Y-%m-%d')").
                 apply(StringUtils.isNotEmpty(inventEndDate), "date_format (InventoryDate,'%Y-%m-%d') <= date_format('" + inventEndDate + "','%Y-%m-%d')"
                 );
+        IPage<ScmVehicleInventory> page = PagerUtil.queryToPage(pq);
+        IPage<ScmVehicleInventoryVo> pagging = baseMapper.selectPageVo(page, qw);
+        PagerVo<ScmVehicleInventoryVo> p = PagerUtil.pageToVo(pagging, null);
+        return p;
+    }
 
+    public PagerVo<ScmVehicleInventoryVo> stayListPage(PagerQuery<ScmVehicleStayInventoryQuery> pq) {
+        ScmVehicleStayInventoryQuery query = pq.getParams();
+        QueryWrapper<ScmVehicleInventory> qw = new QueryWrapper<>();
+        qw.eq("createOrgSid", query.getCreateOrgSid());
+        if (StringUtils.isNotBlank(query.getVinNo())) {
+            qw.like("vinNo", query.getVinNo());
+        }
+        if (StringUtils.isNotBlank(query.getLocationSid())) {
+            qw.eq("locationSid", query.getLocationSid());
+        }
+        qw.eq("InventoryStateKey", "");
         IPage<ScmVehicleInventory> page = PagerUtil.queryToPage(pq);
         IPage<ScmVehicleInventoryVo> pagging = baseMapper.selectPageVo(page, qw);
+        for (ScmVehicleInventoryVo record : pagging.getRecords()) {
+            record.setInventoryState("");
+        }
         PagerVo<ScmVehicleInventoryVo> p = PagerUtil.pageToVo(pagging, null);
         return p;
     }

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehinventorymonth/ScmVehInventorymonthMapper.xml

@@ -4,7 +4,15 @@
     <!--    <where> ${ew.sqlSegment} </where>-->
     <!--    ${ew.customSqlSegment} -->
     <select id="selectPageVo" resultType="com.yxt.anrui.scm.api.scmvehinventorymonth.ScmVehInventorymonthVo">
-        SELECT * FROM scm_veh_inventorymonth
+        SELECT
+        sid,
+        billNo,
+        createTime,
+        createBySid,
+        createByName,
+        `state`
+        FROM
+        scm_veh_inventorymonth
         <where>${ew.sqlSegment}</where>
     </select>
 

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehinventorymonth/ScmVehInventorymonthService.java

@@ -97,9 +97,38 @@ public class ScmVehInventorymonthService extends MybatisBaseService<ScmVehInvent
 
     public PagerVo<ScmVehInventorymonthVo> listPageVo(PagerQuery<ScmVehInventorymonthQuery> pq) {
         ScmVehInventorymonthQuery query = pq.getParams();
-        QueryWrapper<ScmVehInventorymonth> qw = createQueryWrapper(query);
+        QueryWrapper<ScmVehInventorymonth> qw = new QueryWrapper<>();
+        String createStartTime = query.getCreateStartTime();
+        String createEndTime = query.getCreateEndTime();
+        qw.eq("createOrgSid", query.getCreateOrgSid());
+        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')"
+                );
+        if (StringUtils.isNotBlank(query.getCreateByName())) {
+            qw.like("createByName", query.getCreateByName());
+        }
+        qw.orderByDesc("id");
         IPage<ScmVehInventorymonth> page = PagerUtil.queryToPage(pq);
         IPage<ScmVehInventorymonthVo> pagging = baseMapper.selectPageVo(page, qw);
+        for (ScmVehInventorymonthVo record : pagging.getRecords()) {
+            String mainSid = record.getSid();
+            AppVehInventorymonthVo vo = scmVehicleInventoryService.getMonthByMainSid(mainSid);
+            record.setSurplusNumber(String.valueOf(vo.getSurplusNumber()));
+            record.setTotalNumber(String.valueOf(vo.getTotalNumber()));
+            record.setLossNumber(String.valueOf(vo.getLossNumber()));
+            record.setDamageNumber(String.valueOf(vo.getDamageNumber()));
+            record.setProfitNumber(String.valueOf(vo.getProfitNumber()));
+            record.setActualNumber(String.valueOf(vo.getProfitNumber() + vo.getNormalNumber() + vo.getDamageNumber() + vo.getLossNumber()));
+            if ("0".equals(record.getState())) {
+                if (vo.getSurplusNumber() == 0) {
+                    record.setShowBtn(true);
+                } else {
+                    record.setShowBtn(false);
+                }
+            } else {
+                record.setShowBtn(false);
+            }
+        }
         PagerVo<ScmVehInventorymonthVo> p = PagerUtil.pageToVo(pagging, null);
         return p;
     }
@@ -151,8 +180,10 @@ public class ScmVehInventorymonthService extends MybatisBaseService<ScmVehInvent
             if (vehicleCarInventoryListPageVos.size() > 0) {
                 for (AppScmVehicleCarInventoryListPageVo vehicleCarInventoryListPageVo : vehicleCarInventoryListPageVos) {
                     ScmVehInventorymonth scmVehInventorymonth = fetchBySid(vehicleCarInventoryListPageVo.getMainSid());
-                    if (scmVehInventorymonth.getState() == 0) {
-                        return rb.setMsg("上次盘库记录未生成报告，请先生成再操作！");
+                    if (scmVehInventorymonth != null) {
+                        if (scmVehInventorymonth.getState() == 0) {
+                            return rb.setMsg("上次盘库记录未生成报告，请先生成再操作！");
+                        }
                     }
                 }
             }

doc/databases/base_tables.sql

@@ -922,10 +922,13 @@ CREATE TABLE `base_vehicle_out`
     `isTerminal`       varchar(64)          DEFAULT NULL COMMENT '是否为终端客户',
     `customerName`     varchar(255)         DEFAULT NULL COMMENT '客户名称',
     `mobile`           varchar(255)         DEFAULT NULL COMMENT '手机号',
+    `customerSid`      varchar(255)         DEFAULT NULL COMMENT '客户sid',
     `actualCustomer`   varchar(255)         DEFAULT NULL COMMENT '实际购车人名称',
     `actualMobile`     varchar(255)         DEFAULT NULL COMMENT '实际购车人手机号',
+    `actualSid`        varchar(255)         DEFAULT NULL COMMENT '实际购车人sid',
     `giftsDescription` varchar(255)         DEFAULT NULL COMMENT '赠品说明',
     `distributorName`  varchar(255)         DEFAULT NULL COMMENT '二次经销商',
+    `distributorSid`   varchar(255)         DEFAULT NULL COMMENT '二次经销商sid',
     `rebateAmount`     varchar(255)         DEFAULT NULL COMMENT '返利金额',
     PRIMARY KEY (`id`),
     KEY `id` (`id`)