|
@@ -12,7 +12,6 @@ import com.fjhx.wms.entity.stock.po.StockJournalDetails;
|
|
|
import com.fjhx.wms.entity.stock.vo.StockJournalDetailsVo;
|
|
|
import com.fjhx.wms.mapper.stock.StockJournalDetailsMapper;
|
|
|
import com.fjhx.wms.service.stock.StockJournalDetailsService;
|
|
|
-import com.fjhx.wms.service.stock.StockWaitService;
|
|
|
import com.fjhx.wms.service.warehouse.WarehouseService;
|
|
|
import com.ruoyi.common.utils.SecurityUtils;
|
|
|
import com.ruoyi.common.utils.wrapper.IWrapper;
|
|
@@ -38,8 +37,6 @@ public class StockJournalDetailsServiceImpl extends ServiceImpl<StockJournalDeta
|
|
|
private ProductInfoService productInfoService;
|
|
|
@Autowired
|
|
|
private WarehouseService warehouseService;
|
|
|
- @Autowired
|
|
|
- private StockWaitService stockWaitService;
|
|
|
|
|
|
@Override
|
|
|
public Page<StockJournalDetailsVo> getPage(StockJournalSelectDto dto) {
|
|
@@ -67,7 +64,7 @@ public class StockJournalDetailsServiceImpl extends ServiceImpl<StockJournalDeta
|
|
|
}
|
|
|
|
|
|
productInfoService.attributeAssign(records, StockJournalDetailsVo::getProductId, (item, product) -> {
|
|
|
- item.setProductCode(product.getCode());
|
|
|
+ item.setProductCode(product.getCustomCode());
|
|
|
item.setProductUnit(product.getUnit());
|
|
|
item.setProductType(product.getType());
|
|
|
item.setProductName(product.getName());
|
|
@@ -83,28 +80,6 @@ public class StockJournalDetailsServiceImpl extends ServiceImpl<StockJournalDeta
|
|
|
return page;
|
|
|
}
|
|
|
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
@Override
|
|
|
public StockJournalDetailsVo detail(Long id) {
|
|
|
StockJournalDetails StockJournalDetails = this.getById(id);
|