出库

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdelivered/AppDeliveredDetailsVo.java

@@ -26,6 +26,8 @@ public class AppDeliveredDetailsVo implements Vo {
     private String createTime;
     @ApiModelProperty("销售专员")
     private String staffName;
+    @ApiModelProperty("客户sid")
+    private String customerSid;
     @ApiModelProperty("客户名称")
     private String name;
     @ApiModelProperty("客户电话")

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/AppDeliveredApplyDto.java

@@ -24,7 +24,8 @@ public class AppDeliveredApplyDto implements Dto {
     private String staffName;
     @ApiModelProperty("发起日期")
     private String createTime;
-
+    @ApiModelProperty("客户sid")
+    private String customerSid;
     @ApiModelProperty("客户名称")
     private String name;
     @ApiModelProperty("客户电话")

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApply.java

@@ -54,6 +54,8 @@ public class BusDeliveredApply extends BaseEntity {
     private String contractNo;
     @ApiModelProperty("单据编号")
     private String billNo;
+    @ApiModelProperty("客户sid")
+    private String customerSid;
     @ApiModelProperty("客户名称")
     private String name;
     @ApiModelProperty("车型Sid")
@@ -72,8 +74,6 @@ public class BusDeliveredApply extends BaseEntity {
     private String applySid;
     @ApiModelProperty(value = "分公司sid")
     private String useOrgSid;
-    /* @ApiModelProperty("是否是终端:1是，0不是")
-     private Integer isTerminal;*/
     @ApiModelProperty(value = "客户手机号")
     private String mobile;
     @ApiModelProperty(value = "节点状态")

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredService.java

@@ -302,6 +302,7 @@ public class BusDeliveredService extends MybatisBaseService<BusDeliveredMapper,
             appDeliveredDetailsVo.setModelName(appOrderModelInfoVo.getModelName());
             appDeliveredDetailsVo.setModelSid(appOrderModelInfoVo.getModelSid());
             appDeliveredDetailsVo.setConfigSid(appOrderModelInfoVo.getConfigSid());
+            appDeliveredDetailsVo.setCustomerSid(appOrderDetailsVo.getCustomerSid());
             AppOrderPriceInfoVo appOrderPriceInfoVo = appOrderDetailsVo.getPriceInfo();
             //主车成交价
             appDeliveredDetailsVo.setPrice(appOrderPriceInfoVo.getTransactionPrice());
@@ -390,6 +391,7 @@ public class BusDeliveredService extends MybatisBaseService<BusDeliveredMapper,
             if (busDeliveredApply == null) {
                 return rb.setMsg("该出库申请不存在");
             }
+            appDeliveredDetailsVo.setUserSid(busDeliveredApply.getApplySid());
             appDeliveredDetailsVo.setOrgPath(busDeliveredApply.getOrgSidPath());
             appDeliveredDetailsVo.setSid(query.getOutboundSid());
             BeanUtil.copyProperties(busDeliveredApply, appDeliveredDetailsVo, "sid");
@@ -433,8 +435,10 @@ public class BusDeliveredService extends MybatisBaseService<BusDeliveredMapper,
                 appCarListVo.setDiscountUse(discountUse);
                 //使用人信息
                 BusDeliveredUseMessagesVo realBuyer = new BusDeliveredUseMessagesVo();
-                BusDeliveredUseMessage busDeliveredUseMessage = busDeliveredUseMessageService.fetchBySid(busDeliveredApplyDetails.getUseMessageSid());
-                BeanUtil.copyProperties(busDeliveredUseMessage, realBuyer);
+                if ("0".equals(busDeliveredApply.getTypeKey()) || "1".equals(busDeliveredApply.getTypeKey())) {
+                    BusDeliveredUseMessage busDeliveredUseMessage = busDeliveredUseMessageService.fetchBySid(busDeliveredApplyDetails.getUseMessageSid());
+                    BeanUtil.copyProperties(busDeliveredUseMessage, realBuyer);
+                }
                 realBuyer.setVin(busDeliveredApplyDetails.getVinNo());
                 appCarListVo.setRealBuyer(realBuyer);
                 carList.add(appCarListVo);

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java

@@ -955,6 +955,18 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
                     busDeliveredUseMessageService.insert(busDeliveredUseMessage);
                     busDeliveredApplyDetails.setUseMessageSid(busDeliveredUseMessage.getSid());
                 }
+                if ("0".equals(busDeliveredApply.getTypeKey())) {
+                    //客户的信息
+                    String customerSid = busDeliveredApply.getCustomerSid();
+                    ResultBean<CrmCustomerTempVo> crmCustomerTempResultBean = crmCustomerTempFeign.fetchSid(customerSid);
+
+                }
+                if ("1".equals(busDeliveredApply.getTypeKey())) {
+                    //贷款人的信息
+                    String loanSid = busDeliveredApply.getLoanSid();
+                    ResultBean<CrmCustomerTempVo> crmCustomerTempResultBean = crmCustomerTempFeign.fetchSid(loanSid);
+
+                }
 
 
                 busDeliveredApplyDetailsService.insert(busDeliveredApplyDetails);
@@ -1295,7 +1307,7 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
         bv.setModelId(ProcDefEnum.BUSDELIVEREDAPPLY.getProDefId());
         if (r == 1) {
             ResultBean<UpdateFlowFieldVo> voResultBean = flowableFeign.startProcess(bv);
-            if(!voResultBean.getSuccess()){
+            if (!voResultBean.getSuccess()) {
                 return rb.setMsg(voResultBean.getMsg());
             }
             UpdateFlowFieldVo ufVo = voResultBean.getData();

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/DeliveredApplyDto.java

@@ -34,6 +34,8 @@ public class DeliveredApplyDto implements Dto {
     @ApiModelProperty("发起日期")
     @JsonProperty("date")
     private String createTime;
+    @ApiModelProperty("客户sid")
+    private String customerSid;
     @ApiModelProperty("客户名称")
     private String name;
     @ApiModelProperty("客户电话")

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/DeliveredDetailsVo.java

@@ -34,6 +34,8 @@ public class DeliveredDetailsVo implements Vo {
     @ApiModelProperty("发起日期")
     @JsonProperty("date")
     private String createTime;
+    @ApiModelProperty("客户sid")
+    private String customerSid;
     @ApiModelProperty("客户名称")
     private String name;
     @ApiModelProperty("客户电话")
@@ -72,8 +74,8 @@ public class DeliveredDetailsVo implements Vo {
     private String loanMobile;
     @ApiModelProperty("总备注")
     private String remarks;
-   /* @ApiModelProperty("用户sid")
-    private String userSid;*/
+    @ApiModelProperty("用户sid")
+    private String userSid;
     @ApiModelProperty("记录sid")
     private String sid;
     @ApiModelProperty("orgPath")

doc/databases/bus-center_tables.sql

@@ -327,6 +327,7 @@ CREATE TABLE `bus_delivered_use_message`
     `remarks`            varchar(255)         DEFAULT NULL COMMENT '备注',
     `createBySid`        varchar(64)          DEFAULT NULL COMMENT '创建人sid',
     `updateBySid`        varchar(64)          DEFAULT NULL COMMENT '修改人sid',
+    `customerSid`        varchar(64)          DEFAULT NULL COMMENT '客户sid',
     `name`               varchar(64)          DEFAULT NULL COMMENT '客户名称',
     `mobile`             VARCHAR(200)         DEFAULT NULL COMMENT '联系电话',
     `idNo`               VARCHAR(200)         DEFAULT NULL COMMENT '证件号码',