到货登记 添加账期

hx-sale/src/main/java/com/fjhx/sale/controller/arrival/ArrivalDetailController.java

@@ -1,5 +1,10 @@
 package com.fjhx.sale.controller.arrival;
 
+import com.fjhx.sale.entity.arrival.dto.ArrivalDetailDto;
+import com.fjhx.sale.service.arrival.ArrivalDetailService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -16,5 +21,15 @@ import org.springframework.web.bind.annotation.RestController;
 @RequestMapping("/arrivalDetail")
 public class ArrivalDetailController {
 
+    @Autowired
+    private ArrivalDetailService arrivalDetailService;
+
+    /**
+     * 修改账期
+     */
+    @PostMapping("/editAccountPeriods")
+    public void editAccountPeriods(@RequestBody ArrivalDetailDto dto) {
+        arrivalDetailService.editAccountPeriods(dto);
+    }
 
 }

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

@@ -1,11 +1,13 @@
 package com.fjhx.sale.entity.arrival.po;
 
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.common.core.domain.BasePo;
 import lombok.Getter;
 import lombok.Setter;
 
 import java.math.BigDecimal;
+import java.util.Date;
 
 /**
  * <p>
@@ -50,4 +52,10 @@ public class ArrivalDetail extends BasePo {
      */
     private Long purchaseId;
 
+    /**
+     * 账期
+     */
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    private Date accountPeriod;
+
 }

hx-sale/src/main/java/com/fjhx/sale/service/arrival/ArrivalDetailService.java

@@ -1,5 +1,6 @@
 package com.fjhx.sale.service.arrival;
 
+import com.fjhx.sale.entity.arrival.dto.ArrivalDetailDto;
 import com.fjhx.sale.entity.arrival.po.ArrivalDetail;
 import com.ruoyi.common.core.service.BaseService;
 
@@ -15,4 +16,5 @@ import com.ruoyi.common.core.service.BaseService;
 public interface ArrivalDetailService extends BaseService<ArrivalDetail> {
 
 
+    void editAccountPeriods(ArrivalDetailDto dto);
 }

hx-sale/src/main/java/com/fjhx/sale/service/arrival/impl/ArrivalDetailServiceImpl.java

@@ -1,11 +1,21 @@
 package com.fjhx.sale.service.arrival.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fjhx.sale.entity.arrival.dto.ArrivalDetailDto;
 import com.fjhx.sale.entity.arrival.po.ArrivalDetail;
 import com.fjhx.sale.mapper.arrival.ArrivalDetailMapper;
 import com.fjhx.sale.service.arrival.ArrivalDetailService;
+import com.fjhx.wms.entity.stock.po.StockJournalDetails;
+import com.fjhx.wms.entity.stock.po.StockWaitDetails;
+import com.fjhx.wms.service.stock.StockJournalDetailsService;
+import com.fjhx.wms.service.stock.StockWaitDetailsService;
+import com.ruoyi.common.core.domain.BasePo;
+import com.ruoyi.common.utils.SecurityUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.Date;
+
 
 /**
  * <p>
@@ -18,4 +28,28 @@ import org.springframework.stereotype.Service;
 @Service
 public class ArrivalDetailServiceImpl extends ServiceImpl<ArrivalDetailMapper, ArrivalDetail> implements ArrivalDetailService {
 
+    @Autowired
+    private StockWaitDetailsService stockWaitDetailsService;
+    @Autowired
+    private StockJournalDetailsService stockJournalDetailsService;
+
+    @Override
+    public void editAccountPeriods(ArrivalDetailDto dto) {
+        this.updateById(dto);
+        //更新待入库账期
+        stockWaitDetailsService.update(q -> q
+                .eq(StockWaitDetails::getArrivalId, dto.getId())
+                .set(StockWaitDetails::getAccountPeriod, dto.getAccountPeriod())
+                .set(BasePo::getUpdateTime, new Date())
+                .set(BasePo::getUpdateUser, SecurityUtils.getUserId())
+        );
+        //更新流水账期
+        stockJournalDetailsService.update(q -> q
+                .eq(StockJournalDetails::getArrivalId, dto.getId())
+                .set(StockJournalDetails::getAccountPeriod, dto.getAccountPeriod())
+                .set(BasePo::getUpdateTime, new Date())
+                .set(BasePo::getUpdateUser, SecurityUtils.getUserId())
+        );
+    }
+
 }

hx-sale/src/main/java/com/fjhx/sale/service/arrival/impl/ArrivalServiceImpl.java

@@ -144,8 +144,11 @@ public class ArrivalServiceImpl extends ServiceImpl<ArrivalMapper, Arrival> impl
             stockWaitDetails.setQuantity(arrivalDetail.getQuantity());
             stockWaitDetails.setStatus(0);
 
+            stockWaitDetails.setArrivalId(dto.getId());
             stockWaitDetails.setArrivalDetailId(arrivalDetail.getId());
 
+            stockWaitDetails.setAccountPeriod(arrivalDetail.getAccountPeriod());
+
             stockWaitDetailsList.add(stockWaitDetails);
         }
         arrivalDetailService.saveBatch(arrivalDetailList);

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

@@ -104,4 +104,8 @@ public class StockJournal extends BasePo {
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
     private Date inOutTime;
 
+    /**
+     * 到货id
+     */
+    private Long arrivalId;
 }

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

@@ -1,11 +1,13 @@
 package com.fjhx.wms.entity.stock.po;
 
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.common.core.domain.BasePo;
 import lombok.Getter;
 import lombok.Setter;
 
 import java.math.BigDecimal;
+import java.util.Date;
 
 /**
  * <p>
@@ -68,4 +70,19 @@ public class StockJournalDetails extends BasePo {
      */
     private Long purchaseId;
 
+    /**
+     * 到货id
+     */
+    private Long arrivalId;
+
+    /**
+     * 到货明细id
+     */
+    private Long arrivalDetailId;
+
+    /**
+     * 账期
+     */
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    private Date accountPeriod;
 }

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

@@ -1,11 +1,13 @@
 package com.fjhx.wms.entity.stock.po;
 
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.common.core.domain.BasePo;
 import lombok.Getter;
 import lombok.Setter;
 
 import java.math.BigDecimal;
+import java.util.Date;
 
 /**
  * <p>
@@ -76,8 +78,19 @@ public class StockWaitDetails extends BasePo {
     private Long prodOrderId;
 
     /**
+     * 到货id
+     */
+    private Long arrivalId;
+
+    /**
      * 到货明细id
      */
     private Long arrivalDetailId;
 
+    /**
+     * 账期
+     */
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    private Date accountPeriod;
+
 }

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

@@ -251,6 +251,7 @@ public class StockWaitServiceImpl extends ServiceImpl<StockWaitMapper, StockWait
         stockJournal.setPurchaseId(stockWait.getPurchaseId());
         //------------------------------------------------------------
         stockJournal.setInOutTime(stockWaitDto.getInOutTime());
+        stockJournal.setArrivalId(stockWait.getArrivalId());
         //保存出入库记录
         stockJournalService.save(stockJournal);
 
@@ -274,6 +275,11 @@ public class StockWaitServiceImpl extends ServiceImpl<StockWaitMapper, StockWait
             stockJournalDetails.setCompanyId(companyId);
             stockJournalDetails.setContractId(stockJournal.getContractId());
             stockJournalDetails.setPurchaseId(stockJournal.getPurchaseId());
+
+            stockJournalDetails.setArrivalId(stockWait.getArrivalId());
+            stockJournalDetails.setArrivalDetailId(temp.getArrivalDetailId());
+            stockJournalDetails.setAccountPeriod(temp.getAccountPeriod());
+
             stockJournalDetailsList.add(stockJournalDetails);
         }
         List<InOutBo> inOutBoList = BeanUtil.copyToList(stockList, InOutBo.class);