问题修改

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelmodprice/BaseModelModpriceService.java

@@ -38,10 +38,13 @@ import com.yxt.anrui.base.api.basemodelmodpricemodel.BaseModelModpriceModel;
 import com.yxt.anrui.base.api.basemodelmodpricemodel.BaseModelModpriceModelDto;
 import com.yxt.anrui.base.api.basemodelmodpricemodel.BaseModelModpriceModelVo;
 import com.yxt.anrui.base.api.baseoutsourcingapplication.GetNextNodeDto;
+import com.yxt.anrui.base.api.basevehmodelconfig.BaseVehmodelConfig;
 import com.yxt.anrui.base.api.busvehicleapply.BusVehicleApply;
 import com.yxt.anrui.base.api.busvehicleapply.flow.GetNodeVo;
 import com.yxt.anrui.base.api.busvehicleapply.flow.SubmitBusVehicleApplyDto;
 import com.yxt.anrui.base.biz.basemodelmodpricemodel.BaseModelModpriceModelService;
+import com.yxt.anrui.base.biz.basevehmodelconfig.BaseVehmodelConfigMapper;
+import com.yxt.anrui.base.biz.basevehmodelconfig.BaseVehmodelConfigService;
 import com.yxt.anrui.flowable.api.flow.FlowableFeign;
 import com.yxt.anrui.flowable.api.flow.UpdateFlowFieldVo;
 import com.yxt.anrui.flowable.api.flowtask.FlowTaskFeign;
@@ -62,6 +65,7 @@ import com.yxt.common.core.vo.PagerVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
@@ -94,6 +98,8 @@ public class BaseModelModpriceService extends MybatisBaseService<BaseModelModpri
     private FlowTaskFeign flowTaskFeign;
     @Autowired
     private SysUserFeign sysUserFeign;
+    @Autowired
+    private BaseVehmodelConfigMapper baseVehmodelConfigMapper;
 
     public PagerVo<BaseModelModpriceVo> listPageVo(PagerQuery<BaseModelModpriceQuery> pq) {
         BaseModelModpriceQuery query = pq.getParams();
@@ -268,6 +274,7 @@ public class BaseModelModpriceService extends MybatisBaseService<BaseModelModpri
     public ResultBean complete(BusinessVariables bv) {
         ResultBean rb = ResultBean.fireFail();
         BaseModelModprice baseModelModprice = fetchBySid(bv.getBusinessSid());
+        List<BaseModelModpriceModelVo> baseModelModpriceModelVos = baseModelModpriceModelService.fetchByMainSid(bv.getBusinessSid());
         if (bv.getTaskId().equals(baseModelModprice.getTaskId())) {
             ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.handleProsess(bv);
             if (!resultBean.getSuccess()) {
@@ -276,7 +283,19 @@ public class BaseModelModpriceService extends MybatisBaseService<BaseModelModpri
             String taskDefKey = resultBean.getData().getTaskDefKey();
             updateFlowFiled(BeanUtil.beanToMap(resultBean.getData()));
             if ("Event_end".equals(taskDefKey)) {
-
+                for (BaseModelModpriceModelVo baseModelModpriceModelVo : baseModelModpriceModelVos) {
+                    BigDecimal incOrDecInPrice = new BigDecimal(baseModelModpriceModelVo.getIncOrDecInPrice());
+                    BigDecimal guidedPrice = new BigDecimal(baseModelModpriceModelVo.getGuidedPrice());
+                    guidedPrice = guidedPrice.add(incOrDecInPrice);
+                    String modelSid = baseModelModpriceModelVo.getModelSid();
+                    String configSid = baseModelModpriceModelVo.getConfigSid();
+                    String createOrgSid = baseModelModprice.getCreateOrgSid();
+                    BaseVehmodelConfig baseVehmodelConfig = baseVehmodelConfigMapper.selectSid(modelSid, configSid, createOrgSid);
+                    if (baseVehmodelConfig == null) {
+                        return rb.setMsg("车型配置不存在");
+                    }
+                    baseVehmodelConfigMapper.updateGuidedPrice(guidedPrice, baseVehmodelConfig.getSid());
+                }
             }
             return rb.success().setData(resultBean.getData());
         } else {

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseshuntinginvoicingapply/BaseShuntingInvoicingApplyService.java

@@ -359,6 +359,9 @@ public class BaseShuntingInvoicingApplyService extends MybatisBaseService<BaseSh
                 nextNodeUserSids.append(sid).append(",");
             }
         }
+        if (StringUtils.isBlank(nextNodeUserSids)){
+            return rb.setMsg("下一环节暂无操作人员");
+        }
         String substring = nextNodeUserSids.substring(0,nextNodeUserSids.lastIndexOf(","));
         bv.setNextNodeUserSids(substring);
         return handleProcess(bv, rb, baseShuntingInvoicingApply);

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

@@ -1187,6 +1187,8 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
             qw.eq("bv.lockedState", VehicleState.LockEnum.UN_LOCK.getCode());
             //库存状态：库存
             qw.eq("bv.vehicleState", VehicleState.StockEnum.STOCK.getCode());
+            //调车状态：未调车
+            qw.eq("bv.witPinState","100");
         }
         return qw;
     }

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

@@ -32,11 +32,9 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.yxt.anrui.base.api.basemodelconfig.AppModelConfigListVo;
 import com.yxt.anrui.base.api.basevehmodelconfig.*;
-import org.apache.ibatis.annotations.Delete;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-import org.apache.ibatis.annotations.Select;
+import org.apache.ibatis.annotations.*;
 
+import java.math.BigDecimal;
 import java.util.List;
 
 /**
@@ -134,4 +132,7 @@ public interface BaseVehmodelConfigMapper extends BaseMapper<BaseVehmodelConfig>
     IPage<BaseVehmodelConfigVos> selVehModelByUseOrgSidAndModelSidAndConfigSid(IPage<BaseVehmodelConfig> page,@Param(Constants.WRAPPER) QueryWrapper<BaseVehmodelConfigVos> qw);
 
     BaseVehmodelConfig selectSid(@Param("modelSid") String modelSid, @Param("configSid") String configSid, @Param("useOrgSid") String useOrgSid);
+
+    @Update("update base_vehmodel_config set guidedPrice = #{guidedPrice} where sid = #{sid}")
+    void updateGuidedPrice(@Param("guidedPrice") BigDecimal guidedPrice,@Param("sid") String sid);
 }

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinbound/ScmApplyInboundVo.java

@@ -9,6 +9,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.validation.constraints.NotBlank;
 import java.math.BigDecimal;
 import java.util.Date;
 import java.util.List;
@@ -71,6 +72,11 @@ public class ScmApplyInboundVo implements Vo {
     @ApiModelProperty("二次运费")
     private BigDecimal secondaryFreight;
 
+    @ApiModelProperty("用户sid")
+    private String userSid;
+    @ApiModelProperty("车辆台数")
+    private String num;
+
     @ApiModelProperty("政策1")
     private String policyOne;
     @ApiModelProperty("可享受金额1")

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclestayinventory/ScmVehicleStayInventoryMapper.xml

@@ -21,6 +21,8 @@
         scm_vehicle_stay_inventory svsi
         LEFT JOIN scm_vehicle_inventory svi
         ON svsi.`mainSid` = svi.`mainSid`
+        LEFT JOIN anrui_base.`base_vehicle` bv
+        ON bv.`vinNo` = svsi.mainSid
         <where>${ew.sqlSegment}</where>
         GROUP BY svsi.`mainSid`
     </select>

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclestayinventory/ScmVehicleStayInventoryService.java

@@ -92,6 +92,7 @@ public class ScmVehicleStayInventoryService extends MybatisBaseService<ScmVehicl
         if (StringUtils.isNotBlank(query.getLocationSid())) {
             qw.eq("svsi.locationSid", query.getLocationSid());
         }
+        qw.eq("bv.vehicleState","0001").or().eq("bv.vehicleState","0003");
         IPage<ScmVehicleStayInventory> page = PagerUtil.queryToPage(pq);
         IPage<ScmVehicleStayInventoryVo> pagging = baseMapper.selectPageVo(page, qw);
         PagerVo<ScmVehicleStayInventoryVo> p = PagerUtil.pageToVo(pagging, null);