feat: 部门物品报废

cy

2023-12-02 b7a353e571a503a3dfb970af069efc0a65208839

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

@@ -3,6 +3,7 @@
import cn.hutool.core.convert.Convert;
import com.consum.base.core.CodeGeneratorEnum;
import com.consum.base.core.CodeGeneratorService;
import com.consum.base.core.DepFormScrappedCoreServiceImpl;
import com.consum.base.core.utils.IdUtil;
import com.consum.base.core.utils.MapperUtil;
import com.consum.base.pojo.DepFormScrappedGoodsParam;
@@ -10,14 +11,7 @@
import com.consum.base.pojo.LDeptFormScrappedParam;
import com.consum.base.pojo.query.LDeptFormScrappedQry;
import com.consum.base.pojo.response.DepFormScrappedExtendVo;
import com.consum.model.po.BaseCategory;
import com.consum.model.po.DepFormScrapped;
import com.consum.model.po.DepFormScrappedGoods;
import com.consum.model.po.DepFormScrappedModel;
import com.consum.model.po.FinSysTenantDepartment;
import com.consum.model.po.FinSysTenantUser;
import com.consum.model.po.LWhFormTransfer;
import com.consum.model.po.SDictData;
import com.consum.model.po.*;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.iplatform.model.po.S_user_core;
import com.walker.db.page.GenericPager;
@@ -26,15 +20,16 @@
import com.walker.infrastructure.utils.StringUtils;
import com.walker.jdbc.service.BaseServiceImpl;
import com.walker.web.ResponseValue;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
import javax.annotation.Resource;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

/**
 * @ClassName DepFormScrappedServiceImpl
@@ -58,6 +53,9 @@
    private SDictDataServiceImpl sDictDataService;
    @Resource
    private BaseGoodsModelsServiceImpl baseGoodsModelsService;

    @Resource
    private DepFormScrappedCoreServiceImpl depFormScrappedCoreService;

    @Transactional
    public ResponseValue add(LDeptFormScrappedParam param, S_user_core currentUser, FinSysTenantUser sysInfo) {
@@ -188,6 +186,7 @@
        }
        int i = insertBatch(scrappedGoodsArrayList);
        int i2 = insertBatch(modelArrayList);
        depFormScrappedCoreService.updateScrapped(lWhFormScrappedId,currentUser,dealTime);
        return ResponseValue.success();
    }

@@ -272,7 +271,7 @@
        return scrappedExtend;
    }

    private static String EXPORT_SQL = "SELECT scrap.id,scrap.BUSINESS_FORM_CODE,model.BASE_GOODS_TEMPLATE_NAME,model.BASE_GOODS_MODELS_NAME,model.COUNTS,scrap.AGENCY_NAME,scrap.DEPARTMENT_NAME,scrap.OPERATOR_NAME,scrap.DEAL_TIME,scrap.OUT_WAREHOUSE_NAME,2 AS TOTAL_PRICE,model.SCRAPPED_NAME,NULL AS bz FROM DEP_FORM_SCRAPPED scrap LEFT JOIN DEP_FORM_SCRAPPED_MODEL model ON scrap.id=model.DEP_FORM_SCRAPPED_ID WHERE 1=1 ";
    private static String EXPORT_SQL = "SELECT scrap.id,scrap.BUSINESS_FORM_CODE,model.BASE_GOODS_TEMPLATE_NAME,model.BASE_GOODS_MODELS_NAME,model.COUNTS,scrap.AGENCY_NAME,scrap.DEPARTMENT_NAME,scrap.OPERATOR_NAME,scrap.DEAL_TIME,scrap.OUT_WAREHOUSE_NAME,ROUND( IFNULL( TOTAL_AMOUNT, 0 )/ 100, 2 ) AS TOTAL_PRICE,model.SCRAPPED_NAME,NULL AS bz FROM DEP_FORM_SCRAPPED scrap LEFT JOIN DEP_FORM_SCRAPPED_MODEL model ON scrap.id=model.DEP_FORM_SCRAPPED_ID WHERE 1=1 ";
    private static String EXPORT_SQL_END = "order by scrap.DEAL_TIME DESC";

    public List<Map<String, Object>> export(Long id, String agencyId) {
@@ -341,4 +340,26 @@
        }
        return select(sql.append(EXPORT_SQL_END).toString(), paramts, new MapperUtil());
    }

    private static String GET_BF_MODEL_LIST = "SELECT\n" +
            "\tscrGoods.TRANS_BUSINESS_ID,\n" +
            "\tscrGoods.BUSINESS_FORM_CODE,\n" +
            "\tscrGoods.TRANS_OUT_WAREHOUSE_TYPE,\n" +
            "\tscrGoods.TRANS_OUT_WAREHOUSE_ID,\n" +
            "\tgoodsModel.BASE_GOODS_TEMPLATE_ID,\n" +
            "\tgoodsModel.COUNTS,\n" +
            "\tgoodsModel.PROCURE_MODEL_USER_ID,\n" +
            "\tgoodsModel.GOODS_USER_NAME \n" +
            "FROM\n" +
            "\tDEP_FORM_SCRAPPED_GOODS scrGoods\n" +
            "\tLEFT JOIN DEP_FORM_SCRAPPED_MODEL goodsModel ON scrgoods.id = goodsModel.DEP_FORM_SCRAPPED_GOODS_ID";

    public List<Map<String, Object>> getBfModelList(Long lWhFormScrappedId) {
        HashMap<String, Object> paramts = new HashMap<>();
        StringBuilder sql = new StringBuilder(GET_BF_MODEL_LIST);
        //报废单id
        sql.append(" and scrGoods.DEP_FORM_SCRAPPED_ID = :lWhFormScrappedId");
        paramts.put("lWhFormScrappedId", lWhFormScrappedId);
        return select(sql.toString(), paramts, new MapperUtil());
    }
}