维多利亚

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

@@ -23,6 +23,11 @@ import java.util.Date;
 public class StockTransfer extends BaseEntity {
 
     /**
+     * 京东订单id
+     */
+    private Long jdOrderInfoId;
+
+    /**
      * 产品id
      */
     private Long productId;

hx-service-api/victoriatourist-api/src/main/java/com/fjhx/enums/stock/OutTypeEnum.java

@@ -18,7 +18,7 @@ public enum OutTypeEnum {
     // business_id = order_details 表 id
     PURCHASE(1, "采购订单出库"),
 
-    // business_id = order_details 表 id
+    // business_id = stock_transfer 表 id
     JD(2, "京东订单出库"),
 
     // ======== 手动出库明细 ========

hx-service-api/victoriatourist-api/src/main/java/com/fjhx/params/stock/StockTransferAddVo.java → hx-service-api/victoriatourist-api/src/main/java/com/fjhx/params/stock/StockTransferAddDto.java

@@ -1,11 +1,17 @@
 package com.fjhx.params.stock;
 
+import com.fjhx.enums.stock.OutTypeEnum;
 import lombok.Data;
 
 import java.util.List;
 
 @Data
-public class StockTransferAddVo {
+public class StockTransferAddDto {
+
+    /**
+     * 京东订单id
+     */
+    private Long jdOrderInfoId;
 
     /**
      * 调出仓库id
@@ -23,6 +29,11 @@ public class StockTransferAddVo {
     private String remark;
 
     /**
+     * 出库类型（PURCHASE JD）
+     */
+    private Enum<OutTypeEnum> outTypeEnum;
+
+    /**
      * 调仓明细
      */
     private List<ChangeProduct> changeProductList;

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

@@ -3,7 +3,8 @@ package com.fjhx.controller.stock;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fjhx.base.Condition;
 import com.fjhx.entity.stock.StockTransfer;
-import com.fjhx.params.stock.StockTransferAddVo;
+import com.fjhx.enums.stock.OutTypeEnum;
+import com.fjhx.params.stock.StockTransferAddDto;
 import com.fjhx.service.stock.StockTransferService;
 import org.springblade.core.tool.api.R;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -39,8 +40,10 @@ public class StockTransferController {
      * 调仓
      */
     @PostMapping("/add")
-    public R add(@RequestBody StockTransferAddVo stockTransferAddVo) {
-        stockTransferService.add(stockTransferAddVo);
+    public R add(@RequestBody StockTransferAddDto stockTransferAddDto) {
+        stockTransferAddDto.setJdOrderInfoId(null);
+        stockTransferAddDto.setOutTypeEnum(OutTypeEnum.PURCHASE);
+        stockTransferService.add(stockTransferAddDto);
         return R.success();
     }
 

hx-service/victoriatourist/src/main/java/com/fjhx/service/order/impl/OrderDetailsServiceImpl.java

@@ -15,7 +15,7 @@ import com.fjhx.params.order.OrderDetailsEx;
 import com.fjhx.params.order.OrderDetailsVo;
 import com.fjhx.params.stock.ChangeProduct;
 import com.fjhx.params.stock.StockChangeDto;
-import com.fjhx.params.stock.StockTransferAddVo;
+import com.fjhx.params.stock.StockTransferAddDto;
 import com.fjhx.service.logistics.LogisticsInfoService;
 import com.fjhx.service.order.OrderDetailsService;
 import com.fjhx.service.order.OrderInfoService;
@@ -121,16 +121,8 @@ public class OrderDetailsServiceImpl extends ServiceImpl<OrderDetailsMapper, Ord
         logisticsInfo.setStatus(0);
         logisticsInfoService.save(logisticsInfo);
 
-        // 变更库存添加流水记录
-        StockChangeDto stockChangeDto = new StockChangeDto();
-        stockChangeDto.setDefaultWarehouseId(issueDto.getWarehouseId());
-        stockChangeDto.setTypeEnum(issueDto.getOutTypeEnum());
-        stockChangeDto.setChangeDetailsList(issueDto.getOrderDetailsList());
-        stockService.changeQuantity(stockChangeDto);
-
         // 京东出库新增调仓
         if (issueDto.getOutTypeEnum().equals(OutTypeEnum.JD)) {
-
             // 获取京东仓库id
             List<ChangeProduct> changeProductList = issueDto.getOrderDetailsList().stream().map(item -> {
                 ChangeProduct changeProduct = new ChangeProduct();
@@ -139,12 +131,22 @@ public class OrderDetailsServiceImpl extends ServiceImpl<OrderDetailsMapper, Ord
                 return changeProduct;
             }).collect(Collectors.toList());
 
-            StockTransferAddVo stockTransferAddVo = new StockTransferAddVo();
-            stockTransferAddVo.setOutWarehouseId(issueDto.getWarehouseId());
-            stockTransferAddVo.setInWarehouseId(systemConfigService.getValue(SystemConfigKeyConstant.JD_WAREHOUSE_ID, Long.class));
-            stockTransferAddVo.setRemark("京东出库");
-            stockTransferAddVo.setChangeProductList(changeProductList);
-            stockTransferService.add(stockTransferAddVo);
+            StockTransferAddDto stockTransferAddDto = new StockTransferAddDto();
+            stockTransferAddDto.setJdOrderInfoId(orderId);
+            stockTransferAddDto.setOutWarehouseId(issueDto.getWarehouseId());
+            stockTransferAddDto.setInWarehouseId(systemConfigService.getValue(SystemConfigKeyConstant.JD_WAREHOUSE_ID, Long.class));
+            stockTransferAddDto.setRemark("京东订单出库");
+            stockTransferAddDto.setOutTypeEnum(OutTypeEnum.JD);
+            stockTransferAddDto.setChangeProductList(changeProductList);
+            stockTransferService.add(stockTransferAddDto);
+        }
+        // 销售出库添加出库记录
+        else {
+            StockChangeDto stockChangeDto = new StockChangeDto();
+            stockChangeDto.setDefaultWarehouseId(issueDto.getWarehouseId());
+            stockChangeDto.setTypeEnum(OutTypeEnum.PURCHASE);
+            stockChangeDto.setChangeDetailsList(issueDto.getOrderDetailsList());
+            stockService.changeQuantity(stockChangeDto);
         }
 
     }

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

@@ -1,10 +1,10 @@
 package com.fjhx.service.stock;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.base.BaseService;
 import com.fjhx.base.Condition;
 import com.fjhx.entity.stock.StockTransfer;
-import com.fjhx.params.stock.StockTransferAddVo;
-import com.fjhx.base.BaseService;
+import com.fjhx.params.stock.StockTransferAddDto;
 
 import java.util.Map;
 
@@ -20,7 +20,7 @@ public interface StockTransferService extends BaseService<StockTransfer> {
 
     Page<Map<String, Object>> getPage(Condition condition);
 
-    void add(StockTransferAddVo stockTransferAddVo);
+    void add(StockTransferAddDto stockTransferAddDto);
 
     void receive(StockTransfer stockTransfer);
 

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

@@ -9,11 +9,10 @@ import com.fjhx.constants.StatusConstant;
 import com.fjhx.entity.product.ProductInfo;
 import com.fjhx.entity.stock.StockTransfer;
 import com.fjhx.enums.stock.InTypeEnum;
-import com.fjhx.enums.stock.OutTypeEnum;
 import com.fjhx.mapper.stock.StockTransferMapper;
 import com.fjhx.params.stock.ChangeProduct;
 import com.fjhx.params.stock.StockChangeDto;
-import com.fjhx.params.stock.StockTransferAddVo;
+import com.fjhx.params.stock.StockTransferAddDto;
 import com.fjhx.service.stock.StockService;
 import com.fjhx.service.stock.StockTransferService;
 import com.fjhx.utils.Assert;
@@ -43,7 +42,6 @@ public class StockTransferServiceImpl extends ServiceImpl<StockTransferMapper, S
     @Autowired
     private StockService stockService;
 
-
     @Override
     public Page<Map<String, Object>> getPage(Condition condition) {
 
@@ -78,24 +76,25 @@ public class StockTransferServiceImpl extends ServiceImpl<StockTransferMapper, S
 
     @Transactional(rollbackFor = Exception.class)
     @Override
-    public void add(StockTransferAddVo stockTransferAddVo) {
+    public void add(StockTransferAddDto stockTransferAddDto) {
         // 调仓明细
-        List<ChangeProduct> changeProductList = stockTransferAddVo.getChangeProductList();
+        List<ChangeProduct> changeProductList = stockTransferAddDto.getChangeProductList();
         Assert.notEmpty(changeProductList, "调仓明细不能为空");
         List<StockTransfer> stockTransferList = changeProductList.stream()
-                .filter(item -> item.getQuantity().compareTo(BigDecimal.ZERO) > 0)
-                .map(item -> {
+                .filter(changeProduct -> changeProduct.getQuantity().compareTo(BigDecimal.ZERO) > 0)
+                .map(changeProduct -> {
                     long id = IdWorker.getId();
-                    item.setBusinessId(id);
+                    changeProduct.setBusinessId(id);
 
                     StockTransfer stockTransfer = new StockTransfer();
                     stockTransfer.setId(id);
-                    stockTransfer.setInWarehouseId(stockTransferAddVo.getInWarehouseId());
-                    stockTransfer.setOutWarehouseId(stockTransferAddVo.getOutWarehouseId());
-                    stockTransfer.setRemark(stockTransferAddVo.getRemark());
+                    stockTransfer.setJdOrderInfoId(stockTransferAddDto.getJdOrderInfoId());
+                    stockTransfer.setInWarehouseId(stockTransferAddDto.getInWarehouseId());
+                    stockTransfer.setOutWarehouseId(stockTransferAddDto.getOutWarehouseId());
+                    stockTransfer.setRemark(stockTransferAddDto.getRemark());
                     stockTransfer.setInStatus(StatusConstant.NO);
-                    stockTransfer.setOutQuantity(item.getQuantity());
-                    stockTransfer.setProductId(item.getProductId());
+                    stockTransfer.setOutQuantity(changeProduct.getQuantity());
+                    stockTransfer.setProductId(changeProduct.getProductId());
                     return stockTransfer;
                 }).collect(Collectors.toList());
 
@@ -106,9 +105,9 @@ public class StockTransferServiceImpl extends ServiceImpl<StockTransferMapper, S
         saveBatch(stockTransferList);
 
         StockChangeDto stockChangeDto = new StockChangeDto();
-        stockChangeDto.setDefaultWarehouseId(stockTransferAddVo.getOutWarehouseId());
-        stockChangeDto.setDefaultRemarks(stockTransferAddVo.getRemark());
-        stockChangeDto.setTypeEnum(OutTypeEnum.TRANSFER);
+        stockChangeDto.setDefaultWarehouseId(stockTransferAddDto.getOutWarehouseId());
+        stockChangeDto.setDefaultRemarks(stockTransferAddDto.getRemark());
+        stockChangeDto.setTypeEnum(stockTransferAddDto.getOutTypeEnum());
         stockChangeDto.setChangeDetailsList(changeProductList);
         stockService.changeQuantity(stockChangeDto);
     }
@@ -116,8 +115,7 @@ public class StockTransferServiceImpl extends ServiceImpl<StockTransferMapper, S
     @Transactional(rollbackFor = Exception.class)
     @Override
     public void receive(StockTransfer dto) {
-
-        StockTransfer stockTransfer = getById(dto);
+        StockTransfer stockTransfer = getById(dto.getId());
         Assert.eqTrue(StatusConstant.NO.equals(stockTransfer.getInStatus()), "物品已接收");
 
         stockTransfer.setInUser(AuthUtil.getUserId());