产品字段调整

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

@@ -37,14 +37,6 @@ public class StockJournalDetailsController {
         return stockJournalDetailsService.getPage(dto);
     }
 
-//    /**
-//     * 出入库记录明细分页 维多利亚
-//     */
-//    @PostMapping("/pageByWdly")
-//    public Page<StockJournalDetailsVo> pageByWdly(@RequestBody StockJournalSelectDto dto) {
-//        return stockJournalDetailsService.getPageByWdly(dto);
-//    }
-
     /**
      * 出入库记录明细明细
      */

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

@@ -23,11 +23,6 @@ public interface StockJournalDetailsService extends BaseService<StockJournalDeta
      */
     Page<StockJournalDetailsVo> getPage(StockJournalSelectDto dto);
 
-//    /**
-//     * 出入库记录明细分页 维多利亚
-//     */
-//    Page<StockJournalDetailsVo> getPageByWdly(StockJournalSelectDto dto);
-
     /**
      * 出入库记录明细明细
      */

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

@@ -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 Page<StockJournalDetailsVo> getPageByWdly(StockJournalSelectDto dto) {
-//        Page<StockJournalDetailsVo> page = getPage(dto);
-//        List<StockJournalDetailsVo> records = page.getRecords();
-//        if (ObjectUtil.isEmpty(records)) {
-//            return page;
-//        }
-//        //给采购退货的数据赋值关联单号
-//        List<Long> swIds = records.stream().filter(x -> x.getType() == 13).map(StockJournalDetailsVo::getBusinessId).collect(Collectors.toList());
-//        if (ObjectUtil.isNotEmpty(swIds)) {
-//            Map<Long, StockWait> stockWaitMap = stockWaitService.mapKEntity(StockWait::getId, q -> q.in(StockWait::getId, swIds));
-//            for (StockJournalDetailsVo record : records) {
-//                StockWait stockWait = stockWaitMap.get(record.getBusinessId());
-//                if(ObjectUtil.isEmpty(stockWait)){
-//                    continue;
-//                }
-//                record.setLinkCode(stockWait.getBusinessCode());
-//            }
-//        }
-//        return page;
-//    }
-
     @Override
     public StockJournalDetailsVo detail(Long id) {
         StockJournalDetails StockJournalDetails = this.getById(id);

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

@@ -68,7 +68,7 @@ public class StockWaitDetailsServiceImpl extends ServiceImpl<StockWaitDetailsMap
         }
         // 赋值产品属性
         productInfoService.attributeAssign(records, StockWaitDetailsVo::getProductId, (item, productInfo) -> {
-            item.setProductCode(productInfo.getCode());
+            item.setProductCode(productInfo.getCustomCode());
             item.setProductUnit(productInfo.getUnit());
             item.setProductType(productInfo.getType());
             item.setProductName(productInfo.getName());