修改销售订单

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemiddleman/BaseMiddleQuery.java

@@ -13,7 +13,7 @@ import lombok.Data;
 public class BaseMiddleQuery implements Query {
     private static final long serialVersionUID = 1582178443217852396L;
 
-    private String orgName;
+    private String name;
     @ApiModelProperty("参数错误：userSid不能为空")
     private String userSid;
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemiddleman/BaseMiddlemanService.java

@@ -112,7 +112,7 @@ public class BaseMiddlemanService extends MybatisBaseService<BaseMiddlemanMapper
                 qw.eq("useOrgSid", resultBean.getData());
             }
         }
-        IPage<BaseMiddleVo> pagging = baseMapper.getMiddleList(page, qw, params.getOrgName());
+        IPage<BaseMiddleVo> pagging = baseMapper.getMiddleList(page, qw, params.getName());
         PagerVo<BaseMiddleVo> p = PagerUtil.pageToVo(pagging, null);
         return p;
     }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java

@@ -2391,7 +2391,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
         //总经理是否超权限
         variables.put("isPrice1", busSalesOrderPowerVo.getIsPower());
         //是否排产
-        variables.put("isLoan1", "3".equals(busSalesOrder.getType()));
+//        variables.put("isLoan1", "3".equals(busSalesOrder.getType()));
         return variables;
     }
 }

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

@@ -19,7 +19,7 @@ public enum ProcDefEnum {
     SCMVEHICLERETURN("采购退库", "process_md8aeoap:4:392512"),
     SEALAPPLY("盖章申请", "process_7h0z66tp:1:240064" ),
     BASEVEHICLEACTUALSALES("未售买断", "process_6qx07b75:6:457504"),//ToDo
-    SALESORDER("销售订单审批流程", "process_p5ils2rn:3:485012"),
+    SALESORDER("销售订单审批流程", "process_p5ils2rn:4:490008"),
     BASEOUTSOURCINGAPPLICATION("外采申请", "process_5tqysnjc:3:365004"),//TODO
     BASEMODELMODPRICE("车型调价申请", "process_kydcif7k:5:280004"),
     BASEINTERNALPURCHASE("调车申请", "process_i6luw5xq:1:400004"),