账期：提测问题修改

@@ -27,6 +27,7 @@ import com.lframework.xingyun.sc.handlers.TransactorHandler;
 import com.lframework.xingyun.sc.mappers.FundCoordinationMapper;
 import com.lframework.xingyun.sc.mappers.FundCoordinationMapper;
 import com.lframework.xingyun.sc.service.ledger.*;
 import com.lframework.xingyun.sc.service.ledger.*;
 import com.lframework.xingyun.sc.service.order.PurchaseOrderInfoService;
 import com.lframework.xingyun.sc.service.order.PurchaseOrderInfoService;
+import com.lframework.xingyun.sc.service.shipments.car.DraftRequestCarTicketService;
 import com.lframework.xingyun.sc.vo.ledger.detail.QueryFundOrderingUnitDetailVo;
 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.CreateFundCoordinationVo;
 import com.lframework.xingyun.sc.vo.ledger.fund.QueryFundCoordinationVo;
 import com.lframework.xingyun.sc.vo.ledger.fund.QueryFundCoordinationVo;
@@ -62,6 +63,8 @@ public class FundCoordinationServiceImpl extends BaseMpServiceImpl<FundCoordinat
     private PurchaseOrderInfoService purchaseOrderInfoService;
     private PurchaseOrderInfoService purchaseOrderInfoService;
     @Resource
     @Resource
     private FlowTaskWrapperMapper flowTaskWrapperMapper;
     private FlowTaskWrapperMapper flowTaskWrapperMapper;
+    @Resource
+    private DraftRequestCarTicketService draftRequestCarTicketService;
 
 
 
 
     @Override
     @Override
@@ -288,6 +291,8 @@ public class FundCoordinationServiceImpl extends BaseMpServiceImpl<FundCoordinat
             List<String> purchaseOrderIdList = pendingDeliveryOrderList
             List<String> purchaseOrderIdList = pendingDeliveryOrderList
                     .stream().map(PendingDeliveryOrder::getPurchaseOrderId).collect(Collectors.toList());
                     .stream().map(PendingDeliveryOrder::getPurchaseOrderId).collect(Collectors.toList());
             purchaseOrderInfoService.batchUnblock(purchaseOrderIdList);
             purchaseOrderInfoService.batchUnblock(purchaseOrderIdList);
+            //解封草稿要车单
+            draftRequestCarTicketService.freezeOrDeblocking(false, purchaseOrderIdList);
         }
         }
     }
     }
 
 

@@ -165,7 +165,6 @@ public class RecapitalizeServiceImpl extends BaseMpServiceImpl<RecapitalizeMappe
             createVo.setDeptId(vo.getDeptId());
             createVo.setDeptId(vo.getDeptId());
             createVo.setCustomerId(vo.getOrderingUnit());
             createVo.setCustomerId(vo.getOrderingUnit());
             createVo.setFactoryType(vo.getFactoryType());
             createVo.setFactoryType(vo.getFactoryType());
-            createVo.setFactoryType(vo.getFactoryType());
             createVo.setActualReturnedDate(vo.getRecapitalizeDate());
             createVo.setActualReturnedDate(vo.getRecapitalizeDate());
             createVo.setReturnedAmount(vo.getReturnedAmount());
             createVo.setReturnedAmount(vo.getReturnedAmount());
             createVo.setEndAccountReceivable(vo.getReturnedAmount().negate());
             createVo.setEndAccountReceivable(vo.getReturnedAmount().negate());

@@ -184,6 +184,7 @@ public class ReceiptLedgerInfoServiceImpl extends BaseMpServiceImpl<ReceiptLedge
         data.setFifthCoordinateDate(vo.getFifthCoordinateDate());
         data.setFifthCoordinateDate(vo.getFifthCoordinateDate());
         data.setDescription(vo.getDescription());
         data.setDescription(vo.getDescription());
         data.setDebtStatus(vo.getDebtStatus());
         data.setDebtStatus(vo.getDebtStatus());
+        data.setType(vo.getType());
         getBaseMapper().insert(data);
         getBaseMapper().insert(data);
 
 
         OpLogUtil.setVariable("id", data.getId());
         OpLogUtil.setVariable("id", data.getId());

@@ -281,10 +281,16 @@ public class DraftRequestCarTicketServiceImpl extends BaseMpServiceImpl<DraftReq
             return;
             return;
         }
         }
         LambdaUpdateWrapper<DraftRequestCarTicket> updateWrapper = Wrappers.lambdaUpdate(DraftRequestCarTicket.class);
         LambdaUpdateWrapper<DraftRequestCarTicket> updateWrapper = Wrappers.lambdaUpdate(DraftRequestCarTicket.class);
-        updateWrapper.set(DraftRequestCarTicket::isFreeze, flag)
-                .setSql("freeze_count = freeze_count + 1")
-                .in(DraftRequestCarTicket::getPurchaseOrderId, orderIds);
-        getBaseMapper().update(updateWrapper);
+        if (flag) {
+            updateWrapper.set(DraftRequestCarTicket::isFreeze, flag)
+                    .setSql("freeze_count = freeze_count + 1")
+                    .in(DraftRequestCarTicket::getPurchaseOrderId, orderIds);
+            getBaseMapper().update(updateWrapper);
+        } else {
+            updateWrapper.set(DraftRequestCarTicket::isFreeze, flag)
+                    .in(DraftRequestCarTicket::getPurchaseOrderId, orderIds);
+            getBaseMapper().update(updateWrapper);
+        }
     }
     }
 
 
     @Override
     @Override

@@ -52,7 +52,6 @@ public class UpdateReceiptLedgerInfoVo implements BaseVo, Serializable {
      * 实际回笼日期
      * 实际回笼日期
      */
      */
     @ApiModelProperty(value = "实际回笼日期", required = true)
     @ApiModelProperty(value = "实际回笼日期", required = true)
-    @NotNull(message = "请输入实际回笼日期！")
     @TypeMismatch(message = "实际回笼日期格式有误！")
     @TypeMismatch(message = "实际回笼日期格式有误！")
     private LocalDate actualReturnedDate;
     private LocalDate actualReturnedDate;
 
 
@@ -60,7 +59,6 @@ public class UpdateReceiptLedgerInfoVo implements BaseVo, Serializable {
      * 回笼金额
      * 回笼金额
      */
      */
     @ApiModelProperty(value = "回笼金额", required = true)
     @ApiModelProperty(value = "回笼金额", required = true)
-    @NotNull(message = "请输入回笼金额！")
     @TypeMismatch(message = "回笼金额格式有误！")
     @TypeMismatch(message = "回笼金额格式有误！")
     @IsNumberPrecision(message = "回笼金额最多允许4位小数！", value = 4)
     @IsNumberPrecision(message = "回笼金额最多允许4位小数！", value = 4)
     private BigDecimal returnedAmount;
     private BigDecimal returnedAmount;
@@ -69,7 +67,6 @@ public class UpdateReceiptLedgerInfoVo implements BaseVo, Serializable {
      * 期末应收账款
      * 期末应收账款
      */
      */
     @ApiModelProperty(value = "期末应收账款", required = true)
     @ApiModelProperty(value = "期末应收账款", required = true)
-    @NotNull(message = "请输入期末应收账款！")
     @TypeMismatch(message = "期末应收账款格式有误！")
     @TypeMismatch(message = "期末应收账款格式有误！")
     @IsNumberPrecision(message = "期末应收账款最多允许4位小数！", value = 4)
     @IsNumberPrecision(message = "期末应收账款最多允许4位小数！", value = 4)
     private BigDecimal endAccountReceivable;
     private BigDecimal endAccountReceivable;