资金协调手续：新增、列表、详情接口

@@ -6,8 +6,9 @@ import com.lframework.starter.common.constants.StringPool;
 import java.time.LocalDate;
 import java.util.List;
 import com.lframework.starter.web.core.bo.BaseBo;
-import com.lframework.xingyun.sc.bo.ledger.rel.GetFundOrderingUnitBo;
 import com.lframework.xingyun.sc.entity.FundCoordination;
+import com.lframework.xingyun.sc.entity.FundOrderingUnit;
+import com.lframework.xingyun.sc.entity.PendingDeliveryOrder;
 import io.swagger.annotations.ApiModelProperty;
 
 import lombok.Data;
@@ -62,12 +63,6 @@ public class GetFundCoordinationBo extends BaseBo<FundCoordination> {
     private String orderingUnitName;
 
     /**
-     * 客户简称ID
-     */
-    @ApiModelProperty("客户简称ID")
-    private String customerShortId;
-
-    /**
      * 客户简称名称
      */
     @ApiModelProperty("客户简称名称")
@@ -141,10 +136,34 @@ public class GetFundCoordinationBo extends BaseBo<FundCoordination> {
     private String requirementSpecification;
 
     /**
-     * 协调事由需求说明
+     * 申请发货量（吨）
      */
-    @ApiModelProperty("协调事由需求说明")
-    private List<GetFundOrderingUnitBo> fundOrderingUnitList;
+    @ApiModelProperty("申请发货量")
+    private String requestedShipmentQuantity;
+
+    /**
+     * 贸易类型：外贸: OUTSIDE  内贸：INSIDE
+     */
+    @ApiModelProperty("贸易类型")
+    private String type;
+
+    /**
+     * 订货单位关联记录
+     */
+    @ApiModelProperty("订货单位关联记录")
+    private List<FundOrderingUnit> fundOrderingUnitList;
+
+    /**
+     * 待交付订单量
+     */
+    @ApiModelProperty("待交付订单量")
+    private List<PendingDeliveryOrder> pendingDeliveryOrderList;
+
+    /**
+     * 是否能审核
+     */
+    @ApiModelProperty("是否能审核")
+    private boolean showExamine;
 
     public GetFundCoordinationBo() {
 

@@ -60,12 +60,6 @@ public class QueryFundCoordinationBo extends BaseBo<FundCoordination> {
     private String orderingUnitName;
 
     /**
-     * 客户简称ID
-     */
-    @ApiModelProperty("客户简称ID")
-    private String customerShortId;
-
-    /**
      * 客户类型
      */
     @ApiModelProperty("客户类型")
@@ -132,6 +126,18 @@ public class QueryFundCoordinationBo extends BaseBo<FundCoordination> {
     @ApiModelProperty("协调事由需求说明")
     private String requirementSpecification;
 
+    /**
+     * 申请发货量（吨）
+     */
+    @ApiModelProperty("申请发货量")
+    private String requestedShipmentQuantity;
+
+    /**
+     * 贸易类型：外贸: OUTSIDE  内贸：INSIDE
+     */
+    @ApiModelProperty("贸易类型")
+    private String type;
+
     public QueryFundCoordinationBo() {
 
     }

@@ -279,6 +279,12 @@ public class GetPurchaseOrderInfoBo extends BaseBo<PurchaseOrderInfo> {
     private BigDecimal totalQuantity;
 
     /**
+     * 已发货数量(吨)
+     */
+    @TableField(exist = false)
+    private String dispatchedQuantity;
+
+    /**
      * 包装费
      */
     @ApiModelProperty("包装费")
@@ -308,6 +314,12 @@ public class GetPurchaseOrderInfoBo extends BaseBo<PurchaseOrderInfo> {
     @ApiModelProperty("交货日期")
     private LocalDate deliveryDate;
 
+    /**
+     * 是否冻结
+     */
+    @ApiModelProperty("是否冻结")
+    private boolean freeze;
+
 
     public GetPurchaseOrderInfoBo() {
 

 package com.lframework.xingyun.sc.controller.ledger;
 
+import com.lframework.starter.bpm.dto.FlowTaskDto;
+import com.lframework.starter.bpm.mappers.FlowTaskWrapperMapper;
+import com.lframework.starter.bpm.vo.flow.task.QueryTodoTaskListVo;
 import com.lframework.starter.web.core.annotations.security.HasPermission;
 import com.lframework.starter.web.core.components.security.SecurityUtil;
 import com.lframework.starter.web.core.controller.DefaultBaseController;
@@ -16,26 +19,27 @@ import com.lframework.starter.web.inner.service.system.SysDataDicItemService;
 import com.lframework.starter.web.inner.service.system.SysDeptService;
 import com.lframework.starter.web.inner.service.system.SysUserService;
 import com.lframework.starter.web.inner.vo.system.user.QuerySysUserVo;
-import com.lframework.xingyun.sc.bo.ledger.detail.GetFundOrderingUnitDetailBo;
 import com.lframework.xingyun.sc.bo.ledger.fund.GetFundCoordinationBo;
 import com.lframework.xingyun.sc.bo.ledger.fund.QueryFundCoordinationBo;
-import com.lframework.xingyun.sc.bo.ledger.rel.GetFundOrderingUnitBo;
-import com.lframework.xingyun.sc.entity.FundCoordination;
-import com.lframework.xingyun.sc.entity.ReceiptLedgerInfo;
-import com.lframework.xingyun.sc.entity.UnlimitedGuaranteeLetter;
-import com.lframework.xingyun.sc.service.ledger.FundCoordinationService;
-import com.lframework.xingyun.sc.service.ledger.ReceiptLedgerInfoService;
-import com.lframework.xingyun.sc.service.ledger.UnlimitedGuaranteeLetterService;
+import com.lframework.xingyun.sc.bo.order.GetPurchaseOrderInfoBo;
+import com.lframework.xingyun.sc.entity.*;
+import com.lframework.xingyun.sc.service.ledger.*;
+import com.lframework.xingyun.sc.service.order.PurchaseOrderInfoService;
+import com.lframework.xingyun.sc.vo.ledger.detail.QueryFundOrderingUnitDetailVo;
 import com.lframework.xingyun.sc.vo.ledger.fund.CreateFundCoordinationVo;
 import com.lframework.xingyun.sc.vo.ledger.fund.QueryFundCoordinationVo;
 import com.lframework.xingyun.sc.vo.ledger.fund.UpdateFundCoordinationVo;
 import com.lframework.xingyun.sc.vo.ledger.guarantee.QueryUnlimitedGuaranteeLetterVo;
+import com.lframework.xingyun.sc.vo.ledger.pending.QueryPendingDeliveryOrderVo;
+import com.lframework.xingyun.sc.vo.ledger.rel.QueryFundOrderingUnitVo;
+import com.lframework.xingyun.sc.vo.order.QueryPurchaseOrderInfoVo;
 import io.swagger.annotations.ApiImplicitParam;
 import com.lframework.starter.web.core.components.resp.InvokeResultBuilder;
 import com.lframework.starter.common.exceptions.impl.DefaultClientException;
 import io.swagger.annotations.ApiOperation;
 import com.lframework.starter.common.utils.CollectionUtil;
 import io.swagger.annotations.Api;
+import org.apache.commons.collections.CollectionUtils;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
@@ -73,6 +77,16 @@ public class FundCoordinationController extends DefaultBaseController {
     private SysDataDicItemService sysDataDicItemService;
     @Resource
     private UnlimitedGuaranteeLetterService unlimitedGuaranteeLetterService;
+    @Resource
+    private PurchaseOrderInfoService purchaseOrderInfoService;
+    @Resource
+    private FundOrderingUnitService fundOrderingUnitService;
+    @Resource
+    private FundOrderingUnitDetailService fundOrderingUnitDetailService;
+    @Resource
+    private PendingDeliveryOrderService pendingDeliveryOrderService;
+    @Resource
+    private FlowTaskWrapperMapper flowTaskWrapperMapper;
 
     /**
      * 查询列表
@@ -108,7 +122,7 @@ public class FundCoordinationController extends DefaultBaseController {
             throw new DefaultClientException("资金协调手续不存在！");
         }
 
-        GetFundCoordinationBo result = new GetFundCoordinationBo(data);
+        GetFundCoordinationBo result = packFundCoordinationData(data);
 
         return InvokeResultBuilder.success(result);
     }
@@ -188,7 +202,6 @@ public class FundCoordinationController extends DefaultBaseController {
 //        SysDataDicItem type = sysDataDicItemService.findByCode("ENTERPRISE_TYPE", receiptLedgerInfo.getCustomerType());
 //        getFundCoordinationBo.setCustomerTypeName(type == null ? "" : type.getName());
         //客户简称
-        getFundCoordinationBo.setCustomerShortId(receiptLedgerInfo.getCustomerShortId());
         getFundCoordinationBo.setCustomerShortName(receiptLedgerInfo.getCustomerShortName());
         //授权额度
         if (receiptLedgerInfo.getQuota() != null) {
@@ -202,7 +215,7 @@ public class FundCoordinationController extends DefaultBaseController {
         //无限担保书
         StringBuilder unlimitedGuaranteeLetterStr = new StringBuilder();
         //订货单位集合
-        List<GetFundOrderingUnitBo> fundOrderingUnitList = new ArrayList<>();
+        List<FundOrderingUnit> fundOrderingUnitList = new ArrayList<>();
         //总计应收款
         BigDecimal totalAccountsReceivable = BigDecimal.ZERO;
         //超期应收款
@@ -228,17 +241,17 @@ public class FundCoordinationController extends DefaultBaseController {
             } else {
                 unlimitedGuaranteeLetterStr.append("有").append("，");
             }
-            GetFundOrderingUnitBo bo = new GetFundOrderingUnitBo();
-            bo.setOrderingUnit(customerId);
-            bo.setOrderingUnitName(receiptList.get(0).getCustomerName());
+            FundOrderingUnit fundOrderingUnit = new FundOrderingUnit();
+            fundOrderingUnit.setOrderingUnit(customerId);
+            fundOrderingUnit.setOrderingUnitName(receiptList.get(0).getCustomerName());
             System.out.println("Customer ID: " + customerId);
             //订货单位应收款明细
-            List<GetFundOrderingUnitDetailBo> fundOrderingUnitDetailList = new ArrayList<>();
+            List<FundOrderingUnitDetail> fundOrderingUnitDetailList = new ArrayList<>();
             for (ReceiptLedgerInfo receipt : receiptList) {
-                GetFundOrderingUnitDetailBo bo1 = new GetFundOrderingUnitDetailBo();
-                bo1.setDeliveryDate(receipt.getShipmentDate());
+                FundOrderingUnitDetail fundOrderingUnitDetail = new FundOrderingUnitDetail();
+                fundOrderingUnitDetail.setDeliveryDate(receipt.getShipmentDate());
                 if (receipt.getStartAccountReceivable() != null) {
-                    bo1.setAccountsReceivable(receipt.getStartAccountReceivable().stripTrailingZeros().toPlainString());
+                    fundOrderingUnitDetail.setAccountsReceivable(receipt.getStartAccountReceivable().stripTrailingZeros().toPlainString());
                 }
                 SysDataDicItem sysDataDicItem = sysDataDicItemService.findByCode("DEBT_STATUS", receipt.getDebtStatus());
                 if (sysDataDicItem != null && sysDataDicItem.getCode().equals("FIRST_COORDINATE")) {
@@ -283,23 +296,23 @@ public class FundCoordinationController extends DefaultBaseController {
                         || sysDataDicItem.getCode().equals("SECOND_COORDINATE") || sysDataDicItem.getCode().equals("CLEAR_DEBTS")))) {
                     continue;
                 }
-                bo1.setStatus(sysDataDicItem.getName());
-                bo1.setDueDate(receipt.getProcessedDate());
-                if (bo1.getDueDate() != null) {
-                    long daysBetween = ChronoUnit.DAYS.between(bo1.getDueDate(), LocalDate.now());
-                    bo1.setTimeout(String.valueOf(daysBetween));
+                fundOrderingUnitDetail.setStatus(sysDataDicItem.getName());
+                fundOrderingUnitDetail.setDueDate(receipt.getProcessedDate());
+                if (fundOrderingUnitDetail.getDueDate() != null) {
+                    long daysBetween = ChronoUnit.DAYS.between(fundOrderingUnitDetail.getDueDate(), LocalDate.now());
+                    fundOrderingUnitDetail.setTimeout(String.valueOf(daysBetween));
                 }
                 //协调办理日期
                 if (receipt.getCoordinateDate() != null && !receipt.getCoordinateDate().isBefore(LocalDate.now())) {
-                    bo1.setCoordinateHandleDate(receipt.getCoordinateDate());
+                    fundOrderingUnitDetail.setCoordinateHandleDate(receipt.getCoordinateDate());
                 }
                 if (receipt.getCoordinateDate() != null && !receipt.getCoordinateDate().isBefore(LocalDate.now())
-                        && bo1.getDueDate() != null) {
+                        && fundOrderingUnitDetail.getDueDate() != null) {
                     //实际超时(协调办理日期-应办理日期)
-                    long daysBetween = ChronoUnit.DAYS.between(bo1.getDueDate(), receipt.getCoordinateDate());
-                    bo1.setActualTimeout(String.valueOf(daysBetween));
+                    long daysBetween = ChronoUnit.DAYS.between(fundOrderingUnitDetail.getDueDate(), receipt.getCoordinateDate());
+                    fundOrderingUnitDetail.setActualTimeout(String.valueOf(daysBetween));
                 }
-                fundOrderingUnitDetailList.add(bo1);
+                fundOrderingUnitDetailList.add(fundOrderingUnitDetail);
             }
             //排序
             fundOrderingUnitDetailList.sort((a, b) -> {
@@ -307,8 +320,8 @@ public class FundCoordinationController extends DefaultBaseController {
                 Long bVal = b.getTimeout() == null ? null : Long.valueOf(b.getTimeout());
                 return Comparator.<Long>reverseOrder().compare(aVal, bVal);
             });
-            bo.setFundOrderingUnitDetailList(fundOrderingUnitDetailList);
-            fundOrderingUnitList.add(bo);
+            fundOrderingUnit.setFundOrderingUnitDetailList(fundOrderingUnitDetailList);
+            fundOrderingUnitList.add(fundOrderingUnit);
         }
         //订货单位名称
         if (customerNameStr.length() > 0) {
@@ -364,4 +377,65 @@ public class FundCoordinationController extends DefaultBaseController {
 
         return InvokeResultBuilder.success(data);
     }
+
+
+    /**
+     * 查询冻结的订货单列表
+     */
+    @ApiOperation("查询冻结的订货单列表")
+    @GetMapping("/queryFreeze")
+    public InvokeResult<PageResult<GetPurchaseOrderInfoBo>> queryFreeze(@Valid QueryPurchaseOrderInfoVo vo) {
+
+        PageResult<PurchaseOrderInfo> pageResult = purchaseOrderInfoService.queryFreeze(getPageIndex(vo), getPageSize(vo), vo);
+
+        List<PurchaseOrderInfo> datas = pageResult.getDatas();
+        List<GetPurchaseOrderInfoBo> results = null;
+
+        if (!CollectionUtil.isEmpty(datas)) {
+            results = datas.stream().map(GetPurchaseOrderInfoBo::new).collect(Collectors.toList());
+        }
+
+        return InvokeResultBuilder.success(PageResultUtil.rebuild(pageResult, results));
+    }
+
+    /**
+     * 封装客户资信数据
+     *
+     * @param fundCoordination 数据实体
+     * @return GetFundCoordinationBo
+     */
+    private GetFundCoordinationBo packFundCoordinationData(FundCoordination fundCoordination) {
+        // 处理关联数据
+        GetFundCoordinationBo data = new GetFundCoordinationBo(fundCoordination);
+        //获取订货单位关联记录
+        QueryFundOrderingUnitVo vo = new QueryFundOrderingUnitVo();
+        vo.setFundId(fundCoordination.getId());
+        List<FundOrderingUnit> fundOrderingUnitList = fundOrderingUnitService.query(vo);
+        if (CollectionUtils.isNotEmpty(fundOrderingUnitList)) {
+            for (FundOrderingUnit fundOrderingUnit : fundOrderingUnitList) {
+                //资金协调手续订货单位应收款明细
+                QueryFundOrderingUnitDetailVo vo1 = new QueryFundOrderingUnitDetailVo();
+                vo1.setFundOrderingUnitId(fundOrderingUnit.getId());
+                List<FundOrderingUnitDetail> fundOrderingUnitDetailList = fundOrderingUnitDetailService.query(vo1);
+                if (CollectionUtils.isNotEmpty(fundOrderingUnitDetailList)) {
+                    fundOrderingUnit.setFundOrderingUnitDetailList(fundOrderingUnitDetailList);
+                }
+            }
+            data.setFundOrderingUnitList(fundOrderingUnitList);
+        }
+        //待交付订单量
+        QueryPendingDeliveryOrderVo vo2 = new QueryPendingDeliveryOrderVo();
+        vo2.setFundId(fundCoordination.getId());
+        List<PendingDeliveryOrder> pendingDeliveryOrderList = pendingDeliveryOrderService.query(vo2);
+        if (CollectionUtils.isNotEmpty(pendingDeliveryOrderList)) {
+            data.setPendingDeliveryOrderList(pendingDeliveryOrderList);
+        }
+        // 获取当前人员的待办任务数据
+        List<FlowTaskDto> flowTaskList = flowTaskWrapperMapper.queryTodoList(new QueryTodoTaskListVo(), SecurityUtil.getCurrentUser().getId());
+        if (CollectionUtils.isNotEmpty(flowTaskList)) {
+            List<String> businessIds = flowTaskList.stream().map(FlowTaskDto::getBusinessId).collect(Collectors.toList());
+            data.setShowExamine(businessIds.contains(fundCoordination.getId()));
+        }
+        return data;
+    }
 }

@@ -61,14 +61,8 @@ public class FundCoordination extends BaseEntity implements BaseDto {
     private String orderingUnitName;
 
     /**
-     * 客户简称ID
-     */
-    private String customerShortId;
-
-    /**
      * 客户简称
      */
-    @TableField(exist = false)
     private String customerShortName;
 
     /**
@@ -122,6 +116,16 @@ public class FundCoordination extends BaseEntity implements BaseDto {
     private String requirementSpecification;
 
     /**
+     * 申请发货量（吨）
+     */
+    private String requestedShipmentQuantity;
+
+    /**
+     * 贸易类型：外贸: OUTSIDE  内贸：INSIDE
+     */
+    private String type;
+
+    /**
      * 办事处内勤ID
      */
     private String officeClerk;

@@ -3,6 +3,7 @@ package com.lframework.xingyun.sc.entity;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.lframework.starter.web.core.dto.BaseDto;
 import java.time.LocalDateTime;
+import java.util.List;
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.lframework.starter.web.core.entity.BaseEntity;
 import com.baomidou.mybatisplus.annotation.TableField;
@@ -48,6 +49,12 @@ public class FundOrderingUnit extends BaseEntity implements BaseDto {
     private String remark;
 
     /**
+     * 资金协调手续订货单位应收款明细
+     */
+    @TableField(exist = false)
+    private List<FundOrderingUnitDetail> fundOrderingUnitDetailList;
+
+    /**
      * 创建人ID
      */
     @TableField(fill = FieldFill.INSERT)

@@ -254,6 +254,12 @@ public class PurchaseOrderInfo extends BaseEntity implements BaseDto {
     private BigDecimal totalQuantity;
 
     /**
+     * 已发货数量(吨)
+     */
+    @TableField(exist = false)
+    private String dispatchedQuantity;
+
+    /**
      * 包装费
      */
     private String packagingFee;
@@ -264,6 +270,11 @@ public class PurchaseOrderInfo extends BaseEntity implements BaseDto {
     private String contractCreateById;
 
     /**
+     * 是否冻结
+     */
+    private boolean freeze;
+
+    /**
      * 下单人(非持久化字段)
      */
     @TableField(exist = false)

@@ -3,6 +3,7 @@ package com.lframework.xingyun.sc.impl.ledger;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.github.pagehelper.PageInfo;
+import com.lframework.starter.common.utils.CollectionUtil;
 import com.lframework.starter.web.core.impl.BaseMpServiceImpl;
 import com.lframework.starter.web.core.utils.PageResultUtil;
 import com.lframework.starter.web.core.utils.OpLogUtil;
@@ -19,17 +20,26 @@ import com.lframework.starter.common.utils.Assert;
 import com.lframework.xingyun.sc.entity.FundCoordination;
 import com.lframework.xingyun.sc.mappers.FundCoordinationMapper;
 import com.lframework.xingyun.sc.service.ledger.FundCoordinationService;
+import com.lframework.xingyun.sc.service.ledger.FundOrderingUnitService;
+import com.lframework.xingyun.sc.service.ledger.PendingDeliveryOrderService;
 import com.lframework.xingyun.sc.vo.ledger.fund.CreateFundCoordinationVo;
 import com.lframework.xingyun.sc.vo.ledger.fund.QueryFundCoordinationVo;
 import com.lframework.xingyun.sc.vo.ledger.fund.UpdateFundCoordinationVo;
+import com.lframework.xingyun.sc.vo.ledger.pending.CreatePendingDeliveryOrderVo;
+import com.lframework.xingyun.sc.vo.ledger.rel.CreateFundOrderingUnitVo;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.stereotype.Service;
-
+import javax.annotation.Resource;
 import java.util.List;
 
 @Service
 public class FundCoordinationServiceImpl extends BaseMpServiceImpl<FundCoordinationMapper, FundCoordination> implements FundCoordinationService {
 
+    @Resource
+    private FundOrderingUnitService fundOrderingUnitService;
+    @Resource
+    private PendingDeliveryOrderService pendingDeliveryOrderService;
+
     @Override
     public PageResult<FundCoordination> query(Integer pageIndex, Integer pageSize, QueryFundCoordinationVo vo) {
 
@@ -72,7 +82,7 @@ public class FundCoordinationServiceImpl extends BaseMpServiceImpl<FundCoordinat
         if (!StringUtil.isBlank(vo.getOrderingUnitName())) {
             data.setOrderingUnitName(vo.getOrderingUnitName());
         }
-        data.setCustomerShortId(vo.getCustomerShortId());
+        data.setCustomerShortName(vo.getCustomerShortName());
         if (!StringUtil.isBlank(vo.getCustomerType())) {
             data.setCustomerType(vo.getCustomerType());
         }
@@ -94,15 +104,40 @@ public class FundCoordinationServiceImpl extends BaseMpServiceImpl<FundCoordinat
         if (!StringUtil.isBlank(vo.getRequirementSpecification())) {
             data.setRequirementSpecification(vo.getRequirementSpecification());
         }
+        if (!StringUtil.isBlank(vo.getRequestedShipmentQuantity())) {
+            data.setRequestedShipmentQuantity(vo.getRequestedShipmentQuantity());
+        }
+        if (!StringUtil.isBlank(vo.getType())) {
+            data.setType(vo.getType());
+        }
 
         getBaseMapper().insert(data);
 
+        //新增协调事由需求说明
+        List<CreateFundOrderingUnitVo> fundOrderingUnitList = vo.getFundOrderingUnitList();
+        if (CollectionUtil.isNotEmpty(fundOrderingUnitList)) {
+            for (CreateFundOrderingUnitVo createFundOrderingUnitVo : fundOrderingUnitList) {
+                createFundOrderingUnitVo.setFundId(data.getId());
+                fundOrderingUnitService.create(createFundOrderingUnitVo);
+            }
+        }
+        //新增待交付订单量
+        List<CreatePendingDeliveryOrderVo> pendingDeliveryOrderList = vo.getPendingDeliveryOrderList();
+        if (CollectionUtil.isNotEmpty(pendingDeliveryOrderList)) {
+            pendingDeliveryOrderList.forEach(pendingDeliveryOrder ->
+                    pendingDeliveryOrder.setFundId(data.getId())
+            );
+            pendingDeliveryOrderService.batchAdd(pendingDeliveryOrderList);
+        }
         OpLogUtil.setVariable("id", data.getId());
         OpLogUtil.setExtra(vo);
 
         return data.getId();
     }
 
+    /**
+     * 没有修改：方法不全后续使用要完善
+     */
     @OpLog(type = OtherOpLogType.class, name = "修改资金协调手续，ID：{}", params = {"#id"})
     @Transactional(rollbackFor = Exception.class)
     @Override
@@ -117,7 +152,7 @@ public class FundCoordinationServiceImpl extends BaseMpServiceImpl<FundCoordinat
                 .set(FundCoordination::getFundResponsiblePerson, StringUtil.isBlank(vo.getFundResponsiblePerson()) ? null : vo.getFundResponsiblePerson())
                 .set(FundCoordination::getDeptAndRole, StringUtil.isBlank(vo.getDeptAndRole()) ? null : vo.getDeptAndRole())
                 .set(FundCoordination::getOrderingUnitName, StringUtil.isBlank(vo.getOrderingUnitName()) ? null : vo.getOrderingUnitName())
-                .set(FundCoordination::getCustomerShortId, vo.getCustomerShortId())
+                .set(FundCoordination::getCustomerShortName, vo.getCustomerShortName())
                 .set(FundCoordination::getCustomerType, StringUtil.isBlank(vo.getCustomerType()) ? null : vo.getCustomerType())
                 .set(FundCoordination::getUnlimitedGuaranteeLetter, StringUtil.isBlank(vo.getUnlimitedGuaranteeLetter()) ? null : vo.getUnlimitedGuaranteeLetter())
                 .set(FundCoordination::getSettlementPeriod, StringUtil.isBlank(vo.getSettlementPeriod()) ? null : vo.getSettlementPeriod())
@@ -125,6 +160,8 @@ public class FundCoordinationServiceImpl extends BaseMpServiceImpl<FundCoordinat
                 .set(FundCoordination::getOrderDate, vo.getOrderDate() == null ? null : vo.getOrderDate())
                 .set(FundCoordination::getOrderQuantity, vo.getOrderQuantity() == null ? null : vo.getOrderQuantity())
                 .set(FundCoordination::getRequirementSpecification, StringUtil.isBlank(vo.getRequirementSpecification()) ? null : vo.getRequirementSpecification())
+                .set(FundCoordination::getRequestedShipmentQuantity, StringUtil.isBlank(vo.getRequestedShipmentQuantity()) ? null : vo.getRequestedShipmentQuantity())
+                .set(FundCoordination::getType, StringUtil.isBlank(vo.getType()) ? null : vo.getType())
                 .eq(FundCoordination::getId, vo.getId());
 
         getBaseMapper().update(updateWrapper);

@@ -3,6 +3,7 @@ package com.lframework.xingyun.sc.impl.ledger;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.github.pagehelper.PageInfo;
+import com.lframework.starter.web.core.components.security.SecurityUtil;
 import com.lframework.starter.web.core.impl.BaseMpServiceImpl;
 import com.lframework.starter.web.core.utils.PageResultUtil;
 import com.lframework.starter.web.core.components.resp.PageResult;
@@ -22,9 +23,11 @@ import com.lframework.xingyun.sc.service.ledger.FundOrderingUnitDetailService;
 import com.lframework.xingyun.sc.vo.ledger.detail.CreateFundOrderingUnitDetailVo;
 import com.lframework.xingyun.sc.vo.ledger.detail.QueryFundOrderingUnitDetailVo;
 import com.lframework.xingyun.sc.vo.ledger.detail.UpdateFundOrderingUnitDetailVo;
+import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.stereotype.Service;
-
+import java.time.LocalDateTime;
+import java.util.ArrayList;
 import java.util.List;
 
 @Service
@@ -124,6 +127,34 @@ public class FundOrderingUnitDetailServiceImpl extends BaseMpServiceImpl<FundOrd
     }
 
     @Override
+    public void batchAdd(List<CreateFundOrderingUnitDetailVo> createFundOrderingUnitDetailVoList) {
+        if (CollectionUtils.isEmpty(createFundOrderingUnitDetailVoList)) {
+            return;
+        }
+        String userId = SecurityUtil.getCurrentUser().getId();
+        List<FundOrderingUnitDetail> fundOrderingUnitDetailList = new ArrayList<>();
+        for (CreateFundOrderingUnitDetailVo vo : createFundOrderingUnitDetailVoList) {
+            FundOrderingUnitDetail fundOrderingUnitDetail = new FundOrderingUnitDetail();
+            fundOrderingUnitDetail.setFundOrderingUnitId(vo.getFundOrderingUnitId());
+            fundOrderingUnitDetail.setDeliveryDate(vo.getDeliveryDate());
+            fundOrderingUnitDetail.setAccountsReceivable(vo.getAccountsReceivable());
+            fundOrderingUnitDetail.setStatus(vo.getStatus());
+            fundOrderingUnitDetail.setDueDate(vo.getDueDate());
+            fundOrderingUnitDetail.setTimeout(vo.getTimeout());
+            fundOrderingUnitDetail.setCoordinateHandleDate(vo.getCoordinateHandleDate());
+            fundOrderingUnitDetail.setActualTimeout(vo.getActualTimeout());
+            fundOrderingUnitDetail.setRemark(vo.getRemark());
+            fundOrderingUnitDetail.setId(IdUtil.getId());
+            fundOrderingUnitDetail.setCreateById(userId);
+            fundOrderingUnitDetail.setUpdateById(userId);
+            fundOrderingUnitDetail.setCreateTime(LocalDateTime.now());
+            fundOrderingUnitDetail.setUpdateTime(LocalDateTime.now());
+            fundOrderingUnitDetailList.add(fundOrderingUnitDetail);
+        }
+        getBaseMapper().batchAdd(fundOrderingUnitDetailList);
+    }
+
+    @Override
     public void cleanCacheByKey(Serializable key) {
 
     }

@@ -17,18 +17,25 @@ import com.lframework.starter.common.utils.Assert;
 import com.lframework.starter.web.inner.components.oplog.OtherOpLogType;
 import com.lframework.xingyun.sc.entity.FundOrderingUnit;
 import com.lframework.xingyun.sc.mappers.FundOrderingUnitMapper;
+import com.lframework.xingyun.sc.service.ledger.FundOrderingUnitDetailService;
 import com.lframework.xingyun.sc.service.ledger.FundOrderingUnitService;
+import com.lframework.xingyun.sc.vo.ledger.detail.CreateFundOrderingUnitDetailVo;
 import com.lframework.xingyun.sc.vo.ledger.rel.CreateFundOrderingUnitVo;
 import com.lframework.xingyun.sc.vo.ledger.rel.QueryFundOrderingUnitVo;
 import com.lframework.xingyun.sc.vo.ledger.rel.UpdateFundOrderingUnitVo;
+import org.apache.commons.collections.CollectionUtils;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.stereotype.Service;
+import javax.annotation.Resource;
 import java.io.Serializable;
 import java.util.List;
 
 @Service
 public class FundOrderingUnitServiceImpl extends BaseMpServiceImpl<FundOrderingUnitMapper, FundOrderingUnit> implements FundOrderingUnitService {
 
+    @Resource
+    private FundOrderingUnitDetailService fundOrderingUnitDetailService;
+
     @Override
     public PageResult<FundOrderingUnit> query(Integer pageIndex, Integer pageSize, QueryFundOrderingUnitVo vo) {
 
@@ -72,6 +79,18 @@ public class FundOrderingUnitServiceImpl extends BaseMpServiceImpl<FundOrderingU
         }
 
         getBaseMapper().insert(data);
+        //新增 资金协调手续订货单位应收款明细
+        List<CreateFundOrderingUnitDetailVo> fundOrderingUnitDetailList = vo.getFundOrderingUnitDetailList();
+        if (CollectionUtils.isNotEmpty(fundOrderingUnitDetailList)) {
+            if (fundOrderingUnitDetailList.stream()
+                    .anyMatch(detail -> detail.getCoordinateHandleDate() == null)) {
+                throw new DefaultClientException("协调办理日期不能为空！");
+            }
+            fundOrderingUnitDetailList.forEach(detail ->
+                    detail.setFundOrderingUnitId(data.getId())
+            );
+            fundOrderingUnitDetailService.batchAdd(fundOrderingUnitDetailList);
+        }
 
         OpLogUtil.setVariable("id", data.getId());
         OpLogUtil.setExtra(vo);

@@ -45,6 +45,7 @@ import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.util.*;
 import java.util.function.Function;
 import java.util.stream.Collectors;
@@ -573,6 +574,50 @@ public class PurchaseOrderInfoServiceImpl extends BaseMpServiceImpl<PurchaseOrde
     }
 
     @Override
+    public PageResult<PurchaseOrderInfo> queryFreeze(Integer pageIndex, Integer pageSize, QueryPurchaseOrderInfoVo vo) {
+
+        Assert.greaterThanZero(pageIndex);
+        Assert.greaterThanZero(pageSize);
+        vo.setFreeze(true);
+        PageHelperUtil.startPage(pageIndex, pageSize);
+        List<PurchaseOrderInfo> datas = getBaseMapper().query(vo);
+        if (CollectionUtils.isNotEmpty(datas)) {
+            List<String> ids = datas.stream()
+                    .map(PurchaseOrderInfo::getId)
+                    .collect(Collectors.toList());
+            //数据封装
+            List<PurchaseOrderLine> purchaseOrderLineList = purchaseOrderLineService.listDispatchedByOrderIds(ids);
+            Map<String, BigDecimal> result = purchaseOrderLineList.stream()
+                    .filter(Objects::nonNull)
+                    .filter(line -> line.getQuantity() != null && line.getPurchaseOrderId() != null)
+                    .collect(Collectors.groupingBy(
+                            PurchaseOrderLine::getPurchaseOrderId,
+                            Collectors.reducing(BigDecimal.ZERO, PurchaseOrderLine::getQuantity, BigDecimal::add)
+                    ));
+
+            for (PurchaseOrderInfo info : datas) {
+                BigDecimal totalQuantity = info.getTotalQuantity();
+                if (totalQuantity == null) {
+                    info.setTotalQuantity(BigDecimal.ZERO);
+                } else {
+                    BigDecimal divided = totalQuantity.divide(BigDecimal.valueOf(1000), 10, RoundingMode.HALF_UP);
+                    String formatted = divided.stripTrailingZeros().toPlainString();
+                    info.setTotalQuantity(new BigDecimal(formatted));
+                }
+                BigDecimal quantity = result.get(info.getId());
+                if (quantity == null) {
+                    info.setDispatchedQuantity("0");
+                    continue;
+                }
+                BigDecimal divided = quantity.divide(BigDecimal.valueOf(1000), 10, RoundingMode.HALF_UP);
+                String formatted = divided.stripTrailingZeros().toPlainString();
+                info.setDispatchedQuantity(formatted);
+            }
+        }
+        return PageResultUtil.convert(new PageInfo<>(datas));
+    }
+
+    @Override
     public void cleanCacheByKey(Serializable key) {
 
     }

@@ -351,6 +351,24 @@ public class PurchaseOrderLineServiceImpl extends BaseMpServiceImpl<PurchaseOrde
     }
 
     @Override
+    public List<PurchaseOrderLine> listDispatchedByOrderIds(List<String> orderIds) {
+        if (CollectionUtils.isEmpty(orderIds)) {
+            return new ArrayList<>();
+        }
+        // 已发货(填写实发数并已到发货日期)
+        LambdaQueryWrapper<PurchaseOrderLine> queryWrapper = Wrappers.lambdaQuery(PurchaseOrderLine.class);
+        queryWrapper.eq(PurchaseOrderLine::getDelFlag, Boolean.FALSE)
+                .in(PurchaseOrderLine::getPurchaseOrderId, orderIds);
+        queryWrapper.eq(PurchaseOrderLine::getShipment, Boolean.TRUE);
+        queryWrapper.le(PurchaseOrderLine::getDeliveryDate, LocalDate.now());
+
+        // 只查询 quantity > 0 的记录
+        queryWrapper.gt(PurchaseOrderLine::getQuantity, BigDecimal.ZERO);
+
+        return getBaseMapper().selectList(queryWrapper);
+    }
+
+    @Override
     public void cleanCacheByKey(Serializable key) {
 
     }

@@ -21,4 +21,6 @@ public interface FundOrderingUnitDetailMapper extends BaseMapper<FundOrderingUni
      * @return
      */
     List<FundOrderingUnitDetail> query(@Param("vo") QueryFundOrderingUnitDetailVo vo);
+
+    void batchAdd(@Param("list") List<FundOrderingUnitDetail> list);
 }

@@ -52,4 +52,9 @@ public interface FundOrderingUnitDetailService extends BaseMpService<FundOrderin
      * @return
      */
     void deleteById(String id);
+
+    /**
+     * 批量新增
+     */
+    void batchAdd(List<CreateFundOrderingUnitDetailVo> createFundOrderingUnitDetailVoList);
 }

@@ -132,4 +132,11 @@ public interface PurchaseOrderInfoService extends BaseMpService<PurchaseOrderInf
      * @return              List<PurchaseOrderInfo>
      */
     List<PurchaseOrderInfo> listByCustomerIds(List<String> customerIds);
+
+    /**
+     * 查询需要解冻列表
+     *
+     * @return
+     */
+    PageResult<PurchaseOrderInfo> queryFreeze(Integer pageIndex, Integer pageSize, QueryPurchaseOrderInfoVo vo);
 }

@@ -138,4 +138,12 @@ public interface PurchaseOrderLineService extends BaseMpService<PurchaseOrderLin
      * @param ids   主键ID集合
      */
     void dispatched(List<String> ids);
+
+    /**
+     * 获取已发货的订货单物料
+     *
+     * @param orderIds 订货单ids
+     * @return 已发货的订货单物料
+     */
+    List<PurchaseOrderLine> listDispatchedByOrderIds(List<String> orderIds);
 }

@@ -6,6 +6,9 @@ import javax.validation.constraints.NotBlank;
 import java.time.LocalDate;
 import com.lframework.starter.web.core.vo.BaseVo;
 import javax.validation.constraints.NotNull;
+
+import com.lframework.xingyun.sc.bo.ledger.pending.GetPendingDeliveryOrderBo;
+import com.lframework.xingyun.sc.vo.ledger.pending.CreatePendingDeliveryOrderVo;
 import com.lframework.xingyun.sc.vo.ledger.rel.CreateFundOrderingUnitVo;
 import io.swagger.annotations.ApiModelProperty;
 import com.lframework.starter.web.core.components.validation.TypeMismatch;
@@ -55,10 +58,10 @@ public class CreateFundCoordinationVo implements BaseVo, Serializable {
     /**
      * 客户简称ID
      */
-    @ApiModelProperty(value = "客户简称ID", required = true)
-    @NotBlank(message = "请输入客户简称ID！")
-    @Length(message = "客户简称ID最多允许32个字符！")
-    private String customerShortId;
+    @ApiModelProperty(value = "客户简称", required = true)
+    @NotBlank(message = "请输入客户简称！")
+    @Length(message = "客户简称最多允许100个字符！")
+    private String customerShortName;
 
     /**
      * 客户类型
@@ -132,9 +135,27 @@ public class CreateFundCoordinationVo implements BaseVo, Serializable {
     private String requirementSpecification;
 
     /**
+     * 申请发货量（吨）
+     */
+    @ApiModelProperty("申请发货量")
+    private String requestedShipmentQuantity;
+
+    /**
+     * 贸易类型：外贸: OUTSIDE  内贸：INSIDE
+     */
+    @ApiModelProperty("贸易类型")
+    private String type;
+
+    /**
      * 协调事由需求说明
      */
     @ApiModelProperty("协调事由需求说明")
     private List<CreateFundOrderingUnitVo> fundOrderingUnitList;
 
+    /**
+     * 待交付订单量
+     */
+    @ApiModelProperty("待交付订单量")
+    private List<CreatePendingDeliveryOrderVo> pendingDeliveryOrderList;
+
 }

@@ -45,10 +45,10 @@ public class UpdateFundCoordinationVo implements BaseVo, Serializable {
     /**
      * 客户简称ID
      */
-    @ApiModelProperty(value = "客户简称ID", required = true)
-    @NotBlank(message = "请输入客户简称ID！")
-    @Length(message = "客户简称ID最多允许32个字符！")
-    private String customerShortId;
+    @ApiModelProperty(value = "客户简称", required = true)
+    @NotBlank(message = "请输入客户简称！")
+    @Length(message = "客户简称最多允许100个字符！")
+    private String customerShortName;
 
     /**
      * 客户类型
@@ -122,6 +122,18 @@ public class UpdateFundCoordinationVo implements BaseVo, Serializable {
     private String requirementSpecification;
 
     /**
+     * 申请发货量（吨）
+     */
+    @ApiModelProperty("申请发货量")
+    private String requestedShipmentQuantity;
+
+    /**
+     * 贸易类型：外贸: OUTSIDE  内贸：INSIDE
+     */
+    @ApiModelProperty("贸易类型")
+    private String type;
+
+    /**
      * 协调事由需求说明
      */
     @ApiModelProperty("协调事由需求说明")

@@ -110,4 +110,10 @@ public class QueryPurchaseOrderInfoVo extends PageVo implements BaseVo, Serializ
 
     @ApiModelProperty("合同")
     private String contractId;
+
+    /**
+     * 是否冻结
+     */
+    @ApiModelProperty("是否冻结")
+    private boolean freeze;
 }

@@ -10,7 +10,6 @@
         <result column="dept_and_role" property="deptAndRole"/>
         <result column="application_date" property="applicationDate"/>
         <result column="ordering_unit_name" property="orderingUnitName"/>
-        <result column="customer_short_id" property="customerShortId"/>
         <result column="customer_short_name" property="customerShortName"/>
         <result column="customer_type" property="customerType"/>
         <result column="unlimited_guarantee_letter" property="unlimitedGuaranteeLetter"/>
@@ -57,8 +56,7 @@
             tb.dept_and_role,
             tb.application_date,
             tb.ordering_unit_name,
-            tb.customer_short_id,
-            cs.short_name AS customer_short_name,
+            tb.customer_short_name,
             tb.customer_type,
             tb.unlimited_guarantee_letter,
             tb.settlement_period,
@@ -94,7 +92,6 @@
             tb.create_time,
             tb.update_time
         FROM fund_coordination AS tb
-        left join base_data_customer_short cs on cs.id = tb.customer_short_id
         left join sys_user u on u.id = tb.applicant
     </sql>
 
@@ -113,7 +110,7 @@
                 AND tb.ordering_unit_name LIKE CONCAT('%', #{vo.orderingUnitName}, '%')
             </if>
             <if test="vo.shortName != null and vo.shortName != ''">
-                AND cs.short_name LIKE CONCAT('%', #{vo.shortName}, '%')
+                AND tb.customer_short_name LIKE CONCAT('%', #{vo.shortName}, '%')
             </if>
         </where>
         ORDER BY tb.create_time DESC

@@ -51,4 +51,45 @@
         </where>
         ORDER BY tb.actual_timeout DESC
     </select>
+
+    <insert id="batchAdd">
+        INSERT INTO fund_ordering_unit_detail (
+        id,
+        fund_ordering_unit_id,
+        delivery_date,
+        accounts_receivable,
+        status,
+        due_date,
+        timeout,
+        coordinate_handle_date,
+        actual_timeout,
+        remark,
+        create_by_id,
+        create_by,
+        update_by_id,
+        update_by,
+        create_time,
+        update_time
+        ) VALUES
+        <foreach collection="list" item="item" separator=",">
+            (
+            #{item.id},
+            #{item.fundOrderingUnitId},
+            #{item.deliveryDate},
+            #{item.accountsReceivable},
+            #{item.status},
+            #{item.dueDate},
+            #{item.timeout},
+            #{item.coordinateHandleDate},
+            #{item.actualTimeout},
+            #{item.remark},
+            #{item.createById},
+            #{item.createBy},
+            #{item.updateById},
+            #{item.updateBy},
+            #{item.createTime},
+            #{item.updateTime}
+            )
+        </foreach>
+    </insert>
 </mapper>

@@ -99,6 +99,7 @@
             tb.packaging_fee,
             tb.contract_create_by_id,
             su.name as contract_create_by_name,
+            tb.freeze,
             tb.create_by_id,
             tb.create_by,
             tb.update_by_id,
@@ -153,6 +154,9 @@
             <if test="vo.type != null and vo.type != ''">
                 AND tb.type = #{vo.type}
             </if>
+            <if test="vo.freeze != null and vo.freeze != ''">
+                AND tb.freeze = #{vo.freeze}
+            </if>
             <if test="vo.orderingUnitNameOrOrderNo != null and vo.orderingUnitNameOrOrderNo != ''">
                 AND (cu.name LIKE CONCAT('%', #{vo.orderingUnitNameOrOrderNo},'%')
                 or tb.order_no LIKE CONCAT('%', #{vo.orderingUnitNameOrOrderNo},'%'))