入库

hx-service-api/victoriatourist-api/src/main/java/com/fjhx/entity/stock/Stock.java

@@ -29,6 +29,11 @@ public class Stock extends BaseEntity {
     private BigDecimal quantity;
 
     /**
+     * 冻结数量
+     */
+    private BigDecimal frozenQuantity;
+
+    /**
      * 仓库id
      */
     private Long warehouseId;

hx-service-api/victoriatourist-api/src/main/java/com/fjhx/entity/stock/StockJournal.java

@@ -1,13 +1,11 @@
 package com.fjhx.entity.stock;
 
-import java.math.BigDecimal;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.Version;
-import com.baomidou.mybatisplus.annotation.TableId;
 import com.fjhx.base.BaseEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.math.BigDecimal;
+
 /**
  * <p>
  * 出入库流水记录
@@ -47,6 +45,16 @@ public class StockJournal extends BaseEntity {
     private BigDecimal changeQuantity;
 
     /**
+     * 实际入库数量
+     */
+    private BigDecimal actualQuantity;
+
+    /**
+     * 是否已入库：0、否；1、是
+     */
+    private Integer isInStock;
+
+    /**
      * 备注
      */
     private String remarks;

hx-service/victoriatourist/src/main/java/com/fjhx/controller/stock/ApplyInController.java

@@ -2,9 +2,10 @@ package com.fjhx.controller.stock;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fjhx.base.Condition;
-import com.fjhx.entity.logistics.LogisticsDetails;
+import com.fjhx.entity.stock.StockJournal;
 import com.fjhx.service.apply.ApplyPurchaseService;
 import com.fjhx.service.logistics.LogisticsDetailsService;
+import com.fjhx.service.stock.StockJournalService;
 import org.springblade.core.tool.api.R;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -28,6 +29,9 @@ public class ApplyInController {
     @Autowired
     private LogisticsDetailsService logisticsDetailsService;
 
+    @Autowired
+    private StockJournalService stockJournalService;
+
     @PostMapping("/page")
     public R page(@RequestBody Condition condition) {
         Page<Map<String, Object>> result = applyPurchaseService.applyInPage(condition);
@@ -40,9 +44,9 @@ public class ApplyInController {
         return R.success(result);
     }
 
-    @PostMapping("submitLogisticsDetails")
-    public R submitLogisticsDetails(@RequestBody List<LogisticsDetails> logisticsDetailsList) {
-        logisticsDetailsService.submitLogisticsDetails(logisticsDetailsList);
+    @PostMapping("/inAdd")
+    public R inAdd(@RequestBody List<StockJournal> list) {
+//        stockJournalService.inAdd(list);
         return R.success();
     }
 

hx-service/victoriatourist/src/main/java/com/fjhx/service/stock/impl/StockJournalServiceImpl.java

@@ -60,6 +60,7 @@ public class StockJournalServiceImpl extends ServiceImpl<StockJournalMapper, Sto
         stockJournal.setGoodsId(goodsId);
         stockJournal.setWarehouseId(warehouseId);
         stockJournal.setChangeQuantity(changeQuantity);
+        stockJournal.setActualQuantity(new BigDecimal(BigDecimal.ZERO.intValue()));
         stockJournal.setRemarks(remarks);
         save(stockJournal);
     }