1.盘带人级联 2.盘点物品为仓库内物品

futian.liu

2023-12-20 1b8db0473522c886428767f7eeaaf7f52d47ce42

 consum-base/src/main/java/com/consum/base/service/impl/LWhFormInventoryCoreService.java

@@ -1,6 +1,7 @@
package com.consum.base.service.impl;

import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -19,7 +20,7 @@
import com.consum.base.core.utils.IdUtil;
import com.consum.base.service.BaseGoodsTemplateService;
import com.consum.base.service.BaseWarehouseService;
import com.consum.base.service.LWhFormInventoryGoodsServiceImpl;
import com.consum.base.service.LWhFormInventoryGoodsService;
import com.consum.base.service.LWhFormInventoryService;
import com.consum.base.service.LWhFormOutputService;
import com.consum.base.service.LWhFormProcureGoodsService;
@@ -50,7 +51,7 @@
@Transactional(propagation = Propagation.REQUIRED)
public class LWhFormInventoryCoreService {

    private LWhFormInventoryGoodsServiceImpl lWhFormInventoryGoods;
    private LWhFormInventoryGoodsService lWhFormInventoryGoods;
    private LWhFormOutputCoreService lWhFormOutputCoreService;
    private CodeGeneratorService codeGeneratorService;
    private LWhFormProcureService lWhFormProcureServiceImpl;
@@ -64,7 +65,7 @@
    private LWhFormOutputService lWhFormOutputService;

    @Autowired
    public LWhFormInventoryCoreService(LWhFormInventoryGoodsServiceImpl lWhFormInventoryGoods,
    public LWhFormInventoryCoreService(LWhFormInventoryGoodsService lWhFormInventoryGoods,
                                       LWhFormOutputCoreService lWhFormOutputCoreService,
                                       CodeGeneratorService codeGeneratorService,
                                       LWhFormProcureService lWhFormProcureServiceImpl,
@@ -251,14 +252,15 @@
                continue;
            }
            // 查询型号库存
            int goodsModelNum = lWhGoodsService.queryGoodsModelNum(0, warehouseId, baseGoodsModelsId, 1, null);
            List<Long> warehouseIds = new ArrayList<>(Arrays.asList(warehouseId));
            int goodsModelNum = lWhGoodsService.queryGoodsModelNum(0, warehouseIds, baseGoodsModelsId, 1, null);
            LWhProcureModel model = new LWhProcureModel();
            model.setId(IdUtil.generateId());
            model.setFromProcureGoodsId(fromProcureGoodsId);
            model.setBusinessType(WhBusinessEnum.CAIGOU.getValue() + 0);
            model.setBusinessId(whFormProcureId);
            model.setBaseGoodsModelsId(baseGoodsModelsId);
            model.setPrice(0l);
            model.setPrice(0L);
            model.setCounts(counts);
            model.setWorehouseCount(goodsModelNum);
            model.setSupplier(null);
@@ -324,11 +326,12 @@
                continue;
            }
            //根据物品型号查询物品库存
            int goodsNum = lWhGoodsService.queryGoodsModelNum(0, warehouseId, baseGoodsModelsId, 1, null);
            List<Long> warehouseIds = new ArrayList<>(Arrays.asList(warehouseId));
            int goodsNum = lWhGoodsService.queryGoodsModelNum(0, warehouseIds, baseGoodsModelsId, 1, null);
            //新增L_WH_PROCURE_MODEL记录
            LWhProcureModel lWhProcureModel = new LWhProcureModel();
            lWhProcureModel.setId(IdUtil.generateId());
            lWhProcureModel.setBusinessType(WhBusinessEnum.CHUKU.getValue() + 0);
            lWhProcureModel.setBusinessType(WhBusinessEnum.CHUKU.getValue());
            lWhProcureModel.setBusinessId(lWhFormOutputId);
            lWhProcureModel.setBaseGoodsModelsId(baseGoodsModelsId);
            lWhProcureModel.setCounts(counts);