代码清理

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

@@ -5,23 +5,13 @@ import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 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.customer.entity.customer.po.Customer;
 import com.fjhx.customer.service.customer.CustomerService;
 import com.fjhx.item.service.product.ProductInfoService;
-import com.fjhx.supply.entity.supplier.po.SupplierInfo;
 import com.fjhx.supply.service.supplier.SupplierInfoService;
-import com.fjhx.wms.entity.arrival.po.ArrivalDetailPo;
-import com.fjhx.wms.entity.contract.po.ContractPo;
-import com.fjhx.wms.entity.purchase.po.PurchaseDetailPo;
-import com.fjhx.wms.entity.purchase.po.PurchasePo;
 import com.fjhx.wms.entity.stock.dto.StockJournalDto;
 import com.fjhx.wms.entity.stock.dto.StockJournalSelectDto;
-import com.fjhx.wms.entity.stock.emums.JournalType;
 import com.fjhx.wms.entity.stock.po.StockJournal;
 import com.fjhx.wms.entity.stock.po.StockJournalDetails;
-import com.fjhx.wms.entity.stock.po.StockWait;
-import com.fjhx.wms.entity.stock.po.StockWaitDetails;
 import com.fjhx.wms.entity.stock.vo.StockJournalDetailsVo;
 import com.fjhx.wms.entity.stock.vo.StockJournalVo;
 import com.fjhx.wms.entity.warehouse.po.Warehouse;
@@ -41,7 +31,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
-import java.util.Map;
 import java.util.Objects;
 
 
@@ -153,50 +142,50 @@ public class StockJournalServiceImpl extends ServiceImpl<StockJournalMapper, Sto
         });
         stockJournalVo.setList(stockJournalDetailsVos);
 
-        //流水打印数据赋值
-        if (JournalType.PURCHASE_IN.getDetailType().equals(stockJournalVo.getType())) {
-            StockWait stockWait = stockWaitService.getById(stockJournalVo.getBusinessId());
-            Assert.notEmpty(stockWait, "查询不到待出入库信息");
-            PurchasePo purchase = myPurchaseService.getPurchaseInfo(stockWait.getBusinessId());
-            Assert.notEmpty(purchase, "查询不到采购信息");
-            Map<Long, PurchaseDetailPo> purchaseDetailMap = myPurchaseService.grtPurchaseDetail(purchase.getId());
-            //流水打印数据获取
-            if (ObjectUtils.isEmpty(purchase.getDataResource())) {
-                //采购合同
-                SupplierInfo supplierInfo = supplierInfoService.getById(purchase.getSupplyId());
-                if (ObjectUtils.isNotEmpty(supplierInfo)) {
-                    stockJournalVo.setCorporateName(supplierInfo.getName());//供应商
-                }
-                stockJournalVo.setCode(purchase.getCode());//单号
-            } else {
-                //销售合同
-                ContractPo contractInfo = mySaleService.getContractInfo(purchase.getDataResourceId());
-                Customer customer = customerService.getById(contractInfo.getBuyCorporationId());
-                if (ObjectUtils.isNotEmpty(customer)) {
-                    stockJournalVo.setCorporateName(customer.getName());//客户名称
-                }
-                stockJournalVo.setCode(contractInfo.getCode());//单号
-            }
-            stockJournalVo.setCurrency(purchase.getCurrency());//币种
-            //明细数据赋值
-            for (StockJournalDetailsVo stockJournalDetailsVo : stockJournalVo.getList()) {
-                stockJournalDetailsVo.setCurrency(purchase.getCurrency());//币种
-                StockWaitDetails stockWaitDetails = stockWaitDetailsService.getById(stockJournalDetailsVo.getBusinessDetailsId());
-                if (ObjectUtils.isEmpty(stockWaitDetails)) {
-                    continue;
-                }
-                ArrivalDetailPo arrivalDetailInfo = myPurchaseService.getArrivalDetailInfo(stockWaitDetails.getBusinessDetailsId());
-                if (ObjectUtils.isEmpty(arrivalDetailInfo)) {
-                    continue;
-                }
-                PurchaseDetailPo purchaseDetail = purchaseDetailMap.get(arrivalDetailInfo.getPurchaseDetailId());
-                if (ObjectUtils.isEmpty(purchaseDetail)) {
-                    continue;
-                }
-                stockJournalDetailsVo.setPrice(purchaseDetail.getPrice());//单价
-                stockJournalDetailsVo.setAmount(purchaseDetail.getAmount());//金额
-            }
-        }
+//        //流水打印数据赋值
+//        if (JournalType.PURCHASE_IN.getDetailType().equals(stockJournalVo.getType())) {
+//            StockWait stockWait = stockWaitService.getById(stockJournalVo.getBusinessId());
+//            Assert.notEmpty(stockWait, "查询不到待出入库信息");
+//            PurchasePo purchase = myPurchaseService.getPurchaseInfo(stockWait.getBusinessId());
+//            Assert.notEmpty(purchase, "查询不到采购信息");
+//            Map<Long, PurchaseDetailPo> purchaseDetailMap = myPurchaseService.grtPurchaseDetail(purchase.getId());
+//            //流水打印数据获取
+//            if (ObjectUtils.isEmpty(purchase.getDataResource())) {
+//                //采购合同
+//                SupplierInfo supplierInfo = supplierInfoService.getById(purchase.getSupplyId());
+//                if (ObjectUtils.isNotEmpty(supplierInfo)) {
+//                    stockJournalVo.setCorporateName(supplierInfo.getName());//供应商
+//                }
+//                stockJournalVo.setCode(purchase.getCode());//单号
+//            } else {
+//                //销售合同
+//                ContractPo contractInfo = mySaleService.getContractInfo(purchase.getDataResourceId());
+//                Customer customer = customerService.getById(contractInfo.getBuyCorporationId());
+//                if (ObjectUtils.isNotEmpty(customer)) {
+//                    stockJournalVo.setCorporateName(customer.getName());//客户名称
+//                }
+//                stockJournalVo.setCode(contractInfo.getCode());//单号
+//            }
+//            stockJournalVo.setCurrency(purchase.getCurrency());//币种
+//            //明细数据赋值
+//            for (StockJournalDetailsVo stockJournalDetailsVo : stockJournalVo.getList()) {
+//                stockJournalDetailsVo.setCurrency(purchase.getCurrency());//币种
+//                StockWaitDetails stockWaitDetails = stockWaitDetailsService.getById(stockJournalDetailsVo.getBusinessDetailsId());
+//                if (ObjectUtils.isEmpty(stockWaitDetails)) {
+//                    continue;
+//                }
+//                ArrivalDetailPo arrivalDetailInfo = myPurchaseService.getArrivalDetailInfo(stockWaitDetails.getBusinessDetailsId());
+//                if (ObjectUtils.isEmpty(arrivalDetailInfo)) {
+//                    continue;
+//                }
+//                PurchaseDetailPo purchaseDetail = purchaseDetailMap.get(arrivalDetailInfo.getPurchaseDetailId());
+//                if (ObjectUtils.isEmpty(purchaseDetail)) {
+//                    continue;
+//                }
+//                stockJournalDetailsVo.setPrice(purchaseDetail.getPrice());//单价
+//                stockJournalDetailsVo.setAmount(purchaseDetail.getAmount());//金额
+//            }
+//        }
 
         return stockJournalVo;
     }