移动端订单修改

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigMapper.xml

@@ -678,6 +678,7 @@
             WHERE
             bv.modelSid = bvc.modelSid
             AND bv.modelConfigSid = bvc.configurationItemsSid
+            AND (bv.vehicleStateValue = '库存' or bv.vehicleStateValue = '在途' or bv.vehicleStateValue = '调入')
             AND bv.lockedState = #{state}
             AND bv.useOrgSid = #{orgSid}
             ) > 0

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

@@ -683,6 +683,7 @@
             WHERE
             bv.modelSid = bvm.sid
             AND bv.lockedState = #{state}
+            AND ( bv.vehicleStateValue = '库存' OR bv.vehicleStateValue = '在途' OR bv.vehicleStateValue = '调入' )
             AND bv.useOrgSid = #{useOrgSid} )
             > 0
         </where>

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositRest.java

@@ -62,7 +62,7 @@ import java.util.List;
  * @since 1.0
  */
 @Api(tags = "销售虚拟订单")
-@RestController("com.yxt.anrui.buscenter.biz.busmaindeposit.BusMainDepositRest")
+@RestController
 @RequestMapping("v1/busmaindeposit")
 public class BusMainDepositRest implements BusMainDepositFeign {
 

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java

@@ -2053,7 +2053,7 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
                 BeanUtil.copyProperties(query, flowTaskVo);
                 Map<String, Object> variables = new HashMap<>();
                 Map<String, Object> appMap = new HashMap<>();
-                appMap.put("virtualOrderSid", appMap);
+                appMap.put("virtualOrderSid", query.getBusinessSid());
                 variables.put("app", appMap);
                 flowTaskVo.setValues(variables);
                 ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.taskReject(flowTaskVo);

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/virtualOrders/AppBusMainDepositFeign.java

@@ -33,7 +33,7 @@ import java.util.List;
  */
 @Api(tags = "销售虚拟订单")
 @FeignClient(
-        contextId = "anrui-buscenter-BusMainDeposit",
+        contextId = "anrui-terminal-BusMainDeposit",
         name = "anrui-terminal",
         path = "autoservice/v1/virtualOrders",
         fallback = AppBusMainDepositFeignFallback.class)