代码清理

hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/service/purchase/impl/PurchaseBackServiceImpl.java

@@ -131,51 +131,6 @@ public class PurchaseBackServiceImpl extends ServiceImpl<PurchaseBackMapper, Pur
     @Override
     @DSTransactional
     public void backOut(StockWaitDetailsDto stockWaitDetailsDto) {
-//        //修改待出入库状态
-//        stockWaitDetailsService.changeStockWaitStatus(stockWaitDetailsDto);
-//        StockWaitDetails stockWaitDetails = stockWaitDetailsService.getById(stockWaitDetailsDto.getId());
-//        StockWait byId = stockWaitService.getById(stockWaitDetails.getStockWaitId());
-//        //创建出入库记录
-//        StockJournal stockJournal = new StockJournal();
-//        stockJournal.setOpType(byId.getType());
-//        //退货出库
-//        stockJournal.setType(JournalType.BACK_OUT.getDetailType());
-//
-//        DynamicDataSourceContextHolder.push(SourceConstant.WMS);
-//        stockJournal.setCode(CodeEnum.SOUT_CODE.getCode());
-//        DynamicDataSourceContextHolder.poll();
-//
-//        stockJournal.setWarehouseId(stockWaitDetailsDto.getWarehouseId());
-//        stockJournal.setBusinessId(byId.getId());
-//        //保存出入库记录
-//        stockJournalService.save(stockJournal);
-//        //操作库存
-//        Stock stock = new Stock();
-//        stock.setQuantity(stockWaitDetailsDto.getQuantity());
-//        stock.setProductId(stockWaitDetails.getProductId());
-//        //退货出库出次品库存
-//        List<StockJournalDetails> stockJournalDetailsList = stockService.ModifyInventory(stockJournal.getId(), 4, Arrays.asList(stock), stockWaitDetailsDto.getWarehouseId());
-//        //保存出入库明细
-//        stockJournalDetailsService.saveBatch(stockJournalDetailsList);
-//
-//        //创建物流数据
-//        LogisticsInfos logisticsInfos = new LogisticsInfos();
-//        logisticsInfos.setBusinessId(byId.getId());
-//        logisticsInfos.setBusinessCode(byId.getBusinessCode());
-//        logisticsInfos.setBusinessType(5);//采购退货
-//        logisticsInfos.setLogisticsCompanyCode(stockWaitDetailsDto.getLogisticsCompanyCode());
-//        logisticsInfos.setCode(stockWaitDetailsDto.getLogisticsCode());
-//        logisticsInfos.setWarehouseId(stockWaitDetailsDto.getWarehouseId());
-//        logisticsInfos.setIsKd100(0);
-//        logisticsInfosService.save(logisticsInfos);
-//
-//        LogisticsDetails logisticsDetails = new LogisticsDetails();
-//        logisticsDetails.setLogisticsInfoId(logisticsInfos.getId());
-//        logisticsDetails.setLogisticsInfoCode(logisticsInfos.getCode());
-//        logisticsDetails.setBusinessDetailsId(stockWaitDetailsDto.getId());
-//        logisticsDetails.setReceiptQuantity(stockWaitDetailsDto.getQuantity());
-//        logisticsDetailsService.save(logisticsDetails);
-
         //优化
         StockWaitDetails stockWaitDetails = stockWaitDetailsService.getById(stockWaitDetailsDto.getId());
         Assert.notEmpty(stockWaitDetails, "查询不到待出库明细信息");

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

@@ -5,7 +5,6 @@ import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.dynamic.datasource.annotation.DSTransactional;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.fjhx.common.utils.Assert;
 import com.fjhx.item.entity.product.po.ProductInfo;
 import com.fjhx.item.service.product.ProductInfoService;
 import com.fjhx.wms.entity.stock.dto.StockWaitDetailsDto;
@@ -15,7 +14,6 @@ import com.fjhx.wms.entity.stock.po.StockWait;
 import com.fjhx.wms.entity.stock.po.StockWaitDetails;
 import com.fjhx.wms.entity.stock.vo.StockWaitDetailsVo;
 import com.fjhx.wms.mapper.stock.StockWaitDetailsMapper;
-import com.fjhx.wms.service.MyPurchaseService;
 import com.fjhx.wms.service.stock.StockWaitDetailsService;
 import com.fjhx.wms.service.stock.StockWaitService;
 import com.ruoyi.common.exception.ServiceException;
@@ -24,7 +22,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
-import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -44,8 +41,6 @@ public class StockWaitDetailsServiceImpl extends ServiceImpl<StockWaitDetailsMap
     private ProductInfoService productInfoService;
     @Autowired
     private StockWaitService stockWaitService;
-    @Autowired
-    private MyPurchaseService myPurchaseService;
 
     @Override
     public Page<StockWaitDetailsVo> getPage(StockWaitDetailsSelectDto dto) {
@@ -105,58 +100,7 @@ public class StockWaitDetailsServiceImpl extends ServiceImpl<StockWaitDetailsMap
     @Override
     @DSTransactional
     public void add(StockWaitDetailsDto stockWaitDetailsDto) {
-//        //修改待出库状态
-//        changeStockWaitStatus(stockWaitDetailsDto);
-//        StockWaitDetails stockWaitDetails = getById(stockWaitDetailsDto.getId());
-//        StockWait byId = stockWaitService.getById(stockWaitDetails.getStockWaitId());
-//        Integer businessType = byId.getBusinessType();
-//
-//        if (StockWaitType.SALE_ORDER_OUT.getDetailType().equals(businessType)) {
-//            //销售订单出库
-//            wmsService.outbound(stockWaitDetailsDto);
-//        }
-//        if (StockWaitType.PRODUCTION_TASK_OUT.getDetailType().equals(businessType)) {
-//            //生产任务待出库
-//            //减少冻结库存
-//            StockFrozen stockFrozen = stockFrozenService.getOne(q -> q.eq(StockFrozen::getProductId, stockWaitDetails.getProductId()));
-//            BigDecimal subtract = stockFrozen.getFrozenQuantity().subtract(stockWaitDetailsDto.getQuantity());
-//            stockFrozen.setFrozenQuantity(subtract);
-//            stockFrozenService.updateById(stockFrozen);
-//        }
-//
-//        //创建出入库记录
-//        StockJournal stockJournal = new StockJournal();
-//        stockJournal.setOpType(byId.getType());
-//        //根据待入库业务类型创建待出入库记录
-//        stockJournal.setType(stockWaitService.getStockJournalType(businessType));
-//        stockJournal.setCode(byId.getType() == 1 ? CodeEnum.SIN_CODE.getCode() : CodeEnum.SOUT_CODE.getCode());
-//        stockJournal.setWarehouseId(stockWaitDetailsDto.getWarehouseId());
-//        stockJournal.setBusinessId(byId.getId());
-//        //保存出入库记录
-//        stockJournalService.save(stockJournal);
-//        //操作库存
-//        Stock stock = new Stock();
-//        stock.setQuantity(stockWaitDetailsDto.getQuantity());
-//        stock.setProductId(stockWaitDetails.getProductId());
-//        List<StockJournalDetails> stockJournalDetailsList = stockService.ModifyInventory(stockJournal.getId(), byId.getType(), Arrays.asList(stock), stockWaitDetailsDto.getWarehouseId());
-//        //保存出入库明细
-//        stockJournalDetailsService.saveBatch(stockJournalDetailsList);
-
-        //优化
-        StockWaitDetails stockWaitDetails = this.getById(stockWaitDetailsDto.getId());
-        Assert.notEmpty(stockWaitDetails, "查询不到待出库明细信息");
-        StockWaitDto stockWaitDto = BeanUtil.copyProperties(stockWaitDetailsDto, StockWaitDto.class);
-        stockWaitDto.setId(stockWaitDetails.getStockWaitId());
-        stockWaitDto.setStockWaitDetailsList(Collections.singletonList(BeanUtil.copyProperties(stockWaitDetailsDto, StockWaitDetails.class)));
-        stockWaitService.addByWdly(stockWaitDto);
-
-        //如果是采购退货 修改采购退货状态
-        StockWait stockWait = stockWaitService.getById(stockWaitDto.getId());
-        Assert.notEmpty(stockWait, "查询不到待出库信息");
-        if (stockWait.getBusinessType() == 4) {
-            Integer status = stockWait.getStatus();
-            myPurchaseService.updateSalesReturnStatus(stockWaitDetails.getBusinessDetailsId(), status);
-        }
+        stockWaitService.add(stockWaitDetailsDto);
     }
 
 

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

@@ -24,6 +24,7 @@ import com.fjhx.wms.entity.stock.vo.StockWaitDetailsVo;
 import com.fjhx.wms.entity.stock.vo.StockWaitVo;
 import com.fjhx.wms.entity.warehouse.po.Warehouse;
 import com.fjhx.wms.mapper.stock.StockWaitMapper;
+import com.fjhx.wms.service.MyPurchaseService;
 import com.fjhx.wms.service.WmsService;
 import com.fjhx.wms.service.arrival.ArrivalStockRecordsDetailsService;
 import com.fjhx.wms.service.arrival.ArrivalStockRecordsService;
@@ -38,6 +39,7 @@ import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 import java.util.function.Function;
@@ -75,6 +77,8 @@ public class StockWaitServiceImpl extends ServiceImpl<StockWaitMapper, StockWait
     private WmsService wmsService;
     @Autowired
     private StockFrozenService stockFrozenService;
+    @Autowired
+    private MyPurchaseService myPurchaseService;
 
     @Override
     public Page<StockWaitVo> getPage(StockWaitSelectDto dto) {
@@ -118,7 +122,7 @@ public class StockWaitServiceImpl extends ServiceImpl<StockWaitMapper, StockWait
         //赋值操作人
         UserUtil.assignmentNickName(records, StockWaitVo::getCreateUser, StockWaitVo::setOperatorName);
         //赋值仓库名称和id
-        List<Long> wids = new ArrayList<>();
+        List<Long> warehouseIds = new ArrayList<>();
         for (StockWaitVo stockWaitVo : records) {
             String victoriatouristJson = stockWaitVo.getVictoriatouristJson();
             if (ObjectUtil.isEmpty(victoriatouristJson)) {
@@ -128,12 +132,12 @@ public class StockWaitServiceImpl extends ServiceImpl<StockWaitMapper, StockWait
             if (!json.containsKey("receiptWarehouseId")) {
                 continue;
             }
-            wids.add(json.getLong("receiptWarehouseId"));
+            warehouseIds.add(json.getLong("receiptWarehouseId"));
         }
-        if (ObjectUtil.isEmpty(wids)) {
+        if (ObjectUtil.isEmpty(warehouseIds)) {
             return page;
         }
-        List<Warehouse> warehouses = warehouseService.listByIds(wids);
+        List<Warehouse> warehouses = warehouseService.listByIds(warehouseIds);
         Map<Long, String> warehousesMap = warehouses.stream().collect(Collectors.toMap(Warehouse::getId, Warehouse::getName));
         for (StockWaitVo stockWaitVo : records) {
             String victoriatouristJson = stockWaitVo.getVictoriatouristJson();
@@ -181,9 +185,9 @@ public class StockWaitServiceImpl extends ServiceImpl<StockWaitMapper, StockWait
 
 
         //赋值物品信息和采购信息
-        List<Long> pids = stockWaitDetailsVos.stream().map(StockWaitDetails::getProductId).collect(Collectors.toList());
-        if (ObjectUtil.isNotEmpty(pids)) {
-            List<ProductInfo> productInfos = productInfoService.listByIds(pids);
+        List<Long> productIds = stockWaitDetailsVos.stream().map(StockWaitDetails::getProductId).collect(Collectors.toList());
+        if (ObjectUtil.isNotEmpty(productIds)) {
+            List<ProductInfo> productInfos = productInfoService.listByIds(productIds);
             Map<Long, ProductInfo> productInfoMap = productInfos.stream().collect(Collectors.toMap(ProductInfo::getId, Function.identity()));
             for (StockWaitDetailsVo stockWaitDetails : stockWaitDetailsVos) {
                 ProductInfo productInfo = productInfoMap.get(stockWaitDetails.getProductId());
@@ -202,7 +206,21 @@ public class StockWaitServiceImpl extends ServiceImpl<StockWaitMapper, StockWait
     @DSTransactional
     @Override
     public void add(StockWaitDetailsDto stockWaitDetailsDto) {
-        stockWaitDetailsService.add(stockWaitDetailsDto);
+        //优化
+        StockWaitDetails stockWaitDetails = stockWaitDetailsService.getById(stockWaitDetailsDto.getId());
+        Assert.notEmpty(stockWaitDetails, "查询不到待出库明细信息");
+        StockWaitDto stockWaitDto = BeanUtil.copyProperties(stockWaitDetailsDto, StockWaitDto.class);
+        stockWaitDto.setId(stockWaitDetails.getStockWaitId());
+        stockWaitDto.setStockWaitDetailsList(Collections.singletonList(BeanUtil.copyProperties(stockWaitDetailsDto, StockWaitDetails.class)));
+        this.addByWdly(stockWaitDto);
+
+        //如果是采购退货 修改采购退货状态
+        StockWait stockWait = this.getById(stockWaitDto.getId());
+        Assert.notEmpty(stockWait, "查询不到待出库信息");
+        if (stockWait.getBusinessType() == 4) {
+            Integer status = stockWait.getStatus();
+            myPurchaseService.updateSalesReturnStatus(stockWaitDetails.getBusinessDetailsId(), status);
+        }
     }
 
     @DSTransactional