采购退货-待出库数据关联异常处理

hx-form/src/main/java/com/fjhx/form/entity/cost/po/CostControlDetail.java

@@ -1,12 +1,14 @@
 package com.fjhx.form.entity.cost.po;
 
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fjhx.common.controller.Label;
 import com.ruoyi.common.core.domain.BasePo;
 import lombok.Getter;
 import lombok.Setter;
 
 import java.math.BigDecimal;
+import java.util.Date;
 
 /**
  * <p>
@@ -111,7 +113,8 @@ public class CostControlDetail extends BasePo {
      * 帐期
      */
     @Label("帐期")
-    private String accountPeriod;
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM")
+    private Date accountPeriod;
 
     /**
      * 本账期金额

hx-sale/src/main/java/com/fjhx/sale/flow/PurchaseBackFlow.java

@@ -113,6 +113,7 @@ public class PurchaseBackFlow extends FlowDelegate {
         stockWait.setBusinessType(JournalType.PURCHASE_RETURN_OUT.getDetailType());
         stockWait.setBusinessId(purchaseBack.getId());
         stockWait.setBusinessCode(purchaseBack.getCode());
+        stockWait.setPurchaseId(purchaseBack.getPurchaseId());
         stockWaitService.save(stockWait);
 
         List<StockWaitDetails> stockWaitDetailsList = new ArrayList<>();
@@ -127,6 +128,7 @@ public class PurchaseBackFlow extends FlowDelegate {
             stockWaitDetails.setStockWaitId(stockWait.getId());
             stockWaitDetails.setProductId(productId);
             stockWaitDetails.setQuantity(quantity);
+            stockWaitDetails.setPurchaseDetailId(purchaseBackDetails.getPurchaseDetailsId());
             stockWaitDetailsList.add(stockWaitDetails);