From 209d9c6f60d96fc29fad0bd2f9dad8fe8424f91f Mon Sep 17 00:00:00 2001
From: futian.liu <liufutianyoo@163.com>
Date: 星期五, 17 十一月 2023 18:10:47 +0800
Subject: [PATCH] 调拨管理
---
consum-base/src/main/java/com/consum/base/service/LWhFormTransferServiceImpl.java | 75 +++++++++++++++++++++++++++++++++++--
1 files changed, 70 insertions(+), 5 deletions(-)
diff --git a/consum-base/src/main/java/com/consum/base/service/LWhFormTransferServiceImpl.java b/consum-base/src/main/java/com/consum/base/service/LWhFormTransferServiceImpl.java
index c0ca71b..a9be7ec 100644
--- a/consum-base/src/main/java/com/consum/base/service/LWhFormTransferServiceImpl.java
+++ b/consum-base/src/main/java/com/consum/base/service/LWhFormTransferServiceImpl.java
@@ -100,6 +100,7 @@
log.error("浠撳簱涓嶅瓨鍦�");
throw new Exception("浠撳簱涓嶅瓨鍦�");
}
+ lWhFormTransfer.setInWarehouseId(warehouse.getId());
lWhFormTransfer.setInWarehouseName(warehouse.getWarehouseName());
lWhFormTransfer.setInAgencyId(Long.valueOf(tenantId));
lWhFormTransfer.setInAgencyName(sysInfo.getTenantName());
@@ -157,10 +158,8 @@
if (baseGoodsModels != null) {
lWhProcureModel.setBaseGoodsModelsName(baseGoodsModels.getModelName());
}
- // TODO 浠锋牸
- lWhProcureModel.setPrice(10L);
//鏍规嵁鐗╁搧鍨嬪彿鏌ヨ鐗╁搧搴撳瓨
- int goodsNum = this.lWhGoodsService.queryGoodsModelNum(0, warehouseId, model.getBaseGoodsModelsId(), (short) 1, null);
+ int goodsNum = this.lWhGoodsService.queryGoodsModelNum(0, warehouseId, model.getBaseGoodsModelsId(), 1, null);
lWhProcureModel.setWorehouseCount(goodsNum);
//3.褰撲笟鍔＄被鍨嬩负閮ㄩ棬鍒嗗彂鏃� 娣诲姞閮ㄩ棬鍒嗗彂璁板綍鍜屼娇鐢ㄤ汉
@@ -401,9 +400,9 @@
paramts.put("goodsName", StringUtils.CHAR_PERCENT + transferQry.getGoodsTemplateName() + StringUtils.CHAR_PERCENT);
}
// 瑙勬牸鍨嬪彿
- if (transferQry.getBaseGoodsTemplateId() != null) {
+ if (transferQry.getBaseGoodsModelsId() != null) {
sql.append("AND bgm.id =:goodsModelId ");
- paramts.put("goodsModelId", transferQry.getBaseGoodsTemplateId());
+ paramts.put("goodsModelId", transferQry.getBaseGoodsModelsId());
}
//璋冩嫧鏈烘瀯
if (transferQry.getOutAgencyId() != null) {
@@ -434,4 +433,70 @@
}
+ public GenericPager<Map<String, Object>> queryFormTransferDetailList(TransferQry param) {
+
+ HashMap<String, Object> params = new HashMap<>();
+ StringBuilder sql = new StringBuilder("SELECT ft.id,\n"
+ + " ft.BUSINESS_FORM_CODE,\n"
+ + " bgt.GOODS_NAME,\n"
+ + " bgt.CLASSIFICATION,\n"
+ + " pm.BASE_GOODS_MODELS_NAME,\n"
+ + " pm.COUNTS,\n"
+ + " ft.IN_AGENCY_NAME,\n"
+ + " ft.OPERATOR_NAME,\n"
+ + " ft.CREATE_TIME,\n"
+ + " ft.IN_TIME,\n"
+ + " ft.OUT_AGENCY_NAME,\n"
+ + " ft.OUT_OPERATOR_NAME,\n"
+ + " ft.OUTPUT_TIME\n"
+ + "FROM l_wh_form_transfer ft\n"
+ + " LEFT JOIN l_wh_procure_model pm ON ft.ID = pm.BUSINESS_ID\n"
+ + " LEFT JOIN base_goods_models bgm ON bgm.id = pm.BASE_GOODS_MODELS_ID\n"
+ + " LEFT JOIN base_goods_template bgt ON bgt.id = bgm.GOODS_TEMPLATES_ID where 1=1 ");
+ if (StringUtils.isNotEmpty(param.getBusinessFormCode())) {
+ sql.append("AND ft.BUSINESS_FORM_CODE = :businessFormCode ");
+ params.put("businessFormCode", param.getBusinessFormCode());
+ }
+ if (StringUtils.isNotEmpty(param.getGoodsTemplateName())) {
+ sql.append("AND bgt.GOODS_NAME like :goodsName ");
+ params.put("goodsName", StringUtils.CHAR_PERCENT + param.getGoodsTemplateName() + StringUtils.CHAR_PERCENT);
+ }
+ if (param.getBaseGoodsModelsId() != null) {
+ sql.append("AND bgm.id = :goodsModelId ");
+ params.put("goodsModelId", param.getBaseGoodsModelsId());
+ }
+ if (param.getOutAgencyId() != null) {
+ sql.append("AND ft.OUT_AGENCY_ID like :outAgencyId ");
+ params.put("outAgencyId", param.getOutAgencyId());
+ }
+ if (param.getOutAgencyId() != null) {
+ sql.append("AND ft.IN_AGENCY_ID like :inAgencyId ");
+ params.put("inAgencyId", param.getInAgencyId());
+ }
+ if (StringUtils.isNotEmpty(param.getOperatorName())) {
+ sql.append("AND ft.OPERATOR_NAME = :operatorName ");
+ params.put("operatorName", param.getOperatorName());
+ }
+ //鐢宠鍒涘缓鏃堕棿
+ if (param.getCreateTimeStart() != null) {
+ sql.append("AND ft.CREATE_TIME >= :createTimeStart ");
+ params.put("createTimeStart", param.getCreateTimeStart() * 1000000);
+ }
+ if (param.getCreateTimeEnd() != null) {
+ sql.append("AND ft.CREATE_TIME < :createTimeEnd ");
+ params.put("createTimeEnd", param.getCreateTimeEnd() * 1000000 + 240000);
+ }
+ //鎺ユ敹鏃堕棿
+ if (param.getStartTime() != null) {
+ sql.append("AND ft.IN_TIME >= :createTimeStart ");
+ params.put("createTimeStart", param.getStartTime() * 1000000);
+ }
+ if (param.getEndTime() != null) {
+ sql.append("AND ft.IN_TIME < :createTimeEnd ");
+ params.put("createTimeEnd", param.getEndTime() * 1000000 + 240000);
+ }
+ GenericPager<Map<String, Object>> mapGenericPager = this.selectSplit(sql.toString(), params, param.getPageNum(), param.getPageSize(), new MapperUtil());
+ return mapGenericPager;
+
+ }
}
--
Gitblit v1.9.1