维多利亚

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

@@ -18,6 +18,7 @@ public enum InTypeEnum {
     // business_id = 自定义id
     MANUAL(2, "手动入库"),
 
+    // business_id = stock_transfer 表 id
     TRANSFER(7, "调仓入库"),
 
     // business_id = stock_combination 表 id

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

@@ -31,7 +31,7 @@ public enum OutTypeEnum {
 
     // ======== 手动出库明细 ========
 
-    // business_id = 自定义id
+    // business_id = stock_transfer 表 id
     TRANSFER(7, "调仓出库"),
 
     // business_id = quality_details 表 id

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

@@ -1,6 +1,5 @@
 package com.fjhx.params.stock;
 
-import com.fjhx.entity.stock.StockTransfer;
 import lombok.Data;
 
 import java.util.List;

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

@@ -35,6 +35,9 @@ public class StockTransferController {
         return R.success(page);
     }
 
+    /**
+     * 调仓
+     */
     @PostMapping("/add")
     public R add(@RequestBody StockTransferAddVo stockTransferAddVo) {
         stockTransferService.add(stockTransferAddVo);

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

@@ -43,14 +43,6 @@ public interface StockJournalService extends BaseService<StockJournal> {
      */
     Page<StockJournal> getManualInStockPage(Condition condition);
 
-    // /**
-    //  * 到货质检列表
-    //  *
-    //  * @param condition 查询条件
-    //  * @return
-    //  */
-    // Page<StockJournal> getArrivalQualityPage(Map<String, Object> condition);
-
     /**
      * 出入库单据
      */

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

@@ -239,52 +239,20 @@ public class StockJournalServiceImpl extends ServiceImpl<StockJournalMapper, Sto
                 .orderByDesc("t1", StockJournal::getId);
 
         Page<StockJournal> page = baseMapper.getManualInStockPage(createPage(condition), wrapper);
-        if (Func.isNotEmpty(page.getRecords())) {
-            //操作人名称map
-            Map<Long, String> userNameMap = UserClientUtil.getUserNameMap(page.getRecords(), StockJournal::getCreateUser);
 
-            for (StockJournal record : page.getRecords()) {
-                if (Func.isNotEmpty(userNameMap) && Func.isNotEmpty(userNameMap.get(record.getCreateUser()))) {
-                    record.setCreateName(userNameMap.get(record.getCreateUser()));
-                }
-            }
+        List<StockJournal> records = page.getRecords();
+        if (records.size() == 0) {
+            return page;
+        }
+
+        // 操作人名称map
+        Map<Long, String> userNameMap = UserClientUtil.getUserNameMap(page.getRecords(), StockJournal::getCreateUser);
+        for (StockJournal record : records) {
+            record.setCreateName(userNameMap.get(record.getCreateUser()));
         }
         return page;
     }
 
-    // /**
-    //  * 到货质检列表
-    //  *
-    //  * @param condition 查询条件
-    //  * @return
-    //  */
-    // @Override
-    // public Page<StockJournal> getArrivalQualityPage(Map<String, Object> condition) {
-    //     IWrapper<StockJournal> wrapper = IWrapper.getWrapper(condition);
-    //     wrapper.eq("t1", StockJournal::getType, StockJournalTypeConstant.IN)
-    //             .eq("t1", StockJournal::getDetailsType, InTypeEnum.PURCHASE.getKey())
-    //             .keyword(
-    //                     new KeywordData("t3.`code`"),
-    //                     new KeywordData("t4.`name`"),
-    //                     new KeywordData("t5.`name`")
-    //             )
-    //             .groupBy("t1.`code`")
-    //             .orderByDesc("t1", ApplyPurchase::getCode);
-    //
-    //     Page<StockJournal> page = baseMapper.getArrivalQualityPage(createPage(condition), wrapper);
-    //     List<StockJournal> records = page.getRecords();
-    //     if (records.size() == 0) {
-    //         return page;
-    //     }
-    //
-    //     Map<Long, String> userNameMap = UserClientUtil.getUserNameMap(records, BaseEntity::getCreateUser);
-    //
-    //     for (StockJournal record : records) {
-    //         record.setCreateName(userNameMap.get(record.getCreateUser()));
-    //     }
-    //     return page;
-    // }
-
     @Override
     public Page<Map<String, Object>> inOutDocument(Condition condition) {
 
@@ -300,7 +268,6 @@ public class StockJournalServiceImpl extends ServiceImpl<StockJournalMapper, Sto
         Page<Map<String, Object>> page = baseMapper.inOutDocument(condition.getPage(), wrapper);
 
         UserClientUtil.setUserName(page.getRecords(),"createUser","createUserName");
-
         return page;
     }
 }

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

@@ -82,15 +82,12 @@ public class StockTransferServiceImpl extends ServiceImpl<StockTransferMapper, S
         // 调仓明细
         List<ChangeProduct> changeProductList = stockTransferAddVo.getChangeProductList();
         Assert.notEmpty(changeProductList, "调仓明细不能为空");
-
-        Date date = new Date();
-        Long userId = AuthUtil.getUserId();
         List<StockTransfer> stockTransferList = changeProductList.stream()
-                // 排除调仓数量为0
                 .filter(item -> item.getQuantity().compareTo(BigDecimal.ZERO) > 0)
-
                 .map(item -> {
                     long id = IdWorker.getId();
+                    item.setBusinessId(id);
+
                     StockTransfer stockTransfer = new StockTransfer();
                     stockTransfer.setId(id);
                     stockTransfer.setInWarehouseId(stockTransferAddVo.getInWarehouseId());
@@ -99,21 +96,16 @@ public class StockTransferServiceImpl extends ServiceImpl<StockTransferMapper, S
                     stockTransfer.setInStatus(StatusConstant.NO);
                     stockTransfer.setOutQuantity(item.getQuantity());
                     stockTransfer.setProductId(item.getProductId());
-                    stockTransfer.setCreateTime(date);
-                    stockTransfer.setCreateUser(userId);
-
-                    item.setBusinessId(id);
-
                     return stockTransfer;
                 }).collect(Collectors.toList());
-        saveBatch(stockTransferList);
 
         if (stockTransferList.size() == 0) {
             return;
         }
 
+        saveBatch(stockTransferList);
+
         StockChangeDto stockChangeDto = new StockChangeDto();
-        stockChangeDto.setDefaultBusinessId(IdWorker.getId());
         stockChangeDto.setDefaultWarehouseId(stockTransferAddVo.getOutWarehouseId());
         stockChangeDto.setDefaultRemarks(stockTransferAddVo.getRemark());
         stockChangeDto.setTypeEnum(OutTypeEnum.TRANSFER);
@@ -123,26 +115,25 @@ public class StockTransferServiceImpl extends ServiceImpl<StockTransferMapper, S
 
     @Transactional(rollbackFor = Exception.class)
     @Override
-    public void receive(StockTransfer stockTransfer) {
+    public void receive(StockTransfer dto) {
 
-        StockTransfer byId = getById(stockTransfer);
-        Assert.eqTrue(StatusConstant.NO.equals(byId.getInStatus()), "物品已接收");
-        BigDecimal inQuantity = stockTransfer.getInQuantity();
+        StockTransfer stockTransfer = getById(dto);
+        Assert.eqTrue(StatusConstant.NO.equals(stockTransfer.getInStatus()), "物品已接收");
 
-        byId.setInUser(AuthUtil.getUserId());
-        byId.setInQuantity(inQuantity);
-        byId.setInTime(new Date());
-        byId.setInStatus(StatusConstant.YES);
-        updateById(byId);
+        stockTransfer.setInUser(AuthUtil.getUserId());
+        stockTransfer.setInQuantity(dto.getInQuantity());
+        stockTransfer.setInTime(new Date());
+        stockTransfer.setInStatus(StatusConstant.YES);
+        updateById(stockTransfer);
 
         ChangeProduct changeProduct = new ChangeProduct();
-        changeProduct.setProductId(byId.getProductId());
-        changeProduct.setQuantity(inQuantity);
+        changeProduct.setBusinessId(stockTransfer.getId());
+        changeProduct.setProductId(stockTransfer.getProductId());
+        changeProduct.setQuantity(stockTransfer.getInQuantity());
 
         StockChangeDto stockChangeDto = new StockChangeDto();
-        stockChangeDto.setDefaultBusinessId(byId.getId());
-        stockChangeDto.setDefaultWarehouseId(byId.getInWarehouseId());
-        stockChangeDto.setDefaultRemarks(byId.getRemark());
+        stockChangeDto.setDefaultWarehouseId(stockTransfer.getInWarehouseId());
+        stockChangeDto.setDefaultRemarks(stockTransfer.getRemark());
         stockChangeDto.setTypeEnum(InTypeEnum.TRANSFER);
         stockChangeDto.setChangeDetailsList(Collections.singletonList(changeProduct));
         stockService.changeQuantity(stockChangeDto);