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

futian.liu

2023-12-20 1b8db0473522c886428767f7eeaaf7f52d47ce42

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

 admin-web/src/views/stock/inventorycount/inventorytask/edit.vue

@@ -11,7 +11,7 @@
        />
      </el-form-item>
      <el-form-item label="盘点仓库" prop="warehouseId">
        <el-select v-model="formData.warehouseId" placeholder="请选择" style="width: 100%">
        <el-select @change="getPdr" v-model="formData.warehouseId" placeholder="请选择" style="width: 100%">
          <el-option v-for="item in warehouseOptions" :key="item.id" :label="item.warehouseName" :value="item.id" />
        </el-select>
      </el-form-item>
@@ -97,7 +97,7 @@
      this.formData.businessFormName = formatDate(new Date(), 'yyyy年MM月份盘点');
    }
    this.handleSelectTenantWarehouse();
    this.getPdr();
    //this.getPdr();
    this.getJpr();
  },
  methods: {
@@ -113,7 +113,7 @@
    },
    // 获取盘点人
    getPdr() {
      warehouseManagerList({ tenantId: this.userInfo.tenantId }).then((res) => {
      warehouseManagerList({ warehouseId: this.formData.warehouseId }).then((res) => {
        this.count++
        this.operatorOptions = res;
        if(this.count>1){

 consum-base/src/main/java/com/consum/base/controller/LWhFormTransferController.java

@@ -124,11 +124,10 @@
        if (transferBusinessType == 1) {
            // 先出库，再入库
            // 出库前 设置出库仓库
            List<LWhProcureModel> modelByForm = lWhProcureModelService.getModelByForm(WhBusinessEnum.DIAOBO, id);
            List<LWhProcureModel> modelByForm = lWhProcureModelService.getModelByForm(WhBusinessEnum.BUMENFENFA, id);
            Set<Long> baseModelIds =
                modelByForm.stream().map(LWhProcureModel::getBaseGoodsModelsId).collect(Collectors.toSet());

            // TODO 不同库处理
            FinSysTenantUser sysTenantUser = this.getSysInfo();
            String agencyId = sysTenantUser.getTenantId();
            List<BaseWarehouse> baseWarehouseList =
@@ -140,14 +139,6 @@
            if (ObjectUtils.isEmpty(goodsInfoDTO)) {
                return ResponseValue.error("该型号没有库存可使用");
            }
            // FinSysTenantUser sysTenantUser = this.getSysInfo();
            // String agencyId = sysTenantUser.getTenantId();
            // List<BaseWarehouse> baseWarehouseList =
            // baseWarehouseService.getBaseWareHouseList(Long.valueOf(agencyId), (short)1, (short)1);
            // if (CollectionUtils.isEmpty(baseWarehouseList)) {
            // return ResponseValue.error("机构无默认仓库！");
            // }
            // BaseWarehouse baseWarehouse = baseWarehouseList.get(0);

            Long wareHouseId = goodsInfoDTO.getWarehouseId();
            String warehouseName = goodsInfoDTO.getWarehouseName();
@@ -295,7 +286,6 @@
        Set<Long> baseModelIds =
            modelByForm.stream().map(LWhProcureModel::getBaseGoodsModelsId).collect(Collectors.toSet());

        // TODO 不同库处理且为本机构的仓库物品
        FinSysTenantUser sysTenantUser = this.getSysInfo();
        String agencyId = sysTenantUser.getTenantId();
        List<BaseWarehouse> baseWarehouseList =
@@ -305,14 +295,6 @@
        // 通过调拨单中的型号id查询出该型号物品所在的仓库位置
        List<GoodsInfoDTO> goodsInfoDTOS = lWhGoodsService.queryGoodsInfo(baseModelIds, wareHouseIds);
        GoodsInfoDTO goodsInfoDTO = goodsInfoDTOS.stream().findFirst().orElse(null);
        // 出库前 设置出库仓库
        // FinSysTenantUser sysTenantUser = this.getSysInfo();
        // String agencyId = sysTenantUser.getTenantId();
        // List<BaseWarehouse> baseWarehouseList =
        // baseWarehouseService.getBaseWareHouseList(Long.valueOf(agencyId), (short)1, (short)1);
        // if (CollectionUtils.isEmpty(baseWarehouseList)) {
        // return ResponseValue.error("机构无默认仓库！");
        // }
        if (ObjectUtils.isEmpty(goodsInfoDTO)) {
            return ResponseValue.error("该型号没有库存可使用");
        }

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

@@ -331,7 +331,7 @@
            //新增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);

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

@@ -342,19 +342,29 @@
            return null;
        }
        Long warehouseId = inventory.getWarehouseId();
        Integer warehouseType = inventory.getWarehouseType();

        formInventoryVO.setBusinessFormCode(inventory.getBusinessFormCode());
        formInventoryVO.setBusinessFormName(inventory.getBusinessFormName());
        formInventoryVO.setWarehouseId(warehouseId);
        formInventoryVO.setWarehouseName(inventory.getWarehouseName());

        // 统计仓库内的物品
        String sql =
            "select bgt.id baseGoodsTemplateId,bgm.id baseGoodsModelId,bgt.GOODS_NAME goodsTemplateName,bgm.MODEL_NAME baseGoodsModelsName,bgt.CLASSIFICATION type,bgm.UNIT "
                + "from base_goods_models bgm left join base_goods_template bgt on bgm.GOODS_TEMPLATES_ID = bgt.id "
                + "where bgt.AGENCY_ID = :agencyId";
            "SELECT distinct bgt.id baseGoodsTemplateId,bgm.id baseGoodsModelId,bgt.GOODS_NAME goodsTemplateName,bgm.MODEL_NAME baseGoodsModelsName,"
                + "bgt.CLASSIFICATION TYPE,bgm.UNIT FROM l_wh_goods g "
                + "LEFT JOIN base_goods_template bgt ON g.BASE_GOODS_TEMPLATE_ID = bgt.ID "
                + "LEFT JOIN base_goods_models bgm ON bgm.GOODS_TEMPLATES_ID = bgt.id WHERE "
                + "WAREHOUSE_ID = :warehouseId ";
        HashMap<String, Object> param = new HashMap<>();
        param.put("agencyId", inventory.getAgencyId());
        param.put("warehouseId", warehouseId);

        // String sql =
        // "select bgt.id baseGoodsTemplateId,bgm.id baseGoodsModelId,bgt.GOODS_NAME goodsTemplateName,bgm.MODEL_NAME
        // baseGoodsModelsName,bgt.CLASSIFICATION type,bgm.UNIT "
        // + "from base_goods_models bgm left join base_goods_template bgt on bgm.GOODS_TEMPLATES_ID = bgt.id "
        // + "where bgt.AGENCY_ID = :agencyId";
        // HashMap<String, Object> param = new HashMap<>();
        // param.put("agencyId", inventory.getAgencyId());
        List<Map<String, Object>> result = this.select(sql, param, new MapperUtil());
        List<FormInventoryGoodsVO> goodsVOList = Lists.newArrayList();
        result.forEach(item -> {

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

@@ -20,6 +20,7 @@
import com.consum.base.core.type.GoodsModelType;
import com.consum.base.core.type.InAndOutPutType;
import com.consum.base.core.type.OutPutStatesType;
import com.consum.base.core.type.WareHouseType;
import com.consum.base.core.utils.CurrencyUtil;
import com.consum.base.core.utils.IdUtil;
import com.consum.base.core.utils.MapUtils;
@@ -132,9 +133,8 @@
                lWhProcureModel.setCounts(model.getCounts());
                // 根据物品型号查询物品库存
                List<Long> warehouseIds = new ArrayList<>(Arrays.asList(warehouseId));
                // 查询库存时不区分机构和部门
                int goodsNum =
                    this.lWhGoodsService.queryGoodsModelNum(null, warehouseIds, model.getBaseGoodsModelsId(), 1, null);
                int goodsNum = this.lWhGoodsService.queryGoodsModelNum(WareHouseType.TENANT.getValue(), warehouseIds,
                    model.getBaseGoodsModelsId(), 1, null);
                lWhProcureModel.setWorehouseCount(goodsNum);
                modelList.add(lWhProcureModel);
            }

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

@@ -361,7 +361,9 @@
            "SELECT distinct WAREHOUSE_ID,WAREHOUSE_NAME from L_WH_GOODS where base_goods_models_id in (:baseGoodsModelsIds) "
                + "and WAREHOUSE_TYPE =0 and BUY_TYPE =1 and states =1 and WAREHOUSE_ID in (:wareHouseIds)");
        Map<String, Object> param = new HashMap<>();
        param.put("baseGoodsModelsIds", baseModelIds);
        if (!CollectionUtils.isEmpty(baseModelIds)) {
            param.put("baseGoodsModelsIds", baseModelIds);
        }
        param.put("wareHouseIds", wareHouseIds);
        List<Map<String, Object>> result = this.select(sql.toString(), param, new MapperUtil());
        result.forEach(item -> {