Merge remote-tracking branch 'origin/master'

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseinternalpurchase/BaseInternalPurchaseService.java

@@ -637,7 +637,7 @@ public class BaseInternalPurchaseService extends MybatisBaseService<BaseInternal
             //调入部门全路径
             String orgSidPathDRBM = sysOrganizationVoDRBM.getOrgSidPath();
             userQuery.setRoleSid(candidateGroups.get(0));
-            if (id.equals("Activity_08r04ow")) {//判断下一环节是否为事业部副总经理审批(管辖调出方)
+            if (("Activity_08r04ow").equals(id)) {//判断下一环节是否为事业部副总经理审批(管辖调出方)
                 userQuery.setOrgSidPath(baseInternalPurchase.getOrgSidPath());
             }
             //else if (id.equals("Activity_02xqz9n")) {//判断下一环节是否为事业部副总经理审批(管辖调入方)

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

@@ -477,9 +477,8 @@ public class BaseVehicleRest implements BaseVehicleFeign {
             scmApplyInboundVehQueryDto.setVinNo(baseVehicleDto1.getVinNo());
             scmApplyInboundVehQueryDto.setMgroupCode(baseVehicleDto1.getCarBrandCode());
             scmApplyInboundVehQueryDto.setMgroupName(baseVehicleDto1.getCarBrandName());
-            BaseVehicleModel baseVehicleModel = baseVehicleModelService.selectDetails(baseVehicleDto1.getModelSid()).getData();
-            scmApplyInboundVehQueryDto.setVehicleTypeKey(baseVehicleModel.getVehicleType());
-            scmApplyInboundVehQueryDto.setVehicleTypeValue(baseVehicleModel.getVehicleTypeValue());
+            scmApplyInboundVehQueryDto.setVehicleTypeKey(baseVehicleDto1.getManufSaleAccessKey());
+            scmApplyInboundVehQueryDto.setVehicleTypeValue(baseVehicleDto1.getManufSaleAccessName());
             scmApplyInboundVehQueryDto.setIunit("辆");
             scmApplyInboundVehQueryDto.setNum("1");
             scmApplyInboundVehQueryDto.setSettleMoney(Float.toString(baseVehicleDto1.getCostPrice()));

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinboundquery/ScmApplyInboundQueryRest.java

@@ -71,8 +71,8 @@ public class ScmApplyInboundQueryRest implements ScmApplyInboundQueryFeign {
 	@PostMapping("/save")
 	public ResultBean<String> save(@RequestBody ScmApplyInboundQueryDto dto){
 		ResultBean rb = ResultBean.fireFail();
-		scmApplyInboundQueryService.saveOrUpdateDto(dto);
-		return rb.success();
+		String sid = scmApplyInboundQueryService.saveOrUpdateDto(dto);
+		return rb.success().setData(sid);
 	}
 
 	@Override

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinboundquery/ScmApplyInboundQueryService.java

@@ -284,7 +284,7 @@ public class ScmApplyInboundQueryService extends MybatisBaseService<ScmApplyInbo
                 if (ManPurOrderType.ManOrderType.PC_ORDER.getCode().equals(scmApplyInboundQuery.getManPurOrderTypeKey()) ||
                         ManPurOrderType.ManOrderType.TC_ORDER.getCode().equals(scmApplyInboundQuery.getManPurOrderTypeKey())) {
                     //车辆类型-厂家外采和调车
-                    sf.setCllx(scmApplyInboundVehQueryDetailsVo.getVehicleTypeValue());
+                    sf.setCllx(scmApplyInboundVehQueryDetailsVo.getVehicleTypeKey());
                     sf.setCllxType("sellChannel");
                     //填充直接调拨单物料列表数据
                     StkTransferDirect.FBillEntry fBillEntry = new StkTransferDirect.FBillEntry();