Merge remote-tracking branch 'origin/master'

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeign.java

@@ -279,7 +279,7 @@ public interface BusSalesOrderFeign {
     @ResponseBody
     ResultBean<String> selectTemporaryNo(@RequestParam("vehSid")String vehSid);
 
-    @ApiOperation(value = "根据车辆sid查询销售订单是否存在，若存在返回相关数据")
+    @ApiOperation(value = "出库初始化，根据车辆sid查询销售订单是否存在，若存在返回相关数据")
     @GetMapping("/selectOrderOne")
     @ResponseBody
     ResultBean<BusSaleOrderVehicleOutVo> selectOrderOne(@RequestParam("vinSid")String vinSid);

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/common/BusSalesOrderConstantUtils.java

@@ -17,8 +17,54 @@ public class BusSalesOrderConstantUtils {
      */
     public static String GENERAL_MANAGER_ROLESID = "135b4829-2928-4124-a5b3-7d4b1101a863";
 
+
     /**
-     * 车辆临时状态
+     * 流程中网关参数
+     * 是否是全款：IS_LOAN
+     * 销售部经理是否超权限：SALES_MANAGER_Price true超权限，false不超权限
+     * 总经理是否超权限：GENERAL_MANAGER_PRICE true超权限，false不超权限
+     */
+    public static String IS_LOAN = "isLoan";
+    public static String SALES_MANAGER_Price = "isPrice";
+    public static String GENERAL_MANAGER_PRICE = "isPrice1";
+
+    /**
+     * 付款类型
+     */
+    @Getter
+    public static enum PayTypeEnum {
+        /**
+         * 全款
+         */
+        FULL_PAYMENT("1", "全款"),
+        /**
+         * 贷款
+         */
+        LOAN("2", "贷款");
+
+        /**
+         * code值
+         */
+        private final String code;
+        /**
+         * 备注
+         */
+        private final String remarks;
+
+        /**
+         * 构造器
+         *
+         * @param code    code值
+         * @param remarks 备注
+         */
+        private PayTypeEnum(String code, String remarks) {
+            this.code = code;
+            this.remarks = remarks;
+        }
+    }
+
+    /**
+     * 车辆类型
      */
     @Getter
     public static enum TypeEnum {
@@ -55,4 +101,162 @@ public class BusSalesOrderConstantUtils {
             this.remarks = remarks;
         }
     }
+
+    /**
+     * 是否包含上装
+     */
+    @Getter
+    public static enum TopType {
+        /**
+         * 包含上装
+         */
+        YES("1", "包含"),
+        /**
+         * 不包含上装
+         */
+        NO("0", "不包含");
+
+        /**
+         * code值
+         */
+        private final String code;
+        /**
+         * 备注
+         */
+        private final String remarks;
+
+        /**
+         * 构造器
+         *
+         * @param code    code值
+         * @param remarks 备注
+         */
+        private TopType(String code, String remarks) {
+            this.code = code;
+            this.remarks = remarks;
+        }
+    }
+
+    /**
+     * 订金交纳方式
+     */
+    @Getter
+    public static enum DepositType {
+        /**
+         * 现交订金
+         */
+        CASH_DEPOSIT("01", "现交订金"),
+        /**
+         * 订金结转
+         */
+        DEPOSIT_CARRY_FORWARD("02", "订金结转");
+
+        /**
+         * code值
+         */
+        private final String code;
+        /**
+         * 备注
+         */
+        private final String remarks;
+
+        /**
+         * 构造器
+         *
+         * @param code    code值
+         * @param remarks 备注
+         */
+        private DepositType(String code, String remarks) {
+            this.code = code;
+            this.remarks = remarks;
+        }
+    }
+
+    /**
+     * 是否包含保险
+     */
+    @Getter
+    public static enum InsuranceType {
+        /**
+         * 包含保险
+         */
+        YES("1", "入保"),
+        /**
+         * 不包含保险
+         */
+        NO("0", "不入保");
+
+        /**
+         * code值
+         */
+        private final String code;
+        /**
+         * 备注
+         */
+        private final String remarks;
+
+        /**
+         * 构造器
+         *
+         * @param code    code值
+         * @param remarks 备注
+         */
+        private InsuranceType(String code, String remarks) {
+            this.code = code;
+            this.remarks = remarks;
+        }
+    }
+
+    /**
+     * 载货、自卸、搅拌车、专用车有上装、牵引车、起重机没有上装的
+     */
+    @Getter
+    public static enum VehicleFunctions {
+        /**
+         * 搅拌车
+         */
+        MIXER("7", "搅拌车"),
+        /**
+         * 载货车
+         */
+        TRUCK("005", "载货车"),
+        /**
+         * 牵引车
+         */
+        TRACTION("4", "牵引车"),
+        /**
+         * 专用车/特种车
+         */
+        SPECIAL("5", "专用车/特种车"),
+        /**
+         * 自卸车
+         */
+        DUMP("3", "自卸车"),
+        /**
+         * 起重机
+         */
+        CRANCE("6", "起重机");
+
+        /**
+         * code值
+         */
+        private final String code;
+        /**
+         * 备注
+         */
+        private final String remarks;
+
+        /**
+         * 构造器
+         *
+         * @param code    code值
+         * @param remarks 备注
+         */
+        private VehicleFunctions(String code, String remarks) {
+            this.code = code;
+            this.remarks = remarks;
+        }
+    }
+
+
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderdeposit/BusSalesOrderDepositService.java

@@ -38,6 +38,7 @@ import com.yxt.anrui.buscenter.api.bussalesorderdeposit.BusSalesOrderDepositDeta
 import com.yxt.anrui.buscenter.api.bussalesorderdeposit.BusSalesOrderDepositDto;
 import com.yxt.anrui.buscenter.api.bussalesorderdeposit.app.*;
 import com.yxt.anrui.buscenter.api.bussalesorderprice.BusSalesOrderPrice;
+import com.yxt.anrui.buscenter.api.common.BusSalesOrderConstantUtils;
 import com.yxt.anrui.buscenter.biz.busdeposit.BusDepositService;
 import com.yxt.anrui.buscenter.biz.busdepositfictitious.BusDepositFictitiousService;
 import com.yxt.anrui.buscenter.biz.bussalesorder.BusSalesOrderService;
@@ -203,7 +204,7 @@ public class BusSalesOrderDepositService extends MybatisBaseService<BusSalesOrde
         //先计算需补交订金是多少
         //总的结转金额
         BigDecimal makeUpDecimal = new BigDecimal("0");
-        if ("02".equals(dto.getDepositTypeKey())) {
+        if (BusSalesOrderConstantUtils.DepositType.DEPOSIT_CARRY_FORWARD.getCode().equals(dto.getDepositTypeKey())) {
             List<AppBusSalesOrderDepositListDto> listVos = dto.getVirtualOrderList();
             listVos.removeAll(Collections.singleton(null));
             if (!listVos.isEmpty()) {
@@ -262,7 +263,7 @@ public class BusSalesOrderDepositService extends MybatisBaseService<BusSalesOrde
             BeanUtil.copyProperties(dto, busSalesOrderDeposit, "sid");
             //计算需补交订金
             if (StringUtils.isNotBlank(dto.getDepositAll())) {
-                if ("02".equals(dto.getDepositTypeKey())) {
+                if (BusSalesOrderConstantUtils.DepositType.DEPOSIT_CARRY_FORWARD.getCode().equals(dto.getDepositTypeKey())) {
                     BigDecimal bigDecimalAll = new BigDecimal(dto.getDepositAll());
                     busSalesOrderDeposit.setMakeUpDeposit(bigDecimalAll.subtract(makeUpDecimal));
                 }
@@ -274,13 +275,13 @@ public class BusSalesOrderDepositService extends MybatisBaseService<BusSalesOrde
             BeanUtil.copyProperties(dto, busSalesOrderDeposit, "sid");
             //计算需补交订金
             if (StringUtils.isNotBlank(dto.getDepositAll())) {
-                if ("02".equals(dto.getDepositTypeKey())) {
+                if (BusSalesOrderConstantUtils.DepositType.DEPOSIT_CARRY_FORWARD.getCode().equals(dto.getDepositTypeKey())) {
                     BigDecimal bigDecimalAll = new BigDecimal(dto.getDepositAll());
                     busSalesOrderDeposit.setMakeUpDeposit(bigDecimalAll.subtract(makeUpDecimal));
                 }
             }
             baseMapper.updateById(busSalesOrderDeposit);
-            if ("01".equals(dto.getDepositTypeKey())) {
+            if (BusSalesOrderConstantUtils.DepositType.CASH_DEPOSIT.getCode().equals(dto.getDepositTypeKey())) {
                 //将需补交订金设置为null
                 baseMapper.updateMakeUpDeposit(depositSid);
 
@@ -305,7 +306,7 @@ public class BusSalesOrderDepositService extends MybatisBaseService<BusSalesOrde
             busDepositFictitiousService.deleteByDepositSid(depositSid);
         }
         //若缴纳方式为订金结转
-        if ("02".equals(dto.getDepositTypeKey())) {
+        if (BusSalesOrderConstantUtils.DepositType.DEPOSIT_CARRY_FORWARD.getCode().equals(dto.getDepositTypeKey())) {
             List<AppBusSalesOrderDepositListDto> listVos = dto.getVirtualOrderList();
             listVos.removeAll(Collections.singleton(null));
             BigDecimal bigDecimalAll = new BigDecimal("0");

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/AppFinCollectionConfirmationDetailedVo.java

@@ -69,6 +69,7 @@ public class AppFinCollectionConfirmationDetailedVo implements Vo {
     private String purchaseSystemName;
 
     private String reason;
+    private String cotlectionBitiStateValue;
 
 
 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java

@@ -902,13 +902,15 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
         vo.setImages(images);
         FinCollectionConfirmation finCollectionConfirmation = fetchBySid(query.getCollectionBillSid());
         if(finCollectionConfirmation.getAuditState() ==2){
+            vo.setCotlectionBitiStateValue("驳回");
 //            String confirmationDetails = finCollectionConfirmation.getConfirmName()+"于"+finCollectionConfirmation.getConfirmDate()+"已驳回，原因是："+finCollectionConfirmation.getReason();
 //            String confirmationDetails = finCollectionConfirmation.getConfirmName()+"于"+finCollectionConfirmation.getConfirmDate()+"已驳回，原因是："+finCollectionConfirmation.getReason();
             vo.setReason(finCollectionConfirmation.getReason());
-        }/*else if(finCollectionConfirmation.getAuditState() == 3){
-            String confirmationDetails = finCollectionConfirmation.getConfirmName()+"于"+finCollectionConfirmation.getConfirmDate()+"已确认";
-            vo.setReason(confirmationDetails);
-        }*/
+        }else if(finCollectionConfirmation.getAuditState() == 3){
+//            String confirmationDetails = finCollectionConfirmation.getConfirmName()+"于"+finCollectionConfirmation.getConfirmDate()+"已确认";
+//            vo.setReason(confirmationDetails);
+            vo.setCotlectionBitiStateValue("确认");
+        }
         return rb.success().setData(vo);
     }
 

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

@@ -208,7 +208,26 @@ public class SysOrganizationService extends MybatisBaseService<SysOrganizationMa
             } else {
                 sysStaffOrg.setOrgSidPath(entity.getSid());
             }
-            String psid = entity.getPsid();
+            //根据orgSidPath查询全名称
+            if (StringUtils.isNotBlank(sysStaffOrg.getOrgSidPath())) {
+                StringBuilder orgName = new StringBuilder();
+                List<String> split = Arrays.asList(sysStaffOrg.getOrgSidPath().split("/"));
+                if(split.size()>1){
+                    for(int i = 0;i<split.size();i++){
+                        SysOrganization sysOrganization = fetchBySid(split.get(i));
+                        if(i == 0){
+                            orgName = orgName.append(sysOrganization.getName());
+                        }else{
+                            orgName = orgName.append("/").append(sysOrganization.getName());
+                        }
+                    }
+                }else{
+                    SysOrganization sysOrganization = fetchBySid(split.get(0));
+                    orgName = orgName.append(sysOrganization.getName());
+                }
+                sysStaffOrg.setOrgNamePath(orgName.toString());
+            }
+            /*String psid = entity.getPsid();
             if (StringUtils.isNotBlank(psid)) {
                 SysOrganization sysOrganization = this.fetchBySid(psid);
                 if (sysOrganization != null) {
@@ -216,7 +235,7 @@ public class SysOrganizationService extends MybatisBaseService<SysOrganizationMa
                 } else {
                     sysStaffOrg.setOrgNamePath(entity.getName());
                 }
-            }
+            }*/
             sysStaffOrgService.save(sysStaffOrg);
             //==========================添加清空变化的用户的token
             List<SysStaffOrgVo> sysStaffOrgVos1 = sysStaffOrgService.selectByStaffS(sid);

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

@@ -679,6 +679,7 @@ public class SysStaffinfoService extends MybatisBaseService<SysStaffinfoMapper,
         }
         qw.eq("ss.isDelete", 0);
         qw.ne("sso.orgSid", deptSid);
+        qw.ne("ss.personTypeKey","01");
         return baseMapper.getStaffName(qw);
     }
 
@@ -689,6 +690,7 @@ public class SysStaffinfoService extends MybatisBaseService<SysStaffinfoMapper,
         }
         qw.eq("sso.orgSid", deptSid);
         qw.eq("ss.isDelete", 0);
+        qw.ne("ss.personTypeKey","01");
         return baseMapper.getStaffNameByDeptSid(qw);
     }
 

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleexamine/ScmVehicleExaminePageVo.java

@@ -26,6 +26,8 @@
 package com.yxt.anrui.scm.api.scmvehicleexamine;
 
 
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.yxt.common.core.vo.Vo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -79,8 +81,18 @@ public class ScmVehicleExaminePageVo implements Vo {
 
     @ApiModelProperty("供应商名称")
     private String manufacturerName; // 供应商名称
+    @ApiModelProperty("车型sid")
     private String modelSid;
 
     @ApiModelProperty("外采 排产 调车 sid")
     private String businessSid;
+    @ApiModelProperty("配置sid")
+    private String configSid;
+    @ApiModelProperty("车型与配置关联的表的sid")
+    private String modelSidAndConfig;
+    @ApiModelProperty("分公司sid")
+    private String useOrgSid;
+
+    @ApiModelProperty(value = "单台指导价")
+    private String guidedPrice;
 }

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleexamine/ScmVehicleExamineMapper.xml

@@ -109,7 +109,9 @@
         sve.inspection as inspectedName,
         sve.inspectionDate as inspectedDate,
         sve.inspectionResult as inspectedType,
-        sve.modelSid
+        sve.modelSid,
+        sve.configSid,
+        sve.useOrgSid
         FROM scm_vehicle_examine sve
         <where>
             ${ew.sqlSegment}

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleexamine/ScmVehicleExamineService.java

@@ -40,6 +40,8 @@ import com.yxt.anrui.base.api.basevehiclebrand.BaseVehicleBrand;
 import com.yxt.anrui.base.api.basevehiclebrand.BaseVehicleBrandFeign;
 import com.yxt.anrui.base.api.basevehiclemodel.BaseVehicleModel;
 import com.yxt.anrui.base.api.basevehiclemodel.BaseVehicleModelFeign;
+import com.yxt.anrui.base.api.basevehmodelconfig.BaseVehmodelConfigFeign;
+import com.yxt.anrui.base.api.basevehmodelconfig.BaseVehmodelVo;
 import com.yxt.anrui.base.api.busvehicleapply.BusVehicleApplyFeign;
 import com.yxt.anrui.base.common.enums.ManPurOrderType;
 import com.yxt.anrui.base.common.enums.OperVehicleState;
@@ -133,6 +135,8 @@ public class ScmVehicleExamineService extends MybatisBaseService<ScmVehicleExami
     private BaseVehicleBrandFeign baseVehicleBrandFeign;
     @Autowired
     private BaseVehicleModelFeign baseVehicleModelFeign;
+    @Autowired
+    private BaseVehmodelConfigFeign baseVehmodelConfigFeign;
 
 
     private QueryWrapper<ScmVehicleExamine> createQueryWrapper(ScmVehicleExamineQuery query) {
@@ -221,6 +225,12 @@ public class ScmVehicleExamineService extends MybatisBaseService<ScmVehicleExami
                     record.setManufacturerName(baseManufacturerAllVo.getBaseManufacturerDto().getManufacturerName());
                 }
             }
+            //根据车型sid、配置sid、分公司sid查询车型与配置的sid
+            ResultBean<BaseVehmodelVo> resultBean = baseVehmodelConfigFeign.selectOne(record.getModelSid(),record.getConfigSid(), record.getUseOrgSid());
+            if(resultBean.getData() != null){
+                record.setModelSidAndConfig(resultBean.getData().getModelConfigSid());
+                record.setGuidedPrice(resultBean.getData().getGuidedPrice());
+            }
         }
         return iPage;
     }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/collectionConfirm/ConfirmationDetailedVo.java

@@ -58,7 +58,9 @@ public class ConfirmationDetailedVo implements Vo {
     private String purchaseSystemSid;
     @ApiModelProperty("采购系统名称")
     private String purchaseSystemName;
-
+    @ApiModelProperty("驳回原因")
     private String reason;
+    @ApiModelProperty("审批状态")
+    private String cotlectionBitiStateValue;
 }