付款申请车辆列表修复

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java

@@ -11,6 +11,8 @@ import com.yxt.anrui.fin.api.kingdee.FinKingDeeFeign;
 import com.yxt.anrui.fin.api.kingdee.saloutstock.SalOutStock;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo;
+import com.yxt.anrui.scm.api.scmwarehouse.ScmWarehouseFeign;
+import com.yxt.anrui.scm.api.scmwarehouse.ScmWarehouseVo;
 import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.base.utils.PagerUtil;
 import com.yxt.common.core.query.PagerQuery;
@@ -39,6 +41,8 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
     private SysOrganizationFeign sysOrganizationFeign;
     @Autowired
     private FinKingDeeFeign finKingDeeFeign;
+    @Autowired
+    private ScmWarehouseFeign scmWarehouseFeign;
 
     public ResultBean vehicleOut(BaseVehicleOutDto dto) {
         ResultBean rb = ResultBean.fireFail();
@@ -116,7 +120,8 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
             }
         }
         //项目类别key和项目类别type
-
+        salOutStock.setF_PAEZ_AssistantType(dto.getType());
+        salOutStock.setF_PAEZ_AssistantKey(dto.getTypeKey());
         //业务员
 
         //中介单位
@@ -131,6 +136,8 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
         //物料编码
         //批号
         //仓库id
+        ResultBean<ScmWarehouseVo> voResultBean = scmWarehouseFeign.fetchBySid(baseVehicle.getLocation());
+        fEntity.setFStockID(voResultBean.getData().getWarehouseCode());
         //销售折让
         if (StringUtils.isNotBlank(dto.getSalesAllowance())) {
             fEntity.setF_PAEZ_Decimal3(dto.getSalesAllowance());

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

@@ -70,4 +70,9 @@ public class FinPaymentapplyVo implements Vo {
     @ApiModelProperty(value = "备注")
     private String remarks;
 
+    @ApiModelProperty("流程定义id")
+    private String procDefId;
+    @ApiModelProperty("流程实例id")
+    private String procInstId;
+
 }

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplydetails/FinPaymentapplyDetailVo.java

@@ -4,8 +4,6 @@ import com.yxt.common.core.vo.Vo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.math.BigDecimal;
-
 /**
  * @Author dimengzhe
  * @Date 2022/10/6 22:13
@@ -28,4 +26,6 @@ public class FinPaymentapplyDetailVo implements Vo {
     private String receivingAccount;
     @ApiModelProperty("付款金额")
     private String payAccount;
+
+    private String remarks;
 }

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

@@ -15,7 +15,9 @@
                case fp.state
                    when 1 then '未付款'
                    when 2 then '已付款' end                         as state,
-               fp.remarks
+               fp.remarks,
+               fp.procInstId,
+               fp.procDefId
         FROM fin_paymentapply fp
         <where>
             ${ew.sqlSegment}

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplyvehicle/FinPaymentapplyVehicleService.java

@@ -30,6 +30,7 @@ public class FinPaymentapplyVehicleService extends MybatisBaseService<FinPayment
             BeanUtil.copyProperties(dto, finPaymentapplyVehicle, "sid");
             finPaymentapplyVehicle.setMoney(new BigDecimal(dto.getMoney()));
             bigDecimal = bigDecimal.add(new BigDecimal(dto.getMoney()));
+            finPaymentapplyVehicle.setApplySid(sid);
             baseMapper.insert(finPaymentapplyVehicle);
         }
         return bigDecimal.toString();