修改出库单模板，修复出入库明细重复

futian.liu

2023-12-09 b50140663ea7cfe4e8f9fd3be33987f60d09039b

修改出库单模板，修复出入库明细重复

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

@@ -125,13 +125,6 @@

    @GetMapping("query/goodsModel")
    public ResponseValue queryGoodsModelByGoodsTemplatesId(Long goodsTemplatesId) {
//        S_user_core currentUser = this.getCurrentUser();
//        if (currentUser == null) {
//            return ResponseValue.error("登录用户信息不存在");
//        }
//        if (goodsTemplatesId == null) {
//            return ResponseValue.error("物品id不存在");
//        }
        BaseGoodsModels baseGoodsModels = new BaseGoodsModels();
        baseGoodsModels.setGoodsTemplatesId(goodsTemplatesId);
        List<BaseGoodsModels> result = this.baseGoodsModelsService.select(baseGoodsModels);

 consum-base/src/main/java/com/consum/base/pojo/excel/OutputExcelTemplate.java

@@ -22,8 +22,6 @@
    private String baseModelName;
    @Excel(name = "数量")
    private Integer num;
    @Excel(name = "单价")
    private Integer price;
    @Excel(name = "金额")
    private Double amount;
    @Excel(name = "备注")

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

@@ -1,20 +1,25 @@
package com.consum.base.service;

import java.util.HashMap;
import java.util.List;
import java.util.Map;

import org.apache.commons.compress.utils.Lists;
import org.springframework.stereotype.Service;

import com.consum.base.core.WhBusinessEnum;
import com.consum.base.core.type.MixType;
import com.consum.base.core.utils.*;
import com.consum.base.core.utils.CurrencyUtil;
import com.consum.base.core.utils.MapRowMapper;
import com.consum.base.core.utils.MapUtils;
import com.consum.base.core.utils.MapperUtil;
import com.consum.base.core.utils.PageUtil;
import com.consum.base.pojo.LWarehouseFlowParam;
import com.consum.base.pojo.query.LWhFormOutputQry;
import com.consum.base.pojo.response.OutAndInDetailVO;
import com.walker.db.page.GenericPager;
import com.walker.infrastructure.utils.StringUtils;
import com.walker.jdbc.service.BaseServiceImpl;
import org.apache.commons.compress.utils.Lists;
import org.springframework.stereotype.Service;

import java.util.HashMap;
import java.util.List;
import java.util.Map;

/**
 * @ClassName LWarehouseFlowService
@@ -370,7 +375,8 @@
                + "flow.DEAL_TIME,\n"
                + "flow.OPERATOR_NAME,\n"
                + "record.TOTAL_PRICE\n"
                + "FROM  L_WAREHOUSE_FLOW flow\n"
                + "FROM ( SELECT * FROM BASE_WAREHOUSE WHERE 1= 1 AND AGENCY_ID =:tenantId ) bw "
                + "LEFT JOIN L_WAREHOUSE_FLOW flow ON bw.id = flow.WAREHOUSE_ID AND flow.WAREHOUSE_TYPE = 0\n"
                + "LEFT JOIN L_WH_GOODS_RECORD record ON flow.id=record.WAREHOUSE_FLOW_ID\n"
                + "LEFT JOIN L_WH_FORM_PROCURE tCaiGou ON flow.BUSINESS_TYPE=1 AND tCaiGou.id=flow.BUSINESS_FORM_ID\n"
                + "LEFT JOIN L_WH_FORM_TRANSFER tTrans ON (flow.BUSINESS_TYPE=2 or flow.BUSINESS_TYPE=4) AND tTrans.id=flow.BUSINESS_FORM_ID\n"
@@ -378,13 +384,17 @@
                + "LEFT JOIN L_WH_FORM_INVENTORY tInventory ON flow.BUSINESS_TYPE=7 AND tInventory.id=flow.BUSINESS_FORM_ID\n"
                + "LEFT JOIN L_WH_FORM_SCRAPPED tScrapped ON flow.BUSINESS_TYPE=5 AND tScrapped.id=flow.BUSINESS_FORM_ID\n"
                + "LEFT JOIN USING_FORM_BACK tBack ON flow.BUSINESS_TYPE=6 AND tBack.id=flow.BUSINESS_FORM_ID\n"
                + "LEFT JOIN base_warehouse bw ON flow.WAREHOUSE_ID = bw.id\n"
                //+ "LEFT JOIN base_warehouse bw ON flow.WAREHOUSE_ID = bw.id\n"
                + "LEFT JOIN fin_sys_tenant fst ON fst.id = bw.AGENCY_ID\n"
                + "WHERE record.id IS NOT NULL ");

        HashMap<String, Object> paramts = new HashMap<>();
        //机构
        if (param.getAgencyId() != null) {
            paramts.put("tenantId", param.getAgencyId());
        }
        //机构
        if (param.getAgencyId() != null) {
            sql.append("AND fst.id like :agencyId ");
            paramts.put("agencyId", param.getAgencyId() + StringUtils.CHAR_PERCENT);
        }

 deploy-jar-single/src/main/resources/import/³ö¿âµ¥.xls

Binary files differ