From b50140663ea7cfe4e8f9fd3be33987f60d09039b Mon Sep 17 00:00:00 2001 From: futian.liu <liufutianyoo@163.com> Date: 星期六, 09 十二月 2023 14:21:06 +0800 Subject: [PATCH] 修改出库单模板,修复出入库明细重复 --- deploy-jar-single/src/main/resources/import/出库单.xls | 0 consum-base/src/main/java/com/consum/base/pojo/excel/OutputExcelTemplate.java | 2 -- consum-base/src/main/java/com/consum/base/service/LWarehouseFlowService.java | 28 +++++++++++++++++++--------- consum-base/src/main/java/com/consum/base/controller/BaseGoodsModelsController.java | 7 ------- 4 files changed, 19 insertions(+), 18 deletions(-) diff --git a/consum-base/src/main/java/com/consum/base/controller/BaseGoodsModelsController.java b/consum-base/src/main/java/com/consum/base/controller/BaseGoodsModelsController.java index f84a751..bf69c9e 100644 --- a/consum-base/src/main/java/com/consum/base/controller/BaseGoodsModelsController.java +++ b/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); diff --git a/consum-base/src/main/java/com/consum/base/pojo/excel/OutputExcelTemplate.java b/consum-base/src/main/java/com/consum/base/pojo/excel/OutputExcelTemplate.java index 72003d6..400d674 100644 --- a/consum-base/src/main/java/com/consum/base/pojo/excel/OutputExcelTemplate.java +++ b/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 = "澶囨敞") diff --git a/consum-base/src/main/java/com/consum/base/service/LWarehouseFlowService.java b/consum-base/src/main/java/com/consum/base/service/LWarehouseFlowService.java index 6d59316..3fe3dfe 100644 --- a/consum-base/src/main/java/com/consum/base/service/LWarehouseFlowService.java +++ b/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); } diff --git "a/deploy-jar-single/src/main/resources/import/\345\207\272\345\272\223\345\215\225.xls" "b/deploy-jar-single/src/main/resources/import/\345\207\272\345\272\223\345\215\225.xls" index 54b87bb..fe14aae 100644 --- "a/deploy-jar-single/src/main/resources/import/\345\207\272\345\272\223\345\215\225.xls" +++ "b/deploy-jar-single/src/main/resources/import/\345\207\272\345\272\223\345\215\225.xls" Binary files differ -- Gitblit v1.9.1