调仓修改

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

@@ -1,5 +1,6 @@
 package com.fjhx.victoriatourist.controller.stock;
 
+import com.fjhx.wms.entity.stock.dto.StockDto;
 import org.springframework.web.bind.annotation.*;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fjhx.victoriatourist.entity.stock.vo.StockTransferVo;
@@ -70,4 +71,12 @@ public class StockTransferController {
         stockTransferService.receive(stockTransferDto);
     }
 
+    /**
+     * 调仓 重构用不是维多利亚的
+     */
+    @PostMapping("/addSt")
+    public void stockTransfer(@RequestBody StockTransferDto stockTransferDto) {
+        stockTransferService.stockTransfer(stockTransferDto);
+    }
+
 }

hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/entity/stock/vo/StockTransferDetailsVo.java

@@ -4,6 +4,8 @@ import com.fjhx.victoriatourist.entity.stock.po.StockTransferDetails;
 import lombok.Getter;
 import lombok.Setter;
 
+import java.math.BigDecimal;
+
 /**
  * 调仓明细列表查询返回值实体
  *
@@ -27,4 +29,36 @@ public class StockTransferDetailsVo extends StockTransferDetails {
      */
     private String productSpec;
 
+    /**
+     * 产品单位
+     */
+    private String productUnit;
+
+    /**出入库编号*/
+    private String code;
+
+    /**
+     * 调出仓库名称
+     */
+    private String outWarehouseName;
+
+    /**
+     * 调入仓库名称
+     */
+    private String inWarehouseName;
+
+    /**
+     * 调入仓库id
+     */
+    private Long inWarehouseId;
+
+    /**
+     * 调出仓库id
+     */
+    private Long outWarehouseId;
+
+    /**调仓数量*/
+    private BigDecimal quantity;
+
+
 }

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

@@ -1,10 +1,12 @@
 package com.fjhx.victoriatourist.service.stock;
 
+import com.baomidou.dynamic.datasource.annotation.DSTransactional;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fjhx.victoriatourist.entity.stock.dto.StockTransferDto;
 import com.fjhx.victoriatourist.entity.stock.dto.StockTransferSelectDto;
 import com.fjhx.victoriatourist.entity.stock.po.StockTransfer;
 import com.fjhx.victoriatourist.entity.stock.vo.StockTransferVo;
+import com.fjhx.wms.entity.stock.dto.StockDto;
 import com.ruoyi.common.core.service.BaseService;
 
 
@@ -48,4 +50,5 @@ public interface StockTransferService extends BaseService<StockTransfer> {
      */
     void receive(StockTransferDto stockTransferDto);
 
+    void stockTransfer(StockTransferDto stockTransferDto);
 }

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

@@ -1,16 +1,20 @@
 package com.fjhx.victoriatourist.service.stock.impl;
 
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fjhx.item.service.product.ProductInfoService;
+import com.fjhx.victoriatourist.entity.stock.dto.StockTransferDetailsDto;
+import com.fjhx.victoriatourist.entity.stock.dto.StockTransferDetailsSelectDto;
 import com.fjhx.victoriatourist.entity.stock.po.StockTransferDetails;
+import com.fjhx.victoriatourist.entity.stock.vo.StockTransferDetailsVo;
 import com.fjhx.victoriatourist.mapper.stock.StockTransferDetailsMapper;
 import com.fjhx.victoriatourist.service.stock.StockTransferDetailsService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fjhx.victoriatourist.entity.stock.vo.StockTransferDetailsVo;
-import com.fjhx.victoriatourist.entity.stock.dto.StockTransferDetailsSelectDto;
+import com.fjhx.wms.entity.stock.vo.StockVo;
+import com.fjhx.wms.service.warehouse.WarehouseService;
 import com.ruoyi.common.utils.wrapper.IWrapper;
-import com.fjhx.victoriatourist.entity.stock.dto.StockTransferDetailsDto;
-import cn.hutool.core.bean.BeanUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
 
 
 /**
@@ -18,17 +22,35 @@ import cn.hutool.core.bean.BeanUtil;
  * 调仓明细 服务实现类
  * </p>
  *
- * @author 
+ * @author
  * @since 2023-04-17
  */
 @Service
 public class StockTransferDetailsServiceImpl extends ServiceImpl<StockTransferDetailsMapper, StockTransferDetails> implements StockTransferDetailsService {
+    @Autowired
+    ProductInfoService productInfoService;
+    @Autowired
+    WarehouseService warehouseService;
 
     @Override
     public Page<StockTransferDetailsVo> getPage(StockTransferDetailsSelectDto dto) {
         IWrapper<StockTransferDetails> wrapper = getWrapper();
         wrapper.orderByDesc("std", StockTransferDetails::getId);
         Page<StockTransferDetailsVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
+        //赋值产品信息
+        productInfoService.attributeAssign(page.getRecords(), StockTransferDetailsVo::getProductId, (item, productInfo) -> {
+            item.setProductCode(productInfo.getCode());
+            item.setProductUnit(productInfo.getUnit());
+            item.setProductName(productInfo.getName());
+            item.setProductSpec(productInfo.getSpec());
+        });
+        //赋值仓库名称
+        warehouseService.attributeAssign(page.getRecords(), StockTransferDetailsVo::getInWarehouseId, (item, warehouse) -> {
+            item.setInWarehouseName(warehouse.getName());
+        });
+        warehouseService.attributeAssign(page.getRecords(), StockTransferDetailsVo::getOutWarehouseId, (item, warehouse) -> {
+            item.setOutWarehouseName(warehouse.getName());
+        });
         return page;
     }
 

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

@@ -3,11 +3,9 @@ package com.fjhx.victoriatourist.service.stock.impl;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.dynamic.datasource.annotation.DSTransactional;
-import com.baomidou.dynamic.datasource.toolkit.DynamicDataSourceContextHolder;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.fjhx.common.constant.SourceConstant;
 import com.fjhx.item.service.product.ProductInfoService;
 import com.fjhx.victoriatourist.entity.abnormal.po.AbnormalInfo;
 import com.fjhx.victoriatourist.entity.stock.dto.StockTransferDto;
@@ -21,6 +19,7 @@ import com.fjhx.victoriatourist.service.abnormal.AbnormalInfoService;
 import com.fjhx.victoriatourist.service.stock.StockTransferDetailsService;
 import com.fjhx.victoriatourist.service.stock.StockTransferService;
 import com.fjhx.victoriatourist.utils.CodeEnum;
+import com.fjhx.wms.entity.stock.dto.StockDto;
 import com.fjhx.wms.entity.stock.emums.JournalType;
 import com.fjhx.wms.entity.stock.po.Stock;
 import com.fjhx.wms.entity.stock.po.StockJournal;
@@ -203,4 +202,55 @@ public class StockTransferServiceImpl extends ServiceImpl<StockTransferMapper, S
         }
     }
 
+    @Override
+    @DSTransactional
+    public void stockTransfer(StockTransferDto stockTransferDto) {
+        stockTransferDto.setCode(CodeEnum.STOCK_TRANSFER.getCode());
+        stockTransferDto.setType(1);
+        stockTransferDto.setInStatus(0);
+        this.save(stockTransferDto);
+        List<StockTransferDetails> stockTransferDetailsList = stockTransferDto.getStockTransferDetailsList();
+        for (StockTransferDetails stockTransferDetails : stockTransferDetailsList) {
+            stockTransferDetails.setStockTransferId(stockTransferDto.getId());
+        }
+        stockTransferDetailsService.saveBatch(stockTransferDetailsList);
+
+        List<Stock> stockList = new ArrayList<>();
+        for (StockTransferDetails stockTransferDetails : stockTransferDetailsList) {
+            Stock stock = new Stock();
+            stock.setProductId(stockTransferDetails.getProductId());
+            stock.setQuantity(stockTransferDetails.getOutQuantity());
+            stockList.add(stock);
+        }
+
+        //创建出库记录
+        StockJournal stockJournal = new StockJournal();
+        stockJournal.setCode(CodeEnum.STOCK_TRANSFER.getCode());
+        stockJournal.setOpType(2);//出库
+        stockJournal.setType(JournalType.ADJUSTING_OUT.getDetailType());//调仓入库
+        stockJournal.setWarehouseId(stockTransferDto.getOutWarehouseId());
+//        stockJournal.setToWarehouseId(stockDto.getToWarehouseId());
+        //保存出入库记录
+        stockJournalService.save(stockJournal);
+        //操作库存
+        List<StockJournalDetails> stockJournalDetailsList = stockService.ModifyInventory(stockJournal.getId(), 2, stockList, stockTransferDto.getOutWarehouseId());
+        //保存出入库明细
+        stockJournalDetailsService.saveBatch(stockJournalDetailsList);
+
+        //创建入库记录
+        StockJournal stockJournal1 = new StockJournal();
+        stockJournal1.setCode(com.fjhx.wms.utils.CodeEnum.STOCK_TRANSFER.getCode());
+        stockJournal1.setOpType(1);//入库
+        stockJournal1.setType(JournalType.ADJUSTING_IN.getDetailType());//调仓出库
+        stockJournal1.setWarehouseId(stockTransferDto.getInWarehouseId());
+//        stockJournal1.setToWarehouseId(stockDto.getToWarehouseId());
+        //保存出入库记录
+        stockJournalService.save(stockJournal1);
+
+        //入库操作
+        List<StockJournalDetails> stockJournalDetailsList1 = stockService.ModifyInventory(stockJournal1.getId(), 1, stockList, stockTransferDto.getInWarehouseId());
+        //保存出入库明细
+        stockJournalDetailsService.saveBatch(stockJournalDetailsList1);
+    }
+
 }

hx-victoriatourist/src/main/resources/mapper/stock/StockTransferDetailsMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.fjhx.victoriatourist.mapper.stock.StockTransferDetailsMapper">
     <select id="getPage" resultType="com.fjhx.victoriatourist.entity.stock.vo.StockTransferDetailsVo">
-        select
+        SELECT
             std.id,
             std.stock_transfer_id,
             std.product_id,
@@ -11,8 +11,13 @@
             std.create_user,
             std.create_time,
             std.update_user,
-            std.update_time
-        from stock_transfer_details std
+            std.update_time,
+            st.`code`,
+            st.in_warehouse_id,
+            st.out_warehouse_id
+        FROM
+            stock_transfer st
+                LEFT JOIN stock_transfer_details std ON std.stock_transfer_id = st.id
             ${ew.customSqlSegment}
     </select>
 

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

@@ -78,14 +78,6 @@ public class StockController {
     }
 
     /**
-     * 调仓
-     */
-    @PostMapping("/stockTransfer")
-    public void stockTransfer(@RequestBody StockDto stockDto) {
-        stockService.stockTransfer(stockDto);
-    }
-
-    /**
      * 库存删除
      */
     @PostMapping("/delete")

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

@@ -54,11 +54,6 @@ public interface StockService extends BaseService<Stock> {
     void edit(StockDto stockDto);
 
     /**
-     * 调仓
-     */
-    void stockTransfer(StockDto stockDto);
-
-    /**
      * 库存删除
      */
     void delete(Long id);

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

@@ -219,39 +219,6 @@ public class StockServiceImpl extends ServiceImpl<StockMapper, Stock> implements
     }
 
     @Override
-    @DSTransactional
-    public void stockTransfer(StockDto stockDto) {
-        //创建出库记录
-        StockJournal stockJournal = new StockJournal();
-        stockJournal.setCode(CodeEnum.STOCK_TRANSFER.getCode());
-        stockJournal.setOpType(2);//出库
-        stockJournal.setType(JournalType.ADJUSTING_OUT.getDetailType());//调仓入库
-        stockJournal.setWarehouseId(stockDto.getWarehouseId());
-        stockJournal.setToWarehouseId(stockDto.getToWarehouseId());
-        //保存出入库记录
-        stockJournalService.save(stockJournal);
-        //操作库存
-        List<StockJournalDetails> stockJournalDetailsList = ModifyInventory(stockJournal.getId(), 2, stockDto.getList(), stockDto.getWarehouseId());
-        //保存出入库明细
-        stockJournalDetailsService.saveBatch(stockJournalDetailsList);
-
-        //创建入库记录
-        StockJournal stockJournal1 = new StockJournal();
-        stockJournal1.setCode(CodeEnum.STOCK_TRANSFER.getCode());
-        stockJournal1.setOpType(1);//入库
-        stockJournal1.setType(JournalType.ADJUSTING_IN.getDetailType());//调仓出库
-        stockJournal1.setWarehouseId(stockDto.getWarehouseId());
-        stockJournal1.setToWarehouseId(stockDto.getToWarehouseId());
-        //保存出入库记录
-        stockJournalService.save(stockJournal1);
-
-        //入库操作
-        List<StockJournalDetails> stockJournalDetailsList1 = ModifyInventory(stockJournal1.getId(), 1, stockDto.getList(), stockDto.getToWarehouseId());
-        //保存出入库明细
-        stockJournalDetailsService.saveBatch(stockJournalDetailsList1);
-    }
-
-    @Override
     public void delete(Long id) {
         this.removeById(id);
     }