维多利亚

hx-service-api/victoriatourist-api/src/main/java/com/fjhx/entity/logistics/LogisticsInfo.java

@@ -43,12 +43,12 @@ public class LogisticsInfo extends BaseEntity {
     private String code;
 
     /**
-     * 状态：0、未完成 / 未到货；1、已完成 / 已到货
+     * 采购出货完成状态：0、未完成 / 未到货；1、已完成 / 已到货
      */
     private Integer status;
 
     /**
-     * 入库状态：10、未入库；20、部分入库；30、已入库
+     * 采购出货入库状态：10、未入库；20、部分入库；30、已入库
      */
     private Integer inStockStatus;
 

hx-service-api/victoriatourist-api/src/main/java/com/fjhx/params/order/IssueDto.java

@@ -31,7 +31,7 @@ public class IssueDto {
     private String logisticsCompanyCode;
 
     /**
-     * 类型：1、京东订单出库 2、销售订单出库
+     * 出货类型
      */
     private OutTypeEnum outTypeEnum;
 

hx-service/victoriatourist/src/main/java/com/fjhx/controller/order/OrderDetailsController.java

@@ -27,6 +27,9 @@ public class OrderDetailsController {
     @Autowired
     private OrderDetailsService orderDetailsService;
 
+    /**
+     * 根据订单id查询订单明细
+     */
     @PostMapping("/listByOrderSalesId")
     public R listByOrderSalesId(@RequestBody OrderInfo orderInfo) {
         List<OrderDetailsEx> result = orderDetailsService.listByOrderSalesId(orderInfo.getId());

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

@@ -2,11 +2,9 @@ package com.fjhx.controller.stock;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fjhx.base.Condition;
-import com.fjhx.entity.stock.Stock;
 import com.fjhx.params.stock.PageByCombinationVo;
 import com.fjhx.params.stock.PageByProductVo;
 import com.fjhx.params.stock.PageByWarehouseVo;
-import com.fjhx.params.stock.StockVo;
 import com.fjhx.service.stock.StockService;
 import org.springblade.core.tool.api.R;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -32,30 +30,6 @@ public class StockController {
     @Autowired
     private StockService stockService;
 
-    @PostMapping("/page")
-    public R page(@RequestBody Map<String, Object> condition) {
-        Page<Stock> result = stockService.getPage(condition);
-        return R.success(result);
-    }
-
-    @PostMapping("/add")
-    public R add(@RequestBody StockVo stockVo) {
-        stockService.add(stockVo);
-        return R.success();
-    }
-
-    @PostMapping("/edit")
-    public R edit(@RequestBody StockVo stockVo) {
-        stockService.edit(stockVo);
-        return R.success();
-    }
-
-    @PostMapping("/delete")
-    public R delete(@RequestBody StockVo stockVo) {
-        stockService.delete(stockVo);
-        return R.success();
-    }
-
     /**
      * 查询仓库库存
      */

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

@@ -1,14 +1,11 @@
 package com.fjhx.service.order;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.base.BaseService;
 import com.fjhx.entity.order.OrderDetails;
 import com.fjhx.params.order.IssueDto;
 import com.fjhx.params.order.OrderDetailsEx;
-import com.fjhx.params.order.OrderDetailsVo;
-import com.fjhx.base.BaseService;
 
 import java.util.List;
-import java.util.Map;
 
 /**
  * <p>
@@ -20,14 +17,9 @@ import java.util.Map;
  */
 public interface OrderDetailsService extends BaseService<OrderDetails> {
 
-    Page<OrderDetails> getPage(Map<String, Object> condition);
-
-    void add(OrderDetailsVo orderDetailsVo);
-
-    void edit(OrderDetailsVo orderDetailsVo);
-
-    void delete(OrderDetailsVo orderDetailsVo);
-
+    /**
+     * 根据订单id查询订单明细
+     */
     List<OrderDetailsEx> listByOrderSalesId(Long orderId);
 
     void issue(IssueDto issueDto);

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

@@ -2,7 +2,6 @@ package com.fjhx.service.order.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fjhx.constants.SystemConfigKeyConstant;
 import com.fjhx.entity.logistics.LogisticsInfo;
@@ -12,7 +11,6 @@ import com.fjhx.enums.stock.OutTypeEnum;
 import com.fjhx.mapper.order.OrderDetailsMapper;
 import com.fjhx.params.order.IssueDto;
 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.StockTransferAddDto;
@@ -24,7 +22,7 @@ import com.fjhx.service.stock.StockTransferService;
 import com.fjhx.service.system.SystemConfigService;
 import com.fjhx.uitl.kd100.KD100Util;
 import com.fjhx.utils.Assert;
-import com.fjhx.utils.wrapperUtil.IWrapper;
+import org.springblade.core.log.exception.ServiceException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
@@ -62,30 +60,6 @@ public class OrderDetailsServiceImpl extends ServiceImpl<OrderDetailsMapper, Ord
     @Autowired
     private SystemConfigService systemConfigService;
 
-
-    @Override
-    public Page<OrderDetails> getPage(Map<String, Object> condition) {
-
-        IWrapper<OrderDetails> wrapper = IWrapper.getWrapper(condition);
-
-        return page(condition, wrapper);
-    }
-
-    @Override
-    public void add(OrderDetailsVo orderDetailsVo) {
-        save(orderDetailsVo);
-    }
-
-    @Override
-    public void edit(OrderDetailsVo orderDetailsVo) {
-        updateById(orderDetailsVo);
-    }
-
-    @Override
-    public void delete(OrderDetailsVo orderDetailsVo) {
-        removeById(orderDetailsVo.getId());
-    }
-
     @Override
     public List<OrderDetailsEx> listByOrderSalesId(Long orderId) {
         Assert.notEmpty(orderId, "订单id不能为空");
@@ -108,6 +82,43 @@ public class OrderDetailsServiceImpl extends ServiceImpl<OrderDetailsMapper, Ord
             updateOrderInfoStatus(list, issueDto);
         }
 
+        switch (issueDto.getOutTypeEnum()) {
+
+            // 销售出库添加出库记录
+            case PURCHASE:
+                StockChangeDto stockChangeDto = new StockChangeDto();
+                stockChangeDto.setDefaultWarehouseId(issueDto.getWarehouseId());
+                stockChangeDto.setTypeEnum(OutTypeEnum.PURCHASE);
+                stockChangeDto.setDefaultRemarks("销售订单出库");
+                stockChangeDto.setChangeDetailsList(issueDto.getOrderDetailsList());
+                stockService.changeQuantity(stockChangeDto);
+                break;
+
+            // 京东出库新增调仓
+            case JD:
+                // 获取京东仓库id
+                List<ChangeProduct> changeProductList = issueDto.getOrderDetailsList().stream().map(item -> {
+                    ChangeProduct changeProduct = new ChangeProduct();
+                    changeProduct.setProductId(item.getProductId());
+                    changeProduct.setQuantity(item.getChangeQuantity());
+                    return changeProduct;
+                }).collect(Collectors.toList());
+
+                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);
+                break;
+
+            default:
+                throw new ServiceException("未知调仓类型");
+
+        }
+
         // 查询快递100的物流信息
         String logisticsCompanyCode = issueDto.getLogisticsCompanyCode();
         String logisticsCode = issueDto.getLogisticsCode();
@@ -116,42 +127,13 @@ public class OrderDetailsServiceImpl extends ServiceImpl<OrderDetailsMapper, Ord
         // 保存物流消息
         LogisticsInfo logisticsInfo = new LogisticsInfo();
         logisticsInfo.setBusinessId(orderId);
-        logisticsInfo.setBusinessType(2);
+        logisticsInfo.setBusinessType(OutTypeEnum.JD.equals(issueDto.getOutTypeEnum()) ? 2 : 3);
         logisticsInfo.setCode(logisticsCode);
         logisticsInfo.setLogisticsCompanyCode(logisticsCompanyCode);
         logisticsInfo.setWarehouseId(issueDto.getWarehouseId());
         logisticsInfo.setLogisticsStatus(logisticsStatus);
         logisticsInfo.setStatus(0);
         logisticsInfoService.save(logisticsInfo);
-
-        // 京东出库新增调仓
-        if (issueDto.getOutTypeEnum().equals(OutTypeEnum.JD)) {
-            // 获取京东仓库id
-            List<ChangeProduct> changeProductList = issueDto.getOrderDetailsList().stream().map(item -> {
-                ChangeProduct changeProduct = new ChangeProduct();
-                changeProduct.setProductId(item.getProductId());
-                changeProduct.setQuantity(item.getChangeQuantity());
-                return changeProduct;
-            }).collect(Collectors.toList());
-
-            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);
-        }
-
     }
 
     /**
@@ -182,7 +164,7 @@ public class OrderDetailsServiceImpl extends ServiceImpl<OrderDetailsMapper, Ord
     private void updateOrderInfoStatus(List<OrderDetails> list, IssueDto issueDto) {
         OrderInfo orderInfo = orderInfoService.getById(issueDto.getOrderId());
 
-        // 如果是京东出库,出去一次订单则完成
+        // 如果是京东出库,出去一次订单则完成(已补发已出库)
         if (issueDto.getOutTypeEnum().equals(OutTypeEnum.JD)) {
             orderInfo.setStatus(2);
             orderInfo.setIssueStatus(3);
@@ -190,6 +172,7 @@ public class OrderDetailsServiceImpl extends ServiceImpl<OrderDetailsMapper, Ord
         // 如果是退换货或者补发，出库一次算完成
         else if (orderInfo.getType() == 5) {
             orderInfo.setIssueStatus(3);
+
             // 补发跟进中变已补发
             if (orderInfo.getAfterSalesStatus() == 1) {
                 orderInfo.setAfterSalesStatus(2);

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

@@ -5,7 +5,10 @@ import com.fjhx.base.BaseService;
 import com.fjhx.base.Condition;
 import com.fjhx.entity.stock.Stock;
 import com.fjhx.entity.stock.StockJournal;
-import com.fjhx.params.stock.*;
+import com.fjhx.params.stock.PageByCombinationVo;
+import com.fjhx.params.stock.PageByProductVo;
+import com.fjhx.params.stock.PageByWarehouseVo;
+import com.fjhx.params.stock.StockChangeDto;
 
 import java.util.List;
 import java.util.Map;
@@ -20,22 +23,29 @@ import java.util.Map;
  */
 public interface StockService extends BaseService<Stock> {
 
-    Page<Stock> getPage(Map<String, Object> condition);
-
-    void add(StockVo stockVo);
-
-    void edit(StockVo stockVo);
-
-    void delete(StockVo stockVo);
-
+    /**
+     * 变更库存数量
+     */
     List<StockJournal> changeQuantity(StockChangeDto stockChangeDto);
 
+    /**
+     * 查询仓库库存
+     */
     Page<Map<String, Object>> pageByWarehouseId(Condition condition);
 
+    /**
+     * 根据仓库查询库存
+     */
     Page<PageByWarehouseVo> pageByWarehouse(Condition condition);
 
+    /**
+     * 根据产品查询库存
+     */
     Page<PageByProductVo> pageByProduct(Condition condition);
 
+    /**
+     * 根据组合查询库存
+     */
     Page<PageByCombinationVo> pageByCombination(Condition condition);
 
 }

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

@@ -20,8 +20,14 @@ public interface StockTransferService extends BaseService<StockTransfer> {
 
     Page<Map<String, Object>> getPage(Condition condition);
 
+    /**
+     * 添加调仓记录
+     */
     void add(StockTransferAddDto stockTransferAddDto);
 
+    /**
+     * 接收调仓
+     */
     void receive(StockTransfer stockTransfer);
 
 }

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

@@ -1,7 +1,6 @@
 package com.fjhx.service.stock.impl;
 
 import cn.hutool.core.util.ObjectUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -15,11 +14,13 @@ import com.fjhx.entity.warehouse.Warehouse;
 import com.fjhx.enums.stock.InTypeEnum;
 import com.fjhx.enums.stock.OutTypeEnum;
 import com.fjhx.mapper.stock.StockMapper;
-import com.fjhx.params.stock.*;
+import com.fjhx.params.stock.PageByCombinationVo;
+import com.fjhx.params.stock.PageByProductVo;
+import com.fjhx.params.stock.PageByWarehouseVo;
+import com.fjhx.params.stock.StockChangeDto;
 import com.fjhx.service.product.ProductCombinationService;
 import com.fjhx.service.stock.StockService;
 import com.fjhx.utils.Assert;
-import com.fjhx.utils.WrapperUtil;
 import com.fjhx.utils.wrapperUtil.IWrapper;
 import com.fjhx.utils.wrapperUtil.KeywordData;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -50,32 +51,6 @@ public class StockServiceImpl extends ServiceImpl<StockMapper, Stock> implements
     @Autowired
     private ProductCombinationService productCombinationService;
 
-    @Override
-    public Page<Stock> getPage(Map<String, Object> condition) {
-
-        QueryWrapper<Stock> wrapper = Wrappers.query();
-
-        WrapperUtil.init(condition, wrapper)
-                .createTimeDesc();
-
-        return page(condition, wrapper);
-    }
-
-    @Override
-    public void add(StockVo stockVo) {
-        save(stockVo);
-    }
-
-    @Override
-    public void edit(StockVo stockVo) {
-        updateById(stockVo);
-    }
-
-    @Override
-    public void delete(StockVo stockVo) {
-        removeById(stockVo.getId());
-    }
-
     @Transactional(rollbackFor = Exception.class)
     @Override
     public List<StockJournal> changeQuantity(StockChangeDto stockChangeDto) {