销售订单选择虚拟订单为流程状态已办结的+移动端排产详情添加采购类型

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/app/AppVehicleApplyVo.java

@@ -43,4 +43,7 @@ public class AppVehicleApplyVo implements Vo {
 
     @ApiModelProperty(value = "排产列表")
     private List<AppVehicleApplyListVo> records = new ArrayList<>();
+
+    @ApiModelProperty(value = "采购类型")
+    private String applyType;
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyMapper.xml

@@ -72,7 +72,8 @@
                ba.procInstId,
                ba.taskId,
                ba.createOrgSid as userSid,
-               ba.createOrgName
+               ba.createOrgName,
+               ba.applyType
         from bus_vehicle_apply ba
         where sid = #{sid}
     </select>

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

@@ -57,6 +57,7 @@ import com.yxt.anrui.crm.api.crmcustomertemp.AppCrmCustomerTempInfoVo;
 import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempFeign;
 import com.yxt.anrui.flowable.api.flow.FlowableFeign;
 import com.yxt.anrui.flowable.api.flow.UpdateFlowFieldVo;
+import com.yxt.anrui.flowable.api.flowcomment.FlowComment;
 import com.yxt.anrui.flowable.api.flowtask.FlowTaskFeign;
 import com.yxt.anrui.flowable.api.flowtask.FlowTaskVo;
 import com.yxt.anrui.flowable.api.flowtask.LatestTaskVo;
@@ -1667,7 +1668,8 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
         }
         qw.eq("bc.customerSid", query.getCustomerSid());
         qw.eq("bd.depositBillTypeKey", "02");
-        qw.eq("bd.state", 1);
+//        qw.eq("bd.state", 1);
+        qw.eq("bd.nodeState", FlowComment.SETTLE.getRemark());//已办结
         return qw;
     }
 

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderdeposit/BusSalesOrderDepositService.java

@@ -42,6 +42,7 @@ import com.yxt.anrui.buscenter.biz.busdeposit.BusDepositService;
 import com.yxt.anrui.buscenter.biz.busdepositfictitious.BusDepositFictitiousService;
 import com.yxt.anrui.buscenter.biz.bussalesorder.BusSalesOrderService;
 import com.yxt.anrui.buscenter.biz.bussalesorderprice.BusSalesOrderPriceService;
+import com.yxt.anrui.flowable.api.flowcomment.FlowComment;
 import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
 import com.yxt.anrui.portal.api.sysuser.SysUserInfoVo;
 import com.yxt.common.base.service.MybatisBaseService;
@@ -259,7 +260,8 @@ public class BusSalesOrderDepositService extends MybatisBaseService<BusSalesOrde
                 }
             }
         }
-        qw.eq("bd.state", 1);
+//        qw.eq("bd.state", 1);
+        qw.eq("bd.nodeState", FlowComment.SETTLE.getRemark());//已办结
         qw.eq("bmd.depositBillTypeKey", "01");
         return qw;
     }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/vehicleApply/VehicleApplyVo.java

@@ -48,6 +48,8 @@ public class VehicleApplyVo implements Vo {
 
     @ApiModelProperty(value = "用户sid")
     private String userSid;
+    @JsonProperty("type")
+    private String applyType;
 
 
 }