优化

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/common/enums/DictCommonEnum.java

@@ -17,6 +17,7 @@ public class DictCommonEnum {
         CB_SCHEDULINGTYPE("01", "储备"),
         LS_SCHEDULINGTYPE("02", "临时"),
         CJRW_SCHEDULINGTYPE("03", "厂家任务"),
+        KHDD_SCHEDULINGTYPE("04", "客户订单"),
         ;
         private final String code;
         private final String remarks;

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclemodel/BaseVehicleModelMapper.java

@@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.yxt.anrui.base.api.basemodelconfig.BaseModelConfigVo;
 import com.yxt.anrui.base.api.basemodelconfig.PcChooseBaseModelConfigVo;
 import com.yxt.anrui.base.api.basevehiclemodel.*;
+import com.yxt.anrui.base.api.basevehmodelconfig.BaseVehmodelConfig;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
@@ -168,4 +169,6 @@ public interface BaseVehicleModelMapper extends BaseMapper<BaseVehicleModel> {
 
     @Select("select * from base_vehicle_model where createOrg = #{sid} AND isDelete = 0")
     List<BaseVehicleModel> selectBycreateOrg(String sid);
+
+    BaseVehmodelConfig selectDetailss(@Param("modelSid") String vehicleSid, @Param("configSid") String configSid, @Param("useOrgSid") String createOrgSid);
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclemodel/BaseVehicleModelMapper.xml

@@ -472,4 +472,8 @@
           and bbm.supplierTypeValue = '主机厂'
           and bm.sid = #{modelSid}
     </select>
+
+    <select id="selectDetailss" resultType="com.yxt.anrui.base.api.basevehmodelconfig.BaseVehmodelConfig">
+        select * from base_vehmodel_config WHERE modelSid = #{modelSid} and configurationItemsSid = #{configSid} and useOrgSid = #{useOrgSid}
+    </select>
 </mapper>

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclemodel/BaseVehicleModelService.java

@@ -11,6 +11,7 @@ import com.yxt.anrui.base.api.basevehiclemodel.*;
 import com.yxt.anrui.base.api.basevehiclemodelappendix.BaseVehicleModelAppendix;
 import com.yxt.anrui.base.api.basevehiclemodelappendix.BaseVehicleModelAppendixDto;
 import com.yxt.anrui.base.api.basevehiclemodelappendix.BaseVehicleModelAppendixVo;
+import com.yxt.anrui.base.api.basevehmodelconfig.BaseVehmodelConfig;
 import com.yxt.anrui.base.api.basevehmodelconfig.BaseVehmodelConfigVo;
 import com.yxt.anrui.base.biz.basemodelconfig.BaseModelConfigService;
 import com.yxt.anrui.base.biz.basevehiclemodelappendix.BaseVehicleModelAppendixService;
@@ -706,4 +707,8 @@ public class BaseVehicleModelService extends MybatisBaseService<BaseVehicleModel
     public List<BaseVehicleModel> selectBycreateOrg(String sid) {
         return baseMapper.selectBycreateOrg(sid);
     }
+
+    public BaseVehmodelConfig selectDetailss(String vehicleSid, String configSid, String createOrgSid) {
+        return baseMapper.selectDetailss(vehicleSid,configSid,createOrgSid);
+    }
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyService.java

@@ -11,6 +11,7 @@ import com.yxt.anrui.base.api.basemanufacturer.BaseManufacturer;
 import com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemDetailsVo;
 import com.yxt.anrui.base.api.basevehicle.BaseVehicle;
 import com.yxt.anrui.base.api.basevehiclemodel.BaseVehicleModel;
+import com.yxt.anrui.base.api.basevehmodelconfig.BaseVehmodelConfig;
 import com.yxt.anrui.base.api.busvehicleapply.*;
 import com.yxt.anrui.base.api.busvehicleapply.app.AppVehicleApplyListVo;
 import com.yxt.anrui.base.api.busvehicleapply.app.AppVehicleApplySzVo;
@@ -520,6 +521,7 @@ public class BusVehicleApplyService extends MybatisBaseService<BusVehicleApplyMa
         variables.put("app", appMap);
         //判断是否是储备订单，若是，则isTrue网关参数为true=============添加
         variables.put("isTrue", DictCommonEnum.schedulingType.CB_SCHEDULINGTYPE.getCode().equals(dto.getSchedulingTypeKey()));
+        variables.put("customer", DictCommonEnum.schedulingType.KHDD_SCHEDULINGTYPE.getCode().equals(dto.getSchedulingTypeKey()));
         if (DictCommonEnum.schedulingType.CB_SCHEDULINGTYPE.getCode().equals(dto.getSchedulingTypeKey())) {
             bv.setNextNodeUserSids(dto.getUserSids());
         }
@@ -642,6 +644,7 @@ public class BusVehicleApplyService extends MybatisBaseService<BusVehicleApplyMa
         variables.put("money", busVehicleApply.getCurrentAmount().intValue() > 0);
         //判断是否是储备订单，若是，则isTrue网关参数为true=============添加
         variables.put("isTrue", DictCommonEnum.schedulingType.CB_SCHEDULINGTYPE.getCode().equals(busVehicleApply.getSchedulingTypeKey()));
+        variables.put("customer", DictCommonEnum.schedulingType.KHDD_SCHEDULINGTYPE.getCode().equals(busVehicleApply.getSchedulingTypeKey()));
         //厂家采购工作名称：采购系统+采购原因+采购类型
         String orderNames = busVehicleApply.getOrgDeptName() + busVehicleApply.getSchedulingType() + busVehicleApply.getApplyType();
         variables.put("orderNames", orderNames);
@@ -775,6 +778,7 @@ public class BusVehicleApplyService extends MybatisBaseService<BusVehicleApplyMa
         variables.put("money", busVehicleApply.getCurrentAmount().intValue() > 0);
         //判断是否是储备订单，若是，则isTrue网关参数为true=============添加
         variables.put("isTrue", DictCommonEnum.schedulingType.CB_SCHEDULINGTYPE.getCode().equals(busVehicleApply.getSchedulingTypeKey()));
+        variables.put("customer", DictCommonEnum.schedulingType.KHDD_SCHEDULINGTYPE.getCode().equals(busVehicleApply.getSchedulingTypeKey()));
         //厂家采购工作名称：采购系统+采购原因+采购类型
         String orderNames = busVehicleApply.getOrgDeptName() + busVehicleApply.getSchedulingType() + busVehicleApply.getApplyType();
         variables.put("orderNames", orderNames);
@@ -803,6 +807,7 @@ public class BusVehicleApplyService extends MybatisBaseService<BusVehicleApplyMa
         variables.put("money", busVehicleApply.getCurrentAmount().intValue() > 0);
         //判断是否是储备订单，若是，则isTrue网关参数为true=============添加
         variables.put("isTrue", DictCommonEnum.schedulingType.CB_SCHEDULINGTYPE.getCode().equals(busVehicleApply.getSchedulingTypeKey()));
+        variables.put("customer", DictCommonEnum.schedulingType.KHDD_SCHEDULINGTYPE.getCode().equals(busVehicleApply.getSchedulingTypeKey()));
         //厂家采购工作名称：采购系统+采购原因+采购类型
         String orderNames = busVehicleApply.getOrgDeptName() + busVehicleApply.getSchedulingType() + busVehicleApply.getApplyType();
         variables.put("orderNames", orderNames);
@@ -846,6 +851,7 @@ public class BusVehicleApplyService extends MybatisBaseService<BusVehicleApplyMa
                 variables.put("money", busVehicleApply.getCurrentAmount().intValue() > 0);
                 //判断是否是储备订单，若是，则isTrue网关参数为true=============添加
                 variables.put("isTrue", DictCommonEnum.schedulingType.CB_SCHEDULINGTYPE.getCode().equals(busVehicleApply.getSchedulingTypeKey()));
+                variables.put("customer", DictCommonEnum.schedulingType.KHDD_SCHEDULINGTYPE.getCode().equals(busVehicleApply.getSchedulingTypeKey()));
                 //厂家采购工作名称：采购系统+采购原因+采购类型
                 String orderNames = busVehicleApply.getOrgDeptName() + busVehicleApply.getSchedulingType() + busVehicleApply.getApplyType();
                 variables.put("orderNames", orderNames);
@@ -1056,8 +1062,10 @@ public class BusVehicleApplyService extends MybatisBaseService<BusVehicleApplyMa
             BeanUtil.copyProperties(busVehicleApplyDetailDto, busVehicleApplyDetail, "sid");
             busVehicleApplyDetail.setApplySid(busVehicleApply.getSid());
             //内部编码
-            BaseVehicleModel baseVehicleModel = baseVehicleModelService.fetchBySid(busVehicleApplyDetail.getVehicleSid());
-            busVehicleApplyDetail.setInsideCode(baseVehicleModel.getInsideCode());
+            BaseVehmodelConfig baseVehmodelConfig = baseVehicleModelService.selectDetailss(busVehicleApplyDetail.getVehicleSid(),busVehicleApplyDetail.getConfigSid(),busVehicleApply.getCreateOrgSid());
+            if(baseVehmodelConfig != null){
+                busVehicleApplyDetail.setInsideCode(baseVehmodelConfig.getInsideCode());
+            }
             busVehicleApplyDetailService.insert(busVehicleApplyDetail);
             if (busVehicleApplyDetailDto.getBusVehicleApplySzPushDto() != null) {
                 BusVehicleApplySz busVehicleApplySz = new BusVehicleApplySz();