Merge remote-tracking branch 'origin/master'

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppOrderDetailsVo.java

@@ -88,6 +88,7 @@ public class AppOrderDetailsVo implements Vo {
     private String financePlanValue;
     @ApiModelProperty("付款类型")
     private String payTypeKey;
+    private String payType;
 
     @ApiModelProperty("分公司sid")
     private String useOrgSid;

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdepositvehicle/ScheduledService.java

@@ -40,8 +40,8 @@ public class ScheduledService {
         Calendar calendar = Calendar.getInstance();
         calendar.setTime(now);
         //+1今天的时间加一天
-//        calendar.add(Calendar.DAY_OF_MONTH, -4);
-        calendar.add(Calendar.DAY_OF_MONTH, -2);
+        calendar.add(Calendar.DAY_OF_MONTH, -4);
+//        calendar.add(Calendar.DAY_OF_MONTH, -2);
         String tomorrow = sdf.format(calendar.getTime());
         //查询简易订单-车辆预定中
         //查询修改日期包含该日期的已经通过的简易订车单

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

@@ -2030,6 +2030,7 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
                     //收款银行value
                     finConfirmDto.setCollectionTypeValue(busDeposit.getPayType());
                     //付款方名称
+                    finConfirmDto.setPayerName(busDeposit.getDraweeName());
                     //收款金额
                     finConfirmDto.setCollectionMoney(busDeposit.getDeposit().toString());
                     //分公司sid
@@ -2042,6 +2043,8 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
                     finConfirmDto.setPushMessgae(1);
                     finConfirmDto.setBusSid(busMainDeposit.getSid());
                     finConfirmDto.setBusNo(busMainDeposit.getBillNo());
+                    finConfirmDto.setAuditState(1);
+                    finConfirmDto.setCreateByName(busDeposit.getStaffName());
                   /*  List<FinSelectDto> list = new ArrayList<>();
                     if (StringUtils.isNotBlank(busDeposit.getVehicleNum())) {
                         List<BusDepositCustomerVo> customerList = busDepositCustomerService.selectListByBillSid(bv.getBusinessSid());

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

@@ -198,6 +198,7 @@
                bo.billNo,
                bo.financePlanValue,
                bo.payTypeKey,
+               bo.payType,
                bo.useOrgSid,
                bo.licensePlateValue
         from bus_sales_order bo
@@ -279,6 +280,8 @@
     </select>
 
     <select id="selectOrderByContractNo" resultType="com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder">
-        select * from bus_sales_order where contractNo = #{contractNo}
+        select *
+        from bus_sales_order
+        where contractNo = #{contractNo}
     </select>
 </mapper>

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/app/FinConfirmDto.java

@@ -59,4 +59,10 @@ public class FinConfirmDto implements Dto {
     @ApiModelProperty("业务单据编号")
     private String busNo;
 
+    @ApiModelProperty("审核状态")
+    private Integer auditState;
+
+    @ApiModelProperty("创建人名称")
+    private String createByName;
+
 }

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincostapply/FinCostapply.java

@@ -90,4 +90,6 @@ public class FinCostapply extends BaseEntity {
     @ApiModelProperty(value = "任务id")
     private String taskId;
 
+    private String orgSidPath;
+
 }

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincostapply/FinCostapplyDto.java

@@ -84,4 +84,6 @@ public class FinCostapplyDto implements Dto {
     @ApiModelProperty(value = "备注")
     private String remarks;
 
+    private String orgSidPath;
+
 }

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapply/FinPaymentapply.java

@@ -108,4 +108,6 @@ public class FinPaymentapply extends BaseEntity {
     @ApiModelProperty(value = "品牌名称")
     private String carBrandName;
 
+    private String orgSidPath;
+
 }

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapply/FinPaymentapplyDto.java

@@ -97,4 +97,6 @@ public class FinPaymentapplyDto implements Dto {
     @ApiModelProperty(value = "品牌名称")
     private String carBrandName;
 
+    private String orgSidPath;
+
 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java

@@ -41,11 +41,10 @@ import com.yxt.anrui.base.api.commoncontract.CommonContractFeign;
 import com.yxt.anrui.base.common.enums.VehicleStateTempOrLast;
 import com.yxt.anrui.buscenter.api.busdelivered.BusDeliveredDto;
 import com.yxt.anrui.buscenter.api.busdelivered.BusDeliveredFeign;
-import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder;
 import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderFeign;
 import com.yxt.anrui.buscenter.api.bussalesorder.app.order.AppOrderDetailsVo;
 import com.yxt.anrui.buscenter.api.bussalesorder.app.order.AppOrderModelInfoVo;
-import com.yxt.anrui.buscenter.api.bussalesorderprice.BusSalesOrderPrice;
+import com.yxt.anrui.buscenter.api.bussalesorder.app.order.AppOrderPriceInfoVo;
 import com.yxt.anrui.fin.api.fincollectionconfirmation.*;
 import com.yxt.anrui.fin.api.fincollectionconfirmation.app.AppBusArrearsCarryMoneyVo;
 import com.yxt.anrui.fin.api.fincollectionconfirmation.app.FinConfirmDto;
@@ -1131,7 +1130,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
         //查询该申请下的所有待审核的款项明细
         BigDecimal subscriptionMoneyAll = new BigDecimal("0");
         List<FinSelectedReceivablesDetailedVo> finSelectedReceivablesDetailedVos = finSelectedReceivablesDetailedService.fetchByAuditState(sid, 1);
-        if(finSelectedReceivablesDetailedVos.size()>0){
+        if (finSelectedReceivablesDetailedVos.size() > 0) {
             finSelectedReceivablesDetailedVos.stream().forEach(v -> {
                 //已选款项明细sid
                 String selectSid = v.getSid();
@@ -1152,10 +1151,41 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
                 finSelectedReceivablesDetailedService.updateById(finSelectedReceivablesDetailed);
                 //ToDo:查询是否符合待出库的条件
                 //该合同编号下的该车架号的所有认款金额
-                List<FinSelectedReceivablesDetailedVo> voList = finSelectedReceivablesDetailedService.selectListByVin(v.getContractNo(),v.getVIN());
+                List<FinSelectedReceivablesDetailedVo> voList = finSelectedReceivablesDetailedService.selectListByVin(v.getContractNo(), v.getVIN(),3);
                 BigDecimal bigDecimalVinAll = voList.stream().map(FinSelectedReceivablesDetailedVo::getSubscriptionMoney).map(BigDecimal::new).reduce(BigDecimal.ZERO, BigDecimal::add);
                 //查询该合同编号下的销售订单的单车成交价
-                ResultBean<BusSalesOrderPrice> resultBean = busSalesOrderFeign.selectByContractNo(v.getContractNo());
+                ResultBean<CommonContract> commonContractResultBean = commonContractFeign.selectByNo(v.getContractNo());
+                if (commonContractResultBean.getSuccess()) {
+                    CommonContract commonContract = commonContractResultBean.getData();
+                    if (commonContract != null) {
+                        ResultBean<AppOrderDetailsVo> orderDetails = busSalesOrderFeign.getSaleOrderDetails(commonContract.getBusSid());
+                        AppOrderDetailsVo vo = orderDetails.getData();
+                        if (vo != null) {
+                            AppOrderPriceInfoVo priceInfoVo = vo.getPriceInfo();
+                            BigDecimal singleFinalPrice = new BigDecimal(priceInfoVo.getSingleFinalPrice());
+                            if (singleFinalPrice.compareTo(bigDecimalVinAll) == 0) {//推送待出库
+                                BusDeliveredDto busDeliveredDto = new BusDeliveredDto();
+                                busDeliveredDto.setSubscriptionKey(VehicleStateTempOrLast.PaymentEnum.PAY_MODELS.getCode());
+                                busDeliveredDto.setSubscription(VehicleStateTempOrLast.PaymentEnum.PAY_MODELS.getRemarks());
+                                busDeliveredDto.setPaymentMethodKey(vo.getPayTypeKey());
+                                busDeliveredDto.setPaymentMethod(vo.getPayType());
+                                busDeliveredDto.setContractNo(v.getContractNo());
+                                busDeliveredDto.setName(v.getCustomerName());
+                                busDeliveredDto.setVinNo(v.getVIN());
+                                busDeliveredDto.setMobile(v.getCustomerPhone());
+                                busDeliveredDto.setPrice(priceInfoVo.getSingleFinalPrice());
+                                //根据客户sid查询客户的身份证号和
+                                AppOrderModelInfoVo appOrderModelInfoVo = vo.getModelInfo();
+                                busDeliveredDto.setModelName(appOrderModelInfoVo.getModelName());
+                                ResultBean resultBean1 = busDeliveredFeign.save(busDeliveredDto);
+
+                            }
+
+
+                        }
+                    }
+                }
+                /*ResultBean<BusSalesOrderPrice> resultBean = busSalesOrderFeign.selectByContractNo(v.getContractNo());
                 if(resultBean.getSuccess()){
                     BusSalesOrderPrice busSalesOrderPrice = resultBean.getData();
                     BigDecimal singleFinalPrice = busSalesOrderPrice.getSingleFinalPrice();
@@ -1186,7 +1216,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
                         ResultBean resultBean1 = busDeliveredFeign.save(busDeliveredDto);
 
                     }
-                }
+                }*/
             });
             //查询该申请已认款金额总数
             subscriptionMoneyAll = finSelectedReceivablesDetailedVos.stream().map(FinSelectedReceivablesDetailedVo::getSubscriptionMoney).map(BigDecimal::new).reduce(BigDecimal.ZERO, BigDecimal::add);

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincostapply/FinCostapplyService.java

@@ -145,9 +145,26 @@ public class FinCostapplyService extends MybatisBaseService<FinCostapplyMapper,
         ResultBean<String> rb = ResultBean.fireFail();
         String dtoSid = dto.getSid();
         if (StringUtils.isBlank(dtoSid)) {
+            //=======================================
+            String orgSidPath = dto.getOrgSidPath();
+            if(StringUtils.isBlank(orgSidPath)){
+                //根据用户sid获取staffSid
+                ResultBean<SysUserVo> userVoResultBean = sysUserFeign.fetchBySid(dto.getCreateBySid());
+                if (!userVoResultBean.getSuccess()) {
+                    return rb.setMsg(userVoResultBean.getMsg());
+                }
+                //根据staffSid获取用户的组织全路径
+                ResultBean<SysStaffOrg> staffOrgResultBean = sysStaffOrgFeign.getOrgByStaffSid(userVoResultBean.getData().getStaffSid());
+                if (!staffOrgResultBean.getSuccess()) {
+                    return rb.setMsg(staffOrgResultBean.getMsg());
+                }
+                orgSidPath = staffOrgResultBean.getData().getOrgSidPath();
+            }
+            //===========================================
             //新增
             FinCostapply finCostapply = new FinCostapply();
             BeanUtil.copyProperties(dto, finCostapply, "sid");
+            finCostapply.setOrgSidPath(orgSidPath);
             String billNo = getApplyCode(dto);
             if (finCostapply.getIsVeh() == 1) {
                 if (finCostapply.getIsOutDoor() == null) {
@@ -174,7 +191,7 @@ public class FinCostapplyService extends MybatisBaseService<FinCostapplyMapper,
             if (finCostapply == null) {
                 return rb.setMsg("该费用申请不存在");
             }
-            BeanUtil.copyProperties(dto, finCostapply);
+            BeanUtil.copyProperties(dto, finCostapply,"orgSidPath");
             finCostapplyVehicleService.deleteByMainSid(dtoSid);
             if (finCostapply.getIsVeh() == 1) {
                 if (finCostapply.getIsOutDoor() == null) {
@@ -257,6 +274,7 @@ public class FinCostapplyService extends MybatisBaseService<FinCostapplyMapper,
             return rb.setMsg("操作失败!提交的数据不一致");
         }
         //新增修改保存
+        dto.setOrgSidPath(orgSidPath);
         ResultBean<String> resultBean = saveOrUpdateDto(dto);
         if (!resultBean.getSuccess()) {
             return rb.setMsg(resultBean.getMsg());
@@ -405,6 +423,7 @@ public class FinCostapplyService extends MybatisBaseService<FinCostapplyMapper,
             appMap.put("sid", bv.getBusinessSid());
             vaributes.put("app", appMap);
             bv.setFormVariables(vaributes);
+            bv.setOrgSidPath(finCostapply.getOrgSidPath());
             ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.handleProsess(bv);
             if (!resultBean.getSuccess()) {
                 return rb.setMsg(resultBean.getMsg());

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyService.java

@@ -157,11 +157,26 @@ public class FinPaymentapplyService extends MybatisBaseService<FinPaymentapplyMa
         ResultBean rb = ResultBean.fireFail();
         String dtoSid = dto.getSid();
         if (StringUtils.isBlank(dtoSid)) {
+            //=======================================
+            String orgSidPath = dto.getOrgSidPath();
+            if(StringUtils.isBlank(orgSidPath)){
+                //根据用户sid获取staffSid
+                ResultBean<SysUserVo> userVoResultBean = sysUserFeign.fetchBySid(dto.getCreateBySid());
+                if (!userVoResultBean.getSuccess()) {
+                    return rb.setMsg(userVoResultBean.getMsg());
+                }
+                //根据staffSid获取用户的组织全路径
+                ResultBean<SysStaffOrg> staffOrgResultBean = sysStaffOrgFeign.getOrgByStaffSid(userVoResultBean.getData().getStaffSid());
+                if (!staffOrgResultBean.getSuccess()) {
+                    return rb.setMsg(staffOrgResultBean.getMsg());
+                }
+                orgSidPath = staffOrgResultBean.getData().getOrgSidPath();
+            }
             FinPaymentapply finPaymentapply = new FinPaymentapply();
             BeanUtil.copyProperties(dto, finPaymentapply, "sid");
             String billNo = getApplyCode(dto);
             finPaymentapply.setBillNo(billNo);
-
+            finPaymentapply.setOrgSidPath(orgSidPath);
             List<FinPaymentapplyDetailDto> detailsList = dto.getDetailsList();
             String i = finPaymentapplyDetailsService.saveDetailsList(detailsList, finPaymentapply.getSid());
             if ("1".equals(dto.getIsVeh())) {
@@ -177,7 +192,7 @@ public class FinPaymentapplyService extends MybatisBaseService<FinPaymentapplyMa
             if (finPaymentapply == null) {
                 return rb.setMsg("该付款申请不存在");
             }
-            BeanUtil.copyProperties(dto, finPaymentapply);
+            BeanUtil.copyProperties(dto, finPaymentapply,"orgSidPath");
 
             List<FinPaymentapplyDetailDto> detailsList = dto.getDetailsList();
             String i = finPaymentapplyDetailsService.saveDetailsList(detailsList, finPaymentapply.getSid());
@@ -252,6 +267,7 @@ public class FinPaymentapplyService extends MybatisBaseService<FinPaymentapplyMa
             return rb.setMsg("操作失败!提交的数据不一致");
         }
         //新增修改保存
+        dto.setOrgSidPath(orgSidPath);
         ResultBean<String> resultBean = saveOrUpdateDto(dto);
         if (!resultBean.getSuccess()) {
             return rb.setMsg(resultBean.getMsg());
@@ -383,6 +399,7 @@ public class FinPaymentapplyService extends MybatisBaseService<FinPaymentapplyMa
             appMap.put("sid", bv.getBusinessSid());
             vaributes.put("app", appMap);
             bv.setFormVariables(vaributes);
+            bv.setOrgSidPath(finPaymentapply.getOrgSidPath());
             ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.handleProsess(bv);
             if (!resultBean.getSuccess()) {
                 return rb.setMsg(resultBean.getMsg());

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.java

@@ -102,7 +102,7 @@ public interface FinSelectedReceivablesDetailedMapper extends BaseMapper<FinSele
 
     List<String> selectListByAuditState(@Param("i") int i,@Param("userSid") String userSid,@Param("useOrgSid") String useOrgSid);
 
-    List<FinSelectedReceivablesDetailedVo> selectListByVin(@Param("contractNo") String contractNo, @Param("vinNo") String vin);
+    List<FinSelectedReceivablesDetailedVo> selectListByVin(@Param("contractNo") String contractNo, @Param("vinNo") String vin,@Param("state") int state);
 
     List<FinSelectedReceivablesDetailed> getList(@Param("list") List<String> sidsList);
 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.xml

@@ -106,7 +106,7 @@
         select *
         from fin_selected_receivables_detailed
         where contractNo = #{contractNo}
-          and VIN = #{vinNo}
+          and VIN = #{vinNo} and auditState = #{state}
     </select>
 
     <select id="getList"

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedService.java

@@ -217,8 +217,8 @@ public class FinSelectedReceivablesDetailedService extends MybatisBaseService<Fi
         return baseMapper.selectListByAuditState(i,userSid,useOrgSid);
     }
 
-    public List<FinSelectedReceivablesDetailedVo> selectListByVin(String contractNo, String vin) {
-        return baseMapper.selectListByVin(contractNo, vin);
+    public List<FinSelectedReceivablesDetailedVo> selectListByVin(String contractNo, String vin,int state) {
+        return baseMapper.selectListByVin(contractNo, vin,state);
     }
 
     public List<FinSelectedReceivablesDetailed> getList(List<String> sidsList) {

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

@@ -5,6 +5,8 @@ package com.yxt.anrui.flowable.api.utils;
  */
 public enum ProcDefEnum {
 
+    /***************************正式流程id***********************************/
+
     ORDERDEPOSITAPPROVE("简易订单-订金收取", "process_pkyns85b:4:575004"),
     ORDERDEPOSITVEHICLEAPPROVE("简易订单-车辆预定", "process_pkyns85b:5:575008"),
     ORDERAPPROVE("订单审批", "order_approve_96asleqi:1:227504"),
@@ -26,29 +28,21 @@ public enum ProcDefEnum {
     //VEHICLEAPPLY("排产申请流程", "process_9egcg169:10:657508"),//TODO
 //    ARREARSCARRYVEHICLE("欠款提车审批流程", "process_8ax1xxn3:1:795004"),//测试
     ARREARSCARRYVEHICLE("欠款提车审批流程", "process_8ax1xxn3:2:862512"),//测试（新）2022、11、22
-//    VEHICLEAPPLY("排产申请流程", "process_9egcg169:10:657508"),//TODO
-    VEHICLEAPPLY("排产申请流程", "process_9egcg169:11:865004"),//TODO:测试
+    VEHICLEAPPLY("排产申请流程", "process_9egcg169:10:657508"),//TODO
     // RECORDAPPLICATION("入账申请", "record_application_7y80d4r8:1:265008"),//TODO
     RECORDAPPLICATION("入库申请", "process_xbwq2c7p:3:675024"),//TODO
     SCMVEHICLERETURN("采购退库", "process_md8aeoap:2:867508"),//测试采购退库流程定义id
     //BASEVEHICLEACTUALSALES("未售买断", "process_6qx07b75:6:457504"),//ToDo
-    //    SALESORDER("销售订单审批流程", "process_p5ils2rn:4:490008"),
     SEALAPPLY("盖章申请", "process_7h0z66tp:1:240064" ),
 //    BASEVEHICLEACTUALSALES("未售买断", "process_6qx07b75:6:457504"),//ToDo
-    BASEVEHICLEACTUALSALES("未售买断", "process_6qx07b75:9:852504"),//ToDo:测试
-//    SALESORDER("销售订单审批流程", "process_p5ils2rn:4:490008"),
     SALESORDER("销售订单审批流程", "process_p5ils2rn:5:557508"),
     BASEOUTSOURCINGAPPLICATION("外采申请", "process_5tqysnjc:5:867504"),//测试外采流程定义id
     BASEMODELMODPRICE("车型调价申请", "process_kydcif7k:7:867520"),//测试车型调价流程定义id
     BASEINTERNALPURCHASE("调车申请", "process_i6luw5xq:4:892504"),//测试调车流程定义id
-    //SCMCARTRANSFER("库存地点变更申请", "process_3bc4p2em:6:510004"), //TODO
-    //FINCOSTAPPLY("费用申请", "process_u0pahv0s:5:457512"),
-    //FINPAYAPPLY("付款申请", "process_gin2tntb:3:457508"),
     BASEACCADJAPPLY("调账申请", "process_r6pyzqoz:2:867516"), //测试调账流程定义id
 //    SCMCARTRANSFER("库存地点变更申请", "process_3bc4p2em:6:510004"), //TODO
-    SCMCARTRANSFER("库存地点变更申请", "process_3bc4p2em:8:860004"), //TODO:测试
-    FINCOSTAPPLY("费用申请","process_u0pahv0s:5:457512"),
-    FINPAYAPPLY("付款申请","process_gin2tntb:3:457508"),
+//    FINCOSTAPPLY("费用申请","process_u0pahv0s:5:457512"),
+//    FINPAYAPPLY("付款申请","process_gin2tntb:3:457508"),
     BUSDELIVEREDAPPLY("出库申请","process_wgt1n66l:2:357504"),
     //BASEACCADJAPPLY("调账申请","process_r6pyzqoz:1:695004"),//正式调账流程定义id
     BASESHUNINVOICAPPLY("调车开票申请","process_u4xrvaso:1:400008"),
@@ -61,6 +55,15 @@ public enum ProcDefEnum {
     SCMCOLLECTIONREBATEWITHAPPLY("回款返利预提申请","process_k4lodiyg:1:630004"),
     SCMCOLLECTIONREBATECHECKAPPLY("回款返利核对申请","process_fgrv1mbv:1:630008"),
     CONTRACTAPPLY("合同审核","process_gd8c9xd5:1:545008"),
+
+
+
+    /******************************测试流程id*********************************************/
+    SCMCARTRANSFER("库存地点变更申请", "process_3bc4p2em:8:860004"), //TODO:测试
+    BASEVEHICLEACTUALSALES("未售买断", "process_6qx07b75:9:852504"),//ToDo:测试
+//    VEHICLEAPPLY("排产申请流程", "process_9egcg169:11:865004"),//TODO:测试
+    FINCOSTAPPLY("费用申请","process_u0pahv0s:6:902504"),//ToDo:测试
+    FINPAYAPPLY("付款申请","process_gin2tntb:4:902508"),//ToDo:测试
     ;
 
     ProcDefEnum(String proDefName, String proDefId) {