Merge remote-tracking branch 'origin/master'

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

@@ -39,12 +39,14 @@ import com.yxt.anrui.base.api.basemodelmodprice.BaseModelModprice;
 import com.yxt.anrui.base.api.basemodelmodprice.flow.SubmitBaseModelModPriceDto;
 import com.yxt.anrui.base.api.baseoutsourcingapplication.GetNextNodeDto;
 import com.yxt.anrui.base.api.basevehicle.BaseVehicle;
+import com.yxt.anrui.base.api.basevehicle.BaseVehicleDto;
 import com.yxt.anrui.base.api.busvehicleapply.BusVehicleApply;
 import com.yxt.anrui.base.api.busvehicleapply.BusVehicleApplyDto;
 import com.yxt.anrui.base.api.busvehicleapply.flow.GetNodeVo;
 import com.yxt.anrui.base.biz.baseinternalpurchasevehicle.BaseInternalPurchaseVehicleService;
 import com.yxt.anrui.base.biz.basevehicle.BaseVehicleService;
 import com.yxt.anrui.base.common.enums.BillTypeEnum;
+import com.yxt.anrui.base.common.enums.VehicleState;
 import com.yxt.anrui.base.common.utils.Rule;
 import com.yxt.anrui.base.common.utils.domain.BillNo;
 import com.yxt.anrui.flowable.api.flow.FlowableFeign;
@@ -60,6 +62,11 @@ import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
 import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
 import com.yxt.anrui.portal.api.sysuser.SysUserVo;
 import com.yxt.anrui.portal.api.sysuser.UserQuery;
+import com.yxt.anrui.scm.api.scmapplyinboundvehicle.ScmApplyInboundVehicleDto;
+import com.yxt.anrui.scm.api.scmvehicleexamine.ScmEntryVehicleExamineDto;
+import com.yxt.anrui.scm.api.scmvehicleexamine.ScmVehicleExamineFeign;
+import com.yxt.anrui.scm.api.scmvehinspectitem.ScmVehinspectItemDto;
+import com.yxt.anrui.scm.api.scmvehinspectitem.ScmVehinspectItemFeign;
 import com.yxt.common.base.utils.ConstantUtils;
 import org.apache.commons.lang3.StringUtils;
 import com.yxt.common.base.service.MybatisBaseService;
@@ -107,6 +114,10 @@ public class BaseInternalPurchaseService extends MybatisBaseService<BaseInternal
     private SysOrganizationFeign sysOrganizationFeign;
     @Autowired
     private BaseVehicleService baseVehicleService;
+    @Autowired
+    private ScmVehicleExamineFeign scmVehicleExamineFeign;
+    @Autowired
+    private ScmVehinspectItemFeign scmVehinspectItemFeign;
 
     private QueryWrapper<BaseInternalPurchase> createQueryWrapper(BaseInternalPurchaseQuery query) {
         // todo: 这里根据具体业务调整查询条件
@@ -378,6 +389,30 @@ public class BaseInternalPurchaseService extends MybatisBaseService<BaseInternal
                 return rb.setMsg(resultBean.getMsg());
             }
             updateFlowFiled(BeanUtil.beanToMap(resultBean.getData()));
+            if ("Event_end".equals(resultBean.getData().getTaskDefKey())) {
+                List<BaseInternalPurchaseVehicleVo> baseInternalPurchaseVehicleVos = baseInternalPurchaseVehicleService.fetchByMainSid(bv.getBusinessSid());
+                for (BaseInternalPurchaseVehicleVo booad : baseInternalPurchaseVehicleVos) {
+                    ScmEntryVehicleExamineDto scmEntryVehicleExamineDto = new ScmEntryVehicleExamineDto();
+                    //配置的名称
+                    scmEntryVehicleExamineDto.setConfigName(booad.getConfigName());
+                    scmEntryVehicleExamineDto.setConfigSid(booad.getConfigSid());
+                    scmEntryVehicleExamineDto.setModelName(booad.getVehicleAlias());
+                    scmEntryVehicleExamineDto.setModelSid(booad.getVehicleSid());
+                    //订单类型
+                    scmEntryVehicleExamineDto.setPurchaseTypeKey("03");
+                    scmEntryVehicleExamineDto.setPurchaseType("排产");
+                    scmEntryVehicleExamineDto.setUserSid(bv.getUserSid());
+                    scmEntryVehicleExamineDto.setVinNo(booad.getVinNo());
+                    scmEntryVehicleExamineDto.setInspectionResult("1");
+                    ResultBean<String> resultBean1 = scmVehicleExamineFeign.saveEntryCarInspectedInfo(scmEntryVehicleExamineDto);
+                    if (!resultBean1.getSuccess()) {
+                        return rb.setMsg("验车业务模块的数据推送失败!");
+                    }
+                    ScmVehinspectItemDto scmVehinspectItemDto = new ScmVehinspectItemDto();
+                    scmVehinspectItemDto.setVehInspectSid(resultBean1.getData());
+                    scmVehinspectItemFeign.save(scmVehinspectItemDto);
+                }
+            }
             return rb.success().setData(resultBean.getData());
         } else {
             return rb.setMsg("操作失败!提交的数据不一致");

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

@@ -127,6 +127,7 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
             if (StringUtils.isNotBlank(pagerQuery.getVehicleState())) {//库存状态
                 qw.eq("bv.vehicleState", pagerQuery.getVehicleState());
             }
+            qw.orderByDesc("bv.createTime");
         }
         return qw;
     }

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclereturn/ScmVehicleReturnMapper.xml

@@ -15,7 +15,7 @@
     </select>
 
     <select id="details" resultType="com.yxt.anrui.scm.api.scmvehiclereturn.ScmVehicleReturnDetailsVo">
-        select sid, DATE_FORMAT(createTime, '%Y-%m-%d') as createTime, reason, applicationName as name, money, remarks,applicationCode
+        select sid, DATE_FORMAT(createTime, '%Y-%m-%d') as createTime, reason, applicationName as name, money, remarks,applicationCode,orgName
         from scm_vehicle_return
         where sid = #{sid}
     </select>