盘点查询返回结果修改

futian.liu

2023-12-02 c1ac6d13630b04b4e11d6f383858e4f8fa64f924

盘点查询返回结果修改

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

@@ -4,7 +4,7 @@
import com.consum.base.core.utils.CommonUtil;
import com.consum.base.pojo.BaseCategoryParam;
import com.consum.base.pojo.ProjectTreeResult;
import com.consum.base.service.BaseCategoryServiceImpl;
import com.consum.base.service.BaseCategoryService;
import com.consum.base.service.BaseGoodsTemplateServiceImpl;
import com.consum.model.po.BaseCategory;
import com.iplatform.model.po.S_user_core;
@@ -35,7 +35,7 @@
public class BaseCategoryController extends BaseController {

    @Autowired
    private BaseCategoryServiceImpl baseCategoryService;
    private BaseCategoryService baseCategoryService;

    @Autowired
    private BaseGoodsTemplateServiceImpl baseGoodsTemplateService;

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

@@ -13,7 +13,7 @@
import com.consum.base.pojo.response.FormInventoryGoodsVO;
import com.consum.base.pojo.response.FormInventoryVO;
import com.consum.base.service.FinSysTenantUserServiceImpl;
import com.consum.base.service.LWhFormInventoryServiceImpl;
import com.consum.base.service.LWhFormInventoryService;
import com.consum.model.po.FinSysTenantUser;
import com.consum.model.po.LWhFormInventory;
import com.iplatform.model.po.S_user_core;
@@ -52,7 +52,7 @@
public class LWhFormInventoryController extends BaseController {

    @Autowired
    private LWhFormInventoryServiceImpl lWhFormInventoryService;
    private LWhFormInventoryService lWhFormInventoryService;
    @Autowired
    private FinSysTenantUserServiceImpl finSysTenantUserService;

@@ -86,7 +86,7 @@
        FinSysTenantUser monitorUserInfo = new FinSysTenantUser();
        monitorUserInfo.setId(param.getMonitorUserId());
        FinSysTenantUser monitorUser = finSysTenantUserService.get(monitorUserInfo);
        int result = this.lWhFormInventoryService.add(param, this.getSysInfo(), operatorUser, monitorUser);
        int result = lWhFormInventoryService.add(param, this.getSysInfo(), operatorUser, monitorUser);
        if (result > 0) {
            return ResponseValue.success();
        }
@@ -113,7 +113,7 @@
        if (sysInfo == null) {
            return ResponseValue.error("登录用户信息不存在");
        }
        GenericPager<LWhFormInventory> pager = this.lWhFormInventoryService.queryList(param, sysInfo);
        GenericPager<LWhFormInventory> pager = lWhFormInventoryService.queryList(param, sysInfo);
        return ResponseValue.success(pager);
    }

@@ -132,10 +132,10 @@
            return ResponseValue.error("参数不能为空");
        }
        //通过机构查询相关的模板信息
        FormInventoryVO formInventoryVO = this.lWhFormInventoryService.queryInventBaseGoodTemplate(id);
        FormInventoryVO formInventoryVO = lWhFormInventoryService.queryInventBaseGoodTemplate(id);

        // 保存后返回记录信息
        List<FormInventoryGoodsVO> result = this.lWhFormInventoryService.saveInventory(formInventoryVO, id);
        FormInventoryVO result = lWhFormInventoryService.saveInventory(formInventoryVO, id);
        return ResponseValue.success(result);
    }

@@ -175,7 +175,7 @@
        FinSysTenantUser monitorUserInfo = new FinSysTenantUser();
        monitorUserInfo.setId(param.getMonitorUserId());
        FinSysTenantUser monitorUser = finSysTenantUserService.get(monitorUserInfo);
        int result = this.lWhFormInventoryService.add(param, this.getSysInfo(), operatorUser, monitorUser);
        int result = lWhFormInventoryService.add(param, this.getSysInfo(), operatorUser, monitorUser);

        if (result > 0) {
            return ResponseValue.success();
@@ -233,7 +233,7 @@
            return ResponseValue.error("参数错误");
        }

        int num = this.lWhFormInventoryService.updateInventoryInfo(param, 1, null, null);
        int num = lWhFormInventoryService.updateInventoryInfo(param, 1, null, null);
        return num > 0 ? ResponseValue.success(1) : ResponseValue.error("暂存失败！");
    }

@@ -259,7 +259,7 @@
        }
        S_user_core currentUser = this.getCurrentUser();
        FinSysTenantUser sysInfo = this.getSysInfo();
        int num = this.lWhFormInventoryService.updateInventoryInfo(param, 2, currentUser, sysInfo);
        int num = lWhFormInventoryService.updateInventoryInfo(param, 2, currentUser, sysInfo);

        return num > 0 ? ResponseValue.success(1) : ResponseValue.error("盘点失败！");
    }
@@ -284,7 +284,7 @@
        if (sysInfo == null) {
            return ResponseValue.error("登录用户信息不存在");
        }
        PageUtil<FormInventoryDetailVO> result = this.lWhFormInventoryService.queryPdDetailList(param, sysInfo);
        PageUtil<FormInventoryDetailVO> result = lWhFormInventoryService.queryPdDetailList(param, sysInfo);
        return ResponseValue.success(result);
    }

@@ -302,12 +302,12 @@

        LWhFormInventory lWhFormInventory = new LWhFormInventory();
        lWhFormInventory.setId(id);
        LWhFormInventory item = this.lWhFormInventoryService.get(lWhFormInventory);
        LWhFormInventory item = lWhFormInventoryService.get(lWhFormInventory);
        if (Objects.isNull(item)) {
            return ResponseValue.error("盘点单不存在");
        }
        BeanUtils.copyProperties(item, formInventoryVO);
        List<FormInventoryGoodsVO> formInventoryGoodsVOS = this.lWhFormInventoryService.selectDetailById(id);
        List<FormInventoryGoodsVO> formInventoryGoodsVOS = lWhFormInventoryService.selectDetailById(id);
        formInventoryVO.setFormInventoryGoodsList(formInventoryGoodsVOS);
        return ResponseValue.success(formInventoryVO);
    }

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

@@ -426,6 +426,7 @@
            }

        }
        // TODO 使用人修改调用

        return ResponseValue.success();
    }
@@ -497,19 +498,6 @@
        return ResponseValue.success(result);
    }


    @ApiOperation(value = "查询部门下的分发单", notes = "查询部门下的分发单")
    @ApiImplicitParams({
        @ApiImplicitParam(name = "agencyId", value = "机构id", required = true, dataType = "Long", paramType = "query")
    })
    @GetMapping("/query/detail")
    public ResponseValue queryDepartmentTransferOrder(Long agencyId) {

        TransferInfoVO transferInfoVO = new TransferInfoVO();

        lWhFormTransferService.queryDepartmentTransferOrder();
        return ResponseValue.success(transferInfoVO);
    }

    @ApiOperation(value = "查询部门下的分发单", notes = "查询部门下的分发单")
    @ApiImplicitParams({

 consum-base/src/main/java/com/consum/base/core/service/LWhWarningCoreServiceImpl.java

@@ -8,16 +8,15 @@
import com.consum.model.po.BaseWarehouse;
import com.consum.model.po.FinSysTenantUser;
import com.consum.model.po.WhWarning;
import org.apache.commons.collections4.CollectionUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Propagation;
import org.springframework.transaction.annotation.Transactional;

import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
import javax.annotation.Resource;
import org.apache.commons.collections4.CollectionUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Propagation;
import org.springframework.transaction.annotation.Transactional;


/**
@@ -59,8 +58,8 @@
            return;
        }
        List<Long> allChangModelList = baseModelIdList.stream()
                .distinct()
                .collect(Collectors.toList());
            .distinct()
            .collect(Collectors.toList());
        baseModelIdList = allChangModelList;

        // 将数据插入库存预警【WH_WARNING】
@@ -116,7 +115,6 @@
    private String KU_CUN_NORMAL_MODEL = "update WH_WARNING set STATES=2 where WAREHOUSE_TYPE=? and BASE_WAREHOUSE_ID=?";

    /**
     *
     * @param warehouseType
     * @param warehouseId
     * @param normalBaseModelIdList 库存正常的
@@ -132,7 +130,7 @@

        StringBuilder sql = new StringBuilder(KU_CUN_NORMAL_MODEL);
        if (!org.springframework.util.CollectionUtils.isEmpty(normalBaseModelIdList)) {
            sql.append(" and BASE_GOODS_MODELS_ID in(").append( org.apache.commons.lang3.StringUtils.join(normalBaseModelIdList, ",")).append(")");
            sql.append(" and BASE_GOODS_MODELS_ID in(").append(org.apache.commons.lang3.StringUtils.join(normalBaseModelIdList, ",")).append(")");
        }
        return lWhWarningService.update(sql.toString(), params.toArray());
    }

 consum-base/src/main/java/com/consum/base/service/BaseGoodsTemplateServiceImpl.java

@@ -31,7 +31,7 @@
    @Autowired
    private CodeGeneratorService codeGeneratorService;
    @Autowired
    private BaseCategoryServiceImpl baseCategoryService;
    private BaseCategoryService baseCategoryService;
    @Autowired
    private BaseGoodsModelsServiceImpl baseGoodsModelsService;


 consum-base/src/main/java/com/consum/base/service/DepFormScrappedServiceImpl.java

@@ -53,7 +53,7 @@
    @Resource
    private LWhFormTransferService lWhFormTransferService;
    @Resource
    private BaseCategoryServiceImpl baseCategoryService;
    private BaseCategoryService baseCategoryService;
    @Resource
    private SDictDataServiceImpl sDictDataService;
    @Resource

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

@@ -41,7 +41,7 @@
    private LWhProcureModelService lWhProcureModelService;
    private BaseGoodsTemplateServiceImpl baseGoodsTemplateService;
    private LWhGoodsService lWhGoodsService;
    private LWhFormInventoryServiceImpl lWhFormInventoryService;
    private LWhFormInventoryService lWhFormInventoryService;
    private LWhFormProcureCoreService lWhFormProcureCoreService;
    private LWhFormOutputServiceImpl lWhFormOutputService;

@@ -55,7 +55,7 @@
                                       LWhProcureModelService lWhProcureModelService,
                                       BaseGoodsTemplateServiceImpl baseGoodsTemplateService,
                                       LWhGoodsService lWhGoodsService,
                                       LWhFormInventoryServiceImpl lWhFormInventoryService,
                                       LWhFormInventoryService lWhFormInventoryService,
                                       LWhFormProcureCoreService lWhFormProcureCoreService,
                                       LWhFormOutputServiceImpl lWhFormOutputService


 consum-base/src/main/java/com/consum/base/service/LWhFormInventoryService.java

New file
@@ -0,0 +1,56 @@
package com.consum.base.service;

import com.consum.base.core.utils.PageUtil;
import com.consum.base.pojo.excel.InventoryExcelTemplate;
import com.consum.base.pojo.query.LWhFormInventoryQry;
import com.consum.base.pojo.request.FormInventoryParam;
import com.consum.base.pojo.request.LWhFormInventoryParam;
import com.consum.base.pojo.response.FormInventoryDetailVO;
import com.consum.base.pojo.response.FormInventoryGoodsVO;
import com.consum.base.pojo.response.FormInventoryVO;
import com.consum.model.po.FinSysTenantUser;
import com.consum.model.po.LWhFormInventory;
import com.iplatform.model.po.S_user_core;
import com.walker.db.page.GenericPager;
import com.walker.jdbc.service.BaseService;
import java.util.List;

public interface LWhFormInventoryService extends BaseService {

    int add(FormInventoryParam param, FinSysTenantUser currentUser, FinSysTenantUser operatorUser, FinSysTenantUser monitorUser);

    /**
     * @Description 盘点单列表查询
     * @Author 卢庆阳
     * @Date 2023/10/31
     */
    GenericPager<LWhFormInventory> queryList(LWhFormInventoryQry param, FinSysTenantUser sysInfo);


    FormInventoryVO saveInventory(FormInventoryVO dto, Long id);


    /**
     * 保存盘点信息
     *
     * @author 卢庆阳
     * @date 2023/10/31
     */
    int updateInventoryInfo(LWhFormInventoryParam dto, Integer state, S_user_core currentUser, FinSysTenantUser sysInfo);


    /**
     * @return
     * @Description 异常明细列表查询
     * @Author 卢庆阳
     * @Date 2023/11/1
     */
    PageUtil<FormInventoryDetailVO> queryPdDetailList(LWhFormInventoryQry param, FinSysTenantUser sysInfo);

    List<FormInventoryGoodsVO> selectDetailById(Long id);

    FormInventoryVO queryInventBaseGoodTemplate(Long id);

    List<InventoryExcelTemplate> getExportList(Long id);

}

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

@@ -41,7 +41,7 @@
 */
@Slf4j
@Service
public class LWhFormInventoryServiceImpl extends BaseServiceImpl {
public class LWhFormInventoryServiceImpl extends BaseServiceImpl implements LWhFormInventoryService {

    @Autowired
    private CodeGeneratorService codeGeneratorService;
@@ -83,6 +83,7 @@
     * @Author 卢庆阳
     * @Date 2023/10/31
     */
    @Override
    public int add(FormInventoryParam param, FinSysTenantUser currentUser, FinSysTenantUser operatorUser, FinSysTenantUser monitorUser) {
        //新增盘点单
        LWhFormInventory lWhFormInventory = new LWhFormInventory();
@@ -121,6 +122,7 @@
     * @Author 卢庆阳
     * @Date 2023/10/31
     */
    @Override
    public GenericPager<LWhFormInventory> queryList(LWhFormInventoryQry param, FinSysTenantUser sysInfo) {
        StringBuilder sql = new StringBuilder(QUERY_LIST);
        HashMap<String, Object> paramts = new HashMap<>();
@@ -158,7 +160,8 @@
    }


    public List<FormInventoryGoodsVO> saveInventory(FormInventoryVO dto, Long id) {
    @Override
    public FormInventoryVO saveInventory(FormInventoryVO dto, Long id) {
        //1.根据盘点单id查询盘点单
        LWhFormInventory lWhFormInventory = this.get(new LWhFormInventory(id));
        if (lWhFormInventory == null) {
@@ -177,8 +180,8 @@
            log.error("盘点单物品为空");
        }
        List<FormInventoryGoodsVO> result = inventoryGoodsService.add(formInventoryGoodsList, id);

        return result;
        dto.setFormInventoryGoodsList(result);
        return dto;
    }


@@ -189,6 +192,7 @@
     * @date 2023/10/31
     */
    @Transactional(rollbackFor = Exception.class)
    @Override
    public int updateInventoryInfo(LWhFormInventoryParam dto, Integer state, S_user_core currentUser, FinSysTenantUser sysInfo) {
        //1.根据盘点单id查询盘点单
        LWhFormInventory lWhFormInventory = this.get(new LWhFormInventory(dto.getId()));
@@ -233,6 +237,7 @@
     * @Author 卢庆阳
     * @Date 2023/11/1
     */
    @Override
    public PageUtil<FormInventoryDetailVO> queryPdDetailList(LWhFormInventoryQry param, FinSysTenantUser sysInfo) {
        StringBuilder sql = new StringBuilder(QUERY_PD_DETAIL_LIST);
        HashMap<String, Object> paramts = new HashMap<>();
@@ -303,6 +308,7 @@
        return pageUtil;
    }

    @Override
    public List<FormInventoryGoodsVO> selectDetailById(Long id) {

        String sql = "select fig.id, fig.BASE_GOODS_TEMPLATE_ID,fig.GOODS_TEMPLATE_NAME,fig.BASE_GOODS_MODELS_NAME,"
@@ -319,6 +325,7 @@
        return result;
    }

    @Override
    public FormInventoryVO queryInventBaseGoodTemplate(Long id) {
        FormInventoryVO formInventoryVO = new FormInventoryVO();

@@ -354,6 +361,7 @@
        return formInventoryVO;
    }

    @Override
    public List<InventoryExcelTemplate> getExportList(Long id) {
        String sql = "SELECT\n"
            + "\tfi.INVENTORY_DATE createTime,\n"

 consum-base/src/main/java/com/consum/base/service/LWhFormOutputCoreService.java

@@ -222,7 +222,11 @@
        goodsModelNumList.forEach(itemModelInfo -> {
            // 需要调拨的物品的某个型号
            Long baseGoodsModelsId = itemModelInfo.getBaseGoodsModelsId();
            allChangModelList.add(baseGoodsModelsId);

            //TODO 为空时不加入更新列表
            if (baseGoodsModelsId != null) {
                allChangModelList.add(baseGoodsModelsId);
            }
            // 需要调拨的物品某个型号的数量
            Integer counts = itemModelInfo.getCounts();


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

File was renamed from consum-base/src/main/java/com/consum/base/service/BaseCategoryServiceImpl.java
@@ -1,9 +1,10 @@
package com.consum.base.service;
package com.consum.base.service.impl;

import com.consum.base.Constants;
import com.consum.base.core.utils.IdUtil;
import com.consum.base.pojo.BaseCategoryParam;
import com.consum.base.pojo.ProjectTreeResult;
import com.consum.base.service.BaseCategoryService;
import com.consum.model.po.BaseCategory;
import com.iplatform.model.po.S_user_core;
import com.walker.db.page.GenericPager;
@@ -23,7 +24,7 @@
 * @Date 2023/10/23
 */
@Service
public class BaseCategoryServiceImpl extends BaseServiceImpl {
public class BaseCategoryServiceImpl extends BaseServiceImpl implements BaseCategoryService {

    private static final String QUERY_TREE_ALL = "select * from base_category where states = 1  order by FATHER_CATEGORY_ID, LEVELS ASC";


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

@@ -18,7 +18,7 @@
import com.consum.base.pojo.response.UsingFormBackGoodsTemplateInfo;
import com.consum.base.pojo.response.UsingFormBackModelInfo;
import com.consum.base.pojo.response.UsingFormBackVO;
import com.consum.base.service.BaseCategoryServiceImpl;
import com.consum.base.service.BaseCategoryService;
import com.consum.base.service.FinSysTenantDepartmentService;
import com.consum.base.service.LWhFormTransferService;
import com.consum.base.service.UsingFormBackGoodsService;
@@ -58,7 +58,7 @@
    @Autowired
    private CodeGeneratorService codeGeneratorService;
    @Autowired
    private BaseCategoryServiceImpl baseCategoryService;
    private BaseCategoryService baseCategoryService;
    @Autowired
    private UsingFormBackModelService usingFormBackModelService;
    @Autowired