车辆台账、简易订单、公司间调账优化

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeign.java

@@ -3,7 +3,6 @@ package com.yxt.anrui.base.api.basevehicle;
 import com.yxt.anrui.base.api.basemodelconfig.AppCarConfigSummaryVo;
 import com.yxt.anrui.base.api.basepurchasesystem.BasePurchSystemVo;
 import com.yxt.anrui.base.api.basevehicle.app.*;
-import com.yxt.anrui.base.api.basevehicleout.BaseVehicleOutQuery;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleQuery.java

@@ -45,6 +45,10 @@ public class BaseVehicleQuery implements Query {
     private String insideCode;
     @ApiModelProperty(value = "采购类型")
     private String manPurOrderTypeKey;
+
+    @ApiModelProperty(value = "买断结束日期")
+    private String solidEndDate;
+
     @ApiModelProperty(value = "厂家入库日期")
     private String priceDate;
     @ApiModelProperty(value = "买断状态")
@@ -57,8 +61,8 @@ public class BaseVehicleQuery implements Query {
 
     @ApiModelProperty(value = "买断开始日期")
     private String solidStartDate;
-    @ApiModelProperty(value = "买断结束日期")
-    private String solidEndDate;
+    @ApiModelProperty(value = "排产订单编号")
+    private String orderingNo;
 
 
     /***************车型查询**********************/

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

@@ -315,6 +315,9 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
         if (pagerQuery != null) {
             qw.eq("bv.isDelete", "0");
             qw.eq("bv.createOrgSid", pagerQuery.getCreateOrgSid());
+            if (StringUtils.isNotBlank(pagerQuery.getOrderingNo())) {//排产订单编号
+                qw.like("bv.orderingNo", pagerQuery.getOrderingNo());
+            }
             if (StringUtils.isNotBlank(pagerQuery.getVinNo())) {//车架号
                 qw.like("bv.vinNo", pagerQuery.getVinNo());
             }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busmaindeposit/BusMainDepositQuery.java

@@ -51,7 +51,8 @@ public class BusMainDepositQuery implements Query {
 
     @ApiModelProperty("用户sid")
     private String userSid;
-    
+    @ApiModelProperty("订单编号")
+    private String billNo;
 	@ApiModelProperty("业务员Sid")
     private String staffSid;
 

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

@@ -108,6 +108,29 @@
                 </if>
             </where>
             order by bmd.id desc ) c
+            UNION ALL
+            select * from( SELECT
+            bmd.sid AS virtualOrderSid,
+            bmd.billNo AS virtualOrderId,
+            bmd.createDate AS virtualOrderDate,
+            bmd.depositBillTypeKey as virtualOrderType,
+            bmd.staffName AS sellerName,
+            bmd.orgName,
+            if(length(bmd.nodeState) > 0, nodeState, '待提交') AS virtualOrderState,
+            bmd.remarks,
+            bd.usedDeposit
+            FROM bus_main_deposit bmd
+            LEFT JOIN bus_deposit_vehicle_customer bdvc ON bmd.sid = bdvc.billSid
+            LEFT JOIN bus_deposit bd ON bmd.sid = bd.billSid
+            <where>
+                ${ew.sqlSegment}
+                <if test="name != '' and name != null">
+                    and bmd.billNo LIKE concat('%'
+                    , #{name}
+                    , '%')
+                </if>
+            </where>
+            order by bmd.id desc ) d
         </if>
     </select>
 

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

@@ -215,6 +215,10 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
             qw.eq("bmd.staffSid", query.getStaffSid());
         }
 
+        if (StringUtils.isNotBlank(query.getBillNo())) {
+            qw.like("bmd.billNo", query.getBillNo());
+        } //订单编号
+
         if (StringUtils.isNotBlank(query.getName())) {
             qw.and(wrapper -> wrapper.like("bd.draweeName", query.getName()).or().like("bdvc.customerName", query.getName()));
         }

anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java

@@ -30,7 +30,7 @@ public enum ProcDefEnum {
     BASEOUTSOURCINGAPPLICATION("外采申请", "process_5tqysnjc:5:722504"),
     BASEMODELMODPRICE("车型调价申请", "process_kydcif7k:7:722512"),
     BASEINTERNALPURCHASE("调车申请", "process_i6luw5xq:3:722516"),
-    BASEACCADJAPPLY("调账申请", "process_r6pyzqoz:2:722520"),
+    BASEACCADJAPPLY("调账申请", "process_r6pyzqoz:4:1362508"),
     BUSDELIVEREDAPPLY("出库申请", "process_wgt1n66l:3:770004"),
     BASESHUNINVOICAPPLY("调车开票申请", "process_u4xrvaso:1:400008"),
     BASEVEHINSTALLMODPRICE("上装调价申请", "process_s0a0svth:1:492508"),
@@ -42,7 +42,7 @@ public enum ProcDefEnum {
     SCMCOLLECTIONREBATEWITHAPPLY("回款返利预提申请", "process_k4lodiyg:1:630004"),
     SCMCOLLECTIONREBATECHECKAPPLY("回款返利核对申请", "process_fgrv1mbv:1:630008"),
     CONTRACTAPPLY("合同审核", "process_gd8c9xd5:2:932504"),
-    BASEDISPACKAGEAPPLY("优惠包申请流程", "process_l8i6tqho:1:967504"),
+    BASEDISPACKAGEAPPLY("优惠包申请流程", "process_wxe83uvm:3:1230012"),
     BUSSALESORDERRETURNVEHAPPLY("销售订单退车申请", "process_tzjjs03y:1:1012504"),