调车开票接口对接完成。

调账流程接口对接有疑问，待解决。
调车业务、流程接口对接。
采购订单文档测试问题修改完成。
车辆台账文档测试问题修改完成。
客户补充缺少的字段属性。

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseaccadjapply/BaseAccadjApplyByVehQuery.java

@@ -52,8 +52,8 @@ public class BaseAccadjApplyByVehQuery implements Query {
 
     @ApiModelProperty("车架号")
     private String vinNo; // 车架号
-	@ApiModelProperty("调车类型（0调入，1调出）")
+	@ApiModelProperty("调车类型key")
-    private String shuntingType; // 调车类型（0调入，1调出）
+    private String shuntingTypeKey; // 调车类型key
 	@ApiModelProperty("调出分公司sid")
     private String callOutOrgSid; // 调出分公司sid
 	@ApiModelProperty("调入分公司sid")

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseaccadjapply/BaseAccadjApplyDetailsVo.java

@@ -69,6 +69,10 @@ public class BaseAccadjApplyDetailsVo implements Vo {
     private String callInOrgSid; // 调入分公司sid
 	@ApiModelProperty("调入分公司名称")
     private String callInOrgName; // 调入分公司名称
+    @ApiModelProperty("流程实例的sid")
+    private String instanceId; // 流程实例的sid
+    @ApiModelProperty("taskId")
+    private String taskId; // taskId
     @ApiModelProperty("调账车辆列表")
     private List<BaseInternalPurchaseVehicle> baseInternalPurchaseVehicles; // 调账车辆列表
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseaccadjapply/BaseAccadjApplyFeign.java

@@ -30,6 +30,7 @@ import com.yxt.anrui.base.api.baseaccadjapply.flow.BaseAccAdjApplyTaskQuery;
 import com.yxt.anrui.base.api.baseaccadjapply.flow.SubmitBaseAccAdjApplyDto;
 import com.yxt.anrui.base.api.baseinternalpurchase.BaseInternalPurchaseDetailsVo;
 import com.yxt.anrui.base.api.baseinternalpurchasevehicle.BaseInternalPurchaseVehicleDetailsVo;
+import com.yxt.anrui.base.api.baseshuntinginvoicingapply.flow.BaseShuntingInvoicingApplyCompleteDto;
 import com.yxt.anrui.base.api.busvehicleapply.flow.*;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -99,6 +100,10 @@ public interface BaseAccadjApplyFeign {
     @PostMapping("/complete")
     public ResultBean complete(@Valid @RequestBody BaseAccAdjApplyCompleteDto query);
 
+    @ApiOperation(value = "办理（同意）")
+    @PostMapping("/InitiatorToAnswer")
+    public ResultBean InitiatorToAnswer(@Valid @RequestBody BaseAccAdjApplyCompleteDto query);
+
     @ApiOperation(value = "获取上一个环节")
     @GetMapping(value = "/getPreviousNodesForReject")
     ResultBean<List<GetNodeVo>> getPreviousNodesForReject(@Valid @SpringQueryMap GetNodeQuery query);

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseaccadjapply/BaseAccadjApplyFeignFallback.java

@@ -91,6 +91,11 @@ public class BaseAccadjApplyFeignFallback implements BaseAccadjApplyFeign {
 		return null;
 	}
 
+	@Override
+	public ResultBean InitiatorToAnswer(BaseAccAdjApplyCompleteDto query) {
+		return null;
+	}
+
 	@Override
 	public ResultBean<List<GetNodeVo>> getPreviousNodesForReject(GetNodeQuery query) {
 		return null;

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseinternalpurchase/BaseInternalPurchaseFeign.java

@@ -25,6 +25,7 @@
  *********************************************************/
 package com.yxt.anrui.base.api.baseinternalpurchase;
 
+import com.yxt.anrui.base.api.baseaccadjapply.flow.BaseAccAdjApplyCompleteDto;
 import com.yxt.anrui.base.api.baseinternalpurchase.flow.BaseInterNalPurchaseCompleteDto;
 import com.yxt.anrui.base.api.baseinternalpurchase.flow.BaseInterNalPurchaseTaskQuery;
 import com.yxt.anrui.base.api.baseinternalpurchase.flow.SubmitBaseInterNalPurchaseDto;
@@ -94,6 +95,10 @@ public interface BaseInternalPurchaseFeign {
     @PostMapping("/complete")
     public ResultBean complete(@Valid @RequestBody BaseInterNalPurchaseCompleteDto bvd);
 
+    @ApiOperation(value = "办理（同意）")
+    @PostMapping("/InitiatorToAnswer")
+    public ResultBean InitiatorToAnswer(@Valid @RequestBody BaseInterNalPurchaseCompleteDto bvd);
+
     @ApiOperation(value = "获取下一个环节")
     @GetMapping(value = "/getNextNodesForSubmit")
     ResultBean getNextNodesForSubmit(@Valid @SpringQueryMap GetNextNodeDto query);

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseinternalpurchase/BaseInternalPurchaseFeignFallback.java

@@ -85,6 +85,11 @@ public class BaseInternalPurchaseFeignFallback implements BaseInternalPurchaseFe
 		return null;
 	}
 
+	@Override
+	public ResultBean InitiatorToAnswer(BaseInterNalPurchaseCompleteDto bvd) {
+		return null;
+	}
+
 	@Override
 	public ResultBean getNextNodesForSubmit(GetNextNodeDto query) {
 		return null;

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseinternalpurchase/BaseInternalPurchaseQuery.java

@@ -55,8 +55,12 @@ public class BaseInternalPurchaseQuery implements Query {
     private String createStartTime; // 申请开始日期
     @ApiModelProperty("申请结束日期")
     private String createEndTime; // 申请结束日期
-	@ApiModelProperty("售方机构sid")
+	@ApiModelProperty("调入分公司sid")
-    private String sellerOrgSid; // 售方机构sid
+    private String buyerOrgSid; // 调入分公司sid
+    @ApiModelProperty("调出分公司sid")
+    private String sellerOrgSid; // 调出分公司sid
+    @ApiModelProperty("调车类型key")
+    private String shuntingTypeKey; // 调车类型key
 	@ApiModelProperty("创建组织sid")
     private String createOrgSid; // 创建组织sid
 

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseinternalpurchasevehicle/BaseInternalPurchaseVehicleDetailsVo.java

@@ -83,8 +83,10 @@ public class BaseInternalPurchaseVehicleDetailsVo implements Vo {
     private String isInvoicing; // 是否开票（0未开票，1已开票）
     @ApiModelProperty("车架号")
     private String vinNo; // 车架号
-    @ApiModelProperty("调车类型")
+    @ApiModelProperty("调车类型key")
-    private String shuntingType;
+    private String shuntingTypeKey; // 调车类型key
+    @ApiModelProperty("调车类型value")
+    private String shuntingTypeValue; // 调车类型value
     @ApiModelProperty("调入分公司名称")
     private String buyerOrgName;
     @ApiModelProperty("调入分公司sid")

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseinternalpurchasevehicle/BaseInternalPurchaseVehicleDto.java

@@ -54,7 +54,7 @@ public class BaseInternalPurchaseVehicleDto implements Dto {
 	@ApiModelProperty("内购申请sid")
     private String mainSid; // 内购申请sid
     @ApiModelProperty("车型sid")
-    private String modelSid; // 车型sid
+    private String vehicleSid; // 车型sid
 	@ApiModelProperty("车型别名")
     private String vehicleAlias; // 车型别名
 	@ApiModelProperty("常用配置sid")

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseinternalpurchasevehicle/BaseInternalPurchaseVehicleVo.java

@@ -54,7 +54,7 @@ public class BaseInternalPurchaseVehicleVo implements Vo {
     @ApiModelProperty("内购申请sid")
     private String mainSid; // 内购申请sid
     @ApiModelProperty("车型sid")
-    private String modelSid; // 车型sid
+    private String vehicleSid; // 车型sid
     @ApiModelProperty("车型别名")
     private String vehicleAlias; // 车型别名
     @ApiModelProperty("常用配置sid")
@@ -67,4 +67,24 @@ public class BaseInternalPurchaseVehicleVo implements Vo {
     private String vinNo; // 车架号
     @ApiModelProperty("备注")
     private String remarks; // 备注
+    @ApiModelProperty("库存地点sid")
+    private String inventoryLocationSid; // 库存地点sid
+    @ApiModelProperty("库存地点名称")
+    private String inventoryLocationName; // 库存地点名称
+    @ApiModelProperty("内销价格")
+    private String witPinMoney; // 内销价格
+    @ApiModelProperty("发票类型key")
+    private String invoiceTypeKey; // 发票类型key
+    @ApiModelProperty("发票类型value")
+    private String invoiceTypeValue; // 发票类型value
+    @ApiModelProperty("运费承担方sid")
+    private String freightUndertakerSid; // 运费承担方sid
+    @ApiModelProperty("运费承担方名称")
+    private String freightUndertakerName; // 运费承担方名称
+    @ApiModelProperty("运费承担方类型")
+    private String freightUndertakerType; // 运费承担方类型
+    @ApiModelProperty("是否调账（0未调账，1已调账）")
+    private String isAccadj; // 是否调账（0未调账，1已调账）
+    @ApiModelProperty("是否开票（0未开票，1已开票）")
+    private String isInvoicing; // 是否开票（0未开票，1已开票）
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseshuntinginvoicinapplyeveh/BaseShuntingInvoicinApplyeVehDetailsVo.java

@@ -95,4 +95,6 @@ public class BaseShuntingInvoicinApplyeVehDetailsVo implements Vo {
     private String isAccadj; // 是否调账（0未调账，1已调账）
     @ApiModelProperty("是否开票（0未开票，1已开票）")
     private String isInvoicing; // 是否开票（0未开票，1已开票）
+    @ApiModelProperty("备注")
+    private String remarks; // 备注
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseshuntinginvoicingapply/BaseShuntingInvoicingApplyDetailsVo.java

@@ -63,6 +63,10 @@ public class BaseShuntingInvoicingApplyDetailsVo implements Vo {
     private String callInOrgSid; // 调入分公司sid
 	@ApiModelProperty("调入分公司名称")
     private String callInOrgName; // 调入分公司名称
+    @ApiModelProperty("流程实例的sid")
+    private String instanceId; // 流程实例的sid
+    @ApiModelProperty("taskId")
+    private String taskId; // taskId
     @ApiModelProperty("调车开票车辆列表")
     private List<BaseShuntingInvoicinApplyeVehDetailsVo> baseShuntingInvoicinApplyeVehs; // 调车开票车辆列表
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseshuntinginvoicingapply/BaseShuntingInvoicingApplyFeign.java

@@ -103,13 +103,17 @@ public interface BaseShuntingInvoicingApplyFeign {
     @PostMapping("/complete")
     public ResultBean complete(@Valid @RequestBody BaseShuntingInvoicingApplyCompleteDto query);
 
+    @ApiOperation(value = "办理（同意）")
+    @PostMapping("/callInOrgToCallOutOrg")
+    public ResultBean callInOrgToCallOutOrg(@Valid @RequestBody BaseShuntingInvoicingApplyCompleteDto query);
+
     @ApiOperation(value = "获取上一个环节")
     @GetMapping(value = "/getPreviousNodesForReject")
-    ResultBean<List<GetNodeVo>> getPreviousNodesForReject(@Valid @SpringQueryMap GetNodeQuery query);
+    ResultBean getPreviousNodesForReject(@Valid @SpringQueryMap GetNodeQuery query);
 
     @ApiOperation(value = "获取下一个环节")
     @GetMapping(value = "/getNextNodesForSubmit")
-    ResultBean<List<GetNodeVo>> getNextNodesForSubmit(@Valid @SpringQueryMap GetNodeQuery query);
+    ResultBean getNextNodesForSubmit(@Valid @SpringQueryMap GetNodeQuery query);
 
     @ApiOperation(value = "驳回任务")
     @PostMapping(value = "/reject")

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseshuntinginvoicingapply/BaseShuntingInvoicingApplyFeignFallback.java

@@ -91,6 +91,11 @@ public class BaseShuntingInvoicingApplyFeignFallback implements BaseShuntingInvo
 		return null;
 	}
 
+	@Override
+	public ResultBean callInOrgToCallOutOrg(BaseShuntingInvoicingApplyCompleteDto query) {
+		return null;
+	}
+
 	@Override
 	public ResultBean<List<GetNodeVo>> getPreviousNodesForReject(GetNodeQuery query) {
 		return null;

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseshuntinginvoicingapply/BaseShuntingInvoicingByVehQuery.java

@@ -31,6 +31,8 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 @Data
 @ApiModel(value = "调车申请表 查询条件", description = "调车申请表 查询条件")
 public class BaseShuntingInvoicingByVehQuery implements Query {
@@ -39,4 +41,6 @@ public class BaseShuntingInvoicingByVehQuery implements Query {
     private String callOutOrgSid; // 调出分公司sid
 	@ApiModelProperty("调入分公司sid")
     private String callInOrgSid; // 调入分公司sid
+    @ApiModelProperty("调车车辆列表sid")
+    private List<String> sids; // 调车车辆列表sid
 }

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

@@ -64,7 +64,7 @@ public class BaseVehicle extends BaseEntity {
     private String orderingNo;
 
     @ApiModelProperty(value = "入库价")
-    private Integer costPriced;
+    private Integer costPrice;
     @ApiModelProperty(value = "运费")
     private Integer freight;
     @ApiModelProperty(value = "厂家合同价")

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

@@ -20,18 +20,24 @@ public class BaseVehicleActualVo implements Vo {
     private String brandName;
     @ApiModelProperty(value = "车型")
     private String vehicleAlias;
+    @ApiModelProperty(value = "车型sid")
+    private String modelSid;
     @ApiModelProperty(value = "车架号")
     private String vinNo;
     @ApiModelProperty(value = "颜色")
     private String color;
     @ApiModelProperty(value = "存放地点")
     private String location;
+    @ApiModelProperty(value = "存放地点sid")
+    private String locationSid;
     @ApiModelProperty(value = "销售指导价")
     @JsonSerialize(using = ToStringSerializer.class)
     private String guidedPrice;
 
     @ApiModelProperty(value = "常用配置")
     private String configName;
+    @ApiModelProperty(value = "常用配置sid")
+    private String configSid;
     @ApiModelProperty(value = "入库日期")
     private String priceDate;
 

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

@@ -80,7 +80,7 @@ public class BaseVehicleDto implements Dto {
     @ApiModelProperty("存放地点名称（陕汽必须的字段）")
     private String locationName;
     @ApiModelProperty(value = "厂家入库价")
-    private Integer costPriced;
+    private Integer costPrice;
     @ApiModelProperty(value = "厂家合同价")
     private Integer contractPrice;
     @ApiModelProperty(value = "成交价")

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

@@ -70,11 +70,13 @@ public class BaseVehicleSelectVo implements Vo {
     @ApiModelProperty("存放地点名称（陕汽必须的字段）")
     private String locationName;
     @ApiModelProperty(value = "厂家入库价")
-    private float costPriced;
+    private float costPrice;
     @ApiModelProperty(value = "成交价")
     private float salePrice;
     @ApiModelProperty("保修卡号")
     private String warrantyCardNo;
+    @ApiModelProperty("内部编码")
+    private String insideCode;
     @ApiModelProperty("锁定状态")
     private String lockedState;
     @ApiModelProperty("锁定状态Value")

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

@@ -8,10 +8,16 @@ import lombok.Data;
 public class ExiCarConfigDetailVo implements Vo {
 
     private static final long serialVersionUID = 5960160515593151936L;
+    @ApiModelProperty(value = "车型信息")
+    private String vehModelInfor;
     @ApiModelProperty(value = "车型别名")
     private String vehicleAlias;
+    @ApiModelProperty(value = "常用配置名称")
+    private String configName;
     @ApiModelProperty(value = "品牌")
     private String brandName;
+    @ApiModelProperty(value = "品牌sid")
+    private String brandSid;
     @ApiModelProperty(value = "功能")
     private String vehicleTypeValue;
     @ApiModelProperty(value = "排放标准")
@@ -82,4 +88,9 @@ public class ExiCarConfigDetailVo implements Vo {
     private String configuringBao;
     @ApiModelProperty(value = "更多配置")
     private String otherConfig;
+    @ApiModelProperty(value = "车型sid")
+    private String modelSid;
+    @ApiModelProperty(value = "常用配置sid")
+    private String configSid;
+
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleinquiry/BusVehicleInquiry.java

@@ -76,6 +76,10 @@ public class BusVehicleInquiry extends BaseEntity {
     private String customerSid;
     @ApiModelProperty("常用配置更多配置")
     private String moreConfig;
+    @ApiModelProperty("换装配置")
+    private String replacementConfig;
+    @ApiModelProperty("选装配置")
+    private String optionalConfig;
     @ApiModelProperty("使用组织sid")
     private String useOrgSid;
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleinquiry/BusVehicleInquiryDto.java

@@ -75,6 +75,12 @@ public class BusVehicleInquiryDto implements Dto {
 	private String customerSid;
 	@ApiModelProperty("常用配置更多配置")
 	private String moreConfig;
+	@ApiModelProperty("换装配置")
+	private String replacementConfig;
+	@ApiModelProperty("选装配置")
+	private String optionalConfig;
 	@ApiModelProperty("使用组织sid")
 	private String useOrgSid;
+	@ApiModelProperty("申请人sid")
+	private String createBySid;
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyMapper.java

@@ -71,4 +71,6 @@ public interface BaseAccadjApplyMapper extends BaseMapper<BaseAccadjApply> {
 	IPage<BaseInternalPurchaseVehicleDetailsVo> fetchVeh(IPage<BaseInternalPurchaseVehicleDetailsVo> page, @Param(Constants.WRAPPER) Wrapper<BaseInternalPurchaseVehicleDetailsVo> qw);
 
     int updateFlowFiled(Map<String, Object> map);
+
+    int selectBySid(String join);
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyMapper.xml

@@ -15,7 +15,8 @@
 			resultType="com.yxt.anrui.base.api.baseinternalpurchasevehicle.BaseInternalPurchaseVehicleDetailsVo">
 		SELECT
 		bipv.*,
-		bip.`shuntingType`,
+		bip.`shuntingTypeKey`,
+		bip.`shuntingTypeValue`,
 		bip.`buyerOrgName`,
 		bip.`buyerOrgSid`,
 		bip.`sellerOrgName`,
@@ -42,4 +43,11 @@
 		</if>
 		WHERE sid = #{sid}
     </update>
+
+	<select id="selectBySid" resultType="int">
+		SELECT COUNT(*)
+		FROM base_accadj_apply
+		WHERE nodeState != '待提交'
+		  and find_in_set(sid, #{list})
+    </select>
 </mapper>

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyRest.java

@@ -114,6 +114,14 @@ public class BaseAccadjApplyRest implements BaseAccadjApplyFeign {
 		return baseAccadjApplyService.complete(bv);
 	}
 
+	@Override
+	public ResultBean InitiatorToAnswer(BaseAccAdjApplyCompleteDto query) {
+		BusinessVariables bv = new BusinessVariables();
+		BeanUtil.copyProperties(query, bv);
+		bv.setModelId(ProcDefEnum.BASEACCADJAPPLY.getProDefId());
+		return baseAccadjApplyService.InitiatorToAnswer(bv);
+	}
+
 	@Override
 	public ResultBean<List<GetNodeVo>> getPreviousNodesForReject(GetNodeQuery query) {
 		return baseAccadjApplyService.getPreviousNodesForReject(query);

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyService.java

@@ -57,6 +57,7 @@ import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg;
 import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
 import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
 import com.yxt.anrui.portal.api.sysuser.SysUserVo;
+import com.yxt.anrui.portal.api.sysuser.UserQuery;
 import com.yxt.common.base.utils.DateUtils;
 import org.apache.commons.lang3.StringUtils;
 import com.yxt.common.base.service.MybatisBaseService;
@@ -132,12 +133,13 @@ public class BaseAccadjApplyService extends MybatisBaseService<BaseAccadjApplyMa
         return p;
     }
 
-    public ResultBean saveOrUpdateDto(BaseAccadjApplyDto dto) {
+    public ResultBean<String> saveOrUpdateDto(BaseAccadjApplyDto dto) {
         ResultBean rb = ResultBean.fireFail();
         String dtoSid = dto.getSid();
         List<String> accSids = dto.getAccSids();
         if (StringUtils.isBlank(dtoSid)) {//新增
             dto.setApplyDate(DateUtil.today());
+            dto.setNodeState("待提交");
             ResultBean resultBean = this.insertByDto(dto);
             String sid = (String) resultBean.getData();
             for (String accSid : accSids) {
@@ -146,7 +148,7 @@ public class BaseAccadjApplyService extends MybatisBaseService<BaseAccadjApplyMa
                 baseAccadjApplyeVeh.setPurchaseSid(accSid);
                 baseAccadjApplyeVehService.save(baseAccadjApplyeVeh);
             }
-            return rb.success().setMsg("保存成功");
+            return rb.success().setMsg("保存成功").setData(resultBean.getData());
         }
         BaseAccadjApply baseAccadjApply = fetchBySid(dtoSid);
         if (baseAccadjApply == null) {
@@ -160,10 +162,10 @@ public class BaseAccadjApplyService extends MybatisBaseService<BaseAccadjApplyMa
             baseAccadjApplyeVeh.setPurchaseSid(accSid);
             baseAccadjApplyeVehService.save(baseAccadjApplyeVeh);
         }
-        return rb.success().setMsg("修改成功");
+        return rb.success().setMsg("修改成功").setData(dtoSid);
     }
 
-    public ResultBean insertByDto(BaseAccadjApplyDto dto) {
+    public ResultBean<String> insertByDto(BaseAccadjApplyDto dto) {
         ResultBean rb = ResultBean.fireFail();
         BaseAccadjApply entity = new BaseAccadjApply();
         BeanUtil.copyProperties(dto, entity, "id", "sid");
@@ -187,6 +189,7 @@ public class BaseAccadjApplyService extends MybatisBaseService<BaseAccadjApplyMa
         BaseAccadjApplyDetailsVo vo = new BaseAccadjApplyDetailsVo();
         List<BaseInternalPurchaseVehicle> baseInternalPurchaseVehicles = new ArrayList<>();
         BeanUtil.copyProperties(entity, vo);
+        vo.setInstanceId(entity.getProcInstId());
         String sid1 = vo.getSid();
         List<String> stringList = baseAccadjApplyeVehService.fetchByMainSid(sid1);
         for (String s : stringList) {
@@ -212,8 +215,8 @@ public class BaseAccadjApplyService extends MybatisBaseService<BaseAccadjApplyMa
         if (StringUtils.isNotBlank(query.getVinNo())) {
             qw.like("bipv.vinNo", query.getVinNo());
         }
-        if (StringUtils.isNotBlank(query.getShuntingType())){
+        if (StringUtils.isNotBlank(query.getShuntingTypeKey())) {
-            qw.eq("bip.shuntingType",query.getShuntingType());
+            qw.eq("bip.shuntingTypeKey", query.getShuntingTypeKey());
         }
         qw.eq("bip.buyerOrgSid", callInOrgSid);
         qw.eq("bip.sellerOrgSid", callOutOrgSid);
@@ -229,6 +232,11 @@ public class BaseAccadjApplyService extends MybatisBaseService<BaseAccadjApplyMa
 
     public ResultBean delAll(String[] sids) {
         ResultBean rb = ResultBean.fireFail();
+        //查询该sid中是否有流程不是待提交的
+        int count = baseMapper.selectBySid(StringUtils.join(sids, ","));
+        if (count > 0) {
+            return rb.setMsg("删除的数据中包含已经提交审批的数据，删除失败");
+        }
         delBySids(sids);
         for (String sid : sids) {
             baseAccadjApplyeVehService.delByMainSid(sid);
@@ -355,6 +363,61 @@ public class BaseAccadjApplyService extends MybatisBaseService<BaseAccadjApplyMa
         }
     }
 
+    public ResultBean InitiatorToAnswer(BusinessVariables bv) {
+        ResultBean rb = ResultBean.fireFail();
+        BaseAccadjApply baseAccadjApply = fetchBySid(bv.getBusinessSid());
+        if (baseAccadjApply.getAccadjTypeValue().equals("调入")) {
+            String callOutOrgSid = baseAccadjApply.getCallOutOrgSid();
+            ResultBean<List<Map<String, Object>>> resultBean = flowTaskFeign.getNextNodesForSubmit(bv);
+            //判断数组是否为空，若为空则赋值，若不为空，则遍历循环将map中的数据赋值给getNodeVo
+            List<GetNodeVo> voList = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), GetNodeVo.class)).collect(Collectors.toList());
+            List<String> candidateGroups = voList.get(0).getCandidateGroups();
+            UserQuery userQuery = new UserQuery();
+            userQuery.setRoleSid(candidateGroups.get(0));
+            userQuery.setOrgSidPath("11/11/" + callOutOrgSid + "/11");
+            List<SysUserVo> sysUserVos = sysUserFeign.getUserByRole(userQuery).getData();
+            StringBuilder nextNodeUserSids =new StringBuilder();
+            if (sysUserVos.size() > 0) {
+                for (SysUserVo sysUserVo : sysUserVos) {
+                    String sid = sysUserVo.getSid();
+                    nextNodeUserSids.append(sid).append(",");
+                }
+            }
+            String substring = nextNodeUserSids.substring(0,nextNodeUserSids.lastIndexOf(","));
+            bv.setNextNodeUserSids(substring);
+        }
+        if (baseAccadjApply.getAccadjTypeValue().equals("调出")) {
+            String callInOrgSid = baseAccadjApply.getCallInOrgSid();
+            ResultBean<List<Map<String, Object>>> resultBean = flowTaskFeign.getNextNodesForSubmit(bv);
+            //判断数组是否为空，若为空则赋值，若不为空，则遍历循环将map中的数据赋值给getNodeVo
+            List<GetNodeVo> voList = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), GetNodeVo.class)).collect(Collectors.toList());
+            List<String> candidateGroups = voList.get(0).getCandidateGroups();
+            UserQuery userQuery = new UserQuery();
+            userQuery.setRoleSid(candidateGroups.get(0));
+            userQuery.setOrgSidPath("11/11/" + callInOrgSid + "/11");
+            List<SysUserVo> sysUserVos = sysUserFeign.getUserByRole(userQuery).getData();
+            StringBuilder nextNodeUserSids =new StringBuilder();
+            if (sysUserVos.size() > 0) {
+                for (SysUserVo sysUserVo : sysUserVos) {
+                    String sid = sysUserVo.getSid();
+                    nextNodeUserSids.append(sid).append(",");
+                }
+            }
+            String substring = nextNodeUserSids.substring(0,nextNodeUserSids.lastIndexOf(","));
+            bv.setNextNodeUserSids(substring);
+        }
+        if (bv.getTaskId().equals(baseAccadjApply.getTaskId())) {
+            ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.handleProsess(bv);
+            if (!resultBean.getSuccess()) {
+                return rb.setMsg(resultBean.getMsg());
+            }
+            updateFlowFiled(BeanUtil.beanToMap(resultBean.getData()));
+            return rb.success().setData(resultBean.getData());
+        } else {
+            return rb.setMsg("操作失败!提交的数据不一致");
+        }
+    }
+
     public ResultBean<List<GetNodeVo>> getPreviousNodesForReject(GetNodeQuery query) {
         ResultBean<List<GetNodeVo>> rb = ResultBean.fireFail();
         BusinessVariables bv = new BusinessVariables();
@@ -457,4 +520,6 @@ public class BaseAccadjApplyService extends MybatisBaseService<BaseAccadjApplyMa
         }
         return rb.setMsg("操作失败!提交的数据不一致!");
     }
+
+
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseinternalpurchase/BaseInternalPurchaseMapper.xml

@@ -6,6 +6,7 @@
 	<select id="selectPageVo" resultType="com.yxt.anrui.base.api.baseinternalpurchase.BaseInternalPurchaseVo">
 		SELECT DISTINCT
 		bip.sid,
+		bip.shuntingTypeValue,
 		bip.`applyNo`,
 		bip.`applyPeoName`,
 		bip.`createTime`,

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseinternalpurchase/BaseInternalPurchaseRest.java

@@ -108,6 +108,14 @@ public class BaseInternalPurchaseRest implements BaseInternalPurchaseFeign {
 		return baseInternalPurchaseService.complete(bv);
 	}
 
+	@Override
+	public ResultBean InitiatorToAnswer(BaseInterNalPurchaseCompleteDto bvd) {
+		BusinessVariables bv=new BusinessVariables();
+		BeanUtil.copyProperties(bvd,bv);
+		bv.setModelId(ProcDefEnum.BASEINTERNALPURCHASE.getProDefId());
+		return baseInternalPurchaseService.InitiatorToAnswer(bv);
+	}
+
 	@Override
 	public ResultBean getNextNodesForSubmit(GetNextNodeDto gnnd) {
 		return baseInternalPurchaseService.getNextNodesForSubmit(gnnd);

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseinternalpurchase/BaseInternalPurchaseService.java

@@ -57,6 +57,7 @@ import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg;
 import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
 import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
 import com.yxt.anrui.portal.api.sysuser.SysUserVo;
+import com.yxt.anrui.portal.api.sysuser.UserQuery;
 import com.yxt.common.base.utils.ConstantUtils;
 import org.apache.commons.lang3.StringUtils;
 import com.yxt.common.base.service.MybatisBaseService;
@@ -115,15 +116,15 @@ public class BaseInternalPurchaseService extends MybatisBaseService<BaseInternal
         QueryWrapper<BaseInternalPurchase> qw = new QueryWrapper<>();
         String createStartTime = query.getCreateStartTime();
         String createEndTime = query.getCreateEndTime();
-		qw.eq("bip.createOrgSid",query.getCreateOrgSid());
+        qw.eq("bip.createOrgSid", query.getCreateOrgSid());
         qw.apply(StringUtils.isNotBlank(createStartTime), "date_format (bip.createTime,'%Y-%m-%d') >= date_format('" + createStartTime + "','%Y-%m-%d')").
                 apply(StringUtils.isNotBlank(createEndTime), "date_format (bip.createTime,'%Y-%m-%d') <= date_format('" + createEndTime + "','%Y-%m-%d')"
                 );
-		if (StringUtils.isNotBlank(query.getNodeState())){
+        if (StringUtils.isNotBlank(query.getNodeState())) {
             //qw.eq("bip.nodeState",query.getNodeState());
         }
-		if (StringUtils.isNotBlank(query.getSellerOrgSid())){
+        if (StringUtils.isNotBlank(query.getSellerOrgSid())) {
-			qw.like("bip.sellerOrgSid",query.getSellerOrgSid());
+            qw.like("bip.sellerOrgSid", query.getSellerOrgSid());
         }
         IPage<BaseInternalPurchase> page = PagerUtil.queryToPage(pq);
         IPage<BaseInternalPurchaseVo> pagging = baseMapper.selectPageVo(page, qw);
@@ -131,12 +132,25 @@ public class BaseInternalPurchaseService extends MybatisBaseService<BaseInternal
         return p;
     }
 
-	public ResultBean<BaseInternalPurchaseDetailsVo> fetchDetailsVoBySid(String sid){
+    public ResultBean<BaseInternalPurchaseDetailsVo> fetchDetailsVoBySid(String sid) {
         ResultBean rb = ResultBean.fireFail();
         BaseInternalPurchaseDetailsVo baseInternalPurchaseDetailsVo = new BaseInternalPurchaseDetailsVo();
         BaseInternalPurchase entity = fetchBySid(sid);
         BeanUtil.copyProperties(entity, baseInternalPurchaseDetailsVo);
+        //调入分公司sid
+        String buyerOrgSid = baseInternalPurchaseDetailsVo.getBuyerOrgSid();
+        //调出分公司sid
+        String sellerOrgSid = baseInternalPurchaseDetailsVo.getSellerOrgSid();
         List<BaseInternalPurchaseVehicleVo> baseInternalPurchaseVehicleVos = baseInternalPurchaseVehicleService.fetchByMainSid(sid);
+        for (BaseInternalPurchaseVehicleVo baseInternalPurchaseVehicleVo : baseInternalPurchaseVehicleVos) {
+            //运费承担方sid
+            String freightUndertakerSid = baseInternalPurchaseVehicleVo.getFreightUndertakerSid();
+            if (freightUndertakerSid.equals(buyerOrgSid)) {
+                baseInternalPurchaseVehicleVo.setFreightUndertakerType("调入分公司");
+            } else if (freightUndertakerSid.equals(sellerOrgSid)) {
+                baseInternalPurchaseVehicleVo.setFreightUndertakerType("调出分公司");
+            }
+        }
         baseInternalPurchaseDetailsVo.setBaseInternalPurchaseVehicles(baseInternalPurchaseVehicleVos);
         return rb.success().setData(baseInternalPurchaseDetailsVo);
     }
@@ -147,12 +161,12 @@ public class BaseInternalPurchaseService extends MybatisBaseService<BaseInternal
         List<BaseInternalPurchaseVehicleDto> baseInternalPurchaseVehicles = dto.getBaseInternalPurchaseVehicles();
         if (StringUtils.isBlank(dtoSid)) {//新增
             String sellerOrgName = dto.getSellerOrgName();
-			if (StringUtils.isBlank(sellerOrgName)){
+            if (StringUtils.isBlank(sellerOrgName)) {
                 return rb.setMsg("售方机构不能为空");
             }
             BaseInternalPurchase baseInternalPurchase = new BaseInternalPurchase();
             String sid = baseInternalPurchase.getSid();
-			BeanUtil.copyProperties(dto,baseInternalPurchase);
+            BeanUtil.copyProperties(dto, baseInternalPurchase);
             baseInternalPurchase.setSid(sid);
             //申请编号规则：单据名称大写首字母+品牌编码+分公司编码+年份+月份+4位顺序号
             //获取单据名称大写首字母+品牌编码+分公司编码+年份+月份
@@ -163,23 +177,24 @@ public class BaseInternalPurchaseService extends MybatisBaseService<BaseInternal
             for (BaseInternalPurchaseVehicleDto baseInternalPurchaseVehicle : baseInternalPurchaseVehicles) {
                 BaseInternalPurchaseVehicle baseInternalPurchaseVehicle1 = new BaseInternalPurchaseVehicle();
                 String sid1 = baseInternalPurchaseVehicle1.getSid();
-				BeanUtil.copyProperties(baseInternalPurchaseVehicle,baseInternalPurchaseVehicle1);
+                BeanUtil.copyProperties(baseInternalPurchaseVehicle, baseInternalPurchaseVehicle1);
                 baseInternalPurchaseVehicle1.setSid(sid1);
                 baseInternalPurchaseVehicle1.setMainSid(sid);
+                baseInternalPurchaseVehicle1.setModelSid(baseInternalPurchaseVehicle.getVehicleSid());
                 baseInternalPurchaseVehicleService.save(baseInternalPurchaseVehicle1);
             }
             return rb.success().setMsg("保存成功").setData(baseInternalPurchase.getSid());
         }
         BaseInternalPurchase baseInternalPurchase = fetchBySid(dtoSid);
-		if (baseInternalPurchase == null){
+        if (baseInternalPurchase == null) {
             return rb.setMsg("该内购申请单不存在");
         }
-		updateBySid(dto.toMap(),dtoSid);
+        updateBySid(dto.toMap(), dtoSid);
         baseInternalPurchaseVehicleService.delByMainSid(dtoSid);
         for (BaseInternalPurchaseVehicleDto baseInternalPurchaseVehicle : baseInternalPurchaseVehicles) {
             BaseInternalPurchaseVehicle baseInternalPurchaseVehicle1 = new BaseInternalPurchaseVehicle();
             String sid1 = baseInternalPurchaseVehicle1.getSid();
-			BeanUtil.copyProperties(baseInternalPurchaseVehicle,baseInternalPurchaseVehicle1);
+            BeanUtil.copyProperties(baseInternalPurchaseVehicle, baseInternalPurchaseVehicle1);
             baseInternalPurchaseVehicle1.setSid(sid1);
             baseInternalPurchaseVehicle1.setMainSid(dtoSid);
             baseInternalPurchaseVehicleService.save(baseInternalPurchaseVehicle1);
@@ -314,16 +329,21 @@ public class BaseInternalPurchaseService extends MybatisBaseService<BaseInternal
         ResultBean rb = ResultBean.fireFail();
         BaseInternalPurchase baseInternalPurchase = fetchBySid(bv.getBusinessSid());
         Map<String, Object> formVariables = bv.getFormVariables();
-		if (formVariables != null){
+        if (formVariables != null) {
-			List<Map<String,Object>> l = ConstantUtils.getListData(formVariables,"baseInternalPurchaseVehicles");
+            List<Map<String, Object>> l = ConstantUtils.getListData(formVariables, "baseInternalPurchaseVehicles");
-			for (int i = 0;i<l.size();i++){
+            for (int i = 0; i < l.size(); i++) {
-				Map<String,Object> map = l.get(i);
+                Map<String, Object> map = l.get(i);
                 String sid = map.get("sid").toString();
                 String vinNo = map.get("vinNo").toString();
-				if (StringUtils.isBlank(vinNo)){
+                String inventoryLocationSid = map.get("inventoryLocationSid").toString();
+                String inventoryLocationName = map.get("inventoryLocationName").toString();
+                if (StringUtils.isBlank(vinNo)) {
                     return rb.setMsg("请填写车架号");
                 }
-				baseInternalPurchaseVehicleService.updateVinNoBySid(sid,vinNo);
+                if (StringUtils.isBlank(inventoryLocationSid)){
+                    return rb.setMsg("请选择存放地点");
+                }
+                baseInternalPurchaseVehicleService.updateVinNoBySid(sid, vinNo,inventoryLocationSid,inventoryLocationName);
             }
         }
         if (bv.getTaskId().equals(baseInternalPurchase.getTaskId())) {
@@ -338,6 +358,62 @@ public class BaseInternalPurchaseService extends MybatisBaseService<BaseInternal
         }
     }
 
+    public ResultBean InitiatorToAnswer(BusinessVariables bv) {
+        ResultBean rb = ResultBean.fireFail();
+        BaseInternalPurchase baseInternalPurchase = fetchBySid(bv.getBusinessSid());
+        String shuntingTypeValue = baseInternalPurchase.getShuntingTypeValue();
+        if (shuntingTypeValue.equals("调入")) {
+            String callOutOrgSid = baseInternalPurchase.getSellerOrgSid();
+            ResultBean<List<Map<String, Object>>> resultBean = flowTaskFeign.getNextNodesForSubmit(bv);
+            //判断数组是否为空，若为空则赋值，若不为空，则遍历循环将map中的数据赋值给getNodeVo
+            List<GetNodeVo> voList = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), GetNodeVo.class)).collect(Collectors.toList());
+            List<String> candidateGroups = voList.get(0).getCandidateGroups();
+            UserQuery userQuery = new UserQuery();
+            userQuery.setRoleSid(candidateGroups.get(0));
+            userQuery.setOrgSidPath("11/11/" + callOutOrgSid + "/11");
+            List<SysUserVo> sysUserVos = sysUserFeign.getUserByRole(userQuery).getData();
+            StringBuilder nextNodeUserSids =new StringBuilder();
+            if (sysUserVos.size() > 0) {
+                for (SysUserVo sysUserVo : sysUserVos) {
+                    String sid = sysUserVo.getSid();
+                    nextNodeUserSids.append(sid).append(",");
+                }
+            }
+            String substring = nextNodeUserSids.substring(0,nextNodeUserSids.lastIndexOf(","));
+            bv.setNextNodeUserSids(substring);
+        }
+        if (shuntingTypeValue.equals("调出")) {
+            String callInOrgSid = baseInternalPurchase.getBuyerOrgSid();
+            ResultBean<List<Map<String, Object>>> resultBean = flowTaskFeign.getNextNodesForSubmit(bv);
+            //判断数组是否为空，若为空则赋值，若不为空，则遍历循环将map中的数据赋值给getNodeVo
+            List<GetNodeVo> voList = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), GetNodeVo.class)).collect(Collectors.toList());
+            List<String> candidateGroups = voList.get(0).getCandidateGroups();
+            UserQuery userQuery = new UserQuery();
+            userQuery.setRoleSid(candidateGroups.get(0));
+            userQuery.setOrgSidPath("11/11/" + callInOrgSid + "/11");
+            List<SysUserVo> sysUserVos = sysUserFeign.getUserByRole(userQuery).getData();
+            StringBuilder nextNodeUserSids =new StringBuilder();
+            if (sysUserVos.size() > 0) {
+                for (SysUserVo sysUserVo : sysUserVos) {
+                    String sid = sysUserVo.getSid();
+                    nextNodeUserSids.append(sid).append(",");
+                }
+            }
+            String substring = nextNodeUserSids.substring(0,nextNodeUserSids.lastIndexOf(","));
+            bv.setNextNodeUserSids(substring);
+        }
+        if (bv.getTaskId().equals(baseInternalPurchase.getTaskId())) {
+            ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.handleProsess(bv);
+            if (!resultBean.getSuccess()) {
+                return rb.setMsg(resultBean.getMsg());
+            }
+            updateFlowFiled(BeanUtil.beanToMap(resultBean.getData()));
+            return rb.success().setData(resultBean.getData());
+        } else {
+            return rb.setMsg("操作失败!提交的数据不一致");
+        }
+    }
+
     public ResultBean getNextNodesForSubmit(GetNextNodeDto query) {
         ResultBean<List<GetNodeVo>> rb = ResultBean.fireFail();
         BusinessVariables bv = new BusinessVariables();

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseinternalpurchasevehicle/BaseInternalPurchaseVehicleMapper.java

@@ -64,9 +64,9 @@ public interface BaseInternalPurchaseVehicleMapper extends BaseMapper<BaseIntern
 	@Delete("delete from base_internal_purchase_vehicle where mainSid = #{dtoSid}")
     int delByMainSid(String dtoSid);
 
-	@Select("select * from base_internal_purchase_vehicle where mainSid = #{dtoSid}")
+	@Select("select *,modelSid as vehicleSid from base_internal_purchase_vehicle where mainSid = #{dtoSid}")
 	List<BaseInternalPurchaseVehicleVo> fetchByMainSid(String sid);
 
-	@Update("update base_internal_purchase_vehicle set vinNo = #{vinNo} where sid = #{sid}")
+	@Update("update base_internal_purchase_vehicle set vinNo = #{vinNo},inventoryLocationSid =#{inventoryLocationSid},inventoryLocationName = #{inventoryLocationName} where sid = #{sid}")
-    int updateVinNoBySid(@Param("sid") String sid,@Param("vinNo") String vinNo);
+    int updateVinNoBySid(@Param("sid") String sid,@Param("vinNo") String vinNo,@Param("inventoryLocationSid") String inventoryLocationSid,@Param("inventoryLocationName") String inventoryLocationName);
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseinternalpurchasevehicle/BaseInternalPurchaseVehicleService.java

@@ -116,7 +116,7 @@ public class BaseInternalPurchaseVehicleService extends MybatisBaseService<BaseI
 		return baseMapper.fetchByMainSid(sid);
 	}
 
-	public int updateVinNoBySid(String sid, String vinNo) {
+	public int updateVinNoBySid(String sid, String vinNo,String inventoryLocationSid,String inventoryLocationName) {
-		return baseMapper.updateVinNoBySid(sid,vinNo);
+		return baseMapper.updateVinNoBySid(sid,vinNo,inventoryLocationSid,inventoryLocationName);
 	}
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseshuntinginvoicinapplyeveh/BaseShuntingInvoicinApplyeVehMapper.xml

@@ -34,7 +34,7 @@
                bsiav.invoicinMoney,
                bsiav.invoicinCompanySid,
                bsiav.invoicinCompanyName,
-               bsiav.`remarks`,
+               bipv.`remarks`,
                bsiav.purchaseSid
         FROM base_shunting_invoicin_applye_veh bsiav
                      LEFT JOIN base_internal_purchase_vehicle bipv

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseshuntinginvoicingapply/BaseShuntingInvoicingApplyMapper.java

@@ -69,4 +69,6 @@ public interface BaseShuntingInvoicingApplyMapper extends BaseMapper<BaseShuntin
     IPage<BaseInternalPurchaseVehicleDetailsVo> fetchVeh(IPage<BaseInternalPurchaseVehicleDetailsVo> page, @Param(Constants.WRAPPER) QueryWrapper<BaseInternalPurchaseVehicleDetailsVo> qw);
 
     int updateFlowFiled(Map<String, Object> map);
+
+	int selectBySid(String join);
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseshuntinginvoicingapply/BaseShuntingInvoicingApplyMapper.xml

@@ -43,4 +43,11 @@
 		</if>
 		WHERE sid = #{sid}
     </update>
+
+	<select id="selectBySid" resultType="int">
+		SELECT COUNT(*)
+		FROM base_shunting_invoicing_apply
+		WHERE nodeState != '待提交'
+		  and find_in_set(sid, #{list})
+	</select>
 </mapper>

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseshuntinginvoicingapply/BaseShuntingInvoicingApplyRest.java

@@ -115,12 +115,20 @@ public class BaseShuntingInvoicingApplyRest implements BaseShuntingInvoicingAppl
 	}
 
 	@Override
-	public ResultBean<List<GetNodeVo>> getPreviousNodesForReject(GetNodeQuery query) {
+	public ResultBean callInOrgToCallOutOrg(BaseShuntingInvoicingApplyCompleteDto query) {
+		BusinessVariables bv = new BusinessVariables();
+		BeanUtil.copyProperties(query, bv);
+		bv.setModelId(ProcDefEnum.BASESHUNINVOICAPPLY.getProDefId());
+		return baseShuntingInvoicingApplyService.callInOrgToCallOutOrg(bv);
+	}
+
+	@Override
+	public ResultBean getPreviousNodesForReject(GetNodeQuery query) {
 		return baseShuntingInvoicingApplyService.getPreviousNodesForReject(query);
 	}
 
 	@Override
-	public ResultBean<List<GetNodeVo>> getNextNodesForSubmit(GetNodeQuery query) {
+	public ResultBean getNextNodesForSubmit(GetNodeQuery query) {
 		return baseShuntingInvoicingApplyService.getNextNodesForSubmit(query);
 	}
 

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseshuntinginvoicingapply/BaseShuntingInvoicingApplyService.java

@@ -26,6 +26,7 @@
 package com.yxt.anrui.base.biz.baseshuntinginvoicingapply;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.date.DateUtil;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -51,6 +52,7 @@ import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg;
 import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
 import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
 import com.yxt.anrui.portal.api.sysuser.SysUserVo;
+import com.yxt.anrui.portal.api.sysuser.UserQuery;
 import org.apache.commons.lang3.StringUtils;
 import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.base.utils.PagerUtil;
@@ -121,17 +123,19 @@ public class BaseShuntingInvoicingApplyService extends MybatisBaseService<BaseSh
         return p;
     }
 
-    public ResultBean saveOrUpdateDto(BaseShuntingInvoicingApplyDto dto) {
+    public ResultBean<String> saveOrUpdateDto(BaseShuntingInvoicingApplyDto dto) {
         ResultBean rb = ResultBean.fireFail();
         List<BaseShuntingInvoicinApplyeVehDto> baseShuntingInvoicinApplyeVehs = dto.getBaseShuntingInvoicinApplyeVehs();
         String dtoSid = dto.getSid();
         if (StringUtils.isBlank(dtoSid)) {//新增
+            dto.setApplyDate(DateUtil.today());
+            dto.setNodeState("待提交");
             String s = this.insertByDto(dto);
             for (BaseShuntingInvoicinApplyeVehDto baseShuntingInvoicinApplyeVeh : baseShuntingInvoicinApplyeVehs) {
                 baseShuntingInvoicinApplyeVeh.setMainSid(s);
                 baseShuntingInvoicinApplyeVehService.insertByDto(baseShuntingInvoicinApplyeVeh);
             }
-            return rb.success().setMsg("保存成功");
+            return rb.success().setMsg("保存成功").setData(s);
         }
         BaseShuntingInvoicingApply baseShuntingInvoicingApply = fetchBySid(dtoSid);
         if (baseShuntingInvoicingApply == null) {
@@ -143,13 +147,13 @@ public class BaseShuntingInvoicingApplyService extends MybatisBaseService<BaseSh
         for (BaseShuntingInvoicinApplyeVehDetailsVo baseShuntingInvoicinApplyeVehDetailsVo : baseShuntingInvoicinApplyeVehDetailsVos) {
             for (BaseShuntingInvoicinApplyeVehDto baseShuntingInvoicinApplyeVeh : baseShuntingInvoicinApplyeVehs) {
                 BaseShuntingInvoicinApplyeVeh baseShuntingInvoicinApplyeVeh1 = new BaseShuntingInvoicinApplyeVeh();
-                BeanUtil.copyProperties(baseShuntingInvoicinApplyeVeh,baseShuntingInvoicinApplyeVeh1);
+                BeanUtil.copyProperties(baseShuntingInvoicinApplyeVeh, baseShuntingInvoicinApplyeVeh1);
                 baseShuntingInvoicinApplyeVeh1.setSid(baseShuntingInvoicinApplyeVehDetailsVo.getSid());
                 baseShuntingInvoicinApplyeVeh1.setMainSid(dtoSid);
                 baseShuntingInvoicinApplyeVehService.save(baseShuntingInvoicinApplyeVeh1);
             }
         }
-        return rb.success().setMsg("修改成功");
+        return rb.success().setMsg("修改成功").setData(dtoSid);
     }
 
     public String insertByDto(BaseShuntingInvoicingApplyDto dto) {
@@ -174,6 +178,7 @@ public class BaseShuntingInvoicingApplyService extends MybatisBaseService<BaseSh
         BaseShuntingInvoicingApply entity = fetchBySid(sid);
         BaseShuntingInvoicingApplyDetailsVo vo = new BaseShuntingInvoicingApplyDetailsVo();
         BeanUtil.copyProperties(entity, vo);
+        vo.setInstanceId(entity.getProcInstId());
         List<BaseShuntingInvoicinApplyeVehDetailsVo> baseShuntingInvoicinApplyeVehDetailsVos = baseShuntingInvoicinApplyeVehService.fetchByMainSid(sid);
         vo.setBaseShuntingInvoicinApplyeVehs(baseShuntingInvoicinApplyeVehDetailsVos);
         return rb.success().setData(vo);
@@ -191,9 +196,12 @@ public class BaseShuntingInvoicingApplyService extends MybatisBaseService<BaseSh
         if (StringUtils.isBlank(callOutOrgSid)) {
             return rb.setMsg("请选择调出分公司");
         }
-        qw.eq("bip.shuntingType", "0");
+        qw.eq("bip.shuntingTypeKey", "01");
         qw.eq("bip.buyerOrgSid", callInOrgSid);
         qw.eq("bip.sellerOrgSid", callOutOrgSid);
+        if (query.getSids().size() > 0) {
+            qw.notIn("bipv.sid", query.getSids());
+        }
         IPage<BaseInternalPurchaseVehicleDetailsVo> page = PagerUtil.queryToPage(pq);
         IPage<BaseInternalPurchaseVehicleDetailsVo> pagging = baseMapper.fetchVeh(page, qw);
         PagerVo<BaseInternalPurchaseVehicleDetailsVo> p = PagerUtil.pageToVo(pagging, null);
@@ -202,6 +210,11 @@ public class BaseShuntingInvoicingApplyService extends MybatisBaseService<BaseSh
 
     public ResultBean delAll(String[] sids) {
         ResultBean rb = ResultBean.fireFail();
+        //查询该sid中是否有流程不是待提交的
+        int count = baseMapper.selectBySid(StringUtils.join(sids, ","));
+        if (count > 0) {
+            return rb.setMsg("删除的数据中包含已经提交审批的数据，删除失败");
+        }
         delBySids(sids);
         for (String sid : sids) {
             baseShuntingInvoicinApplyeVehService.delByMainSid(sid);
@@ -317,6 +330,40 @@ public class BaseShuntingInvoicingApplyService extends MybatisBaseService<BaseSh
     public ResultBean complete(BusinessVariables bv) {
         ResultBean rb = ResultBean.fireFail();
         BaseShuntingInvoicingApply baseShuntingInvoicingApply = fetchBySid(bv.getBusinessSid());
+        return handleProcess(bv, rb, baseShuntingInvoicingApply);
+    }
+
+    /**
+     * 流程流转：调入到调出  跨分公司
+     *
+     * @param bv
+     * @return
+     */
+    public ResultBean callInOrgToCallOutOrg(BusinessVariables bv) {
+        ResultBean rb = ResultBean.fireFail();
+        BaseShuntingInvoicingApply baseShuntingInvoicingApply = fetchBySid(bv.getBusinessSid());
+        String callOutOrg = baseShuntingInvoicingApply.getCallOutOrgSid();
+        ResultBean<List<Map<String, Object>>> resultBean = flowTaskFeign.getNextNodesForSubmit(bv);
+        //判断数组是否为空，若为空则赋值，若不为空，则遍历循环将map中的数据赋值给getNodeVo
+        List<GetNodeVo> voList = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), GetNodeVo.class)).collect(Collectors.toList());
+        List<String> candidateGroups = voList.get(0).getCandidateGroups();
+        UserQuery userQuery = new UserQuery();
+        userQuery.setRoleSid(candidateGroups.get(0));
+        userQuery.setOrgSidPath("11/11/" + callOutOrg + "/11");
+        List<SysUserVo> sysUserVos = sysUserFeign.getUserByRole(userQuery).getData();
+        StringBuilder nextNodeUserSids =new StringBuilder();
+        if (sysUserVos.size() > 0) {
+            for (SysUserVo sysUserVo : sysUserVos) {
+                String sid = sysUserVo.getSid();
+                nextNodeUserSids.append(sid).append(",");
+            }
+        }
+        String substring = nextNodeUserSids.substring(0,nextNodeUserSids.lastIndexOf(","));
+        bv.setNextNodeUserSids(substring);
+        return handleProcess(bv, rb, baseShuntingInvoicingApply);
+    }
+
+    private ResultBean handleProcess(BusinessVariables bv, ResultBean rb, BaseShuntingInvoicingApply baseShuntingInvoicingApply) {
         if (bv.getTaskId().equals(baseShuntingInvoicingApply.getTaskId())) {
             ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.handleProsess(bv);
             if (!resultBean.getSuccess()) {
@@ -329,7 +376,7 @@ public class BaseShuntingInvoicingApplyService extends MybatisBaseService<BaseSh
         }
     }
 
-    public ResultBean<List<GetNodeVo>> getPreviousNodesForReject(GetNodeQuery query) {
+    public ResultBean getPreviousNodesForReject(GetNodeQuery query) {
         ResultBean<List<GetNodeVo>> rb = ResultBean.fireFail();
         BusinessVariables bv = new BusinessVariables();
         BeanUtil.copyProperties(query, bv);
@@ -341,7 +388,7 @@ public class BaseShuntingInvoicingApplyService extends MybatisBaseService<BaseSh
         return rb.success().setData(voList);
     }
 
-    public ResultBean<List<GetNodeVo>> getNextNodesForSubmit(GetNodeQuery query) {
+    public ResultBean getNextNodesForSubmit(GetNodeQuery query) {
         ResultBean<List<GetNodeVo>> rb = ResultBean.fireFail();
         BusinessVariables bv = new BusinessVariables();
         BeanUtil.copyProperties(query, bv);
@@ -431,4 +478,5 @@ public class BaseShuntingInvoicingApplyService extends MybatisBaseService<BaseSh
         }
         return rb.setMsg("操作失败!提交的数据不一致!");
     }
+
 }

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

@@ -10,6 +10,7 @@ import com.yxt.anrui.base.api.basevehicle.app.AppBaseVehicleOrderVo;
 import com.yxt.common.core.result.ResultBean;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
 import org.apache.ibatis.annotations.Update;
 
 import java.util.List;

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

@@ -400,7 +400,15 @@
                bmc.hubMaterial,
                bmc.tireCover,
                bmc.configuringBao,
-               bmc.otherConfig
+               bmc.otherConfig,
+               bmc.configName,
+               bvm.vehicleAlias,
+               bmc.sid                     as configSid,
+               bvm.sid                     as modelSid,
+               bvm.carBrand                as brandSid,
+               concat_ws('、', bvm.`vehicleVersionValue`, bvm.`fuelTypeValue`, bvm.`gearboxTypeValue`,
+                         bvm.`marketSegmentsValue`, bvm.`engineTypeValue`, bvm.`specifications`,
+                         bvm.`department`) as vehModelInfor
         FROM base_vehmodel_config bvc
                      LEFT JOIN base_vehicle_model bvm ON bvc.`modelSid` = bvm.`sid`
                      LEFT JOIN base_model_config bmc ON bvc.configurationItemsSid = bmc.`sid`
@@ -492,7 +500,8 @@
         AND lockedState = #{lockedStateKey}
         AND bv.useOrgSid =
         #{useOrgSid}) AS nowCarNum,
-                        (select SUM(distinct cast((cast(bo.platformNo as signed)-IFNULL(cast(bo.lockingNum as signed),'0')) as signed)) as quantity from bus_vehicle_order bo
+        (select SUM(distinct cast((cast(bo.platformNo as signed)-IFNULL(cast(bo.lockingNum as signed),'0')) as signed))
+        as quantity from bus_vehicle_order bo
         LEFT JOIN bus_vehicle_apply_detail bd on bo.purchaseRequisitionSid = bd.applySid
         where bo.useOrgSid = #{useOrgSid} AND bd.vehicleSid = bvm.sid) AS produceCarNum
         FROM base_vehicle_model bvm
@@ -510,9 +519,12 @@
                 WHERE bv.modelSid = #{modelSid}
                   AND bv.lockedState = #{state}
                   and bv.useOrgSid = bvc.useOrgSid) AS nowCarNum,
-               (select SUM(distinct cast((cast(bo.platformNo as signed)-IFNULL(cast(bo.lockingNum as signed),'0')) as signed)) as quantity from bus_vehicle_order bo
+               (select SUM(distinct cast((cast(bo.platformNo as signed) -
+                                          IFNULL(cast(bo.lockingNum as signed), '0')) as signed)) as quantity
+                from bus_vehicle_order bo
                              LEFT JOIN bus_vehicle_apply_detail bd on bo.purchaseRequisitionSid = bd.applySid
-        where bo.useOrgSid = bvc.useOrgSid AND bd.vehicleSid = bvm.sid) AS produceCarNum
+                where bo.useOrgSid = bvc.useOrgSid
+                  AND bd.vehicleSid = bvm.sid)      AS produceCarNum
         FROM base_vehicle_model bvm
                      LEFT JOIN base_vehmodel_config bvc ON bvm.sid = bvc.modelSid
         WHERE bvc.modelSid = #{modelSid}
@@ -651,15 +663,20 @@
         bvm.brandName,
         <!--车型名称-->
         bvm.vehicleAlias,
+        <!--车型sid-->
+        bvm.sid as modelSid,
         <!--车架号-->
         bv.vinNo,
         <!--颜色-->
         bmc.carColor color,
         <!--存放地点-->
         bv.locationName location,
+        <!--存放地点sid-->
+        bv.location locationSid,
         <!--销售指导价-->
         bv.salePrice as guidedPrice,
         bmc.configName,
+        bmc.sid as configSid,
         DATE_FORMAT(bv.priceDate, '%Y-%m-%d') as priceDate,
         bv.costPrice as priced
         FROM base_vehicle bv
@@ -772,8 +789,7 @@
         select filePath
         from base_vehicle_appendix
         where linkSid = #{vehicleSid}
-          and attachType = '0001'
+          and attachType = '0001' limit 1
-        limit 1
     </select>
 
     <select id="getVinByWarehouseSid" resultType="com.yxt.anrui.base.api.basevehicle.AppScmWarehouseVinVo">

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

@@ -290,6 +290,16 @@ public class BaseVehicleRest implements BaseVehicleFeign {
     public ResultBean<ExiCarConfigDetailVo> selectExiCarConfig(String modelSid, String configSid, String userSid) {
         ResultBean rb = ResultBean.fireFail();
         ExiCarConfigDetailVo exiCarConfigDetailVo = baseVehicleService.selectExiCarConfig(modelSid, configSid, userSid);
+        /*StringBuilder s = new StringBuilder();
+        String marketSegmentsValue = exiCarConfigDetailVo.getMarketSegmentsValue();
+        String engineTypeValue = exiCarConfigDetailVo.getEngineTypeValue();
+        String specifications = exiCarConfigDetailVo.getSpecifications();
+        String departmentValue = exiCarConfigDetailVo.getDepartmentValue();
+        if (StringUtils.isNotBlank(marketSegmentsValue)){
+            s.append(marketSegmentsValue)
+        }else
+        s.append(exiCarConfigDetailVo.getVehicleVersionValue()).append("、").append(exiCarConfigDetailVo.getFuelTypeValue()).append("、").append(exiCarConfigDetailVo.getGearboxTypeValue()).append("、").append()
+        */
         return rb.success().setData(exiCarConfigDetailVo);
     }
 

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleinquiry/BusVehicleInquiryService.java

@@ -105,7 +105,9 @@ public class BusVehicleInquiryService extends MybatisBaseService<BusVehicleInqui
 
     public void saveOrUpdateDto(BusVehicleInquiryDto dto) {
         BusVehicleInquiry entity = new BusVehicleInquiry();
+        String sid = entity.getSid();
         dto.fillEntity(entity);
+        entity.setSid(sid);
         this.saveOrUpdate(entity);
     }
 

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleorder/BusVehicleOrderMapper.xml

@@ -11,6 +11,7 @@
         <where>
             ${ew.sqlSegment}
         </where>
+        ORDER BY bva.`applicationCode` DESC
     </select>
 
     <select id="selectListAllVo" resultType="com.yxt.anrui.base.api.busvehicleorder.BusVehicleOrderVo">

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleorder/BusVehicleOrderService.java

@@ -217,6 +217,8 @@ public class BusVehicleOrderService extends MybatisBaseService<BusVehicleOrderMa
         } else { // 修改
             BusVehicleOrder vehicleOrder = fetchBySid(dto.getSid());
             BeanUtil.copyProperties(dto, vehicleOrder);
+            //订单日期
+            String orderDate = dto.getOrderDate();
             //下线日期
             String offlineDate = dto.getOfflineDate();
             //上线日期
@@ -228,6 +230,8 @@ public class BusVehicleOrderService extends MybatisBaseService<BusVehicleOrderMa
             } else if (StringUtils.isNotBlank(launchDate)) {
                 vehicleOrder.setOrderStatus("上线");
             } else if (StringUtils.isNotBlank(expectLaunchDate)) {
+                vehicleOrder.setOrderStatus("预计上线");
+            } else if (StringUtils.isNotBlank(orderDate)) {
                 vehicleOrder.setOrderStatus("未上线");
             }
             updateById(vehicleOrder);

anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempVo.java

@@ -1,6 +1,8 @@
 package com.yxt.anrui.crm.api.crmcustomertemp;
 
 
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.yxt.anrui.crm.api.crmbusiness.CrmBusinessVo;
 import com.yxt.anrui.crm.api.crmvehicledemand.CrmVehicledemand;
 import com.yxt.anrui.crm.api.crmvehicledemand.CrmVehicledemandVo;
@@ -10,6 +12,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -35,6 +38,10 @@ public class CrmCustomerTempVo implements Vo {
     @ApiModelProperty("创建人sid")
     private String createBySid;
 
+    @ApiModelProperty("登记日期")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date createTime;
+    
 	@ApiModelProperty("客户编号（部门编码+客户类型（1位，0个人，1企业）+部门内部流水号（6位））")
     private String customerNo;