车型以及常用配置关联表查询条件补充。

物料管理新增、编辑、修改回显、详情补充字段。

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelconfig/BaseVehmodelConfigQuery.java

@@ -55,4 +55,44 @@ public class BaseVehmodelConfigQuery implements Query {
     private String modelSid; // 车型sid
     @ApiModelProperty(value = "分公司sid")
     private String useOrgSid;
+    @ApiModelProperty("车身颜色key")
+    private String carColorKey;
+    @ApiModelProperty("缓速器key")
+    private String slowMachineKey;
+    @ApiModelProperty("后视镜key")
+    private String rearViewMirrorKey;
+    @ApiModelProperty("轮胎规格key")
+    private String tireSizeKey;
+    @ApiModelProperty("驾驶室规格key")
+    private String specificationKey;
+    @ApiModelProperty("后桥速比key")
+    private String rearAxleRatioKey;
+    @ApiModelProperty("空调key")
+    private String airConditionerKey;
+    @ApiModelProperty("轮毂材质key")
+    private String hubMaterialKey;
+    @ApiModelProperty("导流罩key")
+    private String baffleModelKey;
+    @ApiModelProperty("悬架key")
+    private String suspensionKey;
+    @ApiModelProperty("座椅key")
+    private String seatKey;
+    @ApiModelProperty("护轮罩key（有、无）")
+    private String tireCoverKey;
+    @ApiModelProperty("鞍座key")
+    private String saddleKey;
+    @ApiModelProperty("轴距key")
+    private String wheelbaseKey;
+    @ApiModelProperty("保险杠key")
+    private String bumperKey;
+    @ApiModelProperty("配置包key")
+    private String configuringBaoKey;
+    @ApiModelProperty("独立热源key(1有、0无)")
+    private String independentSourcesKey;
+    @ApiModelProperty("油箱/气罐key")
+    private String fuelTankKey;
+    @ApiModelProperty("多媒体key")
+    private String multimediaKey;
+    @ApiModelProperty("简述配置名称")
+    private String configName;
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationService.java

@@ -182,7 +182,7 @@ public class BaseOutsourcingApplicationService extends MybatisBaseService<BaseOu
 				}
 			}
 			entity.setUseOrgSid(orgSidPath);
-			entity.setCreateBySid(dto.getStaffSid());
+			entity.setCreateBySid(dto.getUserSid());
 			save(entity);
 			for (BaseOutsourcingApplicationVehicleDto baseOutsourcingApplicationVehicleDto : baseOutsourcingApplicationVehicleDtos) {
 				BaseOutsourcingApplicationVehicle baseOutsourcingApplicationVehicle = new BaseOutsourcingApplicationVehicle();

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigService.java

@@ -92,13 +92,73 @@ public class BaseVehmodelConfigService extends MybatisBaseService<BaseVehmodelCo
         // todo: 这里根据具体业务调整查询条件
         // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
         QueryWrapper<BaseVehmodelConfig> qw = new QueryWrapper<>();
-
+        qw.eq("bmc.isDelete", "0");
         if (StringUtils.isNotBlank(query.getModelSid())) {
             qw.eq("bvc.modelSid", query.getModelSid());
         }
         if (StringUtils.isNotBlank(query.getUseOrgSid())) {
             qw.eq("bvm.useOrgSid", query.getUseOrgSid());
         }
+        if (StringUtils.isNotBlank(query.getCarColorKey())) {//车身颜色
+            qw.like("bmc.carColorKey", query.getCarColorKey());
+        }
+        if (StringUtils.isNotBlank(query.getSlowMachineKey())) {//缓速器key
+            qw.like("bmc.slowMachineKey", query.getSlowMachineKey());
+        }
+        if (StringUtils.isNotBlank(query.getRearViewMirrorKey())) {//后视镜key
+            qw.like("bmc.rearViewMirrorKey", query.getRearViewMirrorKey());
+        }
+        if (StringUtils.isNotBlank(query.getTireSizeKey())) {//轮胎规格key
+            qw.like("bmc.tireSizeKey", query.getTireSizeKey());
+        }
+        if (StringUtils.isNotBlank(query.getSpecificationKey())) {//驾驶室规格key
+            qw.like("bmc.specificationKey", query.getSpecificationKey());
+        }
+        if (StringUtils.isNotBlank(query.getRearAxleRatioKey())) {//后桥速比key
+            qw.like("bmc.rearAxleRatioKey", query.getRearAxleRatioKey());
+        }
+        if (StringUtils.isNotBlank(query.getAirConditionerKey())) {//空调key
+            qw.like("bmc.airConditionerKey", query.getAirConditionerKey());
+        }
+        if (StringUtils.isNotBlank(query.getHubMaterialKey())) {//轮毂材质key
+            qw.like("bmc.hubMaterialKey", query.getHubMaterialKey());
+        }
+        if (StringUtils.isNotBlank(query.getBaffleModelKey())) {//导流罩key
+            qw.like("bmc.baffleModelKey", query.getBaffleModelKey());
+        }
+        if (StringUtils.isNotBlank(query.getSuspensionKey())) {//悬架key
+            qw.like("bmc.suspensionKey", query.getSuspensionKey());
+        }
+        if (StringUtils.isNotBlank(query.getSeatKey())) {//座椅key
+            qw.like("bmc.seatKey", query.getSeatKey());
+        }
+        if (StringUtils.isNotBlank(query.getTireCoverKey())) {//护轮罩key
+            qw.like("bmc.tireCoverKey", query.getTireCoverKey());
+        }
+        if (StringUtils.isNotBlank(query.getSaddleKey())) {//鞍座key
+            qw.like("bmc.saddleKey", query.getSaddleKey());
+        }
+        if (StringUtils.isNotBlank(query.getWheelbaseKey())) {//轴距key
+            qw.like("bmc.wheelbaseKey", query.getWheelbaseKey());
+        }
+        if (StringUtils.isNotBlank(query.getBumperKey())) {//保险杠key
+            qw.like("bmc.bumperKey", query.getBumperKey());
+        }
+        if (StringUtils.isNotBlank(query.getConfiguringBaoKey())) {//配置包key
+            qw.like("bmc.configuringBaoKey", query.getConfiguringBaoKey());
+        }
+        if (StringUtils.isNotBlank(query.getIndependentSourcesKey())) {//独立热源key
+            qw.like("bmc.independentSourcesKey", query.getIndependentSourcesKey());
+        }
+        if (StringUtils.isNotBlank(query.getFuelTankKey())) {//油箱/气罐key
+            qw.like("bmc.fuelTankKey", query.getFuelTankKey());
+        }
+        if (StringUtils.isNotBlank(query.getMultimediaKey())) {//多媒体key
+            qw.like("bmc.multimediaKey", query.getMultimediaKey());
+        }
+        if (StringUtils.isNotBlank(query.getConfigName())) {//简述配置名称
+            qw.like("bmc.configName", query.getConfigName());
+        }
         return qw;
     }
 

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmmaterial/ScmMaterial.java

@@ -105,6 +105,12 @@ public class ScmMaterial extends BaseEntity {
 	@ApiModelProperty("存货类别")
 	private String inventoryType;
 
+	@ApiModelProperty("存放地点")
+	private String storageLocation;
+
+	@ApiModelProperty("入库时间")
+	private String warehousingTime;
+
 	@ApiModelProperty("生产厂家")
 	private String manufacturer;
 

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmmaterial/ScmMaterialDetailsVo.java

@@ -76,6 +76,12 @@ public class ScmMaterialDetailsVo implements Vo {
     @ApiModelProperty("生产厂家sid")
     private String manufacturerSid;
 
+    @ApiModelProperty("存放地点")
+    private String storageLocation;
+
+    @ApiModelProperty("入库时间")
+    private String warehousingTime;
+
     @ApiModelProperty("备注")
     private String remarks; // 存货类别
 

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmmaterial/ScmMaterialDto.java

@@ -104,6 +104,18 @@ public class ScmMaterialDto implements Dto {
     @ApiModelProperty(value = "存货类别")
     private String inventoryType;
 
+    @ApiModelProperty("存放地点")
+    private String storageLocation;
+
+    @ApiModelProperty("入库时间")
+    private String warehousingTime;
+
+    @ApiModelProperty("生产厂家")
+    private String manufacturer;
+
+    @ApiModelProperty("生产厂家sid")
+    private String manufacturerSid;
+
     @ApiModelProperty(value = "备注")
     private String remarks;
 

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmmaterial/ScmMaterialVo.java

@@ -113,6 +113,12 @@ public class ScmMaterialVo implements Vo {
 	@ApiModelProperty("生产厂家sid")
 	private String manufacturerSid;
 
+	@ApiModelProperty("存放地点")
+	private String storageLocation;
+
+	@ApiModelProperty("入库时间")
+	private String warehousingTime;
+
 	@ApiModelProperty("备注")
 	private String remarks; // 存货类别