feat: 报废明细

cy

2023-12-09 6665ddbc6dd0fe82ea3d47cd2bb5e48a5a27a712

feat: 报废明细

 admin-web/src/views/departmentitem/itemscr/scrappDetails/index.vue

@@ -126,7 +126,7 @@
      table: {
        showIndex: true, // 是否显示序号
        expand: false, // 是否显示详情数据
        url: SettingIplatform.apiBaseURL + '/pc/l/wh/form/scrapped/deptListByModel', // 请求地址
        url: SettingIplatform.apiBaseURL + '/pc/l/wh/form/scrapped/deptListByModel2', // 请求地址
        // 工具条
        tools: {
          columnsCtrl: {
@@ -158,7 +158,7 @@
            title: '操作时间', field: 'dealTime', align: 'center',
            width: 160,
            formatter: (row) => {
              return {value: DateFormatter.LongToDateTime(row.createTime)};
              return {value: DateFormatter.LongToDateTime(row.dealTime)};
            },
          },
        ],

 admin-web/src/views/stock/procure/purchaseOrder/index.vue

@@ -10,7 +10,7 @@
          <el-col>
            <!--列表-->
            <div class="table-tool-bar" style="margin-bottom: 15px">
              <my-button name="新增" @click="handleAdd" site="tools" size="medium" />
              <my-button name="新增"  check-permission="procure:order:add" @click="handleAdd" site="tools" size="medium" />
              <my-button name="导入" @click="importSetting.dialogShow = true" site="tools" size="medium" />
            </div>
            <div v-loading="loading" style="margin-bottom: 15px">

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

@@ -206,6 +206,27 @@
        return ResponseValue.success(export);
    }

    @GetMapping("/deptListByModel2")
    public ResponseValue deptListByModel2() {
        LDeptFormScrappedQry param = CommonUtil.getObjFromReq(LDeptFormScrappedQry.class);
        LDeptFormScrappedQry query = new LDeptFormScrappedQry();
        CommonUtil.copyProperties(param, query);
        param = query;

        FinSysTenantUser sysInfo = getSysInfo();
        if (sysInfo == null) {
            throw new RuntimeException("登录用户信息不存在");
        }
        /*当前登录人只能看到自己机构下的列表*/
        String tenantId = sysInfo.getTenantId();
        String paramAgencyId = param.getAgencyId();
        if (StringUtils.isEmpty(paramAgencyId) || !paramAgencyId.startsWith(tenantId)) {
            param.setAgencyId(tenantId);
        }
        return ResponseValue.success(depFormScrappedService.listByModel2(param));
    }


//    public static void main(String[] args) {
//        TemplateExportParams exportParams = new TemplateExportParams("D:\\MyProjects\\jmy\\低值易耗品\\low-consum-manage\\deploy-jar-single\\src\\main\\resources\\import\\deptScrapped.xlsx");
//        exportParams.setHeadingStartRow(2);

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

@@ -11,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;
@@ -27,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
@@ -347,6 +341,59 @@
        return select(sql.append(EXPORT_SQL_END).toString(), paramts, new MapperUtil());
    }

    public GenericPager<Map<String, Object>> listByModel2(LDeptFormScrappedQry param) {
        HashMap<String, Object> paramts = new HashMap<>();
        StringBuilder sql = new StringBuilder(EXPORT_SQL);
        //报废单id
        if (param.getId() != null) {
            sql.append(" and scrap.id = :id");
            paramts.put("id", param.getId());
        }
        //报废单号
        if (param.getBusinessFormCode() != null) {
            sql.append(" and scrap.BUSINESS_FORM_CODE= :businessFormCode");
            paramts.put("businessFormCode", param.getBusinessFormCode());
        }
        //物品名称
        if (StringUtils.isNotEmpty(param.getGoodsTemplateName())) {
            sql.append(" and model.BASE_GOODS_TEMPLATE_NAME LIKE :goodsTemplateName ");
            paramts.put("goodsTemplateName", StringUtils.CHAR_PERCENT + param.getGoodsTemplateName() + StringUtils.CHAR_PERCENT);
        }
        //规格型号
        if (param.getBaseGoodsModelsId() != null) {
            sql.append("and model.BASE_GOODS_MODELS_ID =:baseGoodsModelsId ");
            paramts.put("baseGoodsModelsId", param.getBaseGoodsModelsId());
        }

        //机构
        if (param.getAgencyId() != null) {
            sql.append(" and scrap.AGENCY_ID = :agencyId ");
            paramts.put("agencyId", param.getAgencyId());
        }
        // 部门 此处按的是物品使用部门 而不是 操作人所在部门
        if (param.getDepartmentId() != null) {
            sql.append(" and scrap.OUT_WAREHOUSE_ID= :departmentId");
            paramts.put("departmentId", param.getDepartmentId());
        }
        //创建人
        if (!StringUtils.isEmpty(param.getOperatorName())) {
            sql.append(" and scrap.OPERATOR_NAME LIKE :operatorName ");
            paramts.put("operatorName", StringUtils.CHAR_PERCENT + param.getOperatorName() + StringUtils.CHAR_PERCENT);
        }
        //报废时间
        if (param.getStartTime() != null) {
            sql.append(" and scrap.DEAL_TIME >=:dealTimeStart ");
            paramts.put("dealTimeStart", param.getStartTime() * 1000000);
        }
        if (param.getEndTime() != null) {
            sql.append(" and scrap.DEAL_TIME <:dealTimeEnd ");
            paramts.put("dealTimeEnd", param.getEndTime() * 1000000 + 240000);
        }
        return selectSplit(sql.append(EXPORT_SQL_END).toString(),paramts, param.getPageNum(), param.getPageSize(),  new MapperUtil());

//        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" +