问题处理

hx-sale/src/main/java/com/fjhx/sale/entity/arrival/po/ArrivalDetail.java

@@ -55,7 +55,7 @@ public class ArrivalDetail extends BasePo {
     /**
      * 账期
      */
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM")
     private Date accountPeriod;
 
 }

hx-wms/src/main/java/com/fjhx/wms/entity/stock/po/StockJournalDetails.java

@@ -71,6 +71,11 @@ public class StockJournalDetails extends BasePo {
     private Long purchaseId;
 
     /**
+     * 采购明细id
+     */
+    private Long purchaseDetailId;
+
+    /**
      * 到货id
      */
     private Long arrivalId;
@@ -83,6 +88,6 @@ public class StockJournalDetails extends BasePo {
     /**
      * 账期
      */
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM")
     private Date accountPeriod;
 }

hx-wms/src/main/java/com/fjhx/wms/entity/stock/po/StockWaitDetails.java

@@ -90,7 +90,7 @@ public class StockWaitDetails extends BasePo {
     /**
      * 账期
      */
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM")
     private Date accountPeriod;
 
 }

hx-wms/src/main/java/com/fjhx/wms/service/stock/impl/StockWaitServiceImpl.java

@@ -275,6 +275,7 @@ public class StockWaitServiceImpl extends ServiceImpl<StockWaitMapper, StockWait
             stockJournalDetails.setCompanyId(companyId);
             stockJournalDetails.setContractId(stockJournal.getContractId());
             stockJournalDetails.setPurchaseId(stockJournal.getPurchaseId());
+            stockJournalDetails.setPurchaseDetailId(temp.getPurchaseDetailId());
 
             stockJournalDetails.setArrivalId(stockWait.getArrivalId());
             stockJournalDetails.setArrivalDetailId(temp.getArrivalDetailId());